[Libreoffice-commits] .: accessibility/bridge accessibility/source

[Libreoffice Gerrit user]

 accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx |4 ++--
 accessibility/source/standard/vclxaccessiblebutton.cxx  |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d204c1a47ef7215ca3e1ef198e81d9eeaed2095a
Author: Marcos Paulo de Souza 
Date:   Sat Dec 29 11:02:39 2012 -0200

Remove last RTL_CONSTASCII_* from accessibility

Change-Id: Icb8f66c9f6ad70828aa55580a1f3aae8b2af1593
Signed-off-by: Marcos Paulo de Souza 
Reviewed-on: https://gerrit.libreoffice.org/1500
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx 
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 5b66b22..096138a 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 e433811..9b6c653 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 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: accessibility/bridge

[Libreoffice Gerrit user]

 accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d475a059fc9f07f4d896bd67649c7d800fc66f6f
Author: David Tardon 
Date:   Mon Oct 15 07:13:23 2012 +0200

export symbols after gbuildification

Change-Id: I5c8ef1009a65fa5a38174898f58f9146e1367aa9

diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx 
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index cb0fa44..5b66b22 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -68,12 +68,12 @@ jmethodID g_jmRevokeTopWindow = 0;
 // functions
 //
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
+SAL_DLLPUBLIC_EXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
 {
 return JNI_VERSION_1_2;
 }
 
-JNIEXPORT jbyteArray JNICALL
+SAL_DLLPUBLIC_EXPORT jbyteArray JNICALL
 
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
 *pJNIEnv, jclass clazz)
 {
 // Initialize global class and method references
@@ -109,7 +109,7 @@ 
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
 return jbaProcessID;
 }
 
-JNIEXPORT jboolean JNICALL
+SAL_DLLPUBLIC_EXPORT jboolean JNICALL
 
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEnv
 *, jclass, jlong pointer)
 {
 uno_Environment * pJava_environment = NULL;
@@ -165,7 +165,7 @@ 
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
 return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
+SAL_DLLPUBLIC_EXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
 {
 ::Application::RemoveEventListener(g_aEventListenerLink);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits