c4a3b15031
They seem to be designed with multi-dimensional flexibility in mind; it is stored as an array of lists, each having a name and a module. The name may mean a filter. It may have a special name "_user" with unclear meaning. But it only ever used a single item in the array, named "_default", in a single module (swriter). Everything else was only read into a hidden listbox in Compatibility dialog, and never shown nor used. Make ir much simpler. Just use the "_default" item. It is possible to expand it later, if needed; but the previous complexity was bad for maintenance and adding new options. Translatable descriptions of the options were moved from UI file to sw/inc/strings.hrc, and used in a structure that clearly maps them to respective identifiers, to avoid fragile hidden dependency on order of different lists. Change-Id: I78ac5add8a872613e1fb388e4b8cc4fbf4362adf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162651 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
146 lines
4.1 KiB
C++
146 lines
4.1 KiB
C++
/* -*- 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 "itemholder1.hxx"
|
|
|
|
#include <comphelper/processfactory.hxx>
|
|
#include <com/sun/star/lang/XComponent.hpp>
|
|
#include <com/sun/star/configuration/theDefaultProvider.hpp>
|
|
|
|
#include <unotools/useroptions.hxx>
|
|
#include <unotools/cmdoptions.hxx>
|
|
#include <unotools/compatibility.hxx>
|
|
#include <unotools/lingucfg.hxx>
|
|
#include <unotools/moduleoptions.hxx>
|
|
#include <unotools/pathoptions.hxx>
|
|
#include <unotools/options.hxx>
|
|
#include <unotools/syslocaleoptions.hxx>
|
|
#include <rtl/ref.hxx>
|
|
#include <osl/diagnose.h>
|
|
#include <comphelper/diagnose_ex.hxx>
|
|
|
|
ItemHolder1::ItemHolder1()
|
|
{
|
|
try
|
|
{
|
|
css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
|
|
css::uno::Reference< css::lang::XComponent > xCfg(
|
|
css::configuration::theDefaultProvider::get( xContext ),
|
|
css::uno::UNO_QUERY_THROW );
|
|
xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
|
|
}
|
|
#ifdef DBG_UTIL
|
|
catch(const css::uno::Exception&)
|
|
{
|
|
static bool bMessage = true;
|
|
if(bMessage)
|
|
{
|
|
bMessage = false;
|
|
TOOLS_WARN_EXCEPTION( "unotools", "CreateInstance with arguments");
|
|
}
|
|
}
|
|
#else
|
|
catch(css::uno::Exception&){}
|
|
#endif
|
|
}
|
|
|
|
ItemHolder1::~ItemHolder1()
|
|
{
|
|
impl_releaseAllItems();
|
|
}
|
|
|
|
void ItemHolder1::holdConfigItem(EItem eItem)
|
|
{
|
|
static rtl::Reference<ItemHolder1> pHolder = new ItemHolder1();
|
|
pHolder->impl_addItem(eItem);
|
|
}
|
|
|
|
void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&)
|
|
{
|
|
css::uno::Reference< css::uno::XInterface > xSelfHold(static_cast< css::lang::XEventListener* >(this), css::uno::UNO_QUERY);
|
|
impl_releaseAllItems();
|
|
}
|
|
|
|
void ItemHolder1::impl_addItem(EItem eItem)
|
|
{
|
|
std::scoped_lock aLock(m_aLock);
|
|
|
|
for ( auto const & rInfo : m_lItems )
|
|
{
|
|
if (rInfo.eItem == eItem)
|
|
return;
|
|
}
|
|
|
|
TItemInfo aNewItem;
|
|
aNewItem.eItem = eItem;
|
|
impl_newItem(aNewItem);
|
|
if (aNewItem.pItem)
|
|
m_lItems.emplace_back(std::move(aNewItem));
|
|
}
|
|
|
|
void ItemHolder1::impl_releaseAllItems()
|
|
{
|
|
std::vector< TItemInfo > items;
|
|
{
|
|
std::scoped_lock aLock(m_aLock);
|
|
items.swap(m_lItems);
|
|
}
|
|
|
|
// items will be freed when the block exits
|
|
}
|
|
|
|
void ItemHolder1::impl_newItem(TItemInfo& rItem)
|
|
{
|
|
switch(rItem.eItem)
|
|
{
|
|
case EItem::CmdOptions :
|
|
rItem.pItem.reset( new SvtCommandOptions() );
|
|
break;
|
|
|
|
case EItem::EventConfig :
|
|
//rItem.pItem.reset( new GlobalEventConfig() );
|
|
break;
|
|
|
|
case EItem::LinguConfig :
|
|
rItem.pItem.reset( new SvtLinguConfig() );
|
|
break;
|
|
|
|
case EItem::ModuleOptions :
|
|
rItem.pItem.reset( new SvtModuleOptions() );
|
|
break;
|
|
|
|
case EItem::PathOptions :
|
|
rItem.pItem.reset( new SvtPathOptions() );
|
|
break;
|
|
|
|
case EItem::UserOptions :
|
|
rItem.pItem.reset( new SvtUserOptions() );
|
|
break;
|
|
|
|
case EItem::SysLocaleOptions :
|
|
rItem.pItem.reset( new SvtSysLocaleOptions() );
|
|
break;
|
|
|
|
default:
|
|
OSL_FAIL( "unknown item type" );
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|