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

[Bjoern Michaelsen]

 filter/source/graphicfilter/itiff/itiff.cxx |    5 ++++-
 vcl/source/control/throbber.cxx             |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dc86610d16a561ff1a0455d5fef157431f9271e3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Sep 4 16:33:43 2013 +0200

    fdo#68210: Make tiff import work again with merged-libs
    
    - there was a symbol mismatch for dynamic loading
    - while this fixes fdo#68210, similar fixes are likely needed for the other
      dynamically loaded functionality
    
    Change-Id: I7e4d6baf256dbe7b145dcbc118b4cac2075e07f5

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 7b47690..71bd7e0 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1358,7 +1358,10 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
 
 //================== GraphicImport - the exported function ================
 
-#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS)
+// this needs to be kept in sync with
+// ImpFilterLibCacheEntry::GetImportFunction() from
+// vcl/source/filter/graphicfilter.cxx
+#if defined(DISABLE_DYNLOADING)
 #define GraphicImport itiGraphicImport
 #endif
 
commit 2349713c72be2ce4069fa5be3062a18fd9318587
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Sep 4 16:28:07 2013 +0200

    remove macro breaking 'make vcl debug=T'
    
    Change-Id: I694480dc876f5990f5904cf39b15ea0c60ea816d

diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 457bb2e..bc4063f 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -174,7 +174,6 @@ void Throbber::initImages()
     }
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION();
     }
 }