summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx15
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx45
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.cxx6
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.hxx3
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx1
-rw-r--r--chart2/source/model/template/ChartType.hxx12
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx12
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.hxx4
-rw-r--r--chart2/source/tools/CommonConverters.cxx1
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx14
-rw-r--r--chart2/source/tools/OPropertySet.cxx86
-rw-r--r--chart2/source/view/charttypes/CategoryPositionHelper.cxx2
-rw-r--r--chart2/source/view/main/DataPointSymbolSupplier.cxx1
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx41
14 files changed, 1 insertions, 242 deletions
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 631bce3d48aa..8635e80a6597 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -58,7 +58,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -81,10 +80,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
m_xUndoManager->preAction( getModel());
SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
- //pOutliner->SetRefDevice(m_pChartWindow);
- //pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)pStyleSheetPool);
- //pOutliner->SetDefaultLanguage( eLang );
- //pOutliner->SetHyphenator( xHyphenator );
//#i77362 change notification for changes on additional shapes are missing
uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
@@ -102,12 +97,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
);
if(bEdit)
{
- // set undo manager at topmost shell ( SdDrawTextObjectBar )
- /*
- if( pViewSh )
- pViewSh->GetViewFrame()->GetDispatcher()->GetShell( 0 )->
- SetUndoManager(&pOutliner->GetUndoManager());
- */
m_pDrawViewWrapper->SetEditMode();
// #i12587# support for shapes in chart
@@ -236,8 +225,6 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
// attributes become unique (sel. has to be erased anyway)
pOutlinerView->InsertText(String());
- //SfxUndoManager& rUndoMgr = pOutliner->GetUndoManager();
- //rUndoMgr.EnterListAction( String( SchResId( STR_UNDO_INSERT_SPECCHAR )), String( SchResId( STR_UNDO_INSERT_SPECCHAR )));
pOutlinerView->InsertText(aString, TRUE);
ESelection aSel = pOutlinerView->GetSelection();
@@ -245,8 +232,6 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
aSel.nStartPos = aSel.nEndPos;
pOutlinerView->SetSelection(aSel);
- //rUndoMgr.LeaveListAction();
-
// show changes
pOutliner->SetUpdateMode(TRUE);
pOutlinerView->ShowCursor();
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 261561125bd3..23dc588dd13f 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -155,51 +155,6 @@ bool lcl_deleteDataCurve(
return bResult;
}
-// void lcl_CopyPageContentToPage(
-// const Reference< drawing::XDrawPage > & xSourcePage,
-// const Reference< drawing::XDrawPage > & xDestPage )
-// {
-// try
-// {
-// Reference< container::XIndexAccess > xSourceIA( xSourcePage, uno::UNO_QUERY_THROW );
-// sal_Int32 nCount( xSourceIA->getCount());
-// for( sal_Int32 i=0; i<nCount; ++i )
-// {
-// Reference< drawing::XShape > xShape;
-// if( xSourceIA->getByIndex( i ) >>= xShape )
-// xDestPage->add( xShape );
-// }
-// }
-// catch( const uno::Exception & ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-
-// // copies all shapes on all pages of xSource to the only page of xDestination
-// void lcl_CopyShapesToChart(
-// const Reference< frame::XModel > & xSource, const Reference< frame::XModel > & xDestination )
-// {
-// try
-// {
-// Reference< drawing::XDrawPageSupplier > xDestPGSupp( xDestination, uno::UNO_QUERY_THROW );
-// Reference< drawing::XDrawPage > xDestPage( xDestPGSupp->getDrawPage());
-// Reference< drawing::XDrawPagesSupplier > xSourcePGsSupp( xSource, uno::UNO_QUERY_THROW );
-// Reference< drawing::XDrawPages > xSourcePages( xSourcePGsSupp->getDrawPages());
-
-// sal_Int32 nCount( xSourcePages->getCount());
-// for( sal_Int32 i=0; i<nCount; ++i )
-// {
-// Reference< drawing::XDrawPage > xSourcePage( xSourcePages->getByIndex( i ), uno::UNO_QUERY_THROW );
-// lcl_CopyPageContentToPage( xSourcePage, xDestPage );
-// }
-// }
-// catch( const uno::Exception & ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-
} // anonymous namespace
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 399b0e1d6aab..8ee5f4ad712a 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -76,12 +76,6 @@ void CommandDispatchContainer::setModel(
m_xModel = xModel;
}
-// void CommandDispatchContainer::setUndoManager(
-// const Reference< chart2::XUndoManager > & xUndoManager )
-// {
-// m_xUndoManager = xUndoManager;
-// }
-
void CommandDispatchContainer::setChartDispatch(
const Reference< frame::XDispatch > xChartDispatch,
const ::std::set< OUString > & rChartCommands )
diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx
index 8d99247c908d..b698494a9f1e 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.hxx
@@ -87,9 +87,6 @@ public:
void setModel(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xModel );
-// void setUndoManager(
-// const ::com::sun::star::uno::Reference<
-// ::com::sun::star::chart2::XUndoManager > & xUndoManager );
/** Set a chart dispatcher that is used for all commands contained in
rChartCommands
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index c5fcb7e53e1a..903acfab38bc 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -51,7 +51,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
namespace
{
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index c8191eee7847..a2fd1c75f1b9 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -139,23 +139,11 @@ 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);
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
- // not implemented
-// ____ XCloneable ____
-// virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-// throw (::com::sun::star::uno::RuntimeException);
-
protected:
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 2ca8847701fc..1a36079de078 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -114,7 +114,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -171,7 +170,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -186,7 +184,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL PieChartTypeTemplate::getInfoHelper()
@@ -202,7 +199,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -211,7 +207,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
@@ -238,11 +233,6 @@ sal_Int32 PieChartTypeTemplate::getAxisCountByDimension( sal_Int32 /*nDimension*
return 0;
}
-// void PieChartTypeTemplate::createAxes(
-// const Sequence< Reference< chart2::XCoordinateSystem > > & rCoordSys )
-// {
-// }
-
void PieChartTypeTemplate::adaptAxes(
const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > & /*rCoordSys*/ )
{
@@ -274,8 +264,6 @@ void PieChartTypeTemplate::adaptScales(
xAxis->setScaleData( aScaleData );
}
- //------
-
xAxis = AxisHelper::getAxis( 0 /*nDimensionIndex*/,0 /*nAxisIndex*/
, aCooSysSeq[nCooSysIdx] );
if( xAxis.is() )
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx
index b7cf1ea1ec46..6ae289bbaed7 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -101,10 +101,6 @@ protected:
::com::sun::star::chart2::XDiagram > & xDiagram );
virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension );
-// virtual void createAxes(
-// const ::com::sun::star::uno::Sequence<
-// ::com::sun::star::uno::Reference<
-// ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys );
virtual void adaptAxes(
const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 1dd6359b4d84..d56f4ca154eb 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -281,7 +281,6 @@ drawing::PolyPolygonShape3D BezierToPoly(
const drawing::PolyPolygonBezierCoords& rBezier )
{
const drawing::PointSequenceSequence& rPointSequence = rBezier.Coordinates;
-// const drawing::FlagSequenceSequence& rFlags = rBezier.Flags;
drawing::PolyPolygonShape3D aRet;
aRet.SequenceX.realloc( rPointSequence.getLength() );
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 32e0a64718d6..37e4f3ce1b9b 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -371,9 +371,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
{
bool bHasDataRowSource = false;
bool bHasFirstCellAsLabel = false;
-// bool bHasHasCategories = false;
bool bHasCellRangeRepresentation = false;
-// bool bHasSequenceMapping = false;
uno::Reference< data::XDataProvider > xDataProvider( xChartDocument->getDataProvider() );
if( !xDataProvider.is() )
@@ -399,24 +397,12 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
bHasFirstCellAsLabel =
(aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType()));
}
-// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasCategories" ) ))
-// {
-// bHasHasCategories =
-// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType()));
-// }
else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) ))
{
::rtl::OUString aRange;
bHasCellRangeRepresentation =
(aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && aRange.getLength() > 0);
}
-// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
-// {
-// bHasSequenceMapping =
-// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
-// ::getCppuType( reinterpret_cast<
-// const uno::Sequence< sal_Int32 > * >(0))));
-// }
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index d80e284cdfae..e44816954340 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::style::XStyleSupplier;
-// using ::com::sun::star::beans::XFastPropertyState;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -73,11 +72,9 @@ OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex & par_rMut
m_rMutex( par_rMutex ),
m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
{
- // /--
MutexGuard aGuard( m_rMutex );
if( rOther.m_pImplProperties.get())
m_pImplProperties.reset( new impl::ImplOPropertySet( * rOther.m_pImplProperties.get()));
- // \--
}
void OPropertySet::SetNewValuesExplicitlyEvenIfTheyEqualDefault()
@@ -98,10 +95,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
{
return ::cppu::queryInterface(
aType,
-// static_cast< uno::XInterface * >(
-// static_cast< uno::XWeak * >( this )),
-// static_cast< uno::XWeak * >( this ),
-// static_cast< lang::XServiceInfo * >( this ),
static_cast< lang::XTypeProvider * >( this ),
static_cast< beans::XPropertySet * >( this ),
static_cast< beans::XMultiPropertySet * >( this ),
@@ -109,45 +102,8 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
static_cast< beans::XPropertyState * >( this ),
static_cast< beans::XMultiPropertyStates * >( this ),
static_cast< XStyleSupplier * >( this ) );
-// static_cast< XFastPropertyState * >( this ) );
}
-// void SAL_CALL OPropertySet::acquire() throw ()
-// {
-// OWeakObject::acquire();
-// }
-
-// void SAL_CALL OPropertySet::release() throw ()
-// {
-// OWeakObject::release();
-// }
-
-
-// ____ XServiceInfo ____
-// OUString SAL_CALL
-// OPropertySet::getImplementationName()
-// throw (uno::RuntimeException)
-// {
-// return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OPropertySet" ));
-// }
-
-// sal_Bool SAL_CALL
-// OPropertySet::supportsService( const OUString& ServiceName )
-// throw (uno::RuntimeException)
-// {
-// return ( 0 == ServiceName.reverseCompareToAsciiL(
-// RTL_CONSTASCII_STRINGPARAM( "com.sun.star.beans.PropertySet" )));
-// }
-
-// Sequence< OUString > SAL_CALL
-// OPropertySet::getSupportedServiceNames()
-// throw (uno::RuntimeException)
-// {
-// Sequence< OUString > aServiceNames( 1 );
-// aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.PropertySet" ));
-// return aServiceNames;
-// }
-
#define LCL_PROP_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const Reference<t> *>(0)))
// // ____ XTypeProvider ____
@@ -157,15 +113,12 @@ Sequence< uno::Type > SAL_CALL
{
static Sequence< uno::Type > aTypeList;
- // /--
MutexGuard aGuard( m_rMutex );
if( aTypeList.getLength() == 0 )
{
::std::vector< uno::Type > aTypes;
-// aTypes.push_back( LCL_PROP_CPPUTYPE( uno::XWeak ));
-// aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XServiceInfo ));
aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XTypeProvider ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertySet ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertySet ));
@@ -173,13 +126,11 @@ Sequence< uno::Type > SAL_CALL
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertyState ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertyStates ));
aTypes.push_back( LCL_PROP_CPPUTYPE( XStyleSupplier ));
-// aTypes.push_back( LCL_PROP_CPPUTYPE( XFastPropertyState ));
aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
}
return aTypeList;
- // \--
}
Sequence< sal_Int8 > SAL_CALL
@@ -370,7 +321,6 @@ void SAL_CALL OPropertySet::getFastPropertyValue
{
if( ! m_pImplProperties->GetPropertyValueByHandle( rValue, nHandle ))
{
-// OSL_TRACE( "OPropertySet: asking style for property" );
// property was not set -> try style
uno::Reference< beans::XFastPropertySet > xStylePropSet( m_pImplProperties->GetStyle(), uno::UNO_QUERY );
if( xStylePropSet.is() )
@@ -429,7 +379,6 @@ void SAL_CALL OPropertySet::getFastPropertyValue
}
else
{
-// OSL_TRACE( "OPropertySet: no style => getting default for property" );
// there is no style (or the style does not support XFastPropertySet)
// => take the default value
try
@@ -467,41 +416,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
0 );
}
-// ____ XFastPropertyState ____
-// beans::PropertyState OPropertySet::SAL_CALL getFastPropertyState( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// return m_pImplProperties->GetPropertyStateByHandle( nHandle );
-// }
-
-// uno::Sequence< beans::PropertyState > OPropertySet::SAL_CALL getFastPropertyStates(
-// const uno::Sequence< sal_Int32 >& aHandles )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// ::std::vector< sal_Int32 > aHandleVec(
-// aHandles.getConstArray(),
-// aHandles.getConstArray() + aHandles.getLength() );
-
-// return m_pImplProperties->GetPropertyStatesByHandle( aHandleVec );
-// }
-
-// void OPropertySet::SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// m_pImplProperties->SetPropertyToDefault( nHandle );
-// }
-
-// uno::Any OPropertySet::SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// lang::WrappedTargetException,
-// uno::RuntimeException)
-// {
-// return GetDefaultValue( nHandle );
-// }
-
// ____ XMultiPropertySet ____
void SAL_CALL OPropertySet::setPropertyValues(
const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values )
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 657004706e81..c4df135927eb 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -35,8 +35,6 @@
namespace chart
{
//.............................................................................
-//using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth )
: m_fSeriesCount(fSeriesCount)
diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx
index 13749d205f91..a01b17cc1999 100644
--- a/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -38,7 +38,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList(
uno::Reference< lang::XMultiServiceFactory > xShapeFactory
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 65f5182347bb..184ac36f8252 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -185,7 +185,6 @@ uno::Any createPolyPolygon_Cube(
//fWidthH stands for Half Width
const double fWidthH = rSize.DirectionX >=0.0? rSize.DirectionX/2.0 : -rSize.DirectionX/2.0;
const double fHeight = rSize.DirectionY;
-// const double fDepth = rSize.DirectionZ >=0.0? rSize.DirectionZ : -rSize.DirectionZ ;
const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0;
@@ -214,7 +213,6 @@ uno::Any createPolyPolygon_Cube(
for(sal_Int32 nN = nPointCount; nN--;)
*pInnerSequenceZ++ = 0.0;
- //*pInnerSequenceZ++ = -fDepth/2.0;
if(nPointCount == 5)
{
@@ -952,26 +950,6 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords(
fStartAngleRadian, fWidthAngleRadian, fUnitCircleInnerRadius, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
appendAndCloseBezierCoords( aReturn, aInnerArc, sal_True );
- //fill rMarkHandlePoints
- /*
- {
- rMarkHandlePoints.realloc(1);
- rMarkHandlePoints[0].realloc(6);
- sal_Int32 nHandleCount=0;
- sal_Int32 nOuterArcCount = aOuterArc.Coordinates[0].getLength();
- if(nOuterArcCount>0)
- rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][0];
- if(nOuterArcCount>1)
- rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][nOuterArcCount-1];
- sal_Int32 nInnerArcCount = aInnerArc.Coordinates[0].getLength();
- if(nInnerArcCount>0)
- rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][0];
- if(nInnerArcCount>1)
- rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][nInnerArcCount-1];
- rMarkHandlePoints[0].realloc(nHandleCount);
- }
- */
-
return aReturn;
}
@@ -1017,19 +995,6 @@ uno::Reference< drawing::XShape >
, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) );
-
- //add shape for markhandles
- /*
- drawing::PointSequenceSequence aMarkHandlePoints(1); to be filled within getRingBezierCoords
- if( xGroup.is() )
- {
- VLineProperties aHandleLineProperties;
- aHandleLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE );
- uno::Reference< drawing::XShape > xHandleShape =
- this->createLine2D( xGroup, aMarkHandlePoints, &aHandleLineProperties );
- this->setShapeName( xHandleShape, C2U("HandlesOnly") );
- }
- */
}
catch( uno::Exception& e )
{
@@ -1493,7 +1458,7 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D&
break;
}
}
- //return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+
return aPP;
}
@@ -1804,11 +1769,7 @@ uno::Reference< drawing::XShape >
//create shape
uno::Reference< drawing::XShape > xShape(
m_xShapeFactory->createInstance( C2U(
- //"com.sun.star.drawing.LineShape") ), uno::UNO_QUERY );
"com.sun.star.drawing.PolyLineShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyLinePathShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyPolygonPathShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY );
xTarget->add(xShape);
//set properties
generated by cgit (git 2.34.1) at 2025-05-02 09:30:40 +0000