Tag: cws_src680_rptchart01 User: oj Date: 2008-01-25 13:57:58+0000 Modified: dba/reportdesign/source/core/api/ReportDefinition.cxx dba/reportdesign/source/inc/stringconstants.hrc dba/reportdesign/source/shared/stringconstants.cxx dba/reportdesign/source/ui/inc/DataProviderHandler.hxx dba/reportdesign/source/ui/inc/metadata.hxx dba/reportdesign/source/ui/inspection/DataProviderHandler.cxx dba/reportdesign/source/ui/inspection/inspection.src dba/reportdesign/source/ui/inspection/metadata.cxx
Log: #i85225# two new aatributes for master detail File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportDefinition.cxx?r1=1.5.20.1&r2=1.5.20.2 Delta lines: +30 -3 -------------------- --- ReportDefinition.cxx 2008-01-24 12:39:30+0000 1.5.20.1 +++ ReportDefinition.cxx 2008-01-25 13:57:55+0000 1.5.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: ReportDefinition.cxx,v $ * - * $Revision: 1.5.20.1 $ + * $Revision: 1.5.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:30 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -653,6 +653,7 @@ ::rtl::OUString m_sFilter; ::rtl::OUString m_sMimeType; ::rtl::OUString m_sIdentifier; + ::rtl::OUString m_sDataSourceName; awt::Size m_aVisualAreaSize; ::sal_Int64 m_nAspect; ::sal_Int16 m_nGroupKeepTogether; @@ -1402,7 +1403,7 @@ { uno::Sequence<beans::PropertyValue> aComponentData; aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComponentData")),aComponentData); - if ( aComponentData.getLength() && !m_pImpl->m_xNumberFormatsSupplier.is() ) + if ( aComponentData.getLength() && (!m_pImpl->m_xActiveConnection.is() || !m_pImpl->m_xNumberFormatsSupplier.is()) ) { ::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData ); m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),m_pImpl->m_xActiveConnection); @@ -2531,6 +2532,7 @@ // XNumberFormatsSupplier uno::Reference< beans::XPropertySet > SAL_CALL OReportDefinition::getNumberFormatSettings( ) throw (uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); if ( m_pImpl->m_xNumberFormatsSupplier.is() ) return m_pImpl->m_xNumberFormatsSupplier->getNumberFormatSettings(); return uno::Reference< beans::XPropertySet >(); @@ -2538,6 +2540,7 @@ // ----------------------------------------------------------------------------- uno::Reference< util::XNumberFormats > SAL_CALL OReportDefinition::getNumberFormats( ) throw (uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); if ( m_pImpl->m_xNumberFormatsSupplier.is() ) return m_pImpl->m_xNumberFormatsSupplier->getNumberFormats(); return uno::Reference< util::XNumberFormats >(); @@ -2559,6 +2562,30 @@ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler")) ,m_aProps->m_xContext),uno::UNO_QUERY); return xRet; } +// ----------------------------------------------------------------------------- +uno::Reference< sdbc::XConnection > SAL_CALL OReportDefinition::getActiveConnection() throw (uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_pImpl->m_xActiveConnection; +} +// ----------------------------------------------------------------------------- +void SAL_CALL OReportDefinition::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection ) throw (lang::IllegalArgumentException, uno::RuntimeException) +{ + if ( !_activeconnection.is() ) + throw lang::IllegalArgumentException(); + set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_pImpl->m_xActiveConnection); +} +// ----------------------------------------------------------------------------- +::rtl::OUString SAL_CALL OReportDefinition::getDataSourceName() throw (uno::RuntimeException) +{ + osl::MutexGuard g(m_aMutex); + return m_pImpl->m_sDataSourceName; +} +// ----------------------------------------------------------------------------- +void SAL_CALL OReportDefinition::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException, lang::IllegalArgumentException) +{ + set(PROPERTY_DATASOURCENAME,the_value,m_pImpl->m_sDataSourceName); +} // ============================================================================= }// namespace reportdesign Directory: /dba/reportdesign/source/inc/ ======================================== File [changed]: stringconstants.hrc Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/inc/stringconstants.hrc?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +3 -2 ------------------- --- stringconstants.hrc 2008-01-24 12:39:32+0000 1.4.20.1 +++ stringconstants.hrc 2008-01-25 13:57:55+0000 1.4.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: stringconstants.hrc,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:32 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -200,6 +200,7 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE ); DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME ); DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA ); DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA ); DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED ); Directory: /dba/reportdesign/source/shared/ =========================================== File [changed]: stringconstants.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/shared/stringconstants.cxx?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +3 -2 ------------------- --- stringconstants.cxx 2008-01-24 12:39:32+0000 1.4.20.1 +++ stringconstants.cxx 2008-01-25 13:57:55+0000 1.4.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: stringconstants.cxx,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:32 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -192,6 +192,7 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTILINE, "MultiLine"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING, "EscapeProcessing"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULA, "Formula"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA, "InitialFormula"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREEVALUATED, "PreEvaluated"); Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: DataProviderHandler.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/DataProviderHandler.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +14 -9 -------------------- --- DataProviderHandler.hxx 2008-01-24 12:41:13+0000 1.1.2.1 +++ DataProviderHandler.hxx 2008-01-25 13:57:55+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: DataProviderHandler.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:41:13 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,8 @@ #include "com/sun/star/inspection/XPropertyHandler.hpp" #endif #include "com/sun/star/chart2/XChartDocument.hpp" +#include "com/sun/star/chart2/data/XDatabaseDataProvider.hpp" +#include "com/sun/star/report/XReportComponent.hpp" #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include "com/sun/star/lang/XServiceInfo.hpp" #endif @@ -79,8 +81,8 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); - public: explicit DataProviderHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + private: // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -116,6 +118,8 @@ void operator =(DataProviderHandler &); // not defined + bool impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; // overload WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, @@ -125,8 +129,9 @@ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDataProvider; /// inspectee + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider> m_xDataProvider; /// inspectee ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xFormComponent; /// inspectee + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xReportComponent; /// inspectee ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument> m_xChartModel; ::std::auto_ptr< OPropertyInfoService > m_pInfoService; }; File [changed]: metadata.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/metadata.hxx?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +4 -2 ------------------- --- metadata.hxx 2008-01-24 12:39:32+0000 1.4.20.1 +++ metadata.hxx 2008-01-25 13:57:55+0000 1.4.20.2 @@ -6,9 +6,9 @@ * * $RCSfile: metadata.hxx,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:32 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -158,6 +158,8 @@ #define PROPERTY_ID_SCOPE 32 #define PROPERTY_ID_RESETPAGENUMBER 33 #define PROPERTY_ID_CHARTTYPE 34 + #define PROPERTY_ID_MASTERFIELDS 35 + #define PROPERTY_ID_DETAILFIELDS 36 //............................................................................ } // namespace rptui Directory: /dba/reportdesign/source/ui/inspection/ ================================================== File [changed]: DataProviderHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/DataProviderHandler.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +111 -36 ---------------------- --- DataProviderHandler.cxx 2008-01-24 12:40:56+0000 1.1.2.1 +++ DataProviderHandler.cxx 2008-01-25 13:57:55+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: DataProviderHandler.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:40:56 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,7 @@ #ifndef _COM_SUN_STAR_INSPECTION_PROPERTYCONTROLTYPE_HPP_ #include <com/sun/star/inspection/PropertyControlType.hpp> #endif +#include <com/sun/star/inspection/PropertyLineElement.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> @@ -65,10 +66,8 @@ #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> - -#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_ #include <com/sun/star/report/XReportDefinition.hpp> -#endif + #ifndef _COM_SUN_STAR_REPORT_XSECTION_HPP_ #include <com/sun/star/report/XSection.hpp> #endif @@ -185,6 +184,8 @@ m_xFormComponent = m_xChartModel->getDataProvider(); } } + m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY); + m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY ); //const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); //if ( xNameCont->hasByName(sRowSet) ) //{ @@ -290,10 +291,16 @@ switch(nId) { case PROPERTY_ID_CHARTTYPE: - aOut.PrimaryButtonId = UID_RPT_PROP_DLG_FONT_TYPE; + aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True); aOut.HasPrimaryButton = sal_True; break; + case PROPERTY_ID_MASTERFIELDS: + case PROPERTY_ID_DETAILFIELDS: + aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); + aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS; + aOut.HasPrimaryButton = sal_True; + break; default: aOut = m_xFormComponentHandler->describePropertyLine(PropertyName, _xControlFactory); } @@ -362,9 +369,19 @@ { m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); beans::Property aValue; - aValue.Name = PROPERTY_CHARTTYPE; + static const ::rtl::OUString s_pProperties[] = + { + PROPERTY_CHARTTYPE + ,PROPERTY_MASTERFIELDS + ,PROPERTY_DETAILFIELDS + }; + ; + for (size_t nPos = 0; nPos < sizeof(s_pProperties)/sizeof(s_pProperties[0]) ;++nPos ) + { + aValue.Name = s_pProperties[nPos]; aNewProps.push_back(aValue); } + } return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } @@ -388,45 +405,103 @@ { if ( !_rxInspectorUI.is() ) throw lang::NullPointerException(); - if ( PropertyName.equalsAscii(PROPERTY_CHARTTYPE) ) + + inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName); + switch(nId) { + case PROPERTY_ID_CHARTTYPE: + if ( impl_dialogChartType_nothrow(aGuard) ) + eResult = inspection::InteractiveSelectionResult_ObtainedValue; + break; + case PROPERTY_ID_MASTERFIELDS: + case PROPERTY_ID_DETAILFIELDS: + if ( impl_dialogLinkedFields_nothrow( aGuard ) ) + eResult = inspection::InteractiveSelectionResult_Success; + break; + default: + eResult = m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, _rxInspectorUI); + } + + return eResult; +} + +void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) +{ ::osl::ClearableMutexGuard aGuard( m_aMutex ); + const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName); + switch(nId) + { + case PROPERTY_ID_MASTERFIELDS: + break; + case PROPERTY_ID_DETAILFIELDS: + // in opposite to the other properties, here in real *two* properties are + // affected + { + uno::Reference< report::XReportDefinition> xReport = m_xReportComponent->getSection()->getReportDefinition(); + bool bDoEnableMasterDetailFields = xReport.is() && xReport->getCommand().getLength() && m_xDataProvider->getCommand().getLength(); + InspectorUI->enablePropertyUIElements( PROPERTY_DETAILFIELDS, inspection::PropertyLineElement::PrimaryButton, bDoEnableMasterDetailFields ); + InspectorUI->enablePropertyUIElements( PROPERTY_MASTERFIELDS, inspection::PropertyLineElement::PrimaryButton, bDoEnableMasterDetailFields ); + } + break; + default: + m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit); + } +} + +::sal_Bool SAL_CALL DataProviderHandler::suspend(::sal_Bool Suspend) throw (uno::RuntimeException) +{ + return m_xFormComponentHandler->suspend(Suspend); +} +bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const +{ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); - aGuard.clear(); - inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; - uno::Sequence<uno::Any> aSeq(2); + uno::Sequence<uno::Any> aSeq(3); beans::PropertyValue aParam; - aParam.Name = rtl::OUString::createFromAscii("ParentWindow"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); aParam.Value <<= xInspectorWindow; aSeq[0] <<= aParam; - aParam.Name = rtl::OUString::createFromAscii("ChartModel"); - aParam.Value <<= m_xChartModel; + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Detail")); + aParam.Value <<= m_xDataProvider; aSeq[1] <<= aParam; + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master")); + aParam.Value <<= m_xReportComponent->getSection()->getReportDefinition(); + aSeq[2] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.ChartTypeDialog")),aSeq + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog")),aSeq , m_xContext), uno::UNO_QUERY); - if ( xDialog->execute() != 0 ) - eResult = inspection::InteractiveSelectionResult_ObtainedValue; - return eResult; - } - return m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, _rxInspectorUI); + _rClearBeforeDialog.clear(); + return ( xDialog->execute() != 0 ); } - -void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) +// ----------------------------------------------------------------------------- +bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { - m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit); -} + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); -::sal_Bool SAL_CALL DataProviderHandler::suspend(::sal_Bool Suspend) throw (uno::RuntimeException) -{ - return m_xFormComponentHandler->suspend(Suspend); -} + uno::Sequence<uno::Any> aSeq(2); + beans::PropertyValue aParam; + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); + aParam.Value <<= xInspectorWindow; + aSeq[0] <<= aParam; + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel")); + aParam.Value <<= m_xChartModel; + aSeq[1] <<= aParam; + + uno::Reference< ui::dialogs::XExecutableDialog > xDialog( + m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.ChartTypeDialog")),aSeq + , m_xContext), uno::UNO_QUERY); + _rClearBeforeDialog.clear(); + return ( xDialog->execute() != 0 ); +} //........................................................................ } // namespace rptui //........................................................................ File [changed]: inspection.src Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/inspection.src?r1=1.5.20.1&r2=1.5.20.2 Delta lines: +10 -2 -------------------- --- inspection.src 2008-01-24 12:39:33+0000 1.5.20.1 +++ inspection.src 2008-01-25 13:57:55+0000 1.5.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: inspection.src,v $ * - * $Revision: 1.5.20.1 $ + * $Revision: 1.5.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:33 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -228,3 +228,11 @@ { Text [ en-US ] = "Field or Formula;Function;Counter;User defined Function"; }; +String RID_STR_MASTERFIELDS +{ + Text [ en-US ] = "Link master fields" ; +}; +String RID_STR_DETAILFIELDS +{ + Text [ en-US ] = "Link slave fields" ; +}; \ No newline at end of file File [changed]: metadata.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/metadata.cxx?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +5 -2 ------------------- --- metadata.cxx 2008-01-24 12:39:33+0000 1.4.20.1 +++ metadata.cxx 2008-01-25 13:57:56+0000 1.4.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: metadata.cxx,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:33 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:57:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -188,6 +188,8 @@ ,DEF_INFO_1( CONTROLBACKGROUNDTRANSPARENT, CONTROLBACKGROUNDTRANSPARENT ,CONTROLBACKGROUNDTRANSPARENT, COMPOSEABLE ) ,DEF_INFO_1( CHARTTYPE, CHARTTYPE, CHARTTYPE, COMPOSEABLE ) + ,DEF_INFO_2( MASTERFIELDS, MASTERFIELDS, MASTERFIELDS, COMPOSEABLE,DATA_PROPERTY ) + ,DEF_INFO_2( DETAILFIELDS, DETAILFIELDS, DETAILFIELDS, COMPOSEABLE,DATA_PROPERTY) }; s_pPropertyInfos = aPropertyInfos; @@ -377,6 +379,7 @@ ,PROPERTY_FORMULALIST ,PROPERTY_SCOPE ,PROPERTY_TYPE + ,PROPERTY_DATASOURCENAME }; beans::Property* pPropsIter = aProps.getArray(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
