dbaccess/Library_dbaxml.mk | 3 --- dbaccess/Library_dbu.mk | 4 ++-- dbaccess/Library_dbui.mk | 4 ++-- dbaccess/Library_sdbt.mk | 3 --- vcl/source/gdi/impimagetree.cxx | 13 ++++--------- 5 files changed, 8 insertions(+), 19 deletions(-)
New commits: commit eb1a4bb908534b68527a9746aca4b6d5dd6a538d Author: Gábor Stefanik <[email protected]> Date: Wed Apr 25 23:49:06 2012 +0200 Fix debug message and remove useless try...catch from ImplImageTree::loadImage diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 31f507c..14dfcd1 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -170,15 +170,10 @@ bool ImplImageTree::loadImage( if (found || !loadMissing) return found; - try { - OSL_TRACE( - "ImplImageTree::loadImage exception couldn't load \"%s\", fetching missing_icon.png", - rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr()); - found = loadDefaultImage(style, bitmap); - } catch (css::uno::RuntimeException &) { - throw; - } - return found; + OSL_TRACE( + "ImplImageTree::loadImage exception couldn't load \"%s\", fetching default image", + rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr()); + return loadDefaultImage(style, bitmap); } bool ImplImageTree::loadDefaultImage( commit d4e9eb3db2c9abcfdfbb0dc3889873db2f788e58 Author: Caolán McNamara <[email protected]> Date: Fri Apr 27 13:50:26 2012 +0100 WaE: exception handlers used in code without unwind support Change-Id: I1efec5017927d06c519f65312ab29e2b19a6cff6 diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 093a2eb..0854533 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -86,9 +86,6 @@ $(eval $(call gb_Library_add_exception_objects,dbaxml,\ dbaccess/source/filter/xml/xmlTableFilterList \ dbaccess/source/filter/xml/xmlTableFilterPattern \ dbaccess/source/shared/flt_reghelper \ -)) - -$(eval $(call gb_Library_add_noexception_objects,dbaxml,\ dbaccess/source/shared/xmlstrings \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 44d75b5..5d9462c 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -87,6 +87,7 @@ $(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu)) $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/shared/dbu_reghelper \ + dbaccess/source/shared/dbustrings \ dbaccess/source/ui/app/AppController \ dbaccess/source/ui/app/AppControllerDnD \ dbaccess/source/ui/app/AppControllerGen \ @@ -156,6 +157,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/dlg/indexdialog \ dbaccess/source/ui/dlg/indexfieldscontrol \ dbaccess/source/ui/dlg/odbcconfig \ + dbaccess/source/ui/dlg/optionalboolitem \ dbaccess/source/ui/dlg/paramdialog \ dbaccess/source/ui/dlg/queryfilter \ dbaccess/source/ui/dlg/queryorder \ @@ -266,9 +268,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ )) $(eval $(call gb_Library_add_noexception_objects,dbu,\ - dbaccess/source/shared/dbustrings \ dbaccess/source/ui/control/ScrollHelper \ - dbaccess/source/ui/dlg/optionalboolitem \ dbaccess/source/ui/querydesign/TableFieldInfo \ )) diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index a8f6aa2..ca2c126 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -98,6 +98,7 @@ $(eval $(call gb_Library_use_libraries,dbui,\ endif $(eval $(call gb_Library_add_exception_objects,dbui,\ + dbaccess/source/shared/dbustrings \ dbaccess/source/ui/app/AppDetailView \ dbaccess/source/ui/app/AppController \ dbaccess/source/ui/app/AppControllerDnD \ @@ -143,6 +144,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/dlg/dlgsave \ dbaccess/source/ui/dlg/admincontrols \ dbaccess/source/ui/dlg/adminpages \ + dbaccess/source/ui/dlg/optionalboolitem \ dbaccess/source/ui/dlg/queryorder \ dbaccess/source/ui/dlg/queryfilter \ dbaccess/source/ui/dlg/paramdialog \ @@ -274,14 +276,12 @@ $(eval $(call gb_Library_add_noexception_objects,dbui, \ dbaccess/source/ui/browser/AsyncronousLink \ dbaccess/source/ui/dlg/dlgsize \ dbaccess/source/ui/dlg/dlgattr \ - dbaccess/source/ui/dlg/optionalboolitem \ dbaccess/source/ui/querydesign/TableFieldInfo \ dbaccess/source/ui/querydesign/QTableConnectionData \ dbaccess/source/ui/querydesign/QTableWindowData \ dbaccess/source/ui/querydesign/ConnectionLine \ dbaccess/source/ui/querydesign/ConnectionLineData \ dbaccess/source/shared/dbu_reghelper \ - dbaccess/source/shared/dbustrings \ )) # the following source file can't be compiled with optimization by some compilers (crash or endless loop): diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index c6b0a80..fa49d96 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -63,9 +63,6 @@ $(eval $(call gb_Library_add_exception_objects,sdbt,\ dbaccess/source/sdbtools/connection/tablename \ dbaccess/source/sdbtools/misc/module_sdbt \ dbaccess/source/sdbtools/misc/sdbt_services \ -)) - -$(eval $(call gb_Library_add_noexception_objects,sdbt,\ dbaccess/source/shared/sdbtstrings \ ))
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
