[Libreoffice-commits] core.git: 2 commits - include/xmloff xmloff/source

[David Tardon]

 include/xmloff/unointerfacetouniqueidentifiermapper.hxx     |    1 +
 xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx |    8 ++++++++
 xmloff/source/core/xmlmultiimagehelper.cxx                  |    4 ++++
 3 files changed, 13 insertions(+)

New commits:
commit 2f2e4d88db426e3b09c8f4cf6bb8dd6bc5f349e4
Author: David Tardon <dtardon at redhat.com>
Date:   Fri May 3 15:19:25 2013 +0200

    add a warning
    
    Change-Id: I0baf90cfe8d3caa96f826695c1be4bc563864c00

diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 5919296..6f154bf 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -40,6 +40,7 @@ class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
 
 public:
     UnoInterfaceToUniqueIdentifierMapper();
+    ~UnoInterfaceToUniqueIdentifierMapper();
 
     /** returns a unique identifier for the given uno object. IF a uno object is
         registered more than once, the returned identifier is always the same.
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 4b2b9db..bbbc874 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -33,6 +33,14 @@ UnoInterfaceToUniqueIdentifierMapper::UnoInterfaceToUniqueIdentifierMapper()
 {
 }
 
+UnoInterfaceToUniqueIdentifierMapper::~UnoInterfaceToUniqueIdentifierMapper()
+{
+    SAL_WARN_IF( !maReserved.empty(), "xmloff",
+            "there are " << maReserved.size()
+            << " ids left. This means a data loss: some connection(s) to shape(s) are missing."
+    );
+}
+
 /** returns a unique identifier for the given uno object. IF a uno object is
     registered more than once, the returned identifier is always the same.
 */
commit 4f4f450eaf9dad85d28fcd58b01c0f51ff0bd5ef
Author: David Tardon <dtardon at redhat.com>
Date:   Fri May 3 14:58:26 2013 +0200

    fdo#60075 need to return context when available
    
    Change-Id: I53a83a3f2234dc061c23344116b0e294594f1c90

diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index e33c443..3d2dc77 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -129,6 +129,10 @@ const SvXMLImportContext* multiImageImportHelper::solveMultipleImages()
             removeGraphicFromImportContext(**maImplContextVector[a]);
         }
     }
+    else if (maImplContextVector.size() == 1)
+    {
+        pContext = *maImplContextVector.front();
+    }
 
     return pContext;
 }