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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/layoutmanager/helpers.cxx | 10 | ||||
| -rw-r--r-- | framework/source/uielement/fontmenucontroller.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index a108baaa287f..1c9ae72bb649 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -202,9 +202,9 @@ OUString getElementTypeFromResourceURL( const OUString& aResourceURL ) { sal_Int32 nIndex = 0; OUString aPathPart = aResourceURL.copy( aUIResourceURL.getLength() ); - aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); + aPathPart.getToken( 0, '/', nIndex ); - return aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); + return aPathPart.getToken( 0, '/', nIndex ); } return aType; @@ -217,10 +217,10 @@ void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUS { sal_Int32 nIndex = 0; OUString aPathPart = aResourceURL.copy( aUIResourceURL.getLength() ); - aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); + aPathPart.getToken( 0, '/', nIndex ); - aElementType = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); - aElementName = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); + aElementType = aPathPart.getToken( 0, '/', nIndex ); + aElementName = aPathPart.getToken( 0, '/', nIndex ); } } diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index ae090316b330..056ea97277ea 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -166,7 +166,7 @@ void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) OUString aText = m_xPopupMenu->getItemText( nItemId ); // TODO: must be replaced by implementation of VCL, when available - sal_Int32 nIndex = aText.indexOf( (sal_Unicode)'~' ); + sal_Int32 nIndex = aText.indexOf( '~' ); if ( nIndex >= 0 ) aText = aText.replaceAt( nIndex, 1, "" ); // TODO: must be replaced by implementation of VCL, when available |