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

loplugin:cstylecast: deal with remaining pointer casts

Browse Source 
Change-Id: If5ab427ab320e2623df182e6143c4e7123610eae
This commit is contained in:
Stephan Bergmann 2015-06-08 16:23:25 +02:00
parent 638a4ec6dc
commit bc14d27dd0
44 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/inc/ChartModel.hxx
View File

@ -241,7 +241,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ChartModel( xContext );
return static_cast<cppu::OWeakObject *>(new ChartModel( xContext ));
}
// ::com::sun::star::lang::XInitialization

2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
View File

@ -1049,7 +1049,7 @@ void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAdd
if( xInit.is() )
{
uno::Any aParam;
uno::Reference< XChartDocument > xDoc( (XChartDocument*)this, uno::UNO_QUERY );
uno::Reference< XChartDocument > xDoc( static_cast<XChartDocument*>(this), uno::UNO_QUERY );
aParam <<= xDoc;
uno::Sequence< uno::Any > aSeq( &aParam, 1 );
xInit->initialize( aSeq );

2
chart2/source/controller/dialogs/tp_AxisLabel.cxx
View File

@ -274,7 +274,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
}
}
ToggleShowLabel( (void*)0 );
ToggleShowLabel( nullptr );
}
void SchAxisLabelTabPage::ShowStaggeringControls( bool bShowStaggeringControls )

6
chart2/source/controller/dialogs/tp_AxisPositions.cxx
View File

@ -198,7 +198,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
if( nPos < m_pLB_CrossesAt->GetEntryCount() )
m_pLB_CrossesAt->SelectEntryPos( nPos );
CrossesAtSelectHdl( (void*)0 );
CrossesAtSelectHdl( nullptr );
if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SfxItemState::SET || bZero )
{
@ -231,7 +231,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
m_pLB_PlaceLabels->SetNoSelection();
PlaceLabelsSelectHdl( (void*)0 );
PlaceLabelsSelectHdl( nullptr );
// Tick marks
long nTicks = 0, nMinorTicks = 0;
@ -324,7 +324,7 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
if( 0 == m_pED_CrossesAtCategory->GetSelectEntryCount() )
m_pED_CrossesAtCategory->SelectEntryPos(0);
PlaceLabelsSelectHdl( (void*)0 );
PlaceLabelsSelectHdl( nullptr );
return 0;
}

2
chart2/source/controller/inc/ChartDocumentWrapper.hxx
View File

@ -76,7 +76,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ChartDocumentWrapper( xContext );
return static_cast<cppu::OWeakObject *>(new ChartDocumentWrapper( xContext ));
}
void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn );

2
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
View File

@ -74,7 +74,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new CreationWizardUnoDlg( xContext );
return static_cast<cppu::OWeakObject *>(new CreationWizardUnoDlg( xContext ));
}
// XExecutableDialog

2
chart2/source/controller/main/ChartController.hxx
View File

@ -162,7 +162,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ChartController( xContext );
return static_cast<cppu::OWeakObject *>(new ChartController( xContext ));
}
// ::com::sun::star::frame::XController (required interface)

2
chart2/source/controller/main/ChartFrameloader.hxx
View File

@ -64,7 +64,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ChartFrameLoader( xContext );
return static_cast<cppu::OWeakObject *>(new ChartFrameLoader( xContext ));
}
// ::com::sun::star::frame::XFrameLoader

2
chart2/source/controller/main/ElementSelector.hxx
View File

@ -89,7 +89,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ElementSelectorToolbarController( xContext );
return static_cast<cppu::OWeakObject *>(new ElementSelectorToolbarController( xContext ));
}
// XInterface

2
chart2/source/inc/CachedDataSequence.hxx
View File

@ -87,7 +87,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new CachedDataSequence( xContext );
return static_cast<cppu::OWeakObject *>(new CachedDataSequence( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()

2
chart2/source/inc/ConfigColorScheme.hxx
View File

@ -57,7 +57,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ConfigColorScheme( xContext );
return static_cast<cppu::OWeakObject *>(new ConfigColorScheme( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()

2
chart2/source/inc/DataSource.hxx
View File

@ -50,7 +50,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new DataSource( xContext );
return static_cast<cppu::OWeakObject *>(new DataSource( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()

2
chart2/source/inc/ErrorBar.hxx
View File

@ -93,7 +93,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ErrorBar( xContext );
return static_cast<cppu::OWeakObject *>(new ErrorBar( xContext ));
}
// XPropertySet

2
chart2/source/inc/InternalDataProvider.hxx
View File

@ -94,7 +94,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new InternalDataProvider( xContext );
return static_cast<cppu::OWeakObject *>(new InternalDataProvider( xContext ));
}
// ____ XInternalDataProvider ____

2
chart2/source/inc/LabeledDataSequence.hxx
View File

@ -63,7 +63,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new LabeledDataSequence( xContext );
return static_cast<cppu::OWeakObject *>(new LabeledDataSequence( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()

8
chart2/source/inc/Scaling.hxx
View File

@ -50,7 +50,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new LogarithmicScaling( xContext );
return static_cast<cppu::OWeakObject *>(new LogarithmicScaling( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()
@ -101,7 +101,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ExponentialScaling( xContext );
return static_cast<cppu::OWeakObject *>(new ExponentialScaling( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()
@ -152,7 +152,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new LinearScaling( xContext );
return static_cast<cppu::OWeakObject *>(new LinearScaling( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()
@ -202,7 +202,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PowerScaling( xContext );
return static_cast<cppu::OWeakObject *>(new PowerScaling( xContext ));
}
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()

4
chart2/source/model/inc/CartesianCoordinateSystem.hxx
View File

@ -70,7 +70,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new CartesianCoordinateSystem2d( xContext );
return static_cast<cppu::OWeakObject *>(new CartesianCoordinateSystem2d( xContext ));
}
// ____ XServiceInfo ____
virtual OUString SAL_CALL getImplementationName()
@ -96,7 +96,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new CartesianCoordinateSystem3d( xContext );
return static_cast<cppu::OWeakObject *>(new CartesianCoordinateSystem3d( xContext ));
}
// ____ XServiceInfo ____
virtual OUString SAL_CALL getImplementationName()

2
chart2/source/model/inc/ChartTypeManager.hxx
View File

@ -64,7 +64,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ChartTypeManager( xContext );
return static_cast<cppu::OWeakObject *>(new ChartTypeManager( xContext ));
}
protected:

2
chart2/source/model/inc/DataSeries.hxx
View File

@ -76,7 +76,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new DataSeries( xContext );
return static_cast<cppu::OWeakObject *>(new DataSeries( xContext ));
}
/// XServiceInfo declarations
virtual OUString SAL_CALL getImplementationName()

2
chart2/source/model/inc/Diagram.hxx
View File

@ -69,7 +69,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new Diagram( xContext );
return static_cast<cppu::OWeakObject *>(new Diagram( xContext ));
}
/// XServiceInfo declarations

4
chart2/source/model/inc/PolarCoordinateSystem.hxx
View File

@ -70,7 +70,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PolarCoordinateSystem2d( xContext );
return static_cast<cppu::OWeakObject *>(new PolarCoordinateSystem2d( xContext ));
}
// ____ XServiceInfo ____
virtual OUString SAL_CALL getImplementationName()
@ -96,7 +96,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PolarCoordinateSystem3d( xContext );
return static_cast<cppu::OWeakObject *>(new PolarCoordinateSystem3d( xContext ));
}
// ____ XServiceInfo ____
virtual OUString SAL_CALL getImplementationName()

4
chart2/source/model/inc/XMLFilter.hxx
View File

@ -66,7 +66,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new XMLFilter( xContext );
return static_cast<cppu::OWeakObject *>(new XMLFilter( xContext ));
}
/// XServiceInfo declarations
virtual OUString SAL_CALL getImplementationName()
@ -185,7 +185,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception)
{
return (::cppu::OWeakObject *)new XMLReportFilterHelper( xContext );
return static_cast<cppu::OWeakObject *>(new XMLReportFilterHelper( xContext ));
}
static OUString getImplementationName_Static()
{

2
chart2/source/model/main/Axis.hxx
View File

@ -62,7 +62,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new Axis( xContext );
return static_cast<cppu::OWeakObject *>(new Axis( xContext ));
}
/// XServiceInfo declarations
virtual OUString SAL_CALL getImplementationName()

2
chart2/source/model/main/FormattedString.hxx
View File

@ -67,7 +67,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new FormattedString( xContext );
return static_cast<cppu::OWeakObject *>(new FormattedString( xContext ));
}
/// merge XInterface implementations

2
chart2/source/model/main/GridProperties.hxx
View File

@ -60,7 +60,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new GridProperties( xContext );
return static_cast<cppu::OWeakObject *>(new GridProperties( xContext ));
}
/// XServiceInfo declarations

2
chart2/source/model/main/Legend.hxx
View File

@ -59,7 +59,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new Legend( xContext );
return static_cast<cppu::OWeakObject *>(new Legend( xContext ));
}
/// XServiceInfo declarations

2
chart2/source/model/main/PageBackground.hxx
View File

@ -56,7 +56,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PageBackground( xContext );
return static_cast<cppu::OWeakObject *>(new PageBackground( xContext ));
}
/// XServiceInfo declarations

2
chart2/source/model/main/Title.hxx
View File

@ -57,7 +57,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new Title( xContext );
return static_cast<cppu::OWeakObject *>(new Title( xContext ));
}
/// XServiceInfo declarations

2
chart2/source/model/template/AreaChartType.hxx
View File

@ -49,7 +49,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new AreaChartType( xContext );
return static_cast<cppu::OWeakObject *>(new AreaChartType( xContext ));
}
protected:

2
chart2/source/model/template/BarChartType.hxx
View File

@ -49,7 +49,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new BarChartType( xContext );
return static_cast<cppu::OWeakObject *>(new BarChartType( xContext ));
}
protected:

2
chart2/source/model/template/BubbleChartType.hxx
View File

@ -50,7 +50,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new BubbleChartType( xContext );
return static_cast<cppu::OWeakObject *>(new BubbleChartType( xContext ));
}
protected:

2
chart2/source/model/template/CandleStickChartType.hxx
View File

@ -49,7 +49,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new CandleStickChartType( xContext );
return static_cast<cppu::OWeakObject *>(new CandleStickChartType( xContext ));
}
protected:

2
chart2/source/model/template/ColumnChartType.hxx
View File

@ -49,7 +49,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ColumnChartType( xContext );
return static_cast<cppu::OWeakObject *>(new ColumnChartType( xContext ));
}
protected:

2
chart2/source/model/template/FilledNetChartType.hxx
View File

@ -48,7 +48,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new FilledNetChartType( xContext );
return static_cast<cppu::OWeakObject *>(new FilledNetChartType( xContext ));
}
protected:

2
chart2/source/model/template/GL3DBarChartType.hxx
View File

@ -43,7 +43,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new GL3DBarChartType( xContext );
return static_cast<cppu::OWeakObject *>(new GL3DBarChartType( xContext ));
}
protected:

2
chart2/source/model/template/LineChartType.hxx
View File

@ -50,7 +50,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new LineChartType( xContext );
return static_cast<cppu::OWeakObject *>(new LineChartType( xContext ));
}
protected:

2
chart2/source/model/template/NetChartType.hxx
View File

@ -76,7 +76,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new NetChartType( xContext );
return static_cast<cppu::OWeakObject *>(new NetChartType( xContext ));
}
protected:

2
chart2/source/model/template/PieChartType.hxx
View File

@ -50,7 +50,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PieChartType( xContext );
return static_cast<cppu::OWeakObject *>(new PieChartType( xContext ));
}
protected:

2
chart2/source/model/template/ScatterChartType.hxx
View File

@ -54,7 +54,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ScatterChartType( xContext );
return static_cast<cppu::OWeakObject *>(new ScatterChartType( xContext ));
}
protected:

14
chart2/source/tools/RegressionCurveModel.hxx
View File

@ -169,7 +169,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new MeanValueRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new MeanValueRegressionCurve( xContext ));
}
};
@ -201,7 +201,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new LinearRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new LinearRegressionCurve( xContext ));
}
};
@ -233,7 +233,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new LogarithmicRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new LogarithmicRegressionCurve( xContext ));
}
};
@ -265,7 +265,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new ExponentialRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new ExponentialRegressionCurve( xContext ));
}
};
@ -297,7 +297,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PotentialRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new PotentialRegressionCurve( xContext ));
}
};
@ -329,7 +329,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new PolynomialRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new PolynomialRegressionCurve( xContext ));
}
};
@ -361,7 +361,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new MovingAverageRegressionCurve( xContext );
return static_cast<cppu::OWeakObject *>(new MovingAverageRegressionCurve( xContext ));
}
};

2
chart2/source/tools/RegressionEquation.hxx
View File

@ -80,7 +80,7 @@ public:
static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
throw(css::uno::Exception)
{
return (::cppu::OWeakObject *)new RegressionEquation( xContext );
return static_cast<cppu::OWeakObject *>(new RegressionEquation( xContext ));
}
protected:

2
chart2/source/view/inc/GL3DRenderer.hxx
View File

@ -131,7 +131,7 @@ struct PackedVertex{
glm::vec3 position;
glm::vec3 normal;
bool operator<(const PackedVertex& that) const{
return memcmp((void*)this, (void*)&that, sizeof(PackedVertex))>0;
return memcmp(this, &that, sizeof(PackedVertex))>0;
};
};

26
chart2/source/view/main/GL3DRenderer.cxx
View File

@ -887,7 +887,7 @@ void OpenGL3DRenderer::RenderLine3D(const Polygon3DInfo& polygon)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
CHECK_GL_ERROR();
@ -1017,7 +1017,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& polygon)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
CHECK_GL_ERROR();
if(!mbPickingMode)
@ -1032,7 +1032,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& polygon)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
}
CHECK_GL_ERROR();
@ -1665,7 +1665,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
if(!mbPickingMode)
@ -1678,7 +1678,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
}
if(!mbPickingMode)
@ -1975,7 +1975,7 @@ void OpenGL3DRenderer::RenderScreenTextShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//tex coord
CHECK_GL_ERROR();
@ -1987,7 +1987,7 @@ void OpenGL3DRenderer::RenderScreenTextShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//texture
CHECK_GL_ERROR();
@ -2032,7 +2032,7 @@ void OpenGL3DRenderer::RenderTextShapeBatch()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//tex coord
CHECK_GL_ERROR();
@ -2045,7 +2045,7 @@ void OpenGL3DRenderer::RenderTextShapeBatch()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//use texture array to get the vertex
for (size_t i = 0; i < m_TextInfoBatch.texture.size(); i++)
@ -2101,7 +2101,7 @@ void OpenGL3DRenderer::RenderTextShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//tex coord
CHECK_GL_ERROR();
@ -2113,7 +2113,7 @@ void OpenGL3DRenderer::RenderTextShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//texture
CHECK_GL_ERROR();
@ -2537,7 +2537,7 @@ void OpenGL3DRenderer::RenderBatchBars(bool bNewScene)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//normal
glEnableVertexAttribArray(maResources.m_3DBatchNormalID);
@ -2547,7 +2547,7 @@ void OpenGL3DRenderer::RenderBatchBars(bool bNewScene)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
for (unsigned int i = 0; i < 4 ; i++)

24
chart2/source/view/main/OpenGLRender.cxx
View File

@ -223,7 +223,7 @@ int OpenGLRender::RenderLine2FBO(int)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
glEnableVertexAttribArray(m_2DVertexID);
glDrawArrays(GL_LINE_STRIP, 0, pointList.size()/3); // 12*3 indices starting at 0 -> 12 triangles
@ -450,7 +450,7 @@ int OpenGLRender::RenderBubble2FBO(int)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
glDrawArrays(GL_TRIANGLE_FAN, 0, m_Bubble2DCircle.size() / 2);
glDisableVertexAttribArray(m_2DVertexID);
@ -471,7 +471,7 @@ int OpenGLRender::RenderBubble2FBO(int)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
glDrawArrays(GL_LINE_STRIP, 0, (m_Bubble2DCircle.size() * sizeof(GLfloat) -2) / sizeof(float) / 2);
glDisableVertexAttribArray(m_2DVertexID);
@ -548,7 +548,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
// 2nd attribute buffer : color
@ -560,7 +560,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//TODO: moggi: get rid of GL_QUADS
glDrawArrays(GL_QUADS, 0, 4);
@ -593,7 +593,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
// 2nd attribute buffer : color
@ -605,7 +605,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
glDrawArrays(GL_LINE_LOOP, 0, 4);
glDisableVertexAttribArray(m_BackgroundVertexID);
@ -754,7 +754,7 @@ int OpenGLRender::RenderTextShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//tex coord
CHECK_GL_ERROR();
@ -766,7 +766,7 @@ int OpenGLRender::RenderTextShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
//texture
CHECK_GL_ERROR();
@ -871,7 +871,7 @@ int OpenGLRender::RenderArea2DShape()
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
// TODO: moggi: remove deprecated GL_POLYGON
glDrawArrays(GL_POLYGON, 0, pointList.size() / 3); // 12*3 indices starting at 0 -> 12 triangles
@ -1001,7 +1001,7 @@ int OpenGLRender::RenderPieSegment2DShape(float fSize, float fPosX, float fPosY)
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
glDrawArrays(GL_TRIANGLE_STRIP, 0, pointList.size() / 3); // 12*3 indices starting at 0 -> 12 triangles
glDisableVertexAttribArray(m_2DVertexID);
@ -1055,7 +1055,7 @@ int OpenGLRender::RenderSymbol2DShape(float x, float y, float , float , sal_Int3
GL_FLOAT, // type
GL_FALSE, // normalized?
0, // stride
(void*)0 // array buffer offset
nullptr // array buffer offset
);
glDrawArrays(GL_POINTS, 0, 1);