diff options
| -rw-r--r-- | include/oox/export/chartexport.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ppt/animationspersist.hxx | 4 | ||||
| -rw-r--r-- | oox/source/export/chartexport.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ppt/timenode.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index c813ebf94d6d..7c9e4983c759 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -120,7 +120,7 @@ private: OUString parseFormula( const OUString& rRange ); void InitPlotArea(); - void _ExportContent(); + void ExportContent_(); void exportChartSpace( const css::uno::Reference< css::chart::XChartDocument >& rChartDoc, bool bIncludeTable ); diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index cbf0070f325f..7a49964e5a32 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -45,10 +45,10 @@ namespace oox { namespace ppt { NP_ENDSYNC, NP_ITERATETYPE, NP_ITERATEINTERVAL, NP_SUBITEM, NP_TARGET, NP_COMMAND, NP_PARAMETER, NP_VALUES, NP_FORMULA, NP_KEYTIMES, NP_DISPLAY, - _NP_SIZE + NP_SIZE_ }; - typedef std::array< css::uno::Any, _NP_SIZE > NodePropertyMap; + typedef std::array< css::uno::Any, NP_SIZE_ > NodePropertyMap; /** data for CT_TLShapeTargetElement */ diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index b003b172c5f9..e483b9e46943 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -664,10 +664,10 @@ void ChartExport::ExportContent() return; InitRangeSegmentationProperties( xChartDoc ); // TODO: export chart - _ExportContent( ); + ExportContent_( ); } -void ChartExport::_ExportContent() +void ChartExport::ExportContent_() { Reference< css::chart::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); if( xChartDoc.is()) diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 6c068aca6468..dee91bd649e8 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -291,7 +291,7 @@ namespace oox { namespace ppt { OUString sString; Sequence< NamedValue > aSeq; - for( int i = 0; i < _NP_SIZE; i++) + for( int i = 0; i < NP_SIZE_; i++) { Any & aValue( maNodeProperties[ i ] ); if( aValue.hasValue() ) |