[Libreoffice-commits] core.git: chart2/qa

[Tamás Zolnai]

 chart2/qa/extras/chart2dump/chart2dump.cxx                                       |    6 ++++++
 chart2/qa/extras/chart2dump/data/axis_special_positioning.ods                    |binary
 chart2/qa/extras/chart2dump/data/default_formated_axis.ods                       |binary
 chart2/qa/extras/chart2dump/data/formated_axis_lines.ods                         |binary
 chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods                         |binary
 chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt |    4 ++--
 chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt    |    8 ++++----
 7 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 5815ca4ef1126140e08f3a1d106bcadc41044505
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Mon Feb 13 23:12:01 2017 +0100

    ChartDumpTest: Avoid using Arial font in test documents
    
    Let's see whether this caused the position and size
    differences between different machines.
    
    Change-Id: I6cf0a2fff86d7ce8613d4ca4bbcfe6e001bd9f49
    Reviewed-on: https://gerrit.libreoffice.org/34226
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 20e3cd7..3ebea80 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -560,6 +560,9 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false)
     }
 }
 
+#undef  INT_EPS
+#define INT_EPS     0.1
+
 DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
 {
     const std::vector<OUString> aTestFiles =
@@ -633,6 +636,9 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
     }
 }
 
+#undef  INT_EPS
+#define INT_EPS     2.1
+
 DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
 {
     const std::vector<OUString> aTestFiles =
diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods b/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods
index f60197a..0ca86c6 100755
Binary files a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods and b/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods differ
diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.ods b/chart2/qa/extras/chart2dump/data/default_formated_axis.ods
index 96f8462..e40155f 100755
Binary files a/chart2/qa/extras/chart2dump/data/default_formated_axis.ods and b/chart2/qa/extras/chart2dump/data/default_formated_axis.ods differ
diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods b/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods
index 1e51ef1..c44fd8f 100755
Binary files a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods and b/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods differ
diff --git a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods
index c5a7cd6..4515478 100755
Binary files a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods and b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods differ
diff --git a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
index 5fc5c6c..e977fa9 100755
--- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
+++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
@@ -6,9 +6,9 @@
 // aAxisSize.Height
 495
 // aAxisSize.Width
-14438
+14439
 // aAxisTransformation
-14439;0;3510;0;496;7520;0;0;1
+14440;0;3510;0;496;7520;0;0;1
 // nAxisGeometriesCount
 4
 // sAxisLineDash
diff --git a/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt b/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt
index aa01dfc..34cfc5b 100755
--- a/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt
+++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt
@@ -36,7 +36,7 @@
 // xLabel->getString()
 3. negyedév
 // aLabelPosition.X
-11593
+11594
 // aLabelPosition.Y
 7770
 // aLabelSize.Height
@@ -44,7 +44,7 @@
 // aLabelSize.Width
 1881
 // aLabelTransformation
-1882;0;11593;0;346;7770;0;0;1
+1882;0;11594;0;346;7770;0;0;1
 // static_cast<sal_Int32>(aLabelFontColor)
 0
 // fLabelFontHeight
@@ -52,7 +52,7 @@
 // xLabel->getString()
 4. negyedév
 // aLabelPosition.X
-15203
+15204
 // aLabelPosition.Y
 7770
 // aLabelSize.Height
@@ -60,7 +60,7 @@
 // aLabelSize.Width
 1881
 // aLabelTransformation
-1882;0;15203;0;346;7770;0;0;1
+1882;0;15204;0;346;7770;0;0;1
 // static_cast<sal_Int32>(aLabelFontColor)
 0
 // fLabelFontHeight