summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-16 10:11:04 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-18 10:03:44 +0000
commit2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae (patch)
tree66ba7ff0b95cf5ceeda5e53294a71c6786460eb3 /framework
parent4e59eecc077d27dd9762e7c890b2aaf92a212959 (diff)
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other plugins too. Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035 Reviewed-on: https://gerrit.libreoffice.org/25057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/filtercache.hxx92
-rw-r--r--framework/inc/classes/filtercachedata.hxx330
-rw-r--r--framework/inc/classes/wildcard.hxx65
-rw-r--r--framework/inc/helper/mischelper.hxx27
-rw-r--r--framework/inc/queries.h301
-rw-r--r--framework/inc/uielement/itemcontainer.hxx1
-rw-r--r--framework/inc/uielement/statusindicatorinterfacewrapper.hxx2
-rw-r--r--framework/source/inc/loadenv/actionlockguard.hxx11
-rw-r--r--framework/source/services/sessionlistener.cxx1
9 files changed, 0 insertions, 830 deletions
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
deleted file mode 100644
index 4b7fda29ad97..000000000000
--- a/framework/inc/classes/filtercache.hxx
+++ /dev/null
@@ -1,92 +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 .
- */
-
-/*TODO
- - late init
- - order by number!
- - insert default detector and loader as last ones in hashes ... don't hold it as an extra member!
- => CheckedIterator will be obsolete!
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
-
-#include <classes/filtercachedata.hxx>
-
-#include <general.h>
-#include <queries.h>
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-
-#include <rtl/ustring.hxx>
-
-#ifdef ENABLE_GENERATEFILTERCACHE
- #include <rtl/ustrbuf.hxx>
-#endif
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short cache for all filter and type information
- @descr Frameloader - and filterfactory need some information about our current registered filters and types.
- For better performance its necessary to cache all needed values.
-
- @devstatus ready to use
- @threadsafe yes
-*//*-*************************************************************************************************************/
-
-class FilterCache
-{
- public:
-
- // public methods
-
- public:
-
- // constructor / destructor
-
- FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION,
- ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE );
-
- /*-****************************************************************************************************
- @short standard destructor to delete instance
- @descr This will clear the cache if last owner release it.
- *//*-*****************************************************************************************************/
-
- virtual ~FilterCache();
-
- // private variables
-
- private:
-
- static sal_Int32 m_nRefCount;
- static sal_Int32 m_nVersion;
- static sal_Int16 m_nMode;
-
-}; // class FilterCache
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
deleted file mode 100644
index 77a87d54c770..000000000000
--- a/framework/inc/classes/filtercachedata.hxx
+++ /dev/null
@@ -1,330 +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_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-
-#include <classes/wildcard.hxx>
-#include <classes/converter.hxx>
-#include <macros/xinterface.hxx>
-#include <general.h>
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/XChangesListener.hpp>
-#include <com/sun/star/util/XChangesNotifier.hpp>
-
-#include <unotools/configitem.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-
-#include <iterator>
-#include <unordered_map>
-#include <vector>
-
-namespace framework{
-
-#define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one.
-
-#define DEFAULT_FILTERCACHE_MODE ConfigItemMode::DelayedUpdate | ConfigItemMode::AllLocales /// ConfigItems could run in different modes: supported values are ... { ConfigItemMode::ImmediateUpdate, ConfigItemMode::DelayedUpdate, ConfigItemMode::AllLocales }
-
-enum EModifyState
-{
- E_UNTOUCHED ,
- E_ADDED ,
- E_CHANGED ,
- E_REMOVED
-};
-
-enum EFilterPackage
-{
- E_STANDARD ,
- E_ADDITIONAL
-};
-
-// These struct define a type, which present the type of a file.
-// He is used for easy filter detection without file stream detection!
-// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-
-struct FileType
-{
-
- // public methods
-
- public:
-
- inline FileType ( ) { impl_clear(); }
- inline FileType ( const FileType& rCopy ) { impl_copy( rCopy ); }
- inline ~FileType ( ) { impl_clear(); }
- inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- bPreferred = false;
- sName.clear();
- sMediaType.clear();
- sClipboardFormat.clear();
- nDocumentIconID = 0;
- lUINames.clear();
- lURLPattern.clear();
- lExtensions.clear();
- }
-
- inline FileType& impl_copy( const FileType& rCopy )
- {
- bPreferred = rCopy.bPreferred;
- sName = rCopy.sName;
- lUINames = rCopy.lUINames;
- sMediaType = rCopy.sMediaType;
- sClipboardFormat = rCopy.sClipboardFormat;
- nDocumentIconID = rCopy.nDocumentIconID;
- lURLPattern = rCopy.lURLPattern;
- lExtensions = rCopy.lExtensions;
- return (*this);
- }
-
- // public member
-
- public:
-
- bool bPreferred;
- OUString sName;
- OUStringHashMap lUINames;
- OUString sMediaType;
- OUString sClipboardFormat;
- sal_Int32 nDocumentIconID;
- std::vector<OUString> lURLPattern;
- std::vector<OUString> lExtensions;
-};
-
-// These struct describe a filter which is registered for one type.
-// He hold information about services which present the document himself (like a item) and a filter service which
-// filter a file in these document.
-// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-
-struct Filter
-{
-
- // public methods
-
- public:
-
- inline Filter ( ) { impl_clear(); }
- inline Filter ( const Filter& rCopy ) { impl_copy( rCopy ); }
- inline ~Filter ( ) { impl_clear(); }
- inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- nOrder = 0;
- sName.clear();
- sType.clear();
- sDocumentService.clear();
- sFilterService.clear();
- sUIComponent.clear();
- nFlags = 0;
- nFileFormatVersion = 0;
- sTemplateName.clear();
- lUINames.clear();
- lUserData.clear();
- }
-
- inline Filter& impl_copy( const Filter& rCopy )
- {
- nOrder = rCopy.nOrder;
- sName = rCopy.sName;
- sType = rCopy.sType;
- lUINames = rCopy.lUINames;
- sDocumentService = rCopy.sDocumentService;
- sFilterService = rCopy.sFilterService;
- sUIComponent = rCopy.sUIComponent;
- nFlags = rCopy.nFlags;
- nFileFormatVersion = rCopy.nFileFormatVersion;
- sTemplateName = rCopy.sTemplateName;
- lUserData = rCopy.lUserData;
- return (*this);
- }
-
- // public member
-
- public:
-
- sal_Int32 nOrder;
- OUString sName;
- OUString sType;
- OUStringHashMap lUINames;
- OUString sDocumentService;
- OUString sFilterService;
- OUString sUIComponent;
- sal_Int32 nFlags;
- std::vector<OUString> lUserData;
- sal_Int32 nFileFormatVersion;
- OUString sTemplateName;
-};
-
-// Programmer can register his own services for an content detection of different types.
-// The implementation or service name of these is the keyname of an item with these structure
-// in our hash map or our configuration set!
-
-struct Detector
-{
-
- // public methods
-
- public:
-
- inline Detector ( ) { impl_clear(); }
- inline Detector ( const Detector& rCopy ) { impl_copy( rCopy ); }
- inline ~Detector ( ) { impl_clear(); }
- inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- sName.clear();
- lTypes.clear();
- }
-
- inline Detector& impl_copy( const Detector& rCopy )
- {
- sName = rCopy.sName;
- lTypes = rCopy.lTypes;
- return (*this);
- }
-
- // public member
-
- public:
-
- OUString sName;
- std::vector<OUString> lTypes;
-};
-
-// Programmer can register his own services for loading documents in a frame.
-// The implementation or service name of these is the keyname of an item with these structure
-// in our hash map or our configuration set!
-
-struct Loader
-{
-
- // public methods
-
- public:
-
- inline Loader ( ) { impl_clear(); }
- inline Loader ( const Loader& rCopy ) { impl_copy( rCopy ); }
- inline ~Loader ( ) { impl_clear(); }
- inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- sName.clear();
- lUINames.clear();
- lTypes.clear();
- }
-
- inline Loader& impl_copy( const Loader& rCopy )
- {
- sName = rCopy.sName;
- lUINames = rCopy.lUINames;
- lTypes = rCopy.lTypes;
- return (*this);
- }
-
- // public member
-
- public:
-
- OUString sName;
- OUStringHashMap lUINames;
- std::vector<OUString> lTypes;
-};
-
-// Programmer can register his own services to handle a FileType and intercept dispatches.
-// Don't forget: It's not a FrameLoader - it's a ContentHandler! (normally without any UI)
-
-struct ContentHandler
-{
-
- // public methods
-
- public:
-
- inline ContentHandler( ) { impl_clear(); }
- inline ContentHandler( const ContentHandler& rCopy ) { impl_copy( rCopy ); }
- inline ~ContentHandler( ) { impl_clear(); }
- inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- sName.clear();
- lTypes.clear();
- }
-
- inline ContentHandler& impl_copy( const ContentHandler& rCopy )
- {
- sName = rCopy.sName;
- lTypes = rCopy.lTypes;
- return (*this);
- }
-
- // public member
-
- public:
-
- OUString sName;
- std::vector<OUString> lTypes;
-};
-
-// We need different hash maps for different tables of our configuration management.
-// Follow maps convert <names> to <properties> of type, filter, detector, loader ...
-// and could be used in a generic way
-
-template< class HashType >
-class SetNodeHash : public std::unordered_map< OUString ,
- HashType ,
- OUStringHash >
-{
-};
-
-// Use these hashes to implement different tables which assign types to frame loader or detect services.
-// It's an optimism to find registered services faster!
-// The preferred hash maps file extensions to preferred types to find these ones faster.
-
-class PerformanceHash : public std::unordered_map< OUString,
- std::vector<OUString>,
- OUStringHash >
-{
-};
-
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
deleted file mode 100644
index e9ced168099a..000000000000
--- a/framework/inc/classes/wildcard.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_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
-
-#include <rtl/ustring.hxx>
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short implement wildcard-mechanism for unicode
- @descr This class can be used to get information about the matching of a pattern to a given text.
- It's suitable for 8-Bit- AND 16-Bit-strings!
- @ATTENTION This class isn't threadsafe!
-
- @devstatus deprecated
-*//*-*************************************************************************************************************/
-
-class Wildcard
-{
-
- // public methods
-
- public:
-
- // constructor / destructor
-
- /*-****************************************************************************************************
- @short standard ctor
- @descr We do nothing here.
- *//*-*****************************************************************************************************/
-
- Wildcard();
-
- /*-****************************************************************************************************
- @short standard dtor
- @descr We do nothing here.
- *//*-*****************************************************************************************************/
-
- virtual ~Wildcard();
-
-}; // class Wildcard
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 6be2306e7fdf..39cae9c6a484 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -234,33 +234,6 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis
}
};
-class WeakEventListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
-{
- private:
- css::uno::WeakReference<css::lang::XEventListener> mxOwner;
-
- public:
- WeakEventListener(css::uno::Reference<css::lang::XEventListener> xOwner)
- : mxOwner(xOwner)
- {
- }
-
- virtual ~WeakEventListener()
- {
- }
-
- // lang.XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
- throw(css::uno::RuntimeException, std::exception) override
- {
- css::uno::Reference<css::lang::XEventListener> xOwner(mxOwner.get(),
- css::uno::UNO_QUERY);
- if (xOwner.is())
- xOwner->disposing(rEvent);
-
- }
-};
-
class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
{
private:
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
deleted file mode 100644
index 153cbc000340..000000000000
--- a/framework/inc/queries.h
+++ /dev/null
@@ -1,301 +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_FRAMEWORK_INC_QUERIES_H
-#define INCLUDED_FRAMEWORK_INC_QUERIES_H
-
-#include "general.h"
-
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short These values describe our supported queries for type, filter ... properties.
- They are used by our FilterFactory or our TypeDetection to return
- subsets of our cached configuration.
-*//*-*************************************************************************************************************/
-#define BASE_QUERY_ALL "_query_all"
-#define BASE_QUERY_WRITER "_query_Writer"
-#define BASE_QUERY_WEB "_query_web"
-#define BASE_QUERY_GLOBAL "_query_global"
-#define BASE_QUERY_CHART "_query_chart"
-#define BASE_QUERY_CALC "_query_calc"
-#define BASE_QUERY_IMPRESS "_query_impress"
-#define BASE_QUERY_DRAW "_query_draw"
-#define BASE_QUERY_MATH "_query_math"
-#define BASE_QUERY_GRAPHICS "_query_graphics"
-
-/*-************************************************************************************************************
- @short These parameters can be used in combination with BASE_QUERY_... defines to
- specialize it.
- use follow syntax to do so: "<query>[:<param>[=<value>]]"
- e.g.: "_query_writer:default_first:use_order:sort_prop=uiname"
-
- argument description default
- -----------------------------------------------------------------------------------------------
- iflags=<mask> include filters by given mask 0
- eflags=<mask> exclude filters by given mask 0
- sort_prop=<[name,uiname]> sort by internal name or uiname name
- descending sort descending false
- use_order use order flag of filters for sorting false
- default_first set default filter on top of return list false
- case_sensitive compare "sort_prop" case sensitive false
-*//*-*************************************************************************************************************/
-#define SEPARATOR_QUERYPARAM ((sal_Unicode)':')
-#define SEPARATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
-
-#define QUERYPARAM_IFLAGS "iflags"
-#define QUERYPARAM_EFLAGS "eflags"
-#define QUERYPARAM_SORT_PROP "sort_prop"
-
-#define QUERYPARAM_DESCENDING "descending"
-#define QUERYPARAM_USE_ORDER "use_order"
-#define QUERYPARAM_DEFAULT_FIRST "default_first"
-#define QUERYPARAM_CASE_SENSITIVE "case_sensitive"
-
-#define QUERYPARAMVALUE_SORT_PROP_NAME "name"
-#define QUERYPARAMVALUE_SORT_PROP_UINAME "uiname"
-
-/*-************************************************************************************************************
- @short Helper class to support easy building of a query statements.
-*//*-*************************************************************************************************************/
-class QueryBuilder
-{
- public:
-
- // start with empty query
-
- QueryBuilder()
- {
- resetAll();
- }
-
- // forget all setted params and start with empty ones
- // Attention: base of query isn't changed!
-
- void resetParams()
- {
- m_sParams.makeStringAndClear();
- m_sParams.ensureCapacity( 256 );
- }
-
- // start with new empty query
-
- void resetAll()
- {
- m_sBase.clear();
- resetParams();
- }
-
- private:
- OUString m_sBase;
- OUStringBuffer m_sParams;
-
-}; // class QueryBuilder
-
-/*-************************************************************************************************************
- @short Helper class to analyze queries and split into his different parts (base, params and values).
-*//*-*************************************************************************************************************/
-class QueryAnalyzer
-{
- public:
-
- // it's will not perform to compare strings as query type ...
- // so we convert it into these enum values.
- // default = E_ALL!
-
- enum EQuery
- {
- E_ALL ,
- E_WRITER ,
- E_WEB ,
- E_GLOBAL ,
- E_CHART ,
- E_CALC ,
- E_IMPRESS ,
- E_DRAW ,
- E_MATH ,
- E_GRAPHICS
- };
-
- // these are valid values for param "sort_prop".
- // other ones are not supported!
- // default = E_NAME
-
- enum ESortProp
- {
- E_NAME ,
- E_UINAME
- };
-
- // analyze given query and split it into his different parts; <base>:<param1>:<param2=value>...
-
- QueryAnalyzer(const OUString& sQuery)
- // Don't forget to set default values for non given params!
- : m_eQuery ( E_ALL ) // return ALL filter ...
- , m_nIFlags ( 0 ) // which has set ANY flag ... (we remove all entries which match with these mask .. => 0!)
- , m_nEFlags ( 0 ) // (only used, if nIFlags==0 and himself!=0!)
- , m_eSortProp ( E_NAME ) // sort it by internal name ...
- , m_bDescending ( sal_False ) // in ascending order ...
- , m_bCaseSensitive( sal_False ) // ignore case ...
- , m_bUseOrder ( sal_False ) // don't use order flag ...
- , m_bDefaultFirst ( sal_False ) // and don't handle default entries in special case!
- {
- // Translate old query format to new one first!
- OUString sNewQuery( sQuery );
- if (sQuery == "_filterquery_textdocument_withdefault")
- sNewQuery = "_query_writer:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_webdocument_withdefault")
- sNewQuery = "_query_web:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_globaldocument_withdefault")
- sNewQuery = "_query_global:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_chartdocument_withdefault")
- sNewQuery = "_query_chart:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_spreadsheetdocument_withdefault")
- sNewQuery = "_query_calc:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_presentationdocument_withdefault")
- sNewQuery = "_query_impress:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_drawingdocument_withdefault")
- sNewQuery = "_query_draw:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_formulaproperties_withdefault")
- sNewQuery = "_query_math:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_textdocument")
- sNewQuery = "_query_writer:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_webdocument")
- sNewQuery = "_query_web:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_globaldocument")
- sNewQuery = "_query_global:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_chartdocument")
- sNewQuery = "_query_chart:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_spreadsheetdocument")
- sNewQuery = "_query_calc:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_presentationdocument")
- sNewQuery = "_query_impress:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_drawingdocument")
- sNewQuery = "_query_draw:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_formulaproperties")
- sNewQuery = "_query_math:use_order:sort_prop=uiname";
-
- // Analyze query ...
- // Try to find base of it and safe it for faster access as enum value!
- sal_Int32 nToken = 0;
- OUString sParam;
- OUString sBase = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
-
- if (sBase.equalsIgnoreAsciiCase(BASE_QUERY_ALL))
- m_eQuery = E_ALL;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WRITER))
- m_eQuery = E_WRITER;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WEB))
- m_eQuery = E_WEB;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GLOBAL))
- m_eQuery = E_GLOBAL;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CHART))
- m_eQuery = E_CHART;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CALC))
- m_eQuery = E_CALC;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_IMPRESS))
- m_eQuery = E_IMPRESS;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_DRAW))
- m_eQuery = E_DRAW;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_MATH))
- m_eQuery = E_MATH;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GRAPHICS))
- m_eQuery = E_GRAPHICS;
-
- // Try to get additional parameters ...
- while( nToken >= 0 )
- {
- sParam = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
- // "default_first"
- if( sParam.startsWith( QUERYPARAM_DEFAULT_FIRST ) )
- {
- m_bDefaultFirst = sal_True;
- }
- // "use_order"
- else if( sParam.startsWith( QUERYPARAM_USE_ORDER ) )
- {
- m_bUseOrder = sal_True;
- }
- // "descending"
- else if( sParam.startsWith( QUERYPARAM_DESCENDING ) )
- {
- m_bDescending = sal_True;
- }
- // "case_sensitive"
- else if( sParam.startsWith( QUERYPARAM_CASE_SENSITIVE ) )
- {
- m_bCaseSensitive = sal_True;
- }
- // "iflags=<mask>"
- else if( sParam.startsWith( QUERYPARAM_IFLAGS ) )
- {
- sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( nSubToken > 0 )
- {
- m_nIFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
- }
- }
- // "eflags=<mask>"
- else if( sParam.startsWith( QUERYPARAM_EFLAGS ) )
- {
- sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( nSubToken > 0 )
- {
- m_nEFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
- }
- }
- // "sort_prop=<[name,uiname]>"
- else if( sParam.startsWith( QUERYPARAM_SORT_PROP ) )
- {
- sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( nSubToken > 0 )
- {
- OUString sParamValue = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_NAME ) )
- m_eSortProp = E_NAME;
- else if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_UINAME ) )
- m_eSortProp = E_UINAME;
- }
- }
- }
- }
-
- private:
- EQuery m_eQuery;
- sal_uInt32 m_nIFlags;
- sal_uInt32 m_nEFlags;
- ESortProp m_eSortProp;
- bool m_bDescending;
- bool m_bCaseSensitive;
- bool m_bUseOrder;
- bool m_bDefaultFirst;
-
-}; // class QueryAnalyzer
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_QUERIES_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 5e60ce9f1735..a784602593a9 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -82,7 +82,6 @@ class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper< css::contai
throw (css::uno::RuntimeException, std::exception) override;
private:
- ItemContainer();
void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex );
css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex );
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index f6a65104912b..3801e081a9e4 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -51,8 +51,6 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper< css::ta
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
private:
- StatusIndicatorInterfaceWrapper();
-
css::uno::WeakReference< css::lang::XComponent > m_xStatusIndicatorImpl;
};
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 69404486885c..a660252c0e75 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -61,17 +61,6 @@ class ActionLockGuard
{
}
- /** @short initialize new guard instance and lock the given resource immediately.
-
- @param xLock
- points to the outside resource, which should be locked.
- */
- ActionLockGuard(const css::uno::Reference< css::document::XActionLockable >& xLock)
- : m_bActionLocked(false)
- {
- setResource(xLock);
- }
-
/** @short release this guard instance and make sure, that no lock
will exist afterwards on the internal wrapped resource.
*/
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 8f0f4c738604..befbfc4ff6f7 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -20,7 +20,6 @@
#include <sal/types.h>
#include <services/desktop.hxx>
-#include <classes/filtercache.hxx>
#include <protocols.h>
#include <general.h>