summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-26 08:38:37 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-05-26 06:47:56 +0000
commitaad92a7ce2f74782064a69c1f3797544bd3298ee (patch)
treed48d0707fc9af909816e2cfb5e87c2ed3a1ad654 /starmath/inc
parent01ef2044d0b2c3429eca71de6afef0241e0196f3 (diff)
loplugin:unnecessarysuperclass, merge SmMathConfig with SmConfig
Change-Id: I2c431e9f72f5dee14cf1b603b11972a2e9d88725 Reviewed-on: https://gerrit.libreoffice.org/15902 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/config.hxx48
-rw-r--r--starmath/inc/smmod.hxx6
2 files changed, 3 insertions, 51 deletions
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
deleted file mode 100644
index 559545bcec85..000000000000
--- a/starmath/inc/config.hxx
+++ /dev/null
@@ -1,48 +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_STARMATH_INC_CONFIG_HXX
-#define INCLUDED_STARMATH_INC_CONFIG_HXX
-
-#include <svl/SfxBroadcaster.hxx>
-#include <svl/lstner.hxx>
-#include "format.hxx"
-
-#include "cfgitem.hxx"
-
-
-class SfxItemSet;
-
-class SmConfig : public SmMathConfig, public SfxBroadcaster
-{
- SmFontPickList vFontPickList[7];
-
-public:
- SmConfig();
- virtual ~SmConfig();
-
- SmFontPickList & GetFontPickList(sal_uInt16 nIdent) { return vFontPickList[nIdent]; }
-
- void ItemSetToConfig(const SfxItemSet &rSet);
- void ConfigToItemSet(SfxItemSet &rSet) const;
-};
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 59020d815280..9ee0deb9cce8 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -34,9 +34,9 @@
#include <memory>
class SfxObjectFactory;
-class SmConfig;
class SmModule;
class SmSymbolManager;
+class SmMathConfig;
/*************************************************************************
|*
@@ -88,7 +88,7 @@ public:
class SmModule : public SfxModule, utl::ConfigurationListener
{
std::unique_ptr<svtools::ColorConfig> mpColorConfig;
- std::unique_ptr<SmConfig> mpConfig;
+ std::unique_ptr<SmMathConfig> mpConfig;
std::unique_ptr<SmLocalizedSymbolData> mpLocSymbolData;
std::unique_ptr<SvtSysLocale> mpSysLocale;
VclPtr<VirtualDevice> mpVirtualDev;
@@ -111,7 +111,7 @@ public:
svtools::ColorConfig & GetColorConfig();
- SmConfig * GetConfig();
+ SmMathConfig * GetConfig();
SmSymbolManager & GetSymbolManager();
SmLocalizedSymbolData & GetLocSymbolData();