[Libreoffice-commits] .: binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 27 13:02:47 PST 2011
binfilter/bf_xmloff/source/script/makefile.mk | 2
binfilter/bf_xmloff/source/script/xmloff_XMLEventExport.cxx | 4
binfilter/bf_xmloff/source/script/xmloff_XMLEventsImportContext.cxx | 18 +--
binfilter/bf_xmloff/source/script/xmloff_XMLScriptContextFactory.cxx | 10 -
binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicContextFactory.cxx | 6 -
binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicExportHandler.cxx | 6 -
binfilter/bf_xmloff/source/script/xmloff_xmlbasici.cxx | 22 +--
binfilter/bf_xmloff/source/script/xmloff_xmlscripti.cxx | 60 +++++-----
8 files changed, 63 insertions(+), 65 deletions(-)
New commits:
commit 1aed9ea490b3e760e81d18484a46ab886a3286cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 21:02:42 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_xmloff/source/script/makefile.mk b/binfilter/bf_xmloff/source/script/makefile.mk
index df548fa..f8afe1b 100644
--- a/binfilter/bf_xmloff/source/script/makefile.mk
+++ b/binfilter/bf_xmloff/source/script/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
PRJNAME=binfilter
diff --git a/binfilter/bf_xmloff/source/script/xmloff_XMLEventExport.cxx b/binfilter/bf_xmloff/source/script/xmloff_XMLEventExport.cxx
index f859712..79727bc 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_XMLEventExport.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_XMLEventExport.cxx
@@ -56,8 +56,8 @@ using ::binfilter::xmloff::token::XML_EVENTS;
XMLEventExport::XMLEventExport(SvXMLExport& rExp,
const XMLEventNameTranslation* pTranslationTable) :
- rExport(rExp),
- sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType"))
+ sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
+ rExport(rExp)
{
AddTranslationTable(pTranslationTable);
}
diff --git a/binfilter/bf_xmloff/source/script/xmloff_XMLEventsImportContext.cxx b/binfilter/bf_xmloff/source/script/xmloff_XMLEventsImportContext.cxx
index 553b720..47aff9c 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_XMLEventsImportContext.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_XMLEventsImportContext.cxx
@@ -57,20 +57,20 @@ TYPEINIT1(XMLEventsImportContext, SvXMLImportContext);
XMLEventsImportContext::XMLEventsImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName) :
- SvXMLImportContext(rImport, nPrfx, rLocalName)
+ SvXMLImportContext(rInImport, nPrfx, rLocalName)
{
}
XMLEventsImportContext::XMLEventsImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const Reference<XEventsSupplier> & xEventsSupplier) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
+ SvXMLImportContext(rInImport, nPrfx, rLocalName),
xEvents(xEventsSupplier->getEvents())
{
}
@@ -93,7 +93,7 @@ XMLEventsImportContext::~XMLEventsImportContext()
void XMLEventsImportContext::StartElement(
- const Reference<XAttributeList> & xAttrList)
+ const Reference<XAttributeList> & /*xAttrList*/)
{
// nothing to be done
}
@@ -104,7 +104,7 @@ void XMLEventsImportContext::EndElement()
}
SvXMLImportContext* XMLEventsImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
@@ -121,10 +121,10 @@ SvXMLImportContext* XMLEventsImportContext::CreateChildContext(
for (sal_Int16 nAttr = 0; nAttr < nCount; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr), &sLocalName );
- if (XML_NAMESPACE_SCRIPT == nPrefix)
+ if (XML_NAMESPACE_SCRIPT == nLclPrefix)
{
if (IsXMLToken(sLocalName, XML_EVENT_NAME))
{
@@ -141,7 +141,7 @@ SvXMLImportContext* XMLEventsImportContext::CreateChildContext(
// b) delegate to factory
return GetImport().GetEventImport().CreateContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
this, sEventName, sLanguage);
}
diff --git a/binfilter/bf_xmloff/source/script/xmloff_XMLScriptContextFactory.cxx b/binfilter/bf_xmloff/source/script/xmloff_XMLScriptContextFactory.cxx
index 332897d..c454eb8 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_XMLScriptContextFactory.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_XMLScriptContextFactory.cxx
@@ -51,8 +51,8 @@ using ::com::sun::star::uno::Any;
XMLScriptContextFactory::XMLScriptContextFactory() :
sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
- sURL(RTL_CONSTASCII_USTRINGPARAM("Script")),
- sScript(RTL_CONSTASCII_USTRINGPARAM("Script"))
+ sScript(RTL_CONSTASCII_USTRINGPARAM("Script")),
+ sURL(RTL_CONSTASCII_USTRINGPARAM("Script"))
{
}
@@ -67,7 +67,7 @@ SvXMLImportContext * XMLScriptContextFactory::CreateContext
const Reference<XAttributeList> & xAttrList,
XMLEventsImportContext * rEvents,
const OUString & rApiEventName,
- const OUString & rLanguage)
+ const OUString & /*rLanguage*/)
{
OUString sURLVal;
@@ -75,10 +75,10 @@ SvXMLImportContext * XMLScriptContextFactory::CreateContext
for (sal_Int16 nAttr = 0; nAttr < nCount; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().
+ sal_uInt16 nLclPrefix = rImport.GetNamespaceMap().
GetKeyByAttrName(xAttrList->getNameByIndex(nAttr), &sLocalName);
- if (XML_NAMESPACE_XLINK == nPrefix)
+ if (XML_NAMESPACE_XLINK == nLclPrefix)
{
if (IsXMLToken(sLocalName, XML_HREF))
sURLVal = xAttrList->getValueByIndex(nAttr);
diff --git a/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicContextFactory.cxx b/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicContextFactory.cxx
index e5f5e28..c288b4e 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicContextFactory.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicContextFactory.cxx
@@ -69,7 +69,7 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
const Reference<XAttributeList> & xAttrList,
XMLEventsImportContext* rEvents,
const OUString& rApiEventName,
- const OUString& rLanguage)
+ const OUString& /*rLanguage*/)
{
OUString sLibraryVal;
OUString sMacroNameVal;
@@ -78,10 +78,10 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
for(sal_Int16 nAttr = 0; nAttr < nCount; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().
+ sal_uInt16 nLclPrefix = rImport.GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr), &sLocalName );
- if (XML_NAMESPACE_SCRIPT == nPrefix)
+ if (XML_NAMESPACE_SCRIPT == nLclPrefix)
{
if (IsXMLToken(sLocalName, XML_LIBRARY))
{
diff --git a/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicExportHandler.cxx b/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicExportHandler.cxx
index 1e98b02..3240ef5 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicExportHandler.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_XMLStarBasicExportHandler.cxx
@@ -46,10 +46,10 @@ using ::com::sun::star::beans::PropertyValue;
XMLStarBasicExportHandler::XMLStarBasicExportHandler() :
sStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic")),
- sStarOffice(RTL_CONSTASCII_USTRINGPARAM("StarOffice")),
- sApplication(RTL_CONSTASCII_USTRINGPARAM("application")),
sLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")),
- sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName"))
+ sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")),
+ sStarOffice(RTL_CONSTASCII_USTRINGPARAM("StarOffice")),
+ sApplication(RTL_CONSTASCII_USTRINGPARAM("application"))
{
}
diff --git a/binfilter/bf_xmloff/source/script/xmloff_xmlbasici.cxx b/binfilter/bf_xmloff/source/script/xmloff_xmlbasici.cxx
index 336c922..4ef0e81 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_xmlbasici.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_xmlbasici.cxx
@@ -45,9 +45,9 @@ namespace binfilter
// XMLBasicImportContext
// =============================================================================
- XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+ XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
const Reference< frame::XModel >& rxModel )
- :SvXMLImportContext( rImport, nPrfx, rLName )
+ :SvXMLImportContext( rInImport, nPrfx, rLName )
,m_xModel( rxModel )
{
Reference< lang::XMultiServiceFactory > xMSF = GetImport().getServiceFactory();
@@ -78,16 +78,16 @@ namespace binfilter
// -----------------------------------------------------------------------------
SvXMLImportContext* XMLBasicImportContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
- const Reference< xml::sax::XAttributeList >& rxAttrList )
+ USHORT nInPrefix, const ::rtl::OUString& rLocalName,
+ const Reference< xml::sax::XAttributeList >& /*rxAttrList*/ )
{
SvXMLImportContext* pContext = 0;
if ( m_xHandler.is() )
- pContext = new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler );
+ pContext = new XMLBasicImportChildContext( GetImport(), nInPrefix, rLocalName, m_xHandler );
if ( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -145,9 +145,9 @@ namespace binfilter
// XMLBasicImportChildContext
// =============================================================================
- XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+ XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
const Reference< xml::sax::XDocumentHandler >& rxHandler )
- :SvXMLImportContext( rImport, nPrfx, rLName )
+ :SvXMLImportContext( rInImport, nPrfx, rLName )
,m_xHandler( rxHandler )
{
}
@@ -161,10 +161,10 @@ namespace binfilter
// -----------------------------------------------------------------------------
SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
- const Reference< xml::sax::XAttributeList >& xAttrList )
+ USHORT nInPrefix, const ::rtl::OUString& rLocalName,
+ const Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
- return new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler );
+ return new XMLBasicImportChildContext( GetImport(), nInPrefix, rLocalName, m_xHandler );
}
// -----------------------------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/script/xmloff_xmlscripti.cxx b/binfilter/bf_xmloff/source/script/xmloff_xmlscripti.cxx
index 1a797df..e39826f 100644
--- a/binfilter/bf_xmloff/source/script/xmloff_xmlscripti.cxx
+++ b/binfilter/bf_xmloff/source/script/xmloff_xmlscripti.cxx
@@ -67,7 +67,7 @@ private:
OUString msLanguage;
public:
- XMLScriptModuleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ XMLScriptModuleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& aLibName,
const Reference<XAttributeList>& xAttrList,
XMLScriptElementContext& rParentContext,
@@ -75,7 +75,7 @@ public:
virtual ~XMLScriptModuleContext();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLName,
const Reference<XAttributeList>& xAttrList );
virtual void EndElement();
@@ -95,14 +95,14 @@ private:
OUString msLibName;
public:
- XMLScriptElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ XMLScriptElementContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference<XAttributeList>& xAttrList,
XMLScriptContext& rParentContext,
Reference<XStarBasicAccess> xBasicAccess );
virtual ~XMLScriptElementContext();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLName,
const Reference<XAttributeList>& xAttrList );
virtual void EndElement();
@@ -118,25 +118,25 @@ XMLScriptElementContext::~XMLScriptElementContext()
}
-SvXMLImportContext* XMLScriptElementContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContext* XMLScriptElementContext::CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLName,
const Reference<XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if ( XML_NAMESPACE_SCRIPT == nPrefix)
+ if ( XML_NAMESPACE_SCRIPT == nInPrefix)
{
if( IsXMLToken( msLName, XML_LIBRARY_EMBEDDED ) )
{
if( IsXMLToken( rLName, XML_MODULE ) )
{
- pContext = new XMLScriptModuleContext( GetImport(), nPrefix,
+ pContext = new XMLScriptModuleContext( GetImport(), nInPrefix,
rLName, msLibName, xAttrList, *this, mxBasicAccess );
}
//else if( IsXMLToken( rLName, XML_DIALOG ) )
//{
//pContext = new XMLScriptDialogContext( GetImport(),
- //nPrefix, rLName, xAttrList, *this, mxBasicAccess );
+ //nInPrefix, rLName, xAttrList, *this, mxBasicAccess );
//}
}
}
@@ -145,7 +145,7 @@ SvXMLImportContext* XMLScriptElementContext::CreateChildContext( sal_uInt16 nPre
if ( !pContext )
{
// default context to ignore unknown elements
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
}
return pContext;
}
@@ -161,15 +161,15 @@ void XMLScriptElementContext::Characters( const ::rtl::OUString& rChars )
//-------------------------------------------------------------------------
-XMLScriptModuleContext::XMLScriptModuleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLScriptModuleContext::XMLScriptModuleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& aLibName,
const Reference<XAttributeList>& xAttrList,
XMLScriptElementContext& rParentContext,
Reference<XStarBasicAccess> xBasicAccess )
- : SvXMLImportContext( rImport, nPrfx, rLName )
- , msLibName( aLibName )
+ : SvXMLImportContext( rInImport, nPrfx, rLName )
, mrParent( rParentContext )
, mxBasicAccess( xBasicAccess )
+ , msLibName( aLibName )
{
mrParent.AddRef();
@@ -200,11 +200,11 @@ XMLScriptModuleContext::~XMLScriptModuleContext()
mrParent.ReleaseRef();
}
-SvXMLImportContext* XMLScriptModuleContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContext* XMLScriptModuleContext::CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLName,
- const Reference<XAttributeList>& xAttrList )
+ const Reference<XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext* pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext* pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -229,12 +229,12 @@ private:
::rtl::OUString m_aLanguage;
public:
- XMLScriptChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+ XMLScriptChildContext( SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rxModel,
const ::rtl::OUString& rLanguage );
virtual ~XMLScriptChildContext();
- virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ virtual SvXMLImportContext* CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
virtual void EndElement();
@@ -242,9 +242,9 @@ public:
// -----------------------------------------------------------------------------
-XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
const Reference< frame::XModel >& rxModel, const ::rtl::OUString& rLanguage )
- :SvXMLImportContext( rImport, nPrfx, rLName )
+ :SvXMLImportContext( rInImport, nPrfx, rLName )
,m_xModel( rxModel )
,m_aLanguage( rLanguage )
{
@@ -259,18 +259,18 @@ XMLScriptChildContext::~XMLScriptChildContext()
// -----------------------------------------------------------------------------
SvXMLImportContext* XMLScriptChildContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = NULL;
::rtl::OUString aBasic( RTL_CONSTASCII_USTRINGPARAM( "Basic" ) );
- if ( m_aLanguage == aBasic && nPrefix == XML_NAMESPACE_SCRIPT && IsXMLToken( rLocalName, XML_LIBRARIES ) )
- pContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel );
+ if ( m_aLanguage == aBasic && nInPrefix == XML_NAMESPACE_SCRIPT && IsXMLToken( rLocalName, XML_LIBRARIES ) )
+ pContext = new XMLBasicImportContext( GetImport(), nInPrefix, rLocalName, m_xModel );
if ( !pContext )
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ pContext = SvXMLImportContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
return pContext;
}
@@ -285,9 +285,9 @@ void XMLScriptChildContext::EndElement()
// XMLScriptContext: context for <office:script> element
// =============================================================================
-XMLScriptContext::XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+XMLScriptContext::XMLScriptContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference<XModel>& rDocModel )
- :SvXMLImportContext( rImport, nPrfx, rLName )
+ :SvXMLImportContext( rInImport, nPrfx, rLName )
,m_xModel( rDocModel )
{
}
@@ -301,17 +301,17 @@ XMLScriptContext::~XMLScriptContext()
// -----------------------------------------------------------------------------
SvXMLImportContext* XMLScriptContext::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLName,
+ sal_uInt16 nInPrefix, const OUString& rLName,
const Reference<XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if ( nPrefix == XML_NAMESPACE_OFFICE )
+ if ( nInPrefix == XML_NAMESPACE_OFFICE )
{
if ( IsXMLToken( rLName, XML_EVENTS ) )
{
Reference< XEventsSupplier > xSupplier( GetImport().GetModel(), UNO_QUERY );
- pContext = new XMLEventsImportContext( GetImport(), nPrefix, rLName, xSupplier );
+ pContext = new XMLEventsImportContext( GetImport(), nInPrefix, rLName, xSupplier );
}
else if ( IsXMLToken( rLName, XML_SCRIPT_DATA ) )
{
@@ -320,13 +320,13 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext(
if ( xAttrList.is() )
{
::rtl::OUString aLanguage = xAttrList->getValueByName( aAttrName );
- pContext = new XMLScriptChildContext( GetImport(), nPrefix, rLName, m_xModel, aLanguage );
+ pContext = new XMLScriptChildContext( GetImport(), nInPrefix, rLName, m_xModel, aLanguage );
}
}
}
if ( !pContext )
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLName, xAttrList);
+ pContext = SvXMLImportContext::CreateChildContext( nInPrefix, rLName, xAttrList);
return pContext;
}
More information about the Libreoffice-commits
mailing list