[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Feb 2 04:09:07 PST 2011
binfilter/bf_basic/source/runtime/makefile.mk | 14
binfilter/bf_xmloff/source/text/xmloff_XMLCalculationSettingsContext.cxx | 16 -
binfilter/bf_xmloff/source/text/xmloff_XMLChangeImportContext.cxx | 10
binfilter/bf_xmloff/source/text/xmloff_XMLStringBufferImportContext.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx | 18 -
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 106 +++---
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx | 44 +-
binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx | 154 +++++-----
9 files changed, 184 insertions(+), 194 deletions(-)
New commits:
commit c611f9e4a6a4b2a33fc388b0dff5e970f8f2c1f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 2 12:06:46 2011 +0000
build-break, fix this makefile
diff --git a/binfilter/bf_basic/source/runtime/makefile.mk b/binfilter/bf_basic/source/runtime/makefile.mk
index 42ac51d..1b8799d 100644
--- a/binfilter/bf_basic/source/runtime/makefile.mk
+++ b/binfilter/bf_basic/source/runtime/makefile.mk
@@ -41,19 +41,7 @@ INC+= -I$(PRJ)$/inc$/bf_basic
# --- Allgemein -----------------------------------------------------------
SLOFILES= \
- $(SLO)$/basrdll.obj \
- $(SLO)$/runtime.obj \
- $(SLO)$/step0.obj \
- $(SLO)$/step1.obj \
- $(SLO)$/step2.obj \
- $(SLO)$/iosys.obj \
- $(SLO)$/stdobj.obj \
- $(SLO)$/stdobj1.obj \
- $(SLO)$/methods.obj \
- $(SLO)$/methods1.obj \
- $(SLO)$/props.obj \
- $(SLO)$/ddectrl.obj \
- $(SLO)$/dllmgr.obj
+ $(SLO)$/basrdll.obj
# --- Targets -------------------------------------------------------------
commit 86939374eb1bcb129a7898da0359aba1ae7c8817
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 2 11:28:56 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLCalculationSettingsContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLCalculationSettingsContext.cxx
index 87005ce..4d5ad08 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLCalculationSettingsContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLCalculationSettingsContext.cxx
@@ -42,26 +42,26 @@ using namespace ::binfilter::xmloff::token;
using rtl::OUString;
-XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList )
- : SvXMLImportContext ( rImport, nPrefix, rLocalName )
+ : SvXMLImportContext ( rInImport, nInPrefix, rLocalName )
, nYear( 1930 )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
{
- if ( IsXMLToken( aLocalName, XML_NULL_YEAR ) )
+ if ( IsXMLToken( aLclLocalName, XML_NULL_YEAR ) )
{
sal_Int32 nTemp;
GetImport().GetMM100UnitConverter().convertNumber(nTemp, sValue);
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLChangeImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLChangeImportContext.cxx
index 176bd44..b0db6d7 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLChangeImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLChangeImportContext.cxx
@@ -49,13 +49,13 @@ using ::binfilter::xmloff::token::XML_CHANGE_ID;
TYPEINIT1( XMLChangeImportContext, SvXMLImportContext );
XMLChangeImportContext::XMLChangeImportContext(
- SvXMLImport& rImport,
- sal_Int16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_Int16 nInPrefix,
const OUString& rLocalName,
sal_Bool bStart,
sal_Bool bEnd,
sal_Bool bOutsideOfParagraph) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
bIsStart(bStart),
bIsEnd(bEnd),
bIsOutsideOfParagraph(bOutsideOfParagraph)
@@ -74,10 +74,10 @@ void XMLChangeImportContext::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_CHANGE_ID ) )
{
// Id found! Now call RedlineImportHelper
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLStringBufferImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLStringBufferImportContext.cxx
index 9615db1..9f1eed6 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLStringBufferImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLStringBufferImportContext.cxx
@@ -45,11 +45,11 @@ using ::binfilter::xmloff::token::XML_P;
TYPEINIT1(XMLStringBufferImportContext, SvXMLImportContext);
XMLStringBufferImportContext::XMLStringBufferImportContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& sLocalName,
OUStringBuffer& rBuffer) :
- SvXMLImportContext(rImport, nPrefix, sLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, sLocalName),
rTextBuffer(rBuffer)
{
}
@@ -59,11 +59,11 @@ XMLStringBufferImportContext::~XMLStringBufferImportContext()
}
SvXMLImportContext *XMLStringBufferImportContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList)
+ const Reference<XAttributeList> & /*xAttrList*/)
{
- return new XMLStringBufferImportContext(GetImport(), nPrefix,
+ return new XMLStringBufferImportContext(GetImport(), nInPrefix,
rLocalName, rTextBuffer);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx
index ebe446d..a2b7444 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx
@@ -46,10 +46,10 @@ using namespace ::binfilter::xmloff::token;
TYPEINIT1( XMLTrackedChangesImportContext, SvXMLImportContext );
XMLTrackedChangesImportContext::XMLTrackedChangesImportContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName) :
- SvXMLImportContext(rImport, nPrefix, rLocalName)
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName)
{
}
@@ -68,10 +68,10 @@ void XMLTrackedChangesImportContext::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_TEXT == nPrefix )
+ if ( XML_NAMESPACE_TEXT == nLclPrefix )
{
if ( IsXMLToken( sLocalName, XML_TRACK_CHANGES ) )
{
@@ -101,22 +101,22 @@ void XMLTrackedChangesImportContext::StartElement(
SvXMLImportContext* XMLTrackedChangesImportContext::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) &&
IsXMLToken( rLocalName, XML_CHANGED_REGION ) )
{
pContext = new XMLChangedRegionImportContext(GetImport(),
- nPrefix, rLocalName);
+ nInPrefix, rLocalName);
}
if (NULL == pContext)
{
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
index 6dbf0e7..7d1951c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
@@ -313,8 +313,8 @@ TYPEINIT1( XMLTextFieldImportContext, SvXMLImportContext);
XMLTextFieldImportContext::XMLTextFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
const sal_Char* pService,
- sal_uInt16 nPrefix, const OUString& rElementName)
- : SvXMLImportContext( rImport, nPrefix, rElementName ),
+ sal_uInt16 nInPrefix, const OUString& rElementName)
+ : SvXMLImportContext( rImport, nInPrefix, rElementName ),
sContentBuffer(),
rTextImportHelper(rHlp),
bValid(sal_False),
@@ -334,11 +334,11 @@ void XMLTextFieldImportContext::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(rTextImportHelper.GetTextFieldAttrTokenMap().
- Get(nPrefix, sLocalName),
+ Get(nLclPrefix, sLocalName),
xAttrList->getValueByIndex(i) );
}
}
@@ -425,7 +425,7 @@ XMLTextFieldImportContext*
XMLTextFieldImportContext::CreateTextFieldImportContext(
SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rName,
sal_uInt16 nToken)
{
@@ -450,109 +450,109 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
case XML_TOK_TEXT_SENDER_STATE_OR_PROVINCE:
pContext =
new XMLSenderFieldImportContext( rImport, rHlp,
- nPrefix, rName, nToken );
+ nInPrefix, rName, nToken );
break;
case XML_TOK_TEXT_AUTHOR_NAME:
case XML_TOK_TEXT_AUTHOR_INITIALS:
pContext =
new XMLAuthorFieldImportContext( rImport, rHlp,
- nPrefix, rName, nToken );
+ nInPrefix, rName, nToken );
break;
case XML_TOK_TEXT_PLACEHOLDER:
pContext =
new XMLPlaceholderFieldImportContext( rImport, rHlp,
- nPrefix, rName);
+ nInPrefix, rName);
break;
case XML_TOK_TEXT_SEQUENCE:
pContext =
new XMLSequenceFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_TEXT_INPUT:
pContext =
new XMLTextInputFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_EXPRESSION:
pContext =
new XMLExpressionFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_VARIABLE_SET:
pContext =
new XMLVariableSetFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_VARIABLE_INPUT:
pContext =
new XMLVariableInputFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_VARIABLE_GET:
pContext =
new XMLVariableGetFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_USER_FIELD_GET:
pContext = new XMLUserFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_USER_FIELD_INPUT:
pContext = new XMLUserFieldInputImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_TIME:
pContext = new XMLTimeFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_PAGE_CONTINUATION_STRING:
pContext = new XMLPageContinuationImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_PAGE_NUMBER:
pContext = new XMLPageNumberImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DATE:
pContext = new XMLDateFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DATABASE_NAME:
pContext = new XMLDatabaseNameImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DATABASE_NEXT:
pContext = new XMLDatabaseNextImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DATABASE_SELECT:
pContext = new XMLDatabaseSelectImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DATABASE_ROW_NUMBER:
pContext = new XMLDatabaseNumberImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DATABASE_DISPLAY:
pContext = new XMLDatabaseDisplayImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_CONDITIONAL_TEXT:
pContext = new XMLConditionalTextImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_HIDDEN_TEXT:
pContext = new XMLHiddenTextImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_HIDDEN_PARAGRAPH:
pContext = new XMLHiddenParagraphImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DOCUMENT_INFORMATION_0: // info fields only for
@@ -564,7 +564,7 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
case XML_TOK_TEXT_DOCUMENT_SUBJECT:
case XML_TOK_TEXT_DOCUMENT_KEYWORDS:
pContext = new XMLSimpleDocInfoImportContext( rImport, rHlp,
- nPrefix, rName,
+ nInPrefix, rName,
nToken, sal_True,
sal_False );
break;
@@ -572,7 +572,7 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
case XML_TOK_TEXT_DOCUMENT_PRINT_AUTHOR:
case XML_TOK_TEXT_DOCUMENT_SAVE_AUTHOR:
pContext = new XMLSimpleDocInfoImportContext( rImport, rHlp,
- nPrefix, rName,
+ nInPrefix, rName,
nToken, sal_False,
sal_True );
break;
@@ -585,35 +585,35 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
case XML_TOK_TEXT_DOCUMENT_SAVE_TIME:
case XML_TOK_TEXT_DOCUMENT_EDIT_DURATION:
pContext = new XMLDateTimeDocInfoImportContext( rImport, rHlp,
- nPrefix, rName,
+ nInPrefix, rName,
nToken );
break;
case XML_TOK_TEXT_DOCUMENT_REVISION:
pContext = new XMLRevisionDocInfoImportContext( rImport, rHlp,
- nPrefix, rName,
+ nInPrefix, rName,
nToken );
break;
case XML_TOK_TEXT_DOCUMENT_USER_DEFINED:
pContext = new XMLUserDocInfoImportContext( rImport, rHlp,
- nPrefix, rName,
+ nInPrefix, rName,
nToken );
break;
case XML_TOK_TEXT_FILENAME:
pContext = new XMLFileNameImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_CHAPTER:
pContext = new XMLChapterImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_TEMPLATENAME:
pContext = new XMLTemplateNameImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_WORD_COUNT:
@@ -624,27 +624,27 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
case XML_TOK_TEXT_OBJECT_COUNT:
case XML_TOK_TEXT_PAGE_COUNT:
pContext = new XMLCountFieldImportContext( rImport, rHlp,
- nPrefix, rName, nToken);
+ nInPrefix, rName, nToken);
break;
case XML_TOK_TEXT_GET_PAGE_VAR:
pContext = new XMLPageVarGetFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_SET_PAGE_VAR:
pContext = new XMLPageVarSetFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_MACRO:
pContext = new XMLMacroFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DDE:
pContext = new XMLDdeFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_REFERENCE_REF:
@@ -654,41 +654,41 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
case XML_TOK_TEXT_SEQUENCE_REF:
pContext = new XMLReferenceFieldImportContext( rImport, rHlp,
nToken,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_SHEET_NAME:
pContext = new XMLSheetNameImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_BIBLIOGRAPHY_MARK:
pContext = new XMLBibliographyFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_ANNOTATION:
pContext = new XMLAnnotationImportContext( rImport, rHlp,
- nPrefix, rName);
+ nInPrefix, rName);
break;
case XML_TOK_TEXT_SCRIPT:
pContext = new XMLScriptImportContext( rImport, rHlp,
- nPrefix, rName);
+ nInPrefix, rName);
break;
case XML_TOK_TEXT_MEASURE:
pContext = new XMLMeasureFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_TABLE_FORMULA:
pContext = new XMLTableFormulaImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
case XML_TOK_TEXT_DROPDOWN:
pContext = new XMLDropDownFieldImportContext( rImport, rHlp,
- nPrefix, rName );
+ nInPrefix, rName );
break;
default:
@@ -2771,24 +2771,24 @@ XMLMacroFieldImportContext::XMLMacroFieldImportContext(
}
SvXMLImportContext* XMLMacroFieldImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if ( (nPrefix == XML_NAMESPACE_OFFICE) &&
+ if ( (nInPrefix == XML_NAMESPACE_OFFICE) &&
IsXMLToken( rLocalName, XML_EVENTS ) )
{
// create events context and remember it!
pContext = new XMLEventsImportContext(
- GetImport(), nPrefix, rLocalName );
+ GetImport(), nInPrefix, rLocalName );
xEventContext = pContext;
bValid = sal_True;
}
else
pContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
+ nInPrefix, rLocalName, xAttrList);
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
index 41bcbe8..4aa8a5c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
@@ -498,9 +498,9 @@ void XMLTextImportPropertyMapper::finished(
if( pVertOrient && pVertOrientRelAsChar )
{
- sal_Int16 nVertOrient;
+ sal_Int16 nVertOrient(0);
pVertOrient->maValue >>= nVertOrient;
- sal_Int16 nVertOrientRel;
+ sal_Int16 nVertOrientRel(0);
pVertOrientRelAsChar->maValue >>= nVertOrientRel;
switch( nVertOrient )
{
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
index 67d5552..c6cf20e 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
@@ -1910,8 +1910,8 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
if( VertOrientation::NONE == nVertOrient )
{
sal_Int32 nPos = 0;
- Any aAny = rPropSet->getPropertyValue( sVertOrientPosition );
- aAny >>= nPos;
+ Any aLclAny = rPropSet->getPropertyValue( sVertOrientPosition );
+ aLclAny >>= nPos;
GetExport().GetMM100UnitConverter().convertMeasure( sValue, nPos );
GetExport().AddAttribute( XML_NAMESPACE_SVG, XML_Y,
sValue.makeStringAndClear() );
@@ -2031,7 +2031,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
const Reference < XTextContent > & rTxtCntnt,
FrameType eType,
sal_Bool bAutoStyles,
- sal_Bool bProgress,
+ sal_Bool bInProgress,
const Reference < XPropertySet > *pRangePropSet)
{
Reference < XPropertySet > xPropSet( rTxtCntnt, UNO_QUERY );
@@ -2054,9 +2054,9 @@ void XMLTextParagraphExport::exportAnyTextFrame(
// frame bound frames
Reference < XTextFrame > xTxtFrame( rTxtCntnt, UNO_QUERY );
Reference < XText > xTxt = xTxtFrame->getText();
- collectFramesBoundToFrameAutoStyles( xTxtFrame, bProgress );
+ collectFramesBoundToFrameAutoStyles( xTxtFrame, bInProgress );
- exportText( xTxt, bAutoStyles, bProgress, sal_True );
+ exportText( xTxt, bAutoStyles, bInProgress, sal_True );
}
break;
case FT_SHAPE:
@@ -2065,6 +2065,8 @@ void XMLTextParagraphExport::exportAnyTextFrame(
GetExport().GetShapeExport()->collectShapeAutoStyles( xShape );
}
break;
+ default:
+ break;
}
}
else
@@ -2095,7 +2097,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
SvXMLElementExport aElem( GetExport(), sStyle.getLength() > 0,
XML_NAMESPACE_TEXT, XML_SPAN, sal_False, sal_False );
{
- SvXMLElementExport aElem( GetExport(),
+ SvXMLElementExport aInnerElem( GetExport(),
FT_SHAPE != eType &&
addHyperlinkAttributes( xPropSet,
xPropState,xPropSetInfo ),
@@ -2103,7 +2105,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
switch( eType )
{
case FT_TEXT:
- _exportTextFrame( xPropSet, xPropSetInfo, bProgress );
+ _exportTextFrame( xPropSet, xPropSetInfo, bInProgress );
break;
case FT_GRAPHIC:
_exportTextGraphic( xPropSet, xPropSetInfo );
@@ -2130,7 +2132,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
void XMLTextParagraphExport::_exportTextFrame(
const Reference < XPropertySet > & rPropSet,
const Reference < XPropertySetInfo > & rPropSetInfo,
- sal_Bool bProgress )
+ sal_Bool bInProgress )
{
Reference < XTextFrame > xTxtFrame( rPropSet, UNO_QUERY );
Reference < XText > xTxt = xTxtFrame->getText();
@@ -2165,7 +2167,7 @@ void XMLTextParagraphExport::_exportTextFrame(
XML_TEXT_BOX, sal_False, sal_True );
// frame bound frames
- exportFramesBoundToFrame( xTxtFrame, bProgress );
+ exportFramesBoundToFrame( xTxtFrame, bInProgress );
// script:events
Reference<XEventsSupplier> xEventsSupp( xTxtFrame, UNO_QUERY );
@@ -2174,7 +2176,7 @@ void XMLTextParagraphExport::_exportTextFrame(
// image map
GetExport().GetImageMapExport().Export( rPropSet );
- exportText( xTxt, sal_False, bProgress, sal_True );
+ exportText( xTxt, sal_False, bInProgress, sal_True );
}
void XMLTextParagraphExport::exportContour(
@@ -2344,7 +2346,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
// svg:transform
aAny = rPropSet->getPropertyValue( sGraphicRotation );
- sal_Int16 nVal;
+ sal_Int16 nVal(0);
aAny >>= nVal;
if( nVal != 0 )
{
@@ -2389,14 +2391,14 @@ void XMLTextParagraphExport::_exportTextGraphic(
}
void XMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
- const Reference < XPropertySet > & rPropSet )
+ const Reference < XPropertySet > & /*rPropSet*/ )
{
DBG_ASSERT( !this, "no API implementation avialable" );
}
void XMLTextParagraphExport::_exportTextEmbedded(
- const Reference < XPropertySet > & rPropSet,
- const Reference < XPropertySetInfo > & rPropSetInfo )
+ const Reference < XPropertySet > & /*rPropSet*/,
+ const Reference < XPropertySetInfo > & /*rPropSetInfo*/ )
{
DBG_ASSERT( !this, "no API implementation avialable" );
}
@@ -2432,8 +2434,8 @@ void XMLTextParagraphExport::exportAlternativeText(
}
void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
- const Reference < XPropertySet >& rPropSet,
- OUString& rStreamName ) const
+ const Reference < XPropertySet >& /*rPropSet*/,
+ OUString& /*rStreamName*/ ) const
{
}
@@ -2587,16 +2589,16 @@ void XMLTextParagraphExport::exportTextRange(
xPropSet, xPropSetInfo ),
xPropSet, sCharStyleNames );
- OUString sText = rTextRange->getString();
+ OUString sLclText = rTextRange->getString();
if( sStyle.getLength() )
GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME,
sStyle );
{
// in a block to make sure it is destroyed before the text:a element
- SvXMLElementExport aElem( GetExport(), sStyle.getLength() > 0,
+ SvXMLElementExport aInnerElem( GetExport(), sStyle.getLength() > 0,
XML_NAMESPACE_TEXT, XML_SPAN, sal_False,
sal_False );
- exportText( sText, rPrevCharIsSpace );
+ exportText( sLclText, rPrevCharIsSpace );
}
}
}
@@ -2862,9 +2864,9 @@ void XMLTextParagraphExport::exportRuby(
else
{
// prepare element names
- OUString sRuby(GetXMLToken(XML_RUBY));
+ OUString sLclRuby(GetXMLToken(XML_RUBY));
OUString sTextRuby(GetExport().GetNamespaceMap().
- GetQNameByKey(XML_NAMESPACE_TEXT, sRuby));
+ GetQNameByKey(XML_NAMESPACE_TEXT, sLclRuby));
OUString sRubyBase(GetXMLToken(XML_RUBY_BASE));
OUString sTextRubyBase(GetExport().GetNamespaceMap().
GetQNameByKey(XML_NAMESPACE_TEXT, sRubyBase));
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
index e29f26c..68a2314 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
@@ -329,10 +329,10 @@ XMLImpCharContext_Impl::XMLImpCharContext_Impl(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLocalName );
- if( XML_NAMESPACE_TEXT == nPrefix &&
+ if( XML_NAMESPACE_TEXT == nLclPrefix &&
IsXMLToken( aLocalName, XML_C ) )
{
sal_Int32 nTmp = xAttrList->getValueByIndex(i).toInt32();
@@ -388,7 +388,7 @@ public:
// Do everything in constructor. Well ...
XMLStartReferenceContext_Impl (
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHnts,
const Reference<xml::sax::XAttributeList> & xAttrList);
@@ -398,11 +398,11 @@ TYPEINIT1( XMLStartReferenceContext_Impl, SvXMLImportContext );
XMLStartReferenceContext_Impl::XMLStartReferenceContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHints,
const Reference<xml::sax::XAttributeList> & xAttrList) :
- SvXMLImportContext(rImport, nPrefix, rLocalName)
+ SvXMLImportContext(rImport, nInPrefix, rLocalName)
{
OUString sName;
@@ -431,7 +431,7 @@ public:
// Do everything in constructor. Well ...
XMLEndReferenceContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHnts,
const Reference<xml::sax::XAttributeList> & xAttrList);
@@ -441,11 +441,11 @@ TYPEINIT1( XMLEndReferenceContext_Impl, SvXMLImportContext );
XMLEndReferenceContext_Impl::XMLEndReferenceContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHints,
const Reference<xml::sax::XAttributeList> & xAttrList) :
- SvXMLImportContext(rImport, nPrefix, rLocalName)
+ SvXMLImportContext(rImport, nInPrefix, rLocalName)
{
OUString sName;
@@ -505,7 +505,7 @@ public:
static SvXMLImportContext *CreateChildContext(
SvXMLImport& rImport,
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken, XMLHints_Impl& rHnts,
sal_Bool& rIgnLeadSpace
@@ -514,7 +514,7 @@ public:
#endif
);
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual void Characters( const OUString& rChars );
@@ -543,7 +543,7 @@ public:
virtual ~XMLImpHyperlinkContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual void Characters( const OUString& rChars );
@@ -575,10 +575,10 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_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_HYPERLINK_HREF:
pHint->SetHRef( GetImport().GetAbsoluteReference( rValue ) );
@@ -621,14 +621,14 @@ XMLImpHyperlinkContext_Impl::~XMLImpHyperlinkContext_Impl()
}
SvXMLImportContext *XMLImpHyperlinkContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
- if ( (nPrefix == XML_NAMESPACE_OFFICE) &&
+ if ( (nInPrefix == XML_NAMESPACE_OFFICE) &&
IsXMLToken(rLocalName, XML_EVENTS) )
{
XMLEventsImportContext* pCtxt = new XMLEventsImportContext(
- GetImport(), nPrefix, rLocalName);
+ GetImport(), nInPrefix, rLocalName);
pHint->SetEventsContext(pCtxt);
return pCtxt;
}
@@ -636,10 +636,10 @@ SvXMLImportContext *XMLImpHyperlinkContext_Impl::CreateChildContext(
{
const SvXMLTokenMap& rTokenMap =
GetImport().GetTextImport()->GetTextPElemTokenMap();
- sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
+ sal_uInt16 nToken = rTokenMap.Get( nInPrefix, rLocalName );
return XMLImpSpanContext_Impl::CreateChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
nToken, rHints, rIgnoreLeadingSpace );
}
}
@@ -672,7 +672,7 @@ public:
virtual ~XMLImpRubyBaseContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual void Characters( const OUString& rChars );
@@ -698,14 +698,14 @@ XMLImpRubyBaseContext_Impl::~XMLImpRubyBaseContext_Impl()
}
SvXMLImportContext *XMLImpRubyBaseContext_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 XMLImpSpanContext_Impl::CreateChildContext( GetImport(), nPrefix,
+ return XMLImpSpanContext_Impl::CreateChildContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
nToken, rHints, rIgnoreLeadingSpace );
}
@@ -755,10 +755,10 @@ XMLImpRubyTextContext_Impl::XMLImpRubyTextContext_Impl(
const OUString& rValue = xAttrList->getValueByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLocalName );
- if( XML_NAMESPACE_TEXT == nPrefix &&
+ if( XML_NAMESPACE_TEXT == nLclPrefix &&
IsXMLToken( aLocalName, XML_STYLE_NAME ) )
{
pHint->SetTextStyleName( rValue );
@@ -800,7 +800,7 @@ public:
virtual ~XMLImpRubyContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
};
@@ -826,10 +826,10 @@ XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
const OUString& rValue = xAttrList->getValueByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLocalName );
- if( XML_NAMESPACE_TEXT == nPrefix &&
+ if( XML_NAMESPACE_TEXT == nLclPrefix &&
IsXMLToken( aLocalName, XML_STYLE_NAME ) )
{
pHint->SetStyleName( rValue );
@@ -847,20 +847,20 @@ XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl()
}
SvXMLImportContext *XMLImpRubyContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext;
- if( XML_NAMESPACE_TEXT == nPrefix )
+ if( XML_NAMESPACE_TEXT == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_RUBY_BASE ) )
- pContext = new XMLImpRubyBaseContext_Impl( GetImport(), nPrefix,
+ pContext = new XMLImpRubyBaseContext_Impl( GetImport(), nInPrefix,
rLocalName,
xAttrList,
rHints,
rIgnoreLeadingSpace );
else if( IsXMLToken( rLocalName, XML_RUBY_TEXT ) )
- pContext = new XMLImpRubyTextContext_Impl( GetImport(), nPrefix,
+ pContext = new XMLImpRubyTextContext_Impl( GetImport(), nInPrefix,
rLocalName,
xAttrList,
pHint );
@@ -869,7 +869,7 @@ SvXMLImportContext *XMLImpRubyContext_Impl::CreateChildContext(
}
else
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = SvXMLImportContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -898,7 +898,7 @@ public:
XMLIndexMarkImportContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
XMLHints_Impl& rHnts);
@@ -936,11 +936,11 @@ TYPEINIT1( XMLIndexMarkImportContext_Impl, SvXMLImportContext );
XMLIndexMarkImportContext_Impl::XMLIndexMarkImportContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens eTok,
XMLHints_Impl& rHnts) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rImport, nInPrefix, rLocalName),
rHints(rHnts),
eToken(eTok),
sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")),
@@ -1042,10 +1042,10 @@ void XMLIndexMarkImportContext_Impl::ProcessAttributes(
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(nPrefix, sLocalName,
+ ProcessAttribute(nLclPrefix, sLocalName,
xAttrList->getValueByIndex(i),
rPropSet);
}
@@ -1182,7 +1182,7 @@ public:
XMLTOCMarkImportContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
XMLHints_Impl& rHnts);
@@ -1200,9 +1200,9 @@ TYPEINIT1( XMLTOCMarkImportContext_Impl, XMLIndexMarkImportContext_Impl );
XMLTOCMarkImportContext_Impl::XMLTOCMarkImportContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
+ SvXMLImport& rImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
- XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName,
+ XMLIndexMarkImportContext_Impl(rImport, nInPrefix, rLocalName,
nTok, rHnts),
sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
{
@@ -1249,7 +1249,7 @@ public:
XMLUserIndexMarkImportContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
XMLHints_Impl& rHnts);
@@ -1266,9 +1266,9 @@ protected:
TYPEINIT1( XMLUserIndexMarkImportContext_Impl, XMLIndexMarkImportContext_Impl);
XMLUserIndexMarkImportContext_Impl::XMLUserIndexMarkImportContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
+ SvXMLImport& rImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
- XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName,
+ XMLIndexMarkImportContext_Impl(rImport, nInPrefix, rLocalName,
nTok, rHnts),
sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName")),
sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
@@ -1331,7 +1331,7 @@ public:
XMLAlphaIndexMarkImportContext_Impl(
SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
XMLHints_Impl& rHnts);
@@ -1349,9 +1349,9 @@ TYPEINIT1( XMLAlphaIndexMarkImportContext_Impl,
XMLIndexMarkImportContext_Impl );
XMLAlphaIndexMarkImportContext_Impl::XMLAlphaIndexMarkImportContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
+ SvXMLImport& rImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
- XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName,
+ XMLIndexMarkImportContext_Impl(rImport, nInPrefix, rLocalName,
nTok, rHnts),
sPrimaryKey(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")),
sSecondaryKey(RTL_CONSTASCII_USTRINGPARAM("SecondaryKey")),
@@ -1455,10 +1455,10 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLocalName );
- if( XML_NAMESPACE_TEXT == nPrefix &&
+ if( XML_NAMESPACE_TEXT == nLclPrefix &&
IsXMLToken( aLocalName, XML_STYLE_NAME ) )
aStyleName = xAttrList->getValueByIndex( i );
}
@@ -1480,7 +1480,7 @@ XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl()
SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
SvXMLImport& rImport,
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken,
XMLHints_Impl& rHints,
@@ -1498,7 +1498,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
switch( nToken )
{
case XML_TOK_TEXT_SPAN:
- pContext = new XMLImpSpanContext_Impl( rImport, nPrefix,
+ pContext = new XMLImpSpanContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
rHints,
rIgnoreLeadingSpace
@@ -1509,21 +1509,21 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
break;
case XML_TOK_TEXT_TAB_STOP:
- pContext = new XMLImpCharContext_Impl( rImport, nPrefix,
+ pContext = new XMLImpCharContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
0x0009, sal_False );
rIgnoreLeadingSpace = sal_False;
break;
case XML_TOK_TEXT_LINE_BREAK:
- pContext = new XMLImpCharContext_Impl( rImport, nPrefix,
+ pContext = new XMLImpCharContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
ControlCharacter::LINE_BREAK );
rIgnoreLeadingSpace = sal_False;
break;
case XML_TOK_TEXT_S:
- pContext = new XMLImpCharContext_Impl( rImport, nPrefix,
+ pContext = new XMLImpCharContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
0x0020, sal_True );
break;
@@ -1542,7 +1542,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
if (xPropSet->getPropertySetInfo()->hasPropertyByName(sHyperLinkURL))
{
- pContext = new XMLImpHyperlinkContext_Impl( rImport, nPrefix,
+ pContext = new XMLImpHyperlinkContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
rHints,
rIgnoreLeadingSpace );
@@ -1551,7 +1551,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
{
pContext = new XMLUrlFieldImportContext( rImport,
*rImport.GetTextImport().get(),
- nPrefix, rLocalName);
+ nInPrefix, rLocalName);
//whitespace handling like other fields
rIgnoreLeadingSpace = sal_False;
@@ -1560,7 +1560,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
}
case XML_TOK_TEXT_RUBY:
- pContext = new XMLImpRubyContext_Impl( rImport, nPrefix,
+ pContext = new XMLImpRubyContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
rHints,
rIgnoreLeadingSpace );
@@ -1572,18 +1572,18 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
if (rImport.GetTextImport()->IsInFrame())
{
// we must not insert footnotes into text frames
- pContext = new SvXMLImportContext( rImport, nPrefix,
+ pContext = new SvXMLImportContext( rImport, nInPrefix,
rLocalName );
}
else
{
pContext = new XMLFootnoteImportContext( rImport,
*rImport.GetTextImport().get(),
- nPrefix, rLocalName );
+ nInPrefix, rLocalName );
}
#else
// create default context to skip content
- pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( rImport, nInPrefix, rLocalName );
#endif // #ifndef SVX_LIGHT
rIgnoreLeadingSpace = sal_False;
break;
@@ -1594,18 +1594,18 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXT_BOOKMARK_END:
pContext = new XMLTextMarkImportContext( rImport,
*rImport.GetTextImport().get(),
- nPrefix, rLocalName );
+ nInPrefix, rLocalName );
break;
case XML_TOK_TEXT_REFERENCE_START:
pContext = new XMLStartReferenceContext_Impl( rImport,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
rHints, xAttrList );
break;
case XML_TOK_TEXT_REFERENCE_END:
pContext = new XMLEndReferenceContext_Impl( rImport,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
rHints, xAttrList );
break;
@@ -1647,7 +1647,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
XMLTextFrameHint_Impl *pHint =
new XMLTextFrameHint_Impl( xAnchorPos );
XMLTextFrameHyperlinkContext *pLinkContext =
- new XMLTextFrameHyperlinkContext( rImport, nPrefix,
+ new XMLTextFrameHyperlinkContext( rImport, nInPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
&pHint->GetTextContentRef(),
@@ -1660,21 +1660,21 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXT_TOC_MARK:
case XML_TOK_TEXT_TOC_MARK_START:
pContext = new XMLTOCMarkImportContext_Impl(
- rImport, nPrefix, rLocalName,
+ rImport, 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, nPrefix, rLocalName,
+ rImport, 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, nPrefix, rLocalName,
+ rImport, nInPrefix, rLocalName,
(enum XMLTextPElemTokens)nToken, rHints);
break;
@@ -1682,7 +1682,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, nPrefix, rLocalName, (enum XMLTextPElemTokens)nToken,
+ rImport, nInPrefix, rLocalName, (enum XMLTextPElemTokens)nToken,
rHints);
break;
@@ -1690,7 +1690,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXTP_CHANGE_END:
case XML_TOK_TEXTP_CHANGE:
pContext = new XMLChangeImportContext(
- rImport, nPrefix, rLocalName,
+ rImport, nInPrefix, rLocalName,
(nToken != XML_TOK_TEXTP_CHANGE_END),
(nToken != XML_TOK_TEXTP_CHANGE_START),
sal_False);
@@ -1700,23 +1700,23 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
// none of the above? then it's probably a text field!
pContext =
XMLTextFieldImportContext::CreateTextFieldImportContext(
- rImport, *rImport.GetTextImport().get(), nPrefix, rLocalName,
+ rImport, *rImport.GetTextImport().get(), nInPrefix, rLocalName,
nToken);
// #108784# import draw elements (except control shapes in headers)
if( pContext == NULL &&
!( rImport.GetTextImport()->IsInHeaderFooter() &&
- nPrefix == XML_NAMESPACE_DRAW &&
+ nInPrefix == XML_NAMESPACE_DRAW &&
IsXMLToken( rLocalName, XML_CONTROL ) ) )
{
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
- rImport, nPrefix, rLocalName, xAttrList, xShapes );
+ rImport, nInPrefix, rLocalName, xAttrList, xShapes );
}
if( !pContext )
{
// ignore unknown content
pContext =
- new SvXMLImportContext( rImport, nPrefix, rLocalName );
+ new SvXMLImportContext( rImport, nInPrefix, rLocalName );
}
// Behind fields, shapes and any unknown content blanks aren't ignored
rIgnoreLeadingSpace = sal_False;
@@ -1729,7 +1729,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
Reference < XTextRange > xAnchorPos =
rImport.GetTextImport()->GetCursor()->getStart();
XMLTextFrameContext *pTextFrameContext =
- new XMLTextFrameContext( rImport, nPrefix,
+ new XMLTextFrameContext( rImport, nInPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
nTextFrameType );
@@ -1747,7 +1747,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
{
Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext(
- rImport, nPrefix, rLocalName, xAttrList, xShapes );
+ rImport, nInPrefix, rLocalName, xAttrList, xShapes );
}
rIgnoreLeadingSpace = sal_False;
@@ -1969,16 +1969,16 @@ XMLParaContext::~XMLParaContext()
}
SvXMLImportContext *XMLParaContext::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 );
if( !pHints )
pHints = new XMLHints_Impl;
return XMLImpSpanContext_Impl::CreateChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
nToken, *pHints, bIgnoreLeadingSpace
#ifdef CONV_STAR_FONTS
, nStarFontsConvFlags
More information about the Libreoffice-commits
mailing list