User: obo Date: 06/01/19 07:43:08 Modified: /dba/dbaccess/source/ui/misc/ DExport.cxx
Log: INTEGRATION: CWS dba202e (1.26.56); FILE MERGED 2006/01/03 09:43:26 oj 1.26.56.1: #i59833# exception caught File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: DExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/DExport.cxx?r1=1.27&r2=1.28 Delta lines: +30 -12 --------------------- --- DExport.cxx 16 Jan 2006 15:28:40 -0000 1.27 +++ DExport.cxx 19 Jan 2006 15:43:05 -0000 1.28 @@ -141,6 +141,12 @@ #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_ #include <com/sun/star/sdb/SQLContext.hpp> #endif +#ifndef _DBAUI_SQLMESSAGE_HXX_ +#include "sqlmessage.hxx" +#endif +#ifndef _SV_MSGBOX_HXX +#include <vcl/msgbox.hxx> +#endif #define CONTAINER_ENTRY_NOTFOUND ((ULONG)0xFFFFFFFF) @@ -168,7 +174,9 @@ const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) - :m_nColumnPos(0) + :m_pColumnList(pList) + ,m_pInfoMap(_pInfoMap) + ,m_nColumnPos(0) ,m_nRows(1) ,m_nRowCount(0) ,m_bError(FALSE) @@ -208,11 +216,6 @@ { SvtSysLocale aSysLocale; m_nLocale = aSysLocale.GetLocaleData().getLocale(); -// Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); -// m_nLocale.Language = ::comphelper::getString(aValue); -// String sLanguage, sCountry; -// ConvertLanguageToIsoNames(Window::GetSettings().GetLanguage(), sLanguage, sCountry); -// m_nLocale = Locale(sLanguage, sCountry, ::rtl::OUString()); } catch(Exception&) { @@ -227,6 +230,8 @@ const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) :m_xConnection(_rxConnection) + ,m_pColumnList(NULL) + ,m_pInfoMap(NULL) ,m_nColumnPos(0) ,m_nRows(1) ,m_nRowCount(0) @@ -236,7 +241,7 @@ ,m_bHead(TRUE) ,m_bDontAskAgain(sal_False) ,m_bIsAutoIncrement(sal_False) - ,m_aDestColumns(_rxConnection->getMetaData().is() && _rxConnection->getMetaData()->storesMixedCaseQuotedIdentifiers() == sal_True) + ,m_aDestColumns(_rxConnection->getMetaData().is() && _rxConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers() == sal_True) ,m_xFactory(_rM) ,m_pTypeInfo() ,m_bFoundTable(sal_False) @@ -247,11 +252,6 @@ { SvtSysLocale aSysLocale; m_nLocale = aSysLocale.GetLocaleData().getLocale(); -// Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); -// m_nLocale.Language = ::comphelper::getString(aValue); -// String sLanguage, sCountry; -// ConvertLanguageToIsoNames(Window::GetSettings().GetLanguage(), sLanguage, sCountry); -// m_nLocale = Locale(sLanguage, sCountry, ::rtl::OUString()); } catch(Exception&) { @@ -461,6 +461,7 @@ { OSL_ENSURE((m_nColumnPos) < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector"); + OSL_ENSURE(m_vColumns[m_nColumnPos].first < static_cast<sal_Int32>(m_vFormatKey.size()),"Illegal index for vector"); m_vFormatKey[m_vColumns[m_nColumnPos].first] = nFormat; // wird sp"ater f"ur die Column gebraucht switch(nType) { @@ -784,6 +785,23 @@ } return bError; +} +//--------------------------------------------------------------------------------- +void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException& e) +{ + if(!m_bDontAskAgain) + { + String aMsg(e.Message); + aMsg += '\n'; + aMsg += String(ModuleRes(STR_QRY_CONTINUE)); + OSQLMessageBox aBox(NULL, String(ModuleRes(STR_STAT_WARNING)), + aMsg, WB_YES_NO | WB_DEF_NO, OSQLMessageBox::Warning); + + if (aBox.Execute() == RET_YES) + m_bDontAskAgain = TRUE; + else + m_bError = TRUE; + } // if(!m_bDontAskAgain) } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
