diff options
Diffstat (limited to 'dbaccess/source/ui')
38 files changed, 238 insertions, 252 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 1f6be558f551..21716791864d 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2000,11 +2000,11 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const if ( !aArguments.has( (::rtl::OUString)PROPERTY_SHOWMENU ) ) aArguments.put( (::rtl::OUString)PROPERTY_SHOWMENU, makeAny( (sal_Bool)sal_True ) ); - aDataSource <<= getDatabaseName(); + aDataSource <<= getDatabaseName(); } - Reference< XComponent > xComponent( pDesigner->openExisting( aDataSource, _sName, aArguments.getPropertyValues() ), UNO_QUERY ); - onDocumentOpened( _sName, _eType, _eOpenMode, xComponent, NULL ); + xRet.set( pDesigner->openExisting( aDataSource, _sName, aArguments.getPropertyValues() ) ); + onDocumentOpened( _sName, _eType, _eOpenMode, xRet, NULL ); } } break; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 989ceacdc1f0..c532c0d45fe7 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -876,7 +876,6 @@ void OApplicationController::getSupportedFormats(ElementType _eType,::std::vecto _rFormatIds.push_back(SOT_FORMATSTR_ID_DBACCESS_TABLE); _rFormatIds.push_back(SOT_FORMAT_RTF); _rFormatIds.push_back(SOT_FORMATSTR_ID_HTML); - _rFormatIds.push_back(SOT_FORMATSTR_ID_HTML_SIMPLE); // run through case E_QUERY: _rFormatIds.push_back(SOT_FORMATSTR_ID_DBACCESS_QUERY); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index f4c7a4eca31d..50e357b687b8 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -181,6 +181,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star; +using ::com::sun::star::awt::XTabController; namespace dbaui { @@ -1299,18 +1300,18 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName, aArgs[3].Name = PROPERTY_SHOWMENU; aArgs[3].Value <<= sal_False; - Reference<XFrame> xFrame( pDispatcher->openExisting( makeAny( _sDataSourceName ), _sName, aArgs ), UNO_QUERY ); - sal_Bool bClearPreview = !xFrame.is(); + Reference< XController > xPreview( pDispatcher->openExisting( makeAny( _sDataSourceName ), _sName, aArgs ), UNO_QUERY ); + sal_Bool bClearPreview = !xPreview.is(); // clear the preview when the query or table could not be loaded if ( !bClearPreview ) { - Reference<awt::XTabController> xController(xFrame->getController(),UNO_QUERY); - bClearPreview = !xController.is(); + Reference< XTabController > xTabController( xPreview, UNO_QUERY ); + bClearPreview = !xTabController.is(); if ( !bClearPreview ) { - Reference<XLoadable> xLoadable(xController->getModel(),UNO_QUERY); - bClearPreview = !(xLoadable.is() && xLoadable->isLoaded()); + Reference< XLoadable > xLoadable( xTabController->getModel(), UNO_QUERY ); + bClearPreview = !( xLoadable.is() && xLoadable->isLoaded() ); } } if ( bClearPreview ) diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 513cb9485f4c..5a6f11ebf840 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -164,7 +164,7 @@ namespace dbaui // ----------------------------------------------------------------------------- sal_Bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) { - if (nUserObjectId == SOT_FORMAT_RTF || nUserObjectId == SOT_FORMATSTR_ID_HTML || nUserObjectId == SOT_FORMATSTR_ID_HTML_SIMPLE) + if (nUserObjectId == SOT_FORMAT_RTF || nUserObjectId == SOT_FORMATSTR_ID_HTML ) { ODatabaseImportExport* pExport = reinterpret_cast<ODatabaseImportExport*>(pUserObject); if ( pExport && rxOStm.Is() ) @@ -185,10 +185,7 @@ namespace dbaui // HTML? if (m_pHtml) - { AddFormat(SOT_FORMATSTR_ID_HTML); - AddFormat(SOT_FORMATSTR_ID_HTML_SIMPLE); - } ODataAccessObjectTransferable::AddSupportedFormats(); } @@ -196,8 +193,7 @@ namespace dbaui // ----------------------------------------------------------------------------- sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor ) { - ULONG nFormat = SotExchange::GetFormat(rFlavor); - sal_uInt32 nHtml = SOT_FORMATSTR_ID_HTML_SIMPLE; + const ULONG nFormat = SotExchange::GetFormat(rFlavor); switch (nFormat) { case SOT_FORMAT_RTF: @@ -205,12 +201,9 @@ namespace dbaui m_pRtf->initialize(getDescriptor()); return m_pRtf && SetObject(m_pRtf, SOT_FORMAT_RTF, rFlavor); case SOT_FORMATSTR_ID_HTML: - nHtml = SOT_FORMATSTR_ID_HTML; - // run through - case SOT_FORMATSTR_ID_HTML_SIMPLE: if ( m_pHtml ) m_pHtml->initialize(getDescriptor()); - return m_pHtml && SetObject(m_pHtml, nHtml, rFlavor); + return m_pHtml && SetObject(m_pHtml, SOT_FORMATSTR_ID_HTML, rFlavor); } return ODataAccessObjectTransferable::GetData( rFlavor ); @@ -219,8 +212,16 @@ namespace dbaui // ----------------------------------------------------------------------------- void ODataClipboard::ObjectReleased() { - m_pHtml = NULL; - m_pRtf = NULL; + if ( m_pHtml ) + { + m_pHtml->dispose(); + m_pHtml = NULL; + } // if ( m_pHtml ) + if ( m_pRtf ) + { + m_pRtf->dispose(); + m_pRtf = NULL; + } m_aEventListeners.clear(); Reference<XConnection> xConnection; Reference<XResultSet> xProp; @@ -237,16 +238,30 @@ namespace dbaui Reference<XConnection> xConnection; Reference<XResultSet> xProp; if ( getDescriptor().has(daConnection) && (getDescriptor()[daConnection] >>= xConnection) ) + { lcl_removeListener(xConnection,this); + getDescriptor().erase(daConnection); + } // if ( getDescriptor().has(daConnection) && (getDescriptor()[daConnection] >>= xConnection) ) if ( getDescriptor().has(daCursor) && (getDescriptor()[daCursor] >>= xProp) ) + { lcl_removeListener(xProp,this); + getDescriptor().erase(daCursor); + } // if ( getDescriptor().has(daCursor) && (getDescriptor()[daCursor] >>= xProp) ) + + if ( getDescriptor().has(daColumnObject) ) + getDescriptor().erase(daColumnObject); + + if ( getDescriptor().has(daComponent) ) + getDescriptor().erase(daComponent); + ClearFormats(); - getDescriptor().clear(); + //getDescriptor().clear(); + AddSupportedFormats(); - m_pHtml = NULL; + /*m_pHtml = NULL; m_pRtf = NULL; - m_aEventListeners.clear(); + m_aEventListeners.clear();*/ } // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2( ODataClipboard, ODataAccessObjectTransferable, TDataClipboard_BASE ) diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index dfda4b4f119b..0251b6f653b8 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1503,7 +1503,6 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) { // case SOT_FORMAT_RTF: // RTF data descriptions // case SOT_FORMATSTR_ID_HTML: // HTML data descriptions -// case SOT_FORMATSTR_ID_HTML_SIMPLE: // HTML data descriptions case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index f9a01133b215..58335c5cd230 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -952,7 +952,7 @@ DBG_NAME(OConnectionHelper) { String sFile = String( ModuleRes( STR_FILE_DOES_NOT_EXIST ) ); sFile.SearchAndReplaceAscii("$file$", aTransformer.get(OFileNotation::N_SYSTEM)); - OSQLMessageBox(this,String(ModuleRes(STR_STAT_WARNING)),sFile).Execute(); + OSQLWarningBox( this, sFile ).Execute(); setURLNoPrefix(sOldPath); SetRoadmapStateValue(sal_False); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 533ff93d5820..8018b424ee95 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -229,6 +229,7 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_APPEND_TABLE_ALIAS, INFO_APPEND_TABLE_ALIAS)); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_AS_BEFORE_CORRNAME, INFO_AS_BEFORE_CORRELATION_NAME ) ); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CHECK_REQUIRED_FIELDS, INFO_FORMS_CHECK_REQUIRED_FIELDS ) ); + m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_ESCAPE_DATETIME, INFO_ESCAPE_DATETIME ) ); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_PARAMETERNAMESUBST, INFO_PARAMETERNAMESUBST)); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_IGNOREDRIVER_PRIV, INFO_IGNOREDRIVER_PRIV)); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_BOOLEANCOMPARISON, PROPERTY_BOOLEANCOMPARISONMODE)); diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index d9ae183a0c7a..15c40b3e40c5 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -59,6 +59,7 @@ void ODriversSettings::getSupportedIndirectSettings( ::dbaccess::DATASOURCE_TYPE DSID_AUTOINCREMENTVALUE, DSID_AUTORETRIEVEVALUE, DSID_BOOLEANCOMPARISON, + DSID_ESCAPE_DATETIME, 0 }; for ( const USHORT* pGenericKnowSetting = nGenericKnownSettings; *pGenericKnowSetting; ++pGenericKnowSetting ) diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src index e3adfea5c0ad..e2d599befef9 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src @@ -1,4 +1,4 @@ -/************************************************************************* +/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -89,3 +89,4 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG TabStop = TRUE ; }; }; + diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index bc070485fea2..63312762c7b8 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -31,60 +31,27 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBAUI_USERADMINDLG_HXX -#include "UserAdminDlg.hxx" -#endif -#ifndef DBAUI_USERADMINDLG_HRC -#include "UserAdminDlg.hrc" -#endif -#ifndef _DBU_DLG_HRC_ +#include "adminpages.hxx" +#include "DbAdminImpl.hxx" #include "dbu_dlg.hrc" -#endif -#ifndef _DBAUI_DATASOURCEITEMS_HXX_ +#include "DriverSettings.hxx" #include "dsitems.hxx" -#endif -#ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> -#endif -#ifndef _SFXENUMITEM_HXX +#include "propertysetitem.hxx" +#include "UITools.hxx" +#include "UserAdmin.hxx" +#include "UserAdminDlg.hrc" +#include "UserAdminDlg.hxx" + +#include <comphelper/componentcontext.hxx> +#include <connectivity/dbmetadata.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <svtools/eitem.hxx> -#endif -#ifndef _SFXINTITEM_HXX #include <svtools/intitem.hxx> -#endif -#ifndef _VCL_STDTEXT_HXX -#include <vcl/stdtext.hxx> -#endif -#ifndef _SV_MSGBOX_HXX +#include <svtools/stritem.hxx> +#include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> -#endif -#ifndef _DBAUI_DATASOURCEITEMS_HXX_ -#include "dsitems.hxx" -#endif -#ifndef DBAUI_DRIVERSETTINGS_HXX -#include "DriverSettings.hxx" -#endif -#ifndef _DBAUI_DBADMINIMPL_HXX_ -#include "DbAdminImpl.hxx" -#endif -#ifndef _DBAUI_PROPERTYSETITEM_HXX_ -#include "propertysetitem.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ -#include "adminpages.hxx" -#endif -#ifndef DBAUI_USERADMIN_HXX -#include "UserAdmin.hxx" -#endif -#ifndef DBAUI_TOOLS_HXX -#include "UITools.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADEFINITIONSUPPLIER_HPP_ -#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XUSERSSUPPLIER_HPP_ -#include <com/sun/star/sdbcx/XUsersSupplier.hpp> -#endif +#include <vcl/stdtext.hxx> + //......................................................................... namespace dbaui { @@ -147,37 +114,22 @@ DBG_NAME(OUserAdminDlg) { try { - Reference<XUsersSupplier> xUsersSup(m_xConnection,UNO_QUERY); - sal_Bool bError = sal_False; - if ( !xUsersSup.is() ) - { - Reference< XDataDefinitionSupplier > xDriver(getDriver(),UNO_QUERY); - bError = !xDriver.is(); - if ( !bError ) - { - m_xConnection = createConnection().first; - bError = !m_xConnection.is(); - - if ( !bError ) - { - // now set the tables supplier at the table control - xUsersSup.set(xDriver->getDataDefinitionByConnection(m_xConnection),UNO_QUERY); - } - } - } - bError = ! ( xUsersSup.is() && xUsersSup->getUsers().is()); - - if ( bError ) + ::dbtools::DatabaseMetaData aMetaData( createConnection().first ); + if ( !aMetaData.supportsUserAdministration( ::comphelper::ComponentContext( getORB() ) ) ) { String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); } } - catch(SQLException& e) + catch(const SQLException& e) { - ::dbaui::showError(::dbtools::SQLExceptionInfo(e),GetParent(),getORB()); + ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), GetParent(), getORB() ); return RET_CANCEL; } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } short nRet = SfxTabDialog::Execute(); if ( nRet == RET_OK ) m_pImpl->saveChanges(*GetOutputItemSet()); diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index ffc6e1cb8080..7b930b81e4ab 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -97,6 +97,7 @@ namespace dbaui ,m_pDosLineEnds( NULL ) ,m_pCheckRequiredFields( NULL ) ,m_pIgnoreCurrency(NULL) + ,m_pEscapeDateTime(NULL) ,m_pBooleanComparisonModeLabel( NULL ) ,m_pBooleanComparisonMode( NULL ) ,m_aControlDependencies() @@ -112,9 +113,11 @@ namespace dbaui ++setting ) { - if ( aDSUI.hasSetting( setting->nItemId ) ) + USHORT nItemId = setting->nItemId; + if ( aDSUI.hasSetting( nItemId ) ) { - (*setting->ppControl) = new CheckBox( this, ModuleRes( setting->nControlResId ) ); + USHORT nID = setting->nControlResId; + (*setting->ppControl) = new CheckBox( this, ModuleRes( nID ) ); (*setting->ppControl)->SetClickHdl( getControlModifiedLink() ); } } @@ -181,6 +184,7 @@ namespace dbaui DELETEZ( m_pDosLineEnds ); DELETEZ( m_pCheckRequiredFields ); DELETEZ( m_pIgnoreCurrency ); + DELETEZ( m_pEscapeDateTime ); DELETEZ( m_pBooleanComparisonModeLabel ); DELETEZ( m_pBooleanComparisonMode ); } @@ -205,11 +209,16 @@ namespace dbaui { &m_pDosLineEnds, CB_DOSLINEENDS, DSID_DOSLINEENDS, false }, { &m_pCheckRequiredFields, CB_CHECK_REQUIRED, DSID_CHECK_REQUIRED_FIELDS, false }, { &m_pIgnoreCurrency, CB_IGNORECURRENCY, DSID_IGNORECURRENCY, false }, + { &m_pEscapeDateTime, CB_ESCAPE_DATETIME, DSID_ESCAPE_DATETIME, false }, { NULL, 0, 0, false } }; for ( const BooleanSettingDesc* pCopy = aSettings; pCopy->nItemId != 0; ++pCopy ) + { + USHORT nID = pCopy->nItemId; + (void) nID; m_aBooleanSettings.push_back( *pCopy ); + } } // ----------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/advancedsettings.hrc b/dbaccess/source/ui/dlg/advancedsettings.hrc index f1f6cd5bcde6..8bd0063fc4d6 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hrc +++ b/dbaccess/source/ui/dlg/advancedsettings.hrc @@ -63,6 +63,7 @@ #define CB_AS_BEFORE_CORR_NAME 12 #define CB_CHECK_REQUIRED 13 #define CB_IGNORECURRENCY 14 +#define CB_ESCAPE_DATETIME 15 #define ET_AUTOINCREMENTVALUE 1 #define ET_RETRIEVE_AUTO 2 diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 6349f87ff2d1..78a572d7fb0f 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -73,6 +73,7 @@ namespace dbaui CheckBox* m_pDosLineEnds; CheckBox* m_pCheckRequiredFields; CheckBox* m_pIgnoreCurrency; + CheckBox* m_pEscapeDateTime; FixedText* m_pBooleanComparisonModeLabel; ListBox* m_pBooleanComparisonMode; diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src index be6a97bd1ce4..acb5fbb81656 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.src +++ b/dbaccess/source/ui/dlg/advancedsettings.src @@ -199,6 +199,17 @@ Text [ en-US ] = "Form data input checks for required fields"; \ }; +#define AUTO_ESCAPE_DATETIME(AUTO_Y) \ + CheckBox CB_ESCAPE_DATETIME \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_ESCAPE_DATETIME; \ + Text [ en-US ] = "Use ODBC conformant date/time literals"; \ + }; + + //------------------------------------------------------------------------- #define WORKAROUND \ @@ -310,7 +321,8 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL AUTO_DOSLINEENDS( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_CHECKREQUIRED( 12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_IGNORECURRENCY( 13*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 12*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_BOOLEANCOMPARISON( 14*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 13*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) + AUTO_ESCAPE_DATETIME( 14*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 14*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_BOOLEANCOMPARISON( 15*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 13*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) }; //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/datasourceui.cxx b/dbaccess/source/ui/dlg/datasourceui.cxx index a255222c13b3..aa4c0e7f8444 100644 --- a/dbaccess/source/ui/dlg/datasourceui.cxx +++ b/dbaccess/source/ui/dlg/datasourceui.cxx @@ -92,6 +92,7 @@ namespace dbaui case DSID_AUTOINCREMENTVALUE: return rAdvancedSupport.bGeneratedValues; case DSID_AUTORETRIEVEVALUE: return rAdvancedSupport.bGeneratedValues; case DSID_IGNORECURRENCY: return rAdvancedSupport.bIgnoreCurrency; + case DSID_ESCAPE_DATETIME: return rAdvancedSupport.bEscapeDateTime; } OSL_ENSURE( false, "DataSourceUI::hasSetting: this item id is currently not supported!" ); diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index d025641477d6..a28567c6b0af 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -410,7 +410,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, String()); *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, String::CreateFromAscii("txt")); *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); - *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_True); + *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100); *pCounter++ = new SfxBoolItem(DSID_SUPPRESSVERSIONCL, sal_False); *pCounter++ = new OPropertySetItem(DSID_DATASOURCE_UNO); @@ -445,6 +445,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, String()); + *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True); // must be the same as in ModelImpl.cxx // create the pool static SfxItemInfo __READONLY_DATA aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] = @@ -504,10 +505,11 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp {0,0}, {0,0}, {0,0}, + {0,0}, /* for Escape DateTime*/ {0,0} }; - OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invlaid Ids!"); + OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!"); _rpPool = new SfxItemPool(String::CreateFromAscii("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/dbaccess/source/ui/dlg/dsitems.hxx b/dbaccess/source/ui/dlg/dsitems.hxx index ad0ca3ce780f..75316232684b 100644 --- a/dbaccess/source/ui/dlg/dsitems.hxx +++ b/dbaccess/source/ui/dlg/dsitems.hxx @@ -90,6 +90,7 @@ #define DSID_CHECK_REQUIRED_FIELDS 54 #define DSID_IGNORECURRENCY 55 #define DSID_CONN_SOCKET 56 +#define DSID_ESCAPE_DATETIME 57 // don't forget to adjust DSID_LAST_ITEM_ID below! @@ -97,7 +98,7 @@ //= item range. Adjust this if you introduce new items above #define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_CONN_SOCKET +#define DSID_LAST_ITEM_ID DSID_ESCAPE_DATETIME #endif // _DBAUI_DATASOURCEITEMS_HXX_ diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 0130a44e2ab0..bd5a4c1e6392 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -768,6 +768,15 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) return 0; } +//================================================================== +// OSQLWarningBox +//================================================================== +OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, WinBits _nStyle, + const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) + :OSQLMessageBox( _pParent, String( ModuleRes( STR_STAT_WARNING ) ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) +{ +} + //......................................................................... } // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 0f3bb3f73c0a..bbcd265c5f34 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -379,16 +379,11 @@ DBG_NAME(OTableSubscriptionPage) Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); sal_Bool bModified = ( xModi.is() && xModi->isModified() ); - Sequence< ::rtl::OUString> aNewTableFilter(1),aEmpty(3); + Sequence< ::rtl::OUString > aNewTableFilter(1); aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); - static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW")); - static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - aEmpty[0] = s_sTableTypeView; - aEmpty[1] = s_sTableTypeTable; - aEmpty[2] = aNewTableFilter[0]; - xProp->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(aEmpty)); + xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); Reference< ::com::sun::star::lang::XEventListener> xEvt; aErrorInfo = ::dbaui::createConnection(xProp,m_xORB,xEvt,m_xCurrentConnection); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index bf60736df901..c0b5e77cc403 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -76,7 +76,6 @@ namespace dbaui { case SOT_FORMAT_RTF: // RTF data descriptions case SOT_FORMATSTR_ID_HTML: // HTML data descriptions - case SOT_FORMATSTR_ID_HTML_SIMPLE: // HTML data descriptions case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor return (E_TABLE == eEntryType); case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index c373cc835b40..2eb162a05020 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -93,15 +93,9 @@ namespace dbaui class ODatabaseImportExport : public ODatabaseImportExport_BASE { private: - void disposing(); void impl_initializeRowMember_throw(); protected: - typedef ::utl::SharedUNOComponent < ::com::sun::star::frame::XModel - , ::utl::CloseableComponent - > SharedModel; - - protected: ::com::sun::star::lang::Locale m_aLocale; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; SvStream* m_pStream; @@ -114,7 +108,6 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xRowSetColumns; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; - SharedModel m_aKeepModelAlive; ::rtl::OUString m_sName; //dyf add 20070601 @@ -123,6 +116,7 @@ namespace dbaui //dyf add end ::rtl::OUString m_sDataSourceName; sal_Int32 m_nCommandType; + bool m_bNeedToReInitialize; #if defined UNX static const char __FAR_DATA sNewLine; @@ -158,17 +152,18 @@ namespace dbaui void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; } //dyf add end - virtual BOOL Write() = 0; // Export - virtual BOOL Read() = 0; // Import + virtual BOOL Write(); // Export + virtual BOOL Read(); // Import void initialize(const ::svx::ODataAccessDescriptor& _aDataDescriptor); - - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + void dispose(); void enableCheckOnly() { m_bCheckOnly = sal_True; } sal_Bool isCheckEnabled() const { return m_bCheckOnly; } + private: + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); void impl_initFromDescriptor( const ::svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 174d42803086..88053668a4ed 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -109,6 +109,8 @@ namespace dbaui bool bFormsCheckRequiredFields; bool bIgnoreCurrency; bool bAutoIncrementIsPrimaryKey; + bool bEscapeDateTime; + // Note: If you extend this list, you need to adjust the ctor (of course) // and (maybe) the implementation of supportsAnySpecialSetting @@ -129,6 +131,7 @@ namespace dbaui ,bFormsCheckRequiredFields ( true ) ,bIgnoreCurrency ( false ) ,bAutoIncrementIsPrimaryKey ( false ) + ,bEscapeDateTime ( false ) { } @@ -156,6 +159,7 @@ namespace dbaui || ( bFormsCheckRequiredFields == true ) || ( bIgnoreCurrency == true ) || ( bAutoIncrementIsPrimaryKey == true ) + || ( bEscapeDateTime == true ) ; } diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 190cbbfe1d67..088ea8a1ac42 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -100,7 +100,7 @@ public: ); /** display a database related error message - <p/> + @param rTitle the title to display @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version @@ -126,6 +126,18 @@ private: void impl_addDetailsButton(); }; +//================================================================== +// OSQLWarningBox +//================================================================== +class OSQLWarningBox : public OSQLMessageBox +{ +public: + OSQLWarningBox( Window* _pParent, + const UniString& _rMessage, + WinBits _nStyle = WB_OK | WB_DEF_OK, + const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); +}; + //......................................................................... } // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index fe31c60abc3b..b366695301a0 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -857,8 +857,7 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException 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); + OSQLWarningBox aBox( NULL, aMsg, WB_YES_NO | WB_DEF_NO ); if (aBox.Execute() == RET_YES) m_bDontAskAgain = TRUE; diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 444af3fba2a7..3098e4b88eb6 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -264,8 +264,7 @@ sal_Bool ORowSetImportExport::insertNewRow() if(!m_bAlreadyAsked) { String sAskIfContinue = String(ModuleRes(STR_ERROR_OCCURED_WHILE_COPYING)); - String sTitle = String(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aDlg(m_pParent,sTitle,sAskIfContinue,WB_YES_NO|WB_DEF_YES,OSQLMessageBox::Warning); + OSQLWarningBox aDlg( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ); if(aDlg.Execute() == RET_YES) m_bAlreadyAsked = sal_True; else diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 299926f222b8..b2760e4d2e51 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -299,12 +299,12 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId { DropDescriptor aTrans; if ( _nFormatId != SOT_FORMAT_RTF ) - const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(_rTransData.HasFormat(SOT_FORMATSTR_ID_HTML) ? SOT_FORMATSTR_ID_HTML : SOT_FORMATSTR_ID_HTML_SIMPLE,aTrans.aHtmlRtfStorage); + const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SOT_FORMATSTR_ID_HTML ,aTrans.aHtmlRtfStorage); else const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SOT_FORMAT_RTF,aTrans.aHtmlRtfStorage); aTrans.nType = E_TABLE; - aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId || SOT_FORMATSTR_ID_HTML_SIMPLE == _nFormatId; + aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any())); @@ -331,8 +331,6 @@ void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData pasteTable( SOT_FORMATSTR_ID_DBACCESS_TABLE,_rTransData,_sDestDataSourceName,_xConnection); else if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_HTML) ) pasteTable( SOT_FORMATSTR_ID_HTML,_rTransData,_sDestDataSourceName,_xConnection); - else if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_HTML_SIMPLE) ) - pasteTable( SOT_FORMATSTR_ID_HTML_SIMPLE,_rTransData,_sDestDataSourceName,_xConnection); else if ( _rTransData.HasFormat(SOT_FORMAT_RTF) ) pasteTable( SOT_FORMAT_RTF,_rTransData,_sDestDataSourceName,_xConnection); } @@ -365,8 +363,7 @@ sal_Bool OTableCopyHelper::isTableFormat(const TransferableDataHelper& _rClipboa sal_Bool bTableFormat = _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) || _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) || _rClipboard.HasFormat(SOT_FORMAT_RTF) - || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML) - || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML_SIMPLE); + || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML); return bTableFormat; } @@ -376,11 +373,11 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD ,const SharedConnection& _xConnection) { sal_Bool bRet = sal_False; - sal_Bool bHtml = _aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML) || _aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML_SIMPLE); + sal_Bool bHtml = _aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML); if ( bHtml || _aDroppedData.HasFormat(SOT_FORMAT_RTF) ) { if ( bHtml ) - const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(_aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML) ? SOT_FORMATSTR_ID_HTML : SOT_FORMATSTR_ID_HTML_SIMPLE,_rAsyncDrop.aHtmlRtfStorage); + const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SOT_FORMATSTR_ID_HTML ,_rAsyncDrop.aHtmlRtfStorage); else const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SOT_FORMAT_RTF,_rAsyncDrop.aHtmlRtfStorage); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index db8bd6e5e21f..0910808a5f9d 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -135,6 +135,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; @@ -163,6 +164,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& :m_xFormatter(_rxNumberF) ,m_xFactory(_rM) ,m_nCommandType(CommandType::TABLE) + ,m_bNeedToReInitialize(sal_False) ,m_pReader(NULL) ,m_pRowMarker(NULL) ,m_bInInitialize(sal_False) @@ -192,6 +194,7 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& ,m_xFormatter(_rxNumberF) ,m_xFactory(_rM) ,m_nCommandType(::com::sun::star::sdb::CommandType::TABLE) + ,m_bNeedToReInitialize(sal_False) ,m_pReader(NULL) ,m_pRowMarker(NULL) ,m_bInInitialize(sal_False) @@ -214,14 +217,14 @@ ODatabaseImportExport::~ODatabaseImportExport() DBG_DTOR(ODatabaseImportExport,NULL); acquire(); - disposing(); + dispose(); if(m_pReader) m_pReader->release(); delete m_pRowMarker; } // ----------------------------------------------------------------------------- -void ODatabaseImportExport::disposing() +void ODatabaseImportExport::dispose() { DBG_CHKTHIS(ODatabaseImportExport,NULL); // remove me as listener @@ -240,8 +243,6 @@ void ODatabaseImportExport::disposing() m_xResultSet.clear(); m_xRow.clear(); m_xFormatter.clear(); - - m_aKeepModelAlive.clear(); } // ----------------------------------------------------------------------------- void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) @@ -251,9 +252,10 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro if(m_xConnection.is() && m_xConnection == xCon) { m_xConnection.clear(); - disposing(); - if(!m_bInInitialize) - initialize(); + dispose(); + m_bNeedToReInitialize = true; + //if(!m_bInInitialize) + // initialize(); } } // ----------------------------------------------------------------------------- @@ -266,30 +268,36 @@ void ODatabaseImportExport::initialize( const ODataAccessDescriptor& _aDataDescr void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit) { DBG_CHKTHIS(ODatabaseImportExport,NULL); - m_sDataSourceName = _aDataDescriptor.getDataSource(); - _aDataDescriptor[daCommandType] >>= m_nCommandType; - _aDataDescriptor[daCommand] >>= m_sName; - // some additonal information - if(_aDataDescriptor.has(daConnection)) - { - Reference< XConnection > xPureConn( _aDataDescriptor[daConnection], UNO_QUERY ); - m_xConnection.reset( xPureConn, SharedConnection::NoTakeOwnership ); - } - if(_aDataDescriptor.has(daSelection)) - _aDataDescriptor[daSelection] >>= m_aSelection; - - sal_Bool bBookmarkSelection = sal_True; // the default if not present - if ( _aDataDescriptor.has( daBookmarkSelection ) ) + if ( !_bPlusDefaultInit ) { - _aDataDescriptor[ daBookmarkSelection ] >>= bBookmarkSelection; - DBG_ASSERT( !bBookmarkSelection, "ODatabaseImportExport::ODatabaseImportExport: bookmarked selection not yet supported!" ); - } + m_sDataSourceName = _aDataDescriptor.getDataSource(); + _aDataDescriptor[daCommandType] >>= m_nCommandType; + _aDataDescriptor[daCommand] >>= m_sName; + // some additonal information + if(_aDataDescriptor.has(daConnection)) + { + Reference< XConnection > xPureConn( _aDataDescriptor[daConnection], UNO_QUERY ); + m_xConnection.reset( xPureConn, SharedConnection::NoTakeOwnership ); + Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY); + Reference< XComponent > xComponent(m_xConnection, UNO_QUERY); + if (xComponent.is() && xEvt.is()) + xComponent->addEventListener(xEvt); + } + if(_aDataDescriptor.has(daSelection)) + _aDataDescriptor[daSelection] >>= m_aSelection; + sal_Bool bBookmarkSelection = sal_True; // the default if not present + if ( _aDataDescriptor.has( daBookmarkSelection ) ) + { + _aDataDescriptor[ daBookmarkSelection ] >>= bBookmarkSelection; + DBG_ASSERT( !bBookmarkSelection, "ODatabaseImportExport::ODatabaseImportExport: bookmarked selection not yet supported!" ); + } - if(_aDataDescriptor.has(daCursor)) - _aDataDescriptor[daCursor] >>= m_xResultSet; - if ( _bPlusDefaultInit ) + if(_aDataDescriptor.has(daCursor)) + _aDataDescriptor[daCursor] >>= m_xResultSet; + } // if ( !_bPlusDefaultInit ) + else initialize(); try @@ -306,23 +314,12 @@ void ODatabaseImportExport::initialize() { DBG_CHKTHIS(ODatabaseImportExport,NULL); m_bInInitialize = sal_True; + m_bNeedToReInitialize = false; if ( !m_xConnection.is() ) { // we need a connection OSL_ENSURE(m_sDataSourceName.getLength(),"There must be a datsource name!"); Reference<XNameAccess> xDatabaseContext = Reference< XNameAccess >(m_xFactory->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); - - try - { - Reference< XDataSource > xDataSource( xDatabaseContext->getByName( m_sDataSourceName ), UNO_QUERY_THROW ); - Reference< XModel > xDocument( getDataSourceOrModel( xDataSource ), UNO_QUERY_THROW ); - m_aKeepModelAlive = SharedModel( xDocument ); - } - catch( const Exception& ) - { - OSL_ENSURE( sal_False, "ODatabaseImportExport::initialize: could not obtaine the document model!" ); - } - Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY); Reference< XConnection > xConnection; @@ -332,13 +329,6 @@ void ODatabaseImportExport::initialize() if(aInfo.isValid() && aInfo.getType() == SQLExceptionInfo::SQL_EXCEPTION) throw *static_cast<const SQLException*>(aInfo); } - else - { - Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY); - Reference< XComponent > xComponent(m_xConnection, UNO_QUERY); - if (xComponent.is() && xEvt.is()) - xComponent->addEventListener(xEvt); - } Reference<XNameAccess> xNameAccess; switch(m_nCommandType) @@ -411,6 +401,26 @@ void ODatabaseImportExport::initialize() m_bInInitialize = sal_False; } // ----------------------------------------------------------------------------- +BOOL ODatabaseImportExport::Write() +{ + if ( m_bNeedToReInitialize ) + { + if ( !m_bInInitialize ) + initialize(); + } // if ( m_bNeedToReInitialize ) + return TRUE; +} +// ----------------------------------------------------------------------------- +BOOL ODatabaseImportExport::Read() +{ + if ( m_bNeedToReInitialize ) + { + if ( !m_bInInitialize ) + initialize(); + } // if ( m_bNeedToReInitialize ) + return TRUE; +} +// ----------------------------------------------------------------------------- void ODatabaseImportExport::impl_initializeRowMember_throw() { if ( !m_xRow.is() && m_xResultSet.is() ) @@ -424,6 +434,7 @@ void ODatabaseImportExport::impl_initializeRowMember_throw() //====================================================================== BOOL ORTFImportExport::Write() { + ODatabaseImportExport::Write(); (*m_pStream) << '{' << sRTF_RTF; (*m_pStream) << sRTF_ANSI << ODatabaseImportExport::sNewLine; rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; @@ -680,6 +691,7 @@ BOOL ORTFImportExport::Write() //------------------------------------------------------------------- BOOL ORTFImportExport::Read() { + ODatabaseImportExport::Read(); SvParserState eState = SVPAR_ERROR; if ( m_pStream ) { @@ -742,6 +754,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD //------------------------------------------------------------------- BOOL OHTMLImportExport::Write() { + ODatabaseImportExport::Write(); if(m_xObject.is()) { (*m_pStream) << '<' << sHTML_doctype << ' ' << sHTML_doctype32 << '>' << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine; @@ -759,6 +772,7 @@ BOOL OHTMLImportExport::Write() //------------------------------------------------------------------- BOOL OHTMLImportExport::Read() { + ODatabaseImportExport::Read(); SvParserState eState = SVPAR_ERROR; if ( m_pStream ) { @@ -1132,4 +1146,3 @@ void OHTMLImportExport::IncIndent( sal_Int16 nVal ) sIndent[m_nIndent] = 0; } // ----------------------------------------------------------------------------- - diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index e25258097e72..c5bfe2470b49 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1263,9 +1263,7 @@ sal_Bool appendToFilter(const Reference<XConnection>& _xConnection, if(! ::dbaui::checkDataSourceAvailable(::comphelper::getString(xProp->getPropertyValue(PROPERTY_NAME)),_xFactory)) { String aMessage(ModuleRes(STR_TABLEDESIGN_DATASOURCE_DELETED)); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(_pParent,sTitle,aMessage); - aMsg.Execute(); + OSQLWarningBox( _pParent, aMessage ).Execute(); bRet = sal_False; } else diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 08946d8660c5..ca3408bd0285 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1598,12 +1598,9 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& // ----------------------------------------------------------------------------- void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName) { - UniString sTitle(ModuleRes(STR_STAT_WARNING)); - UniString sMessage(ModuleRes(STR_UNKNOWN_TYPE_FOUND)); - + String sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) ); sMessage.SearchAndReplaceAscii("#1",_rColumnName); - OSQLMessageBox aMsg(this,sTitle,sMessage); - aMsg.Execute(); + OSQLWarningBox( this, sMessage ).Execute(); } //------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index cdfefb5b673d..fa6e91142fc9 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -178,9 +178,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) { String strMessage = String(ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME)); strMessage.SearchAndReplaceAscii("$column$", sNewName); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(this,sTitle,strMessage,WB_OK | WB_DEF_OK,OSQLMessageBox::Error); - aMsg.Execute(); + OSQLWarningBox( this, strMessage ).Execute(); pCurFieldDescr->SetName(sName); DisplayData(pCurFieldDescr); static_cast<OWizTypeSelect*>(GetParent())->setDuplicateName(sal_True); diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 21a247c73c9f..259834be1724 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -166,7 +166,7 @@ namespace dbaui { try { - // get the desktop object + // if we have no externally provided frame, create one if ( !m_xFrameLoader.is() ) { Reference< XSingleServiceFactory > xFact(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.TaskCreator")), UNO_QUERY_THROW); @@ -185,7 +185,7 @@ namespace dbaui m_xFrameLoader.set(xFact->createInstanceWithArguments(lArgs), UNO_QUERY_THROW); } - Reference< XComponentLoader > xFrameLoader(m_xFrameLoader, UNO_QUERY_THROW); + Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW ); xReturn = xFrameLoader->loadComponentFromURL( m_sComponentURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), @@ -193,8 +193,8 @@ namespace dbaui _rArgs ); - if ( xReturn.is() ) - xReturn.set(m_xFrameLoader,UNO_QUERY); + if ( !xReturn.is() ) + xReturn.set( m_xFrameLoader, UNO_QUERY ); } catch( const Exception& ) { diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 26e9bfd1e953..aa50736ba6b7 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -47,7 +47,7 @@ namespace dbaui { // strange ctor, but makes instantiating this class more readable (see below) InitAdvanced( short _Generated, short _SQL, short _Append, short _As, short _Outer, short _Priv, short _Param, - short _Version, short _Catalog, short _Schema, short _Index, short _DOS, short _Required, short _Bool,short _IgnoreCur,short _AutoPKey ) + short _Version, short _Catalog, short _Schema, short _Index, short _DOS, short _Required, short _Bool,short _IgnoreCur,short _AutoPKey, short _EscapeDT ) :AdvancedSettingsSupport() { bGeneratedValues = ( _Generated != 0 ); @@ -66,6 +66,7 @@ namespace dbaui bFormsCheckRequiredFields = ( _Required != 0 ); bIgnoreCurrency = ( _IgnoreCur != 0 ); bAutoIncrementIsPrimaryKey = ( _AutoPKey != 0 ); + bEscapeDateTime = ( _EscapeDT != 0 ); } enum Special { All, AllButIgnoreCurrency, None }; @@ -89,6 +90,7 @@ namespace dbaui bFormsCheckRequiredFields = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); bIgnoreCurrency = ( _eType == All ); bAutoIncrementIsPrimaryKey = false; // hsqldb special + bEscapeDateTime = ( _eType == All ) || ( _eType == AllButIgnoreCurrency ); } }; @@ -119,18 +121,18 @@ namespace dbaui static AdvancedSupport s_aSupport; if ( s_aSupport.empty() ) { - s_aSupport[ ::dbaccess::DST_MSACCESS ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0 ); - s_aSupport[ ::dbaccess::DST_MYSQL_ODBC ] = InitAdvanced( 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0 ); - s_aSupport[ ::dbaccess::DST_MYSQL_JDBC ] = InitAdvanced( 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0 ); - s_aSupport[ ::dbaccess::DST_MYSQL_NATIVE ] = InitAdvanced( 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0 ); + s_aSupport[ ::dbaccess::DST_MSACCESS ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0 ); + s_aSupport[ ::dbaccess::DST_MYSQL_ODBC ] = InitAdvanced( 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0 ); + s_aSupport[ ::dbaccess::DST_MYSQL_JDBC ] = InitAdvanced( 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1 ); + s_aSupport[ ::dbaccess::DST_MYSQL_NATIVE ] = InitAdvanced( 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0 ); s_aSupport[ ::dbaccess::DST_ORACLE_JDBC ] = InitAdvanced( InitAdvanced::All ); - s_aSupport[ ::dbaccess::DST_ADABAS ] = InitAdvanced( 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0 ); + s_aSupport[ ::dbaccess::DST_ADABAS ] = InitAdvanced( 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0 ); s_aSupport[ ::dbaccess::DST_CALC ] = InitAdvanced( InitAdvanced::None ); - s_aSupport[ ::dbaccess::DST_DBASE ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); - s_aSupport[ ::dbaccess::DST_FLAT ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); + s_aSupport[ ::dbaccess::DST_DBASE ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 ); + s_aSupport[ ::dbaccess::DST_FLAT ] = InitAdvanced( 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); s_aSupport[ ::dbaccess::DST_JDBC ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); s_aSupport[ ::dbaccess::DST_ODBC ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); - s_aSupport[ ::dbaccess::DST_ADO ] = InitAdvanced( 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); + s_aSupport[ ::dbaccess::DST_ADO ] = InitAdvanced( 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); s_aSupport[ ::dbaccess::DST_MOZILLA ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ ::dbaccess::DST_THUNDERBIRD ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ ::dbaccess::DST_LDAP ] = InitAdvanced( InitAdvanced::None ); @@ -141,8 +143,8 @@ namespace dbaui s_aSupport[ ::dbaccess::DST_EVOLUTION_LDAP ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ ::dbaccess::DST_KAB ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ ::dbaccess::DST_MACAB ] = InitAdvanced( InitAdvanced::None ); - s_aSupport[ ::dbaccess::DST_MSACCESS_2007 ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0 ); - s_aSupport[ ::dbaccess::DST_EMBEDDED_HSQLDB ] = InitAdvanced( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1 ); + s_aSupport[ ::dbaccess::DST_MSACCESS_2007 ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0 ); + s_aSupport[ ::dbaccess::DST_EMBEDDED_HSQLDB ] = InitAdvanced( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0 ); s_aSupport[ ::dbaccess::DST_USERDEFINE1 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); s_aSupport[ ::dbaccess::DST_USERDEFINE2 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); s_aSupport[ ::dbaccess::DST_USERDEFINE3 ] = InitAdvanced( InitAdvanced::AllButIgnoreCurrency ); diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index e84927a15690..d1c056b6e4a3 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -454,17 +454,13 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - OExtensionNotPresentDialog aDlg(m_pDialogParent, m_xORB); - - String sText = aDlg.getText(); + String sText( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) ); sText = sText.GetToken(0,'\n'); aInfo.prepend(sText); String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); aInfo.prepend(sMessage); - // OExtensionNotPresentDialog aDlg(m_pDialogParent, m_xORB); - // aDlg.Execute(); } catch(Exception& e) { diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 56f52c986253..2ae24b6f6423 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -692,11 +692,9 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, sal_uInt16 nTabCount = 0; if ( !static_cast<OQueryTableView*>(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occured: column not in table window { - String sTitle(ModuleRes(STR_STAT_WARNING)); String sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST)); sErrorMsg.SearchAndReplaceAscii("$name$",_sColumnName); - OSQLMessageBox aDlg(this,sTitle,sErrorMsg,WB_OK | WB_DEF_OK,OSQLMessageBox::Warning); - aDlg.Execute(); + OSQLWarningBox( this, sErrorMsg ).Execute(); bError = sal_True; } else @@ -772,10 +770,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes // something different which we have to check (may be a select statement) String sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) ); sErrorMessage.SearchAndReplaceAscii("$name$",_sFieldName); - OSQLMessageBox aDlg( this, - String( ModuleRes( STR_STAT_WARNING ) ), sErrorMessage, - WB_OK | WB_DEF_OK, OSQLMessageBox::Warning ); - aDlg.Execute(); + OSQLWarningBox( this, sErrorMessage ).Execute(); return sal_True; } @@ -964,10 +959,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes { // the field could not be isnerted String sErrorMessage( ModuleRes( RID_STR_FIELD_DOESNT_EXIST ) ); sErrorMessage.SearchAndReplaceAscii("$name$",aSelEntry->GetField()); - OSQLMessageBox aDlg( this, - String( ModuleRes( STR_STAT_WARNING ) ), sErrorMessage, - WB_OK | WB_DEF_OK, OSQLMessageBox::Warning ); - aDlg.Execute(); + OSQLWarningBox( this, sErrorMessage ).Execute(); bError = sal_True; } } @@ -1238,9 +1230,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() { if ( !m_bDisableErrorBox ) { - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aDlg(this,sTitle,aErrorMsg,WB_OK | WB_DEF_OK,OSQLMessageBox::Warning); - aDlg.Execute(); + OSQLWarningBox( this, aErrorMsg ).Execute(); } bError = sal_True; } @@ -1249,9 +1239,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() { if ( !m_bDisableErrorBox ) { - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aDlg(this,sTitle,aErrorMsg,WB_OK | WB_DEF_OK,OSQLMessageBox::Warning); - aDlg.Execute(); + OSQLWarningBox( this, aErrorMsg ).Execute(); } bError = sal_True; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 48f51b31d5fd..5b6be38be4a9 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1337,9 +1337,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) if ( !editingCommand() && !haveDataSource() ) { String aMessage(ModuleRes(STR_DATASOURCE_DELETED)); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(getView(),sTitle,aMessage); - aMsg.Execute(); + OSQLWarningBox( getView(), aMessage ).Execute(); return false; } diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 8572ff867f41..b9b599c1c8cc 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -255,9 +255,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)),getORB())) { String aMessage(ModuleRes(STR_DATASOURCE_DELETED)); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(getView(),sTitle,aMessage); - aMsg.Execute(); + OSQLWarningBox( getView(), aMessage ).Execute(); } else { diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 633a7ed45b52..82d42ccc87de 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -375,7 +375,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const // ----------------------------------------------------------------------------- void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) { - OSQLMessageBox aDlg(this,ModuleRes(STR_QUERY_REL_DELETE_WINDOW),String(),WB_YES_NO|WB_DEF_YES,OSQLMessageBox::Warning); + OSQLWarningBox aDlg( this, ModuleRes( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES ); if ( m_bInRemove || aDlg.Execute() == RET_YES ) { m_pView->getController().getUndoMgr()->Clear(); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 33990f5f296a..d81cf5f9a5cf 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -398,9 +398,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) if (!xTablesSup.is()) { String aMessage(ModuleRes(STR_TABLEDESIGN_CONNECTION_MISSING)); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(getView(),sTitle,aMessage); - aMsg.Execute(); + OSQLWarningBox( getView(), aMessage ).Execute(); return sal_False; } @@ -642,8 +640,7 @@ void OTableController::impl_initialize() } catch(const SQLException&) { - OSQLMessageBox aErr(getView(),ModuleRes(STR_STAT_WARNING),ModuleRes(STR_NO_TYPE_INFO_AVAILABLE)); - aErr.Execute(); + OSQLWarningBox( getView(), ModuleRes( STR_NO_TYPE_INFO_AVAILABLE ) ).Execute(); throw; } try @@ -1109,9 +1106,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star:: { String strMessage = String(ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME)); strMessage.SearchAndReplaceAscii("$column$", pFieldDesc->GetName()); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(getView(),sTitle,strMessage,WB_OK | WB_DEF_OK,OSQLMessageBox::Error); - aMsg.Execute(); + OSQLWarningBox( getView(), strMessage ).Execute(); return sal_False; } } @@ -1257,10 +1252,9 @@ void OTableController::alterColumns() { String aMessage( ModuleRes( STR_TABLEDESIGN_ALTER_ERROR ) ); aMessage.SearchAndReplaceAscii( "$column$", pField->GetName() ); - String sTitle( ModuleRes( STR_STAT_WARNING ) ); SQLExceptionInfo aError( ::cppu::getCaughtException() ); - OSQLMessageBox aMsg( getView(), sTitle, aMessage, WB_YES_NO | WB_DEF_YES , OSQLMessageBox::Warning, &aError ); + OSQLWarningBox aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES , &aError ); bNotOk = aMsg.Execute() == RET_YES; } else @@ -1336,8 +1330,7 @@ void OTableController::alterColumns() { String aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR)); aMessage.SearchAndReplaceAscii("$column$",pField->GetName()); - String sTitle(ModuleRes(STR_STAT_WARNING)); - OSQLMessageBox aMsg(getView(),sTitle,aMessage,WB_YES_NO|WB_DEF_YES,OSQLMessageBox::Warning); + OSQLWarningBox aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES ); if ( aMsg.Execute() != RET_YES ) { Reference<XPropertySet> xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW); |