[Libreoffice-commits] core.git: translations

2013-11-16 Thread Robinson Tryon 
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee8b9849466e202c913baefaf81de0ed06cdab66
Author: Robinson Tryon 
Date:   Sat Nov 16 04:54:47 2013 -0500

Updated core
Project: translations  983b259ba97a5a8dd916700b6ce0b1c0ceece1b6

Bugzilla Migration: Change bugs.freedesktop.org -> bugs.libreoffice.org

Change-Id: I12591e20d81023693a53d334526176085d5f964b
Reviewed-on: https://gerrit.libreoffice.org/6692
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/translations b/translations
index 1bb0727..983b259 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1bb07277935bce4a9dcf1e0eeaf2ebdfcf4b2b11
+Subproject commit 983b259ba97a5a8dd916700b6ce0b1c0ceece1b6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/af

2013-11-16 Thread Robinson Tryon 
 source/af/accessibility/source/helper.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 983b259ba97a5a8dd916700b6ce0b1c0ceece1b6
Author: Robinson Tryon 
Date:   Sat Nov 16 04:54:47 2013 -0500

Bugzilla Migration: Change bugs.freedesktop.org -> bugs.libreoffice.org

Change-Id: I12591e20d81023693a53d334526176085d5f964b
Reviewed-on: https://gerrit.libreoffice.org/6692
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/source/af/accessibility/source/helper.po 
b/source/af/accessibility/source/helper.po
index 32132c7..e80af89 100644
--- a/source/af/accessibility/source/helper.po
+++ b/source/af/accessibility/source/helper.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: 
https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
+"Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2013-05-23 12:06+0200\n"
 "PO-Revision-Date: 2012-11-13 20:14+\n"
 "Last-Translator: dwayne \n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype bin/lo-commit-stat connectivity/source editeng/qa i18npool/qa l10ntools/source readlicense_oo/docs sal/osl sw/qa sw/source tube

2013-11-16 Thread Andras Timar 
 bin/get-bugzilla-attachments-by-mimetype |2 +-
 bin/lo-commit-stat   |2 +-
 connectivity/source/parse/sqliterator.cxx|2 +-
 editeng/qa/unit/core-test.cxx|2 +-
 i18npool/qa/cppunit/test_breakiterator.cxx   |   14 +++---
 i18npool/qa/cppunit/test_characterclassification.cxx |2 +-
 l10ntools/source/po.cxx  |2 +-
 readlicense_oo/docs/readme.xrm   |2 +-
 sal/osl/unx/salinit.cxx  |2 +-
 sw/qa/complex/writer/TextPortionEnumerationTest.java |2 +-
 sw/qa/core/uwriter.cxx   |   16 
 sw/source/filter/ww8/ww8par.cxx  |2 +-
 sw/source/ui/misc/swruler.cxx|2 +-
 tubes/source/manager.cxx |2 +-
 unotools/source/config/historyoptions.cxx|4 ++--
 unusedcode.README|2 +-
 16 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 1ba111343eadfc9da58e229d0bc19222819229fd
Author: Andras Timar 
Date:   Sun Nov 17 08:33:01 2013 +0100

bugs.freedesktop.org -> bugs.libreoffice.org

Change-Id: I56c1190c9636981acf2dd271515170a8a904

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index a45281d..f0a6e9c 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -218,7 +218,7 @@ def get_launchpad_bugs(prefix):
 f.write(handle.read())
 f.close()
 
-freedesktop = 'http://bugs.freedesktop.org/buglist.cgi'
+freedesktop = 'http://bugs.libreoffice.org/buglist.cgi'
 abisource = 'http://bugzilla.abisource.com/buglist.cgi' #added for abiword
 gnome = 'http://bugzilla.gnome.org/buglist.cgi' # added for gnumeric
 kde = 'http://bugs.kde.org/buglist.cgi' # added for koffice/calligra
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index fadca4e..a372eea 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -17,7 +17,7 @@ my %module_dirname = (
 
 
 my %bugzillas = (
-fdo  => "https://bugs.freedesktop.org/show_bug.cgi?id=";,
+fdo  => "https://bugs.libreoffice.org/show_bug.cgi?id=";,
 bnc  => "https://bugzilla.novell.com/show_bug.cgi?id=";,
 rhbz => "https://bugzilla.redhat.com/show_bug.cgi?id=";,
 i=> "https://issues.apache.org/ooo/show_bug.cgi?id=";,
diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index a2f9cc4..e388676 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -595,7 +595,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( 
OSQLTables& _rTables,
 //   and using its m_aSelectColumns
 //   This is necessary in stuff like "SELECT * 
FROM tbl1 INNER JOIN (SELECT foo, bar FROM tbl2) AS tbl3"
 //   so that setSelectColumnName() can expand the 
"*" correctly.
-//   See e.g. R_UserAndLastSubscription query of 
https://bugs.freedesktop.org/attachment.cgi?id=71871
+//   See e.g. R_UserAndLastSubscription query of 
https://bugs.libreoffice.org/attachment.cgi?id=71871
 }
 else
 {
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index d0437f4..053e647 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -296,7 +296,7 @@ private:
 }
 };
 
-//https://bugs.freedesktop.org/show_bug.cgi?id=55693
+//https://bugs.libreoffice.org/show_bug.cgi?id=55693
 //Two capitalized letters are not corrected if dash or slash are directly
 //before the two letters
 void Test::testAutocorrect()
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index a81475b..56b105c 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -75,7 +75,7 @@ void TestBreakIterator::testLineBreaking()
 i18n::LineBreakUserOptions aUserOptions;
 lang::Locale aLocale;
 
-//See https://bugs.freedesktop.org/show_bug.cgi?id=31271
+//See https://bugs.libreoffice.org/show_bug.cgi?id=31271
 {
 OUString aTest("(some text here)");
 
@@ -95,7 +95,7 @@ void TestBreakIterator::testLineBreaking()
 }
 }
 
-//See https://bugs.freedesktop.org/show_bug.cgi?id=49849
+//See https://bugs.libreoffice.org/show_bug.cgi?id=49849
 {
 const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD 
};
 OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
@@ -142,7 +142,7 @@ void TestBreakIterator::testLineBreaking()
 }
 }
 
-//See https://bugs.freedesktop.org/show_bug.cgi?id=49629
+//See https://bugs.libreoffice.org/sho

Does someone have access to ftp server?

2013-11-16 Thread Joel Madero 

Hi All,

I'm hoping someone will grant me (or test for themselves) temporary ftp 
access to a server.


https://bugs.freedesktop.org/show_bug.cgi?id=62981

I need to verify that this is still a problem with 4.1 - bug is super 
old and I'd like to just take care of it once and for all. I tried a 
couple public servers and I just got I/O errors - could be because of 
limited rights on those public servers.


Please let me know if there is a server available and/or if you can test 
yourself. We need it tested with nautilus and libreoffice 4.1 (no other 
setup is the same as what they have reported against).



Thanks all!


Best,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - sc/Module_sc.mk sc/qa

2013-11-16 Thread Tor Lillqvist 
 sc/Module_sc.mk|   10 +++---
 sc/qa/unit/opencl-test.cxx |2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 62fd1cfb7eb64ac48d588b667e325c6d80528e33
Author: Tor Lillqvist 
Date:   Sun Nov 17 09:05:20 2013 +0200

WaE: unused variables

Change-Id: I81cdd8d295e07d13b6013e1a64f7c7327f5c54c2

diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 238cefd..0cbf365 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -767,6 +767,8 @@ void ScOpenclTest::testMathFormulaRandom()
 double fLibre = pDoc->GetValue(ScAddress(0,i,0));
 double fExcel = pDocRes->GetValue(ScAddress(0,i,0));
 //because the random numbers will always change,so give the test "true"
+(void) fLibre;
+(void) fExcel;
 CPPUNIT_ASSERT(true);
 }
 xDocSh->DoClose();
commit 51cf9b09542d795c40743e14fa009316286654b2
Author: Tor Lillqvist 
Date:   Sun Nov 17 09:04:44 2013 +0200

CppunitTest_sc_opencl_test doesn't crash on OS X

Change-Id: I401115dc23306525917c968b753e70643ebe069d

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index f27e104..a60506c 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -50,13 +50,17 @@ $(eval $(call gb_Module_add_targets,sc,\
 
 endif
 
-# Disabled because fails on too many machines in
-# the OpenCL compiler
-# CppunitTest_sc_opencl_test
+# The sc_opencl_test disabled for other OSes than OS X at the moment
+# because it fails on many Linux machines in the OpenCL compiler. OS X
+# has a different (?) OpenCL compiler implementation than the one
+# which fails.
+#
 $(eval $(call gb_Module_add_check_targets,sc,\
 CppunitTest_sc_ucalc \
 CppunitTest_sc_filters_test \
 CppunitTest_sc_rangelst_test \
+$(if $(filter $(OS),MACOSX), \
+CppunitTest_sc_opencl_test) \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/Library_scopencl.mk sc/qa sc/source

2013-11-16 Thread minwang 
 sc/Library_scopencl.mk |1 
 sc/qa/unit/data/xls/opencl/logical/and.xls |binary
 sc/qa/unit/opencl-test.cxx |   30 +++
 sc/source/core/opencl/formulagroupcl.cxx   |5 +
 sc/source/core/opencl/op_logical.cxx   |  109 +
 sc/source/core/opencl/op_logical.hxx   |   29 +++
 sc/source/core/tool/token.cxx  |1 
 7 files changed, 175 insertions(+)

New commits:
commit 1c8701f8b7b5fe287a0d9a1c433504f3f8f88ec3
Author: minwang 
Date:   Sun Nov 17 14:26:52 2013 +0800

GPU Calc: unit test cases for AND

Turn NO_FALLBACK_TO_SWINTERP on  in formulagroupcl.cxx for test

AMLOEXT-217 BUG

Change-Id: I768e3b58e37d56c527f364aab54b88ecfe8c0907
Signed-off-by: haochen 
Signed-off-by: I-Jui (Ray) Sung 

diff --git a/sc/qa/unit/data/xls/opencl/logical/and.xls 
b/sc/qa/unit/data/xls/opencl/logical/and.xls
new file mode 100644
index 000..19ae64b
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/logical/and.xls differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 0782883..238cefd 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -239,6 +239,7 @@ public:
 void testArrayFormulaSumXMY2();
 void testStatisticalFormulaStDevP();
 void testStatisticalFormulaCovar();
+void testLogicalFormulaAnd();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -409,6 +410,7 @@ public:
 CPPUNIT_TEST(testArrayFormulaSumXMY2);
 CPPUNIT_TEST(testStatisticalFormulaStDevP);
 CPPUNIT_TEST(testStatisticalFormulaCovar);
+CPPUNIT_TEST(testLogicalFormulaAnd);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -4712,6 +4714,34 @@ void ScOpenclTest:: testArrayFormulaSumXMY2()
 xDocSh->DoClose();
 xDocShRes->DoClose();
 }
+//[AMLOEXT-217]
+void ScOpenclTest:: testLogicalFormulaAnd()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc("opencl/logical/and.", XLS);
+ScDocument *pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc->CalcAll();
+ScDocShellRef xDocShRes = loadDoc("opencl/logical/and.", XLS);
+ScDocument *pDocRes = xDocShRes->GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 1; i <= 20; ++i)
+{
+double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
+double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+for (SCROW i = 1; i <= 20; ++i)
+{
+double fLibre = pDoc->GetValue(ScAddress(3, i, 0));
+double fExcel = pDocRes->GetValue(ScAddress(3, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh->DoClose();
+xDocShRes->DoClose();
+}
 ScOpenclTest::ScOpenclTest()
   : ScBootstrapFixture( "/sc/qa/unit/data" )
 {
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b8a5095..5dc92e6 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1470,6 +1470,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
 case ocSumXMY2:
 case ocStDevP:
 case ocCovar:
+case ocAnd:
 // Don't change the state.
 break;
 default:
commit 26c759b7dfcbceb295acbb1f895847bcc4dd6cce
Author: minwang 
Date:   Sun Nov 17 14:38:12 2013 +0800

GPU Calc: implemented for AND

AMLOEXT-217 FIX

Change-Id: I95454c6e390ddc856b9a08d1db5a7a696a3928aa
Signed-off-by: haochen 
Signed-off-by: I-Jui (Ray) Sung 

diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk
index 134afb8..2c0ac16 100644
--- a/sc/Library_scopencl.mk
+++ b/sc/Library_scopencl.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,scopencl,\
 sc/source/core/opencl/op_math \
 sc/source/core/opencl/op_statistical \
 sc/source/core/opencl/op_array \
+sc/source/core/opencl/op_logical \
 sc/source/core/opencl/clcc/clew \
 ))
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 36415e5..85ebdf0 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -21,6 +21,7 @@
 #include "op_financial.hxx"
 #include "op_database.hxx"
 #include "op_math.hxx"
+#include "op_logical.hxx"
 #include "op_statistical.hxx"
 #include "op_array.hxx"
 #include "formulagroupcl_public.hxx"
@@ -1792,6 +1793,10 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts,
  ft->Children[i], new OpCovar));
  break;
+case ocAnd:
+mvSubArguments.push_back(SoPHelper(ts,
+ ft->Children[i], new OpAnd));
+ break;

[Libreoffice-commits] core.git: sc/source

2013-11-16 Thread Joel Madero 
 sc/source/ui/src/scfuncs.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42463328f5803d7d34a3bb05fbe1e24cdc02dff8
Author: Joel Madero 
Date:   Fri Nov 15 11:07:46 2013 -0800

fdo#71652 - change thousand separate description

Minor change to the text found in thousand separator parameter use
description to make it a bit clearer.

Change-Id: Idfa83e04c123458913af0795c78ea4fae616e24c
Reviewed-on: https://gerrit.libreoffice.org/6690
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index e41cfab..67c346e 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -9529,7 +9529,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 7 // Description of Parameter 3
 {
-Text [ en-US ] = "No thousands separator. True value, if existing 
and TRUE (unequal to 0), no thousands separators are set." ;
+Text [ en-US ] = "Thousands separator. If 0 or omitted the locale 
group separator is used else the separator is suppressed." ;
 };
 };
  // -=*# Resource for function LÄNGE #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2013-11-16 Thread Ray 
 sc/source/core/opencl/openclwrapper.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 37c8301ad18c0fd0b61a587521e7ae40ceed0070
Author: I-Jui (Ray) Sung 
Date:   Sun Nov 17 00:18:04 2013 -0600

GPU Calc: remove CL_QUEUE_THREAD_HANDLE_AMD query

Use of this extension is not recommended even by AMD.
See also:

http://devgurus.amd.com/message/1300769#1300769

for details.

Change-Id: I05bf2903a79c83e1de3cdfe23c713b8a0e7d35f9

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index c4eb7c8..b7e1f91 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -675,10 +675,6 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
 
 CHECK_OPENCL(clStatus, "clCreateCommandQueue");
 }
-#if 0
-clStatus = clGetCommandQueueInfo( gpuInfo->mpCmdQueue, 
CL_QUEUE_THREAD_HANDLE_AMD, 0, NULL, NULL );
-CHECK_OPENCL(clStatus, "clGetCommandQueueInfo");
-#endif
 bool bKhrFp64 = false;
 bool bAmdFp64 = false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Please be careful when touching sc/source/core/opencl

2013-11-16 Thread Markus Mohrhard 
Hey,

so it seems like we have had a regression from some code cleanup in
sc/source/core/opencl and since the directory is under heavy development
and the test is disabled I would ask anyone to wait with any unncessary
clean-up in the directory.

Hopefully I can enable the automatic test soon again but for now it is
quite dangerous to touch this code if you don't know how to test your
changes. This is of course only a temporary solution but until I can fix
the build breakers with some OpenCL compilers we are working without a
safety net in this directory.

Of course fixing a build breaker is highly appreciated.

Thanks for your help keeping the OpenCL code clean,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/qa sc/source

2013-11-16 Thread hongyu zhong 
 sc/qa/unit/data/xls/opencl/statistical/Betainv.xls |binary
 sc/qa/unit/opencl-test.cxx |   25 +++
 sc/source/core/opencl/formulagroupcl.cxx   |5 
 sc/source/core/opencl/op_statistical.cxx   |  153 +
 sc/source/core/opencl/op_statistical.hxx   |8 -
 sc/source/core/opencl/opbase.cxx   |4 
 sc/source/core/opencl/opinlinefun_statistical.cxx  |1 
 sc/source/core/tool/token.cxx  |1 
 8 files changed, 193 insertions(+), 4 deletions(-)

New commits:
commit ca30bd2c6c637746fb56dc9ef45bc84baa743faa
Author: hongyu zhong 
Date:   Sat Nov 16 17:33:30 2013 +0800

GPU Calc: implemented BETAINV

AMLOEXT-201 FIX

Change-Id: I68a7277b7353ed5a6f4d2ea8d1a4f7fb894bf487
Signed-off-by: haochen 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index b9469f2..0d63e4c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1762,6 +1762,10 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts,
  ft->Children[i],new OpSumX2PY2));
  break;
+case ocBetaInv:
+mvSubArguments.push_back(SoPHelper(ts,
+ ft->Children[i],new OpBetainv));
+ break;
 case ocExternal:
 if ( !(pChild->GetExternal().compareTo(OUString(
 "com.sun.star.sheet.addin.Analysis.getEffect"
diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index ddad803..48c015d 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -6198,6 +6198,159 @@ void 
OpBetaDist::GenSlidingWindowFunction(std::stringstream &ss,
 ss << "return tmp;\n";
 ss << "}\n";
 }
+void OpBetainv::BinInlineFun(std::set& decls,
+std::set& funs)
+{
+decls.insert(fMachEpsDecl);
+funs.insert("");
+decls.insert(fMaxGammaArgumentDecl);
+funs.insert("");
+decls.insert(lcl_IterateInverseBetaInvDecl);
+funs.insert(lcl_IterateInverseBetaInv);
+decls.insert(GetBetaDistDecl);
+funs.insert(GetBetaDist);
+decls.insert(lcl_HasChangeOfSignDecl);
+funs.insert(lcl_HasChangeOfSign);
+decls.insert(lcl_HasChangeOfSignDecl);
+funs.insert(lcl_HasChangeOfSign);
+decls.insert(lcl_HasChangeOfSignDecl);
+funs.insert(lcl_HasChangeOfSign);
+decls.insert(lcl_GetBetaHelperContFracDecl);
+funs.insert(lcl_GetBetaHelperContFrac);
+decls.insert(GetBetaDistPDFDecl);
+funs.insert(GetBetaDistPDF);
+decls.insert(GetLogBetaDecl);
+funs.insert(GetLogBeta);
+decls.insert(GetBetaDecl);
+funs.insert(GetBeta);
+decls.insert(lcl_getLanczosSumDecl);
+funs.insert(lcl_getLanczosSum);
+}
+void OpBetainv::GenSlidingWindowFunction(
+std::stringstream &ss,const std::string sSymName,
+SubArguments &vSubArguments)
+{
+ss << "\ndouble " << sSymName;
+ss << "_"<< BinFuncName() <<"(";
+for (unsigned i = 0; i < vSubArguments.size(); i++)
+{
+if (i)
+ss << ",";
+vSubArguments[i]->GenSlidingWindowDecl(ss);
+}
+ss << ")\n";
+ss << "{\n";
+ss << "double tmp0,tmp1,tmp2,tmp3,tmp4;\n";
+ss << "int gid0=get_global_id(0);\n";
+size_t i = vSubArguments.size();
+size_t nItems = 0;
+ss <<"\n";
+//while (i-- > 1)
+for (i = 0; i < vSubArguments.size(); i++)
+{
+FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
+assert(pCur);
+if (pCur->GetType() == formula::svDoubleVectorRef)
+{
+const formula::DoubleVectorRefToken* pDVR =
+dynamic_cast(pCur);
+size_t nCurWindowSize = pDVR->GetRefRowSize();
+ss << "for (int i = ";
+if (!pDVR->IsStartFixed() && pDVR->IsEndFixed()) {
+#ifdef  ISNAN
+ss << "gid0; i < " << pDVR->GetArrayLength();
+ss << " && i < " << nCurWindowSize  << "; i++){\n";
+#else
+ss << "gid0; i < "<< nCurWindowSize << "; i++)\n";
+#endif
+} else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed()) {
+#ifdef  ISNAN
+ss << "0; i < " << pDVR->GetArrayLength();
+ss << " && i < gid0+"<< nCurWindowSize << "; i++){\n";
+#else
+ss << "0; i < gid0+"<< nCurWindowSize << "; i++)\n";
+#endif
+} else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed()){
+#ifdef  ISNAN
+ss << "0; i + gid0 < " << pDVR->GetArrayLength();
+ss << " &&  i < "<< nCurWindowSize << "; i++){\n";
+#else
+ss << "0; i < "<< nCurWindowSize << "; i++)\n";
+#endif
+}
+else {
+#ifdef  ISNAN
+ss << "0; i < "<< nCurWindowSize << "; i++){\n";
+#else
+

[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source

2013-11-16 Thread hongyu zhong 
 sc/qa/unit/data/xls/opencl/statistical/Betainv.xls |binary
 sc/qa/unit/opencl-test.cxx |   25 +++
 sc/source/core/opencl/formulagroupcl.cxx   |   10 +
 sc/source/core/opencl/op_statistical.cxx   |  153 +
 sc/source/core/opencl/op_statistical.hxx   |8 -
 sc/source/core/opencl/opbase.cxx   |4 
 sc/source/core/opencl/opinlinefun_statistical.cxx  |1 
 sc/source/core/tool/token.cxx  |1 
 8 files changed, 197 insertions(+), 5 deletions(-)

New commits:
commit 811c671c7ff3229dab1ed9ae81fa9723c603fa80
Author: hongyu zhong 
Date:   Sat Nov 16 17:33:30 2013 +0800

GPU Calc: implemented BETAINV

AMLOEXT-201 FIX

Change-Id: I68a7277b7353ed5a6f4d2ea8d1a4f7fb894bf487
Signed-off-by: haochen 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 45ab642..d2a10c5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1762,6 +1762,10 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts,
  ft->Children[i],new OpSumX2PY2));
  break;
+case ocBetaInv:
+mvSubArguments.push_back(SoPHelper(ts,
+ ft->Children[i],new OpBetainv));
+ break;
 case ocExternal:
 if ( !(pChild->GetExternal().compareTo(OUString(
 "com.sun.star.sheet.addin.Analysis.getEffect"
diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index ddad803..48c015d 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -6198,6 +6198,159 @@ void 
OpBetaDist::GenSlidingWindowFunction(std::stringstream &ss,
 ss << "return tmp;\n";
 ss << "}\n";
 }
+void OpBetainv::BinInlineFun(std::set& decls,
+std::set& funs)
+{
+decls.insert(fMachEpsDecl);
+funs.insert("");
+decls.insert(fMaxGammaArgumentDecl);
+funs.insert("");
+decls.insert(lcl_IterateInverseBetaInvDecl);
+funs.insert(lcl_IterateInverseBetaInv);
+decls.insert(GetBetaDistDecl);
+funs.insert(GetBetaDist);
+decls.insert(lcl_HasChangeOfSignDecl);
+funs.insert(lcl_HasChangeOfSign);
+decls.insert(lcl_HasChangeOfSignDecl);
+funs.insert(lcl_HasChangeOfSign);
+decls.insert(lcl_HasChangeOfSignDecl);
+funs.insert(lcl_HasChangeOfSign);
+decls.insert(lcl_GetBetaHelperContFracDecl);
+funs.insert(lcl_GetBetaHelperContFrac);
+decls.insert(GetBetaDistPDFDecl);
+funs.insert(GetBetaDistPDF);
+decls.insert(GetLogBetaDecl);
+funs.insert(GetLogBeta);
+decls.insert(GetBetaDecl);
+funs.insert(GetBeta);
+decls.insert(lcl_getLanczosSumDecl);
+funs.insert(lcl_getLanczosSum);
+}
+void OpBetainv::GenSlidingWindowFunction(
+std::stringstream &ss,const std::string sSymName,
+SubArguments &vSubArguments)
+{
+ss << "\ndouble " << sSymName;
+ss << "_"<< BinFuncName() <<"(";
+for (unsigned i = 0; i < vSubArguments.size(); i++)
+{
+if (i)
+ss << ",";
+vSubArguments[i]->GenSlidingWindowDecl(ss);
+}
+ss << ")\n";
+ss << "{\n";
+ss << "double tmp0,tmp1,tmp2,tmp3,tmp4;\n";
+ss << "int gid0=get_global_id(0);\n";
+size_t i = vSubArguments.size();
+size_t nItems = 0;
+ss <<"\n";
+//while (i-- > 1)
+for (i = 0; i < vSubArguments.size(); i++)
+{
+FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
+assert(pCur);
+if (pCur->GetType() == formula::svDoubleVectorRef)
+{
+const formula::DoubleVectorRefToken* pDVR =
+dynamic_cast(pCur);
+size_t nCurWindowSize = pDVR->GetRefRowSize();
+ss << "for (int i = ";
+if (!pDVR->IsStartFixed() && pDVR->IsEndFixed()) {
+#ifdef  ISNAN
+ss << "gid0; i < " << pDVR->GetArrayLength();
+ss << " && i < " << nCurWindowSize  << "; i++){\n";
+#else
+ss << "gid0; i < "<< nCurWindowSize << "; i++)\n";
+#endif
+} else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed()) {
+#ifdef  ISNAN
+ss << "0; i < " << pDVR->GetArrayLength();
+ss << " && i < gid0+"<< nCurWindowSize << "; i++){\n";
+#else
+ss << "0; i < gid0+"<< nCurWindowSize << "; i++)\n";
+#endif
+} else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed()){
+#ifdef  ISNAN
+ss << "0; i + gid0 < " << pDVR->GetArrayLength();
+ss << " &&  i < "<< nCurWindowSize << "; i++){\n";
+#else
+ss << "0; i < "<< nCurWindowSize << "; i++)\n";
+#endif
+}
+else {
+#ifdef  ISNAN
+ss << "0; i < "<< nCurWindowSize << "; i++){\n";
+#else
+

[Libreoffice-commits] core.git: sc/source

2013-11-16 Thread Ray 
 sc/source/core/opencl/openclwrapper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0adea894d6d55ead0ff58c76ce142f5d4e1014a4
Author: I-Jui (Ray) Sung 
Date:   Sat Nov 16 21:44:15 2013 -0600

GPU Calc: fix regression on non-AMD GPUs

Change-Id: Ie9ae42fc8111e1f11acab5c67a4932edd7031619

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index d7719dd..c4eb7c8 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -675,10 +675,10 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
 
 CHECK_OPENCL(clStatus, "clCreateCommandQueue");
 }
-
+#if 0
 clStatus = clGetCommandQueueInfo( gpuInfo->mpCmdQueue, 
CL_QUEUE_THREAD_HANDLE_AMD, 0, NULL, NULL );
 CHECK_OPENCL(clStatus, "clGetCommandQueueInfo");
-
+#endif
 bool bKhrFp64 = false;
 bool bAmdFp64 = false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

(VCL) Timer vs. SalTimer

2013-11-16 Thread Rodolfo 
Hi.

Can you help me understand why this separation? Why not only SalTimer?

I can't see any advantage in reencapsulate SalTimer.beside the getter
and setters (timeout value and callback) that could be in SalTimer
itself.

The callback signature seems different (sal uses a void return, vcl a
long as returned value). Anyway, the long value is never used
internally on VCL Timer.

Regards.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/ia2.4' - offapi/com

2013-11-16 Thread Herbert Dürr 
 offapi/com/sun/star/accessibility/MSAAService.idl   |   48 
--
 offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl |   47 
-
 offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl  |   47 
-
 offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl |   47 
-
 offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl  |   47 
-
 offapi/com/sun/star/accessibility/XMSAAService.idl  |   47 
-
 6 files changed, 121 insertions(+), 162 deletions(-)

New commits:
commit aa3ad3c66c0219ef0b12850290e8cefc2cd7201b
Author: Herbert Dürr 
Date:   Sun Nov 17 00:49:54 2013 +0100

i107914# adjust license headers to the ALv2

as intended by IBM's symphony contribution
and the individual ICLAs of the developers

Found by: V Stuart Foote 

Change-Id: I47125ff5c9f1ae241132f13b7b3ee2d6fa3cfe9a

diff --git a/offapi/com/sun/star/accessibility/MSAAService.idl 
b/offapi/com/sun/star/accessibility/MSAAService.idl
index b7c4efe..3e8840a 100644
--- a/offapi/com/sun/star/accessibility/MSAAService.idl
+++ b/offapi/com/sun/star/accessibility/MSAAService.idl
@@ -1,30 +1,24 @@
-/*
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-*  Copyright IBM Corporation 2010.
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* 
-* for a copy of the LGPLv3 License.
-*
-/
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 #ifndef __com_sun_star_accessibility_Accessible_idl__
 #define __com_sun_star_accessibility_Accessible_idl__
 
diff --git 
a/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl 
b/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl
index 978acc7..e9fd849 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl
@@ -1,30 +1,23 @@
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- *

[Libreoffice-commits] core.git: Branch 'feature/ia2.4' - 2 commits - offapi/com offapi/UnoApi_offapi.mk winaccessibility/source

2013-11-16 Thread David Ostrovsky 
 offapi/UnoApi_offapi.mk |6 
 offapi/com/sun/star/accessibility/AccessibleEventId.idl |   10 +
 offapi/com/sun/star/accessibility/AccessibleRelationType.idl|8 +
 offapi/com/sun/star/accessibility/AccessibleStateType.idl   |   21 +++
 offapi/com/sun/star/accessibility/MSAAService.idl   |   45 
++
 offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl |   49 
+++
 offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl  |   52 
+++
 offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl |   54 

 offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl  |   67 
++
 offapi/com/sun/star/accessibility/XMSAAService.idl  |   56 

 winaccessibility/source/UAccCOM/MAccessible.cxx |4 
 11 files changed, 370 insertions(+), 2 deletions(-)

New commits:
commit cf7c49f115f7f18dc70c4b7a87436cd4dfbe3b18
Author: David Ostrovsky 
Date:   Sat Nov 16 23:31:32 2013 +0100

Fix minor compilation issues

Change-Id: I3567a42d7d071d61a2f41f1fb32d6831c9898d3a

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
old mode 100644
new mode 100755
index 8b63afd..f75da685
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1611,6 +1611,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/accessibility,\
AccessibleTextType \
IllegalAccessibleComponentStateException \
TextSegment \
+MSAAService \
XAccessible \
XAccessibleAction \
XAccessibleComponent \
@@ -1618,7 +1619,9 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/accessibility,\
XAccessibleEditableText \
XAccessibleEventBroadcaster \
XAccessibleEventListener \
+XAccessibleExtendedAttributes \
XAccessibleExtendedComponent \
+XAccessibleGroupPosition \
XAccessibleHyperlink \
XAccessibleHypertext \
XAccessibleImage \
@@ -1628,10 +1631,13 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/accessibility,\
XAccessibleSelection \
XAccessibleStateSet \
XAccessibleTable \
+XAccessibleTableSelection \
XAccessibleText \
XAccessibleTextAttributes \
XAccessibleTextMarkup \
+XAccessibleTextSelection \
XAccessibleValue \
+XMSAAService \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/animations,\
AnimationAdditiveMode \
diff --git a/offapi/com/sun/star/accessibility/XMSAAService.idl 
b/offapi/com/sun/star/accessibility/XMSAAService.idl
old mode 100644
new mode 100755
index 01fa3a2..2b22826
--- a/offapi/com/sun/star/accessibility/XMSAAService.idl
+++ b/offapi/com/sun/star/accessibility/XMSAAService.idl
@@ -48,7 +48,7 @@ interface XMSAAService : ::com::sun::star::uno::XInterface
 */
 long getAccObjectPtr ([in] long hWnd, [in] long lParam, [in] long wParam);
 
-[oneway] void handleWindowOpened ([in] long i);
+void handleWindowOpened ([in] long i);
 };
 
 }; }; }; };
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index a75cfb3..d4a31a8 100755
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -36,9 +36,9 @@
 #include 
 #include 
 #include 
-//#include 
+#include 
 #include 
-//#include 
+#include 
 #include 
 #include 
 #include 
commit 19a205dafe50bc17f36ce2a1954e3c08a6fbfde6
Author: Steve Yin 
Date:   Sat Nov 16 23:58:19 2013 +0100

Integrate branch of IAccessible2

Change-Id: Ied8b6941765c86a849467cb5df312ca7124f32b3

diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl 
b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index d378f7d..efafc1a 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -372,6 +372,16 @@ constants AccessibleEventId
 @since OOo 3.2
 */
 const short LISTBOX_ENTRY_COLLAPSED = 33;
+
+//IAccessibility2 Implementation 2009-
+const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34;
+const short SELECTION_CHANGED_ADD =35;
+const short SELECTION_CHANGED_REMOVE =36;
+const short SELECTION_CHANGED_WITHIN =37;
+const short PAGE_CHANGED =38;
+const short SECTION_CHANGED =39;
+const short COLUMN_CHANGED =40;
+//-IAccessibility2 Implementation 2009
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl 
b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
index 2219c26..0ea803a 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
@@ -106,6 +106,14 @@ constants AccessibleRelationType
 @since OOo 3.0
 */
 const short NODE_CHILD_OF = 9;
+
+/** Descri

[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source

2013-11-16 Thread Takeshi Abe 
 sw/inc/format.hxx  |   16 +++-
 sw/inc/frmfmt.hxx  |4 ++--
 sw/source/core/attr/format.cxx |   24 
 sw/source/core/inc/flyfrm.hxx  |4 ++--
 sw/source/core/layout/atrfrm.cxx   |   14 +++---
 sw/source/core/layout/paintfrm.cxx |   12 ++--
 sw/source/filter/html/htmlfldw.cxx |6 +++---
 7 files changed, 39 insertions(+), 41 deletions(-)

New commits:
commit 11077cb75d0dcf1ebb25b12358776fde45a78eb4
Author: Takeshi Abe 
Date:   Sun Nov 17 07:21:50 2013 +0900

undefining inline is just confusing

Change-Id: I70b973a88944603077a06632c801e8211f9efbd9

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index a777f9f..e92f8e3 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -341,8 +341,6 @@ inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, 
sal_Bool bSrchInPare
 return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
 }
 
-#undef inline
-
 #endif // INCLUDED_SW_INC_FORMAT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5c6bbe6a23b6b746dcbb20de1360b4745b1e4679
Author: Takeshi Abe 
Date:   Sun Nov 17 06:44:00 2013 +0900

sal_Bool to bool

Change-Id: I0b01f904f78ec1a3d1aebd2af2ae8f55588a504f

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index abea51a..a777f9f 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -46,10 +46,10 @@ class SW_DLLPUBLIC SwFmt : public SwModify
(is not hard attribution!!!) */
 sal_uInt16 nPoolHelpId;   ///< HelpId for this Pool-style.
 sal_uInt8 nPoolHlpFileId; ///< FilePos to Doc to these style helps.
-sal_Bool   bWritten : 1;  ///< TRUE: already written.
+bool   bWritten : 1;  ///< TRUE: already written.
 bool   bAutoFmt : 1;  /**< FALSE: it is a template.
default is true! */
-sal_Bool   bFmtInDTOR : 1;/**< TRUE: Format becomes deleted. In order 
to be able
+bool   bFmtInDTOR : 1;/**< TRUE: Format becomes deleted. In order to 
be able
to recognize this in FmtChg-message!! */
 sal_Bool   bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole 
paragraph
at format (UI-side!). */
@@ -101,7 +101,7 @@ public:
 virtual sal_uInt16 ResetAllFmtAttr();
 
 inline SwFmt* DerivedFrom() const { return (SwFmt*)GetRegisteredIn(); }
-inline sal_Bool IsDefault() const { return DerivedFrom() == 0; }
+inline bool IsDefault() const { return DerivedFrom() == 0; }
 
 inline OUString GetName() const   { return aFmtName; }
 void SetName( const OUString& rNewName, sal_Bool bBroadcast=sal_False );
@@ -152,7 +152,7 @@ public:
 { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
 
 /// Format-ID for reading/writing:
-void   ResetWritten(){ bWritten = sal_False; }
+void   ResetWritten(){ bWritten = false; }
 
 /// Query / set AutoFmt-flag.
 bool IsAuto() const { return bAutoFmt; }
@@ -168,7 +168,7 @@ public:
 sal_Bool IsAutoUpdateFmt() const{ return bAutoUpdateFmt; }
 void SetAutoUpdateFmt( sal_Bool bNew = sal_True )   { bAutoUpdateFmt = 
bNew; }
 
-sal_Bool IsFmtInDTOR() const { return bFmtInDTOR; }
+bool IsFmtInDTOR() const { return bFmtInDTOR; }
 
 /** GetMethods: Bool indicates whether to search only in Set (FALSE)
  or also in Parents.
@@ -306,7 +306,7 @@ public:
 
 @return false, default implementation
 */
-virtual sal_Bool IsBackgroundTransparent() const;
+virtual bool IsBackgroundTransparent() const;
 
 /** SwFmt::IsShadowTransparent
 
@@ -318,7 +318,7 @@ public:
 
 @return false, default implementation
 */
-virtual sal_Bool IsShadowTransparent() const;
+virtual bool IsShadowTransparent() const;
 };
 
 // --- inline Implementations 
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 29436cb..aa86dce 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -191,7 +191,7 @@ public:
 @return true, if background color is transparent, but not "no fill"
 or a existing background graphic is transparent.
 */
-virtual sal_Bool IsBackgroundTransparent() const;
+virtual bool IsBackgroundTransparent() const;
 
 /** SwFlyFrmFmt::IsBackgroundBrushInherited
 
@@ -204,7 +204,7 @@ public:
 
 @return true, if background brush is "inherited" from 
parent/grandparent
 */
-sal_Bool IsBackgroundBrushInherited() const;
+bool IsBackgroundBrushInherited() const;
 
 const Point & GetLastFlyFrmPrtRectPos() const   { return 
m_aLastFlyFrmPrtRectPos; }
 void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { 
m_aLastFlyFrmPrtRectPos = rPoint; }
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index d94f2d7..f7747e3 100644
--- a/sw/source/core/

[Libreoffice-commits] core.git: Branch 'feature/ia2.4' - 2 commits - winaccessibility/CustomTarget_ia2_idl.mk winaccessibility/source

2013-11-16 Thread David Ostrovsky 
 winaccessibility/CustomTarget_ia2_idl.mk |   20 ++--
 winaccessibility/source/UAccCOM/stdafx.h |8 
 2 files changed, 6 insertions(+), 22 deletions(-)

New commits:
commit e1d00a33a88ebc0600f12c0d5b6fe40962fbd047
Author: David Ostrovsky 
Date:   Sat Nov 16 22:29:12 2013 +0100

Disable _WIN32_WINNT definition

Change-Id: Ibfa5839700da5ec272c95199b09cd4265d82525d

diff --git a/winaccessibility/source/UAccCOM/stdafx.h 
b/winaccessibility/source/UAccCOM/stdafx.h
index 631c48d..b933b12 100644
--- a/winaccessibility/source/UAccCOM/stdafx.h
+++ b/winaccessibility/source/UAccCOM/stdafx.h
@@ -28,10 +28,10 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
+//#define STRICT
+//#ifndef _WIN32_WINNT
+//#define _WIN32_WINNT 0x0400
+//#endif
 //#define _ATL_APARTMENT_THREADED
 
 #include 
commit 5ab621e46cacc82db2c7840c8582249d147d5951
Author: David Ostrovsky 
Date:   Sat Nov 16 14:33:41 2013 +0100

Remove obsolete IDL files

Change-Id: I4f38c1ec815a5f2e39b492657cb0532bb4e19967

diff --git a/winaccessibility/CustomTarget_ia2_idl.mk 
b/winaccessibility/CustomTarget_ia2_idl.mk
index fc3fc46..92b5cc9 100755
--- a/winaccessibility/CustomTarget_ia2_idl.mk
+++ b/winaccessibility/CustomTarget_ia2_idl.mk
@@ -15,28 +15,12 @@ wina11y_SOURCE := 
$(SRCDIR)/winaccessibility/source/UAccCOMIDL
 # We cannot depend on *.tlb because they only produced by IDL compiler
 # if idl contains 'library' statement.
 $(call gb_CustomTarget_get_target,winaccessibility/ia2/idl) : \
-   $(wina11y_COMIDLDIR)/Accessible2.h \
-   $(wina11y_COMIDLDIR)/AccessibleAction.h \
-   $(wina11y_COMIDLDIR)/AccessibleApplication.h \
-   $(wina11y_COMIDLDIR)/AccessibleComponent.h \
-   $(wina11y_COMIDLDIR)/AccessibleEditableText.h \
-   $(wina11y_COMIDLDIR)/AccessibleEventId.h \
-   $(wina11y_COMIDLDIR)/AccessibleHyperlink.h \
-   $(wina11y_COMIDLDIR)/AccessibleHypertext.h \
-   $(wina11y_COMIDLDIR)/AccessibleImage.h \
$(wina11y_COMIDLDIR)/AccessibleKeyBinding.h \
$(wina11y_COMIDLDIR)/AccessibleKeyStroke.h \
-   $(wina11y_COMIDLDIR)/AccessibleRelation.h \
-   $(wina11y_COMIDLDIR)/AccessibleRole.h \
-   $(wina11y_COMIDLDIR)/AccessibleStates.h \
-   $(wina11y_COMIDLDIR)/AccessibleTable.h \
-   $(wina11y_COMIDLDIR)/AccessibleText.h \
-   $(wina11y_COMIDLDIR)/AccessibleValue.h \
$(wina11y_COMIDLDIR)/Charset.h \
-   $(wina11y_COMIDLDIR)/IA2CommonTypes.h \
-   $(wina11y_COMIDLDIR)/IA2TypeLibrary.h \
$(wina11y_COMIDLDIR)/UAccCOM.h \
-   $(wina11y_COMIDLDIR)/defines.h
+   $(wina11y_COMIDLDIR)/defines.h \
+   $(wina11y_COMIDLDIR)/ia2_api_all.h
 
 $(wina11y_COMIDLDIR)/%.h : $(wina11y_SOURCE)/%.idl \
| $(wina11y_COMIDLDIR)/.dir
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ia2 branch sucessfully integrated with trunk as rev 1542312

2013-11-16 Thread V Stuart Foote 
And of course this is on the "upstream" AOO project side, implementing and
IAccessible2 based native bridge for Windows.



--
View this message in context: 
http://nabble.documentfoundation.org/ia2-branch-sucessfully-integrated-with-trunk-as-rev-1542312-tp4083537p4083539.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

ia2 branch sucessfully integrated with trunk as rev 1542312

2013-11-16 Thread V Stuart Foote 
Steve Yin's ia2 branch has been successfully merged into trunk as rev
1542312,  nightly Windows buildbot build for 16 Nov #837 is functional with
a native Windows bridge provided by IAccessible2.

Please report any issues against AOO bugzilla issues  i107914
   and  winA11y
   for any Windows
accessibility issues.

The only issue of note needing attention thusfar  is  i123643
   that while one
aspect has been corrected, is not yet an acceptable solution for the
automated activation of Assistive Technology support on Windows -- (user
can't turn off their AT and retain use of AOO without deletion of .xcu
registry.




--
View this message in context: 
http://nabble.documentfoundation.org/ia2-branch-sucessfully-integrated-with-trunk-as-rev-1542312-tp4083537.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac download.lst

2013-11-16 Thread David Tardon 
 configure.ac |4 ++--
 download.lst |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c7bedbf124b4c903249ea78ba1f819e1e58d38f7
Author: David Tardon 
Date:   Sat Nov 16 20:32:43 2013 +0100

upload new libe-book

Force it as minimum version for system, as 0.0.1 is not usable
out-of-the-box.

Change-Id: Ic3205cf717b476f4f04777fc57032c0197bfbd84

diff --git a/configure.ac b/configure.ac
index fbac8ef..0de54c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7699,9 +7699,9 @@ AC_SUBST([LIBEOT_CFLAGS])
 AC_SUBST([LIBEOT_LIBS])
 
 dnl ===
-dnl Check for system libebook
+dnl Check for system libe-book
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.0],["-I${WORKDIR}/UnpackedTarball/libebook/inc"],["-L${WORKDIR}/UnpackedTarball/libebook/src/lib/.libs
 -le-book-0.0"])
+libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.0 >= 
0.0.2],["-I${WORKDIR}/UnpackedTarball/libebook/inc"],["-L${WORKDIR}/UnpackedTarball/libebook/src/lib/.libs
 -le-book-0.0"])
 
 dnl ===
 dnl Check for system libetonyek
diff --git a/download.lst b/download.lst
index f4a2206..757ddc2 100644
--- a/download.lst
+++ b/download.lst
@@ -1,7 +1,7 @@
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 74524e1eecc8ab3ac2e8e8a8bb75d6e4
-export EBOOK_TARBALL := libe-book-0.0.1.tar.bz2
+EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
+export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
 ETONYEK_MD5SUM := 040e0d7ce0cc0eb3a016964699d54a6c
 export ETONYEK_TARBALL := libetonyek-0.0.1.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Dev-Environment with Vagrant/VirtualBox?

2013-11-16 Thread bjoern 
Hi,

On Fri, Nov 15, 2013 at 08:37:51PM +0100, Michael Stahl wrote:
> given that a full debug build (which is what would make sense for a
> newbie) is 30 GB, let me take this opportunity to question Bjoern's
> sanity and/or request a don't-drink-and-post policy.

And a non-debug build is merely ~5GB uncompressed, and very helpful for most
first contributions, which is not that much compared to a 5-10GB Linux system
with LibreOffice build dependencies.

> also, a build will get outdated pretty soon anyway... what would be the
> benefit of a 2 month old build today with 4000 extra commits on master?

A first committer would most likely push a small patch to gerrit -- where most
of those can be easily rebased. We are talking about the first onboarding task,
someone using this wont start out with rewriting the Writer core, rather e.g.
covert one dialog to new style UI. This would work perfectly for those guys.

That said, yes, this would need to be updated and rebuild regularly (e.g. once
a month) in an automated way.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Dev-Environment with Vagrant/VirtualBox?

2013-11-16 Thread Andreas Mantke 
Hi,

Am 15.11.2013 20:37, schrieb Michael Stahl:
> On 15/11/13 19:56, bjoern wrote:
>> Hi Andreas,
>>
>> On Fri, Nov 15, 2013 at 07:19:02PM +0100, Andreas Mantke wrote:
>>> The environment should contain a Linux environment with the necessary
>>> tools installed, everything created from an vagrant script.
>>>
>>> I ask here before I start to work on the vagrant script if I should
>>> invest my time for that.
>>> t
>>> What do you think?
>> Such a "get started right away" environment would be quite valueable IMHO. If
>> we have a full Linux environment in it, it might make sense to have a
>> moderately recent checkout of master fully build in it, as it likely is not
>> that much extra space and really lets a developer start right away.
> given that a full debug build (which is what would make sense for a
> newbie) is 30 GB, let me take this opportunity to question Bjoern's
> sanity and/or request a don't-drink-and-post policy.
but the vagrant script and the VirtualBox-image need not to contain a
git checkout and a full debug build. The image should contain only a
clean environment with the necessary development tools.

I think the download of git checkout and creating a first LibreOffice
buildout (full debug) should be done live later.
>
> also, a build will get outdated pretty soon anyway... what would be the
> benefit of a 2 month old build today with 4000 extra commits on master?
>
If that would be part of the VirtualBox-image that would be true. But
that is not my intention.

Cheers,
Andreas

-- 
## Developer LibreOffice
## Freie Office-Suite für Linux, Mac, Windows
## http://LibreOffice.org
## Support the Document Foundation (http://documentfoundation.org)
## Meine Seite: http://www.amantke.de 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

2013-11-16 Thread David Tardon 
 vcl/source/gdi/embeddedfontshelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5b652a24e3b3e03fc1380257711b9ed7b0ecc8c7
Author: David Tardon 
Date:   Sat Nov 16 15:52:40 2013 +0100

fix build with --enable-eot

Change-Id: Ia4e5f3d5a47ff88e318d930261efdc90e08cde50

diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index b69be4e..56611d2 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -114,7 +114,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< 
io::XInputStream > st
 unsigned char *nakedPointerToUncompressedFont = NULL;
 libeot::EOTMetadata eotMetadata;
 libeot::EOTError uncompressError =
-libeot::eot2ttf_buffer( (const unsigned char *)&fontData[0], 
fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, 
&uncompressedFontSize ):
+libeot::eot2ttf_buffer( (const unsigned char *)&fontData[0], 
fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, 
&uncompressedFontSize );
 boost::shared_ptr uncompressedFont( 
nakedPointerToUncompressedFont, libeot::freeEOTBuffer );
 if( uncompressError != libeot::EOT_SUCCESS )
 {
@@ -134,7 +134,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< 
io::XInputStream > st
 }
 writtenTotal += written;
 }
-sufficientFontRights = libeot::canLegallyEdit( eotMetadata );
+sufficientFontRights = libeot::canLegallyEdit( &eotMetadata );
 libeot::EOTfreeMetadata( &eotMetadata );
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2013-11-16 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

tommy27  changed:

   What|Removed |Added

 Depends on||71584

--- Comment #19 from tommy27  ---
I add bug 71584 - FILEOPEN: FORMATTING: formatting error in a file with two
tables

Interestingly this old 4.0.x bug seems fixed in 4.1.3.2 but still affects the
4.2.x branch (including 4.2.0.0.alpha1+ Time: 2013-11-15_23:44:51)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: soltools/cpp

2013-11-16 Thread Jesús Corrius 
 soltools/cpp/_include.c |2 +-
 soltools/cpp/_macro.c   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d83e581fb5074c575e942115b6930b00a81b21dd
Author: Jesús Corrius 
Date:   Sat Nov 16 14:53:12 2013 +0100

Fix for VS 2013 compilation

I don´t know why it doesn´t work anymore, but the fix is trivial
may be related of using the Windows 8.0 SDK.

Change-Id: Ia09109b53d4f022a732ea781c98ddd4eb0c721d9

diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c
index 40ff092..7a9044b 100644
--- a/soltools/cpp/_include.c
+++ b/soltools/cpp/_include.c
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-#if defined(__IBMC__) || defined(__EMX__)
+#if defined(__IBMC__) || defined(__EMX__) || defined(_MSC_VER)
 #   include 
 #   define PATH_MAX _MAX_PATH
 #endif
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index 251a1f6..b86af10 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#if defined(__IBMC__) || defined(__EMX__)
+#if defined(__IBMC__) || defined(__EMX__) || defined(_MSC_VER)
 #   define PATH_MAX _MAX_PATH
 #endif
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/ia2.4'

2013-11-16 Thread David Ostrovsky 
New branch 'feature/ia2.4' available with the following commits:
commit bd02f3bfce81503d9a41f681447dcee503a2aa37
Author: David Ostrovsky 
Date:   Sat Nov 2 15:33:13 2013 +0100

Remove WNT define

Change-Id: Ia69141f58fad25797d7d7495a357dd18c7abf08d

commit ad8485b7e75a66c32f33b01e496afd575d02982f
Author: David Ostrovsky 
Date:   Sat Nov 2 20:40:47 2013 +0100

Gbuildify winaccessibility service

Conflicts:
winaccessibility/source/UAccCOM/UAccCOM.def
winaccessibility/source/service/AccObjectWinManager.cxx
winaccessibility/source/service/checkmt.cxx
winaccessibility/source/service/checkmt.hxx

Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c

commit 367209cb550a2f89f8bb118f84452e7315243ffa
Author: David Ostrovsky 
Date:   Sat Nov 2 15:44:00 2013 +0100

Gbuildify UAA to IA2 bridge

Change-Id: I1aae7ec50c3bb78ac1035d70eaf39c6efef465ab

commit 48cf6c01e518c430be569e75cf8a2d095eb1170b
Author: David Ostrovsky 
Date:   Sat Nov 2 11:07:01 2013 +0100

Add custom target to process IA2 COM idl files

Change-Id: Id20cba53fc21eaa396c3a3d3ed8fa1eb9fdb4978

commit db78117e3e906be17931b330567415ae13d5dbc9
Author: David Ostrovsky 
Date:   Sat Nov 2 11:01:44 2013 +0100

Add --enable-ia2 configuration option

Change-Id: I950c47bd95d5bb4aacf9e584c8e2eeef461af71f

commit 6188caef1f6fc968cb1f966e337178f064ee0f7f
Author: Michael Meeks 
Date:   Thu Nov 14 21:00:21 2013 +

Move to MPLv2 license headers, add modelines.

Change-Id: I895bab038eda82b80e1a223ad877a9674fe561ee

commit f64d6b750388b3af2649f30e0aec81c24ce32e58
Author: Steve Yin 
Date:   Thu Nov 14 08:18:05 2013 +

Integrate branch of IAccessible2

Just the winaccessibility directory initially.

Change-Id: Ia21abb8d7088646ad6c1f83b3a03e7add716b0c0

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source svx/source

2013-11-16 Thread Julien Nabet 
 sd/source/ui/view/drviewsa.cxx |3 +--
 svx/source/svdraw/svddrgmt.cxx |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 49ca17de76ba4a6396b9207a82d460cbae7c6d53
Author: Julien Nabet 
Date:   Sat Nov 16 13:17:09 2013 +0100

cppcheck: reduce scope

Change-Id: Ifa54cc132f0c6591c57639f85e789b08a60b7f4b

diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index a836a22..0d48e74 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -733,7 +733,6 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
 {
 SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
 SdrLayerID nLayer = 0, nOldLayer = 0;
-SdrLayer*  pLayer = NULL;
 SdrObject* pObj = NULL;
 const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
 sal_uLong nMarkCount = rMarkList.GetMarkCount();
@@ -759,7 +758,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
 // Append the layer name to the current page number.
 if( bOneLayer && nMarkCount )
 {
-pLayer = rLayerAdmin.GetLayerPerID( nLayer );
+SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer );
 if( pLayer )
 {
 aOUString += " (" ;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 73d13ea..5a6cba4 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1777,7 +1777,6 @@ SdrDragResize::SdrDragResize(SdrDragView& rNewView)
 void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
 {
 ImpTakeDescriptionStr(STR_DragMethResize, rStr);
-bool bEqual(aXFact == aYFact);
 Fraction aFact1(1,1);
 Point aStart(DragStat().GetStart());
 Point aRef(DragStat().GetRef1());
@@ -1800,6 +1799,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) 
const
 
 rStr += " (";
 
+bool bEqual(aXFact == aYFact);
 if(bX)
 {
 if(!bEqual)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/accessories

2013-11-16 Thread David Tardon 
 external/accessories/Module_accessories.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 37915c87aa64e850a9803b72bc1dcf939ae8f1e6
Author: David Tardon 
Date:   Sat Nov 16 12:18:28 2013 +0100

avoid gbuild warning

Change-Id: Idd034e3978c602e1e3dfcff5c1f3973c9dc5b6a9

diff --git a/external/accessories/Module_accessories.mk 
b/external/accessories/Module_accessories.mk
index ac05557..1b0b1cf 100644
--- a/external/accessories/Module_accessories.mk
+++ b/external/accessories/Module_accessories.mk
@@ -40,19 +40,22 @@ $(eval $(call gb_Module_add_targets,accessories,\
 endif
 
 ifeq ($(WITH_EXTRA_SAMPLE),YES)
-$(eval $(call gb_Module_add_targets,accessories,\
+$(eval $(call gb_Module_add_l10n_targets,accessories,\
AllLangPackage_accessoriessamples \
AllLangPackage_accessoriessamplesadvertisement \
AllLangPackage_accessoriessamplesdocumentation \
AllLangPackage_accessoriessamplesnonfree \
AllLangPackage_accessoriessamplesnonfreeadvertisement \
AllLangPackage_accessoriessamplesnonfreedocumentation \
+))
+
+$(eval $(call gb_Module_add_targets,accessories,\
UnpackedTarball_samples_pack \
 ))
 endif
 
 ifeq ($(WITH_EXTRA_TEMPLATE),YES)
-$(eval $(call gb_Module_add_targets,accessories,\
+$(eval $(call gb_Module_add_l10n_targets,accessories,\
AllLangPackage_accessoriestemplates \
AllLangPackage_accessoriestemplateseducate \
AllLangPackage_accessoriestemplatesfinance \
@@ -75,6 +78,9 @@ $(eval $(call gb_Module_add_targets,accessories,\
AllLangPackage_accessoriestemplatesoffimisc \
AllLangPackage_accessoriestemplatespersonal \
AllLangPackage_accessoriestemplatespresent \
+))
+
+$(eval $(call gb_Module_add_targets,accessories,\
ExternalPackage_accessoriestemplatescommon \
ExternalPackage_accessoriestemplatescommoneducate \
ExternalPackage_accessoriestemplatescommonfinance \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svgio/source

2013-11-16 Thread Julien Nabet 
 svgio/source/svgreader/svgnode.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 239c7020738717e4f1bcec6a29283aeae7796005
Author: Julien Nabet 
Date:   Sat Nov 16 12:21:57 2013 +0100

Remove special characters + some ascii art

Change-Id: Idddc1de6af624dd815f8f148912438e6f6dc43ae

diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index 128bccb..728905b 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-//
 
 namespace svgio
 {
@@ -179,7 +178,7 @@ namespace svgio
 {
 const sal_uInt32 nAttributes(xAttribs->getLength());
 // #i122522# SVG defines that 'In general, this means that the 
presentation attributes have
-// lower priority than other CSS style rules specified in author 
style sheets or ‘style’
+// lower priority than other CSS style rules specified in author 
style sheets or style
 // attributes.' in 
http://www.w3.org/TR/SVG/styling.html#UsingPresentationAttributes
 // (6.4 Specifying properties using the presentation attributes 
SVG 1.1). That means that
 // e.g. font-size will appear as presentation attribute and CSS 
style attribute. In these
@@ -582,7 +581,5 @@ namespace svgio
 } // end of namespace svgreader
 } // end of namespace svgio
 
-//
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-16 Thread Laurent Balland-Poirier 
 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 06d2d3290acb5dd3200481b85baf7c5718ea177c
Author: Laurent Balland-Poirier 
Date:   Tue Nov 12 20:55:21 2013 +0100

fdo#35712 Correct update of equation in status bar

Change-Id: I6db5628bbad337f70e3a39a4c65afbd0f6c30a9d
Reviewed-on: https://gerrit.libreoffice.org/6658
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 9b0fdc9..7491316 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -559,6 +559,18 @@ OUString ObjectNameProvider::getHelpText( const OUString& 
rObjectCID, const Refe
 try
 {
 Reference< chart2::XRegressionCurveCalculator > 
xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
+sal_Int32 aDegree = 2;
+sal_Bool aForceIntercept = false;
+double aInterceptValue = 0.0;
+uno::Reference< beans::XPropertySet > xProperties( 
xCurve, uno::UNO_QUERY );
+if ( xProperties.is())
+{
+xProperties->getPropertyValue( 
"PolynomialDegree") >>= aDegree;
+xProperties->getPropertyValue( 
"ForceIntercept") >>= aForceIntercept;
+if (aForceIntercept)
+xProperties->getPropertyValue( 
"InterceptValue") >>= aInterceptValue;
+}
+xCalculator->setRegressionProperties(aDegree, 
aForceIntercept, aInterceptValue, 2);
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
 // replace formula
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2013-11-16 Thread David Tardon 
 configure.ac |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 40b2a899d5bcba98be371a93c635d04d36ff2c2b
Author: David Tardon 
Date:   Sat Nov 16 11:20:27 2013 +0100

fail if avahi is not found

If I configure with --enable-avahi, presumably I want the code to be
built with avahi support...

diff --git a/configure.ac b/configure.ac
index 0ef3f53..fbac8ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11700,11 +11700,9 @@ dnl Test whether to use avahi
 dnl ===
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_avahi" = "yes"; 
then
 PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6.10],
-  [ENABLE_AVAHI="TRUE"], [ENABLE_AVAHI=""])
-if test "$ENABLE_AVAHI" = "TRUE"; then
-AC_DEFINE(HAVE_FEATURE_AVAHI)
-AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
-fi
+  [ENABLE_AVAHI="TRUE"])
+AC_DEFINE(HAVE_FEATURE_AVAHI)
+AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 fi
 
 AC_SUBST(ENABLE_AVAHI)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/lgodard/calc_notes_import_export' - dictionaries helpcontent2 sc/source xmloff/source

2013-11-16 Thread Laurent Godard 
 dictionaries   |2 
 helpcontent2   |2 
 sc/source/filter/xml/xmlexprt.cxx  |  166 -
 sc/source/filter/xml/xmlexprt.hxx  |2 
 xmloff/source/draw/shapeexport.cxx |5 -
 5 files changed, 46 insertions(+), 131 deletions(-)

New commits:
commit 7d704d28c3a16e1378943c9af962c9b51defc4e0
Author: Laurent Godard 
Date:   Fri Nov 15 18:04:29 2013 +0100

export notes bottlenecks

- annotation autostyles
- write EditText xml in the annotation reusing existing class

Change-Id: Iddfabde8d76316fdc8ca2f4284dbd5d70aa1f722

diff --git a/dictionaries b/dictionaries
index c6f4f79..a32a341 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c6f4f79b596756f5d45c5264a49232e491b9cd78
+Subproject commit a32a341efdbb9e53a7b832262a41f6fb6454bedf
diff --git a/helpcontent2 b/helpcontent2
index 086ca60..4ae80c4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 086ca602232837bc9c80800487c57e35e242fe7a
+Subproject commit 4ae80c49646df353bada547f4755593bf1a6b209
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 5454438..995f75a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1366,6 +1366,41 @@ void ScXMLExport::ExportCellTextAutoStyles(sal_Int32 
nTable)
 
GetProgressBarHelper()->ChangeReference(GetProgressBarHelper()->GetReference() 
+ nCellCount);
 }
 
+void ScXMLExport::ExportAnnotationsTextAutoStyles()
+{
+UniReference xMapper = 
GetTextParagraphExport()->GetTextPropMapper()->getPropertySetMapper();
+UniReference xStylePool = GetAutoStylePool();
+const ScXMLEditAttributeMap& rAttrMap = GetEditAttributeMap();
+
+std::vector aEntries;
+pDoc->GetAllNoteEntries(aEntries);
+std::vector::const_iterator it = aEntries.begin(), 
itEnd = aEntries.end();
+for (; it != itEnd; ++it)
+{
+const ScPostIt& pNote = *it->mpNote;
+const EditTextObject* pEdit = pNote.GetEditTextObject();
+
+std::vector aAttrs;
+pEdit->GetAllSections(aAttrs);
+if (aAttrs.empty())
+continue;
+
+std::vector::const_iterator itSec = 
aAttrs.begin(), itSecEnd = aAttrs.end();
+for (; itSec != itSecEnd; ++itSec)
+{
+const std::vector& rSecAttrs = 
itSec->maAttributes;
+if (rSecAttrs.empty())
+// No formats applied to this section. Skip it.
+continue;
+
+std::vector aPropStates;
+toXMLPropertyStates(aPropStates, rSecAttrs, xMapper, rAttrMap);
+if (!aPropStates.empty())
+xStylePool->Add(XML_STYLE_FAMILY_TEXT_TEXT, OUString(), 
aPropStates, false);
+}
+}
+}
+
 void ScXMLExport::WriteRowContent()
 {
 ScMyRowFormatRange aRange;
@@ -2404,126 +2439,8 @@ void ScXMLExport::_ExportAutoStyles()
 }
 
 // stored styles for notes
-
-UniReference xShapeMapper = 
XMLShapeExport::CreateShapePropMapper( *this );
-GetShapeExport(); // make sure the graphics styles family is added
-
-const std::vector& rNoteEntries = 
pSheetData->GetNoteStyles();
-std::vector::const_iterator aNoteIter = 
rNoteEntries.begin();
-std::vector::const_iterator aNoteEnd = 
rNoteEntries.end();
-while (aNoteIter != aNoteEnd)
-{
-ScAddress aPos = aNoteIter->maCellPos;
-SCTAB nTable = aPos.Tab();
-bool bCopySheet = pDoc->IsStreamValid( nTable );
-if (bCopySheet)
-{
-//! separate method AddStyleFromNote needed?
-
-ScPostIt* pNote = pDoc->GetNote(aPos);
-OSL_ENSURE( pNote, "note not found" );
-if (pNote)
-{
-SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( 
aPos );
-// all uno shapes are created anyway in 
CollectSharedData
-Reference xShapeProperties( 
pDrawObj->getUnoShape(), uno::UNO_QUERY );
-if (xShapeProperties.is())
-{
-if ( !aNoteIter->maStyleName.isEmpty() )
-{
-std::vector 
xPropStates(xShapeMapper->Filter(xShapeProperties));
-OUString sParent;
-OUString sName( aNoteIter->maStyleName );
-GetAutoStylePool()->AddNamed(sName, 
XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates);
-
GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName);
-}
-if ( !aNoteIter->maTe

[Libreoffice-commits] core.git: configure.ac

2013-11-16 Thread Tor Lillqvist 
 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b1ab93642d770e35a3bf4ba4b41c17dd27382eb5
Author: Tor Lillqvist 
Date:   Sat Nov 16 11:57:31 2013 +0200

Fix up help message for --enable-64-bit

Change-Id: Ie3646a1af8663683535642e42118cd39c349a94c

diff --git a/configure.ac b/configure.ac
index 50101b7..0ef3f53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1155,9 +1155,9 @@ AC_ARG_ENABLE(ccache,
 
 AC_ARG_ENABLE(64-bit,
 AS_HELP_STRING([--enable-64-bit],
-[Build a 64-bit LibreOffice on platforms where the normal and only 
supported build
- is 32-bit. In other words, this option is experimental and possibly 
quite broken,
- use only if you are hacking on 64-bit support.]), ,)
+[Build a 64-bit LibreOffice on platforms where the normal build is 
32-bit. Works fine for OS
+ X. In other cases this option is experimental and possibly quite 
broken, use only if you are
+ hacking on 64-bit support.]), ,)
 
 AC_ARG_ENABLE(extra-gallery,
 AS_HELP_STRING([--enable-extra-gallery],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2013-11-16 Thread Tor Lillqvist 
 configure.ac |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 9127dede48fdcccad2232fa7bdff781c6b033d8b
Author: Tor Lillqvist 
Date:   Sat Nov 16 11:54:04 2013 +0200

Fix up help message for --enable-lto

Change-Id: I8f81c37df4751bc6cafc31e1624197477701569b

diff --git a/configure.ac b/configure.ac
index 9544ab7..50101b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -925,12 +925,11 @@ AC_ARG_ENABLE(ooenv,
 
 AC_ARG_ENABLE(lto,
 AS_HELP_STRING([--enable-lto],
-[Enable link-time optimization. Suitable for product builds.
- Building takes longer but libraries and executables are optimized for 
speed.
- (For GCC, best to use GCC 4.6 or later and 'gold' linker.
-  Also possible for Clang.
-  Experimental work in progress,
-  don't use unless you are working on this.)]))
+[Enable link-time optimization. Suitable for (optimised) product 
builds. Building might take
+ longer but libraries and executables are optimized for speed. (For 
GCC, best to use GCC 4.6
+ or later and 'gold' linker. Works fine (and is turned on 
automatically in an optimising
+ build) for MSVC, otherwise experimental work in progress that 
shouldn't be used unless you
+ are working on it.)]))
 
 AC_ARG_ENABLE(crashdump,
 AS_HELP_STRING([--enable-crashdump],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source

2013-11-16 Thread Julien Nabet 
 forms/source/xforms/datatypes.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ea65db333422e58b8af1e4d5faff0849d856c37
Author: Julien Nabet 
Date:   Sat Nov 16 10:52:45 2013 +0100

cppcheck: Array index is used before limits check

Change-Id: I30154dd9504b70dc3212af3ac1d88dfc9a9d8396

diff --git a/forms/source/xforms/datatypes.cxx 
b/forms/source/xforms/datatypes.cxx
index f2fdb79..0c24ace 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -691,7 +691,7 @@ namespace xforms
 sal_Int32 nTotalDigits = 0;
 sal_Int32 nFractionDigits = 0;
 const sal_Unicode* pValue = rValue.getStr();
-for( ; pValue[n] != '.' && n < nLength; n++ )
+for( ; n < nLength && pValue[n] != '.'; n++ )
 if( pValue[n] >= '0'
 && pValue[n] <= '9')
 nTotalDigits++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2013-11-16 Thread Tor Lillqvist 
> This once again shows how harmful it is to have tons of configuration
> options.

And before somebody else replies "but you have yourself introduced
several 'experimental' configuration options": Sure I need to be
re-educated.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

2013-11-16 Thread Julien Nabet 
 sc/source/core/opencl/formulagroupcl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2884fd3765e6e527d12543070c1a882052657df
Author: Julien Nabet 
Date:   Sat Nov 16 10:46:50 2013 +0100

cppcheck: Prefer prefix ++/-- operators for non-primitive types

Change-Id: I453118a27de9484f318f8988a41cda1e809db1a7

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 23b7a71..c795a65 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2025,13 +2025,13 @@ public:
 decl << publicFunc;
 DK->DumpInlineFun(inlineDecl,inlineFun);
 for(std::set::iterator set_iter=inlineDecl.begin();
- set_iter!=inlineDecl.end();set_iter++)
+ set_iter!=inlineDecl.end();++set_iter)
 {
 decl<<*set_iter;
 }
 
 for(std::set::iterator set_iter=inlineFun.begin();
- set_iter!=inlineFun.end();set_iter++)
+ set_iter!=inlineFun.end();++set_iter)
 {
 decl<<*set_iter;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2013-11-16 Thread Julien Nabet 
 sc/source/core/opencl/openclwrapper.cxx |   31 +++
 1 file changed, 11 insertions(+), 20 deletions(-)

New commits:
commit fce8058a30b900c1c49498eaa3b22e2784e2eb61
Author: Julien Nabet 
Date:   Sat Nov 16 10:44:29 2013 +0100

cppcheck: some cleaning + use CHECK_OPENCL

Change-Id: I94d55c196f8bee8d770889015aaa43899183ca9a

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 70a9e00..d7719dd 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -563,43 +563,34 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
 cl_int clStatus;
 cl_uint numPlatforms, numDevices;
 cl_platform_id *platforms;
-cl_context_properties cps[3];
-char platformName[256];
-unsigned int i;
 
 // Have a look at the available platforms.
 
 if ( !gpuInfo->mnIsUserCreated )
 {
 clStatus = clGetPlatformIDs( 0, NULL, &numPlatforms );
-if ( clStatus != CL_SUCCESS )
-{
-return 1;
-}
+CHECK_OPENCL(clStatus, "clGetPlatformIDs");
 gpuInfo->mpPlatformID = NULL;
 
 if ( 0 < numPlatforms )
 {
+char platformName[256];
 platforms = (cl_platform_id*) malloc( numPlatforms * sizeof( 
cl_platform_id ) );
-if ( platforms == (cl_platform_id*) NULL )
+if (!platforms)
 {
 return 1;
 }
 clStatus = clGetPlatformIDs( numPlatforms, platforms, NULL );
+CHECK_OPENCL(clStatus, "clGetPlatformIDs");
 
-if ( clStatus != CL_SUCCESS )
-{
-return 1;
-}
-
-for ( i = 0; i < numPlatforms; i++ )
+for ( unsigned int i = 0; i < numPlatforms; i++ )
 {
 clStatus = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR,
 sizeof( platformName ), platformName, NULL );
 
 if ( clStatus != CL_SUCCESS )
 {
-return 1;
+break;
 }
 gpuInfo->mpPlatformID = platforms[i];
 
@@ -630,14 +621,15 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
 break;
 }
 }
+free( platforms );
 if ( clStatus != CL_SUCCESS )
 return 1;
-free( platforms );
 }
 if ( NULL == gpuInfo->mpPlatformID )
 return 1;
 
 // Use available platform.
+cl_context_properties cps[3];
 cps[0] = CL_CONTEXT_PLATFORM;
 cps[1] = (cl_context_properties) gpuInfo->mpPlatformID;
 cps[2] = 0;
@@ -676,17 +668,16 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
 // Now, get the device list data
 clStatus = clGetContextInfo( gpuInfo->mpContext, CL_CONTEXT_DEVICES, 
length,
gpuInfo->mpArryDevsID, NULL );
-if ( clStatus != CL_SUCCESS )
-return 1;
+CHECK_OPENCL(clStatus, "clGetContextInfo");
 
 // Create OpenCL command queue.
 gpuInfo->mpCmdQueue = clCreateCommandQueue( gpuInfo->mpContext, 
gpuInfo->mpArryDevsID[0], 0, &clStatus );
 
-if ( clStatus != CL_SUCCESS )
-return 1;
+CHECK_OPENCL(clStatus, "clCreateCommandQueue");
 }
 
 clStatus = clGetCommandQueueInfo( gpuInfo->mpCmdQueue, 
CL_QUEUE_THREAD_HANDLE_AMD, 0, NULL, NULL );
+CHECK_OPENCL(clStatus, "clGetCommandQueueInfo");
 
 bool bKhrFp64 = false;
 bool bAmdFp64 = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2013-11-16 Thread Tor Lillqvist 
> + turn on mergedlibs & LTO for Windows - any objections ? (Michael)

Jesús already replied about the LTO bit, thanks for reviewing.

As for --enable-mergelibs, it doesn't look good. Apparently that has
never been tried for Windows? Or at least not recently? The option has
a help message which says it works for Linux only. OK, it mentioned
Android, too, which was wrong information, so maybe the lack of
mention of Windows is also just a mistake, and mergelibs has worked
for Windows at some stage? (We do build one single "merged" library
for each Android app (and one single "merged" executable for each iOS
app), but not using the "mergelibs" mechanism.)

Anyway, I tried building on Windows with --enable-mergelibs=all, did
not succeed. Build stops when linking the chartcontrollerlo library,
no imerged.lib found. And indeed I don't see any *merge*.lib anywhere
in workdir or instdir.

This once again shows how harmful it is to have tons of configuration
options. They don't get tested and bit-rot. Each binary option doubles
the number of possible configurations. If some change in how LO is
built is good, then we should just do it, unconditionally (on some or
all platforms, depending on case), not make it into an option that
will bit-rot.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2013-11-16 Thread Jesús Corrius 
>
>
> + turn on mergedlibs & LTO for Windows - any objections ? (Michael)
> AI: + turn on & see how it goes for 4.2 (Tor)
> + Thanks to Jesus for offering to review vs. 2010
>


Compiled master using Visual Studio 2010 Professional Edition with LTO.
Slower compilation but interesting effects on the generated binaries (in
some of the smallest ones significant size reduction). Cool stuff. But it's
difficult to see any improvements without profiling the application before
and after.

Pushed into master as it is trivial to disable if there are any regressions
(none found by me so far).

-- 
Jesús Corrius 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: junit autogen error?

2013-11-16 Thread Tor Lillqvist 
For me it works if I point the --with-junit to an older junit jar
file, not a "too new" one.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/lgodard/calc_notes_import_export' - 0 commits -

2013-11-16 Thread Laurent Godard 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2013-11-16 Thread Tor Lillqvist 
 configure.ac |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 18f9424ed77c27411f73dfad2be8e3b4ad97001f
Author: Tor Lillqvist 
Date:   Tue Nov 12 15:50:50 2013 +0200

Turn on LTO for MSVC when optimising unless told not to

Change-Id: Ifdb04238d02ff504bd517508851e93211d748b7d
Reviewed-on: https://gerrit.libreoffice.org/6652
Reviewed-by: Jesús Corrius 
Tested-by: Jesús Corrius 

diff --git a/configure.ac b/configure.ac
index 875c434..9544ab7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2495,6 +2495,12 @@ COMPATH=`echo $COMPATH | $SED 
"s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`
 # Set the ENABLE_LTO variable
 # ===
 AC_MSG_CHECKING([whether to use link-time optimization])
+if test $_os = WINNT -a "$WITH_MINGW" != yes -a -z "$enable_lto" -a \
+\( -z "$enable_dbgutil" -o "$enable_dbgutil" = no \) -a \
+\( -z "$enable_debug" -o "$enable_debug" = no \); then
+# Turn on LTO for MSVC when optimising unless told not to
+enable_lto=yes
+fi
 if test -n "$enable_lto" -a "$enable_lto" != "no"; then
 ENABLE_LTO="TRUE"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/lgodard/calc_notes_import_export'

2013-11-16 Thread Laurent Godard 
New branch 'private/lgodard/calc_notes_import_export' available with the 
following commits:
commit 05eea7bc54fe51a7762253ab5869033001d1a066
Author: Laurent Godard 
Date:   Fri Nov 15 18:04:29 2013 +0100

export notes bottlenecks

- annotation autostyles
- write EditText xml in the annotation reusing existing class

Change-Id: Iddfabde8d76316fdc8ca2f4284dbd5d70aa1f722

commit ea2c91a15d9e8374b2c05cc34af12021f1b1c313
Author: Laurent Godard 
Date:   Fri Nov 8 13:53:23 2013 +0100

refactoring annotations import

consume RichText annotation content outside xshape

Change-Id: If427a5dba1c82a91fd5faa0aacee5ce7d04a581c

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: junit autogen error?

2013-11-16 Thread Alexander Thurgood 
Le 15/11/13 13:48, Noel Grandin a écrit :

Hi Noel,



> You need to do:
> 
> ./autogen.sh --with-junit=/opt/local/share/java/junit-4.jar
> 
> or whatever your jar file name is.
> 

Having tried this for a while the day before yesterday on OSX Mavericks,
with the latest hamcrest or junit from the project's download page, I
can confirm that I couldn't get this to work either.


Alex


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source

2013-11-16 Thread Ray 
 sc/source/core/opencl/formulagroupcl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 004dbafbd700b6074f20b3061d0e25e169132b3e
Author: I-Jui (Ray) Sung 
Date:   Sat Nov 16 02:09:18 2013 -0600

GPU Calc: pass the right argument size for reduction kernels in SumIfs

Change-Id: Ib8fab8eacddbeb37795ad45f026559bdde0d43f7

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 64fe95e..36517c7 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -192,6 +192,7 @@ public:
 throw OpenCLError(err);
 return 1;
 }
+virtual cl_mem GetCLBuffer(void) const { return NULL; }
 };
 
 class DynamicKernelPiArgument: public DynamicKernelArgument
@@ -1060,7 +1061,8 @@ public:
 
 // set kernel arg of reduction kernel
 for (size_t j=0; j< vclmem.size(); j++){
-err = clSetKernelArg(redKernel, j, sizeof(cl_mem),
+err = clSetKernelArg(redKernel, j,
+vclmem[j]?sizeof(cl_mem):sizeof(double),
 (void *)&vclmem[j]);
 if (CL_SUCCESS != err)
 throw OpenCLError(err);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits