diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-15 20:15:40 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-16 01:55:13 +0100 |
| commit | 060a4bf91b0409cda264fd6dec4093b7dd1e4c84 (patch) | |
| tree | e85a877a2fd80bf5444879de29cf08c43f54dd3c | |
| parent | e4db2bcaef12877258f691febab1a1260dcf9916 (diff) | |
XGraphicObject: remove construct. with uniqueID
Also make getUniqueID return empty string.
Change-Id: I200a1facf088a205302991e5c26fe93adec55a87
Reviewed-on: https://gerrit.libreoffice.org/51330
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | vcl/source/graphic/UnoGraphicObject.cxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx index 8b1a1fa5e91e..668cfce9a78d 100644 --- a/vcl/source/graphic/UnoGraphicObject.cxx +++ b/vcl/source/graphic/UnoGraphicObject.cxx @@ -65,18 +65,9 @@ public: } }; -GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) +GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& /*args*/) { - if ( args.getLength() == 1 ) - { - OUString sId; - if ( !( args[ 0 ] >>= sId ) || sId.isEmpty() ) - throw lang::IllegalArgumentException(); - OString bsId(OUStringToOString(sId, RTL_TEXTENCODING_UTF8)); - mpGObject.reset( new GraphicObject( bsId ) ); - } - else - mpGObject.reset( new GraphicObject() ); + mpGObject.reset(new GraphicObject()); } uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() @@ -98,11 +89,9 @@ void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic > OUString SAL_CALL GObjectImpl::getUniqueID() { - ::osl::MutexGuard aGuard( m_aMutex ); - OUString sId; - if ( mpGObject.get() ) - sId = OStringToOUString(mpGObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); - return sId; + // not supported anymore so return empty string for now + osl::MutexGuard aGuard(m_aMutex); + return OUString(); } } |