diff options
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx | 4 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblebutton.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx index 5b66b22106d3..096138ac9103 100644 --- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx +++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx @@ -125,10 +125,10 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn if ( g_xUnoVirtualMachine.is() ) { - OUString sJava(RTL_CONSTASCII_USTRINGPARAM("java")); + OUString sJava("java"); uno_getEnvironment(&pJava_environment, sJava.pData, g_xUnoVirtualMachine.get()); - OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)); + OUString sCppu_current_lb_name(CPPU_CURRENT_LANGUAGE_BINDING_NAME); uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL); if ( pJava_environment && pUno_environment ) diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index e433811259a3..9b6c653e57f9 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -139,7 +139,7 @@ OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException) OUString aName( VCLXAccessibleTextComponent::getAccessibleName() ); sal_Int32 nLength = aName.getLength(); - if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("..."), nLength - 3 ) ) + if ( nLength >= 3 && aName.match( "...", nLength - 3 ) ) { if ( nLength == 3 ) { @@ -152,12 +152,12 @@ OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException) aName = aName.copy( 0, nLength - 3 ); } } - else if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("<< "), 0 ) ) + else if ( nLength >= 3 && aName.match( "<< ", 0 ) ) { // remove the leading symbols aName = aName.copy( 3, nLength - 3 ); } - else if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(" >>"), nLength - 3 ) ) + else if ( nLength >= 3 && aName.match( " >>", nLength - 3 ) ) { // remove the trailing symbols aName = aName.copy( 0, nLength - 3 ); |