[Libreoffice-commits] .: chart2/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Nov 22 12:36:18 PST 2010
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 3 --
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 13 ----------
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 6 ----
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 6 ----
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx | 5 ---
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 4 ---
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 3 --
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 3 --
10 files changed, 45 deletions(-)
New commits:
commit 263388925f1580d7bf4ee842a811a01876641e73
Author: Timo Heino <eraggo at gmail.com>
Date: Mon Nov 22 20:18:43 2010 +0200
More cleanup in calc
Removed more commented out code
>From 508c82de834dc890a2b00702147a55c4603c4bb1 Mon Sep 17 00:00:00 2001
From: Timo Heino <eraggo at gmail.com>
Date: Mon, 22 Nov 2010 20:14:43 +0200
Subject: [PATCH] More commented out code removed in calc
Signed-off-by: Timo Heino <eraggo at gmail.com>
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index ba7cbd4..cb92ec6 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -70,7 +70,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LineProperties::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
-// ::chart::NamedProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
// and sort them for access via bsearch
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 3498f8c..26c8357 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -337,7 +337,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
lcl_AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::LineProperties::AddPropertiesToVector( aProperties );
-// ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
@@ -584,8 +583,6 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
aServices[ 0 ] = C2U( "com.sun.star.chart.ChartAxis" );
aServices[ 1 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
aServices[ 2 ] = C2U( "com.sun.star.style.CharacterProperties" );
-// aServices[ 3 ] = C2U( "com.sun.star.beans.PropertySet" );
-// aServices[ 4 ] = C2U( "com.sun.star.drawing.LineProperties" );
return aServices;
}
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index e123340..d7d24fc 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1498,19 +1498,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartDocumentWrapper::getAvailableServ
return aResult;
-// // shapes
-// // uno::Sequence< OUString > aDrawServices( SvxUnoDrawMSFactory::getAvailableServiceNames() );
-// // const OUString * pArr = aDrawServices.getConstArray();
-// // aServices.insert( aServices.end(), pArr, pArr + aDrawServices.getLength() );
-// }
-
-
- // add-ins
- // uno::Sequence< OUString > aAddIns( GetAddInCollection().GetAddInNames() );
-// pArr = aAddIns.getConstArray();
-// aServices.insert( aServices.end(), pArr, pArr + aAddIns.getLength() );
-
-// return ContainerToSequence( aServices );
}
// ____ XAggregation ____
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 7cbdb4b..1b46b17 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -730,13 +730,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
- //add unnamed fill properties (different inner names here)
-// aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) );
-// aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillHatch" ), C2U( "HatchName" ) ) );
-// aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillTransparenceGradient" ), C2U( "TransparencyGradientName" ) ) );
-
//add unnamed line properties (different inner names here)
-// aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "LineDash" ), C2U( "LineDashName" ) ) );
aWrappedProperties.push_back( new WrappedProperty( C2U( "FillColor" ), C2U( "Color" ) ) );
aWrappedProperties.push_back( new WrappedLineStyleProperty( this ) );
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index f8d5e47..3e285fa 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1203,12 +1203,6 @@ void SAL_CALL DiagramWrapper::removeEventListener(
m_aEventListenerContainer.removeInterface( aListener );
}
-// ____ XEventListener ____
-// void SAL_CALL DiagramWrapper::disposing( const lang::EventObject& Source )
-// throw (uno::RuntimeException)
-// {
-// }
-
//-----------------------------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------------------------
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 93ced0d..e9386bd 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -208,12 +208,7 @@ public:
virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException);
-// // ____ XEventListener ____
-// virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-// throw (::com::sun::star::uno::RuntimeException);
-
// ____ XDiagramPositioning ____
-
virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 33ac262..649a996 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -71,7 +71,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
// get properties
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LineProperties::AddPropertiesToVector( aProperties );
-// ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
// and sort them for access via bsearch
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 064a9b6..1ca0c4e 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -261,7 +261,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::LineProperties::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
-// ::chart::NamedProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
@@ -446,9 +445,6 @@ Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static()
aServices[ 1 ] = C2U( "com.sun.star.drawing.Shape" );
aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
aServices[ 3 ] = C2U( "com.sun.star.style.CharacterProperties" );
-// aServices[ 4 ] = C2U( "com.sun.star.beans.PropertySet" );
-// aServices[ 5 ] = C2U( "com.sun.star.drawing.FillProperties" );
-// aServices[ 6 ] = C2U( "com.sun.star.drawing.LineProperties" );
return aServices;
}
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 78f5539..76a232f 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -69,7 +69,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LineProperties::AddPropertiesToVector( aProperties );
-// ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
// and sort them for access via bsearch
@@ -282,8 +281,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< ::rtl::
}
}
//todo: store unknown properties elsewhere
-// if( bUnknownProperty )
-// throw beans::UnknownPropertyException();
}
uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq )
throw (uno::RuntimeException)
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 2b1d451..e77516e 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -64,9 +64,6 @@ class MinMaxLineWrapper : public MutexContainer
, ::com::sun::star::beans::XMultiPropertySet
, ::com::sun::star::beans::XPropertyState
, ::com::sun::star::beans::XMultiPropertyStates
- // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface)
- // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper
- // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
>
{
public:
More information about the Libreoffice-commits
mailing list