diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /extensions/source | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/inc/componentmodule.hxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/multiplx.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/composeduiupdate.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/eformshelper.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/eventhandler.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcontroller.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/formmetadata.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/genericpropertyhandler.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/handlerhelper.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/propertyhandler.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/propeventtranslation.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/sqlcommanddesign.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/xsddatatypes.hxx | 4 | ||||
-rw-r--r-- | extensions/source/resource/oooresourceloader.hxx | 4 |
15 files changed, 29 insertions, 29 deletions
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 162125f357d6..79a6ebf3947f 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -59,7 +59,7 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto friend class OModuleResourceClient; private: - OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class + OModule() = delete; //TODO: get rid of this class protected: // resource administration diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx index 352efc23d3ef..05992289fe03 100644 --- a/extensions/source/plugin/inc/plugin/multiplx.hxx +++ b/extensions/source/plugin/inc/plugin/multiplx.hxx @@ -158,8 +158,8 @@ private: ::cppu::OMultiTypeInterfaceContainerHelper aListenerHolder; - MRCListenerMultiplexerHelper( const MRCListenerMultiplexerHelper & ) SAL_DELETED_FUNCTION; - MRCListenerMultiplexerHelper & operator = ( const MRCListenerMultiplexerHelper & ) SAL_DELETED_FUNCTION; + MRCListenerMultiplexerHelper( const MRCListenerMultiplexerHelper & ) = delete; + MRCListenerMultiplexerHelper & operator = ( const MRCListenerMultiplexerHelper & ) = delete; }; #endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MULTIPLX_HXX diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index e6292507ce3e..84fd9fe3633d 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -184,8 +184,8 @@ namespace pcr void callback_inspectorUIChanged_throw(); private: - ComposedPropertyUIUpdate( const ComposedPropertyUIUpdate& ) SAL_DELETED_FUNCTION; - ComposedPropertyUIUpdate& operator=( const ComposedPropertyUIUpdate& ) SAL_DELETED_FUNCTION; + ComposedPropertyUIUpdate( const ComposedPropertyUIUpdate& ) = delete; + ComposedPropertyUIUpdate& operator=( const ComposedPropertyUIUpdate& ) = delete; }; class ComposedUIAutoFireGuard diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index fac57b717013..2bd8ce785d59 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -246,8 +246,8 @@ namespace pcr impl_toggleBindingPropertyListening_throw( bool _bDoListen, const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull ); private: - EFormsHelper( const EFormsHelper& ) SAL_DELETED_FUNCTION; - EFormsHelper& operator=( const EFormsHelper& ) SAL_DELETED_FUNCTION; + EFormsHelper( const EFormsHelper& ) = delete; + EFormsHelper& operator=( const EFormsHelper& ) = delete; }; diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index d633e62f7f49..b6f895d98d19 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -240,8 +240,8 @@ namespace pcr bool impl_filterMethod_nothrow( const EventDescription& _rEvent ) const; private: - EventHandler( const EventHandler& ) SAL_DELETED_FUNCTION; - EventHandler& operator=( const EventHandler& ) SAL_DELETED_FUNCTION; + EventHandler( const EventHandler& ) = delete; + EventHandler& operator=( const EventHandler& ) = delete; }; diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index eb69debdc2fd..494dc833d4c1 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -434,8 +434,8 @@ namespace pcr DECL_LINK_TYPED( OnDesignerClosed, SQLCommandDesigner&, void ); private: - FormComponentPropertyHandler( const FormComponentPropertyHandler& ) SAL_DELETED_FUNCTION; - FormComponentPropertyHandler& operator=( const FormComponentPropertyHandler& ) SAL_DELETED_FUNCTION; + FormComponentPropertyHandler( const FormComponentPropertyHandler& ) = delete; + FormComponentPropertyHandler& operator=( const FormComponentPropertyHandler& ) = delete; private: using ::comphelper::OPropertyContainer::addPropertyChangeListener; diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index de27d389f9a6..768e271535b4 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -117,8 +117,8 @@ namespace pcr Create(const css::uno::Reference< css::uno::XComponentContext >&); private: - DialogController( const DialogController& ) SAL_DELETED_FUNCTION; - DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION; + DialogController( const DialogController& ) = delete; + DialogController& operator=( const DialogController& ) = delete; }; } // namespace pcr diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index d9ecba20a19c..b982d0dc9db3 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -95,8 +95,8 @@ namespace pcr virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const SAL_OVERRIDE; private: - DefaultEnumRepresentation( const DefaultEnumRepresentation& ) SAL_DELETED_FUNCTION; - DefaultEnumRepresentation& operator=( const DefaultEnumRepresentation& ) SAL_DELETED_FUNCTION; + DefaultEnumRepresentation( const DefaultEnumRepresentation& ) = delete; + DefaultEnumRepresentation& operator=( const DefaultEnumRepresentation& ) = delete; }; diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 3ada5af77596..b588ede600ef 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -136,8 +136,8 @@ namespace pcr impl_getEnumConverter( const css::uno::Type& _rEnumType ); private: - GenericPropertyHandler( const GenericPropertyHandler& ) SAL_DELETED_FUNCTION; - GenericPropertyHandler& operator=( const GenericPropertyHandler& ) SAL_DELETED_FUNCTION; + GenericPropertyHandler( const GenericPropertyHandler& ) = delete; + GenericPropertyHandler& operator=( const GenericPropertyHandler& ) = delete; }; diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index bc576bd6bf23..82b9f41de475 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -196,8 +196,8 @@ namespace pcr } private: - PropertyHandlerHelper( const PropertyHandlerHelper& ) SAL_DELETED_FUNCTION; - PropertyHandlerHelper& operator=( const PropertyHandlerHelper& ) SAL_DELETED_FUNCTION; + PropertyHandlerHelper( const PropertyHandlerHelper& ) = delete; + PropertyHandlerHelper& operator=( const PropertyHandlerHelper& ) = delete; }; diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index fd035e90e82a..e3d7975b140c 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -299,8 +299,8 @@ namespace pcr sal_Int16 impl_getDocumentMeasurementUnit_throw() const; private: - PropertyHandler( const PropertyHandler& ) SAL_DELETED_FUNCTION; - PropertyHandler& operator=( const PropertyHandler& ) SAL_DELETED_FUNCTION; + PropertyHandler( const PropertyHandler& ) = delete; + PropertyHandler& operator=( const PropertyHandler& ) = delete; }; diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index f52fd56e3c43..d65f921adda7 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -61,8 +61,8 @@ namespace pcr virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - PropertyEventTranslation( const PropertyEventTranslation& ) SAL_DELETED_FUNCTION; - PropertyEventTranslation& operator=( const PropertyEventTranslation& ) SAL_DELETED_FUNCTION; + PropertyEventTranslation( const PropertyEventTranslation& ) = delete; + PropertyEventTranslation& operator=( const PropertyEventTranslation& ) = delete; }; diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index c80fe5638c95..033f92d1a2d1 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -171,8 +171,8 @@ namespace pcr bool impl_trySuspendDesigner_nothrow() const; private: - SQLCommandDesigner( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION; - SQLCommandDesigner& operator=( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION; + SQLCommandDesigner( const SQLCommandDesigner& ) = delete; + SQLCommandDesigner& operator=( const SQLCommandDesigner& ) = delete; }; diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 0a7499dfb6b8..75b1058f8030 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -80,8 +80,8 @@ namespace pcr virtual ~XSDDataType(); private: - XSDDataType( const XSDDataType& ) SAL_DELETED_FUNCTION; - XSDDataType& operator=( const XSDDataType& ) SAL_DELETED_FUNCTION; + XSDDataType( const XSDDataType& ) = delete; + XSDDataType& operator=( const XSDDataType& ) = delete; }; diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index 9ee90a529b9a..8095f8efd67e 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -63,8 +63,8 @@ namespace extensions { namespace resource virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) SAL_DELETED_FUNCTION; - OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) SAL_DELETED_FUNCTION; + OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) = delete; + OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) = delete; css::uno::Reference< css::uno::XComponentContext> m_xContext; ::osl::Mutex m_aMutex; ResourceBundleCache m_aBundleCache; |