diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-16 10:11:04 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:19 -0400 |
commit | 2d2ae27b7e7aa147351655a40ed324b67cecf828 (patch) | |
tree | eb52bec1a946d147e3e8b9f3d5db6e250d533f85 /comphelper | |
parent | c5cdfe39d3afca716e7b11f8f8e169ce378861ea (diff) |
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other
plugins too.
Reviewed-on: https://gerrit.libreoffice.org/25057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae)
Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 15 | ||||
-rw-r--r-- | comphelper/source/inc/comphelper_module.hxx | 12 |
2 files changed, 6 insertions, 21 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index bc14d9ca6ac3..a600f3169abe 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -203,7 +203,7 @@ void EmbeddedObjectContainer::CloseEmbeddedObjects() { try { - xClose->close( sal_True ); + xClose->close( true ); } catch (const uno::Exception&) { @@ -502,7 +502,7 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject( //TODO/LATER: possible optimization, don't store immediately //xPersist->setPersistentEntry( pImpl->mxStorage, rName, embed::EntryInitModes::ENTRY_NO_INIT, aSeq, aSeq ); xPersist->storeAsEntry( pImpl->mxStorage, rName, aSeq, aSeq ); - xPersist->saveCompleted( sal_True ); + xPersist->saveCompleted( true ); } } } @@ -791,7 +791,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb { try { - xResult->close( sal_True ); + xResult->close( true ); } catch (const uno::Exception&) { @@ -949,7 +949,6 @@ bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, Embedde return false; } -//sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Bool bClose ) // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, bool bClose, bool bKeepToTempStorage ) { @@ -1116,7 +1115,7 @@ bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed: uno::Reference < ::util::XCloseable > xClose( xObj, uno::UNO_QUERY ); try { - xClose->close( sal_True ); + xClose->close( true ); } catch (const uno::Exception&) { @@ -1221,9 +1220,7 @@ bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < c xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) ); - uno::Any aAny; - aAny <<= rMediaType; - xPropSet->setPropertyValue("MediaType", aAny ); + xPropSet->setPropertyValue("MediaType", uno::Any(rMediaType) ); xPropSet->setPropertyValue("Compressed", uno::makeAny( true ) ); @@ -1621,7 +1618,7 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed:: { uno::Reference< util::XModifiable > xModif( xObj->getComponent(), uno::UNO_QUERY_THROW ); if ( xModif->isModified() ) - xModif->setModified( sal_False ); + xModif->setModified( false ); } catch (const uno::Exception&) { diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx index 2364adf95b6e..0007bd4940d2 100644 --- a/comphelper/source/inc/comphelper_module.hxx +++ b/comphelper/source/inc/comphelper_module.hxx @@ -40,18 +40,6 @@ namespace comphelper { namespace module }; /* -------------------------------------------------------------------- */ - class ComphelperModuleClient : public ::comphelper::OModuleClient - { - private: - typedef ::comphelper::OModuleClient BaseClass; - - public: - ComphelperModuleClient() : BaseClass( ComphelperModule::getInstance() ) - { - } - }; - - /* -------------------------------------------------------------------- */ template < class TYPE > class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE > { |