diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-03-30 09:36:06 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-30 12:21:40 +0000 |
commit | da56de9ac4824eb365af20b351719395e725be39 (patch) | |
tree | f19ad159f5e12b9e62b2ee50f39016819b7a7c5c /xmloff | |
parent | 8d1a56c206e5c2ed6c331049198bb8ebc6176171 (diff) |
remove type decorations on char literals
they are only needed where type deduction fails.
left them in defines for now.
Change-Id: I7f002dd6bc7acc083c73b6c64076de6dd28d0b09
Reviewed-on: https://gerrit.libreoffice.org/35893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 12 | ||||
-rw-r--r-- | xmloff/source/draw/ximpbody.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/meta/xmlversion.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlbahdl.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextColumnsContext.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 28aac0cafbb3..fdbddbfafce8 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -471,7 +471,7 @@ Sequence< Any > AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e // do we have any value at all? if( !rValue.isEmpty() ) { - sal_Int32 nElements = count_codes( rValue, (sal_Unicode)';') + 1; // a non empty string has at least one value + sal_Int32 nElements = count_codes( rValue, ';') + 1; // a non empty string has at least one value // prepare the sequence aValues.realloc( nElements ); @@ -496,7 +496,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue ) if( !rValue.isEmpty() ) { // count the values - sal_Int32 nElements = count_codes( rValue, (sal_Unicode)';' ) + 1; // a non empty string has at least one value + sal_Int32 nElements = count_codes( rValue, ';' ) + 1; // a non empty string has at least one value if( nElements == 1 ) { @@ -520,7 +520,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue ) OUString aEventTrigger; - sal_Int32 nPos = rValue.indexOf( (sal_Unicode)'+' ); + sal_Int32 nPos = rValue.indexOf( '+' ); if( nPos == -1 ) { aEventTrigger = rValue; @@ -533,7 +533,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue ) aEvent.Offset = convertTiming( rValue.copy( nPos + 1 ) ); } - nPos = aEventTrigger.indexOf( (sal_Unicode)'.' ); + nPos = aEventTrigger.indexOf( '.' ); if( nPos != -1 ) { aEvent.Source <<= mrImport.getInterfaceToIdentifierMapper().getReference( aEventTrigger.copy( 0, nPos ) ); @@ -573,7 +573,7 @@ Sequence< double > AnimationsImportHelperImpl::convertKeyTimes( const OUString& sal_Int32 nElements = 0; if( !rValue.isEmpty() ) - nElements = count_codes( rValue, (sal_Unicode)';' ) + 1; // a non empty string has at least one value + nElements = count_codes( rValue, ';' ) + 1; // a non empty string has at least one value Sequence< double > aKeyTimes( nElements ); @@ -593,7 +593,7 @@ Sequence< TimeFilterPair > AnimationsImportHelperImpl::convertTimeFilter( const sal_Int32 nElements = 0; if( !rValue.isEmpty() ) - nElements = count_codes( rValue, (sal_Unicode)';' ) + 1; // a non empty string has at least one value + nElements = count_codes( rValue, ';' ) + 1; // a non empty string has at least one value Sequence< TimeFilterPair > aTimeFilter( nElements ); diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 4de8a8754888..7ed381517d48 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -189,7 +189,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, uno::Reference< beans::XPropertySet > xProps( xShapeDrawPage, uno::UNO_QUERY ); if( xProps.is() ) { - sal_Int32 nIndex = maHREF.lastIndexOf( (sal_Unicode)'#' ); + sal_Int32 nIndex = maHREF.lastIndexOf( '#' ); if( nIndex != -1 ) { OUString aFileName( maHREF.copy( 0, nIndex ) ); diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index e9abec403767..903ef8d7289c 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -226,7 +226,7 @@ bool XMLVersionContext::ParseISODateTimeString( bool bSuccess = true; OUString aDateStr, aTimeStr; - sal_Int32 nPos = rString.indexOf( (sal_Unicode) 'T' ); + sal_Int32 nPos = rString.indexOf( 'T' ); if ( nPos >= 0 ) { aDateStr = rString.copy( 0, nPos ); diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index bacc2bc1e9ee..06bf19bb1501 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -328,7 +328,7 @@ bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& rVal double fValue = 1.0; - if( rStrImpValue.indexOf( (sal_Unicode)'%' ) == -1 ) + if( rStrImpValue.indexOf( '%' ) == -1 ) { fValue = rStrImpValue.toDouble(); } diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 74321b4a0aa1..84821260e717 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -134,7 +134,7 @@ XMLTextColumnContext_Impl::XMLTextColumnContext_Impl( { case XML_TOK_COLUMN_WIDTH: { - sal_Int32 nPos = rValue.indexOf( (sal_Unicode)'*' ); + sal_Int32 nPos = rValue.indexOf( '*' ); if( nPos != -1 && nPos+1 == rValue.getLength() ) { OUString sTmp( rValue.copy( 0, nPos ) ); |