diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-06 12:31:00 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-09-07 06:48:56 +0000 |
commit | 702496391b2b9ef53f83752b34feb3c33d7fb4e9 (patch) | |
tree | b8049cb54a4a0b8724d8bf6b45b9d176511bf9cf /xmlscript | |
parent | ec47e78fee143a3f1705c35300003cb2369013c6 (diff) |
loplugin:constantparam in vcl..xmlscript
Change-Id: Icf66c08071b154259c9e551342d30331caf2b15a
Reviewed-on: https://gerrit.libreoffice.org/28685
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlscript')
-rw-r--r-- | xmlscript/source/xmldlg_imexp/imp_share.hxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 6 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/imp_share.hxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_import.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/imp_share.hxx | 3 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 7 |
8 files changed, 14 insertions, 16 deletions
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 743b5ee239f6..9802f87b195c 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -529,8 +529,8 @@ public: inline WindowElement( OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, - ElementBase * pParent, DialogImport * pImport ) - : ControlElement( rLocalName, xAttributes, pParent, pImport ) + DialogImport * pImport ) + : ControlElement( rLocalName, xAttributes, nullptr, pImport ) {} }; diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 3b53820b090c..8bec171b0478 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1747,7 +1747,7 @@ Reference< xml::input::XElement > DialogImport::startRootElement( // window else if ( rLocalName == "window" ) { - return new WindowElement( rLocalName, xAttributes, nullptr, this ); + return new WindowElement( rLocalName, xAttributes, this ); } else { diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 7ef444abaeae..316b3a0d4007 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -144,9 +144,9 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const BasicLibrariesElement::BasicLibrariesElement( const OUString& rLocalName, const Reference< xml::input::XAttributes >& xAttributes, - BasicElementBase* pParent, BasicImport* pImport, + BasicImport* pImport, const Reference< script::XLibraryContainer2 >& rxLibContainer ) - :BasicElementBase( rLocalName, xAttributes, pParent, pImport ) + :BasicElementBase( rLocalName, xAttributes, nullptr, pImport ) ,m_xLibContainer( rxLibContainer ) { } @@ -478,7 +478,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x if ( xLibContainer.is() ) { - xElement.set( new BasicLibrariesElement( rLocalName, xAttributes, nullptr, this, xLibContainer ) ); + xElement.set( new BasicLibrariesElement( rLocalName, xAttributes, this, xLibContainer ) ); } } else diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index 41219d7fb4c0..d4f12c784266 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -94,7 +94,7 @@ namespace xmlscript public: BasicLibrariesElement( const OUString& rLocalName, const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, - BasicElementBase* pParent, BasicImport* pImport, + BasicImport* pImport, const css::uno::Reference< css::script::XLibraryContainer2 >& rxLibContainer ); // XElement diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index bf69df696386..ec02ffe9278a 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -212,8 +212,8 @@ public: LibrariesElement( OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, - LibElementBase * pParent, LibraryImport * pImport ) - : LibElementBase( rLocalName, xAttributes, pParent, pImport ) + LibraryImport * pImport ) + : LibElementBase( rLocalName, xAttributes, nullptr, pImport ) {} }; diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index c81edf6f36c0..4dfe36501aef 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -138,7 +138,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement( } else if ( mpLibArray && rLocalName == "libraries" ) { - return new LibrariesElement( rLocalName, xAttributes, nullptr, this ); + return new LibrariesElement( rLocalName, xAttributes, this ); } else if ( mpLibDesc && rLocalName == "library" ) { diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx index 6a1bede592fb..969a56d6d609 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -87,7 +87,6 @@ class ModuleElement { protected: rtl::Reference<ModuleImport> mxImport; - rtl::Reference<ModuleElement> mxParent; OUString _aLocalName; css::uno::Reference< css::xml::input::XAttributes > _xAttributes; @@ -97,7 +96,7 @@ public: ModuleElement( OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, - ModuleElement * pParent, ModuleImport * pImport ); + ModuleImport * pImport ); virtual ~ModuleElement(); // XElement diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index e9f9869ef6cf..cb562815d7c4 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -33,7 +33,7 @@ namespace xmlscript Reference< xml::input::XElement > ModuleElement::getParent() throw (RuntimeException, std::exception) { - return mxParent.get(); + return nullptr; } OUString ModuleElement::getLocalName() throw (RuntimeException, std::exception) @@ -87,9 +87,8 @@ Reference< xml::input::XElement > ModuleElement::startChildElement( ModuleElement::ModuleElement( OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, - ModuleElement * pParent, ModuleImport * pImport ) + ModuleImport * pImport ) : mxImport( pImport ) - , mxParent( pParent ) , _aLocalName( rLocalName ) , _xAttributes( xAttributes ) { @@ -145,7 +144,7 @@ Reference< xml::input::XElement > ModuleImport::startRootElement( mrModuleDesc.aLanguage = xAttributes->getValueByUidName( XMLNS_SCRIPT_UID, "language" ); mrModuleDesc.aModuleType = xAttributes->getValueByUidName( XMLNS_SCRIPT_UID, "moduleType" ); - return new ModuleElement( rLocalName, xAttributes, nullptr, this ); + return new ModuleElement( rLocalName, xAttributes, this ); } else { |