diff options
Diffstat (limited to 'chart2/source/tools/CachedDataSequence.cxx')
-rw-r--r-- | chart2/source/tools/CachedDataSequence.cxx | 62 |
1 files changed, 5 insertions, 57 deletions
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 68cbcb50caa7..09a814f277c8 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -68,9 +68,7 @@ enum { // PROP_SOURCE_IDENTIFIER, PROP_NUMBERFORMAT_KEY, - PROP_PROPOSED_ROLE, - PROP_HIDDEN, - PROP_HIDDEN_VALUES + PROP_PROPOSED_ROLE }; } // anonymous namespace @@ -82,67 +80,31 @@ namespace chart CachedDataSequence::CachedDataSequence() : OPropertyContainer( GetBroadcastHelper()), CachedDataSequence_Base( GetMutex()), - m_bIsHidden( true ), m_eCurrentDataType( NUMERICAL ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) + m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) { registerProperties(); } CachedDataSequence::CachedDataSequence( const Reference< uno::XComponentContext > & /*xContext*/ ) : OPropertyContainer( GetBroadcastHelper()), CachedDataSequence_Base( GetMutex()), - m_bIsHidden( true ), m_eCurrentDataType( MIXED ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder( )) + m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder( )) { registerProperties(); } -CachedDataSequence::CachedDataSequence( const ::std::vector< double > & rVector ) - : OPropertyContainer( GetBroadcastHelper()), - CachedDataSequence_Base( GetMutex()), - m_bIsHidden( true ), - m_eCurrentDataType( NUMERICAL ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) -{ - m_aNumericalSequence = ContainerToSequence( rVector ); - registerProperties(); -} - -CachedDataSequence::CachedDataSequence( const ::std::vector< OUString > & rVector ) - : OPropertyContainer( GetBroadcastHelper()), - CachedDataSequence_Base( GetMutex()), - m_bIsHidden( true ), - m_eCurrentDataType( TEXTUAL ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) -{ - m_aTextualSequence = ContainerToSequence( rVector ); - registerProperties(); -} - CachedDataSequence::CachedDataSequence( const OUString & rSingleText ) : OPropertyContainer( GetBroadcastHelper()), CachedDataSequence_Base( GetMutex()), - m_bIsHidden( true ), m_eCurrentDataType( TEXTUAL ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) + m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) { m_aTextualSequence.realloc(1); m_aTextualSequence[0] = rSingleText; registerProperties(); } -CachedDataSequence::CachedDataSequence( const ::std::vector< Any > & rVector ) - : OPropertyContainer( GetBroadcastHelper()), - CachedDataSequence_Base( GetMutex()), - m_bIsHidden( true ), - m_eCurrentDataType( MIXED ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) -{ - m_aMixedSequence = ContainerToSequence( rVector ); - registerProperties(); -} - CachedDataSequence::CachedDataSequence( const CachedDataSequence & rSource ) : OMutexAndBroadcastHelper(), OPropertyContainer( GetBroadcastHelper()), @@ -150,10 +112,8 @@ CachedDataSequence::CachedDataSequence( const CachedDataSequence & rSource ) CachedDataSequence_Base( GetMutex()), m_nNumberFormatKey( rSource.m_nNumberFormatKey ), m_sRole( rSource.m_sRole ), - m_bIsHidden( rSource.m_bIsHidden ), - m_aHiddenValues( rSource.m_aHiddenValues ), m_eCurrentDataType( rSource.m_eCurrentDataType ), - m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()) + m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) { switch( m_eCurrentDataType ) { @@ -187,18 +147,6 @@ void CachedDataSequence::registerProperties() 0, // PropertyAttributes & m_sRole, ::getCppuType( & m_sRole ) ); - - registerProperty( C2U( "IsHidden" ), - PROP_HIDDEN, - 0, // PropertyAttributes - & m_bIsHidden, - ::getCppuType( & m_bIsHidden ) ); - - registerProperty( C2U( "HiddenValues" ), - PROP_HIDDEN_VALUES, - 0, // PropertyAttributes - & m_aHiddenValues, - ::getCppuType( & m_aHiddenValues ) ); } Sequence< double > CachedDataSequence::Impl_getNumericalData() const |