diff options
author | David Tardon <dtardon@redhat.com> | 2011-11-21 09:00:21 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-11-21 09:03:43 +0100 |
commit | 737f61ba4c202834e70bbaa746b4a9ce0137a891 (patch) | |
tree | 3ba0de5068dbd7972161af72c893204ecd5d36be /vcl/unx/x11 | |
parent | ee3ad385fb3ca476e57e80d7b77c1e184e52e1d8 (diff) |
Convert Sal to rtl::O(U)String
Diffstat (limited to 'vcl/unx/x11')
-rw-r--r-- | vcl/unx/x11/x11sys.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index 1dee7c9c7618..43693a9f24eb 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -141,7 +141,7 @@ rtl::OUString X11SalSystem::GetScreenName( unsigned int nScreen ) return aScreenName; } -int X11SalSystem::ShowNativeDialog( const String& rTitle, const String& rMessage, const std::list< String >& rButtons, int nDefButton ) +int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUString& rMessage, const std::list< rtl::OUString >& rButtons, int nDefButton ) { int nRet = -1; @@ -154,7 +154,7 @@ int X11SalSystem::ShowNativeDialog( const String& rTitle, const String& rMessage aWarn.Clear(); sal_uInt16 nButton = 0; - for( std::list< String >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it ) + for( std::list< rtl::OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it ) { aWarn.AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 ); nButton++; |