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

#103081# check new flag before asking readonly

Browse source
This commit is contained in:
Ocke Janssen 2002-09-20 10:06:11 +00:00
parent 0466ce8ae2
commit 677c3f692b
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dbaccess/source/ui/inc/TableController.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: TableController.hxx,v $
*
* $Revision: 1.26 $
* $Revision: 1.27 $
*
* last change: $Author: fs $ $Date: 2002-09-13 15:15:16 $
* last change: $Author: oj $ $Date: 2002-09-20 11:06:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -126,8 +126,8 @@ namespace dbaui
void loadData();
sal_Bool checkColumns(sal_Bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names
String createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxTables,const String& _rDefault);
void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup,sal_Bool _bKeyColumns=sal_False);
void appendPrimaryKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup);
void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup,sal_Bool _bNew,sal_Bool _bKeyColumns = sal_False);
void appendPrimaryKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,sal_Bool _bNew);
void alterColumns();
void dropPrimaryKey();
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const;

18
dbaccess/source/ui/tabledesign/TableController.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: TableController.cxx,v $
*
* $Revision: 1.79 $
* $Revision: 1.80 $
*
* last change: $Author: fs $ $Date: 2002-09-13 15:16:02 $
* last change: $Author: oj $ $Date: 2002-09-20 11:05:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -502,10 +502,10 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
// now append the columns
Reference<XColumnsSupplier> xColSup(xTable,UNO_QUERY);
appendColumns(xColSup);
appendColumns(xColSup,bNew);
// now append the primary key
Reference<XKeysSupplier> xKeySup(xTable,UNO_QUERY);
appendPrimaryKey(xKeySup);
appendPrimaryKey(xKeySup,bNew);
}
// now set the properties
if(bNew)
@ -898,7 +898,7 @@ const OTypeInfo* OTableController::getTypeInfoByType(sal_Int32 _nDataType) const
return NULL;
}
// -----------------------------------------------------------------------------
void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_Bool _bKeyColumns)
void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_Bool _bNew,sal_Bool _bKeyColumns)
{
try
{
@ -919,7 +919,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_
{
OSL_ENSURE(*aIter,"OTableRow is null!");
OFieldDescription* pField = (*aIter)->GetActFieldDescr();
if ( !pField || (*aIter)->IsReadOnly() )
if ( !pField || (!_bNew && (*aIter)->IsReadOnly()) )
continue;
Reference<XPropertySet> xColumn;
@ -959,7 +959,7 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_
}
}
// -----------------------------------------------------------------------------
void OTableController::appendPrimaryKey(Reference<XKeysSupplier>& _rxSup)
void OTableController::appendPrimaryKey(Reference<XKeysSupplier>& _rxSup,sal_Bool _bNew)
{
if(!_rxSup.is())
return; // the database doesn't support keys
@ -977,7 +977,7 @@ void OTableController::appendPrimaryKey(Reference<XKeysSupplier>& _rxSup)
Reference<XColumnsSupplier> xColSup(xKey,UNO_QUERY);
if(xColSup.is())
{
appendColumns(xColSup,sal_True);
appendColumns(xColSup,_bNew,sal_True);
Reference<XNameAccess> xColumns = xColSup->getColumns();
if(xColumns->hasElements())
xAppend->appendByDescriptor(xKey);
@ -1528,7 +1528,7 @@ void OTableController::alterColumns()
if ( bNeedAppendKey )
{
Reference< XKeysSupplier > xKeySup( m_xTable, UNO_QUERY );
appendPrimaryKey( xKeySup );
appendPrimaryKey( xKeySup ,sal_False);
}
reSyncRows();