diff options
-rw-r--r-- | include/unotools/collatorwrapper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/compatibility.hxx | 1 | ||||
-rw-r--r-- | include/unotools/pathoptions.hxx | 1 | ||||
-rw-r--r-- | include/unotools/sharedunocomponent.hxx | 15 | ||||
-rw-r--r-- | include/unotools/xmlaccelcfg.hxx | 89 | ||||
-rw-r--r-- | unotools/Library_utl.mk | 1 | ||||
-rw-r--r-- | unotools/source/config/compatibility.cxx | 7 | ||||
-rw-r--r-- | unotools/source/config/itemholder1.cxx | 1 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/xmlaccelcfg.cxx | 187 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 4 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.hxx | 10 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucbstreamhelper.cxx | 10 | ||||
-rw-r--r-- | uui/source/iahndl.hxx | 4 |
14 files changed, 8 insertions, 332 deletions
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx index b67d9ee54246..823ba03aada0 100644 --- a/include/unotools/collatorwrapper.hxx +++ b/include/unotools/collatorwrapper.hxx @@ -55,10 +55,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper loadCollatorAlgorithm ( const OUString& rAlgorithm, const css::lang::Locale& rLocale, sal_Int32 nOption); - - protected: - - CollatorWrapper(); }; #endif // INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 0cf64faa7e2c..85c88b8375ac 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -163,7 +163,6 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options bool IsUseOurTextWrapping() const; bool IsConsiderWrappingStyle() const; bool IsExpandWordSpace() const; - bool IsProtectForm() const; // private methods diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx index 2784f8cb83df..dce88d4687c2 100644 --- a/include/unotools/pathoptions.hxx +++ b/include/unotools/pathoptions.hxx @@ -120,7 +120,6 @@ public: void SetTemplatePath( const OUString& rPath ); void SetUserConfigPath( const OUString& rPath ); void SetWorkPath( const OUString& rPath ); - void SetClassificationPath( const OUString& rPath ); OUString SubstituteVariable( const OUString& rVar ) const; OUString ExpandMacros( const OUString& rPath ) const; diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index 137d1314fbc2..9943ba88c0e8 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -160,26 +160,11 @@ namespace utl reset( _rxComponent, eMode ); } - inline SharedUNOComponent( const css::uno::XInterface* _pInterface, css::uno::UnoReference_QueryThrow _queryThrow ) - { - set( _pInterface, _queryThrow ); - } - inline SharedUNOComponent( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ) { set( _rRef, _queryThrow ); } - inline SharedUNOComponent( const css::uno::Any& _rAny, css::uno::UnoReference_QueryThrow _queryThrow ) - { - set( _rAny, _queryThrow ); - } - - inline SharedUNOComponent( const SharedUNOComponent& _rxComponent, css::uno::UnoReference_SetThrow _setThrow ) - { - set( _rxComponent, _setThrow ); - } - // SharedUNOComponent& operator=( const css::uno::Reference< INTERFACE >& _rxComponent ); // This operator is intentionally not implemented. There is no canonic ownership after this operator // would have been applied: Should the SharedUNOComponent have the ownership of the component, diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx deleted file mode 100644 index e1ce2b3c123a..000000000000 --- a/include/unotools/xmlaccelcfg.hxx +++ /dev/null @@ -1,89 +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_XMLACCELCFG_HXX -#define INCLUDED_UNOTOOLS_XMLACCELCFG_HXX - -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <cppuhelper/weak.hxx> - -struct SvtAcceleratorConfigItem -{ - sal_uInt16 nCode; - sal_uInt16 nModifier; - OUString aCommand; -}; - -#include <list> -typedef ::std::list < SvtAcceleratorConfigItem > SvtAcceleratorItemList; - -class OReadAccelatorDocumentHandler : public css::xml::sax::XDocumentHandler, - public ::cppu::OWeakObject -{ - public: - OReadAccelatorDocumentHandler( SvtAcceleratorItemList& aNewAcceleratorItemList ) : - m_nElementDepth( 0 ), - m_bAcceleratorMode( false ), - m_bItemCloseExpected( false ), - m_xLocator( nullptr ), - m_aReadAcceleratorList( aNewAcceleratorItemList ) {} - virtual ~OReadAccelatorDocumentHandler() {} - - // XInterface - virtual void SAL_CALL acquire() throw() override - { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() override - { OWeakObject::release(); } - virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; - - // XDocumentHandler - virtual void SAL_CALL startDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL startElement( - const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs ) - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endElement(const OUString& aName) throw - ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL characters(const OUString& aChars) - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDocumentLocator( - const css::uno::Reference< css::xml::sax::XLocator > &xLocator) - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - - private: - OUString getErrorLineString(); - - int m_nElementDepth; - bool m_bAcceleratorMode; - bool m_bItemCloseExpected; - css::uno::Reference< css::xml::sax::XLocator > m_xLocator; - SvtAcceleratorItemList& m_aReadAcceleratorList; -}; - -#endif // INCLUDED_UNOTOOLS_XMLACCELCFG_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index a3481de726c0..bfecbd132cfb 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/config/syslocaleoptions \ unotools/source/config/useroptions \ unotools/source/config/viewoptions \ - unotools/source/config/xmlaccelcfg \ unotools/source/i18n/calendarwrapper \ unotools/source/i18n/caserotate \ unotools/source/i18n/charclass \ diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index b7b34fa56e00..8dd58e27ef36 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -274,7 +274,6 @@ class SvtCompatibilityOptions_Impl : public ConfigItem inline bool IsUseOurTextWrapping() const { return m_aDefOptions.bUseOurTextWrapping; } inline bool IsConsiderWrappingStyle() const { return m_aDefOptions.bConsiderWrappingStyle; } inline bool IsExpandWordSpace() const { return m_aDefOptions.bExpandWordSpace; } - inline bool IsProtectForm() const { return m_aDefOptions.bProtectForm; } // private methods @@ -725,12 +724,6 @@ bool SvtCompatibilityOptions::IsExpandWordSpace() const return m_pDataContainer->IsExpandWordSpace(); } -bool SvtCompatibilityOptions::IsProtectForm() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsProtectForm(); -} - Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions::GetList() const { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index c2b5d0ed8055..6f69b976ce16 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -44,7 +44,6 @@ #include <unotools/searchopt.hxx> #include <unotools/securityoptions.hxx> #include <unotools/viewoptions.hxx> -#include <unotools/xmlaccelcfg.hxx> #include <unotools/options.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 13fa33500914..2a2c14bfff14 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -152,7 +152,6 @@ class SvtPathOptions_Impl void SetTemplatePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); } void SetUserConfigPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); } void SetWorkPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); } - void SetClassificationPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_CLASSIFICATION, rPath ); } OUString SubstVar( const OUString& rVar ) const; OUString ExpandMacros( const OUString& rPath ) const; @@ -702,11 +701,6 @@ void SvtPathOptions::SetWorkPath( const OUString& rPath ) pImp->SetWorkPath( rPath ); } -void SvtPathOptions::SetClassificationPath( const OUString& rPath ) -{ - pImp->SetClassificationPath( rPath ); -} - OUString SvtPathOptions::SubstituteVariable( const OUString& rVar ) const { return pImp->SubstVar( rVar ); diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx deleted file mode 100644 index f84d93d5f24d..000000000000 --- a/unotools/source/config/xmlaccelcfg.cxx +++ /dev/null @@ -1,187 +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 <unotools/xmlaccelcfg.hxx> - -#include <vector> -#include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <cppuhelper/queryinterface.hxx> - -using namespace com::sun::star::uno; -using namespace com::sun::star::xml::sax; - -#define ELEMENT_ACCELERATORLIST "acceleratorlist" -#define ELEMENT_ACCELERATORITEM "item" - -#define ATTRIBUTE_KEYCODE "code" -#define ATTRIBUTE_MODIFIER "modifier" -#define ATTRIBUTE_URL "url" - -Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException, std::exception ) -{ - Any a = ::cppu::queryInterface( rType ,(static_cast< XDocumentHandler* >(this))); - if ( a.hasValue() ) - return a; - else - return OWeakObject::queryInterface( rType ); -} - -void SAL_CALL OReadAccelatorDocumentHandler::ignorableWhitespace( - const OUString& ) -throw( SAXException, RuntimeException, std::exception ) -{ -} - -void SAL_CALL OReadAccelatorDocumentHandler::processingInstruction( - const OUString&, const OUString& ) -throw( SAXException, RuntimeException, std::exception ) -{ -} - -void SAL_CALL OReadAccelatorDocumentHandler::setDocumentLocator( - const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException, std::exception ) -{ - m_xLocator = xLocator; -} - -OUString OReadAccelatorDocumentHandler::getErrorLineString() -{ - if ( m_xLocator.is() ) - { - char buffer[32]; - return OUString::createFromAscii( buffer ); - } - else - return OUString(); -} - -void SAL_CALL OReadAccelatorDocumentHandler::startDocument() - throw ( SAXException, RuntimeException, std::exception ) -{ -} - -void SAL_CALL OReadAccelatorDocumentHandler::endDocument() - throw( SAXException, RuntimeException, std::exception ) -{ - if ( m_nElementDepth > 0 ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "A closing element is missing!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - -void SAL_CALL OReadAccelatorDocumentHandler::startElement( - const OUString& aElementName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException, std::exception ) -{ - m_nElementDepth++; - - if ( aElementName == ELEMENT_ACCELERATORLIST ) - { - // acceleratorlist - if ( m_bAcceleratorMode ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Accelerator list used twice!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - else - m_bAcceleratorMode = true; - } - else if ( aElementName == ELEMENT_ACCELERATORITEM ) - { - // accelerator item - if ( !m_bAcceleratorMode ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Accelerator list element has to be used before!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - else - { - // read accelerator item - m_bItemCloseExpected = true; - - SvtAcceleratorConfigItem aItem; - - // read attributes for accelerator - for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - - if ( aName == ATTRIBUTE_URL ) - aItem.aCommand = aValue; - else if ( aName == ATTRIBUTE_MODIFIER ) - aItem.nModifier = (sal_uInt16)aValue.toInt32(); - else if ( aName == ATTRIBUTE_KEYCODE ) - aItem.nCode = (sal_uInt16)aValue.toInt32(); - } - - m_aReadAcceleratorList.push_back( aItem ); - } - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Unknown element found!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - -void SAL_CALL OReadAccelatorDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) -{ -} - -void SAL_CALL OReadAccelatorDocumentHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException, std::exception ) -{ - m_nElementDepth--; - - if ( aName == ELEMENT_ACCELERATORLIST ) - { - // acceleratorlist - if ( !m_bAcceleratorMode ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Accelerator list used twice!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else if ( aName == ELEMENT_ACCELERATORITEM ) - { - if ( !m_bItemCloseExpected ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Closing accelerator item element expected!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Unknown closing element found!"; - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index a73b87cf0011..a87ef191e08a 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1392,13 +1392,13 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre } UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const Sequence < PropertyValue >& rProps, - StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler ) + StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler ) { if( !xContent.is() ) return nullptr; UcbLockBytesRef xLockBytes = new UcbLockBytes; - xLockBytes->SetSynchronMode( !pHandler ); + xLockBytes->SetSynchronMode( true ); Reference< XActiveDataControl > xSink; if ( eOpenMode & StreamMode::WRITE ) xSink = static_cast<XActiveDataControl*>(new UcbStreamer_Impl( xLockBytes )); diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index 1fd6f5afdd37..ae3dbb6c7d21 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -67,13 +67,6 @@ namespace utl class UcbLockBytes; typedef tools::SvRef<UcbLockBytes> UcbLockBytesRef; -class UcbLockBytesHandler : public SvRefBase -{ -public: - UcbLockBytesHandler() - {} -}; - class UcbLockBytes : public virtual SvLockBytes { osl::Condition m_aInitialized; @@ -103,8 +96,7 @@ public: static UcbLockBytesRef CreateLockBytes( const css::uno::Reference < css::ucb::XContent >& xContent, const css::uno::Sequence < css::beans::PropertyValue >& rProps, StreamMode eMode, - const css::uno::Reference < css::task::XInteractionHandler >& xInter, - UcbLockBytesHandler* pHandler=nullptr ); + const css::uno::Reference < css::task::XInteractionHandler >& xInter ); static UcbLockBytesRef CreateInputLockBytes( const css::uno::Reference < css::io::XInputStream >& xContent ); static UcbLockBytesRef CreateLockBytes( const css::uno::Reference < css::io::XStream >& xContent ); diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index fbd7828ef9ed..51d4f65ef1e7 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -42,7 +42,7 @@ namespace utl static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler, - UcbLockBytesHandler* pHandler, bool bEnsureFileExists ) + bool bEnsureFileExists ) { SvStream* pStream = nullptr; Reference< XUniversalContentBroker > ucb( @@ -117,7 +117,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo rFileName, Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); xLockBytes = UcbLockBytes::CreateLockBytes( aContent.get(), Sequence < PropertyValue >(), - eOpenMode, xInteractionHandler, pHandler ); + eOpenMode, xInteractionHandler ); if ( xLockBytes.Is() ) { pStream = new SvStream( xLockBytes ); @@ -140,19 +140,19 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode ) { - return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), nullptr, true /* bEnsureFileExists */ ); + return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), true /* bEnsureFileExists */ ); } SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler ) { - return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, nullptr, true /* bEnsureFileExists */ ); + return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, true /* bEnsureFileExists */ ); } SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode, bool bFileExists ) { - return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), nullptr, !bFileExists ); + return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), !bFileExists ); } SvStream* UcbStreamHelper::CreateStream( const Reference < XInputStream >& xStream ) diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 48fac4ed2968..85361e2b0b38 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -67,10 +67,6 @@ struct InteractionHandlerData /** The UNO service name to use to instanciate the content provider. */ OUString ServiceName; - - InteractionHandlerData() {}; - explicit InteractionHandlerData(const OUString & rService) - : ServiceName( rService ){} }; typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; |