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

Avoid reserved identifiers

Browse Source 
Change-Id: Ie1664e06dc02f7070e4ef77155e6541c70b2f8e8
This commit is contained in:
Stephan Bergmann
2016-04-22 10:11:13 +02:00
parent 85825e0fd5
commit ff1356ab02
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/oox/export/chartexport.hxx
View File

@@ -120,7 +120,7 @@ private:
OUString parseFormula( const OUString& rRange ); OUString parseFormula( const OUString& rRange );
void InitPlotArea(); void InitPlotArea();
void _ExportContent(); void ExportContent_();
void exportChartSpace( const css::uno::Reference< void exportChartSpace( const css::uno::Reference<
css::chart::XChartDocument >& rChartDoc, css::chart::XChartDocument >& rChartDoc,
bool bIncludeTable ); bool bIncludeTable );

4
include/oox/ppt/animationspersist.hxx
View File

@@ -45,10 +45,10 @@ namespace oox { namespace ppt {
NP_ENDSYNC, NP_ITERATETYPE, NP_ITERATEINTERVAL, NP_ENDSYNC, NP_ITERATETYPE, NP_ITERATEINTERVAL,
NP_SUBITEM, NP_TARGET, NP_COMMAND, NP_PARAMETER, NP_SUBITEM, NP_TARGET, NP_COMMAND, NP_PARAMETER,
NP_VALUES, NP_FORMULA, NP_KEYTIMES, NP_DISPLAY, 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 */ /** data for CT_TLShapeTargetElement */

4
oox/source/export/chartexport.cxx
View File

@@ -664,10 +664,10 @@ void ChartExport::ExportContent()
return; return;
InitRangeSegmentationProperties( xChartDoc ); InitRangeSegmentationProperties( xChartDoc );
// TODO: export chart // TODO: export chart
_ExportContent( ); ExportContent_( );
} }
void ChartExport::_ExportContent() void ChartExport::ExportContent_()
{ {
Reference< css::chart::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); Reference< css::chart::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY );
if( xChartDoc.is()) if( xChartDoc.is())

2
oox/source/ppt/timenode.cxx
View File

@@ -291,7 +291,7 @@ namespace oox { namespace ppt {
OUString sString; OUString sString;
Sequence< NamedValue > aSeq; Sequence< NamedValue > aSeq;
for( int i = 0; i < _NP_SIZE; i++) for( int i = 0; i < NP_SIZE_; i++)
{ {
Any & aValue( maNodeProperties[ i ] ); Any & aValue( maNodeProperties[ i ] );
if( aValue.hasValue() ) if( aValue.hasValue() )