sc/Library_sc.mk | 1 sc/inc/filtopt.hxx | 42 ---------------------- sc/source/core/tool/filtopt.cxx | 74 --------------------------------------- sc/source/filter/lotus/lotus.cxx | 4 +- solenv/clang-format/excludelist | 2 - 5 files changed, 2 insertions(+), 121 deletions(-)
New commits: commit 08a5c48853b0b8dab3c43efcdb7457f2661fa657 Author: Gabor Kelemen <[email protected]> AuthorDate: Fri Jan 30 18:12:24 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Sat Jan 31 11:06:15 2026 +0100 sc: Remove ScFilterOptions class - replace its last config key use with officecfg call - other keys MS_Excel/ColScale and MS_Excel/RowScale seem to be unused, related code was removed in 2017: commit 98c4cd372bf0e9d4b5b129405f5af4562d8a0f64 loplugin:unusedfields improve write-only analysis and 2015: commit 96d44c9b077a6cc8068067a795dc63248ab90fea loplugin:unusedmethods sc Change-Id: I36c8c6e2a99599ad15d722b096fa90718bdc9abc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198440 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 05800e33aba0..e46cbfe00b57 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -247,7 +247,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/doubleref \ sc/source/core/tool/editdataarray \ sc/source/core/tool/editutil \ - sc/source/core/tool/filtopt \ sc/source/core/tool/formulagroup \ sc/source/core/tool/formulaopt \ sc/source/core/tool/formulaparserpool \ diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx deleted file mode 100644 index 50dfdfbbf373..000000000000 --- a/sc/inc/filtopt.hxx +++ /dev/null @@ -1,42 +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 . - */ - -#pragma once - -#include <unotools/configitem.hxx> -#include "scdllapi.h" - -// filter options - -class SC_DLLPUBLIC ScFilterOptions final : public utl::ConfigItem -{ -private: - bool bWK3Flag; - - virtual void ImplCommit() override; - -public: - ScFilterOptions(); - - virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; - - bool GetWK3Flag() const { return bWK3Flag; } -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx deleted file mode 100644 index 5c6ee2c437e8..000000000000 --- a/sc/source/core/tool/filtopt.cxx +++ /dev/null @@ -1,74 +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/uno/Any.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <osl/diagnose.h> - -#include <filtopt.hxx> -#include <miscuno.hxx> - -using namespace utl; -using namespace css::uno; - -constexpr OUStringLiteral CFGPATH_FILTER = u"Office.Calc/Filter/Import"; - -#define SCFILTOPT_WK3 2 - -ScFilterOptions::ScFilterOptions() : - ConfigItem( CFGPATH_FILTER ), - bWK3Flag( false ) -{ - Sequence<OUString> aNames { u"MS_Excel/ColScale"_ustr, // SCFILTOPT_COLSCALE - u"MS_Excel/RowScale"_ustr, // SCFILTOPT_ROWSCALE - u"Lotus123/WK3"_ustr }; // SCFILTOPT_WK3 - Sequence<Any> aValues = GetProperties(aNames); - const Any* pValues = aValues.getConstArray(); - OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed"); - if(aValues.getLength() != aNames.getLength()) - return; - - for(int nProp = 0; nProp < aNames.getLength(); nProp++) - { - OSL_ENSURE(pValues[nProp].hasValue(), "property value missing"); - if(pValues[nProp].hasValue()) - { - switch(nProp) - { - case SCFILTOPT_WK3: - bWK3Flag = ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ); - break; - } - } - } -} - -void ScFilterOptions::ImplCommit() -{ - // options are never modified from office - - OSL_FAIL("trying to commit changed ScFilterOptions?"); -} - -void ScFilterOptions::Notify( const Sequence<OUString>& /* aPropertyNames */ ) -{ - OSL_FAIL("properties have been changed"); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx index c89717cb6884..8f038988555f 100644 --- a/sc/source/filter/lotus/lotus.cxx +++ b/sc/source/filter/lotus/lotus.cxx @@ -21,10 +21,10 @@ #include <lotimpop.hxx> #include <editeng/justifyitem.hxx> +#include <officecfg/Office/Calc.hxx> #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx> #include <scerrors.hxx> -#include <filtopt.hxx> #include <ftools.hxx> #include <tool.h> @@ -43,7 +43,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocume ImportLotus aLotusImport(aContext, *pStream, eSrc); ErrCode eRet; - if (ScFilterOptions().GetWK3Flag()) + if ( officecfg::Office::Calc::Filter::Import::Lotus123::WK3::get() ) eRet = aLotusImport.Read(); else eRet = ErrCode(0xFFFFFFFF); // force WK1 /WKS diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index abca7e458ef3..56c11aa7d03d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7610,7 +7610,6 @@ sc/inc/fielduno.hxx sc/inc/fillinfo.hxx sc/inc/filter.hxx sc/inc/filterentries.hxx -sc/inc/filtopt.hxx sc/inc/filtuno.hxx sc/inc/fmtuno.hxx sc/inc/fonthelper.hxx @@ -7930,7 +7929,6 @@ sc/source/core/tool/docoptio.cxx sc/source/core/tool/doubleref.cxx sc/source/core/tool/editdataarray.cxx sc/source/core/tool/editutil.cxx -sc/source/core/tool/filtopt.cxx sc/source/core/tool/formulagroup.cxx sc/source/core/tool/formulalogger.cxx sc/source/core/tool/formulaopt.cxx
