From f8da549db16bf932271163480429c65eae1e6a3b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 8 Jun 2015 17:34:14 +0100 Subject: Decompressor rubbish in xmlhelp is luckily unused Change-Id: I0d44ef4df250921d24da0d202de96f60c567ded6 --- xmlhelp/Library_ucpchelp1.mk | 1 - xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 3 +- xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 128 ----------------------- xmlhelp/source/cxxhelp/util/Decompressor.cxx | 35 ------- 4 files changed, 1 insertion(+), 166 deletions(-) delete mode 100644 xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx delete mode 100644 xmlhelp/source/cxxhelp/util/Decompressor.cxx (limited to 'xmlhelp') diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 245d052d506a..6c09e8aca6a3 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\ xmlhelp/source/cxxhelp/provider/services \ xmlhelp/source/cxxhelp/provider/urlparameter \ xmlhelp/source/cxxhelp/qe/DocGenerator \ - xmlhelp/source/cxxhelp/util/Decompressor \ xmlhelp/source/treeview/tvfactory \ xmlhelp/source/treeview/tvread \ )) diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 2221f053a298..a1a6d065eacd 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -22,8 +22,7 @@ #include #include #include -#include - +#include namespace xmlsearch { diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx deleted file mode 100644 index 836dd586c3e0..000000000000 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ /dev/null @@ -1,128 +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_XMLHELP_SOURCE_CXXHELP_INC_UTIL_DECOMPRESSOR_HXX -#define INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_DECOMPRESSOR_HXX - -#include -#include - -namespace xmlsearch { - - namespace util { - - - class Decompressor - { - public: - - Decompressor() - : toRead_( 0 ) - { - } - - virtual ~Decompressor() { } - - virtual sal_Int32 getNextByte() = 0; - - void initReading() - { - toRead_ = 0; - } - - private: - - static const sal_Int32 BitsInByte; - static const sal_Int32 NBits; - - sal_Int32 toRead_; - }; - - - - - class StreamDecompressor - : public Decompressor - { - public: - - StreamDecompressor() {} - - virtual ~StreamDecompressor() { } - - - virtual sal_Int32 getNextByte() SAL_OVERRIDE; - }; - - - - class ByteArrayDecompressor - : public Decompressor - { - public: - - ByteArrayDecompressor( sal_Int32 arrayL,sal_Int8* array,sal_Int32 index ) - { - initReading(array,arrayL,index); - } - - - virtual ~ByteArrayDecompressor() { } - - sal_Int32 bytesRead() - { - return index_ - index0_; - } - - - sal_Int32 getNextByte() throw( xmlsearch::excep::XmlSearchException ) SAL_OVERRIDE - { - if( arrayL_ <= index_ ) - throw xmlsearch::excep::XmlSearchException( - OUString( "ByteArrayDecompressor->getNextByte()" ) ); - return array_[index_++] & 0xFF; - } - - - private: - - sal_Int32 arrayL_; - sal_Int8 *array_; - - sal_Int32 index_,index0_; - - using xmlsearch::util::Decompressor::initReading; - void initReading( sal_Int8* array,sal_Int32 arrayL,sal_Int32 index ) - { - arrayL_ = arrayL; - array_ = array; - index_ = index0_ = index; - Decompressor::initReading(); - } - - }; - - - } - -} - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx deleted file mode 100644 index 78f5ec8e273b..000000000000 --- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx +++ /dev/null @@ -1,35 +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 - -using namespace xmlsearch; -using namespace xmlsearch::util; - -const sal_Int32 Decompressor::BitsInByte = 8; -const sal_Int32 Decompressor::NBits = 32; - -sal_Int32 StreamDecompressor::getNextByte() -{ - sal_Int8 a[4]; - a[0] = a[1] = a[2] = 0; - return -1; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit