diff options
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/statusbarcontroller.cxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index ab9b3e750bd5..2d9d3d225673 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -1248,7 +1248,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1, - uno::makeAny( sal_False ), beans::PropertyState_DIRECT_VALUE ); + 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 ); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 7bbdb87cc48d..1706139d4004 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -363,7 +363,7 @@ namespace _rItemSet.Put(aHorJustifyItem); //_rItemSet.Put(SfxInt32Item(ITEMID_DEGREES,_rxReportControlFormat->getCharRotation())); SvxVerJustifyItem aVerJustifyItem(ITEMID_VERJUSTIFY); - aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),0); + aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),MID_HORJUST_ADJUST); _rItemSet.Put(aVerJustifyItem); //_rItemSet.Put(SfxInt32Item(ITEMID_IDENT,_rxReportControlFormat->getCharRotation())); @@ -489,7 +489,7 @@ namespace { const SvxVerJustifyItem* pJustifyItem = static_cast<const SvxVerJustifyItem*>(pItem); uno::Any aValue; - pJustifyItem->QueryValue(aValue,0); + pJustifyItem->QueryValue(aValue,MID_HORJUST_ADJUST); lcl_pushBack( _out_rProperties, PROPERTY_VERTICALALIGN, aValue ); } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_CHARRELIEF,sal_True,&pItem) && pItem->ISA(SvxCharReliefItem)) diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index b69fa43224d4..c85988e69e94 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -223,6 +223,8 @@ void SAL_CALL OStatusbarController::update() throw ( RuntimeException ) // XComponent void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException) { + Reference< XComponent > xComp( m_pController.getRef(), UNO_QUERY ); + ::comphelper::disposeComponent(xComp); m_pController.dispose(); svt::StatusbarController::dispose(); } |