diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-08 11:05:35 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-08 11:05:35 +0100 |
| commit | 24684974fe50ca308a7af50a34c5f73d4b2d9d5f (patch) | |
| tree | 74e831358f8dfaac5f78b340d7b275782838d5e4 /chart2/source | |
| parent | 981b1b3d5a9bcdad2a267bedcc5da22266103a0b (diff) | |
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_AxisLabel.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 8d405af88dc8..e04857adbca2 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -256,11 +256,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) // text order ---------- if( m_bShowStaggeringControls ) { -<<<<<<< local - aState = rInAttrs.GetItemState( SCHATTR_TEXT_ORDER, sal_False, &pPoolItem ); -======= aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, sal_False, &pPoolItem ); ->>>>>>> other if( aState == SFX_ITEM_SET ) { SvxChartTextOrder eOrder = static_cast< const SvxChartTextOrderItem * >( pPoolItem )->GetValue(); |