From e258bcf20797928fa343aae339ce37a2f9ca8458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 22 Oct 2012 16:11:05 +0100 Subject: [PATCH] re-fix patch --- ...solves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch b/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch index 068d141..f54f7ed 100644 --- a/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch +++ b/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch @@ -21,10 +21,10 @@ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 373143b..d2336ec 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx -@@ -152,13 +152,15 @@ XubString Button::GetStandardText( StandardButtonType eButton ) +@@ -151,13 +151,15 @@ + { sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId; - ResId aResId( nResId, *pResMgr ); - aText = String( aResId ); + aText = ResId(nResId, *pResMgr).toString(); - - // Windows (apparently) has some magic auto-accelerator evil around - // ok / cancel so add this only for Unix