diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 23:52:27 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-05 08:35:33 +0000 |
commit | 55664c9bd2469d3e493e6f1b67fbb2f96500d492 (patch) | |
tree | 43e97768980a42c01a9483f2382d9d7e6c302c7a /unotools/inc | |
parent | aeb7683ae745717fe5e283b6ada065183aa730f4 (diff) |
unotools: remove some unused items
Change-Id: I95bcac6a3ff8cf4644c9d1596c75cac2d9cd94fe
Reviewed-on: https://gerrit.libreoffice.org/3191
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Notes
Notes:
API CHANGE.
Diffstat (limited to 'unotools/inc')
-rw-r--r-- | unotools/inc/unotools/accelcfg.hxx | 65 | ||||
-rw-r--r-- | unotools/inc/unotools/itemholderbase.hxx | 9 | ||||
-rw-r--r-- | unotools/inc/unotools/workingsetoptions.hxx | 122 | ||||
-rw-r--r-- | unotools/inc/unotools/xmlaccelcfg.hxx | 11 |
4 files changed, 11 insertions, 196 deletions
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx deleted file mode 100644 index c60a4f09de83..000000000000 --- a/unotools/inc/unotools/accelcfg.hxx +++ /dev/null @@ -1,65 +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_unotools_ACCELCFG_HXX -#define INCLUDED_unotools_ACCELCFG_HXX - -#include <com/sun/star/awt/KeyEvent.hpp> -#include <unotools/options.hxx> - -#include <rtl/ustring.hxx> -#include <tools/stream.hxx> - -struct SvtAcceleratorConfigItem -{ - sal_uInt16 nCode; - sal_uInt16 nModifier; - OUString aCommand; -}; - -#include <list> -typedef ::std::list < SvtAcceleratorConfigItem > SvtAcceleratorItemList; - -class SvStream; -class KeyEvent; -class String; -class SvtAcceleratorConfig_Impl; - -class SvtAcceleratorConfiguration: public utl::detail::Options -{ - SvtAcceleratorConfig_Impl* pImp; - -private: - -public: - // get the global accelerators - SvtAcceleratorConfiguration(); - - // get special accelerators - static String GetStreamName(); - static SvStream* GetDefaultStream( StreamMode ); - - virtual ~SvtAcceleratorConfiguration(); - - // save the configuration to a stream, f.e. into a document - bool Commit( SvStream& rStream ); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/inc/unotools/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx index 2efc282284f4..831cba4a4a72 100644 --- a/unotools/inc/unotools/itemholderbase.hxx +++ b/unotools/inc/unotools/itemholderbase.hxx @@ -33,7 +33,6 @@ struct ItemHolderMutexBase enum EItem { - E_ACCELCFG , // E_ACCESSIBILITYOPTIONS , // 2 E_ADDXMLTOSTORAGEOPTIONS , // E_APEARCFG , // 2 @@ -57,8 +56,6 @@ enum EItem E_HELPOPTIONS , // 2 E_HISTORYOPTIONS , // - E_JAVAOPTIONS , // - E_LANGUAGEOPTIONS , // 2 E_LINGUCFG , // E_LOCALISATIONOPTIONS , // @@ -87,11 +84,7 @@ enum EItem E_VIEWOPTIONS_DIALOG , // E_VIEWOPTIONS_TABDIALOG , // E_VIEWOPTIONS_TABPAGE , // - E_VIEWOPTIONS_WINDOW , // - - E_WORKINGSETOPTIONS , // - - E_XMLACCELCFG // + E_VIEWOPTIONS_WINDOW // }; struct TItemInfo diff --git a/unotools/inc/unotools/workingsetoptions.hxx b/unotools/inc/unotools/workingsetoptions.hxx deleted file mode 100644 index c351da83f3ec..000000000000 --- a/unotools/inc/unotools/workingsetoptions.hxx +++ /dev/null @@ -1,122 +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_unotools_WORKINGSETOPTIONS_HXX -#define INCLUDED_unotools_WORKINGSETOPTIONS_HXX - -#include <sal/types.h> -#include <osl/mutex.hxx> -#include <com/sun/star/uno/Sequence.h> -#include <rtl/ustring.hxx> -#include <unotools/options.hxx> - -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short forward declaration to our private date container implementation - @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism - is faster and smaller then a complete implementation! -*//*-*************************************************************************************************************/ - -class SvtWorkingSetOptions_Impl; - -/*-************************************************************************************************************//** - @short collect information about security features - @descr - - - @implements - - @base - - - @devstatus ready to use -*//*-*************************************************************************************************************/ - -class SAL_WARN_UNUSED SvtWorkingSetOptions : public utl::detail::Options -{ - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short standard constructor and destructor - @descr This will initialize an instance with default values. - We implement these class with a refcount mechanism! Every instance of this class increase it - at create and decrease it at delete time - but all instances use the same data container! - He is implemented as a static member ... - - @seealso member m_nRefCount - @seealso member m_pDataContainer - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - SvtWorkingSetOptions(); - virtual ~SvtWorkingSetOptions(); - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class use his own static mutex to be threadsafe. - We create a static mutex only for one ime and use at different times. - - @seealso - - - @param - - @return A reference to a static mutex member. - - @onerror - - *//*-*****************************************************************************************************/ - - static ::osl::Mutex& GetOwnStaticMutex(); - - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - - private: - - /*Attention - - Don't initialize these static member in these header! - a) Double dfined symbols will be detected ... - b) and unresolved externals exist at linking time. - Do it in your source only. - */ - - static SvtWorkingSetOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism - -}; // class SvtWorkingSetOptions - -#endif // #ifndef INCLUDED_unotools_WORKINGSETOPTIONS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx index 8e2c6982e705..48417b2a229a 100644 --- a/unotools/inc/unotools/xmlaccelcfg.hxx +++ b/unotools/inc/unotools/xmlaccelcfg.hxx @@ -23,7 +23,16 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <cppuhelper/weak.hxx> -#include <unotools/accelcfg.hxx> +struct SvtAcceleratorConfigItem +{ + sal_uInt16 nCode; + sal_uInt16 nModifier; + OUString aCommand; +}; + +#include <list> +typedef ::std::list < SvtAcceleratorConfigItem > SvtAcceleratorItemList; + class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler, public ::cppu::OWeakObject |