[Libreoffice-commits] .: 2 commits - binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Mar 16 09:01:59 PDT 2011
binfilter/bf_xmloff/source/text/xmloff_XMLAutoMarkFileContext.cxx | 10
binfilter/bf_xmloff/source/text/xmloff_XMLChangeElementImportContext.cxx | 18
binfilter/bf_xmloff/source/text/xmloff_XMLChangeInfoContext.cxx | 22
binfilter/bf_xmloff/source/text/xmloff_XMLChangedRegionImportContext.cxx | 20
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteBodyImportContext.cxx | 10
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx | 60 -
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx | 30
binfilter/bf_xmloff/source/text/xmloff_XMLIndexAlphabeticalSourceContext.cxx | 34
binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyConfigurationContext.cxx | 30
binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyEntryContext.cxx | 8
binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographySourceContext.cxx | 16
binfilter/bf_xmloff/source/text/xmloff_XMLIndexBodyContext.cxx | 10
binfilter/bf_xmloff/source/text/xmloff_XMLIndexChapterInfoEntryContext.cxx | 8
binfilter/bf_xmloff/source/text/xmloff_XMLIndexMarkExport.cxx | 8
binfilter/bf_xmloff/source/text/xmloff_XMLIndexObjectSourceContext.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_XMLIndexSimpleEntryContext.cxx | 10
binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx | 26
binfilter/bf_xmloff/source/text/xmloff_XMLIndexSpanEntryContext.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx | 44 -
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCSourceContext.cxx | 22
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCStylesContext.cxx | 24
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTabStopEntryContext.cxx | 8
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTableSourceContext.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTemplateContext.cxx | 56 -
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTitleTemplateContext.cxx | 14
binfilter/bf_xmloff/source/text/xmloff_XMLIndexUserSourceContext.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingExport.cxx | 20
binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingSeparatorImportContext.cxx | 8
binfilter/bf_xmloff/source/text/xmloff_XMLRedlineExport.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx | 39 -
binfilter/bf_xmloff/source/text/xmloff_XMLSectionFootnoteConfigExport.cxx | 1
binfilter/bf_xmloff/source/text/xmloff_XMLSectionFootnoteConfigImport.cxx | 16
binfilter/bf_xmloff/source/text/xmloff_XMLSectionImportContext.cxx | 32
binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceDDEImportContext.cxx | 14
binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceImportContext.cxx | 14
binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx | 82 +-
binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsExport.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx | 70 +-
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 342 ++++------
binfilter/bf_xmloff/source/text/xmloff_txtftne.cxx | 39 -
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx | 105 +--
binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx | 48 -
binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx | 193 ++---
44 files changed, 780 insertions(+), 799 deletions(-)
New commits:
commit 604901b83a4251db3d7cb5a641b702a8c2466f52
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 16 11:27:44 2011 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLAutoMarkFileContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLAutoMarkFileContext.cxx
index 9c6d6ab..524da0b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLAutoMarkFileContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLAutoMarkFileContext.cxx
@@ -55,10 +55,10 @@ using ::binfilter::xmloff::token::XML_HREF;
TYPEINIT1( XMLAutoMarkFileContext, SvXMLImportContext );
XMLAutoMarkFileContext::XMLAutoMarkFileContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
sIndexAutoMarkFileURL(
RTL_CONSTASCII_USTRINGPARAM("IndexAutoMarkFileURL"))
{
@@ -79,10 +79,10 @@ void XMLAutoMarkFileContext::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 );
- if ( ( XML_NAMESPACE_XLINK == nPrefix ) &&
+ if ( ( XML_NAMESPACE_XLINK == nLclPrefix ) &&
IsXMLToken(sLocalName, XML_HREF) )
{
Any aAny;
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLChangeElementImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLChangeElementImportContext.cxx
index ac2c60a..871a10c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLChangeElementImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLChangeElementImportContext.cxx
@@ -52,28 +52,28 @@ using ::binfilter::xmloff::token::XML_CHANGE_INFO;
TYPEINIT1( XMLChangeElementImportContext, SvXMLImportContext );
XMLChangeElementImportContext::XMLChangeElementImportContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
sal_Bool bAccContent,
XMLChangedRegionImportContext& rParent) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
bAcceptContent(bAccContent),
rChangedRegion(rParent)
{
}
SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList)
{
SvXMLImportContext* pContext = NULL;
- if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
+ if ( (XML_NAMESPACE_OFFICE == nInPrefix) &&
IsXMLToken( rLocalName, XML_CHANGE_INFO) )
{
- pContext = new XMLChangeInfoContext(GetImport(), nPrefix, rLocalName,
+ pContext = new XMLChangeInfoContext(GetImport(), nInPrefix, rLocalName,
rChangedRegion, GetLocalName());
}
else
@@ -82,14 +82,14 @@ SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext(
rChangedRegion.UseRedlineText();
pContext = GetImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
XML_TEXT_TYPE_CHANGED_REGION);
if (NULL == pContext)
{
// no text element -> use default
pContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
+ nInPrefix, rLocalName, xAttrList);
// illegal element content! TODO: discard this redline!
}
@@ -100,7 +100,7 @@ SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext(
}
// #107848#
-void XMLChangeElementImportContext::StartElement( const Reference< XAttributeList >& xAttrList )
+void XMLChangeElementImportContext::StartElement( const Reference< XAttributeList >& /*xAttrList*/ )
{
if(bAcceptContent)
{
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLChangeInfoContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLChangeInfoContext.cxx
index 571436f..cc47e3a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLChangeInfoContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLChangeInfoContext.cxx
@@ -54,14 +54,14 @@ using ::com::sun::star::xml::sax::XAttributeList;
TYPEINIT1(XMLChangeInfoContext, SvXMLImportContext);
XMLChangeInfoContext::XMLChangeInfoContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLChangedRegionImportContext& rPParent,
const OUString& rChangeType) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
- rChangedRegion(rPParent),
- rType(rChangeType)
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
+ rType(rChangeType),
+ rChangedRegion(rPParent)
{
}
@@ -77,11 +77,11 @@ void XMLChangeInfoContext::StartElement(
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 );
OUString sValue = xAttrList->getValueByIndex(nAttr);
- if (XML_NAMESPACE_OFFICE == nPrefix)
+ if (XML_NAMESPACE_OFFICE == nLclPrefix)
{
if ( IsXMLToken( sLocalName, XML_CHG_AUTHOR ) )
{
@@ -99,21 +99,21 @@ void XMLChangeInfoContext::StartElement(
}
SvXMLImportContext* XMLChangeInfoContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if ( ( XML_NAMESPACE_TEXT == nPrefix ) &&
+ if ( ( XML_NAMESPACE_TEXT == nInPrefix ) &&
IsXMLToken( rLocalName, XML_P ) )
{
- pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
+ pContext = new XMLStringBufferImportContext(GetImport(), nInPrefix,
rLocalName, sCommentBuffer);
}
else
{
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLChangedRegionImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLChangedRegionImportContext.cxx
index f3c4335..fcb1c03 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLChangedRegionImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLChangedRegionImportContext.cxx
@@ -59,10 +59,10 @@ using ::com::sun::star::xml::sax::XAttributeList;
TYPEINIT1(XMLChangedRegionImportContext, SvXMLImportContext);
XMLChangedRegionImportContext::XMLChangedRegionImportContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
bMergeLastPara(sal_True)
{
}
@@ -79,12 +79,12 @@ void XMLChangedRegionImportContext::StartElement(
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 );
const OUString sValue = xAttrList->getValueByIndex(nAttr);
- if ( XML_NAMESPACE_TEXT == nPrefix )
+ if ( XML_NAMESPACE_TEXT == nLclPrefix )
{
if( IsXMLToken( sLocalName, XML_ID ) )
{
@@ -103,13 +103,13 @@ void XMLChangedRegionImportContext::StartElement(
}
SvXMLImportContext* XMLChangedRegionImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList)
{
SvXMLImportContext* pContext = NULL;
- if (XML_NAMESPACE_TEXT == nPrefix)
+ if (XML_NAMESPACE_TEXT == nInPrefix)
{
if ( IsXMLToken( rLocalName, XML_INSERTION ) ||
IsXMLToken( rLocalName, XML_DELETION ) ||
@@ -117,7 +117,7 @@ SvXMLImportContext* XMLChangedRegionImportContext::CreateChildContext(
{
// create XMLChangeElementImportContext for all kinds of changes
pContext = new XMLChangeElementImportContext(
- GetImport(), nPrefix, rLocalName,
+ GetImport(), nInPrefix, rLocalName,
IsXMLToken( rLocalName, XML_DELETION ),
*this);
}
@@ -126,14 +126,14 @@ SvXMLImportContext* XMLChangedRegionImportContext::CreateChildContext(
if (NULL == pContext)
{
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
// was it a text element? If not, use default!
if (NULL == pContext)
{
pContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
+ nInPrefix, rLocalName, xAttrList);
}
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteBodyImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteBodyImportContext.cxx
index a9973ae..fb9e11a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteBodyImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteBodyImportContext.cxx
@@ -47,27 +47,27 @@ using ::com::sun::star::xml::sax::XAttributeList;
TYPEINIT1( XMLFootnoteBodyImportContext, SvXMLImportContext );
XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName ) :
- SvXMLImportContext(rImport, nPrfx, rLocalName)
+ SvXMLImportContext(rInImport, nPrfx, rLocalName)
{
}
SvXMLImportContext* XMLFootnoteBodyImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
// return text context
SvXMLImportContext *pContext =
GetImport().GetTextImport()->CreateTextChildContext(GetImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList,
XML_TEXT_TYPE_FOOTNOTE);
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_XMLFootnoteConfigurationImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
index 46c56b7..6a98660 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
@@ -69,7 +69,7 @@ public:
TYPEINFO();
XMLFootnoteConfigHelper(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
XMLFootnoteConfigurationImportContext& rConfigImport,
@@ -83,14 +83,14 @@ public:
TYPEINIT1( XMLFootnoteConfigHelper, SvXMLImportContext );
XMLFootnoteConfigHelper::XMLFootnoteConfigHelper(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
XMLFootnoteConfigurationImportContext& rConfigImport,
sal_Bool bBegin) :
- SvXMLImportContext(rImport, nPrfx, rLName),
- rConfig(rConfigImport),
+ SvXMLImportContext(rInImport, nPrfx, rLName),
sBuffer(),
+ rConfig(rConfigImport),
bIsBegin(bBegin)
{
}
@@ -122,32 +122,17 @@ void XMLFootnoteConfigHelper::Characters( const OUString& rChars )
TYPEINIT1( XMLFootnoteConfigurationImportContext, SvXMLStyleContext );
XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList,
sal_Bool bEnd) :
- SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList, bEnd ?
+ SvXMLStyleContext(rInImport, nPrfx, rLocalName, xAttrList, bEnd ?
XML_STYLE_FAMILY_TEXT_ENDNOTECONFIG :
XML_STYLE_FAMILY_TEXT_FOOTNOTECONFIG),
- bIsEndnote(bEnd),
- pAttrTokenMap(NULL),
- sCitationStyle(),
- sAnchorStyle(),
- sDefaultStyle(),
- sPageStyle(),
- sPrefix(),
- sSuffix(),
- sBeginNotice(),
- sEndNotice(),
- sNumFormat(RTL_CONSTASCII_USTRINGPARAM("1")),
- sNumSync(RTL_CONSTASCII_USTRINGPARAM("false")),
- nOffset(0),
- nNumbering(FootnoteNumbering::PER_PAGE),
- bPosition(sal_False),
- sPropertyCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
sPropertyAnchorCharStyleName(
RTL_CONSTASCII_USTRINGPARAM("AnchorCharStyleName")),
+ sPropertyCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
sPropertyNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
sPropertyPageStyleName(RTL_CONSTASCII_USTRINGPARAM("PageStyleName")),
sPropertyParagraphStyleName(
@@ -160,7 +145,22 @@ XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext(
sPropertyFootnoteCounting(
RTL_CONSTASCII_USTRINGPARAM("FootnoteCounting")),
sPropertyEndNotice(RTL_CONSTASCII_USTRINGPARAM("EndNotice")),
- sPropertyBeginNotice(RTL_CONSTASCII_USTRINGPARAM("BeginNotice"))
+ sPropertyBeginNotice(RTL_CONSTASCII_USTRINGPARAM("BeginNotice")),
+ sCitationStyle(),
+ sAnchorStyle(),
+ sDefaultStyle(),
+ sPageStyle(),
+ sPrefix(),
+ sSuffix(),
+ sNumFormat(RTL_CONSTASCII_USTRINGPARAM("1")),
+ sNumSync(RTL_CONSTASCII_USTRINGPARAM("false")),
+ sBeginNotice(),
+ sEndNotice(),
+ pAttrTokenMap(NULL),
+ nOffset(0),
+ nNumbering(FootnoteNumbering::PER_PAGE),
+ bPosition(sal_False),
+ bIsEndnote(bEnd)
{
}
XMLFootnoteConfigurationImportContext::~XMLFootnoteConfigurationImportContext()
@@ -230,11 +230,11 @@ void XMLFootnoteConfigurationImportContext::StartElement(
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 );
OUString sValue = xAttrList->getValueByIndex(nAttr);
- switch (GetFtnConfigAttrTokenMap().Get(nPrefix, sLocalName))
+ switch (GetFtnConfigAttrTokenMap().Get(nLclPrefix, sLocalName))
{
case XML_TOK_FTNCONFIG_CITATION_STYLENAME:
sCitationStyle = sValue;
@@ -289,7 +289,7 @@ void XMLFootnoteConfigurationImportContext::StartElement(
}
SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
@@ -297,20 +297,20 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
if (!bIsEndnote)
{
- if (XML_NAMESPACE_TEXT == nPrefix)
+ if (XML_NAMESPACE_TEXT == nInPrefix)
{
if ( IsXMLToken( rLocalName,
XML_FOOTNOTE_CONTINUATION_NOTICE_FORWARD ) )
{
pContext = new XMLFootnoteConfigHelper(GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
*this, sal_False);
}
else if ( IsXMLToken( rLocalName,
XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ) )
{
pContext = new XMLFootnoteConfigHelper(GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
*this, sal_True);
}
// else: default context
@@ -322,7 +322,7 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
if (pContext == NULL)
{
// default: delegate to super class
- pContext = SvXMLStyleContext::CreateChildContext(nPrefix,
+ pContext = SvXMLStyleContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
index 8e01f7a..3fb80d2 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
@@ -89,14 +89,14 @@ static SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
XMLFootnoteImportContext::XMLFootnoteImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
const OUString& rLocalName ) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
+ sPropertyReferenceId(RTL_CONSTASCII_USTRINGPARAM("ReferenceId")),
rHelper(rHlp),
- xFootnote(),
- sPropertyReferenceId(RTL_CONSTASCII_USTRINGPARAM("ReferenceId"))
+ xFootnote()
{
}
@@ -124,17 +124,17 @@ void XMLFootnoteImportContext::StartElement(
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_TEXT == nPrefix) &&
+ if ( (XML_NAMESPACE_TEXT == nLclPrefix) &&
IsXMLToken( sLocalName, XML_ID ) )
{
// get ID ...
Reference<XPropertySet> xPropertySet(xTextContent, UNO_QUERY);
Any aAny =xPropertySet->getPropertyValue(sPropertyReferenceId);
- sal_Int16 nID;
+ sal_Int16 nID(0);
aAny >>= nID;
// ... and insert into map
@@ -164,7 +164,7 @@ void XMLFootnoteImportContext::StartElement(
}
void XMLFootnoteImportContext::Characters(
- const OUString& rString)
+ const OUString& /*rString*/)
{
// ignore characters! Text must be contained in paragraphs!
// rHelper.InsertString(rString);
@@ -185,7 +185,7 @@ void XMLFootnoteImportContext::EndElement()
SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
@@ -193,7 +193,7 @@ SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext(
SvXMLTokenMap aTokenMap(aFootnoteChildTokenMap);
- switch(aTokenMap.Get(nPrefix, rLocalName))
+ switch(aTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_FTN_FOOTNOTE_CITATION:
case XML_TOK_FTN_ENDNOTE_CITATION:
@@ -205,11 +205,11 @@ SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext(
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 ( (nPrefix == XML_NAMESPACE_TEXT) &&
+ if ( (nLclPrefix == XML_NAMESPACE_TEXT) &&
IsXMLToken( sLocalName, XML_LABEL ) )
{
xFootnote->setLabel(xAttrList->getValueByIndex(nAttr));
@@ -218,7 +218,7 @@ SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext(
// ignore content: return default context
pContext = new SvXMLImportContext(GetImport(),
- nPrefix, rLocalName);
+ nInPrefix, rLocalName);
break;
}
@@ -226,11 +226,11 @@ SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext(
case XML_TOK_FTN_ENDNOTE_BODY:
// return footnote body
pContext = new XMLFootnoteBodyImportContext(GetImport(),
- nPrefix, rLocalName);
+ nInPrefix, rLocalName);
break;
default:
// default:
- pContext = SvXMLImportContext::CreateChildContext(nPrefix,
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
break;
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexAlphabeticalSourceContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexAlphabeticalSourceContext.cxx
index 27a27e5..8aa26d9 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexAlphabeticalSourceContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexAlphabeticalSourceContext.cxx
@@ -74,22 +74,12 @@ const sal_Char sAPI_Locale[] = "Locale";
TYPEINIT1( XMLIndexAlphabeticalSourceContext, XMLIndexSourceBaseContext );
XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
Reference<XPropertySet> & rPropSet) :
- XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName,
+ XMLIndexSourceBaseContext(rInImport, nPrfx, rLocalName,
rPropSet, sal_False),
- sMainEntryStyleName(),
- bMainEntryStyleNameOK(sal_False),
- bSeparators(sal_False),
- bCombineEntries(sal_True),
- bCaseSensitive(sal_True),
- bEntry(sal_False),
- bUpperCase(sal_False),
- bCombineDash(sal_False),
- bCombinePP(sal_True),
- bCommaSeparated(sal_False),
sMainEntryCharacterStyleName(RTL_CONSTASCII_USTRINGPARAM(
sAPI_MainEntryCharacterStyleName)),
sUseAlphabeticalSeparators(RTL_CONSTASCII_USTRINGPARAM(
@@ -101,9 +91,19 @@ XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext(
sUseUpperCase(RTL_CONSTASCII_USTRINGPARAM(sAPI_UseUpperCase)),
sUseDash(RTL_CONSTASCII_USTRINGPARAM(sAPI_UseDash)),
sUsePP(RTL_CONSTASCII_USTRINGPARAM(sAPI_UsePP)),
+ sIsCommaSeparated(RTL_CONSTASCII_USTRINGPARAM("IsCommaSeparated")),
sSortAlgorithm(RTL_CONSTASCII_USTRINGPARAM(sAPI_SortAlgorithm)),
sLocale(RTL_CONSTASCII_USTRINGPARAM(sAPI_Locale)),
- sIsCommaSeparated(RTL_CONSTASCII_USTRINGPARAM("IsCommaSeparated"))
+ sMainEntryStyleName(),
+ bMainEntryStyleNameOK(sal_False),
+ bSeparators(sal_False),
+ bCombineEntries(sal_True),
+ bCaseSensitive(sal_True),
+ bEntry(sal_False),
+ bUpperCase(sal_False),
+ bCombineDash(sal_False),
+ bCombinePP(sal_True),
+ bCommaSeparated(sal_False)
{
}
@@ -248,15 +248,15 @@ void XMLIndexAlphabeticalSourceContext::EndElement()
}
SvXMLImportContext* XMLIndexAlphabeticalSourceContext::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_ALPHABETICAL_INDEX_ENTRY_TEMPLATE ) )
{
return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
aLevelNameAlphaMap,
XML_OUTLINE_LEVEL,
aLevelStylePropNameAlphaMap,
@@ -264,7 +264,7 @@ SvXMLImportContext* XMLIndexAlphabeticalSourceContext::CreateChildContext(
}
else
{
- return XMLIndexSourceBaseContext::CreateChildContext(nPrefix,
+ return XMLIndexSourceBaseContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyConfigurationContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyConfigurationContext.cxx
index 2f4d081..ca2ac84 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyConfigurationContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyConfigurationContext.cxx
@@ -64,11 +64,11 @@ const sal_Char sAPI_FieldMaster_Bibliography[] =
TYPEINIT1( XMLIndexBibliographyConfigurationContext, SvXMLStyleContext );
XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList) :
- SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList, XML_STYLE_FAMILY_TEXT_BIBLIOGRAPHYCONFIG),
+ SvXMLStyleContext(rInImport, nPrfx, rLocalName, xAttrList, XML_STYLE_FAMILY_TEXT_BIBLIOGRAPHYCONFIG),
sFieldMaster_Bibliography(
RTL_CONSTASCII_USTRINGPARAM(sAPI_FieldMaster_Bibliography)),
sBracketBefore(RTL_CONSTASCII_USTRINGPARAM("BracketBefore")),
@@ -100,22 +100,22 @@ void XMLIndexBibliographyConfigurationContext::StartElement(
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 );
- ProcessAttribute(nPrefix, sLocalName,
+ ProcessAttribute(nLclPrefix, sLocalName,
xAttrList->getValueByIndex(nAttr));
// else: ignore
}
}
void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
OUString sLocalName,
OUString sValue)
{
- if( XML_NAMESPACE_TEXT == nPrefix )
+ if( XML_NAMESPACE_TEXT == nInPrefix )
{
if( IsXMLToken(sLocalName, XML_PREFIX) )
{
@@ -146,7 +146,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
sAlgorithm = sValue;
}
}
- else if( XML_NAMESPACE_FO == nPrefix )
+ else if( XML_NAMESPACE_FO == nInPrefix )
{
if( IsXMLToken(sLocalName, XML_LANGUAGE) )
{
@@ -161,7 +161,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
@@ -169,7 +169,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
sal_Bool bSort(sal_True);
// process children here and use default context!
- if ( ( nPrefix == XML_NAMESPACE_TEXT ) &&
+ if ( ( nInPrefix == XML_NAMESPACE_TEXT ) &&
IsXMLToken( rLocalName, XML_SORT_KEY ) )
{
sal_Int16 nLength = xAttrList->getLength();
@@ -223,12 +223,12 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
}
}
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ return SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
}
void XMLIndexBibliographyConfigurationContext::CreateAndInsert(
- sal_Bool bOverwrite)
+ sal_Bool /*bOverwrite*/)
{
// (code almost the same as export...)
@@ -242,11 +242,11 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(
Sequence<rtl::OUString> aServices = xFactory->getAvailableServiceNames();
sal_Bool bFound(sal_False);
sal_Int32 i(0);
- sal_Int32 nCount(aServices.getLength());
- while (i < nCount && !bFound)
+ sal_Int32 nServiceCount(aServices.getLength());
+ while (i < nServiceCount && !bFound)
{
if (aServices[i].equals(sFieldMaster_Bibliography))
- // here we should use a methode which compares in reverse order if available
+ // here we should use a method which compares in reverse order if available
// #85282#
bFound = sal_True;
else
@@ -288,7 +288,7 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(
sal_Int32 nCount = aSortKeys.size();
Sequence<Sequence<PropertyValue> > aKeysSeq(nCount);
- for(sal_Int32 i = 0; i < nCount; i++)
+ for(i = 0; i < nCount; i++)
{
aKeysSeq[i] = aSortKeys[i];
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyEntryContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyEntryContext.cxx
index 125d7a5..001cc21 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyEntryContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographyEntryContext.cxx
@@ -64,11 +64,11 @@ const sal_Char sAPI_CharacterStyleName[] = "CharacterStyleName";
TYPEINIT1( XMLIndexBibliographyEntryContext, XMLIndexSimpleEntryContext);
XMLIndexBibliographyEntryContext::XMLIndexBibliographyEntryContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLIndexTemplateContext& rTemplate,
sal_uInt16 nPrfx,
const OUString& rLocalName ) :
- XMLIndexSimpleEntryContext(rImport,
+ XMLIndexSimpleEntryContext(rInImport,
rTemplate.sTokenBibliographyDataField,
rTemplate,
nPrfx, rLocalName),
@@ -127,10 +127,10 @@ void XMLIndexBibliographyEntryContext::StartElement(
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_TEXT == nPrefix)
+ if (XML_NAMESPACE_TEXT == nLclPrefix)
{
if ( IsXMLToken( sLocalName, XML_STYLE_NAME ) )
{
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographySourceContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographySourceContext.cxx
index 27038b2..df879f9 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographySourceContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBibliographySourceContext.cxx
@@ -60,11 +60,11 @@ TYPEINIT1(XMLIndexBibliographySourceContext, XMLIndexSourceBaseContext);
XMLIndexBibliographySourceContext::XMLIndexBibliographySourceContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
Reference<XPropertySet> & rPropSet) :
- XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName,
+ XMLIndexSourceBaseContext(rInImport, nPrfx, rLocalName,
rPropSet, sal_False)
{
}
@@ -74,8 +74,8 @@ XMLIndexBibliographySourceContext::~XMLIndexBibliographySourceContext()
}
void XMLIndexBibliographySourceContext::ProcessAttribute(
- enum IndexSourceParamEnum eParam,
- const OUString& rValue)
+ enum IndexSourceParamEnum /*eParam*/,
+ const OUString& /*rValue*/)
{
// We have no attributes. Who wants attributes, anyway?
}
@@ -88,15 +88,15 @@ void XMLIndexBibliographySourceContext::EndElement()
SvXMLImportContext* XMLIndexBibliographySourceContext::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_BIBLIOGRAPHY_ENTRY_TEMPLATE ) ) )
{
return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
aLevelNameBibliographyMap,
XML_BIBLIOGRAPHY_TYPE,
aLevelStylePropNameBibliographyMap,
@@ -104,7 +104,7 @@ SvXMLImportContext* XMLIndexBibliographySourceContext::CreateChildContext(
}
else
{
- return XMLIndexSourceBaseContext::CreateChildContext(nPrefix,
+ return XMLIndexSourceBaseContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBodyContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBodyContext.cxx
index 659b343..2d4402d 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBodyContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexBodyContext.cxx
@@ -44,10 +44,10 @@ using ::com::sun::star::xml::sax::XAttributeList;
TYPEINIT1( XMLIndexBodyContext, SvXMLImportContext);
XMLIndexBodyContext::XMLIndexBodyContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const ::rtl::OUString& rLocalName ) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
bHasContent(sal_False)
{
}
@@ -57,7 +57,7 @@ XMLIndexBodyContext::~XMLIndexBodyContext()
}
SvXMLImportContext* XMLIndexBodyContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList)
{
@@ -65,10 +65,10 @@ SvXMLImportContext* XMLIndexBodyContext::CreateChildContext(
// return text content (if possible)
pContext = GetImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList, XML_TEXT_TYPE_SECTION );
+ GetImport(), nInPrefix, rLocalName, xAttrList, XML_TEXT_TYPE_SECTION );
if (NULL == pContext)
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
else
bHasContent = sal_True;
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexChapterInfoEntryContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexChapterInfoEntryContext.cxx
index 9575616..67b2cf5 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexChapterInfoEntryContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexChapterInfoEntryContext.cxx
@@ -62,11 +62,11 @@ using ::com::sun::star::xml::sax::XAttributeList;
TYPEINIT1( XMLIndexChapterInfoEntryContext, XMLIndexSimpleEntryContext);
XMLIndexChapterInfoEntryContext::XMLIndexChapterInfoEntryContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLIndexTemplateContext& rTemplate,
sal_uInt16 nPrfx,
const OUString& rLocalName ) :
- XMLIndexSimpleEntryContext(rImport, rTemplate.sTokenChapterInfo,
+ XMLIndexSimpleEntryContext(rInImport, rTemplate.sTokenChapterInfo,
rTemplate, nPrfx, rLocalName),
nChapterInfo(ChapterFormat::NAME_NUMBER),
bChapterInfoOK(sal_False)
@@ -96,10 +96,10 @@ void XMLIndexChapterInfoEntryContext::StartElement(
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_TEXT == nPrefix)
+ if (XML_NAMESPACE_TEXT == nLclPrefix)
{
if ( IsXMLToken( sLocalName, XML_STYLE_NAME ) )
{
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexMarkExport.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexMarkExport.cxx
index 367b2ee..5477217 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexMarkExport.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexMarkExport.cxx
@@ -57,8 +57,6 @@ using ::com::sun::star::uno::Any;
XMLIndexMarkExport::XMLIndexMarkExport(
SvXMLExport& rExp,
XMLTextParagraphExport& rParaExp) :
- rExport(rExp),
- rParaExport(rParaExp),
sLevel(RTL_CONSTASCII_USTRINGPARAM("Level")),
sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName")),
sPrimaryKey(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")),
@@ -71,7 +69,9 @@ XMLIndexMarkExport::XMLIndexMarkExport(
sPrimaryKeyReading(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeyReading")),
sSecondaryKeyReading(RTL_CONSTASCII_USTRINGPARAM
("SecondaryKeyReading")),
- sMainEntry(RTL_CONSTASCII_USTRINGPARAM("IsMainEntry"))
+ sMainEntry(RTL_CONSTASCII_USTRINGPARAM("IsMainEntry")),
+ rExport(rExp),
+ rParaExport(rParaExp)
{
}
@@ -189,7 +189,7 @@ void XMLIndexMarkExport::ExportTOCMarkAttributes(
const Reference<XPropertySet> & rPropSet)
{
// outline level
- sal_Int16 nLevel;
+ sal_Int16 nLevel(0);
Any aAny = rPropSet->getPropertyValue(sLevel);
aAny >>= nLevel;
OUStringBuffer sBuf;
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexObjectSourceContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexObjectSourceContext.cxx
index 7090d2d..2db9a73 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexObjectSourceContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexObjectSourceContext.cxx
@@ -68,11 +68,11 @@ const sal_Char sAPI_CreateFromOtherEmbeddedObjects[] = "CreateFromOtherEmbeddedO
TYPEINIT1( XMLIndexObjectSourceContext, XMLIndexSourceBaseContext );
XMLIndexObjectSourceContext::XMLIndexObjectSourceContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
Reference<XPropertySet> & rPropSet) :
- XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName,
+ XMLIndexSourceBaseContext(rInImport, nPrfx, rLocalName,
rPropSet, sal_False),
sCreateFromStarCalc(RTL_CONSTASCII_USTRINGPARAM(
sAPI_CreateFromStarCalc)),
@@ -168,15 +168,15 @@ void XMLIndexObjectSourceContext::EndElement()
}
SvXMLImportContext* XMLIndexObjectSourceContext::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_OBJECT_INDEX_ENTRY_TEMPLATE)) )
{
return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
aLevelNameTableMap,
XML_TOKEN_INVALID, // no outline-level attr
aLevelStylePropNameTableMap,
@@ -184,7 +184,7 @@ SvXMLImportContext* XMLIndexObjectSourceContext::CreateChildContext(
}
else
{
- return XMLIndexSourceBaseContext::CreateChildContext(nPrefix,
+ return XMLIndexSourceBaseContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSimpleEntryContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSimpleEntryContext.cxx
index c6acf12..c6ea3e0 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSimpleEntryContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSimpleEntryContext.cxx
@@ -51,16 +51,16 @@ const sal_Char sAPI_CharacterStyleName[] = "CharacterStyleName";
TYPEINIT1( XMLIndexSimpleEntryContext, SvXMLImportContext);
XMLIndexSimpleEntryContext::XMLIndexSimpleEntryContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const OUString& rEntry,
XMLIndexTemplateContext& rTemplate,
sal_uInt16 nPrfx,
const OUString& rLocalName ) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
- rTemplateContext(rTemplate),
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
rEntryType(rEntry),
sCharStyleName(),
bCharStyleNameOK(sal_False),
+ rTemplateContext(rTemplate),
nValues(1)
{
}
@@ -77,10 +77,10 @@ void XMLIndexSimpleEntryContext::StartElement(
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_TEXT == nPrefix) &&
+ if ( (XML_NAMESPACE_TEXT == nLclPrefix) &&
IsXMLToken(sLocalName, XML_STYLE_NAME) )
{
sCharStyleName = xAttrList->getValueByIndex(nAttr);
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
index 249403b..5d99673 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
@@ -152,18 +152,18 @@ static SvXMLTokenMapEntry aIndexSourceTokenMap[] =
TYPEINIT1( XMLIndexSourceBaseContext, SvXMLImportContext );
XMLIndexSourceBaseContext::XMLIndexSourceBaseContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
Reference<XPropertySet> & rPropSet,
sal_Bool bLevelFormats) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
- rIndexPropertySet(rPropSet),
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
+ sCreateFromChapter(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromChapter)),
+ sIsRelativeTabstops(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsRelativeTabstops)),
+ bUseLevelFormats(bLevelFormats),
bChapterIndex(sal_False),
bRelativeTabs(sal_True),
- bUseLevelFormats(bLevelFormats),
- sCreateFromChapter(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromChapter)),
- sIsRelativeTabstops(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsRelativeTabstops))
+ rIndexPropertySet(rPropSet)
{
}
@@ -182,9 +182,9 @@ void XMLIndexSourceBaseContext::StartElement(
{
// map to IndexSourceParamEnum
OUString sLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(i), &sLocalName );
- sal_uInt16 nToken = aTokenMap.Get(nPrefix, sLocalName);
+ sal_uInt16 nToken = aTokenMap.Get(nLclPrefix, sLocalName);
// process attribute
ProcessAttribute((enum IndexSourceParamEnum)nToken,
@@ -233,26 +233,26 @@ void XMLIndexSourceBaseContext::EndElement()
}
SvXMLImportContext* XMLIndexSourceBaseContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if (XML_NAMESPACE_TEXT == nPrefix)
+ if (XML_NAMESPACE_TEXT == nInPrefix)
{
if ( IsXMLToken( rLocalName, XML_INDEX_TITLE_TEMPLATE ) )
{
pContext = new XMLIndexTitleTemplateContext(GetImport(),
rIndexPropertySet,
- nPrefix, rLocalName);
+ nInPrefix, rLocalName);
}
else if ( bUseLevelFormats &&
IsXMLToken( rLocalName, XML_INDEX_SOURCE_STYLES ) )
{
pContext = new XMLIndexTOCStylesContext(GetImport(),
rIndexPropertySet,
- nPrefix, rLocalName);
+ nInPrefix, rLocalName);
}
// else: unknown element in text namespace -> ignore
}
@@ -261,7 +261,7 @@ SvXMLImportContext* XMLIndexSourceBaseContext::CreateChildContext(
// use default context
if (pContext == NULL)
{
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSpanEntryContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSpanEntryContext.cxx
index 3396e41..fdce40e 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSpanEntryContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSpanEntryContext.cxx
@@ -44,11 +44,11 @@ using ::com::sun::star::beans::PropertyValue;
TYPEINIT1( XMLIndexSpanEntryContext, XMLIndexSimpleEntryContext);
XMLIndexSpanEntryContext::XMLIndexSpanEntryContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLIndexTemplateContext& rTemplate,
sal_uInt16 nPrfx,
const OUString& rLocalName ) :
- XMLIndexSimpleEntryContext(rImport, rTemplate.sTokenText,
+ XMLIndexSimpleEntryContext(rInImport, rTemplate.sTokenText,
rTemplate, nPrfx, rLocalName)
{
nValues++; // one more for the text string
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtftne.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtftne.cxx
index 609b324..885671b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtftne.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtftne.cxx
@@ -75,8 +75,8 @@ using rtl::OUStringBuffer;
void XMLTextParagraphExport::exportTextFootnote(
const Reference<XPropertySet> & rPropSet,
- const OUString& sText,
- sal_Bool bAutoStyles, sal_Bool bProgress )
+ const OUString& sInText,
+ sal_Bool bAutoStyles, sal_Bool bInProgress )
{
// get footnote and associated text
Any aAny;
@@ -95,8 +95,8 @@ void XMLTextParagraphExport::exportTextFootnote(
Add( XML_STYLE_FAMILY_TEXT_TEXT, rPropSet );
// handle formatting within footnote
- exportTextFootnoteHelper(xFootnote, xText, sText,
- bAutoStyles, bIsEndnote, bProgress );
+ exportTextFootnoteHelper(xFootnote, xText, sInText,
+ bAutoStyles, bIsEndnote, bInProgress );
}
else
{
@@ -106,7 +106,6 @@ void XMLTextParagraphExport::exportTextFootnote(
sal_Bool bIsUICharStyle = sal_False;
OUString sStyle = FindTextStyleAndHyperlink( rPropSet, bHasHyperlink,
bIsUICharStyle );
- sal_Bool bHasStyle = (sStyle.getLength() > 0);
// export hyperlink (if we have one)
Reference < XPropertySetInfo > xPropSetInfo;
if( bHasHyperlink )
@@ -127,9 +126,9 @@ void XMLTextParagraphExport::exportTextFootnote(
"HyperLinkEvents"));
if (xPropSetInfo->hasPropertyByName(sHyperLinkEvents))
{
- Any aAny = rPropSet->getPropertyValue(sHyperLinkEvents);
+ Any aLclAny = rPropSet->getPropertyValue(sHyperLinkEvents);
Reference<XNameReplace> xName;
- aAny >>= xName;
+ aLclAny >>= xName;
GetExport().GetEventExport().Export(xName, sal_False);
}
}
@@ -146,13 +145,13 @@ void XMLTextParagraphExport::exportTextFootnote(
sStyle );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
XML_SPAN, sal_False, sal_False );
- exportTextFootnoteHelper(xFootnote, xText, sText,
- bAutoStyles, bIsEndnote, bProgress );
+ exportTextFootnoteHelper(xFootnote, xText, sInText,
+ bAutoStyles, bIsEndnote, bInProgress );
}
else
{
- exportTextFootnoteHelper(xFootnote, xText, sText,
- bAutoStyles, bIsEndnote, bProgress );
+ exportTextFootnoteHelper(xFootnote, xText, sInText,
+ bAutoStyles, bIsEndnote, bInProgress );
}
}
}
@@ -162,21 +161,21 @@ void XMLTextParagraphExport::exportTextFootnote(
void XMLTextParagraphExport::exportTextFootnoteHelper(
const Reference<XFootnote> & rFootnote,
const Reference<XText> & rText,
- const OUString& sText,
+ const OUString& sInText,
sal_Bool bAutoStyles,
sal_Bool bIsEndnote,
- sal_Bool bProgress )
+ sal_Bool bInProgress )
{
if (bAutoStyles)
{
- exportText(rText, bAutoStyles, bProgress, sal_True );
+ exportText(rText, bAutoStyles, bInProgress, sal_True );
}
else
{
// export reference Id (for reference fields)
Reference<XPropertySet> xPropSet(rFootnote, UNO_QUERY);
Any aAny = xPropSet->getPropertyValue(sReferenceId);
- sal_Int32 nNumber;
+ sal_Int32 nNumber(0);
aAny >>= nNumber;
OUStringBuffer aBuf;
aBuf.appendAscii("ftn");
@@ -201,7 +200,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
(bIsEndnote ? XML_ENDNOTE_CITATION :
XML_FOOTNOTE_CITATION),
sal_False, sal_False);
- GetExport().Characters(sText);
+ GetExport().Characters(sInText);
}
{
@@ -209,7 +208,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
(bIsEndnote ? XML_ENDNOTE_BODY :
XML_FOOTNOTE_BODY),
sal_False, sal_False);
- exportText(rText, bAutoStyles, bProgress, sal_True );
+ exportText(rText, bAutoStyles, bInProgress, sal_True );
}
}
}
@@ -288,7 +287,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
// numbering style
OUStringBuffer sBuffer;
aAny = rFootnoteConfig->getPropertyValue(sNumberingType);
- sal_Int16 nNumbering;
+ sal_Int16 nNumbering(0);
aAny >>= nNumbering;
GetExport().GetMM100UnitConverter().convertNumFormat( sBuffer, nNumbering);
GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
@@ -302,7 +301,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
// StartAt / start-value
aAny = rFootnoteConfig->getPropertyValue(sStartAt);
- sal_Int16 nOffset;
+ sal_Int16 nOffset(0);
aAny >>= nOffset;
SvXMLUnitConverter::convertNumber(sBuffer, (sal_Int32)nOffset);
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_START_VALUE,
@@ -319,7 +318,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
XML_DOCUMENT : XML_PAGE ) );
aAny = rFootnoteConfig->getPropertyValue(sFootnoteCounting);
- sal_Int16 nTmp;
+ sal_Int16 nTmp(0);
aAny >>= nTmp;
enum XMLTokenEnum eElement;
switch (nTmp)
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
index a3cf700..dd1c333 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
@@ -136,9 +136,9 @@ sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
XMLTextImportPropertyMapper::XMLTextImportPropertyMapper(
const UniReference< XMLPropertySetMapper >& rMapper,
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLFontStylesContext *pFontDecls ) :
- SvXMLImportPropertyMapper( rMapper, rImport ),
+ SvXMLImportPropertyMapper( rMapper, rInImport ),
nSizeTypeIndex( -2 ),
xFontDecls( pFontDecls )
{
@@ -260,7 +260,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
void XMLTextImportPropertyMapper::finished(
::std::vector< XMLPropertyState >& rProperties,
- sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const
+ sal_Int32 /*nStartIndex*/, sal_Int32 /*nEndIndex*/ ) const
{
sal_Bool bHasAnyHeight = sal_False;
sal_Bool bHasAnyMinHeight = sal_False;
@@ -649,13 +649,13 @@ void XMLTextImportPropertyMapper::finished(
const_cast < XMLTextImportPropertyMapper * > ( this )
->nSizeTypeIndex = -1;
sal_Int32 nCount = getPropertySetMapper()->GetEntryCount();
- for( sal_Int32 i=0; i < nCount; i++ )
+ for( sal_Int32 j=0; j < nCount; j++ )
{
if( CTF_SIZETYPE == getPropertySetMapper()
- ->GetEntryContextId( i ) )
+ ->GetEntryContextId( j ) )
{
const_cast < XMLTextImportPropertyMapper * > ( this )
- ->nSizeTypeIndex = i;
+ ->nSizeTypeIndex = j;
break;
}
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
index c87b5d7..0215840 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
@@ -660,12 +660,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
SvXMLAutoStylePoolP & rASP
) :
XMLStyleExport( rExp, OUString(), &rASP ),
-// rExport( rExp ),
rAutoStylePool( rASP ),
- pListElements( 0 ),
- pExportedLists( 0 ),
- pListAutoPool( new XMLTextListAutoStylePool( this->GetExport() ) ),
- pFieldExport( 0 ),
pPageTextFrameIdxs( 0 ),
pPageGraphicIdxs( 0 ),
pPageEmbeddedIdxs( 0 ),
@@ -673,18 +668,23 @@ XMLTextParagraphExport::XMLTextParagraphExport(
pFrameTextFrameIdxs( 0 ),
pFrameGraphicIdxs( 0 ),
pFrameEmbeddedIdxs( 0 ),
+ pFrameShapeIdxs( 0 ),
+ pFieldExport( 0 ),
+ pListElements( 0 ),
+ pExportedLists( 0 ),
+ pListAutoPool( new XMLTextListAutoStylePool( this->GetExport() ) ),
pSectionExport( NULL ),
pIndexMarkExport( NULL ),
pRedlineExport( NULL ),
- pFrameShapeIdxs( 0 ),
+ bProgress( sal_False ),
bBlock( sal_False ),
bOpenRuby( sal_False ),
sParagraphService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph")),
sTableService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable")),
sTextFieldService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField")),
sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")),
- sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject")),
sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject")),
+ sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject")),
sTextEndnoteService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote")),
sTextContentService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent")),
sShapeService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape")),
@@ -694,8 +694,8 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
sCharStyleNames(RTL_CONSTASCII_USTRINGPARAM("CharStyleNames")),
sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName")),
- sTextField(RTL_CONSTASCII_USTRINGPARAM("TextField")),
sText(RTL_CONSTASCII_USTRINGPARAM("Text")),
+ sTextField(RTL_CONSTASCII_USTRINGPARAM("TextField")),
sFrame(RTL_CONSTASCII_USTRINGPARAM("Frame")),
sCategory(RTL_CONSTASCII_USTRINGPARAM("Category")),
sNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")),
@@ -743,8 +743,8 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sHyperLinkTarget(RTL_CONSTASCII_USTRINGPARAM("HyperLinkTarget")),
sUnvisitedCharStyleName(RTL_CONSTASCII_USTRINGPARAM("UnvisitedCharStyleName")),
sVisitedCharStyleName(RTL_CONSTASCII_USTRINGPARAM("VisitedCharStyleName")),
- sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection")),
sDocumentIndex(RTL_CONSTASCII_USTRINGPARAM("DocumentIndex")),
+ sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection")),
sDocumentIndexMark(RTL_CONSTASCII_USTRINGPARAM("DocumentIndexMark")),
sActualSize(RTL_CONSTASCII_USTRINGPARAM("ActualSize")),
sContourPolyPolygon(RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon")),
@@ -757,7 +757,6 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sRubyText(RTL_CONSTASCII_USTRINGPARAM("RubyText")),
sRubyAdjust(RTL_CONSTASCII_USTRINGPARAM("RubyAdjust")),
sRubyCharStyleName(RTL_CONSTASCII_USTRINGPARAM("RubyCharStyleName")),
- bProgress( sal_False ),
aCharStyleNamesPropInfoCache( sCharStyleNames )
{
UniReference < XMLPropertySetMapper > xPropMapper =
@@ -766,40 +765,40 @@ XMLTextParagraphExport::XMLTextParagraphExport(
GetExport() );
OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
- OUString sPrefix( 'P' );
+ OUString sLclPrefix( 'P' );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily,
- xParaPropMapper, sPrefix );
+ xParaPropMapper, sLclPrefix );
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT );
xTextPropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
GetExport() );
sFamily = OUString( GetXMLToken(XML_TEXT) );
- sPrefix = OUString( 'T' );
+ sLclPrefix = OUString( 'T' );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_TEXT, sFamily,
- xTextPropMapper, sPrefix );
+ xTextPropMapper, sLclPrefix );
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_AUTO_FRAME );
xAutoFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
GetExport() );
sFamily = OUString( RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME) );
- sPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "fr" ) );
+ sLclPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "fr" ) );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_FRAME, sFamily,
- xAutoFramePropMapper, sPrefix );
+ xAutoFramePropMapper, sLclPrefix );
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SECTION );
xSectionPropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
GetExport() );
sFamily = OUString( GetXMLToken( XML_SECTION ) );
- sPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "Sect" ) );
+ sLclPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "Sect" ) );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_SECTION, sFamily,
- xSectionPropMapper, sPrefix );
+ xSectionPropMapper, sLclPrefix );
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY );
xRubyPropMapper = new SvXMLExportPropertyMapper( xPropMapper );
sFamily = OUString( GetXMLToken( XML_RUBY ) );
- sPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "Ru" ) );
+ sLclPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "Ru" ) );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_RUBY, sFamily,
- xRubyPropMapper, sPrefix );
+ xRubyPropMapper, sLclPrefix );
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME );
xFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
@@ -902,6 +901,8 @@ void XMLTextParagraphExport::collectFrames( sal_Bool bBoundToFrameOnly )
pFrameTextFrameIdxs = new SvLongs;
pFrameTextFrameIdxs->Insert( i, pFrameTextFrameIdxs->Count() );
break;
+ default:
+ break;
}
}
}
@@ -939,6 +940,8 @@ void XMLTextParagraphExport::collectFrames( sal_Bool bBoundToFrameOnly )
pFrameGraphicIdxs = new SvLongs;
pFrameGraphicIdxs->Insert( i, pFrameGraphicIdxs->Count() );
break;
+ default:
+ break;
}
}
}
@@ -976,6 +979,8 @@ void XMLTextParagraphExport::collectFrames( sal_Bool bBoundToFrameOnly )
pFrameEmbeddedIdxs = new SvLongs;
pFrameEmbeddedIdxs->Insert( i, pFrameEmbeddedIdxs->Count() );
break;
+ default:
+ break;
}
}
}
@@ -1031,7 +1036,7 @@ void XMLTextParagraphExport::collectFrames( sal_Bool bBoundToFrameOnly )
}
void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
- sal_Bool bProgress )
+ sal_Bool bInProgress )
{
if( pPageTextFrameIdxs )
{
@@ -1041,7 +1046,7 @@ void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
Reference < XTextFrame > xTxtFrame;
aAny >>= xTxtFrame;
Reference < XTextContent > xTxtCntnt( xTxtFrame, UNO_QUERY );
- exportTextFrame( xTxtCntnt, bAutoStyles, bProgress );
+ exportTextFrame( xTxtCntnt, bAutoStyles, bInProgress );
}
}
if( pPageGraphicIdxs )
@@ -1090,7 +1095,7 @@ sal_Bool lcl_txtpara_isFrameAnchor(
void XMLTextParagraphExport::exportFrameFrames(
sal_Bool bAutoStyles,
- sal_Bool bProgress,
+ sal_Bool bInProgress,
const Reference < XTextFrame > *pParentTxtFrame )
{
if( pFrameTextFrameIdxs && pFrameTextFrameIdxs->Count() )
@@ -1109,7 +1114,7 @@ void XMLTextParagraphExport::exportFrameFrames(
pFrameTextFrameIdxs->Remove( i );
sal_uInt16 nOldCount = pFrameTextFrameIdxs->Count();
Reference < XTextContent > xTxtCntnt( xTxtFrame, UNO_QUERY );
- exportTextFrame( xTxtCntnt, bAutoStyles, bProgress );
+ exportTextFrame( xTxtCntnt, bAutoStyles, bInProgress );
if( bAutoStyles )
i++;
else if( pFrameTextFrameIdxs->Count() != nOldCount )
@@ -1201,7 +1206,7 @@ void XMLTextParagraphExport::exportFrameFrames(
void XMLTextParagraphExport::exportText(
const Reference < XText > & rText,
sal_Bool bAutoStyles,
- sal_Bool bProgress,
+ sal_Bool bInProgress,
sal_Bool bExportParagraph )
{
if( bAutoStyles )
@@ -1251,7 +1256,7 @@ void XMLTextParagraphExport::exportText(
if( !bAutoStyles && (pRedlineExport != NULL) )
pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_True );
exportTextContentEnumeration( xParaEnum, bAutoStyles, xBaseSection,
- bProgress, bExportParagraph, 0, bExportLevels );
+ bInProgress, bExportParagraph, 0, bExportLevels );
if( !bAutoStyles && (pRedlineExport != NULL) )
pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_False );
}
@@ -1260,7 +1265,7 @@ void XMLTextParagraphExport::exportText(
const Reference < XText > & rText,
const Reference < XTextSection > & rBaseSection,
sal_Bool bAutoStyles,
- sal_Bool bProgress,
+ sal_Bool bInProgress,
sal_Bool bExportParagraph )
{
if( bAutoStyles )
@@ -1282,7 +1287,7 @@ void XMLTextParagraphExport::exportText(
pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_True );
}
exportTextContentEnumeration( xParaEnum, bAutoStyles, rBaseSection,
- bProgress, bExportParagraph );
+ bInProgress, bExportParagraph );
if( !bAutoStyles && (pRedlineExport != NULL) )
pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_False );
}
@@ -1291,7 +1296,7 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
const Reference < XEnumeration > & rContEnum,
sal_Bool bAutoStyles,
const Reference < XTextSection > & rBaseSection,
- sal_Bool bProgress,
+ sal_Bool bInProgress,
sal_Bool bExportParagraph,
const Reference < XPropertySet > *pRangePropSet,
sal_Bool bExportLevels)
@@ -1373,7 +1378,7 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
xTxtCntnt, sal_False );
}
else
- exportParagraph( xTxtCntnt, bAutoStyles, bProgress,
+ exportParagraph( xTxtCntnt, bAutoStyles, bInProgress,
bExportParagraph, aPropSetHelper );
bHasContent = sal_True;
}
@@ -1394,7 +1399,7 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
if ((! bAutoStyles) && (NULL != pRedlineExport))
pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, sal_True);
- exportTable( xTxtCntnt, bAutoStyles, bProgress );
+ exportTable( xTxtCntnt, bAutoStyles, bInProgress );
if ((! bAutoStyles) && (NULL != pRedlineExport))
pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, sal_False);
@@ -1409,7 +1414,7 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
}
else if( xServiceInfo->supportsService( sTextFrameService ) )
{
- exportTextFrame( xTxtCntnt, bAutoStyles, bProgress, pRangePropSet );
+ exportTextFrame( xTxtCntnt, bAutoStyles, bInProgress, pRangePropSet );
}
else if( xServiceInfo->supportsService( sTextGraphicService ) )
{
@@ -1451,12 +1456,12 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
void XMLTextParagraphExport::exportParagraph(
const Reference < XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress, sal_Bool bExportParagraph,
+ sal_Bool bAutoStyles, sal_Bool bInProgress, sal_Bool bExportParagraph,
MultiPropertySetHelper& rPropSetHelper)
{
sal_Int8 nOutlineLevel = -1;
- if( bProgress )
+ if( bInProgress )
{
ProgressBarHelper *pProgress = GetExport().GetProgressBarHelper();
pProgress->SetValue( pProgress->GetValue()+1 );
@@ -1582,26 +1587,26 @@ void XMLTextParagraphExport::exportParagraph(
if( bAutoStyles )
{
- sal_Bool bPrevCharIsSpace = sal_True;
+ sal_Bool bLclPrevCharIsSpace = sal_True;
if( bHasContentEnum )
- bPrevCharIsSpace = !exportTextContentEnumeration(
+ bLclPrevCharIsSpace = !exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection,
- bProgress );
- exportTextRangeEnumeration( xTextEnum, bAutoStyles, bProgress );
+ bInProgress );
+ exportTextRangeEnumeration( xTextEnum, bAutoStyles, bInProgress );
}
else
{
- sal_Bool bPrevCharIsSpace = sal_True;
+ sal_Bool bLclPrevCharIsSpace = sal_True;
enum XMLTokenEnum eElem =
-1 == nOutlineLevel ? XML_P : XML_H;
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
sal_True, sal_False );
if( bHasContentEnum )
- bPrevCharIsSpace = !exportTextContentEnumeration(
+ bLclPrevCharIsSpace = !exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection,
- bProgress );
- exportTextRangeEnumeration( xTextEnum, bAutoStyles, bProgress,
- bPrevCharIsSpace );
+ bInProgress );
+ exportTextRangeEnumeration( xTextEnum, bAutoStyles, bInProgress,
+ bLclPrevCharIsSpace );
}
}
@@ -1616,7 +1621,7 @@ static const enum XMLTokenEnum lcl_XmlBookmarkElements[] = {
void XMLTextParagraphExport::exportTextRangeEnumeration(
const Reference < XEnumeration > & rTextEnum,
- sal_Bool bAutoStyles, sal_Bool bProgress,
+ sal_Bool bAutoStyles, sal_Bool bInProgress,
sal_Bool bPrvChrIsSpc )
{
sal_Bool bPrevCharIsSpace = bPrvChrIsSpc;
@@ -1661,7 +1666,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
if( xContentEnum.is() )
exportTextContentEnumeration( xContentEnum,
bAutoStyles,
- xSection, bProgress, sal_True,
+ xSection, bInProgress, sal_True,
&xPropSet );
bPrevCharIsSpace = sal_False;
@@ -1670,7 +1675,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
{
exportTextFootnote(xPropSet,
xTxtRange->getString(),
- bAutoStyles, bProgress );
+ bAutoStyles, bInProgress );
bPrevCharIsSpace = sal_False;
}
else if (sType.equals(sBookmark))
@@ -1891,8 +1896,8 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
if( HoriOrientation::NONE == nHoriOrient )
{
sal_Int32 nPos = 0;
- Any aAny = rPropSet->getPropertyValue( sHoriOrientPosition );
- aAny >>= nPos;
+ Any aLclAny = rPropSet->getPropertyValue( sHoriOrientPosition );
+ aLclAny >>= nPos;
GetExport().GetMM100UnitConverter().convertMeasure( sValue, nPos );
GetExport().AddAttribute( XML_NAMESPACE_SVG, XML_X,
sValue.makeStringAndClear() );
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
index 7510d0a..8ce77ff 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
@@ -109,22 +109,22 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
TYPEINIT1( XMLTextStyleContext, XMLPropStyleContext );
-XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
+XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
- sal_Bool bDefaultStyle ) :
- XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles,
- nFamily, bDefaultStyle ),
- bAutoUpdate( sal_False ),
- bHasMasterPageName( sal_False ),
- bHasCombinedCharactersLetter( sal_False ),
- pEventContext( NULL ),
+ SvXMLStylesContext& rStyles, sal_uInt16 nInFamily,
+ sal_Bool bInDefaultStyle ) :
+ XMLPropStyleContext( rInImport, nPrfx, rLName, xAttrList, rStyles,
+ nInFamily, bInDefaultStyle ),
sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
sCategory( RTL_CONSTASCII_USTRINGPARAM( "Category" ) ),
sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) ),
+ sDropCapCharStyleName( RTL_CONSTASCII_USTRINGPARAM( "DropCapCharStyleName" ) ),
sPageDescName( RTL_CONSTASCII_USTRINGPARAM( "PageDescName" ) ),
- sDropCapCharStyleName( RTL_CONSTASCII_USTRINGPARAM( "DropCapCharStyleName" ) )
+ bAutoUpdate( sal_False ),
+ bHasMasterPageName( sal_False ),
+ bHasCombinedCharactersLetter( sal_False ),
+ pEventContext( NULL )
{
}
@@ -133,37 +133,37 @@ XMLTextStyleContext::~XMLTextStyleContext()
}
SvXMLImportContext *XMLTextStyleContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap =
GetStyles()->GetImportPropertyMapper( GetFamily() );
if( xImpPrMap.is() )
- pContext = new XMLTextPropertySetContext( GetImport(), nPrefix,
+ pContext = new XMLTextPropertySetContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
GetProperties(),
xImpPrMap,
sDropCapTextStyleName );
}
- else if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
+ else if ( (XML_NAMESPACE_OFFICE == nInPrefix) &&
IsXMLToken( rLocalName, XML_EVENTS ) )
{
// create and remember events import context
// (for delayed processing of events)
- pEventContext = new XMLEventsImportContext( GetImport(), nPrefix,
+ pEventContext = new XMLEventsImportContext( GetImport(), nInPrefix,
rLocalName);
pEventContext->AddRef();
pContext = pEventContext;
}
if( !pContext )
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = XMLPropStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -172,11 +172,11 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext(
void XMLTextStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
XMLPropStyleContext::CreateAndInsert( bOverwrite );
- Reference < XStyle > xStyle = GetStyle();
- if( !xStyle.is() || !(bOverwrite || IsNew()) )
+ Reference < XStyle > xLclStyle = GetStyle();
+ if( !xLclStyle.is() || !(bOverwrite || IsNew()) )
return;
- Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
+ Reference < XPropertySet > xPropSet( xLclStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
if( xPropSetInfo->hasPropertyByName( sIsAutoUpdate ) )
@@ -189,7 +189,7 @@ void XMLTextStyleContext::CreateAndInsert( sal_Bool bOverwrite )
sal_uInt16 nCategory = ParagraphStyleCategory::TEXT;
if( XML_STYLE_FAMILY_TEXT_PARAGRAPH == GetFamily() &&
- sCategoryVal.getLength() && xStyle->isUserDefined() &&
+ sCategoryVal.getLength() && xLclStyle->isUserDefined() &&
xPropSetInfo->hasPropertyByName( sCategory ) &&
SvXMLUnitConverter::convertEnum( nCategory, sCategoryVal, aCategoryMap ) )
{
@@ -202,7 +202,7 @@ void XMLTextStyleContext::CreateAndInsert( sal_Bool bOverwrite )
if (NULL != pEventContext)
{
// set event suppplier and release reference to context
- Reference<document::XEventsSupplier> xEventsSupplier(xStyle,UNO_QUERY);
+ Reference<document::XEventsSupplier> xEventsSupplier(xLclStyle,UNO_QUERY);
pEventContext->SetEvents(xEventsSupplier);
pEventContext->ReleaseRef();
}
@@ -228,13 +228,13 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite )
{
XMLPropStyleContext::Finish( bOverwrite );
- Reference < XStyle > xStyle = GetStyle();
+ Reference < XStyle > xLclStyle = GetStyle();
if( !(sListStyleName.getLength() || sDropCapTextStyleName.getLength() ||
bHasMasterPageName) ||
- !xStyle.is() || !(bOverwrite || IsNew()) )
+ !xLclStyle.is() || !(bOverwrite || IsNew()) )
return;
- Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
+ Reference < XPropertySet > xPropSet( xLclStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx
index 4bc97f1..67eda40 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx
@@ -101,19 +101,23 @@ using rtl::OUStringBuffer;
TYPEINIT1( XMLVarFieldImportContext, XMLTextFieldImportContext );
XMLVarFieldImportContext::XMLVarFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
const sal_Char* pServiceName, sal_uInt16 nPrfx,
const OUString& rLocalName,
sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault,
- sal_Bool bDescription, sal_Bool bVisible, sal_Bool bDisplayFormula,
+ sal_Bool bDescription, sal_Bool bVisible, sal_Bool bIsDisplayFormula,
sal_Bool bType, sal_Bool bStyle, sal_Bool bValue) :
-//STRIP013 ,sal_Bool bPresentation) :
- XMLTextFieldImportContext(rImport, rHlp, pServiceName,
+ XMLTextFieldImportContext(rInImport, rHlp, pServiceName,
nPrfx, rLocalName),
+ sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
+ sPropertyHint(RTL_CONSTASCII_USTRINGPARAM(sAPI_hint)),
+ sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible)),
+ sPropertyIsDisplayFormula(RTL_CONSTASCII_USTRINGPARAM(
+ sAPI_is_show_formula)),
sName(),
sFormula(),
sDescription(),
- aValueHelper(rImport, rHlp, bType, bStyle, bValue, sal_False),
+ aValueHelper(rInImport, rHlp, bType, bStyle, bValue, sal_False),
bDisplayFormula(sal_False),
bDisplayNone(sal_False),
bNameOK(sal_False),
@@ -125,15 +129,7 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
bSetFormulaDefault(bFormulaDefault),
bSetDescription(bDescription),
bSetVisible(bVisible),
- bSetDisplayFormula(bDisplayFormula),
-//STRIP013 bSetPresentation(bPresentation),
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
- sPropertyHint(RTL_CONSTASCII_USTRINGPARAM(sAPI_hint)),
- sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible)),
- sPropertyIsDisplayFormula(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_is_show_formula))
-//STRIP013 ,sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(
-//STRIP013 sAPI_current_presentation))
+ bSetDisplayFormula(bIsDisplayFormula)
{
}
@@ -271,18 +267,17 @@ void XMLVarFieldImportContext::PrepareField(
TYPEINIT1( XMLSetVarFieldImportContext, XMLVarFieldImportContext );
XMLSetVarFieldImportContext::XMLSetVarFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
const sal_Char* pServiceName, sal_uInt16 nPrfx,
const OUString& rLocalName, VarType eVarType,
sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault,
- sal_Bool bDescription, sal_Bool bVisible, sal_Bool bDisplayFormula,
+ sal_Bool bDescription, sal_Bool bVisible, sal_Bool bInDisplayFormula,
sal_Bool bType, sal_Bool bStyle, sal_Bool bValue) :
-//STRIP013 ,sal_Bool bPresentation) :
- XMLVarFieldImportContext(rImport, rHlp, pServiceName,
+ XMLVarFieldImportContext(rInImport, rHlp, pServiceName,
nPrfx, rLocalName,
bName, bFormula, bFormulaDefault,
- bDescription, bVisible, bDisplayFormula,
- bType, bStyle, bValue), //STRIP013, bPresentation),
+ bDescription, bVisible, bInDisplayFormula,
+ bType, bStyle, bValue),
eFieldType(eVarType)
{
}
@@ -355,22 +350,21 @@ sal_Bool XMLSetVarFieldImportContext::FindFieldMaster(
TYPEINIT1( XMLSequenceFieldImportContext, XMLSetVarFieldImportContext );
XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& rLocalName) :
- XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
+ XMLSetVarFieldImportContext(rInImport, rHlp, sAPI_set_expression,
nPrfx, rLocalName, VarTypeSequence,
// name, formula
sal_True, sal_True, sal_True,
sal_False, sal_False, sal_False,
sal_False, sal_False, sal_False),
-//STRIP013 , sal_True),
+ sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format)),
+ sPropertySequenceValue(
+ RTL_CONSTASCII_USTRINGPARAM(sAPI_sequence_value)),
sNumFormat(OUString::valueOf(sal_Unicode('1'))),
sNumFormatSync(GetXMLToken(XML_FALSE)),
sRefName(),
- bRefNameOK(sal_False),
- sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format)),
- sPropertySequenceValue(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_sequence_value))
+ bRefNameOK(sal_False)
{
}
@@ -404,7 +398,7 @@ void XMLSequenceFieldImportContext::PrepareField(
XMLSetVarFieldImportContext::PrepareField(xPropertySet);
// set format
- sal_Int16 nNumType = NumberingType::ARABIC;nNumType;
+ sal_Int16 nNumType = NumberingType::ARABIC;
GetImport().GetMM100UnitConverter().convertNumFormat( nNumType, sNumFormat, sNumFormatSync );
Any aAny;
aAny <<= nNumType;
@@ -414,7 +408,7 @@ void XMLSequenceFieldImportContext::PrepareField(
if (bRefNameOK)
{
aAny = xPropertySet->getPropertyValue(sPropertySequenceValue);
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
aAny >>= nValue;
GetImportHelper().InsertSequenceID(sRefName, GetName(), nValue);
}
@@ -429,9 +423,9 @@ void XMLSequenceFieldImportContext::PrepareField(
TYPEINIT1( XMLVariableSetFieldImportContext, XMLSetVarFieldImportContext );
XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& rLocalName) :
- XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
+ XMLSetVarFieldImportContext(rInImport, rHlp, sAPI_set_expression,
nPrfx, rLocalName, VarTypeSimple,
// name, formula, value&type, style,
// display none
@@ -464,9 +458,9 @@ void XMLVariableSetFieldImportContext::PrepareField(
TYPEINIT1( XMLVariableInputFieldImportContext, XMLSetVarFieldImportContext );
XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& rLocalName) :
- XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
+ XMLSetVarFieldImportContext(rInImport, rHlp, sAPI_set_expression,
nPrfx, rLocalName, VarTypeSimple,
// name, description, display none/formula,
// value&type, style, formula
@@ -505,9 +499,9 @@ void XMLVariableInputFieldImportContext::PrepareField(
TYPEINIT1( XMLUserFieldImportContext, XMLSetVarFieldImportContext );
XMLUserFieldImportContext::XMLUserFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& rLocalName) :
- XMLSetVarFieldImportContext(rImport, rHlp, sAPI_user, nPrfx,
+ XMLSetVarFieldImportContext(rInImport, rHlp, sAPI_user, nPrfx,
rLocalName, VarTypeUserField,
// name, display none/formula, style
sal_True, sal_False, sal_False,
@@ -527,9 +521,9 @@ TYPEINIT1( XMLUserFieldInputImportContext, XMLVarFieldImportContext );
// bug: doesn't work (SO API lacking)
XMLUserFieldInputImportContext::XMLUserFieldInputImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& rLocalName) :
- XMLVarFieldImportContext(rImport, rHlp, sAPI_input_user,
+ XMLVarFieldImportContext(rInImport, rHlp, sAPI_input_user,
nPrfx, rLocalName,
// name, description, style
sal_True, sal_False, sal_False,
@@ -558,9 +552,9 @@ void XMLUserFieldInputImportContext::PrepareField(
TYPEINIT1( XMLVariableGetFieldImportContext, XMLVarFieldImportContext );
XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& rLocalName) :
- XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression,
+ XMLVarFieldImportContext(rInImport, rHlp, sAPI_get_expression,
nPrfx, rLocalName,
// name, style, display formula
sal_True, sal_False, sal_False,
@@ -596,9 +590,9 @@ void XMLVariableGetFieldImportContext::PrepareField(
TYPEINIT1( XMLExpressionFieldImportContext, XMLVarFieldImportContext );
XMLExpressionFieldImportContext::XMLExpressionFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& rLocalName) :
- XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression,
+ XMLVarFieldImportContext(rInImport, rHlp, sAPI_get_expression,
nPrfx, rLocalName,
// formula, type, style, display formula
sal_False, sal_True, sal_True,
@@ -632,9 +626,9 @@ void XMLExpressionFieldImportContext::PrepareField(
TYPEINIT1( XMLTextInputFieldImportContext, XMLVarFieldImportContext );
XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& sLocalName) :
- XMLVarFieldImportContext(rImport, rHlp, sAPI_input,
+ XMLVarFieldImportContext(rInImport, rHlp, sAPI_input,
nPrfx, sLocalName,
// description
sal_False, sal_False, sal_False,
@@ -664,16 +658,14 @@ void XMLTextInputFieldImportContext::PrepareField(
TYPEINIT1( XMLTableFormulaImportContext, XMLTextFieldImportContext );
XMLTableFormulaImportContext::XMLTableFormulaImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
const OUString& rLocalName) :
- XMLTextFieldImportContext(rImport, rHlp, sAPI_table_formula,
+ XMLTextFieldImportContext(rInImport, rHlp, sAPI_table_formula,
nPrfx, rLocalName),
sPropertyIsShowFormula(RTL_CONSTASCII_USTRINGPARAM("IsShowFormula")),
-//STRIP013 sPropertyCurrentPresentation(
-//STRIP013 RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")),
- aValueHelper(rImport, rHlp, sal_False, sal_True, sal_False, sal_True),
+ aValueHelper(rInImport, rHlp, sal_False, sal_True, sal_False, sal_True),
sFormula(),
bIsShowFormula(sal_False)
{
@@ -749,22 +741,22 @@ void XMLTableFormulaImportContext::PrepareField(
TYPEINIT1( XMLVariableDeclsImportContext, SvXMLImportContext );
XMLVariableDeclsImportContext::XMLVariableDeclsImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& rLocalName, enum VarType eVarType) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
- rImportHelper(rHlp),
- eVarDeclsContextType(eVarType)
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
+ eVarDeclsContextType(eVarType),
+ rImportHelper(rHlp)
{
}
SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference<xml::sax::XAttributeList> & xAttrList )
{
enum XMLTokenEnum eElementName;
SvXMLImportContext* pImportContext = NULL;
- if( XML_NAMESPACE_TEXT == nPrefix )
+ if( XML_NAMESPACE_TEXT == nInPrefix )
{
switch (eVarDeclsContextType)
{
@@ -779,19 +771,21 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext(
break;
default:
OSL_FAIL("unknown field type!");
+ eElementName = XML_SEQUENCE_DECL;
+ break;
}
if( IsXMLToken( rLocalName, eElementName ) )
{
pImportContext = new XMLVariableDeclImportContext(
- GetImport(), rImportHelper, nPrefix, rLocalName, xAttrList,
+ GetImport(), rImportHelper, nInPrefix, rLocalName, xAttrList,
eVarDeclsContextType);
}
}
// if no context was created, use default context
if (NULL == pImportContext) {
- pImportContext = SvXMLImportContext::CreateChildContext(nPrefix,
+ pImportContext = SvXMLImportContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
}
@@ -808,21 +802,21 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext(
TYPEINIT1( XMLVariableDeclImportContext, SvXMLImportContext );
XMLVariableDeclImportContext::XMLVariableDeclImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& rLocalName,
const Reference<xml::sax::XAttributeList> & xAttrList,
enum VarType eVarType) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
- nNumLevel(-1), cSeparationChar('.'),
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
// bug?? which properties for userfield/userfieldmaster
- aValueHelper(rImport, rHlp, sal_True, sal_False, sal_True, sal_False),
sPropertyName(RTL_CONSTASCII_USTRINGPARAM(sAPI_name)),
sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)),
sPropertyNumberingLevel(RTL_CONSTASCII_USTRINGPARAM(
sAPI_chapter_numbering_level)),
sPropertyNumberingSeparator(RTL_CONSTASCII_USTRINGPARAM(
sAPI_numbering_separator)),
- sPropertyIsExpression(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_expression))
+ sPropertyIsExpression(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_expression)),
+ aValueHelper(rInImport, rHlp, sal_True, sal_False, sal_True, sal_False),
+ nNumLevel(-1), cSeparationChar('.')
{
if ( (XML_NAMESPACE_TEXT == nPrfx) &&
( ( IsXMLToken( rLocalName, XML_SEQUENCE_DECL )) ||
@@ -836,11 +830,11 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
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 );
sal_uInt16 nToken = rHlp.
- GetTextFieldAttrTokenMap().Get(nPrefix, sLocalName);
+ GetTextFieldAttrTokenMap().Get(nLclPrefix, sLocalName);
switch (nToken)
{
@@ -922,7 +916,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
- Reference<XPropertySet> & xMaster, SvXMLImport& rImport,
+ Reference<XPropertySet> & xMaster, SvXMLImport& rInImport,
XMLTextImportHelper& rImportHelper,
const OUString& sVarName, enum VarType eVarType)
{
@@ -933,7 +927,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
OUString sName = rImportHelper.GetRenameMap().Get(eVarType, sVarName);
// get text fields supplier and field masters
- Reference<XTextFieldsSupplier> xTextFieldsSupp(rImport.GetModel(),
+ Reference<XTextFieldsSupplier> xTextFieldsSupp(rInImport.GetModel(),
UNO_QUERY);
Reference<container::XNameAccess> xFieldMasterNameAccess(
xTextFieldsSupp->getTextFieldMasters(), UNO_QUERY);
@@ -984,7 +978,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
rImportHelper.GetRenameMap().Add(eVarType, sName, sNew);
// call FindFieldMaster recursively to create new master
- return FindFieldMaster(xMaster, rImport, rImportHelper,
+ return FindFieldMaster(xMaster, rInImport, rImportHelper,
sNew, eVarType);
}
} else if (xFieldMasterNameAccess->hasByName(sUserServiceName)) {
@@ -1008,7 +1002,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
rImportHelper.GetRenameMap().Add(eVarType, sName, sNew);
// call FindFieldMaster recursively to create new master
- return FindFieldMaster(xMaster, rImport, rImportHelper,
+ return FindFieldMaster(xMaster, rInImport, rImportHelper,
sNew, eVarType);
}
} else {
@@ -1016,7 +1010,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
// import -> model is MultiServiceFactory -> createInstance
Reference<lang::XMultiServiceFactory>
- xFactory(rImport.GetModel(),UNO_QUERY);
+ xFactory(rInImport.GetModel(),UNO_QUERY);
if( xFactory.is() ) {
OUStringBuffer sService;
@@ -1070,23 +1064,21 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
TYPEINIT1( XMLDatabaseDisplayImportContext, XMLDatabaseFieldImportContext );
XMLDatabaseDisplayImportContext::XMLDatabaseDisplayImportContext(
- SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& rLocalName) :
- XMLDatabaseFieldImportContext(rImport, rHlp, sAPI_database,
+ XMLDatabaseFieldImportContext(rInImport, rHlp, sAPI_database,
nPrfx, rLocalName, false),
- aValueHelper(rImport, rHlp, sal_False, sal_True, sal_False, sal_False),
- sColumnName(),
- bColumnOK(sal_False),
sPropertyColumnName(
RTL_CONSTASCII_USTRINGPARAM(sAPI_data_column_name)),
sPropertyDatabaseFormat(
RTL_CONSTASCII_USTRINGPARAM(sAPI_is_data_base_format)),
-//STRIP013 sPropertyCurrentPresentation(
-//STRIP013 RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
sPropertyIsVisible(
RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible)),
- bDisplayOK( sal_False ),
- bDisplay( sal_True )
+ aValueHelper(rInImport, rHlp, sal_False, sal_True, sal_False, sal_False),
+ sColumnName(),
+ bColumnOK(sal_False),
+ bDisplay( sal_True ),
+ bDisplayOK( sal_False )
{
}
@@ -1169,10 +1161,10 @@ void XMLDatabaseDisplayImportContext::EndElement()
GetImportHelper().InsertTextContent(xTextContent);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list