[Libreoffice-commits] core.git: vcl/source

[Tomaž Vajngerl]

 vcl/source/graphic/UnoGraphicObject.cxx |   21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 060a4bf91b0409cda264fd6dec4093b7dd1e4c84
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Mar 15 20:15:40 2018 +0900

    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 at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

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();
 }
 
 }