This time with 1 (hopefully) working fixed if-statelement :)
Timo H.
From 9c1ac82d6904aa43010c310a9d84c64bdf5b419d Mon Sep 17 00:00:00 2001
From: Timo Heino <era...@gmail.com>
Date: Fri, 10 Dec 2010 23:23:45 +0200
Subject: [PATCH] More commented out code removed
I try to take smallish control over commented out code ;)
Next time before commits i would like to see if someone really makes sure there is no commented out doe :|
Timo
p.s. (only one time i occured small "error" on if-statelement; fixed it (i think so))
Signed-off-by: Timo Heino <era...@gmail.com>
---
chart2/source/model/main/Axis.hxx | 7 -------
chart2/source/model/main/ChartModel.cxx | 9 ---------
chart2/source/model/main/ChartModel.hxx | 7 -------
chart2/source/model/main/DataPointProperties.hxx | 1 -
chart2/source/model/main/FormattedString.hxx | 7 -------
chart2/source/model/main/Legend.hxx | 7 -------
chart2/source/model/main/PageBackground.hxx | 7 -------
chart2/source/model/main/Title.hxx | 7 -------
chart2/source/model/main/Wall.hxx | 7 -------
9 files changed, 0 insertions(+), 59 deletions(-)
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index e9adcc9..c81a751 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -96,13 +96,6 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
// ____ XAxis ____
virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 9681666..d32a5cb 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -495,9 +495,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
uno::Any aSel = xSelectionSupl->getSelection();
rtl::OUString aObjectCID;
if( aSel >>= aObjectCID )
- {
xReturn.set( ObjectIdentifier::getObjectPropertySet( aObjectCID, Reference< XChartDocument >(this)));
- }
}
}
return xReturn;
@@ -531,13 +529,6 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException)
DisposeHelper::DisposeAndClear( m_xPageBackground );
DisposeHelper::DisposeAndClear( m_xXMLNamespaceMap );
- // not owner of storage
-// if( m_xStorage.is())
-// {
-// Reference< lang::XComponent > xComp( m_xStorage, uno::UNO_QUERY );
-// if( xComp.is())
-// xComp->dispose();
-// }
m_xStorage.clear();
if( m_xOldModelAgg.is())
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 062fde0..57ceeb5 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -87,14 +87,9 @@ namespace impl
// Note: needed for queryInterface (if it calls the base-class implementation)
typedef ::comphelper::WeakImplHelper20<
-// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument
::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster
,::com::sun::star::frame::XStorable2 //(extension of XStorable)
-// ,::com::sun::star::frame::XStorable //(required interface) base of XStorable2
,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface)
- // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface)
- // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface)
- // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
,::com::sun::star::lang::XServiceInfo
,::com::sun::star::chart2::XChartDocument // derived from XModel
,::com::sun::star::chart2::data::XDataReceiver // public API
@@ -136,8 +131,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController;
sal_uInt16 m_nControllerLockCount;
-// ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrinterOptions;
-
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xOldModelAgg;
diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx
index 9750a4a..b495c20 100644
--- a/chart2/source/model/main/DataPointProperties.hxx
+++ b/chart2/source/model/main/DataPointProperties.hxx
@@ -50,7 +50,6 @@ public:
// fill
PROP_DATAPOINT_FILL_STYLE,
-// PROP_DATAPOINT_TRANSPARENCY_STYLE,
PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
PROP_DATAPOINT_GRADIENT_NAME,
PROP_DATAPOINT_GRADIENT_STEPCOUNT,
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 575a597..f3a2fdc 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -94,13 +94,6 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx
index 98be6df..25c3156 100644
--- a/chart2/source/model/main/Legend.hxx
+++ b/chart2/source/model/main/Legend.hxx
@@ -91,13 +91,6 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
// ____ XLegend ____
virtual void SAL_CALL registerEntry( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XLegendEntry >& xEntry )
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index de8ace5..bf9b9a3 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -84,13 +84,6 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index 3c403a4..1d5ef36 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -89,13 +89,6 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
// ____ XTitle ____
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx
index e682a08..d90db34 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -82,13 +82,6 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
throw (::com::sun::star::uno::RuntimeException);
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
