summaryrefslogtreecommitdiff
path: root/chart2/source/controller
diff options
context:
space:
mode:
authorBjörn Milcke <bm@openoffice.org>2003-11-04 12:28:39 +0000
committerBjörn Milcke <bm@openoffice.org>2003-11-04 12:28:39 +0000
commit12095b63ceb18f3e76a69864bd15e101c0db0471 (patch)
treef9213b560e4ef566c7db83fead75ad81369182a8 /chart2/source/controller
parent0894ce1bd39f2d1e7ce963a4608412c54b452fed (diff)
-ChartTypeItemConverter
Diffstat (limited to 'chart2/source/controller')
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.cxx10
-rw-r--r--chart2/source/controller/inc/dlg_ChartType.hxx6
-rw-r--r--chart2/source/controller/main/ChartController.cxx20
3 files changed, 16 insertions, 20 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index f51bb1137e7bf..d50719f0285d7 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dlg_ChartType.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: bm $ $Date: 2003-11-04 13:21:59 $
+ * last change: $Author: bm $ $Date: 2003-11-04 13:28:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1255,6 +1255,12 @@ sal_Int32 SchDiagramTypeDlg::GetNumberOfLines() const
return aMtrFldNumLines.GetValue();
}
+bool SchDiagramTypeDlg::HasChanged() const
+{
+ // todo: only return true if really settings have changed
+ return true;
+}
+
//.............................................................................
} //namespace chart
//.............................................................................
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index fee2df40b5948..aec1d7d312bc9 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dlg_ChartType.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: bm $ $Date: 2003-11-04 12:37:14 $
+ * last change: $Author: bm $ $Date: 2003-11-04 13:28:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -227,6 +227,8 @@ public:
::com::sun::star::uno::Reference<
::drafts::com::sun::star::chart2::XChartTypeTemplate >
getTemplate() const;
+
+ bool HasChanged() const;
};
//.............................................................................
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 2fc602a1fa870..92aed9c808646 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ChartController.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: bm $ $Date: 2003-11-04 12:37:19 $
+ * last change: $Author: bm $ $Date: 2003-11-04 13:28:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -78,7 +78,6 @@
#include "chartview/NumberFormatterWrapper.hxx"
#include "dlg_ChartType.hxx"
-#include "ChartTypeItemConverter.hxx"
//for SID_CHARMAP:
#ifndef _SVX_SVXIDS_HRC
@@ -1092,24 +1091,13 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
if( xChartDoc.is())
{
uno::Reference< lang::XMultiServiceFactory > xCTManager( xChartDoc->getChartTypeManager(), uno::UNO_QUERY );
-// wrapper::ChartTypeItemConverter aItemConverter( xCTManager, xProp, m_pDrawModelWrapper->GetItemPool() );
-// SfxItemSet aItemSet = aItemConverter.CreateEmptyItemSet();//creates only an empty itemset
-// aItemConverter.FillItemSet( aItemSet );
//-------------------------------------------------------------
//prepare and open dialog
Window* pParent( NULL );
SchDiagramTypeDlg aDlg( pParent, xDia, xCTManager );
- if( aDlg.Execute() == RET_OK )
+ if( aDlg.Execute() == RET_OK &&
+ aDlg.HasChanged() )
{
-// SfxItemSet aOutItemSet = aItemConverter.CreateEmptyItemSet();
-// aDlg.GetAttr( aOutItemSet );
-
-// bChanged = aItemConverter.ApplyItemSet( aOutItemSet );//model should be changed now
-
-// // XPropertySet may have been changed
-// uno::Reference< beans::XPropertySet > xNewProp( aItemConverter.GetPropertySet());
-// bChanged = bChanged || (xProp != xNewProp);
-// xProp = xNewProp;
xTemplate.set( aDlg.getTemplate());
bChanged = true;
}