mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to set the RoundedEdge check box on load.

Browse Source 
Change-Id: Ic62e3f26b2cda28e823c465efb78a397fe781d51
This commit is contained in:
Kohei Yoshida
2014-03-26 23:07:14 -04:00
parent defa767632
commit d87240c0b2
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
chart2/source/controller/dialogs/tp_ChartType.cxx
View File

@@ -37,27 +37,6 @@ namespace chart
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2;
namespace
{
sal_Bool lcl_getSortByXValues( const uno::Reference< chart2::XChartDocument >& xChartDoc )
{
sal_Bool bRet = sal_False;
if( xChartDoc.is() )
{
try
{
uno::Reference< beans::XPropertySet > xDiaProp( xChartDoc->getFirstDiagram(), uno::UNO_QUERY_THROW );
xDiaProp->getPropertyValue( "SortByXValues" ) >>= bRet;
}
catch( const uno::Exception & ex )
{
ASSERT_EXCEPTION( ex );
}
}
return bRet;
}
}
#define POS_3DSCHEME_SIMPLE 0 #define POS_3DSCHEME_SIMPLE 0
#define POS_3DSCHEME_REALISTIC 1 #define POS_3DSCHEME_REALISTIC 1
@@ -848,8 +827,18 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ )
commitToModel( aParameter ); commitToModel( aParameter );
//detect the new ThreeDLookScheme //detect the new ThreeDLookScheme
aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( ChartModelHelper::findDiagram( m_xChartModel ) ); uno::Reference<XDiagram> xDiagram = ChartModelHelper::findDiagram(m_xChartModel);
aParameter.bSortByXValues = lcl_getSortByXValues( m_xChartModel ); aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme(xDiagram);
try
{
uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
xPropSet->getPropertyValue("SortByXValues") >>= aParameter.bSortByXValues;
xPropSet->getPropertyValue("RoundedEdge") >>= aParameter.mbRoundedEdge;
}
catch ( const uno::Exception& ex )
{
ASSERT_EXCEPTION(ex);
}
//the controls have to be enabled/disabled accordingly //the controls have to be enabled/disabled accordingly
this->fillAllControls( aParameter ); this->fillAllControls( aParameter );
@@ -906,7 +895,18 @@ void ChartTypeTabPage::selectMainType()
if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic ) if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic )
aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic; aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic;
aParameter.bSortByXValues = lcl_getSortByXValues( m_xChartModel ); uno::Reference<XDiagram> xDiagram = ChartModelHelper::findDiagram(m_xChartModel);
try
{
uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
xPropSet->getPropertyValue("SortByXValues") >>= aParameter.bSortByXValues;
xPropSet->getPropertyValue("RoundedEdge") >>= aParameter.mbRoundedEdge;
}
catch ( const uno::Exception& ex )
{
ASSERT_EXCEPTION(ex);
}
this->fillAllControls( aParameter ); this->fillAllControls( aParameter );
uno::Reference< beans::XPropertySet > xTemplateProps( this->getCurrentTemplate(), uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xTemplateProps( this->getCurrentTemplate(), uno::UNO_QUERY );
m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps); m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps);
@@ -981,7 +981,16 @@ void ChartTypeTabPage::initializePage()
if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic ) if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic )
aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic; aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic;
aParameter.bSortByXValues = lcl_getSortByXValues( m_xChartModel ); try
{
uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
xPropSet->getPropertyValue("SortByXValues") >>= aParameter.bSortByXValues;
xPropSet->getPropertyValue("RoundedEdge") >>= aParameter.mbRoundedEdge;
}
catch (const uno::Exception& ex)
{
ASSERT_EXCEPTION(ex);
}
this->fillAllControls( aParameter ); this->fillAllControls( aParameter );
if( m_pCurrentMainType ) if( m_pCurrentMainType )