summaryrefslogtreecommitdiff
path: root/bean/qa/complex/ScreenComparer.java
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:19 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:19 +0200
commitcdda6341027eb807f9cdeca704011fe3968fe3e3 (patch)
treefd07b7561c849218420a898a9fd853bcc6121332 /bean/qa/complex/ScreenComparer.java
parentb52ec9a4fa9b8eb93a181fac3613f1de7d1d0825 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 0038bc6128921ad380912b18634212681578abfd (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit d7771bc638587e49ea7225312933c73cfc041439 Author: bjoern.michaelsen@canonical.com <Bjoern Michaelsen> Date: Mon Feb 7 17:18:01 2011 +0100 lp#696527: enable human icon theme in LibreOffice (cherry picked from commit cfa7e88f5959a8b3b729107d61351410be80f49b) Signed-off-by: Thorsten Behrens <tbehrens@novell.com> (cherry picked from commit c1d45fdb7f6380a0e6640a336cd790027e903b4f) Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Petr Mladek <pmladek@suse.cz> cui/source/options/optgdlg.src | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 474fbc4e896114f138061af9002b88cd675c8f01 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:23 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 94a2ea07194893531b93b78c2903d96bbc5526ce Author: Petr Mladek <pmladek@suse.cz> Date: Sun Feb 6 18:22:35 2011 +0100 add Ukrainian also into packinfo_office.txt setup_native/source/packinfo/packinfo_office.txt | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) commit e6e8d8ebbe2ef54704a467cf4930494fdf3be6ff Author: Petr Mladek <pmladek@suse.cz> Date: Sun Feb 6 18:06:37 2011 +0100 add Occitan also into packinfo_office.txt build fails witout it setup_native/source/packinfo/packinfo_office.txt | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 7754d67735a8e698d2b7106cae4c6e35eaf3b75b Author: Thorsten Behrens <tbehrens@novell.com> Date: Thu Feb 3 17:28:59 2011 +0100 New mimetype icons for LibreOffice Update from design team, source svg is http://wiki.documentfoundation.org/cgi_img_auth.php/d/d4/LibreOffice_Initial_Icons-pre_final.svg setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit adbc618d68569d5b63d1ec87c5d7a9d7f5ba5761 Author: Caolán McNamara <caolanm@redhat.com> Date: Sun Jan 30 20:38:00 2011 +0000 Resolves: rhbz#673819 crash on changing position of drawing object in header The header/footer objects are cunning wrappers to pretend to some parts of the drawing stuff that there are multiple objects, while in reality there is only one. So call HasText actually gets a totally different object from the cast :-( Signed-off-by: David Tardon <dtardon@redhat.com> cui/source/tabpages/swpossizetabpage.cxx | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 13519789cd6c9f86067251c5566f29a96bdaac44 Author: Rene Engelhard <rene@debian.org> Date: Thu Feb 3 00:37:15 2011 +0100 another s/OpenOffice.org/LibreOffice/ in nsplugin extensions/source/nsplugin/source/nsplugin_oo.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c0c2964c3ad1a42a5cd3548b9fcdd1c256c077bf Author: Andras Timar <timar@fsf.hu> Date: Sat Jan 29 12:32:52 2011 +0100 Added Occitan dictionary .../source/packinfo/spellchecker_selection.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit eacd19b0e2eeba91aa1b2387d93e99996c0efae2 Author: Andras Timar <timar@fsf.hu> Date: Sat Jan 29 11:14:10 2011 +0100 Added Ukrainian dictionaries .../source/packinfo/spellchecker_selection.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ecf859006048314ef1c4a4202a642e74a443ebce Author: Tor Lillqvist <tlillqvist@novell.com> Date: Tue Feb 1 14:26:46 2011 +0200 Fix overflow problem in the custom action for UI language de-selection In the _all_ installer we have slightly over 100 LibreOffice UI languages. The code in the custom action that de-selects UI languages based on the Windows UI language(s) and the user's locale had a limit of 100. The consequence was that a few of the alphabetically last LibreOffice UI languages: Ukrainan, Urdu, Uzbek, Venda and Xhosa, were not de-selected even if none of those languages was used by the user or Windows, and thus got installed in a "quick" install and also in a "custom" install unless the person running the installer noticed. Reported by aseques_ on IRC, no bug filed yet. Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> .../source/win32/customactions/sellang/sellang.cxx | 217 ++++++++++---------- 1 files changed, 104 insertions(+), 113 deletions(-) commit a73c1cff1b27dbef84f0d85d594f9628bb48a827 Author: Thorsten Behrens <tbehrens@novell.com> Date: Wed Jan 26 19:52:02 2011 +0100 Revert "Initial LibO mimetype icon design" This reverts commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333. setup_native/source/win32/nsis/ooosetup.ico | Bin 26918 -> 2238 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 88a6c07dc231ed3508ffe81ec624a753f4c49e75 Author: Alexander Thurgood <alex.thurgood@gmail.com> Date: Wed Jan 26 18:10:16 2011 +0100 Fix window focus for langpack installation on Mac fdo# 33056 Signed-off-by: Thorsten Behrens <tbehrens@novell.com> .../scripts/osx_install_languagepack.applescript | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Jan 18 10:26:56 2011 +0100 Initial LibO mimetype icon design As per http://luxate.blogspot.com/2011/01/libreoffice-initial-icons-milestone.html updating the LibO mimetype and app icons (and the installer icon, for coherence). setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit f7d7948cbe9e38e2e219f6024c0add130a5f6480 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:53:12 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) .../uiconfig/sbibliography/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 3097feb2f56b19a1b10b167f5c5869e2c7920be9 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 1b83f908126d09ef6e0015eb531bbd8c4cf57034 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: components_libreoffice-3.3.1.1 split repo tag: components_libreoffice-3.3.1.2
Diffstat (limited to 'bean/qa/complex/ScreenComparer.java')
-rw-r--r--bean/qa/complex/ScreenComparer.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/bean/qa/complex/ScreenComparer.java b/bean/qa/complex/ScreenComparer.java
index a2547a763c58..c169c45f4998 100644
--- a/bean/qa/complex/ScreenComparer.java
+++ b/bean/qa/complex/ScreenComparer.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -83,7 +83,7 @@ class ScreenComparer
{
grabOne(m_rect);
}
-
+
public void grabOne(Rectangle r) throws Exception
{
java.awt.Robot robot = new java.awt.Robot();
@@ -94,7 +94,7 @@ class ScreenComparer
{
grabTwo(m_rect);
}
-
+
public void grabTwo(Rectangle r) throws Exception
{
java.awt.Robot robot = new java.awt.Robot();
@@ -130,7 +130,7 @@ class ScreenComparer
pixel1 = m_img1.getRGB(x, y);
else
bOutOfRange = true;
-
+
if (x < w2 && y < h2)
pixel2 = m_img2.getRGB(x, y);
else
@@ -140,7 +140,7 @@ class ScreenComparer
m_imgDiff.setRGB(x, y, m_diffColor);
else
m_imgDiff.setRGB(x, y, pixel1);
-
+
}
}
return false;
@@ -179,7 +179,7 @@ class ScreenComparer
if (pixels1[offset] != pixels2[offset])
{
ret = ret && false;
- m_imgDiff.setRGB(x, y, m_diffColor);
+ m_imgDiff.setRGB(x, y, m_diffColor);
}
else
{
@@ -193,7 +193,7 @@ class ScreenComparer
/** Writes Images to a location. The
* directory is determined by the java property OOoBean.Images
- *
+ *
*/
public void writeImages() throws Exception
{
@@ -228,6 +228,6 @@ class ScreenComparer
System.out.println("Diff image: " + file1.getPath() + "\n");
}
}
-
+
}