[Libreoffice-commits] core.git: 2 commits - comphelper/source embeddedobj/source

[Michael Stahl]

 comphelper/source/container/embeddedobjectcontainer.cxx |   21 ++++++++++++----
 embeddedobj/source/msole/emboleobj.windows.component    |    2 -
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 63ca871bf8f14e0450e5da0dbcfa3ee5d48f1604
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Feb 8 19:29:07 2013 +0100

    fdo#60234 fdo#60492: fix emboleobj library on WNT:
    
    Use prefix consistently in all component files for the library.
    
    Change-Id: I58dce631f474e022be320c748f62238953a28e17

diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component
index d70f7dc..ac823ee 100644
--- a/embeddedobj/source/msole/emboleobj.windows.component
+++ b/embeddedobj/source/msole/emboleobj.windows.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="emboleobj"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.MSOLEObjectSystemCreator">
     <service name="com.sun.star.comp.embed.MSOLEObjectSystemCreator"/>
commit 44f74a0c2bee7e93bb94e135304f5078280dd760
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Feb 8 19:28:42 2013 +0100

    EmbeddedObjectContainer: log some exceptions
    
    Change-Id: I7356dfedc6121876641ef0e5f41d50db725980d4

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 60a4126..8f449b5 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -380,8 +380,10 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con
         // insert object into my list
         AddEmbeddedObject( xObj, rName );
     }
-    catch (const uno::Exception&)
+    catch (uno::Exception const& e)
     {
+        SAL_WARN("comphelper", "EmbeddedObjectContainer::Get_Impl: "
+                "exception caught: " << e.Message);
     }
 
     return xObj;
@@ -416,8 +418,10 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
         OSL_ENSURE( !xObj.is() || xObj->getCurrentState() != embed::EmbedStates::LOADED,
                     "A freshly create object should be running always!\n" );
     }
-    catch (const uno::Exception&)
+    catch (uno::Exception const& e)
     {
+        SAL_WARN("comphelper", "EmbeddedObjectContainer::CreateEmbeddedObject: "
+                "exception caught: " << e.Message);
     }
 
     return xObj;
@@ -523,8 +527,10 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < em
             }
         }
     }
-    catch (const uno::Exception&)
+    catch (uno::Exception const& e)
     {
+        SAL_WARN("comphelper", "EmbeddedObjectContainer::StoreEmbeddedObject: "
+                "exception caught: " << e.Message);
         // TODO/LATER: better error recovery should keep storage intact
         return sal_False;
     }
@@ -585,9 +591,12 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
             xProps->setPropertyValue( OUString( "MediaType" ),
                     uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) );
         }
-        catch (const uno::Exception&)
+        catch (uno::Exception const& e)
         {
             // complete disaster!
+            SAL_WARN("comphelper",
+                    "EmbeddedObjectContainer::InsertEmbeddedObject: "
+                    "exception caught: " << e.Message);
             return uno::Reference < embed::XEmbeddedObject >();
         }
     }
@@ -669,8 +678,10 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
 
         AddEmbeddedObject( xObj, rNewName );
     }
-    catch (const uno::Exception&)
+    catch (uno::Exception const& e)
     {
+        SAL_WARN("comphelper", "EmbeddedObjectContainer::InsertEmbeddedLink: "
+                "exception caught: " << e.Message);
     }
 
     return xObj;