[Libreoffice-commits] core.git: sw/qa vcl/win

2013-07-31 Thread Tor Lillqvist 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   30 -
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 -
 sw/qa/extras/rtfexport/rtfexport.cxx |   24 ++---
 sw/qa/extras/rtfimport/rtfimport.cxx |   12 +++---
 vcl/win/source/window/keynames.cxx   |   54 +++
 5 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit 3e48277e36a485d964d7b91305b1bf70a83c4451
Author: Tor Lillqvist 
Date:   Wed Jul 31 12:46:29 2013 +0200

Convert utf-8 bytes to \xNN hex representation

Change-Id: I5d1cc0331278f09a6e32345980c660d877d606fa

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b0f9845..f4932ff 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -350,8 +350,8 @@ void Test::testFdo51034()
 #define CHECK_FORMULA( expected, actual ) \
 CPPUNIT_ASSERT_EQUAL( \
 OUString( expected, strlen( expected ), RTL_TEXTENCODING_UTF8 ) \
-.replaceAll( " ", "" ).replaceAll( OUString( "−", strlen( "−" 
), RTL_TEXTENCODING_UTF8 ), "-" ), \
-OUString( actual ).replaceAll( " ", "" ).replaceAll( OUString( "−", 
strlen( "−" ), RTL_TEXTENCODING_UTF8 ), "-" ))
+.replaceAll( " ", "" ).replaceAll( OUString( "\xe2\x88\x92", 
strlen( "\xe2\x88\x92" ), RTL_TEXTENCODING_UTF8 ), "-" ), \
+OUString( actual ).replaceAll( " ", "" ).replaceAll( OUString( 
"\xe2\x88\x92", strlen( "\xe2\x88\x92" ), RTL_TEXTENCODING_UTF8 ), "-" ))
 
 void Test::testMathAccents()
 {
@@ -376,12 +376,12 @@ void Test::testMathD()
 
 void Test::testMathEscaping()
 {
-CHECK_FORMULA( "− ∞ < x < ∞", getFormula( getRun( getParagraph( 1 ), 
1 )));
+CHECK_FORMULA( "\xe2\x88\x92 \xe2\x88\x9e < x < \xe2\x88\x9e", getFormula( 
getRun( getParagraph( 1 ), 1 )));
 }
 
 void Test::testMathLim()
 {
-CHECK_FORMULA( "lim from {x → 1} {x}", getFormula( getRun( getParagraph( 
1 ), 1 )));
+CHECK_FORMULA( "lim from {x \xe2\x86\x92 1} {x}", getFormula( getRun( 
getParagraph( 1 ), 1 )));
 }
 
 void Test::testMathMalformedXml()
@@ -396,32 +396,32 @@ void Test::testMathMatrix()
 
 void Test::testMathMso2k7()
 {
-CHECK_FORMULA( "A = π {r} ^ {2}", getFormula( getRun( getParagraph( 1 ), 
1 )));
+CHECK_FORMULA( "A = \xcf\x80 {r} ^ {2}", getFormula( getRun( getParagraph( 
1 ), 1 )));
 // TODO check the stack/binom difference
 //CHECK_FORMULA( "{left (x+a right )} ^ {n} = sum from {k=0} to {n} {left 
(binom {n} {k} right ) {x} ^ {k} {a} ^ {n-k}}",
 CHECK_FORMULA( "{left (x+a right )} ^ {n} = sum from {k=0} to {n} {left 
(stack {n # k} right ) {x} ^ {k} {a} ^ {n-k}}",
 getFormula( getRun( getParagraph( 2 ), 1 )));
-CHECK_FORMULA( "{left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left 
(n-1 right ) {x} ^ {2}} over {2!} +…",
+CHECK_FORMULA( "{left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left 
(n-1 right ) {x} ^ {2}} over {2!} +\xe2\x80\xa6",
 getFormula( getRun( getParagraph( 3 ), 1 )));
 // TODO check (cos/sin miss {})
-//CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to 
{∞} {left ({a} rsub {n} cos {{nπx} over {L}} + {b} rsub {n} sin {{nπx} over 
{L}} right )}",
-CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to {∞} 
{left ({a} rsub {n} cos {nπx} over {L} + {b} rsub {n} sin {nπx} over {L} 
right )}",
+//CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to 
{\xe2\x88\x9e} {left ({a} rsub {n} cos {{n\xcf\x80x} over {L}} + {b} rsub {n} 
sin {{n\xcf\x80x} over {L}} right )}",
+CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to 
{\xe2\x88\x9e} {left ({a} rsub {n} cos {n\xcf\x80x} over {L} + {b} rsub {n} sin 
{n\xcf\x80x} over {L} right )}",
 getFormula( getRun( getParagraph( 4 ), 1 )));
 CHECK_FORMULA( "{a} ^ {2} + {b} ^ {2} = {c} ^ {2}", getFormula( getRun( 
getParagraph( 5 ), 1 )));
-CHECK_FORMULA( "x = {- b ± sqrt {{b} ^ {2} -4 ac}} over {2 a}",
+CHECK_FORMULA( "x = {- b \xc2\xb1 sqrt {{b} ^ {2} -4 ac}} over {2 a}",
 getFormula( getRun( getParagraph( 6 ), 1 )));
 CHECK_FORMULA(
-"{e} ^ {x} =1+ {x} over {1!} + {{x} ^ {2}} over {2!} + {{x} ^ {3}} 
over {3!} +…,-∞ {\"div\" \"F\"}  dV= llint from {S} 
to  {\"F\" ∙ \"n \" dS}",
+CHECK_FORMULA( "iiint from {V} to  {\"div\" \"F\"}  dV= llint from {S} 
to  {\"F\" \xe2\x88\x99 \"n \" dS}",
 getFormula( getRun( getParagraph( 1 ), 1 )));
 }
 
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0d10002..15bc845 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -948,7 +948,7 @@ void Test::testN779627()
 void Test::testFdo55187()
 {
 // 0x010d was imported as a newline.
-getParagraph(1, OUString("lupčka", 7, RTL_TEXTENCODING_UTF8));
+getParagraph(1, OUString("lup\xc4\x8dka", 7, RTL_T

[Libreoffice-commits] core.git: sw/qa vcl/win

2013-07-31 Thread Fridrich Štrba 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
 sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
 sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
 vcl/win/source/window/keynames.cxx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c7a8462b839f37712620fd2c236cfda026ec546d
Author: Fridrich Å trba 
Date:   Wed Jul 31 11:36:27 2013 +0200

Revert "fdo#66246 fdo#66395 BOM for MSVC with UTF-8 unfriendly codepage"

This breaks tinderbox builds. Better fix on the way.

This reverts commit ded871e9c1a69f640d6283ae6f79820689f0d612.

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 81e7f3f..b0f9845 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ef66d1a..0d10002 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1,4 +1,4 @@
-/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 8d3edf0..48db195 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1,4 +1,4 @@
-/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 17be4fc..c676d08 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1,4 +1,4 @@
-/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 226ff8f..c85360a 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa vcl/win

2013-07-31 Thread Isamu Mogi 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
 sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
 sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
 vcl/win/source/window/keynames.cxx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ded871e9c1a69f640d6283ae6f79820689f0d612
Author: Isamu Mogi 
Date:   Fri Jun 21 15:47:30 2013 +

fdo#66246 fdo#66395 BOM for MSVC with UTF-8 unfriendly codepage

MSVC misinterprets UTF-8 source code without BOM as ANSI/OEM codepage.
For that reason if local codepage is unfriendly to UTF-8, it sometimes
causes compilation error.

Change-Id: I8acd5500e581e020fd60b5a2ec20629f92fdf87c

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b0f9845..81e7f3f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0d10002..ef66d1a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1,4 +1,4 @@
-/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 48db195..8d3edf0 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1,4 +1,4 @@
-/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c676d08..17be4fc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1,4 +1,4 @@
-/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index c85360a..226ff8f 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits