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

[Caolán McNamara]

 stoc/source/tdmanager/tdmgr.cxx |   10 +++++-----
 xmloff/source/text/txtfldi.cxx  |    5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 165a53f3a7f08e65055e08ecd4cfc068c5d353b8
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Feb 8 11:45:18 2013 +0000

    Resolves: fdo#60132 Error reading file after inserting comment
    
    Change-Id: Ib2b388c78c8f44a626267c2f8d3975b46ead3bd5

diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 4b7dc53..d97281a 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3782,6 +3782,11 @@ void XMLAnnotationImportContext::PrepareField(
         while (xFields->hasMoreElements())
         {
             uno::Reference<beans::XPropertySet> 
xCurrField(xFields->nextElement(), uno::UNO_QUERY);
+            uno::Reference<beans::XPropertySetInfo> 
xPropsInfo(xCurrField->getPropertySetInfo());
+
+            if (!xPropsInfo->hasPropertyByName(sPropertyName))
+                continue;
+
             OUString aFieldName;
             xCurrField->getPropertyValue(sPropertyName) >>= aFieldName;
             if (aFieldName == aName)
commit af92c600ef755d3766393b2ef7956f5ac163410c
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Feb 8 11:43:21 2013 +0000

    catch exceptions by const ref
    
    Change-Id: Icaa4095b2032fa87f8ed4982940ba2a166665cef

diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index b1c5976..51af243 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -314,10 +314,10 @@ void ManagerImpl::initialize(
             {
                 insert( makeAny( xHA ) );
             }
-            catch (IllegalArgumentException &)
+            catch (const IllegalArgumentException &)
             {
             }
-            catch (ElementExistException &)
+            catch (const ElementExistException &)
             {
             }
         }
@@ -490,7 +490,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement )
                                 }
                             }
                         }
-                        catch (container::NoSuchElementException &)
+                        catch (const container::NoSuchElementException &)
                         {
                             // type not in: ok
                         }
@@ -1095,7 +1095,7 @@ Any ManagerImpl::getByHierarchicalName( const OUString & 
rName )
                         break;
                     }
                 }
-                catch (NoSuchElementException &)
+                catch (const NoSuchElementException &)
                 {
                 }
             }
@@ -1121,7 +1121,7 @@ sal_Bool ManagerImpl::hasByHierarchicalName( const 
OUString & rName )
     {
         return getByHierarchicalName( rName ).hasValue();
     }
-    catch (NoSuchElementException &)
+    catch (const NoSuchElementException &)
     {
     }
     return sal_False;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits