[libreoffice] re-fix patch

Caolán McNamara caolanm at fedoraproject.org
Mon Oct 22 15:11:11 UTC 2012


commit e258bcf20797928fa343aae339ce37a2f9ca8458
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 22 16:11:05 2012 +0100

    re-fix patch

 ...bz-868479-fdo-56281-doubled-in-German-ok-.patch |    6 +++---
 1 files 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


More information about the scm-commits mailing list