connectivity/source/drivers/evoab2/NCatalog.cxx | 1 - connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 1 - connectivity/source/drivers/evoab2/NDriver.cxx | 1 - connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 1 - connectivity/source/drivers/evoab2/NTables.cxx | 1 - vcl/source/window/msgbox.cxx | 7 +++++-- 6 files changed, 5 insertions(+), 7 deletions(-)
New commits: commit aeab59f2b0565ae3adbb2b96e192ad3522574fd4 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Jan 24 17:04:42 2012 +0000 NDebug.hxx is gone now diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index b29349d..f505dc6 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -31,7 +31,6 @@ #include "NTables.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> -#include "NDebug.hxx" // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index d6faab5..45f93b9 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -29,7 +29,6 @@ #ifndef _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_ #define _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_ -#include "NDebug.hxx" #include "NConnection.hxx" #include "TDatabaseMetaDataBase.hxx" #include "FDatabaseMetaDataResultSet.hxx" diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 93009a0..04ec1b1 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/content.hxx> -#include "NDebug.hxx" #include <signal.h> #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index cf46818..88996b1 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -30,7 +30,6 @@ #include "NDatabaseMetaData.hxx" #include "connectivity/dbexception.hxx" #include <com/sun/star/sdbc/DataType.hpp> -#include "NDebug.hxx" #include "resource/evoab2_res.hrc" using namespace connectivity::evoab; diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 4dfd37b..84a88bb 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -40,7 +40,6 @@ #include "connectivity/dbexception.hxx" #include <cppuhelper/interfacecontainer.h> #include <comphelper/types.hxx> -#include "NDebug.hxx" #include "NTable.hxx" using namespace ::comphelper; commit 4be34f5e14c57e4663c140d2373c6ae693ada814 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Jan 24 16:56:50 2012 +0000 WaE: unused e diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index b42136c..07610d6 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -573,9 +573,12 @@ ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : Image ErrorBox::GetStandardImage() { - try { + try + { ImplInitMsgBoxImageList(); - } catch (const ::com::sun::star::uno::Exception &e) { + } + catch (const ::com::sun::star::uno::Exception &) + { // During early bootstrap we can have no initialized // ucb and hence no ability to get this image, so nop. return Image();
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits