diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 13:15:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 19:17:40 +0100 |
| commit | 7c18da2dc6963b6f3f74a72fc4f6a3eedd8f9eb7 (patch) | |
| tree | bf9b5cf5f648936e5c12c51a7a643059c5bcb6a5 /oox/source/ppt | |
| parent | f22044a49a56e585e2e9f419a1b77aba263b2afe (diff) | |
sal_Char->char in oox..registry
Change-Id: Icc7f2a32696c30317c1ee77ef39d682d5f5a80b9
Reviewed-on: https://gerrit.libreoffice.org/85512
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/ppt')
| -rw-r--r-- | oox/source/ppt/commontimenodecontext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/pptfilterhelpers.cxx | 8 | ||||
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/slidepersist.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 178962340467..dc1d1b4a901c 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -293,7 +293,7 @@ const preset_mapping* preset_mapping::getList() OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType ) { - const sal_Char* pStr = nullptr; + const char* pStr = nullptr; if( (nPresetClass == EffectPresetClass::ENTRANCE) || (nPresetClass == EffectPresetClass::EXIT) ) { diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index cc4ebfba1e4c..c794cdba297a 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -146,8 +146,8 @@ namespace oox { namespace ppt { { bool bRet = false; - const sal_Char* pSource[] = { "ppt_x", "ppt_y", "ppt_w", "ppt_h", nullptr }; - const sal_Char* pDest[] = { "x", "y", "width", "height", nullptr }; + const char* pSource[] = { "ppt_x", "ppt_y", "ppt_w", "ppt_h", nullptr }; + const char* pDest[] = { "x", "y", "width", "height", nullptr }; /* here we want to substitute all occurrences of * [#]ppt_[xyhw] with @@ -155,8 +155,8 @@ namespace oox { namespace ppt { */ sal_Int32 nIndex = 0; - const sal_Char** ps = pSource; - const sal_Char** pd = pDest; + const char** ps = pSource; + const char** pd = pDest; while (*ps) { diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 0088c1e51673..9b4f93378ef0 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::drawing; namespace oox { namespace ppt { -PPTShape::PPTShape( const oox::ppt::ShapeLocation eShapeLocation, const sal_Char* pServiceName ) +PPTShape::PPTShape( const oox::ppt::ShapeLocation eShapeLocation, const char* pServiceName ) : Shape( pServiceName ) , meShapeLocation( eShapeLocation ) , mbReferenced( false ) diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index 247831677dfd..f8bd76846404 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -275,8 +275,8 @@ void SlidePersist::applyTextStyles( const XmlFilterBase& rFilterBase ) for ( int nLevel = 1; nLevel < 5; nLevel++ ) { { - sal_Char pOutline[ 9 ] = "outline1"; - pOutline[ 7 ] = static_cast< sal_Char >( '0' + nLevel ); + char pOutline[ 9 ] = "outline1"; + pOutline[ 7 ] = static_cast< char >( '0' + nLevel ); OUString sOutlineStyle( OUString::createFromAscii( pOutline ) ); if ( xFamilies->hasByName( sOutlineStyle ) ) { |