diff options
Diffstat (limited to 'vcl/unx/gtk/a11y')
-rw-r--r-- | vcl/unx/gtk/a11y/atkaction.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkimage.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atktable.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwrapper.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwrapper.hxx | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index 39c51cb3b274..873a491ac148 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -54,7 +54,7 @@ getAsConst( const rtl::OString& rString ) static int nIdx = 0; nIdx = (nIdx + 1) % nMax; aUgly[nIdx] = rString; - return aUgly[ nIdx ]; + return aUgly[ nIdx ].getStr(); } static accessibility::XAccessibleAction* diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index 04263fd72906..3e7ef0f20991 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -46,7 +46,7 @@ getAsConst( rtl::OUString rString ) static int nIdx = 0; nIdx = (nIdx + 1) % nMax; aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); - return aUgly[ nIdx ]; + return aUgly[ nIdx ].getStr(); } static accessibility::XAccessibleImage* diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index dec06cd7005b..013ca3ada614 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -63,7 +63,7 @@ getAsConst( rtl::OUString rString ) static int nIdx = 0; nIdx = (nIdx + 1) % nMax; aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); - return aUgly[ nIdx ]; + return aUgly[ nIdx ].getStr(); } /*****************************************************************************/ diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 7ccf07b57488..46e4f03aead0 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -726,7 +726,7 @@ ensureTypeFor( uno::XInterface *pAccessible ) } } - GType nType = g_type_from_name( aTypeName ); + GType nType = g_type_from_name( aTypeName.getStr() ); if( nType == G_TYPE_INVALID ) { GTypeInfo aTypeInfo = { @@ -736,7 +736,8 @@ ensureTypeFor( uno::XInterface *pAccessible ) 0, NULL, NULL } ; nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER, - aTypeName, &aTypeInfo, (GTypeFlags)0 ) ; + aTypeName.getStr(), &aTypeInfo, + (GTypeFlags)0 ) ; for( int j = 0; j < aTypeTableSize; j++ ) if( bTypes[j] ) diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 94a8b1981688..42928ece2aa2 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -118,7 +118,7 @@ static inline gchar * OUStringToGChar(const rtl::OUString& rString ) { rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); - return g_strdup( aUtf8 ); + return g_strdup( aUtf8.getStr() ); } #define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() |