[Libreoffice-commits] core.git: 2 commits - lingucomponent/source svx/source

[Caolán McNamara]

 lingucomponent/source/thesaurus/libnth/nthesimp.cxx |    2 -
 svx/source/fmcomp/gridcell.cxx                      |   25 ++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit d8e225304b7c8465f5e7f038ec02270445e1b600
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 20 13:04:54 2016 +0100

    Resolves: tdf#100845 exception during vcl painting -> std::terminate
    
    GetText throws under the circumstances described in the bug where
    the record is missing
    
    Change-Id: I03b0ce9a19d93a7eb8842831b433b80a20628541

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index d83fb06..5381909 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3535,17 +3535,24 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
             nStyle |= DrawTextFlags::Left;
     }
 
-    Color* pColor = nullptr;
-    OUString aText = GetText(_rxField, xFormatter, &pColor);
-    if (pColor != nullptr)
+    try
     {
-        Color aOldTextColor( rDev.GetTextColor() );
-        rDev.SetTextColor( *pColor );
-        rDev.DrawText(rRect, aText, nStyle);
-        rDev.SetTextColor( aOldTextColor );
+        Color* pColor = nullptr;
+        OUString aText = GetText(_rxField, xFormatter, &pColor);
+        if (pColor != nullptr)
+        {
+            Color aOldTextColor( rDev.GetTextColor() );
+            rDev.SetTextColor( *pColor );
+            rDev.DrawText(rRect, aText, nStyle);
+            rDev.SetTextColor( aOldTextColor );
+        }
+        else
+            rDev.DrawText(rRect, aText, nStyle);
+    }
+    catch (const Exception& e)
+    {
+        SAL_WARN("svx.form", "PaintFieldToCell: caught an exception: " << e.Message);
     }
-    else
-        rDev.DrawText(rRect, aText, nStyle);
 }
 
 FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
commit 8955a5e7665758653678fad530e2936036e56fc6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 20 09:57:21 2016 +0100

    The thesaruses are in mythes format
    
    Change-Id: Idf633d7d310c920ae605b7a1996d251352fad079

diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index ed5c675..08296b4 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -523,7 +523,7 @@ OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return OUString( "OpenOffice.org New Thesaurus" );
+    return OUString( "Mythes Thesaurus" );
 }
 
 void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )