diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-16 15:15:10 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 20:40:29 +0200 |
commit | 708eb7472349954de44ad0519b6680e668937d89 (patch) | |
tree | 08a577b08e7d3bc7fd4614fc41763ae8831d1c10 | |
parent | e4745f7c5eb0eca18125b8703ae936ff24037638 (diff) |
sc: drop dead code
dead after a series of removals,
last one commit 4d89865ef2026f40a9a4d66f3e047b77454e6fee
new loplugin:deadclass
Change-Id: I43caada8d846b29f08ffe9501f3dfba52b7b4e88
Reviewed-on: https://gerrit.libreoffice.org/41228
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | sc/Library_scfilt.mk | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/biffcodec.hxx | 62 | ||||
-rw-r--r-- | sc/source/filter/oox/biffcodec.cxx | 58 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/oox/workbooksettings.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/worksheetsettings.cxx | 3 |
6 files changed, 2 insertions, 131 deletions
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index e7d91bff580c..6a02ec91db63 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -163,7 +163,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/oox/addressconverter \ sc/source/filter/oox/autofilterbuffer \ sc/source/filter/oox/autofiltercontext \ - sc/source/filter/oox/biffcodec \ sc/source/filter/oox/biffhelper \ sc/source/filter/oox/chartsheetfragment \ sc/source/filter/oox/commentsbuffer \ diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx deleted file mode 100644 index 6375b52e1e3a..000000000000 --- a/sc/source/filter/inc/biffcodec.hxx +++ /dev/null @@ -1,62 +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_SC_SOURCE_FILTER_INC_BIFFCODEC_HXX -#define INCLUDED_SC_SOURCE_FILTER_INC_BIFFCODEC_HXX - -#include <vector> -#include <comphelper/docpasswordhelper.hxx> -#include <oox/core/binarycodec.hxx> -#include "workbookhelper.hxx" - -namespace oox { -namespace xls { - -const sal_Int64 BIFF_RCF_BLOCKSIZE = 1024; - -/** Base class for BIFF stream decoders. */ -class BiffDecoderBase : public ::comphelper::IDocPasswordVerifier -{ -public: - explicit BiffDecoderBase(); - virtual ~BiffDecoderBase() override; - - /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; - - /** Returns true, if the decoder has been initialized correctly. */ - bool isValid() const { return mbValid; } - -private: - /** Derived classes implement password verification and initialization of - the decoder. */ - virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; - virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) = 0; - -private: - bool mbValid; /// True = decoder is correctly initialized. -}; - -} // namespace xls -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx deleted file mode 100644 index 5c8e421301a3..000000000000 --- a/sc/source/filter/oox/biffcodec.cxx +++ /dev/null @@ -1,58 +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 "biffcodec.hxx" - -#include <osl/thread.h> -#include <oox/helper/attributelist.hxx> -#include <string.h> - -namespace oox { -namespace xls { - -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::uno; - - -BiffDecoderBase::BiffDecoderBase() : - mbValid( false ) -{ -} - -BiffDecoderBase::~BiffDecoderBase() -{ -} - -::comphelper::DocPasswordVerifierResult BiffDecoderBase::verifyPassword( const OUString& rPassword, Sequence< NamedValue >& o_rEncryptionData ) -{ - o_rEncryptionData = implVerifyPassword( rPassword ); - mbValid = o_rEncryptionData.hasElements(); - return mbValid ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword; -} - -::comphelper::DocPasswordVerifierResult BiffDecoderBase::verifyEncryptionData( const Sequence< NamedValue >& rEncryptionData ) -{ - mbValid = implVerifyEncryptionData( rEncryptionData ); - return mbValid ? ::comphelper::DocPasswordVerifierResult::OK : ::comphelper::DocPasswordVerifierResult::WrongPassword; -} - -} // namespace xls -} // namespace oox - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 22b8e471f68a..ff1377778153 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -36,9 +36,7 @@ #include <oox/helper/propertyset.hxx> #include <oox/ole/vbaproject.hxx> #include <oox/token/properties.hxx> -#include <vcl/msgbox.hxx> #include "addressconverter.hxx" -#include "biffcodec.hxx" #include "connectionsbuffer.hxx" #include "defnamesbuffer.hxx" #include "excelchartconverter.hxx" @@ -57,7 +55,6 @@ #include "viewsettings.hxx" #include "workbooksettings.hxx" #include "worksheetbuffer.hxx" -#include "scmod.hxx" #include "docsh.hxx" #include "document.hxx" #include "docuno.hxx" @@ -72,13 +69,9 @@ #include "globstr.hrc" #include "formulabuffer.hxx" -#include <vcl/mapmod.hxx> #include "editutil.hxx" #include <editeng/editstat.hxx> -#include <comphelper/processfactory.hxx> -#include <officecfg/Office/Calc.hxx> - #include <memory> namespace oox { diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index d52ceb4cf8ed..bab9c6f1ca31 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <unotools/mediadescriptor.hxx> +#include <oox/core/binarycodec.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/attributelist.hxx> @@ -31,7 +32,6 @@ #include <oox/core/xmlfilterbase.hxx> #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -#include "biffcodec.hxx" #include "unitconverter.hxx" namespace oox { diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 74c6760a2db5..bb4938407710 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -20,14 +20,13 @@ #include <memory> #include "worksheetsettings.hxx" +#include <oox/core/binarycodec.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/attributelist.hxx> #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -#include "biffcodec.hxx" #include "pagesettings.hxx" -#include "workbooksettings.hxx" #include "tabprotection.hxx" #include "document.hxx" |