diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-01 15:10:56 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-02 06:38:43 +0000 |
commit | 35e68754ec3cff30c5cdb665688a9b13f29dd439 (patch) | |
tree | 90cca99363ad1c0209c6d21fe5a82de2db9d039f | |
parent | 837f171810a95a1d87907dd08d67e969276f0559 (diff) |
loplugin:unusedmethods
Change-Id: I3d6f1300f4fae2af9e580d1d3b2c2c80fa9e9268
Reviewed-on: https://gerrit.libreoffice.org/19075
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r-- | writerfilter/inc/ooxml/OOXMLDocument.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 5 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastHelper.hxx | 18 | ||||
-rw-r--r-- | xmloff/inc/DomExport.hxx | 1 | ||||
-rw-r--r-- | xmloff/source/core/DomExport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.hxx | 15 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport_impl.hxx | 67 | ||||
-rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 1 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/certvalidity.hxx | 30 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/certvalidity.cxx | 86 |
11 files changed, 0 insertions, 240 deletions
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx index a17e517681f2..52b6430a1211 100644 --- a/writerfilter/inc/ooxml/OOXMLDocument.hxx +++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx @@ -258,8 +258,6 @@ public: }; -void ooxmlidsToXML(::std::iostream & out); - std::string fastTokenToId(sal_uInt32 nToken); }} diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 2125b8135cc3..898dacdce600 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -828,10 +828,6 @@ OUString OOXMLFastContextHandler::getTargetForId return mpParserState->getDocument()->getTargetForId(rId); } -void OOXMLFastContextHandler::resolvePropertySetAttrs() -{ -} - void OOXMLFastContextHandler::sendPropertyToParent() { if (mpParent != nullptr) @@ -913,11 +909,6 @@ void OOXMLFastContextHandlerStream::sendProperty(Id nId) } -void OOXMLFastContextHandlerStream::resolvePropertySetAttrs() -{ - mpStream->props(mpPropertySetAttrs); -} - OOXMLPropertySet::Pointer_t OOXMLFastContextHandlerStream::getPropertySet() const { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index a0a6b45b7fe6..6886e4a700b7 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -225,8 +225,6 @@ protected: void startAction(Token_t Element); void endAction(Token_t Element); - virtual void resolvePropertySetAttrs(); - css::uno::Reference< css::uno::XComponentContext > getComponentContext() { return m_xContext;} sal_uInt32 mnInstanceNumber; @@ -262,9 +260,6 @@ public: void handleHyperlink(); -protected: - virtual void resolvePropertySetAttrs() SAL_OVERRIDE; - private: mutable OOXMLPropertySet::Pointer_t mpPropertySetAttrs; }; diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx index 88e5c236f30f..b368916c6a1c 100644 --- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx +++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx @@ -36,15 +36,7 @@ public: (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id nDefine); static void newProperty(OOXMLFastContextHandler * pHandler, - Id nId, - const OUString & rValue); - - static void newProperty(OOXMLFastContextHandler * pHandler, Id nId, sal_Int32 nValue); - - static void attributes - (OOXMLFastContextHandler * pContext, - const css::uno::Reference < css::xml::sax::XFastAttributeList > & Attribs); }; template <class T> @@ -64,16 +56,6 @@ css::uno::Reference<css::xml::sax::XFastContextHandler> OOXMLFastHelper<T>::crea template <class T> void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler, Id nId, - const OUString & rValue) -{ - OOXMLValue::Pointer_t pVal(new T(rValue)); - - pHandler->newProperty(nId, pVal); -} - -template <class T> -void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler, - Id nId, sal_Int32 nVal) { OOXMLValue::Pointer_t pVal(T::Create(nVal)); diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx index 6f88dc3bafb9..c8c9a5d36906 100644 --- a/xmloff/inc/DomExport.hxx +++ b/xmloff/inc/DomExport.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { } } } void exportDom( SvXMLExport&, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>& ); -void exportDom( SvXMLExport&, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& ); #endif diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index ec55a174adc1..450271858d19 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -257,10 +257,4 @@ void exportDom( SvXMLExport& rExport, const Reference<XDocument>& xDocument ) visit( aDomExport, xDocument ); } -void exportDom( SvXMLExport& rExport, const Reference<XNode>& xNode ) -{ - DomExport aDomExport( rExport ); - visit( aDomExport, xNode ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index c74ba87ef0a5..0affa225123d 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -572,17 +572,7 @@ namespace xmloff { } - // SvXMLImportContext overridables - virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void EndElement(); - protected: - // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - createElement(); - // create the child context for the given control type virtual SvXMLImportContext* implCreateControlWrapper( sal_uInt16 _nPrefix, const OUString& _rLocalName) = 0; @@ -605,11 +595,6 @@ namespace xmloff OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); - - protected: - // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - createElement(); }; //= OColumnWrapperImport diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index a9cfc99aa9c2..16783673c19c 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -28,58 +28,6 @@ // no namespace. Same as above: this file is included from elementimport.hxx only, // and this is done inside the namespace -//= OContainerImport -template <class BASE> -inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( - sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) -{ - // maybe it's a sub control - if (_rLocalName == m_sWrapperElementName) - { - if (m_xMeAsContainer.is()) - return implCreateControlWrapper(_nPrefix, _rLocalName); - else - { - OSL_FAIL("OContainerImport::CreateChildContext: don't have an element!"); - return NULL; - } - } - - return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); -} - -template <class BASE> -inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - OContainerImport< BASE >::createElement() -{ - // let the base class create the object - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xReturn = BASE::createElement(); - if (!xReturn.is()) - return xReturn; - - // ensure that the object is a XNameContainer (we strongly need this for inserting child elements) - m_xMeAsContainer = ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >(xReturn, ::com::sun::star::uno::UNO_QUERY); - if (!m_xMeAsContainer.is()) - { - OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!"); - xReturn.clear(); - } - - return xReturn; -} - -template <class BASE> -inline void OContainerImport< BASE >::EndElement() -{ - BASE::EndElement(); - - // now that we have all children, attach the events - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, ::com::sun::star::uno::UNO_QUERY); - if (xIndexContainer.is()) - ODefaultEventAttacherManager::setEvents(xIndexContainer); -} - //= OColumnImport template <class BASE> OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, @@ -91,19 +39,4 @@ OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventA OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!"); } -// OElementImport overridables -template <class BASE> -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > OColumnImport< BASE >::createElement() -{ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xReturn; - // no call to the base class' method. We have to use the grid column factory - if (m_xColumnFactory.is()) - { - // create the column - xReturn = m_xColumnFactory->createColumn(this->m_sServiceName); - OSL_ENSURE(xReturn.is(), "OColumnImport::createElement: the factory returned an invalid object!"); - } - return xReturn; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 5fc4fc13c64d..65b3cfc6582c 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/biginteger \ xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl \ - xmlsecurity/source/xmlsec/certvalidity \ xmlsecurity/source/xmlsec/errorcallback \ xmlsecurity/source/xmlsec/saxhelper \ xmlsecurity/source/xmlsec/serialnumberadapter \ diff --git a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx deleted file mode 100644 index 091165c5c243..000000000000 --- a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTVALIDITY_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTVALIDITY_HXX - -#include <sal/config.h> -#include <rtl/ustring.hxx> - -OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx deleted file mode 100644 index 0bfc432fa973..000000000000 --- a/xmlsecurity/source/xmlsec/certvalidity.cxx +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include <xmlsecurity/certvalidity.hxx> -#include <com/sun/star/security/CertificateValidity.hpp> - -using namespace ::com::sun::star::security ; - -#define VALID_STR "valid certificate" -#define INVALID_STR "invalid certificate" -#define UNTRUSTED_STR "untrusted certificate" -#define TIME_INVALID_STR "expired certificate" -#define NOT_NESTED_TIME_STR "invalid time nesting" -#define REVOKED_STR "revoked certificate" -#define UNKNOWN_REVOKATION_STR "unknown certificate revocation status" -#define SIGNATURE_INVALID_STR "invalid certificate signature" -#define EXTENSION_INVALID_STR "invalid certificate extension" -#define EXTENSION_UNKNOWN_STR "unknown critical certificate extension" -#define ISSUER_UNKNOWN_STR "unknown certificate issuer" -#define ISSUER_UNTRUSTED_STR "untrusted certificate issuer" -#define ISSUER_INVALID_STR "invalid certificate issuer" -#define ROOT_UNKNOWN_STR "unknown root certificate" -#define ROOT_UNTRUSTED_STR "untrusted root certificate" -#define ROOT_INVALID_STR "invalid root certificate" -#define CHAIN_INCOMPLETE_STR "invalid certification path" - -OUString certificateValidityToOUString( ::sal_Int32 certValidity ) { - OUString aValidity ; - - if( certValidity == CertificateValidity::VALID ) { - aValidity = VALID_STR; - } else if( ( certValidity & CertificateValidity::UNTRUSTED ) == CertificateValidity::UNTRUSTED ) { - aValidity = UNTRUSTED_STR; - } else if( ( certValidity & CertificateValidity::TIME_INVALID ) == CertificateValidity::TIME_INVALID ) { - aValidity = TIME_INVALID_STR; - } else if( ( certValidity & CertificateValidity::NOT_TIME_NESTED ) == CertificateValidity::NOT_TIME_NESTED ) { - aValidity = NOT_NESTED_TIME_STR; - } else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) { - aValidity = REVOKED_STR; - } else if( ( certValidity & CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) { - aValidity = UNKNOWN_REVOKATION_STR; - } else if( ( certValidity & CertificateValidity::SIGNATURE_INVALID ) == CertificateValidity::SIGNATURE_INVALID ) { - aValidity = SIGNATURE_INVALID_STR; - } else if( ( certValidity & CertificateValidity::EXTENSION_INVALID ) == CertificateValidity::EXTENSION_INVALID ) { - aValidity = EXTENSION_INVALID_STR; - } else if( ( certValidity & CertificateValidity::EXTENSION_UNKNOWN ) == CertificateValidity::EXTENSION_UNKNOWN ) { - aValidity = EXTENSION_UNKNOWN_STR; - } else if( ( certValidity & CertificateValidity::ISSUER_UNKNOWN ) == CertificateValidity::ISSUER_UNKNOWN ) { - aValidity = ISSUER_UNKNOWN_STR; - } else if( ( certValidity & CertificateValidity::ISSUER_UNTRUSTED ) == CertificateValidity::ISSUER_UNTRUSTED ) { - aValidity = ISSUER_UNTRUSTED_STR; - } else if( ( certValidity & CertificateValidity::ISSUER_INVALID ) == CertificateValidity::ISSUER_INVALID ) { - aValidity = ISSUER_INVALID_STR; - } else if( ( certValidity & CertificateValidity::ROOT_UNKNOWN ) == CertificateValidity::ROOT_UNKNOWN ) { - aValidity = ROOT_UNKNOWN_STR; - } else if( ( certValidity & CertificateValidity::ROOT_UNTRUSTED ) == CertificateValidity::ROOT_UNTRUSTED ) { - aValidity = ROOT_UNTRUSTED_STR; - } else if( ( certValidity & CertificateValidity::ROOT_INVALID ) == CertificateValidity::ROOT_INVALID ) { - aValidity = ROOT_INVALID_STR; - } else if( ( certValidity & CertificateValidity::CHAIN_INCOMPLETE ) == CertificateValidity::CHAIN_INCOMPLETE ) { - aValidity = CHAIN_INCOMPLETE_STR; - } else { - aValidity = INVALID_STR; - } - - return aValidity ; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |