strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#101836# enable sql92 namechecking when needed!

Browse source
This commit is contained in:
Ocke Janssen 2002-07-30 08:45:49 +00:00
parent 18801cefd9
commit 325749b3b5
2 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dbaccess/source/ui/dlg/indexdialog.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: indexdialog.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: oj $ $Date: 2002-04-29 08:27:33 $
* last change: $Author: oj $ $Date: 2002-07-30 09:45:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -95,6 +95,9 @@
#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
#endif
#ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
#endif
//......................................................................
namespace dbaui
{
@ -161,10 +164,20 @@ namespace dbaui
sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const String& _rNewText )
{
// first check if this is valid SQL92 name
for(xub_StrLen i=0;i < _rNewText.Len();++i)
if ( isSQL92CheckEnabled(m_xConnection) )
{
if(!isCharOk(_rNewText.GetBuffer()[i],i == 0,sal_False,::rtl::OUString()))
return sal_False;
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
if ( xMeta.is() )
{
::rtl::OUString sNewName(_rNewText);
::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
if ( ( xMeta->storesMixedCaseQuotedIdentifiers() )
?
sAlias != sNewName
:
!sNewName.equalsIgnoreAsciiCase(sAlias))
return sal_False;
}
}
if (!SvTreeListBox::EditedEntry(_pEntry, _rNewText))
@ -222,9 +235,12 @@ namespace dbaui
//= DbaIndexDialog
//==================================================================
//------------------------------------------------------------------
DbaIndexDialog::DbaIndexDialog(Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames,
const Reference< XNameAccess >& _rxIndexes, const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex)
DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames,
const Reference< XNameAccess >& _rxIndexes,
const Reference< XConnection >& _rxConnection,
const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex)
:ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
,m_xConnection(_rxConnection)
,m_aGeometrySettings(E_DIALOG, ::rtl::OUString::createFromAscii("dbaccess.tabledesign.indexdialog"))
,m_aActions (this, ResId(TLB_ACTIONS))
,m_aIndexes (this, ResId(CTR_INDEXLIST))
@ -249,6 +265,8 @@ namespace dbaui
m_aIndexes.SetEndEditHdl(LINK(this, DbaIndexDialog, OnEntryEdited));
m_aIndexes.SetSelectionMode(SINGLE_SELECTION);
m_aIndexes.SetHighlightRange();
m_aIndexes.setConnection(m_xConnection);
m_pFields->Init(_rFieldNames);
setToolBox(&m_aActions);
@ -965,6 +983,9 @@ namespace dbaui
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.13 2002/04/29 08:27:33 oj
* #98772# impl toolbox hi contrast
*
* Revision 1.12 2001/11/05 10:12:52 oj
* #94031# set unique flag every time
*

20
dbaccess/source/ui/inc/indexdialog.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: indexdialog.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: oj $ $Date: 2002-04-29 08:08:41 $
* last change: $Author: oj $ $Date: 2002-07-30 09:45:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -80,6 +80,9 @@
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
#include <com/sun/star/sdbc/XConnection.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
#include <com/sun/star/uno/Sequence.hxx>
#endif
@ -110,6 +113,7 @@ namespace dbaui
class DbaIndexList : public SvTreeListBox
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
Link m_aSelectHdl;
Link m_aEndEditHdl;
sal_Bool m_bSuspendSelectHdl;
@ -130,6 +134,11 @@ namespace dbaui
void SelectNoHandlerCall( SvLBoxEntry* pEntry );
inline void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection)
{
m_xConnection = _rxConnection;
}
protected:
virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
};
@ -143,6 +152,7 @@ namespace dbaui
public OToolBoxHelper
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
SvtViewOptions m_aGeometrySettings;
ToolBox m_aActions;
@ -167,10 +177,11 @@ namespace dbaui
Window* _pParent,
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rFieldNames,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
sal_Int32 _nMaxColumnsInIndex
);
~DbaIndexDialog();
virtual ~DbaIndexDialog();
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@ -230,6 +241,9 @@ namespace dbaui
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.7 2002/04/29 08:08:41 oj
* #98772# overload window method for hi contrast
*
* Revision 1.6 2001/05/11 16:24:08 fs
* #86788# +m_bEditAgain / #86863# allow a drop without confirmation (mapped from resetting a new index)
*