diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-14 21:23:31 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-15 09:01:50 +0200 |
commit | 5ea13cb3b9ec19fe2d88f91585f433c81e6b1f2e (patch) | |
tree | 64a244d5ba57da7d007f50b55e1f76e2c4931245 | |
parent | 3059ede409bd8136be0397f532b644855bb9d07a (diff) |
writerfilter: remove unused WriterFilterDetector
DOCX/DOCM uses com.sun.star.comp.oox.FormatDetector for filter
detection, this one is unused.
Change-Id: I01776d130b0f8f0a75ee39a0cfbf974639c94216
Reviewed-on: https://gerrit.libreoffice.org/38800
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r-- | writerfilter/Library_writerfilter.mk | 1 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilterDetection.cxx | 134 | ||||
-rw-r--r-- | writerfilter/util/writerfilter.component | 4 |
3 files changed, 0 insertions, 139 deletions
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index cd8ea4c06cdd..e6487f4b51e4 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/dmapper/util \ writerfilter/source/filter/RtfFilter \ writerfilter/source/filter/WriterFilter \ - writerfilter/source/filter/WriterFilterDetection \ writerfilter/source/ooxml/Handler \ writerfilter/source/ooxml/OOXMLBinaryObjectReference \ writerfilter/source/ooxml/OOXMLDocumentImpl \ diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx deleted file mode 100644 index 83f6024ebb0d..000000000000 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ /dev/null @@ -1,134 +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 <com/sun/star/document/XExtendedFilterDetection.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/storagehelper.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <sot/storage.hxx> - -using namespace ::com::sun::star; - -/// File format detection service for DOCX. -class WriterFilterDetection : public cppu::WeakImplHelper - < - document::XExtendedFilterDetection, - lang::XServiceInfo - > -{ -public: - explicit WriterFilterDetection(); - - //XExtendedFilterDetection - OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) override; - - // XServiceInfo - OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override; - uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; -}; - -/// @throws uno::RuntimeException -uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames(); - -WriterFilterDetection::WriterFilterDetection() = default; - -OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor) -{ - OUString sTypeName; - bool bWord = false; - sal_Int32 nPropertyCount = rDescriptor.getLength(); - const beans::PropertyValue* pValues = rDescriptor.getConstArray(); - OUString sURL; - uno::Reference<io::XStream> xStream; - uno::Reference<io::XInputStream> xInputStream; - for (sal_Int32 nProperty = 0; nProperty < nPropertyCount; ++nProperty) - { - if (pValues[nProperty].Name == "TypeName") - rDescriptor[nProperty].Value >>= sTypeName; - else if (pValues[nProperty].Name == "URL") - pValues[nProperty].Value >>= sURL; - else if (pValues[nProperty].Name == "Stream") - pValues[nProperty].Value >>= xStream; - else if (pValues[nProperty].Name == "InputStream") - pValues[nProperty].Value >>= xInputStream; - } - try - { - uno::Reference<embed::XStorage> xDocStorage; - if (sURL == "private:stream") - xDocStorage = comphelper::OStorageHelper::GetStorageFromInputStream(xInputStream); - else - xDocStorage = comphelper::OStorageHelper::GetStorageFromURL(sURL, embed::ElementModes::READ); - if (xDocStorage.is()) - { - uno::Sequence<OUString> aNames = xDocStorage->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - for (sal_Int32 nName = 0; nName < aNames.getLength(); ++nName) - { - if (pNames[nName] == "word") - { - bWord = true; - if (sTypeName.isEmpty()) - sTypeName = "writer_MS_Word_2007"; - break; - } - } - } - } - catch (const uno::Exception&) - { - SAL_WARN("writerfilter", "exception while opening storage"); - } - if (!bWord) - sTypeName.clear(); - return sTypeName; -} - -uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames() -{ - uno::Sequence<OUString> aRet = - { - OUString("com.sun.star.document.ExtendedTypeDetection") - }; - return aRet; -} - -OUString WriterFilterDetection::getImplementationName() -{ - return OUString("com.sun.star.comp.Writer.WriterFilterDetector"); -} - -sal_Bool WriterFilterDetection::supportsService(const OUString& rServiceName) -{ - return cppu::supportsService(this, rServiceName); -} - -uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames() -{ - return WriterFilterDetection_getSupportedServiceNames(); -} - -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilterDetector_get_implementation(uno::XComponentContext* /*pComp*/, uno::Sequence<css::uno::Any> const&) -{ - return cppu::acquire(new WriterFilterDetection); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/util/writerfilter.component b/writerfilter/util/writerfilter.component index cc035f2f603f..63e5931e850e 100644 --- a/writerfilter/util/writerfilter.component +++ b/writerfilter/util/writerfilter.component @@ -24,10 +24,6 @@ <service name="com.sun.star.document.ExportFilter"/> <service name="com.sun.star.document.ImportFilter"/> </implementation> - <implementation name="com.sun.star.comp.Writer.WriterFilterDetector" - constructor="com_sun_star_comp_Writer_WriterFilterDetector_get_implementation"> - <service name="com.sun.star.document.ExtendedTypeDetection"/> - </implementation> <implementation name="com.sun.star.comp.Writer.RtfFilter" constructor="com_sun_star_comp_Writer_RtfFilter_get_implementation"> <service name="com.sun.star.document.ImportFilter"/> |