diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:23:25 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:23:25 +0200 |
commit | bc14d27dd0b50a37ff7ec93b49de976e01c54d0d (patch) | |
tree | cfb06c9f5a18afb836014bc53e67bdf71ab95e6a | |
parent | 638a4ec6dc5b1ea83dba32d78a417a4eeee4032e (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: If5ab427ab320e2623df182e6143c4e7123610eae
44 files changed, 81 insertions, 81 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index d1f5e4f39fdc..ba419e278ac9 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -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 diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index e2c2b3add35b..74e1baddd52b 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -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 ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index c9f53c5f5008..7859bb61de45 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -274,7 +274,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs ) } } - ToggleShowLabel( (void*)0 ); + ToggleShowLabel( nullptr ); } void SchAxisLabelTabPage::ShowStaggeringControls( bool bShowStaggeringControls ) diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 83fa72fa21f1..97fba02ada42 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -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; } diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 1c933d5b7b2d..96e2ee98387f 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -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 ); diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index a71d86aaf3ac..014a99a2ce5e 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -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 diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 1876dbda70ba..0c7537167309 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -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) diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index db445c2d8b18..3d4e7af4a83a 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -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 diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index f0eb612e2d7e..a2d143ba614c 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -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 diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 8119695628da..275e2b233a0c 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -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() diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 993f7af35073..e2d1db3d784d 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -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() diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 6f55fec23dea..976769b24ba1 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -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() diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 6d81e4b0ed63..6ba4fc324488 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -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 diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 3c6477c34b25..1cbcbddd0ee7 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -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 ____ diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 1e3f22e6563b..ec938db8c426 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -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() diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 96a1e2aa4df0..2602d50b188d 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -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() diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index dc1de9167d42..f73f1b5158bf 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -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() diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index c0be3882e490..092fa6f5c09b 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -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: diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 8940547072ee..5f61742d41e1 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -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() diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index d1a17c3e3f33..ddeb9bc92952 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -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 diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index decf8ba381cc..285d4ae5a38f 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -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() diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 46118bdafc02..0c44682148b2 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -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() { diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 506c60f7f229..3f649325553a 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -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() diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 38c74b225cbf..875c54df138c 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -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 diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 7124899637cf..3e4fa7cd7e5e 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -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 diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index f95d906bbcb4..525b4d5c1939 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -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 diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index e91011a81667..ed8148b14d99 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -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 diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 127cb31ce33c..05f2d0181d50 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -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 diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index c58c84ee4517..933c7d738f84 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -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: diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 97ffcb3b3aba..15ac210f428f 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -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: diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 8c6015db7ec4..e59799c7e3d1 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -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: diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index ee3c007b4a4d..c1287e21508f 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -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: diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 97e253d6ef16..3725b8f23bd2 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -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: diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index d74e6a2ee240..03ce04877608 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -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: diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 3a415214fee9..c1f1e426030b 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -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: diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index c6428c241025..7a9a147300fc 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -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: diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index ac75c4c557da..27763a809918 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -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: diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index c905852b840c..fb842ba254ee 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -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: diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 777afe0ff89c..56cdd780c167 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -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: diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index dfed109df919..0fedc2ab9166 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -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 )); } }; diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 0730619f09b0..27f7efc1bf4f 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -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: diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index afaa0f0e278e..4403b2e0ca18 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -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; }; }; diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 93164ba00000..ed87efdf70a1 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -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++) diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 1b64ef1d193e..397acbae18f7 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -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); |