Skip to content

C
core
Kaydet (Commit) d0f2a789 authored tarafından Frank Schoenheit [fs]'s avatar Frank Schoenheit [fs]
Dosyalara gözat
Seçenekler

dba34a: merged latest changes from CWS dba33j

üst 5c6e9ede 467abe4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 33 deletions
dbaccess/source/core/inc/DatabaseDataProvider.hxx
Dosyayı görüntüle @ d0f2a789
...@@ -223,7 +223,7 @@ private: ...@@ -223,7 +223,7 @@ private:
void impl_fillRowSet_throw(); void impl_fillRowSet_throw();
void impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies); void impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies);
bool impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies); bool impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies);
void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& i_aColumnNames); void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& i_aColumnNames);
void impl_invalidateParameter_nothrow(); void impl_invalidateParameter_nothrow();
::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const;
......
reportdesign/source/core/sdr/RptObject.cxx
Dosyayı görüntüle @ d0f2a789
...@@ -1221,20 +1221,12 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) ...@@ -1221,20 +1221,12 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); OReportModel* pRptModel = static_cast<OReportModel*>(GetModel());
pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj));
uno::Sequence< beans::PropertyValue > aArgs( 4 ); ::comphelper::NamedValueCollection aArgs;
aArgs[0] = beans::PropertyValue( aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "all" ) ) ) );
::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1, aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
uno::makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("all")) ), beans::PropertyState_DIRECT_VALUE ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs[1] = beans::PropertyValue( aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
::rtl::OUString::createFromAscii("HasCategories"), -1, xReceiver->setArguments( aArgs.getPropertyValues() );
uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
::rtl::OUString::createFromAscii("DataRowSource"), -1,
uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
xReceiver->setArguments( aArgs );
if( xChartModel.is() ) if( xChartModel.is() )
xChartModel->unlockControllers(); xChartModel->unlockControllers();
......
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
Dosyayı görüntüle @ d0f2a789
...@@ -349,14 +349,14 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > ...@@ -349,14 +349,14 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
if ( xDataProvider.is() ) if ( xDataProvider.is() )
{ {
m_aColumns.realloc(1); m_aColumns.realloc(1);
uno::Sequence< uno::Sequence< ::rtl::OUString > > aColumnNames = xDataProvider->getComplexColumnDescriptions(); uno::Sequence< ::rtl::OUString > aColumnNames = xDataProvider->getColumnDescriptions();
for(sal_Int32 i = 0 ; i < aColumnNames.getLength();++i) for(sal_Int32 i = 0 ; i < aColumnNames.getLength();++i)
{ {
if ( aColumnNames[i].getLength() ) if ( aColumnNames[i].getLength() )
{ {
sal_Int32 nCount = m_aColumns.getLength(); sal_Int32 nCount = m_aColumns.getLength();
m_aColumns.realloc(nCount+1); m_aColumns.realloc(nCount+1);
m_aColumns[nCount] = aColumnNames[i][0]; m_aColumns[nCount] = aColumnNames[i];
} }
} }
} }
......
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
Dosyayı görüntüle @ d0f2a789
...@@ -135,8 +135,8 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, ...@@ -135,8 +135,8 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY); uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY);
if ( xDataProvider.is() ) if ( xDataProvider.is() )
{ {
const uno::Sequence< uno::Sequence< ::rtl::OUString > > aColumnNames = xDataProvider->getComplexColumnDescriptions(); const uno::Sequence< ::rtl::OUString > aColumnNames = xDataProvider->getColumnDescriptions();
aArgs.put( "ComplexColumnDescriptions", uno::makeAny( aColumnNames ) ); aArgs.put( "ColumnDescriptions", uno::makeAny( aColumnNames ) );
} }
xReceiver->attachDataProvider( m_xDatabaseDataProvider.get() ); xReceiver->attachDataProvider( m_xDatabaseDataProvider.get() );
......
reportdesign/source/ui/inspection/DataProviderHandler.cxx
Dosyayı görüntüle @ d0f2a789
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "precompiled_reportdesign.hxx" #include "precompiled_reportdesign.hxx"
#include "DataProviderHandler.hxx" #include "DataProviderHandler.hxx"
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <comphelper/types.hxx> #include <comphelper/types.hxx>
...@@ -469,21 +470,13 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin ...@@ -469,21 +470,13 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin
sal_Bool bModified = xReport->isModified(); sal_Bool bModified = xReport->isModified();
// this fills the chart again // this fills the chart again
uno::Sequence< beans::PropertyValue > aArgs( 4 ); ::comphelper::NamedValueCollection aArgs;
aArgs[0] = beans::PropertyValue( aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "all" ) ) ) );
::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1, aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
uno::makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("all")) ), beans::PropertyState_DIRECT_VALUE ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs[1] = beans::PropertyValue( aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
::rtl::OUString::createFromAscii("HasCategories"), -1,
uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
::rtl::OUString::createFromAscii("DataRowSource"), -1,
uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xChartModel,uno::UNO_QUERY_THROW); uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xChartModel,uno::UNO_QUERY_THROW);
xReceiver->setArguments( aArgs ); xReceiver->setArguments( aArgs.getPropertyValues() );
if ( !bModified ) if ( !bModified )
xReport->setModified(sal_False); xReport->setModified(sal_False);
} // if ( NewValue != OldValue ) } // if ( NewValue != OldValue )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment