[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-167-g79517ba
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 79517baa276c938965457c2cb9a63d441a8d1f66
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 23 16:10:23 2013 +0100
lp#1103495: German OK and Cancel buttons show ~
diff --git a/changelog b/changelog
index cff749e..85bcc19 100644
--- a/changelog
+++ b/changelog
@@ -34,6 +34,7 @@ libreoffice (1:3.5.7-0ubuntu4) precise; urgency=low
* backport restrict page sanity check to non-storage chunks (LP: #1097966)
* backport prevent crashes after incomplete print (LP: #1097962)
* backport set correct paper tray in UI (LP: #994388)
+ * backport German OK and Cancel buttons show ~ (LP: #1103495)
* final upstream bugfix release -- SRU for precise (LP: #1037111)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 23 Jan 2013 10:49:35 +0100
diff --git a/patches/lp-1103495-rhbz-868479-fdo-56281-doubled-in-German-ok-.diff b/patches/lp-1103495-rhbz-868479-fdo-56281-doubled-in-German-ok-.diff
new file mode 100644
index 0000000..1493478
--- /dev/null
+++ b/patches/lp-1103495-rhbz-868479-fdo-56281-doubled-in-German-ok-.diff
@@ -0,0 +1,49 @@
+From 1141d04daea3a0091c2d7533018dbe17e5b5a8bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 22 Oct 2012 13:31:38 +0100
+Subject: [PATCH] Resolves: rhbz#868479 / fdo#56281 doubled ~ in German
+ ok/cancel translations
+
+We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if
+string already contains those.
+
+Though its an open question if the presence of ~ is a bad thing
+for the Windows case. i.e. if we should have tooling to not
+allow the OK/Cancel translations to contain ~ in the first place,
+of if we should drop the ifdef UNX and do it globally now
+
+Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389
+
+Signed-off-by: Petr Mladek <pmladek@suse.cz>
+---
+ vcl/source/control/button.cxx | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
+index ac88195..4647490 100644
+--- a/vcl/source/control/button.cxx
++++ b/vcl/source/control/button.cxx
+@@ -153,12 +153,15 @@ XubString Button::GetStandardText( StandardButtonType eButton )
+ ResId aResId( nResId, *pResMgr );
+ aText = String( aResId );
+
+- // Windows (apparently) has some magic auto-accelerator evil around
+- // ok / cancel so add this only for Unix
+-#ifdef UNX
+- if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL )
+- aText.Insert( String::CreateFromAscii("~"), 0 );
++ if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
++ {
++#ifndef WNT
++ // Windows (apparently) has some magic auto-accelerator evil around
++ // ok / cancel so add accelerators only for Unix
++ if (aText.Search('~') == STRING_NOTFOUND)
++ aText.Insert(String::CreateFromAscii("~"), 0);
+ #endif
++ }
+ }
+ else
+ {
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index c28066d..ad9f7a5 100644
--- a/patches/series
+++ b/patches/series
@@ -57,3 +57,4 @@ lp-1097829-rhbz-689053-fix-crash-following-delete-at-last-table.diff
lp-1097966-fdo-57532-restrict-page-sanity-check-to-non.diff
lp-1097962-rhbz-827695-sw-prevent-crashes-after-incomplete-prin.diff
lp-994388-fdo-43932-set-correct-paper-tray-in-UI.diff
+lp-1103495-rhbz-868479-fdo-56281-doubled-in-German-ok-.diff
--
LibreOffice packaging repository
Reply to: