summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-02-15 15:27:59 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-02-15 15:27:59 +0100
commitb1655e730f3fe55b57e56b6131c2adb0f4b1423b (patch)
tree0be9d1d103b2a095fb0f24d32e096d21bbc0f311
parentb5e5e8ee928b55b58661e15830471825af7a4cf7 (diff)
parentd00fe5a50ae94406c65084f160dbc551d690c278 (diff)
CWS-TOOLING: integrate CWS mysqlconnector
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx65
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
2 files changed, 52 insertions, 15 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 8db327fb8b85..d20a518752db 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -624,6 +624,7 @@ DBG_NAME(SbaXDataBrowserController)
//------------------------------------------------------------------------------
SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM)
:SbaXDataBrowserController_Base(_rM)
+ ,m_nRowSetPrivileges(0)
,m_pClipbordNotifier( NULL )
,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus))
,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) )
@@ -1415,19 +1416,21 @@ void SbaXDataBrowserController::disposing()
m_xRowSet = NULL;
m_xColumnsSupplier = NULL;
m_xLoadable = NULL;
+
+ m_nRowSetPrivileges = 0;
}
- catch(Exception&)
+ catch(const Exception&)
{
- OSL_ENSURE(0,"Exception thrown by dispose");
+ DBG_UNHANDLED_EXCEPTION();
}
}
try
{
::comphelper::disposeComponent(m_xParser);
}
- catch(Exception&)
+ catch(const Exception&)
{
- OSL_ENSURE(0,"Exception thrown by dispose");
+ DBG_UNHANDLED_EXCEPTION();
}
}
//------------------------------------------------------------------------------
@@ -1656,21 +1659,39 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
case ID_BROWSER_INSERT_ROW:
{
// check if it is available
- Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY);
- if (!xDataSourceSet.is())
- break; // no datasource -> no edit mode
-
- sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES));
- aReturn.bEnabled = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowInserts")));
+ sal_Bool bInsertPrivilege = ( m_nRowSetPrivileges & Privilege::INSERT) != 0;
+ sal_Bool bAllowInsertions = sal_True;
+ try
+ {
+ Reference< XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY_THROW );
+ OSL_VERIFY( xRowSetProps->getPropertyValue( ::rtl::OUString::createFromAscii( "AllowInserts" ) ) >>= bAllowInsertions );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+ aReturn.bEnabled = bInsertPrivilege && bAllowInsertions;
}
break;
case SID_FM_DELETEROWS:
{
- Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
- sal_Int32 nCount = ::comphelper::getINT32(xFormSet->getPropertyValue(PROPERTY_ROWCOUNT));
- sal_Bool bNew = sal_False;
- xFormSet->getPropertyValue(PROPERTY_ISNEW) >>= bNew;
- aReturn.bEnabled = nCount != 0 && !bNew;
+ // check if it is available
+ sal_Bool bDeletePrivilege = ( m_nRowSetPrivileges & Privilege::INSERT) != 0;
+ sal_Bool bAllowDeletions = sal_True;
+ sal_Int32 nRowCount = 0;
+ sal_Bool bInsertionRow = sal_False;
+ try
+ {
+ Reference< XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY_THROW );
+ OSL_VERIFY( xRowSetProps->getPropertyValue( ::rtl::OUString::createFromAscii( "AllowDeletes" ) ) >>= bAllowDeletions );
+ OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_ROWCOUNT ) >>= nRowCount );
+ OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_ISNEW ) >>= bInsertionRow );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+ aReturn.bEnabled = bDeletePrivilege && bAllowDeletions && ( nRowCount != 0 ) && !bInsertionRow;
}
break;
@@ -2701,14 +2722,28 @@ void SbaXDataBrowserController::criticalFail()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::criticalFail" );
InvalidateAll();
+ m_nRowSetPrivileges = 0;
}
//------------------------------------------------------------------------------
void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::LoadFinished" );
+ m_nRowSetPrivileges = 0;
+
if (isValid() && !loadingCancelled())
{
+ // obtain cached values
+ try
+ {
+ Reference< XPropertySet > xFormProps( m_xLoadable, UNO_QUERY_THROW );
+ OSL_VERIFY( xFormProps->getPropertyValue( PROPERTY_PRIVILEGES ) >>= m_nRowSetPrivileges );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+
// --------------------------------
// switch the control to alive mode
getBrowserView()->getGridControl()->setDesignMode(sal_False);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index d94f76b8dcc9..ccffbaed3ffe 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -105,6 +105,8 @@ namespace dbaui
mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >
m_xParser; // for sorting 'n filtering
+ sal_Int32 m_nRowSetPrivileges; // cached Privileges property of m_xRowSet
+
AutoTimer m_aInvalidateClipboard; // for testing the state of the CUT/COPY/PASTE-slots
TransferableDataHelper m_aSystemClipboard; // content of the clipboard