diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:25:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:25:21 +0000 |
| commit | 829f98ea3d8ac8fb5671fb667a43435ac262e04f (patch) | |
| tree | bba6b9ea05b350edb34c9624e313f9e94d501a69 /extensions/source/propctrlr/formcontroller.cxx | |
| parent | 029b0d4649a7e1459ac0b8e7e6f1ae6270a2b911 (diff) | |
INTEGRATION: CWS dba22 (1.79.2); FILE MERGED
2005/01/07 08:25:32 oj 1.79.2.3: RESYNC: (1.79-1.81); FILE MERGED
2004/12/29 11:13:45 fs 1.79.2.2: #i34551# preliminary support for experimental properties
2004/12/16 10:26:07 fs 1.79.2.1: care for embedded forms in some more places
Diffstat (limited to 'extensions/source/propctrlr/formcontroller.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formcontroller.cxx | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index c7e4a297c544..da55d54bdadc 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formcontroller.cxx,v $ * - * $Revision: 1.81 $ + * $Revision: 1.82 $ * - * last change: $Author: obo $ $Date: 2005-01-05 12:42:54 $ + * last change: $Author: kz $ $Date: 2005-01-21 17:25:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -941,9 +941,12 @@ class EventsNameReplace_Impl: // do we need to connect? if ( !xReturn.is() ) { - connectRowset( ); - // get the property again - xProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xReturn; + if ( !::dbtools::isEmbeddedInDatabase( getRowSet(), xReturn ) ) + { + connectRowset( ); + // get the property again + xProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xReturn; + } } } @@ -1107,9 +1110,11 @@ class EventsNameReplace_Impl: sal_Bool OPropertyBrowserController::haveRowsetConnection( ) const { Reference< XConnection > xConnection = m_xRowsetConnection; - Reference< XPropertySet > xProps( getRowSet( ), UNO_QUERY ); + Reference< XPropertySet > xProps( getRowSet(), UNO_QUERY ); if ( xProps.is() ) xProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConnection; + if ( !xConnection.is() ) + isEmbeddedInDatabase( getRowSet(), xConnection ); return xConnection.is(); } @@ -2424,8 +2429,16 @@ class EventsNameReplace_Impl: sal_Int32 nPropertyId = m_pPropertyInfo->getPropertyId( sPropertyName ); sal_uInt32 nPropertyUIFlags = m_pPropertyInfo->getPropertyUIFlags( nPropertyId ); - bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; - bool bIsActuatingProperty = ( nPropertyUIFlags & PROP_FLAG_ACTUATING ) != 0; + bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; + bool bIsActuatingProperty = ( nPropertyUIFlags & PROP_FLAG_ACTUATING ) != 0; + bool bIsExperimentalProperty = ( nPropertyUIFlags & PROP_FLAG_EXPERIMENTAL ) != 0; + + // don't show experimental properties unless allowed to do so + if ( bIsExperimentalProperty ) + { + if ( true ) // TODO + continue; + } ////////////////////////////////////////////////////////////////////// if ( bIsDataProperty ) |