Re: minutes of ESC call ...

[David Tardon]

Hi,

On Sat, Nov 16, 2013 at 11:40:31AM +0200, Tor Lillqvist wrote:
> > + turn on mergedlibs & LTO for Windows - any objections ? (Michael)
> 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.

Incidentally, this does not work on Linux either.

D.
___
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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx|   13 ++---
 sc/source/core/opencl/formulagroupcl_public.hxx |1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 77cb1767f723e2a3a07c6cb75ff46bef26eb82db
Author: I-Jui (Ray) Sung 
Date:   Tue Nov 19 00:22:23 2013 -0600

GPU Calc: add an inline function to legalize inputs for reduction.

Change-Id: Ibcede4a33d7b8b1073d6ecfb49abbc78b31a2f35

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 7e61822..2d806aa 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -470,11 +470,18 @@ public:
 ss << "int loopOffset = l*512;\n";
 ss << "if((loopOffset + lidx + offset + 256) < min( offset + 
windowSize, arrayLength))\n";
 ss << "tmp = ";
-ss << mpCodeGen->Gen2("fsum(A[loopOffset + lidx + offset], 0)",
-"fsum(A[loopOffset + lidx + offset + 256], 0)");
+ss << mpCodeGen->Gen2(
+std::string(
+"legalize(A[loopOffset + lidx + offset], ")+
+mpCodeGen->GetBottom() +")",
+std::string(
+"legalize(A[loopOffset + lidx + offset + 256], ")+
+mpCodeGen->GetBottom() +")"
+);
 ss << ";";
 ss << "else if ((loopOffset + lidx + offset) < min(offset + 
windowSize, arrayLength))\n";
-ss << "tmp = fsum(A[loopOffset + lidx + offset], 0);\n";
+ss << "tmp = legalize(A[loopOffset + lidx + offset],";
+ss << mpCodeGen->GetBottom() << ");\n";
 ss << "shm_buf[lidx] = tmp;\n";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "for (int i = 128; i >0; i/=2) {\n";
diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx 
b/sc/source/core/opencl/formulagroupcl_public.hxx
index e50de37..ccee5e1 100644
--- a/sc/source/core/opencl/formulagroupcl_public.hxx
+++ b/sc/source/core/opencl/formulagroupcl_public.hxx
@@ -12,6 +12,7 @@
 
 const char* publicFunc =
  "int isNan(double a) { return a != a; }\n"
+ "double legalize(double a, double b) { return isNan(a)?b:a; }\n"
  "double fsum(double a, double b) { return isNan(a)?b:a+b; }\n"
  "double fsub(double a, double b) { return a-b; }\n"
  "double fdiv(double a, double b) { return a/b; }\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx |  246 ++-
 1 file changed, 240 insertions(+), 6 deletions(-)

New commits:
commit 71f3f362fd857f5b8095ca24217fe98560e7c0ae
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 23:19:15 2013 -0600

GPU Calc: unrolling of sequential reduction loops for DoubleVectorRefs

Change-Id: I749da2d08a09ead56f0b151a317052b8960926ca

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 4946dfd..037760e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -41,6 +41,8 @@
 
 #include 
 
+#define UNROLLING
+
 using namespace formula;
 
 namespace sc { namespace opencl {
@@ -435,7 +437,7 @@ public:
 dynamic_cast(mpCodeGen.get()) ||
 dynamic_cast(mpCodeGen.get()) ||
 dynamic_cast(mpCodeGen.get()))
-return GetWindowSize()> 4 &&
+return GetWindowSize()> 100 &&
 ( (GetStartFixed() && GetEndFixed()) ||
   (!GetStartFixed() && !GetEndFixed())  ) ;
 else
@@ -529,8 +531,9 @@ public:
 }
 }
 }
+// original for loop
+#ifndef UNROLLING
 needBody = true;
-
 // No need to generate a for-loop for degenerated cases
 if (nCurWindowSize == 1)
 {
@@ -573,9 +576,132 @@ public:
 std::min(mpDVR->GetArrayLength(), nCurWindowSize);
 ss << "0; i < "<< limit << "; i++){\n\t\t";
 }
+return nCurWindowSize;
+#endif
 
-return nCurWindowSize;
-}
+
+
+#ifdef UNROLLING
+{
+if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed()) {
+ss << "for (int i = ";
+ss << "gid0; i < " << mpDVR->GetArrayLength();
+ss << " && i < " << nCurWindowSize  << "; i++){\n\t\t";
+needBody = true;
+return nCurWindowSize;
+} else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed()) {
+ss << "for (int i = ";
+ss << "0; i < " << mpDVR->GetArrayLength();
+ss << " && i < gid0+"<< nCurWindowSize << "; i++){\n\t\t";
+needBody = true;
+return nCurWindowSize;
+} else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed()){
+ss << "tmpBottom = " << mpCodeGen->GetBottom() << ";\n\t";
+ss << "{int i;\n\t";
+std::stringstream temp1,temp2;
+int outLoopSize = 16;
+if ( nCurWindowSize/outLoopSize != 0){
+ss << "for(int outLoop=0; outLoop<" << 
nCurWindowSize/outLoopSize<< "; outLoop++){\n\t";
+for(int count=0; count < outLoopSize; count++){
+ss << "i = outLoop*"IsStartFixed() && mpDVR->IsEndFixed())
+  

[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.

[bugzilla-daemon]

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

--- Comment #20 from Bob Harvey  ---
(In reply to comment #18)

> I think the point is just to keep superscript, subscript, underline, italic
> and bold character formatting. Or am I missing the point?


I think that's nearly true, but I would generalise to keep /all/ immediate
formatting applied over and above the original text's intrinisc style.  so
perhaps the casting of a single character into a different font for some reason
might be included too, or perhaps the modification of text colour for some
bizzare reason.

-- 
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: Branch 'feature/calc-group-interpreter-4' - sc/source

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx |  246 ++-
 1 file changed, 240 insertions(+), 6 deletions(-)

New commits:
commit d8b52aa7bc79bb2663841d040629aae97710c87a
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 23:19:15 2013 -0600

GPU Calc: unrolling of sequential reduction loops for DoubleVectorRefs

Change-Id: I749da2d08a09ead56f0b151a317052b8960926ca

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index c518cf4..7e61822 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -41,6 +41,8 @@
 
 #include 
 
+#define UNROLLING
+
 using namespace formula;
 
 namespace sc { namespace opencl {
@@ -435,7 +437,7 @@ public:
 dynamic_cast(mpCodeGen.get()) ||
 dynamic_cast(mpCodeGen.get()) ||
 dynamic_cast(mpCodeGen.get()))
-return GetWindowSize()> 4 &&
+return GetWindowSize()> 100 &&
 ( (GetStartFixed() && GetEndFixed()) ||
   (!GetStartFixed() && !GetEndFixed())  ) ;
 else
@@ -529,8 +531,9 @@ public:
 }
 }
 }
+// original for loop
+#ifndef UNROLLING
 needBody = true;
-
 // No need to generate a for-loop for degenerated cases
 if (nCurWindowSize == 1)
 {
@@ -573,9 +576,132 @@ public:
 std::min(mpDVR->GetArrayLength(), nCurWindowSize);
 ss << "0; i < "<< limit << "; i++){\n\t\t";
 }
+return nCurWindowSize;
+#endif
 
-return nCurWindowSize;
-}
+
+
+#ifdef UNROLLING
+{
+if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed()) {
+ss << "for (int i = ";
+ss << "gid0; i < " << mpDVR->GetArrayLength();
+ss << " && i < " << nCurWindowSize  << "; i++){\n\t\t";
+needBody = true;
+return nCurWindowSize;
+} else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed()) {
+ss << "for (int i = ";
+ss << "0; i < " << mpDVR->GetArrayLength();
+ss << " && i < gid0+"<< nCurWindowSize << "; i++){\n\t\t";
+needBody = true;
+return nCurWindowSize;
+} else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed()){
+ss << "tmpBottom = " << mpCodeGen->GetBottom() << ";\n\t";
+ss << "{int i;\n\t";
+std::stringstream temp1,temp2;
+int outLoopSize = 16;
+if ( nCurWindowSize/outLoopSize != 0){
+ss << "for(int outLoop=0; outLoop<" << 
nCurWindowSize/outLoopSize<< "; outLoop++){\n\t";
+for(int count=0; count < outLoopSize; count++){
+ss << "i = outLoop*"IsStartFixed() && mpDVR->IsEndFixed())
+  

Minutes of the QA Call - 2013-11-18

[Robinson Tryon]

Hello, hello!

Minutes from the QA Call today are available (as always) on the wiki:
https://wiki.documentfoundation.org/QA/Meetings/2013/November_18

We had another marvelous turnout and lots of great input from some new
faces. I'm excited to announce that we dropped our UNCONFIRMED bug
count down 45 bugs from our last QA Call (1189 -> 1144). We're hoping
to drop the UNCONFIRMED bug count even *further* for our next QA call,
which will happen in two weeks:
https://wiki.documentfoundation.org/QA/Meetings/2013/December_02

Cheers,
--R
___
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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx|6 --
 sc/source/core/opencl/formulagroupcl_public.hxx |8 
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 4b02e8daed896714962bd8fcbe592bebd94a76bd
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 19:26:48 2013 -0600

GPU Calc: add compile time option for using fmin/fmax intrinsics

Change-Id: I791d6c8f4335ab2c2618529f2e3d22d59c4f0b5a

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 46c8224..c518cf4 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -24,6 +24,8 @@
 #include "op_logical.hxx"
 #include "op_statistical.hxx"
 #include "op_array.hxx"
+// Comment out this to turn off FMIN and FMAX intrinsics
+#define USE_FMIN_FMAX 1
 #include "formulagroupcl_public.hxx"
 
 #include 
@@ -1038,7 +1040,7 @@ public:
 virtual std::string GetBottom(void) { return "MAXFLOAT"; }
 virtual std::string Gen2(const std::string &lhs, const std::string &rhs) 
const
 {
-return "fmin("+lhs + "," + rhs +")";
+return "mcw_fmin("+lhs + "," + rhs +")";
 }
 virtual std::string BinFuncName(void) const { return "min"; }
 };
@@ -1048,7 +1050,7 @@ public:
 virtual std::string GetBottom(void) { return "-MAXFLOAT"; }
 virtual std::string Gen2(const std::string &lhs, const std::string &rhs) 
const
 {
-return "fmax("+lhs + "," + rhs +")";
+return "mcw_fmax("+lhs + "," + rhs +")";
 }
 virtual std::string BinFuncName(void) const { return "max"; }
 };
diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx 
b/sc/source/core/opencl/formulagroupcl_public.hxx
index 996c898..e50de37 100644
--- a/sc/source/core/opencl/formulagroupcl_public.hxx
+++ b/sc/source/core/opencl/formulagroupcl_public.hxx
@@ -16,6 +16,14 @@ const char* publicFunc =
  "double fsub(double a, double b) { return a-b; }\n"
  "double fdiv(double a, double b) { return a/b; }\n"
  "double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }\n"
+#ifdef USE_FMIN_FMAX
+ "double mcw_fmin(double a, double b) { return fmin(a, b); }\n"
+ "double mcw_fmax(double a, double b) { return fmax(a, b); }\n"
+#else
+ "double mcw_fmin(double a, double b) { return a>b?b:a; }\n"
+ "double mcw_fmax(double a, double b) { return a>b?a:b; }\n"
+#endif
+
  ;
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx|6 --
 sc/source/core/opencl/formulagroupcl_public.hxx |8 
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit b09356c2719947b0a5a112e0c9edc11995c75abb
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 19:26:48 2013 -0600

GPU Calc: add compile time option for using fmin/fmax intrinsics

Change-Id: I791d6c8f4335ab2c2618529f2e3d22d59c4f0b5a

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 8c1f42b..4946dfd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -24,6 +24,8 @@
 #include "op_logical.hxx"
 #include "op_statistical.hxx"
 #include "op_array.hxx"
+// Comment out this to turn off FMIN and FMAX intrinsics
+#define USE_FMIN_FMAX 1
 #include "formulagroupcl_public.hxx"
 
 #include 
@@ -1038,7 +1040,7 @@ public:
 virtual std::string GetBottom(void) { return "MAXFLOAT"; }
 virtual std::string Gen2(const std::string &lhs, const std::string &rhs) 
const
 {
-return "fmin("+lhs + "," + rhs +")";
+return "mcw_fmin("+lhs + "," + rhs +")";
 }
 virtual std::string BinFuncName(void) const { return "min"; }
 };
@@ -1048,7 +1050,7 @@ public:
 virtual std::string GetBottom(void) { return "-MAXFLOAT"; }
 virtual std::string Gen2(const std::string &lhs, const std::string &rhs) 
const
 {
-return "fmax("+lhs + "," + rhs +")";
+return "mcw_fmax("+lhs + "," + rhs +")";
 }
 virtual std::string BinFuncName(void) const { return "max"; }
 };
diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx 
b/sc/source/core/opencl/formulagroupcl_public.hxx
index 996c898..e50de37 100644
--- a/sc/source/core/opencl/formulagroupcl_public.hxx
+++ b/sc/source/core/opencl/formulagroupcl_public.hxx
@@ -16,6 +16,14 @@ const char* publicFunc =
  "double fsub(double a, double b) { return a-b; }\n"
  "double fdiv(double a, double b) { return a/b; }\n"
  "double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }\n"
+#ifdef USE_FMIN_FMAX
+ "double mcw_fmin(double a, double b) { return fmin(a, b); }\n"
+ "double mcw_fmax(double a, double b) { return fmax(a, b); }\n"
+#else
+ "double mcw_fmin(double a, double b) { return a>b?b:a; }\n"
+ "double mcw_fmax(double a, double b) { return a>b?a:b; }\n"
+#endif
+
  ;
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx |   35 ---
 1 file changed, 23 insertions(+), 12 deletions(-)

New commits:
commit 6a31821484464565a11e579c619c80598532be82
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 18:28:34 2013 -0600

GPU Calc: enables parallel min/max reduction

Change-Id: I86e0b40d284a1bfe7414f02333c616556d6d568c

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 17f4afb..46c8224 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -407,6 +407,8 @@ protected:
 /// to either a sliding window average or sum-of-products
 class OpSum; // Forward Declaration
 class OpAverage; // Forward Declaration
+class OpMin; // Forward Declaration
+class OpMax; // Forward Declaration
 template
 class DynamicKernelSlidingArgument: public Base
 {
@@ -428,6 +430,8 @@ public:
 {
 if ((dynamic_cast(mpCodeGen.get())
 && !dynamic_cast(mpCodeGen.get())) ||
+dynamic_cast(mpCodeGen.get()) ||
+dynamic_cast(mpCodeGen.get()) ||
 dynamic_cast(mpCodeGen.get()))
 return GetWindowSize()> 4 &&
 ( (GetStartFixed() && GetEndFixed()) ||
@@ -436,13 +440,16 @@ public:
 return false;
 }
 virtual void GenSlidingWindowFunction(std::stringstream &ss) {
-if (dynamic_cast(mpCodeGen.get()) && NeedParallelReduction())
+if (!dynamic_cast(mpCodeGen.get())
+&& NeedParallelReduction())
 {
 std::string name = Base::GetName();
 ss << "__kernel void "<0; i/=2) {\n";
 ss << "if (lidx < i)\n";
-ss << "shm_buf[lidx] += shm_buf[lidx + i];\n";
+ss << "shm_buf[lidx] = ";
+ss << mpCodeGen->Gen2("shm_buf[lidx]", "shm_buf[lidx + i]");
+ss << ";";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "}\n";
 ss << "if (lidx == 0)\n";
-ss << "current_result += shm_buf[0];\n";
+ss << "current_result =";
+ss << mpCodeGen->Gen2("current_result", "shm_buf[0]");
+ss << ";\n";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "}\n";
 ss << "if (lidx == 0)\n";
@@ -495,7 +508,8 @@ public:
 {
 assert(mpDVR);
 size_t nCurWindowSize = mpDVR->GetRefRowSize();
-if (dynamic_cast(mpCodeGen.get()))
+if (!dynamic_cast(mpCodeGen.get())
+&& NeedParallelReduction())
 {
 if ((!bIsStartFixed && !bIsEndFixed) ||
 (bIsStartFixed && bIsEndFixed))
@@ -589,10 +603,7 @@ public:
 if (CL_SUCCESS != err)
 throw OpenCLError(err);
 // reproduce the reduction function name
-std::string kernelName;
-if (dynamic_cast(mpCodeGen.get()))
-kernelName = Base::GetName() + "_reduction";
-else throw Unhandled();
+std::string kernelName = Base::GetName() + "_reduction";
 
 cl_kernel redKernel = clCreateKernel(mpProgram, kernelName.c_str(), 
&err);
 if (err != CL_SUCCESS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx |   35 ---
 1 file changed, 23 insertions(+), 12 deletions(-)

New commits:
commit 0e52d87cb05f4307f64c0508e1afa47981fb0eae
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 18:28:34 2013 -0600

GPU Calc: enables parallel min/max reduction

Change-Id: I86e0b40d284a1bfe7414f02333c616556d6d568c

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 9d1e2a9..8c1f42b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -407,6 +407,8 @@ protected:
 /// to either a sliding window average or sum-of-products
 class OpSum; // Forward Declaration
 class OpAverage; // Forward Declaration
+class OpMin; // Forward Declaration
+class OpMax; // Forward Declaration
 template
 class DynamicKernelSlidingArgument: public Base
 {
@@ -428,6 +430,8 @@ public:
 {
 if ((dynamic_cast(mpCodeGen.get())
 && !dynamic_cast(mpCodeGen.get())) ||
+dynamic_cast(mpCodeGen.get()) ||
+dynamic_cast(mpCodeGen.get()) ||
 dynamic_cast(mpCodeGen.get()))
 return GetWindowSize()> 4 &&
 ( (GetStartFixed() && GetEndFixed()) ||
@@ -436,13 +440,16 @@ public:
 return false;
 }
 virtual void GenSlidingWindowFunction(std::stringstream &ss) {
-if (dynamic_cast(mpCodeGen.get()) && NeedParallelReduction())
+if (!dynamic_cast(mpCodeGen.get())
+&& NeedParallelReduction())
 {
 std::string name = Base::GetName();
 ss << "__kernel void "<0; i/=2) {\n";
 ss << "if (lidx < i)\n";
-ss << "shm_buf[lidx] += shm_buf[lidx + i];\n";
+ss << "shm_buf[lidx] = ";
+ss << mpCodeGen->Gen2("shm_buf[lidx]", "shm_buf[lidx + i]");
+ss << ";";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "}\n";
 ss << "if (lidx == 0)\n";
-ss << "current_result += shm_buf[0];\n";
+ss << "current_result =";
+ss << mpCodeGen->Gen2("current_result", "shm_buf[0]");
+ss << ";\n";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "}\n";
 ss << "if (lidx == 0)\n";
@@ -495,7 +508,8 @@ public:
 {
 assert(mpDVR);
 size_t nCurWindowSize = mpDVR->GetRefRowSize();
-if (dynamic_cast(mpCodeGen.get()))
+if (!dynamic_cast(mpCodeGen.get())
+&& NeedParallelReduction())
 {
 if ((!bIsStartFixed && !bIsEndFixed) ||
 (bIsStartFixed && bIsEndFixed))
@@ -589,10 +603,7 @@ public:
 if (CL_SUCCESS != err)
 throw OpenCLError(err);
 // reproduce the reduction function name
-std::string kernelName;
-if (dynamic_cast(mpCodeGen.get()))
-kernelName = Base::GetName() + "_reduction";
-else throw Unhandled();
+std::string kernelName = Base::GetName() + "_reduction";
 
 cl_kernel redKernel = clCreateKernel(mpProgram, kernelName.c_str(), 
&err);
 if (err != CL_SUCCESS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/README

[Eike Rathke]

 i18nlangtag/README |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e1ff35c1d5aa37d23be1f972530f4075746d99a4
Author: Eike Rathke 
Date:   Tue Nov 19 01:09:02 2013 +0100

mention dictionaries/Module_dictionaries.mk

Change-Id: If21faf03d12aa6963fe0252475e1585e71aa349a

diff --git a/i18nlangtag/README b/i18nlangtag/README
index 2c37859..f35de68 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -76,6 +76,8 @@ If dictionary exists:
 * dictionaries/Dictionary_*.mk  for example 
dictionaries/Dictionary_ku_TR.mk
 ** rename file, for example to Dictionary_kmr_Latn.mk
 ** change all locale dependent file names and target, for example *ku_TR* to 
*kmr_Latn* AND ku-TR to kmr-Latn; note '-' and '_' separators, both are used!
+* dictionaries/Module_dictionaries.mk
+** if a Dictionary_*.mk was renamed that has to be changed here as well
 
 If extras exist, for example extras/source/autotext/*:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Eike Rathke]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90725db923eda7588c0affe5f09b86b6c3808103
Author: Eike Rathke 
Date:   Tue Nov 19 01:07:01 2013 +0100

Updated core
Project: dictionaries  8d1a0d88df029906968a3bb12da5f7a832e9b8a1

diff --git a/dictionaries b/dictionaries
index f79819b..8d1a0d8 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit f79819b8eadd02f6bfc1131d7824b1948e7ee963
+Subproject commit 8d1a0d88df029906968a3bb12da5f7a832e9b8a1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Module_dictionaries.mk

[Eike Rathke]

 Module_dictionaries.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d1a0d88df029906968a3bb12da5f7a832e9b8a1
Author: Eike Rathke 
Date:   Tue Nov 19 01:07:01 2013 +0100

renamed ku* to kmr-Latn*, fdo#63460

Change-Id: Ib686f03edb95e23381fedb74fca3dcd22f0d2ebd

diff --git a/Module_dictionaries.mk b/Module_dictionaries.mk
index 402c030..46d114c 100644
--- a/Module_dictionaries.mk
+++ b/Module_dictionaries.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_hu \
Dictionary_is \
Dictionary_it \
-   Dictionary_ku-TR \
+   Dictionary_kmr-Latn \
Dictionary_lt \
Dictionary_lv \
Dictionary_ne \
___
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.5'

[Michael Meeks]

New branch 'feature/ia2.5' available with the following commits:
commit 3012193529b10b7540542086d18c483582b8bb31
Author: Michael Meeks 
Date:   Mon Nov 18 23:37:47 2013 +

uia: add some possibly helpful overview documentation.

Change-Id: I4163b587d82a0fd6403fdd124808ab895b4ed460

commit a78df2821277fc1e3a2929b7da960817cece17be
Author: Michael Meeks 
Date:   Mon Nov 18 15:41:26 2013 +

uia: merge VCL pieces of IAccessible2 work.

Original code from:
Author: Steve Yin 
Date:   Sat Nov 16 23:58:19 2013 +0100

Integrate branch of IAccessible2

With these improvements:

Make IAccessible2 an experimental feature, with fallback to Java a11y.
Move initial setup of windows into the bridge and clean, remove conditionals
Check for presence of AT in the bridge as well to clean. Merge VCL events
extensions and their handling. Clean and split WB_GETOBJECT handling out to
it's own method. Add component prefix namespacing.
Cleanup msaa service info, and implement XComponent to share mxAccessBridge.
Add suitable debugging output, remove VCL dependency from UAccCOM causing
registration issues.

Change-Id: Ib19e38ddca71182018df438df27dcdb555d91402

commit 51931f68763a51ac119b56342cbb3d17571bfdb8
Author: Michael Meeks 
Date:   Mon Nov 18 15:28:19 2013 +

uia: remove redundant component registration.

Change-Id: I913e6498d09021cca78be27b542421251f258535

commit 1d8f374741251fd96ef49c28f9a68f243d7aa916
Author: Michael Meeks 
Date:   Mon Nov 18 13:25:49 2013 +

Remove obsolete statreg.cpp / atlimpl.cpp includes.

Change-Id: I51bd72f6aaeb33bb87e425118b9f205744359145

commit fa1940fb197b24cf77db8aedcae50c861efe7bc3
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

commit 3984eca3da173ce94097897f5be632200b906e94
Author: David Ostrovsky 
Date:   Sat Nov 16 23:31:32 2013 +0100

Fix minor compilation issues

Change-Id: I3567a42d7d071d61a2f41f1fb32d6831c9898d3a

commit e9e87f4efdec3337e552b57e52597e22261c1440
Author: Steve Yin 
Date:   Sat Nov 16 23:58:19 2013 +0100

Integrate branch of IAccessible2

Change-Id: Ied8b6941765c86a849467cb5df312ca7124f32b3

commit 559553edddad291ef9e69d37e6a21b334c17d452
Author: David Ostrovsky 
Date:   Sat Nov 16 22:29:12 2013 +0100

Disable _WIN32_WINNT definition

Change-Id: Ibfa5839700da5ec272c95199b09cd4265d82525d

commit e25bebe879678416ba0a3ae813e65c4503e89c5a
Author: David Ostrovsky 
Date:   Sat Nov 16 14:33:41 2013 +0100

Remove obsolete IDL files

Change-Id: I4f38c1ec815a5f2e39b492657cb0532bb4e19967

commit cda57d139eed49d398649545e2f8ee842fc50fd8
Author: David Ostrovsky 
Date:   Sat Nov 2 15:33:13 2013 +0100

Remove WNT define

Change-Id: Ia69141f58fad25797d7d7495a357dd18c7abf08d

commit 5f43b2ecfda4fad2bd4255eb96411834e5127784
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 6a954dd5b87446b965d06ff53db6466b0c4c35a2
Author: David Ostrovsky 
Date:   Sat Nov 2 15:44:00 2013 +0100

Gbuildify UAA to IA2 bridge

Change-Id: I1aae7ec50c3bb78ac1035d70eaf39c6efef465ab

commit a30856befb527a2c1d9cecfcef76fc6b761fb6b3
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 23d44ef3a305da52bfa48b7710f51b4f248304c1
Author: David Ostrovsky 
Date:   Sat Nov 2 11:01:44 2013 +0100

Add --enable-ia2 configuration option

Change-Id: I950c47bd95d5bb4aacf9e584c8e2eeef461af71f

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

Move to MPLv2 license headers, add modelines.

Change-Id: I895bab038eda82b80e1a223ad877a9674fe561ee

commit 1baeaa55c6210ac2e354649a8ca04f9bdb78
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: Branch 'feature/ia2.4' - winaccessibility/README

[Michael Meeks]

 winaccessibility/README |   47 +++
 1 file changed, 47 insertions(+)

New commits:
commit cd7ec5d423dcf19fc310843ce76c54d6464aed56
Author: Michael Meeks 
Date:   Mon Nov 18 23:37:47 2013 +

uia: add some possibly helpful overview documentation.

Change-Id: I4163b587d82a0fd6403fdd124808ab895b4ed460

diff --git a/winaccessibility/README b/winaccessibility/README
new file mode 100644
index 000..45ec550
--- /dev/null
+++ b/winaccessibility/README
@@ -0,0 +1,47 @@
+Windows Accessibility Bridge.
+
+This code provides a bridge between our internal Accessibility
+interfaces (implemented on all visible 'things' in the suite: eg.
+windows, buttons, entry boxes etc.) - and the Windows MSAA /
+IAccessible2 COM interfaces that are familiar to windows users and
+Accessible Technologies (ATs) such as the NVDA screen reader.
+
+The code breaks into three bits:
+
+source/service/
+   + the UNO service providing the accessibility bridge.
+ It essentially listens to events from the LibreOffice
+ core and creates and synchronises COM peers for our
+ internal accessibilty objects when events arrive.
+
+source/UAccCom/
+   + implementations of the MSAA / IAccessible2 interfaces
+ to provide native peers for the accessbility code.
+
+source/UAccCOMIDL/
+   + COM Interface Definition Language (IDL) for UAccCom.
+
+Here is one way of visualising the code / control flow
+
+VCL <-> UNO toolkit <-> UNO a11y <-> win a11y <-> COM / IAccessible2
+vcl/ <-> toolkit/ <-> accessibility/ <-> winaccessibility/ <-> UAccCom/
+
+
+Debugging / playing with winaccessibility
+
+First you need to ensure that UAccCOM.dll is registered, if this did
+not happen at install time use:
+
+regsvr32 /absolute/path/to/program/UAccCOM.dll
+
+Next you need to enable 'experiemental mode' in Tools->Options. After
+that NVDA should work as expected. In order to use 'accprobe' to debug
+it is necessary to override the check for whether an AT (like NVDA) is
+running; to do that use:
+
+SAL_FORCE_IACCESSIBLE2=1 soffice.exe -writer
+
+Then you can use accprobe to introspect the accessibility hierarchy
+remotely, checkout:
+
+http://accessibility.linuxfoundation.org/a11yweb/util/accprobe/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/Library_localedata_others.mk i18npool/source

[Eike Rathke]

 i18npool/Library_localedata_others.mk |2 +
 i18npool/source/localedata/data/ar_AE.xml |   41 ++
 i18npool/source/localedata/data/ar_KW.xml |   41 ++
 i18npool/source/localedata/localedata.cxx |2 +
 4 files changed, 86 insertions(+)

New commits:
commit a0c1d96aa48906b2ebb332f6190b4bcfe9e2a161
Author: Eike Rathke 
Date:   Tue Nov 19 00:27:26 2013 +0100

added [ar-AE] and [ar-KW] locale data referrers, fdo#71140

for AED and KWD currencies, simply referring [ar-SA] in all other
aspects

Change-Id: I2ca19d1f7d2e807406bf207babe76cae967eea81

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index f71d8d4..d1878fe 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -19,8 +19,10 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_af_ZA \
CustomTarget/i18npool/localedata/localedata_ak_GH \
CustomTarget/i18npool/localedata/localedata_am_ET \
+   CustomTarget/i18npool/localedata/localedata_ar_AE \
CustomTarget/i18npool/localedata/localedata_ar_DZ \
CustomTarget/i18npool/localedata/localedata_ar_EG \
+   CustomTarget/i18npool/localedata/localedata_ar_KW \
CustomTarget/i18npool/localedata/localedata_ar_LB \
CustomTarget/i18npool/localedata/localedata_ar_OM \
CustomTarget/i18npool/localedata/localedata_ar_SA \
diff --git a/i18npool/source/localedata/data/ar_AE.xml 
b/i18npool/source/localedata/data/ar_AE.xml
new file mode 100644
index 000..6327373
--- /dev/null
+++ b/i18npool/source/localedata/data/ar_AE.xml
@@ -0,0 +1,41 @@
+
+
+
+
+  
+
+  ar
+  Arabic
+
+
+  AE
+  United Arab Emirates
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  AED
+  د.إ‏
+  AED
+  AED
+  2
+
+  
+  
+  
+  
+  
+
diff --git a/i18npool/source/localedata/data/ar_KW.xml 
b/i18npool/source/localedata/data/ar_KW.xml
new file mode 100644
index 000..f3b6969
--- /dev/null
+++ b/i18npool/source/localedata/data/ar_KW.xml
@@ -0,0 +1,41 @@
+
+
+
+
+  
+
+  ar
+  Arabic
+
+
+  KW
+  Kuwait
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  KWD
+  د.ك‏
+  KWD
+  KWD
+  2
+
+  
+  
+  
+  
+  
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 75edcf7..5171b3f 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -285,6 +285,8 @@ static const struct {
 { "sid_ET", lcl_DATA_OTHERS },
 { "bo_CN",  lcl_DATA_OTHERS },
 { "bo_IN",  lcl_DATA_OTHERS },
+{ "ar_AE",  lcl_DATA_OTHERS },
+{ "ar_KW",  lcl_DATA_OTHERS },
 { "bm_ML",  lcl_DATA_OTHERS }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

curl now with native SSL/TLS on Mac and WNT

[Michael Stahl]

hi Cedric,

digging through curl's makefiles it supports some native SSL/TLS
implementations, which should have OS integrated support and UI for
adding custom CAs and such things:

commit 461bdf0b4f863a5ba39dd76b6baf416fbb64b5e8 enables use of "Secure
Transport" on Mac / IOS

commit 460d6ce526b79f4d98600d60a63f894e197b66fe enables use of
"Schannel" on WNT (MSVC)

and btw commit 88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11
upgrades to version 7.33.0

actually it appears that on WNT our internal curl didn't have any
SSL/TLS support before, which is surprising (but i haven't checked 4.1,
maybe that was only on master).

it appears that Mac OS X 10.6 has a system libcurl.4.dylib, which could
perhaps also be used; our RHEL5 baseline has a libcurl.so.3 apparently
which is too old.

this is build-tested only (and Mac only via tinderbox) - please test if
it actually works for your use-cases.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/ia2.4' - include/sal include/vcl vcl/source vcl/win winaccessibility/inc winaccessibility/Library_uacccom.mk winaccessibility/source

[Michael Meeks]

Rebased ref, commits from common ancestor:
commit 5dbe8f35176bed789515b19636618968d1ac8228
Author: Michael Meeks 
Date:   Mon Nov 18 15:41:26 2013 +

uia: merge VCL pieces of IAccessible2 work.

Original code from:
Author: Steve Yin 
Date:   Sat Nov 16 23:58:19 2013 +0100

Integrate branch of IAccessible2

With these improvements:

Make IAccessible2 an experimental feature, with fallback to Java a11y.
Move initial setup of windows into the bridge and clean, remove conditionals
Check for presence of AT in the bridge as well to clean. Merge VCL events
extensions and their handling. Clean and split WB_GETOBJECT handling out to
it's own method. Add component prefix namespacing.
Cleanup msaa service info, and implement XComponent to share mxAccessBridge.
Add suitable debugging output, remove VCL dependency from UAccCOM causing
registration issues.

Change-Id: Ib19e38ddca71182018df438df27dcdb555d91402

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index ca635c4..a6ffef9 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -346,6 +346,10 @@ certain functionality.
 @li @c vcl.virdev
 @li @c vcl.window
 
+@section winaccessiblity
+
+@li @c iacc2 - IAccessible2 bridge debug
+
 @section Writer
 
 @li @c sw
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 1ce025f..92ffca9 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -151,6 +151,7 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_ITEM_EXPANDED  1174
 #define VCLEVENT_ITEM_COLLAPSED 1175
 #define VCLEVENT_DROPDOWN_PRE_OPEN  1176
+#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED   1180
 
 // VclMenuEvent
 #define VCLEVENT_MENU_ACTIVATE  1200
@@ -169,23 +170,35 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_MENU_ITEMCHECKED   1213
 #define VCLEVENT_MENU_ITEMUNCHECKED 1214
 #define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215
+#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED  1216
+#define VCLEVENT_TOOLBOX_ITEMUPDATED  1217
 
 #define VCLEVENT_MENU_SHOW  1250
 #define VCLEVENT_MENU_HIDE  1251
 
 #define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED  1216
+#define VCLEVENT_LISTBOX_TREEEXPAND 1218
+#define VCLEVENT_LISTBOX_TREECOLLAPSE   1219
+#define VCLEVENT_LISTBOX_TREEFOCUS  1220
+#define VCLEVENT_LISTBOX_TREESELECT 1221
+#define VCLEVENT_EDIT_CARETCHANGED  1222
+#define VCLEVENT_COMBOBOX_UPDATEVALUE  1223
+
+#define VCLEVENT_LISTBOX_FOCUS 1224
+#define VCLEVENT_LISTBOX_CLEAR 1225
 
 // DockingWindow
-#define VCLEVENT_WINDOW_STARTDOCKING1217// pData = DockingData
-#define VCLEVENT_WINDOW_DOCKING 1218
-#define VCLEVENT_WINDOW_ENDDOCKING  1219// pData = 
EndDockingData
-#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING   1220// pData = sal_Bool
-#define VCLEVENT_WINDOW_TOGGLEFLOATING  1221
-#define VCLEVENT_WINDOW_ENDPOPUPMODE1222// pData = 
EndPopupModeData
-
-#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1223// pData = itempos
-#define VCLEVENT_TABLECELL_NAMECHANGED  1224// pData = 
struct(Entry, Column, oldText)
-#define VCLEVENT_TABLEROW_SELECT1225
+#define VCLEVENT_WINDOW_STARTDOCKING1227// pData = DockingData
+#define VCLEVENT_WINDOW_DOCKING 1228
+#define VCLEVENT_WINDOW_ENDDOCKING  1229// pData = 
EndDockingData
+#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING   1230// pData = sal_Bool
+#define VCLEVENT_WINDOW_TOGGLEFLOATING  1231
+#define VCLEVENT_WINDOW_ENDPOPUPMODE1232// pData = 
EndPopupModeData
+
+#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233// pData = itempos
+#define VCLEVENT_TABLECELL_NAMECHANGED  1234// pData = 
struct(Entry, Column, oldText)
+#define VCLEVENT_TABLEROW_SELECT1235
+#define VCLEVENT_LISTBOX_STATEUPDATE1236
 
 class VCL_DLLPUBLIC VclSimpleEvent
 {
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index b42eeea..cb24f02 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -52,6 +52,8 @@
 #include "com/sun/star/java/MissingJavaRuntimeException.hpp"
 #include "com/sun/star/java/JavaDisabledException.hpp"
 
+#include "officecfg/Office/Common.hxx"
+
 #include 
 
 using namespace com::sun::star::uno;
@@ -321,6 +323,20 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool 
&rCancelled)
 {
 css::uno::Reference< XComponentContext > 
xContext(comphelper::getProcessComponentContext());
 
+bool bTryIAcc2 = ( 
officecfg::Office::Common::Misc::ExperimentalMode::get( xContext ) &&
+   !getenv ("SAL_DISABLE_IACCESSIBLE2") );
+
+if ( bTryIAcc2 ) // Windows only really

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

[Michael Stahl]

 external/curl/UnpackedTarball_curl.mk|1 +
 external/curl/curl-msvc-schannel.patch.1 |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit 460d6ce526b79f4d98600d60a63f894e197b66fe
Author: Michael Stahl 
Date:   Tue Nov 19 00:06:50 2013 +0100

curl: use WNT native Schannel SSL/TLS implementation

This should give better OS integration for things like adding CAs.

Change-Id: I53fbfad402618e98d4116a0fecf0bf59e905e292

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 05e9aa5..2e4d4cc 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-freebsd.patch.1 \
external/curl/curl-msvc.patch.1 \
+   external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
 ))
diff --git a/external/curl/curl-msvc-schannel.patch.1 
b/external/curl/curl-msvc-schannel.patch.1
new file mode 100644
index 000..68af66d
--- /dev/null
+++ b/external/curl/curl-msvc-schannel.patch.1
@@ -0,0 +1,22 @@
+MSVC: use WNT native Schannel SSL/TLS implementation
+
+--- curl/lib/Makefile.vc10.old 2013-11-19 00:00:29.044499752 +0100
 curl/lib/Makefile.vc10 2013-11-19 00:01:29.135499684 +0100
+@@ -260,7 +260,7 @@
+ TARGET = $(LIBCURL_DYN_LIB_REL)
+ DIROBJ = $(CFG)
+ LNK= $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) 
/IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)
+-CC = $(CCNODBG) $(RTLIB)
++CC = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL)
+ CFGSET = TRUE
+ RESOURCE = $(DIROBJ)\libcurl.res
+ !ENDIF
+@@ -411,7 +411,7 @@
+ TARGET = $(LIBCURL_DYN_LIB_DBG)
+ DIROBJ = $(CFG)
+ LNK= $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) 
/IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)
+-CC = $(CCDEBUG) $(RTLIBD) 
++CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSWINSSL)
+ CFGSET = TRUE
+ RESOURCE = $(DIROBJ)\libcurl.res
+ !ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com

[Xisco Fauli]

 wizards/com/sun/star/wizards/document/OfficeDocument.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef089191076493d89e033cbbebd7f0dda92f6abe
Author: Xisco Fauli 
Date:   Mon Nov 18 23:57:47 2013 +0100

fdo#68788: Don't use systemPathToFileUrl here

it works on Linux but not on Windows.

Change-Id: Ia9af362c09d46c678fa4ebe8cf4922dae3dddccf

diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py 
b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index eb6fb0a..35d3183 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -105,7 +105,7 @@ class OfficeDocument(object):
 xComponent = None
 try:
 xComponent = frame.loadComponentFromURL(
-systemPathToFileUrl(sURL), "_self", 0, tuple(loadValues))
+sURL, "_self", 0, tuple(loadValues))
 
 except Exception:
 traceback.print_exc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/README

[Eike Rathke]

 i18nlangtag/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 732dd223ca52212ac63626526f92384ed11adc54
Author: Eike Rathke 
Date:   Mon Nov 18 23:55:16 2013 +0100

note '-' and '_' separators

Change-Id: Ic2c0601854f0ea73c6003fe264fed06ce2a13ebe

diff --git a/i18nlangtag/README b/i18nlangtag/README
index 63fbf1a..2c37859 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -75,7 +75,7 @@ If dictionary exists:
 ** if appropriate rename *.dic and *.aff files, for example ku_TR.dic to 
kmr_Latn.dic and ku_TR.aff to kmr_Latn.aff
 * dictionaries/Dictionary_*.mk  for example 
dictionaries/Dictionary_ku_TR.mk
 ** rename file, for example to Dictionary_kmr_Latn.mk
-** change all locale dependent file names and target, for example *ku_TR* to 
*kmr_Latn*
+** change all locale dependent file names and target, for example *ku_TR* to 
*kmr_Latn* AND ku-TR to kmr-Latn; note '-' and '_' separators, both are used!
 
 If extras exist, for example extras/source/autotext/*:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Dictionary_kmr-Latn.mk

[Eike Rathke]

 Dictionary_kmr-Latn.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f79819b8eadd02f6bfc1131d7824b1948e7ee963
Author: Eike Rathke 
Date:   Mon Nov 18 23:51:55 2013 +0100

renamed ku* to kmr-Latn*, fdo#63460

Change-Id: If7a53e72880608378ed22cf5f82ee05d5b1d8f90

diff --git a/Dictionary_kmr-Latn.mk b/Dictionary_kmr-Latn.mk
index e1f20db..7b30416 100644
--- a/Dictionary_kmr-Latn.mk
+++ b/Dictionary_kmr-Latn.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Dictionary_Dictionary,dict-ku-TR,dictionaries/kmr_Latn))
+$(eval $(call gb_Dictionary_Dictionary,dict-kmr-Latn,dictionaries/kmr_Latn))
 
-$(eval $(call gb_Dictionary_add_root_files,dict-ku-TR,\
+$(eval $(call gb_Dictionary_add_root_files,dict-kmr-Latn,\
dictionaries/kmr_Latn/ferheng.org.png \
dictionaries/kmr_Latn/gpl-3.0.txt \
dictionaries/kmr_Latn/kmr_Latn.aff \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Eike Rathke]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20acae99c7224e46701ebcfd3d702ccee35d
Author: Eike Rathke 
Date:   Mon Nov 18 23:39:28 2013 +0100

Updated core
Project: dictionaries  eece7b1bc8579d7bdcbebeac67dcdc676617996e

diff --git a/dictionaries b/dictionaries
index d626d8b..eece7b1 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit d626d8b18cbb14825632900a02c7291912855f73
+Subproject commit eece7b1bc8579d7bdcbebeac67dcdc676617996e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Eike Rathke]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe3494e35c4489c4d904778e828d534742e29d4a
Author: Eike Rathke 
Date:   Mon Nov 18 23:51:55 2013 +0100

Updated core
Project: dictionaries  f79819b8eadd02f6bfc1131d7824b1948e7ee963

diff --git a/dictionaries b/dictionaries
index eece7b1..f79819b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit eece7b1bc8579d7bdcbebeac67dcdc676617996e
+Subproject commit f79819b8eadd02f6bfc1131d7824b1948e7ee963
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/README

[Eike Rathke]

 i18nlangtag/README |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 1ac663b0132257d902a078435981e78e65b564a9
Author: Eike Rathke 
Date:   Mon Nov 18 23:47:00 2013 +0100

mention dictionaries/Dictionary_*.mk

Change-Id: Idd3f7d847fca9b86ac128af1c85fd928d635a1d1

diff --git a/i18nlangtag/README b/i18nlangtag/README
index e075c3b..63fbf1a 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -71,6 +71,11 @@ If dictionary exists:
 * dictionaries/*/dictionaries.xcu   for example 
dictionaries/sr/dictionaries.xcu
 ** change the affected  elements to something 
corresponding, for example  to 
 ** in the "Locales" properties change the  element, for example 
sh-RS to sr-Latn-RS
+* dictionaries/*/*  for example dictionaries/ku_TR/*
+** if appropriate rename *.dic and *.aff files, for example ku_TR.dic to 
kmr_Latn.dic and ku_TR.aff to kmr_Latn.aff
+* dictionaries/Dictionary_*.mk  for example 
dictionaries/Dictionary_ku_TR.mk
+** rename file, for example to Dictionary_kmr_Latn.mk
+** change all locale dependent file names and target, for example *ku_TR* to 
*kmr_Latn*
 
 If extras exist, for example extras/source/autotext/*:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 external/curl/ExternalProject_curl.mk |2 +-
 external/curl/UnpackedTarball_curl.mk |2 +-
 external/curl/curl-7.26.0_win-proxy.patch |4 ++--
 external/curl/curl-msvc.patch.1   |4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 43d477b1685f6c1ad48885c7a73411030c78513d
Author: Michael Stahl 
Date:   Mon Nov 18 23:40:05 2013 +0100

curl: actually use Makefile.vc10 instead of Makefile.vc9

... they are currently identical but it seems more appropriate.

Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 6f024bf..81d46f6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -72,7 +72,7 @@ else ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc9 \
+   MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \
cfg=$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE 
/DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 0516a31..05e9aa5 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
-   lib/Makefile.vc9 \
+   lib/Makefile.vc10 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
index addb47e..26c42f7 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,5 +1,5 @@
 curl-7.26.0/lib/Makefile.vc9
-+++ misc/build/curl-7.26.0/lib/Makefile.vc9
+--- curl-7.26.0/lib/Makefile.vc10
 misc/build/curl-7.26.0/lib/Makefile.vc10
 @@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE)
  SSLLIBS  = libeay32.lib ssleay32.lib
  ZLIBLIBSDLL  = zdll.lib
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 42970d3..927b3f1 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -1,7 +1,7 @@
 MSVC: using SOLARINC and EXCFLAGS
 
 curl/lib/Makefile.vc9  2012-05-24 12:07:02.0 -0400
-+++ curl/lib/Makefile.vc9  2012-10-29 11:53:44.658809300 -0400
+--- curl/lib/Makefile.vc10 2012-05-24 12:07:02.0 -0400
 curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400
 @@ -117,7 +117,7 @@
  ZLIBLIBSDLL  = zdll.lib
  ZLIBLIBS = zlib.lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Dictionary_kmr-Latn.mk Dictionary_ku-TR.mk

[Eike Rathke]

 Dictionary_kmr-Latn.mk |   23 +++
 Dictionary_ku-TR.mk|   23 ---
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit eece7b1bc8579d7bdcbebeac67dcdc676617996e
Author: Eike Rathke 
Date:   Mon Nov 18 23:39:28 2013 +0100

renamed ku* to kmr-Latn*, fdo#63460

Change-Id: I0f6c453036c7082866e83fe5d44ac7aa248e1893

diff --git a/Dictionary_ku-TR.mk b/Dictionary_kmr-Latn.mk
similarity index 59%
rename from Dictionary_ku-TR.mk
rename to Dictionary_kmr-Latn.mk
index a5ab3c8..e1f20db 100644
--- a/Dictionary_ku-TR.mk
+++ b/Dictionary_kmr-Latn.mk
@@ -7,17 +7,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Dictionary_Dictionary,dict-ku-TR,dictionaries/ku_TR))
+$(eval $(call gb_Dictionary_Dictionary,dict-ku-TR,dictionaries/kmr_Latn))
 
 $(eval $(call gb_Dictionary_add_root_files,dict-ku-TR,\
-   dictionaries/ku_TR/ferheng.org.png \
-   dictionaries/ku_TR/gpl-3.0.txt \
-   dictionaries/ku_TR/ku_TR.aff \
-   dictionaries/ku_TR/ku_TR.dic \
-   dictionaries/ku_TR/lgpl-2.1.txt \
-   dictionaries/ku_TR/license.txt \
-   dictionaries/ku_TR/MPL-1.1.txt \
-   dictionaries/ku_TR/README_ku_TR.txt \
+   dictionaries/kmr_Latn/ferheng.org.png \
+   dictionaries/kmr_Latn/gpl-3.0.txt \
+   dictionaries/kmr_Latn/kmr_Latn.aff \
+   dictionaries/kmr_Latn/kmr_Latn.dic \
+   dictionaries/kmr_Latn/lgpl-2.1.txt \
+   dictionaries/kmr_Latn/license.txt \
+   dictionaries/kmr_Latn/MPL-1.1.txt \
+   dictionaries/kmr_Latn/README_kmr_Latn.txt \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 external/curl/ExternalProject_curl.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 461bdf0b4f863a5ba39dd76b6baf416fbb64b5e8
Author: Michael Stahl 
Date:   Mon Nov 18 23:20:45 2013 +0100

curl: try to use Mac OS X native SSL/TLS implementation

This should give better OS integration for things like adding CAs.

Change-Id: I9578f7194f920a9ebc6c18696e12c8c2e2bb2d80

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 932c08b..6f024bf 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -40,7 +40,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
-   --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out") \
+   $(if $(filter MACOSX IOS,$(OS)),\
+   --with-darwinssl, \
+   --with-nss$(if $(filter 
NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marcos Paulo de Souza]

 scp2/source/ooo/file_library_ooo.scp |   18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 6d9026f7a7ebad02b57fcd2dd15f66adeba361af
Author: Marcos Paulo de Souza 
Date:   Mon Nov 18 19:03:21 2013 -0200

Use filelist in curl

Change-Id: I6a5fa0f7c0c9184ff013e2630f8edcb6ba2aa942
Reviewed-on: https://gerrit.libreoffice.org/6713
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index d8245c9..c01b777 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -86,21 +86,9 @@ End
 
 File gid_File_Lib_Curl
 LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
-#endif
-  #else
-   #ifdef _gcc3
-Name = "libcurl-4.dll";
-   #else
-Name = "libcurl.dll";
-   #endif
-  #endif
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = "curl.filelist";
 End
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/app/inputhdl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 257521e7092848793bf2538780468d95ccb69331
Author: Eike Rathke 
Date:   Mon Nov 18 23:12:37 2013 +0100

fixed out-of-bounds string access

Change-Id: I89e005f6f2d35e3343077b3b28e9fbb5135f9fff

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index ad51f49..05de585 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2753,7 +2753,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
 {
 //  keine typographische Anfuehrungszeichen in Formeln
 
-if (aString[0] == '=')
+if (!aString.isEmpty() && aString[0] == '=')
 {
 SvxAutoCorrect* pAuto = SvxAutoCorrCfg::Get().GetAutoCorrect();
 if ( pAuto )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ray]

 sc/qa/unit/data/ods/opencl/compiler/horizontal.ods |binary
 sc/qa/unit/opencl-test.cxx |   32 +++
 sc/source/core/opencl/formulagroupcl.cxx   |   88 ++---
 sc/source/core/opencl/opbase.cxx   |   12 ++
 sc/source/core/opencl/opbase.hxx   |7 -
 5 files changed, 90 insertions(+), 49 deletions(-)

New commits:
commit 41bbf04a5a9cdfc1984e436626222cd806a48a3d
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 15:05:25 2013 -0600

GPU Calc: turn on parallel sumifs and parallel sum reduce

Change-Id: Id615ea0f5f16a4dfc517aacb30715c2df84553e3

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 224ed49..17f4afb 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -426,9 +426,10 @@ public:
 }
 virtual bool NeedParallelReduction(void) const
 {
-if (dynamic_cast(mpCodeGen.get())
-&& !dynamic_cast(mpCodeGen.get()))
-return GetWindowSize()> 100 &&
+if ((dynamic_cast(mpCodeGen.get())
+&& !dynamic_cast(mpCodeGen.get())) ||
+dynamic_cast(mpCodeGen.get()))
+return GetWindowSize()> 4 &&
 ( (GetStartFixed() && GetEndFixed()) ||
   (!GetStartFixed() && !GetEndFixed())  ) ;
 else
@@ -457,10 +458,10 @@ public:
 ss << "tmp = 0.0;\n";
 ss << "int loopOffset = l*512;\n";
 ss << "if((loopOffset + lidx + offset + 256) < min( offset + 
windowSize, arrayLength))\n";
-ss << "tmp = A[loopOffset + lidx + offset] + "
-"A[loopOffset + lidx + offset + 256];\n";
+ss << "tmp = fsum(A[loopOffset + lidx + offset], 0) + "
+"fsum(A[loopOffset + lidx + offset + 256], 0);\n";
 ss << "else if ((loopOffset + lidx + offset) < min(offset + 
windowSize, arrayLength))\n";
-ss << "tmp = A[loopOffset + lidx + offset];\n";
+ss << "tmp = fsum(A[loopOffset + lidx + offset], 0);\n";
 ss << "shm_buf[lidx] = tmp;\n";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "for (int i = 128; i >0; i/=2) {\n";
@@ -496,7 +497,8 @@ public:
 size_t nCurWindowSize = mpDVR->GetRefRowSize();
 if (dynamic_cast(mpCodeGen.get()))
 {
-if (!bIsStartFixed && !bIsEndFixed)
+if ((!bIsStartFixed && !bIsEndFixed) ||
+(bIsStartFixed && bIsEndFixed))
 {
 // set 100 as a temporary threshold for invoking reduction
 // kernel in NeedParalleLReduction function
@@ -510,21 +512,6 @@ public:
 return nCurWindowSize;
 }
 }
-
-if (bIsStartFixed && bIsEndFixed)
-{
-// set 100 as a temporary threshold for invoking reduction
-// kernel in NeedParalleLReduction function
-if (NeedParallelReduction())
-{
-std::string temp = Base::GetName() + "[0]";
-ss << "tmp = ";
-ss << mpCodeGen->Gen2(temp, "tmp");
-ss << ";\n\t";
-needBody = false;
-return nCurWindowSize;
-}
-}
 }
 needBody = true;
 
@@ -576,7 +563,8 @@ public:
 
 virtual size_t Marshal(cl_kernel k, int argno, int w, cl_program mpProgram)
 {
-if (!NeedParallelReduction())
+if (!NeedParallelReduction() ||
+dynamic_cast(mpCodeGen.get()))
 return Base::Marshal(k, argno, w, mpProgram);
 
 assert(Base::mpClmem == NULL);
commit c277e98f9ce1b57794311ef45aca734b8d4dee85
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 13:39:02 2013 -0600

GPU Calc: testcases for horizontal ranges

AMLOEXT-242 BUG

Change-Id: I4b87bdf6183ed81ad767550f5cd49aab51531cf2

diff --git a/sc/qa/unit/data/ods/opencl/compiler/horizontal.ods 
b/sc/qa/unit/data/ods/opencl/compiler/horizontal.ods
new file mode 100644
index 000..18edf64
Binary files /dev/null and b/sc/qa/unit/data/ods/opencl/compiler/horizontal.ods 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index b2d4b87..86a73b0 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -83,6 +83,7 @@ public:
 void testFinacialRateFormula();
 void testFinancialAccrintmFormula();
 void testFinancialAccrintFormula();
+void testCompilerHorizontal();
 void testCompilerNested();
 void testFinacialSLNFormula();
 void testStatisticalFormulaGammaLn();
@@ -253,6 +254,7 @@ public:
 CPPUNIT_TEST(testFinacialIRRFormula);
 CPPUNIT_TEST(testFinacialMIRRFormula);
 CPPUNIT_TEST(testFinacialRateFormula);
+CPPUNIT_TEST(testCompilerHorizontal);
 C

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

[Ray]

 sc/qa/unit/data/ods/opencl/compiler/horizontal.ods |binary
 sc/qa/unit/opencl-test.cxx |   32 +++
 sc/source/core/opencl/formulagroupcl.cxx   |   88 ++---
 sc/source/core/opencl/opbase.cxx   |   12 ++
 sc/source/core/opencl/opbase.hxx   |7 -
 5 files changed, 90 insertions(+), 49 deletions(-)

New commits:
commit 912d23636a55473221e3e35768fb9ac42c3e9b76
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 15:05:25 2013 -0600

GPU Calc: turn on parallel sumifs and parallel sum reduce

Change-Id: Id615ea0f5f16a4dfc517aacb30715c2df84553e3

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 3a63c92..9d1e2a9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -426,9 +426,10 @@ public:
 }
 virtual bool NeedParallelReduction(void) const
 {
-if (dynamic_cast(mpCodeGen.get())
-&& !dynamic_cast(mpCodeGen.get()))
-return GetWindowSize()> 100 &&
+if ((dynamic_cast(mpCodeGen.get())
+&& !dynamic_cast(mpCodeGen.get())) ||
+dynamic_cast(mpCodeGen.get()))
+return GetWindowSize()> 4 &&
 ( (GetStartFixed() && GetEndFixed()) ||
   (!GetStartFixed() && !GetEndFixed())  ) ;
 else
@@ -457,10 +458,10 @@ public:
 ss << "tmp = 0.0;\n";
 ss << "int loopOffset = l*512;\n";
 ss << "if((loopOffset + lidx + offset + 256) < min( offset + 
windowSize, arrayLength))\n";
-ss << "tmp = A[loopOffset + lidx + offset] + "
-"A[loopOffset + lidx + offset + 256];\n";
+ss << "tmp = fsum(A[loopOffset + lidx + offset], 0) + "
+"fsum(A[loopOffset + lidx + offset + 256], 0);\n";
 ss << "else if ((loopOffset + lidx + offset) < min(offset + 
windowSize, arrayLength))\n";
-ss << "tmp = A[loopOffset + lidx + offset];\n";
+ss << "tmp = fsum(A[loopOffset + lidx + offset], 0);\n";
 ss << "shm_buf[lidx] = tmp;\n";
 ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
 ss << "for (int i = 128; i >0; i/=2) {\n";
@@ -496,7 +497,8 @@ public:
 size_t nCurWindowSize = mpDVR->GetRefRowSize();
 if (dynamic_cast(mpCodeGen.get()))
 {
-if (!bIsStartFixed && !bIsEndFixed)
+if ((!bIsStartFixed && !bIsEndFixed) ||
+(bIsStartFixed && bIsEndFixed))
 {
 // set 100 as a temporary threshold for invoking reduction
 // kernel in NeedParalleLReduction function
@@ -510,21 +512,6 @@ public:
 return nCurWindowSize;
 }
 }
-
-if (bIsStartFixed && bIsEndFixed)
-{
-// set 100 as a temporary threshold for invoking reduction
-// kernel in NeedParalleLReduction function
-if (NeedParallelReduction())
-{
-std::string temp = Base::GetName() + "[0]";
-ss << "tmp = ";
-ss << mpCodeGen->Gen2(temp, "tmp");
-ss << ";\n\t";
-needBody = false;
-return nCurWindowSize;
-}
-}
 }
 needBody = true;
 
@@ -576,7 +563,8 @@ public:
 
 virtual size_t Marshal(cl_kernel k, int argno, int w, cl_program mpProgram)
 {
-if (!NeedParallelReduction())
+if (!NeedParallelReduction() ||
+dynamic_cast(mpCodeGen.get()))
 return Base::Marshal(k, argno, w, mpProgram);
 
 assert(Base::mpClmem == NULL);
commit af223ecdf01b76bc1005c8fcc342165639a8823f
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 13:39:02 2013 -0600

GPU Calc: testcases for horizontal ranges

AMLOEXT-242 BUG

Change-Id: I4b87bdf6183ed81ad767550f5cd49aab51531cf2

diff --git a/sc/qa/unit/data/ods/opencl/compiler/horizontal.ods 
b/sc/qa/unit/data/ods/opencl/compiler/horizontal.ods
new file mode 100644
index 000..18edf64
Binary files /dev/null and b/sc/qa/unit/data/ods/opencl/compiler/horizontal.ods 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 3f90040..3f02d9b 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -81,6 +81,7 @@ public:
 void testFinacialRateFormula();
 void testFinancialAccrintmFormula();
 void testFinancialAccrintFormula();
+void testCompilerHorizontal();
 void testCompilerNested();
 void testFinacialSLNFormula();
 void testStatisticalFormulaGammaLn();
@@ -251,6 +252,7 @@ public:
 CPPUNIT_TEST(testFinacialIRRFormula);
 CPPUNIT_TEST(testFinacialMIRRFormula);
 CPPUNIT_TEST(testFinacialRateFormula);
+CPPUNIT_TEST(testCompilerHorizontal);
 C

Re: Vendors Name via UNO API / Basic Macros

[Cor Nouws]

Hi Thomas, *,

Thomas Krumbein wrote (14-11-13 09:21)


Because in LO 4.1 we have some API-changes, macros should now have a
version-switch.
There are different methods to get the internal version-number - that is
not a problem.

But: The version number itself is not suffcient because AOO 4.1.0 will
start soon and this version-number is identical to LO 4.1.0.


For the DocumentInfo - that changed from 3.x to 4.x, I use the following:

  If HasUnoInterfaces(ThisComponent, 
"com.sun.star.document.XDocumentInfoSupplier") Then

   ' 3.x
 s = ThisComponent.Documentinfo.Keywords ' example
  Else
 s = ThisComponent.getDocumentProperties.Keywords(0)
   End If

I've not yet been looking into details to possibly distinct between pré 
and after 4.1.0 for the Date .



In general: Would be nice if for every API change there is something as 
I place above here, to check from e.g. the aivailable interface what to do.


(Sidenote: the change in page formatting, that a page style can have 
different headers/footers on the first page in use, which is very 
positive for MsWord interoperability, may give a challenge too in code 
that manages printing: the page format as such could be used to distinct 
between various trays to print to. But that cannot be done in the same 
way now for documents using that feature ;) )


Cheers,
Cor


--
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Meeks]

 winaccessibility/inc/g_msacc.hxx  |4 +
 winaccessibility/source/UAccCOM/stdafx.h  |5 -
 winaccessibility/source/service/AccFrameEventListener.cxx |   13 
 winaccessibility/source/service/AccTopWindowListener.cxx  |   42 --
 winaccessibility/source/service/msaaservice_impl.cxx  |   41 +++--
 5 files changed, 39 insertions(+), 66 deletions(-)

New commits:
commit 9633cdf1b07bf2f56805b4b030ba78bfb845956c
Author: Michael Meeks 
Date:   Mon Nov 18 21:44:36 2013 +

uia: more cleanups and debugging output.

Change-Id: Ifaaebbc7826ad8421de432cb91030584b807b893

diff --git a/winaccessibility/inc/g_msacc.hxx b/winaccessibility/inc/g_msacc.hxx
index df6e4bd..d700249 100644
--- a/winaccessibility/inc/g_msacc.hxx
+++ b/winaccessibility/inc/g_msacc.hxx
@@ -20,6 +20,10 @@
 #ifndef __G_MSACC_HXX
 #define __G_MSACC_HXX
 
+extern void FreeTopWindowListener();
+extern void handleWindowOpened_impl( long pAcc );
+extern long GetMSComPtr( long hWnd, long lParam, long wParam );
+
 extern AccTopWindowListener* g_pTop;
 
 #endif
diff --git a/winaccessibility/source/UAccCOM/stdafx.h 
b/winaccessibility/source/UAccCOM/stdafx.h
index b933b12..6b2ccdd 100644
--- a/winaccessibility/source/UAccCOM/stdafx.h
+++ b/winaccessibility/source/UAccCOM/stdafx.h
@@ -28,10 +28,6 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-//#define STRICT
-//#ifndef _WIN32_WINNT
-//#define _WIN32_WINNT 0x0400
-//#endif
 //#define _ATL_APARTMENT_THREADED
 
 #include 
@@ -56,6 +52,7 @@ extern CComModule _Module;
 #include 
 #undef OPAQUE
 #include "CheckEnableAccessible.h"
+
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before 
the previous line.
 
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx 
b/winaccessibility/source/service/AccFrameEventListener.cxx
index a57fc3c..81b81ff 100755
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -32,20 +32,7 @@ using namespace com::sun::star::accessibility;
 
 #include 
 #include 
-
-//#ifndef _SV_SYSDATA_HXX
-#if 0
-#if defined( WIN ) || defined( WNT ) || defined( OS2 )
-typedef sal_Int32 HWND;
-typedef sal_Int32 HMENU;
-typedef sal_Int32 HDC;
-typedef void *PVOID;
-typedef PVOID HANDLE;
-typedef HANDLE HFONT;
-#endif
-#endif
 #include 
-//#endif
 
 
AccFrameEventListener::AccFrameEventListener(com::sun::star::accessibility::XAccessible*
 pAcc, AccObjectManagerAgent* Agent)
 :AccEventListener(pAcc, Agent)
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx 
b/winaccessibility/source/service/AccTopWindowListener.cxx
index 28d2b79..24cf2a0 100755
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -23,17 +23,6 @@
 #include 
 #include 
 
-//#ifndef _SV_SYSDATA_HXX
-#if 0
-#if defined( WIN ) || defined( WNT ) || defined( OS2 )
-typedef sal_Int32 HWND;
-typedef sal_Int32 HMENU;
-typedef sal_Int32 HDC;
-typedef void *PVOID;
-typedef PVOID HANDLE;
-typedef HANDLE HFONT;
-#endif
-#endif
 #include 
 
 #include "AccTopWindowListener.hxx"
@@ -53,11 +42,9 @@ using namespace com::sun::star::bridge;
 using namespace com::sun::star::awt;
 using namespace rtl;
 using namespace cppu;
-//
-// Construction/Destruction
-//
 
 AccTopWindowListener* g_pTop = NULL;
+
 //when proccess exit, call FreeTopWindowListener() in svmain
 void FreeTopWindowListener()
 {
@@ -73,7 +60,7 @@ void FreeTopWindowListener()
  */
 void handleWindowOpened_impl(long pAcc)
 {
-if( g_pTop && pAcc != NULL )
+if( g_pTop && pAcc != 0 )
 g_pTop->handleWindowOpened( 
(com::sun::star::accessibility::XAccessible*)((void*)pAcc) );
 }
 
@@ -106,7 +93,7 @@ void AccTopWindowListener::handleWindowOpened( 
com::sun::star::accessibility::XA
 //Only AccessibleContext exist, add all listeners
 if(pAccessibleContext != NULL && systemdata != NULL)
 {
-  accManagerAgent.SaveTopWindowHandle((long)(HWND)systemdata->hWnd,  
pAccessible);
+accManagerAgent.SaveTopWindowHandle((long)(HWND)systemdata->hWnd, 
pAccessible);
 
 AddAllListeners(pAccessible,NULL,(HWND)systemdata->hWnd);
 
@@ -115,7 +102,6 @@ void AccTopWindowListener::handleWindowOpened( 
com::sun::star::accessibility::XA
 
 short role = pAccessibleContext->getAccessibleRole();
 
-
 if (role == com::sun::star::accessibility::AccessibleRole::POPUP_MENU 
||
 role == com::sun::star::accessibility::AccessibleRole::MENU )
 {
@@ -147,20 +133,17 @@ AccTopWindowListener::~AccTopWindowListener()
  */
 void AccTopWindowListener::windowOpened( const 
::com::sun::star::lang::EventObject& e ) throw 
(::com::sun::star::uno::RuntimeException)
 {
+SAL_INFO( "iacc2", "windowOpen

[Libreoffice-commits] core.git: 2 commits - i18nlangtag/README i18npool/Library_localedata_others.mk i18npool/source instsetoo_native/util l10ntools/source scp2/source setup_native/source solenv/inc

[Eike Rathke]

 i18nlangtag/README   |2 
 i18npool/Library_localedata_others.mk|2 
 i18npool/source/localedata/data/kmr_Latn_TR.xml  |  442 +++
 i18npool/source/localedata/data/ku_TR.xml|  441 --
 i18npool/source/localedata/localedata.cxx|2 
 instsetoo_native/util/pack.lst   |2 
 l10ntools/source/ulfconv/msi-encodinglist.txt|2 
 scp2/source/accessories/module_samples_accessories.ulf   |4 
 scp2/source/accessories/module_templates_accessories.ulf |4 
 scp2/source/ooo/module_langpack.ulf  |4 
 setup_native/source/packinfo/spellchecker_selection.txt  |2 
 solenv/inc/langlist.mk   |2 
 12 files changed, 455 insertions(+), 454 deletions(-)

New commits:
commit 45d4b9b5e354578a81960c1b4b56e934f1e4b704
Author: Eike Rathke 
Date:   Mon Nov 18 22:23:10 2013 +0100

renamed ku* to kmr-Latn*, fdo#63460

Change-Id: I8069657d8829a0315c704e884a1cf15b26e02eb8

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index e80b8e7..f71d8d4 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -61,10 +61,10 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_kk_KZ \
CustomTarget/i18npool/localedata/localedata_kkw_CG \
CustomTarget/i18npool/localedata/localedata_km_KH \
+   CustomTarget/i18npool/localedata/localedata_kmr_Latn_TR \
CustomTarget/i18npool/localedata/localedata_kn_IN \
CustomTarget/i18npool/localedata/localedata_kng_CG \
CustomTarget/i18npool/localedata/localedata_ko_KR \
-   CustomTarget/i18npool/localedata/localedata_ku_TR \
CustomTarget/i18npool/localedata/localedata_ky_KG \
CustomTarget/i18npool/localedata/localedata_ldi_CG \
CustomTarget/i18npool/localedata/localedata_lg_UG \
diff --git a/i18npool/source/localedata/data/ku_TR.xml 
b/i18npool/source/localedata/data/kmr_Latn_TR.xml
similarity index 99%
rename from i18npool/source/localedata/data/ku_TR.xml
rename to i18npool/source/localedata/data/kmr_Latn_TR.xml
index 53f19ed..5b32766 100644
--- a/i18npool/source/localedata/data/ku_TR.xml
+++ b/i18npool/source/localedata/data/kmr_Latn_TR.xml
@@ -20,13 +20,14 @@
 
   
 
-  ku
+  qlt
   Kurdish
 
 
   TR
   Turkey
 
+kmr-Latn-TR
   
   
 
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index a8a6d3f..75edcf7 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -221,7 +221,7 @@ static const struct {
 { "ve_ZA",  lcl_DATA_OTHERS },
 { "nr_ZA",  lcl_DATA_OTHERS },
 { "ts_ZA",  lcl_DATA_OTHERS },
-{ "ku_TR",  lcl_DATA_OTHERS },
+{ "kmr_Latn_TR",  lcl_DATA_OTHERS },
 { "ak_GH",  lcl_DATA_OTHERS },
 { "af_NA",  lcl_DATA_OTHERS },
 { "am_ET",  lcl_DATA_OTHERS },
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 762721d..c728515 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -12,7 +12,7 @@ LibreOffice 
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntm
 #LibreOffice_Dev  
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro  
  en-US   openofficedev
 LibreOffice_SDK 
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  
en-US   sdkoo
 #LibreOffice_Dev_SDK  
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  
en-US   sdkoodev
-LibreOfficeLanguagepack 
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro 
en-US|ar|as|ast|be|bg|bn|ca|ca-valencia|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|si|sk|sl|sr|sr-Latn|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW
 ooolanguagepack
+LibreOfficeLanguagepack 
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro 
en-US|ar|as|ast|be|bg|bn|ca|ca-valencia|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kmr-Latn|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|si|sk|sl|sr|sr-Latn|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW
 ooolanguagepack
 #LibreOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi   
  de  ooolanguagepack
 #LibreOfficeDevLanguagepack   
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro  
   
ar|as|ast|bg|bn|ca|ca-valencia|cs|da|de|dz|el|en-GB|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|km|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ru|si|sk|sl|sr|sr-Latn|sv|ta|te|th|tr|ug|uk|vi|

[Libreoffice-commits] help.git: source/auxiliary

[Eike Rathke]

 source/auxiliary/kmr-Latn/default.css   |  108 +++
 source/auxiliary/kmr-Latn/highcontrast1.css |  109 
 source/auxiliary/kmr-Latn/highcontrast2.css |  109 
 source/auxiliary/kmr-Latn/highcontrastblack.css |  109 
 source/auxiliary/kmr-Latn/highcontrastwhite.css |  109 
 source/auxiliary/kmr-Latn/sbasic.cfg|   26 +
 source/auxiliary/kmr-Latn/scalc.cfg |   26 +
 source/auxiliary/kmr-Latn/schart.cfg|   26 +
 source/auxiliary/kmr-Latn/sdatabase.cfg |   26 +
 source/auxiliary/kmr-Latn/sdraw.cfg |   26 +
 source/auxiliary/kmr-Latn/simpress.cfg  |   26 +
 source/auxiliary/kmr-Latn/smath.cfg |   26 +
 source/auxiliary/kmr-Latn/swriter.cfg   |   26 +
 source/auxiliary/ku/default.css |  108 ---
 source/auxiliary/ku/highcontrast1.css   |  109 
 source/auxiliary/ku/highcontrast2.css   |  109 
 source/auxiliary/ku/highcontrastblack.css   |  109 
 source/auxiliary/ku/highcontrastwhite.css   |  109 
 source/auxiliary/ku/sbasic.cfg  |   26 -
 source/auxiliary/ku/scalc.cfg   |   26 -
 source/auxiliary/ku/schart.cfg  |   26 -
 source/auxiliary/ku/sdatabase.cfg   |   26 -
 source/auxiliary/ku/sdraw.cfg   |   26 -
 source/auxiliary/ku/simpress.cfg|   26 -
 source/auxiliary/ku/smath.cfg   |   26 -
 source/auxiliary/ku/swriter.cfg |   26 -
 26 files changed, 752 insertions(+), 752 deletions(-)

New commits:
commit aada8cbd4eb6e04bcf3df4282392f312073c2285
Author: Eike Rathke 
Date:   Mon Nov 18 22:16:08 2013 +0100

renamed ku* to kmr-Latn*, fdo#63460

Change-Id: I3f29acdbbf864a6e996daefe8ba4f39ede2dc92b

diff --git a/source/auxiliary/ku/default.css 
b/source/auxiliary/kmr-Latn/default.css
similarity index 100%
rename from source/auxiliary/ku/default.css
rename to source/auxiliary/kmr-Latn/default.css
diff --git a/source/auxiliary/ku/highcontrast1.css 
b/source/auxiliary/kmr-Latn/highcontrast1.css
similarity index 100%
rename from source/auxiliary/ku/highcontrast1.css
rename to source/auxiliary/kmr-Latn/highcontrast1.css
diff --git a/source/auxiliary/ku/highcontrast2.css 
b/source/auxiliary/kmr-Latn/highcontrast2.css
similarity index 100%
rename from source/auxiliary/ku/highcontrast2.css
rename to source/auxiliary/kmr-Latn/highcontrast2.css
diff --git a/source/auxiliary/ku/highcontrastblack.css 
b/source/auxiliary/kmr-Latn/highcontrastblack.css
similarity index 100%
rename from source/auxiliary/ku/highcontrastblack.css
rename to source/auxiliary/kmr-Latn/highcontrastblack.css
diff --git a/source/auxiliary/ku/highcontrastwhite.css 
b/source/auxiliary/kmr-Latn/highcontrastwhite.css
similarity index 100%
rename from source/auxiliary/ku/highcontrastwhite.css
rename to source/auxiliary/kmr-Latn/highcontrastwhite.css
diff --git a/source/auxiliary/ku/sbasic.cfg 
b/source/auxiliary/kmr-Latn/sbasic.cfg
similarity index 98%
rename from source/auxiliary/ku/sbasic.cfg
rename to source/auxiliary/kmr-Latn/sbasic.cfg
index 9aff398..4919d63 100644
--- a/source/auxiliary/ku/sbasic.cfg
+++ b/source/auxiliary/kmr-Latn/sbasic.cfg
@@ -19,7 +19,7 @@
 
 Title=%PRODUCTNAME Basic
 
-Language=ku
+Language=kmr-Latn
 Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
diff --git a/source/auxiliary/ku/scalc.cfg b/source/auxiliary/kmr-Latn/scalc.cfg
similarity index 98%
rename from source/auxiliary/ku/scalc.cfg
rename to source/auxiliary/kmr-Latn/scalc.cfg
index 89f0134..50fdd84 100644
--- a/source/auxiliary/ku/scalc.cfg
+++ b/source/auxiliary/kmr-Latn/scalc.cfg
@@ -19,7 +19,7 @@
 
 Title=%PRODUCTNAME Calc
 
-Language=ku
+Language=kmr-Latn
 Order=3
 Start=text%2Fscalc%2Fmain.xhp
 Heading=headingheading
diff --git a/source/auxiliary/ku/schart.cfg 
b/source/auxiliary/kmr-Latn/schart.cfg
similarity index 98%
rename from source/auxiliary/ku/schart.cfg
rename to source/auxiliary/kmr-Latn/schart.cfg
index e1b97d5..a43eff3 100644
--- a/source/auxiliary/ku/schart.cfg
+++ b/source/auxiliary/kmr-Latn/schart.cfg
@@ -18,7 +18,7 @@
 
 Title=%PRODUCTNAME Chart
 
-Language=ku
+Language=kmr-Latn
 Order=4
 Start=text%2Fschart%2Fmain.xhp
 Heading=headingheading
diff --git a/source/auxiliary/ku/sdatabase.cfg 
b/source/auxiliary/kmr-Latn/sdatabase.cfg
similarity index 98%
rename from source/auxiliary/ku/sdatabase.cfg
rename to source/auxiliary/kmr-Latn/sdatabase.cfg
index fa46802..344cebb 100644
--- a/source/auxiliary/ku/sdatabase.cfg
+++ b/source/auxiliary/kmr-Latn/sdatabase.cfg
@@ -19,7 +19,7 @@
 
 Title=%PRODUCTNAME Base
 
-Language=ku
+Language=kmr-Latn
 Order=7
 Start=text%2Fsha

[Libreoffice-commits] core.git: helpcontent2

[Eike Rathke]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b1407b9c2db1a45a7414ee7770b6f721fe6e947
Author: Eike Rathke 
Date:   Mon Nov 18 22:16:08 2013 +0100

Updated core
Project: help  aada8cbd4eb6e04bcf3df4282392f312073c2285

diff --git a/helpcontent2 b/helpcontent2
index bd79eeb..aada8cb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bd79eebd63807c29ef7509516291635efecd246a
+Subproject commit aada8cbd4eb6e04bcf3df4282392f312073c2285
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: kmr_Latn/description.xml kmr_Latn/dictionaries.xcu kmr_Latn/ferheng.org.png kmr_Latn/gpl-3.0.txt kmr_Latn/kmr_Latn.aff kmr_Latn/kmr_Latn.dic kmr_Latn/lgpl-2.1.t

[Eike Rathke]

 dev/null   |binary
 kmr_Latn/META-INF/manifest.xml |6 
 kmr_Latn/MPL-1.1.txt   |  470 
 kmr_Latn/README_kmr_Latn.txt   |   55 
 kmr_Latn/description.xml   |   25 
 kmr_Latn/dictionaries.xcu  |   20 
 kmr_Latn/ferheng.org.png   |binary
 kmr_Latn/gpl-3.0.txt   |  674 +
 kmr_Latn/kmr_Latn.aff  |  234 ++
 kmr_Latn/kmr_Latn.dic  | 4760 +
 kmr_Latn/lgpl-2.1.txt  |  504 
 kmr_Latn/license.txt   |9 
 ku_TR/META-INF/manifest.xml|6 
 ku_TR/MPL-1.1.txt  |  470 
 ku_TR/README_ku_TR.txt |   47 
 ku_TR/description.xml  |   25 
 ku_TR/dictionaries.xcu |   20 
 ku_TR/gpl-3.0.txt  |  674 -
 ku_TR/ku_TR.aff|  234 --
 ku_TR/ku_TR.dic| 4760 -
 ku_TR/lgpl-2.1.txt |  504 
 ku_TR/license.txt  |9 
 22 files changed, 6757 insertions(+), 6749 deletions(-)

New commits:
commit d626d8b18cbb14825632900a02c7291912855f73
Author: Eike Rathke 
Date:   Mon Nov 18 22:15:50 2013 +0100

renamed ku* to kmr-Latn*, fdo#63460

Change-Id: I678f0625438ff3caaeb892e4237b4428304f5ce3

diff --git a/ku_TR/META-INF/manifest.xml b/kmr_Latn/META-INF/manifest.xml
similarity index 100%
rename from ku_TR/META-INF/manifest.xml
rename to kmr_Latn/META-INF/manifest.xml
diff --git a/ku_TR/MPL-1.1.txt b/kmr_Latn/MPL-1.1.txt
similarity index 100%
rename from ku_TR/MPL-1.1.txt
rename to kmr_Latn/MPL-1.1.txt
diff --git a/ku_TR/README_ku_TR.txt b/kmr_Latn/README_kmr_Latn.txt
similarity index 83%
rename from ku_TR/README_ku_TR.txt
rename to kmr_Latn/README_kmr_Latn.txt
index e3a1d09..25a7686 100644
--- a/ku_TR/README_ku_TR.txt
+++ b/kmr_Latn/README_kmr_Latn.txt
@@ -45,3 +45,11 @@ then hand-checked by Ronahi and Tovj
 5. License
 
 Originally GPL, relicensed on 04-07-2007 to GPLv3, LGPLv3, MPL 1.1
+
+
+A. Changes to the original on 2013-11-18:
+   LibreOffice now uses proper ISO 639-3 language codes and ISO 15924 script
+   codes instead of the 'ku' macrolanguage code. All *ku_TR.* files have been
+   renamed to *kmr_Latn.* and the locales supported are kmr-Latn-TR and
+   kmr-Latn-SY instead of ku-TR and ku-SY.
+   See also https://bugs.freedesktop.org/show_bug.cgi?id=63460
diff --git a/ku_TR/description.xml b/kmr_Latn/description.xml
similarity index 100%
rename from ku_TR/description.xml
rename to kmr_Latn/description.xml
diff --git a/ku_TR/dictionaries.xcu b/kmr_Latn/dictionaries.xcu
similarity index 76%
rename from ku_TR/dictionaries.xcu
rename to kmr_Latn/dictionaries.xcu
index 7b438cf..e981477 100644
--- a/ku_TR/dictionaries.xcu
+++ b/kmr_Latn/dictionaries.xcu
@@ -2,15 +2,15 @@
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="Linguistic" 
oor:package="org.openoffice.Office">
  
 
-
+
 
-%origin%/ku_TR.aff %origin%/ku_TR.dic
+%origin%/kmr_Latn.aff %origin%/kmr_Latn.dic
 
 
 DICT_SPELL
 
 
-ku-TR ku-SY
+kmr-Latn-TR kmr-Latn-SY
 
 
 
diff --git a/ku_TR/ferheng.org.png b/kmr_Latn/ferheng.org.png
similarity index 100%
rename from ku_TR/ferheng.org.png
rename to kmr_Latn/ferheng.org.png
diff --git a/ku_TR/gpl-3.0.txt b/kmr_Latn/gpl-3.0.txt
similarity index 100%
rename from ku_TR/gpl-3.0.txt
rename to kmr_Latn/gpl-3.0.txt
diff --git a/ku_TR/ku_TR.aff b/kmr_Latn/kmr_Latn.aff
similarity index 100%
rename from ku_TR/ku_TR.aff
rename to kmr_Latn/kmr_Latn.aff
diff --git a/ku_TR/ku_TR.dic b/kmr_Latn/kmr_Latn.dic
similarity index 100%
rename from ku_TR/ku_TR.dic
rename to kmr_Latn/kmr_Latn.dic
diff --git a/ku_TR/lgpl-2.1.txt b/kmr_Latn/lgpl-2.1.txt
similarity index 100%
rename from ku_TR/lgpl-2.1.txt
rename to kmr_Latn/lgpl-2.1.txt
diff --git a/ku_TR/license.txt b/kmr_Latn/license.txt
similarity index 100%
rename from ku_TR/license.txt
rename to kmr_Latn/license.txt
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dictionaries translations

[Eike Rathke]

 dictionaries |2 +-
 translations |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4898079132a63409711668cc09b53991ddd8d093
Author: Eike Rathke 
Date:   Mon Nov 18 22:15:50 2013 +0100

Updated core
Project: dictionaries  d626d8b18cbb14825632900a02c7291912855f73

diff --git a/dictionaries b/dictionaries
index 96cb9a3..d626d8b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 96cb9a317f448f7c70afc3a81b532efacaabd456
+Subproject commit d626d8b18cbb14825632900a02c7291912855f73
commit a953cb7266ed483c6fca28d596e52f7004d61330
Author: Eike Rathke 
Date:   Mon Nov 18 22:15:21 2013 +0100

Updated core
Project: translations  7c6025ab17562741ebfd8d8ae2a8c9207b3f000a

diff --git a/translations b/translations
index 1e5e319..7c6025a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1e5e319682945255f7e519000c4a00fcefb5910f
+Subproject commit 7c6025ab17562741ebfd8d8ae2a8c9207b3f000a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Vendors Name via UNO API / Basic Macros

[Lionel Elie Mamane]

On Mon, Nov 18, 2013 at 09:10:34PM +0100, David Ostrovsky wrote:
> Lionel Elie Mamane wrote on Mon Nov 18 09:32:57 PST 2013

>>> On Mon, Nov 18, 2013 at 06:10:34PM +0100, Fernand Vanrie wrote:
>>> yep conversions are not the problem, its the exiting code who is
>>> broken in many places ?

>> What exiting code?

> This Basic-Macros excerpt:

> oDlg.getControl("myDateField").date = CDatetoIso(now())

> was broken in LibreOffice 4.1.1. The only known migration path is to
> adjust all broken places with:

> REM broken oDlg.getControl("myDateField").date = CDatetoIso(now())
> dim oDat as new com.sun.star.util.Date
> with oDat
>  .day = Day(now)
>  .month = Month(now)
>  .year = Year(now)
> end with
> oDlg.getControl("myDateField").date = oDat

> Now, if you have thousands LoC of Basic Macros, ...

I had understood "exiting code" as the return value of a procedure, so
I was completely lost as to what was meant. I now understand that
Fernand meant "exiSting" code, where code is not a value (a number /
string), but a piece of program.

On a sidenote,

oDlg.getControl("myDateField").date = CDatetoIso(now())

can be replaced by

oDlg.getControl("myDateField").date = CDateToUnoDate(now())

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

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

[Julien Nabet]

 connectivity/source/commontools/FValue.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5bacd0d1c49a31ec2dae671f5e842bfea4fe401c
Author: Julien Nabet 
Date:   Mon Nov 18 22:15:29 2013 +0100

Fix some wrong copy paste

Change-Id: I3ad6f62393cb22b350d6b50086963ebc7d2a8f5e

diff --git a/connectivity/source/commontools/FValue.cxx 
b/connectivity/source/commontools/FValue.cxx
index 2ce6da4..f39299b 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1561,9 +1561,9 @@ sal_uInt32 ORowSetValue::getUInt32()  const
 break;
 case DataType::BIGINT:
 if ( m_bSigned )
-nRet = static_cast(m_aValue.m_nInt64);
+nRet = static_cast(m_aValue.m_nInt64);
 else
-nRet = static_cast(m_aValue.m_uInt64);
+nRet = static_cast(m_aValue.m_uInt64);
 break;
 default:
 {
@@ -1692,7 +1692,7 @@ sal_uInt64 ORowSetValue::getULong()   const
 if ( m_bSigned )
 nRet = m_aValue.m_nInt8;
 else
-nRet = m_aValue.m_uInt16;
+nRet = m_aValue.m_uInt8;
 break;
 case DataType::SMALLINT:
 if ( m_bSigned )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/source/app/svdata.cxx|   10 +
 winaccessibility/source/service/msaaservice_impl.cxx |  144 ++-
 2 files changed, 59 insertions(+), 95 deletions(-)

New commits:
commit ab9710c4a2c0e42d8e3219d21e2f7a92b1f19b76
Author: Michael Meeks 
Date:   Mon Nov 18 20:46:56 2013 +

uia: cleanup msa service info and implement XComponent.

Change-Id: I00d19949a67147ef077bd92abc09ca8e8cf9a661

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 521b07c..0423b68 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -321,13 +321,19 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool 
&rCancelled)
 {
 css::uno::Reference< XComponentContext > 
xContext(comphelper::getProcessComponentContext());
 
-// Windows only but safe here
-if ( !getenv ("SAL_DISABLE_IACCESSIBLE2") )
+bool bTryIAcc2 = ( 
officecfg::Office::Common::Misc::ExperimentalMode::get( xContext ) &&
+   !getenv ("SAL_DISABLE_IACCESSIBLE2") );
+
+if ( bTryIAcc2 ) // Windows only really
 {
 // FIXME: convert to service ... pSVData->mxAccessBridge = 
css::accessibility::MSAAService::create( xContext );
 pSVData->mxAccessBridge = Reference< XComponent >( 
xContext->getServiceManager()->createInstanceWithContext( 
"com.sun.star.accessibility.MSAAService", xContext ), UNO_QUERY );
+
+SAL_INFO( "vcl", "IAccessible2 bridge is: " << 
(int)(pSVData->mxAccessBridge.is()) );
 return pSVData->mxAccessBridge.is();
 }
+else
+SAL_INFO( "vcl", "IAccessible2 disabled, falling back to java" 
);
 
 css::uno::Reference< XExtendedToolkit > xToolkit =
 css::uno::Reference< XExtendedToolkit 
>(Application::GetVCLToolkit(), UNO_QUERY);
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx 
b/winaccessibility/source/service/msaaservice_impl.cxx
index 99b6728..b96a86d 100755
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 #include 
 
@@ -51,78 +51,47 @@ extern void handleWindowOpened_impl( long pAcc);
 namespace my_sc_impl
 {
 
-/**
- * Method that returns the service name.
- * @param
- * @return Name sequence.
- */
 static Sequence< OUString > getSupportedServiceNames_MSAAServiceImpl()
 {
-static Sequence < OUString > *pNames = 0;
-if( ! pNames )
-{
-//  MutexGuard guard( Mutex::getGlobalMutex() );
-if( !pNames )
-{
-static Sequence< OUString > seqNames(1);
-seqNames.getArray()[0] = 
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.MSAAService"));
-pNames = &seqNames;
-}
-}
-return *pNames;
+Sequence< OUString > seqNames(1);
+seqNames.getArray()[0] = "com.sun.star.accessibility.MSAAService";
+return seqNames;
 }
 
-/**
-   * Method that returns the service name.
-   * @param
-   * @return Name sequence.
-   */
 static OUString getImplementationName_MSAAServiceImpl()
 {
-static OUString *pImplName = 0;
-if( ! pImplName )
-{
-//  MutexGuard guard( Mutex::getGlobalMutex() );
-if( ! pImplName )
-{
-static OUString implName( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.my_sc_implementation.MSAAService")
 );
-pImplName = &implName;
-}
-}
-return *pImplName;
+return OUString( 
"com.sun.star.accessibility.my_sc_implementation.MSAAService" );
 }
 
-class MSAAServiceImpl : public ::cppu::WeakImplHelper3<
-XMSAAService, lang::XServiceInfo, lang::XInitialization >
+class MSAAServiceImpl : public ::cppu::WeakImplHelper4<
+XMSAAService, lang::XServiceInfo,
+lang::XInitialization, lang::XComponent >
 {
 OUString m_arg;
 public:
-// focus on three given interfaces,
-// no need to implement XInterface, XTypeProvider, XWeak
+// focus on four interfaces,
+// no need to implement XInterface, XTypeProvider, XWeak etc.
 MSAAServiceImpl ();
 virtual ~MSAAServiceImpl( void );
+
 // XInitialization will be called upon 
createInstanceWithArguments[AndContext]()
-virtual void SAL_CALL initialize( Sequence< Any > const & args )
-throw (Exception);
+virtual void SAL_CALL initialize( Sequence< Any > const & args ) throw 
(Exception);
+
+// XComponent - as used by VCL to lifecycle manage this bridge.
+virtual void SAL_CALL dispose();
+virtual void SAL_CALL addEventListener( const ::css::uno::Reference< 
::css::lang::XEventListener >& xListener ){ /* dummy */ }
+virtual void SAL_CALL removeEventListener( const ::css::uno::Reference< 
::css::lang::XEventListener >& aListe

[Libreoffice-commits] core.git: i18nlangtag/README

[Eike Rathke]

 i18nlangtag/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85ee71de47df92631657fbad762f8454feea1b98
Author: Eike Rathke 
Date:   Mon Nov 18 21:35:52 2013 +0100

it's mnOverride

Change-Id: I9ad21610eb0f6059ff6e8475124e49b34e3e5df8

diff --git a/i18nlangtag/README b/i18nlangtag/README
index fd5cda5..e56e6e1 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -33,7 +33,7 @@ When changing a (translation's) language tag (for example, 
'ca-XV' to 'ca-valenc
 * i18nlangtag/source/isolang/isolang.cxx
 ** maintain the old tag's mapping entry in aImplIsoLangEntries to be able to 
read existing documents using that code
 ** add the new tag's mapping to aImplBcp47CountryEntries or 
aImplIsoLangScriptEntries
-** change mbOverrideExists from false to true in aImplIsoLangScriptEntries
+** change mnOverride from 0 to kSAME in aImplIsoLangScriptEntries or 
aImplIsoLangEntries
 
 * i18nlangtag/source/languagetag/languagetag.cxx
 ** add the new tag's fallback strings to the fallback of the old tag in 
LanguageTag::getFallbackStrings()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - translations wizards/com wizards/source

[Andras Timar]

 translations   |2 
 wizards/com/sun/star/wizards/agenda/AgendaDocument.py  |   15 ++--
 wizards/com/sun/star/wizards/letter/LetterWizardDialog.py  |   32 
+++---
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |3 
 wizards/source/formwizard/dbwizres.src |5 -
 5 files changed, 18 insertions(+), 39 deletions(-)

New commits:
commit 6877b8e8a29ce58143d596f9e5f1413d8152553c
Author: Andras Timar 
Date:   Mon Nov 18 21:39:03 2013 +0100

Updated core
Project: translations  1e5e319682945255f7e519000c4a00fcefb5910f

diff --git a/translations b/translations
index 6655f2f..1e5e319 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6655f2f0d0a0bc781fa6ed710e1141f7362e0697
+Subproject commit 1e5e319682945255f7e519000c4a00fcefb5910f
commit 1f7ddf3bbca4433089117d1aaec838554ea3
Author: Xisco Fauli 
Date:   Sun Nov 17 19:17:12 2013 +0100

fdo#69025 Remove unused text

Change-Id: I9fc60d52e1bc4b38b79e3e29ed1b04b3e8a777a1

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index e73142a..3176abd 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -580,7 +580,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
 (8, HelpIds.getHelpIdString(HID + 22),
 self.resources.reschkUseLogo_value,
-"chkUseLogo", 97, 54, 0, 3, 22, 212), self)
+"chkUseLogo", 97, 34, 0, 3, 22, 212), self)
 self.chkUseAddressReceiver = self.insertCheckBox(
 "chkUseAddressReceiver",
 LetterWizardDialogConst.CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
@@ -596,7 +596,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
 (8, HelpIds.getHelpIdString(HID + 23),
 self.resources.reschkUseAddressReceiver_value,
-"chkUseAddressReceiver", 97, 69, 0, 3, 23, 212), self)
+"chkUseAddressReceiver", 97, 49, 0, 3, 23, 212), self)
 self.chkUseSigns = self.insertCheckBox(
 "chkUseSigns",
 LetterWizardDialogConst.CHKUSESIGNS_ITEM_CHANGED,
@@ -612,7 +612,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
 (8, HelpIds.getHelpIdString(HID + 24),
 self.resources.reschkUseSigns_value,
-"chkUseSigns", 97, 82, 0, 3, 24, 212), self)
+"chkUseSigns", 97, 62, 0, 3, 24, 212), self)
 self.chkUseSubject = self.insertCheckBox(
 "chkUseSubject",
 LetterWizardDialogConst.CHKUSESUBJECT_ITEM_CHANGED,
@@ -628,7 +628,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
 (8, HelpIds.getHelpIdString(HID + 25),
 self.resources.reschkUseSubject_value,
-"chkUseSubject", 97, 98, 0, 3, 25, 212), self)
+"chkUseSubject", 97, 78, 0, 3, 25, 212), self)
 self.chkUseSalutation = self.insertCheckBox(
 "chkUseSalutation",
 LetterWizardDialogConst.CHKUSESALUTATION_ITEM_CHANGED,
@@ -644,7 +644,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
 (8, HelpIds.getHelpIdString(HID + 26),
 self.resources.reschkUseSalutation_value,
-"chkUseSalutation", 97, 113, 0, 3, 26, 66), self)
+"chkUseSalutation", 97, 93, 0, 3, 26, 66), self)
 self.lstSalutation = self.insertComboBox(
 "lstSalutation",
 LetterWizardDialogConst.LSTSALUTATION_ACTION_PERFORMED,
@@ -660,7 +660,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
 (True, 12, HelpIds.getHelpIdString(HID + 27),
-"lstSalutation", 210, 110, 3, 27, 74), self)
+"lstSalutation", 210, 90, 3, 27, 74), self)
 self.chkUseBendMarks = self.insertCheckBox(
 "chkUseBendMarks",
 LetterWizardDialogConst.CHKUSEBENDMARKS_ITEM_CHANGED,
@@ -676,7 +676,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
 (8, HelpIds.getHelpIdString(HID + 28),
 self.resources.reschkUseBendMarks_value,
-"chkUseBendMarks", 97, 127, 0, 3, 28, 212), self)
+"chkUseBendMarks", 97, 107, 0, 3, 28, 212), self)
 self.chkUseGreeting = self.insertCheckBox(
 "chkUseGreeting",
 LetterWizardDialogConst.CHKUSEGREETING_ITEM_CHANGED,
@@ -692,7 +692,7 @@ class LetterWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_WIDTH),
  

[Libreoffice-commits] core.git: download.lst external/curl RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |2 
 download.lst  |2 
 external/curl/ExternalPackage_curl.mk |4 -
 external/curl/UnpackedTarball_curl.mk |   10 +--
 external/curl/curl-7.26.0.patch   |   86 --
 external/curl/curl-7.26.0_mingw.patch |4 -
 external/curl/curl-7.26.0_strlcat.patch   |9 ---
 external/curl/curl-7.26.0_win-proxy.patch |   14 ++--
 external/curl/curl-7.26.0_win.patch   |   59 
 external/curl/curl-aix.patch  |   13 
 external/curl/curl-freebsd.patch.1|   32 +++
 external/curl/curl-msvc.patch.1   |   27 +
 12 files changed, 77 insertions(+), 185 deletions(-)

New commits:
commit 88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11
Author: Michael Stahl 
Date:   Mon Nov 11 14:42:13 2013 +0100

curl: upgrade to version 7.33.0

- from curl-7.26.0.patch:
  * drop ADDCFLAGS stuff, must be some dmake relic
  * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000
which is unsupported (and ws2_32.lib is linked anyway...)
  * split out curl-freebsd.patch.1
- curl-7.26.0_win.patch:
  * drop the library renaming stuff - can be handled in Package and
RepositoryExternal.mk without patch
  * rename the rest to curl-msvc.patch.1
- drop curl-aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop curl-7.26.0_strlcat.patch (obsolete)

Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0
Reviewed-on: https://gerrit.libreoffice.org/6642
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3dcca01..97d4bbf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2025,7 +2025,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl.lib \
+   $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/download.lst b/download.lst
index 757ddc2..ee63b4d 100644
--- a/download.lst
+++ b/download.lst
@@ -37,7 +37,7 @@ export CLUCENE_TARBALL := 
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.
 export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export CPPUNIT_TARBALL := 
ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
 export CT2N_TARBALL := 
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-export CURL_TARBALL := 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
+export CURL_TARBALL := 57409d6bf0bd97053b8378dbe0cadcef-curl-7.33.0.tar.bz2
 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index fa8b325..6e3c7fd 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -16,11 +16,11 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
 else ifeq ($(COM),MSC)
-$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).dll))
 else ifeq ($(OS),AIX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.3.0))
 endif
 
 endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 2e75f38..0516a31 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,20 +14,20 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
-   Makefile.msvc.names \
lib/Makefile.vc9 \
 ))
+
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
-   external/curl/curl-7.26.0.patch \
-   external/curl/curl-aix.patch \
-   external/curl/curl-7.26.0_win.patch \
+   external/curl/curl-freebsd.patch.1 \
+   external/curl/curl-msvc.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
-   external/curl/curl-7.26.0_strlcat.patch \

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/compiler.hxx|   15 +-
 sc/inc/externalrefmgr.hxx  |7 +
 sc/inc/tokenstringcontext.hxx  |4 
 sc/qa/unit/ucalc_formula.cxx   |   10 +
 sc/source/core/tool/compiler.cxx   |  172 -
 sc/source/core/tool/token.cxx  |   35 +
 sc/source/core/tool/tokenstringcontext.cxx |   17 ++
 sc/source/ui/docshell/externalrefmgr.cxx   |   14 ++
 8 files changed, 168 insertions(+), 106 deletions(-)

New commits:
commit 4ab50bff9d446a049f7704e2ce77b1907447bf3a
Author: Kohei Yoshida 
Date:   Mon Nov 18 15:26:05 2013 -0500

Handle external reference bits too. This is the last missing piece.

Change-Id: Ib1dd18bb5a8d70c53722ac91e2340d05bbc7798a

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index c072cfd..d5b4d7f 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -586,6 +586,13 @@ public:
  * @return const OUString* external document URI.
  */
 const OUString* getExternalFileName(sal_uInt16 nFileId, bool 
bForceOriginal = false);
+
+/**
+ * Get all cached external file names as an array. Array indices of the
+ * returned name array correspond with external file ID's.
+ */
+std::vector getAllCachedExternalFileNames() const;
+
 bool hasExternalFile(sal_uInt16 nFileId) const;
 bool hasExternalFile(const OUString& rFile) const;
 const SrcFileData* getExternalFileData(sal_uInt16 nFileId) const;
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index 7af90eb..85b61f7 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -27,6 +27,7 @@ namespace sc {
 struct SC_DLLPUBLIC TokenStringContext
 {
 typedef boost::unordered_map IndexNameMapType;
+typedef boost::unordered_map > 
IndexNamesMapType;
 typedef boost::unordered_map TabIndexMapType;
 
 formula::FormulaGrammar::Grammar meGram;
@@ -39,6 +40,9 @@ struct SC_DLLPUBLIC TokenStringContext
 TabIndexMapType maSheetRangeNames;
 IndexNameMapType maNamedDBs;
 
+std::vector maExternalFileNames;
+IndexNamesMapType maExternalCachedTabNames;
+
 TokenStringContext( const ScDocument* pDoc, 
formula::FormulaGrammar::Grammar eGram );
 };
 
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 7ae2554..6db441c 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -115,11 +115,21 @@ void Test::testFormulaCreateStringFromTokens()
 "SUM(sheetx;x;y;z)", // sheet local and global named ranges mixed
 "MAX(Table1)+MIN(Table2)*SUM(Table3)", // database ranges
 "{1;TRUE;3|FALSE;5;\"Text\"|;;}", // inline matrix
+"SUM('file:///path/to/fake.file'#$Sheet.A1:B10)",
 };
 
 boost::scoped_ptr pArray;
 
 sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+
+// Artificially add external refererence data after the context object is
+// initialized.
+aCxt.maExternalFileNames.push_back("file:///path/to/fake.file");
+std::vector aExtTabNames;
+aExtTabNames.push_back("Sheet");
+aCxt.maExternalCachedTabNames.insert(
+sc::TokenStringContext::IndexNamesMapType::value_type(0, 
aExtTabNames));
+
 ScAddress aPos(0,0,0);
 
 for (size_t i = 0, n = SAL_N_ELEMENTS(aTests); i < n; ++i)
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ff7294e..c5e4fd1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3181,7 +3181,40 @@ void appendTokenByType( sc::TokenStringContext& rCxt, 
OUStringBuffer& rBuf, cons
 {
 if (rToken.IsExternalRef())
 {
-// TODO : Implement this.
+size_t nFileId = rToken.GetIndex();
+OUString aTabName = rToken.GetString().getString();
+if (nFileId >= rCxt.maExternalFileNames.size())
+// out of bound
+return;
+
+OUString aFileName = rCxt.maExternalFileNames[nFileId];
+
+switch (rToken.GetType())
+{
+case svExternalName:
+rBuf.append(rCxt.mpRefConv->makeExternalNameStr(aFileName, 
aTabName));
+break;
+case svExternalSingleRef:
+rCxt.mpRefConv->makeExternalRefStr(
+   rBuf, rPos, aFileName, aTabName, static_cast(rToken).GetSingleRef());
+break;
+case svExternalDoubleRef:
+{
+sc::TokenStringContext::IndexNamesMapType::const_iterator it =
+rCxt.maExternalCachedTabNames.find(nFileId);
+
+if (it == rCxt.maExternalCachedTabNames.end())
+return;
+
+rCxt.mpRefConv->makeExternalRefStr(
+rBuf, rPos, aFileName, it->second, aTabName, 
static_cast(rToken).GetDoubleRef());
+}
+break;
+default:
+// warning, not error, otherwise we may end up 

[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source include/i18nlangtag svtools/source

[Eike Rathke]

 i18nlangtag/qa/cppunit/test_languagetag.cxx|8 
 i18nlangtag/source/isolang/isolang.cxx |   21 
 i18nlangtag/source/isolang/mslangid.cxx|   20 +++
 i18nlangtag/source/languagetag/languagetag.cxx |   43 +
 include/i18nlangtag/lang.h |6 ++-
 svtools/source/misc/langtab.src|9 ++---
 6 files changed, 94 insertions(+), 13 deletions(-)

New commits:
commit 6a826ddc4ee40a9727131cd4b13365bf6ae16319
Author: Eike Rathke 
Date:   Mon Nov 18 21:07:43 2013 +0100

cleaned up ISO code usage for Kurdish, fdo#63460

* instead of the 'ku' macrolanguage code use proper ISO 639-3 codes and
  use 'Latn' script with 'kmr'
* use MS-LCID 0x0492 for Central Kurdish (Iraq) [ckb-IQ]
* added Southern Kurdish (Iraq) [sdh-IQ]

Change-Id: Iaee8be98d0659a0e7bbf041e60025dd1f771066f

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 17217fd..8946969 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -625,6 +625,14 @@ static bool checkMapping( const OUString rStr1, const 
OUString& rStr2 )
 if (rStr1 == "yi-Hebr-IL"  ) return rStr2 == "yi-IL";
 if (rStr1 == "ha-NG"   ) return rStr2 == "ha-Latn-NG";
 if (rStr1 == "ha-GH"   ) return rStr2 == "ha-Latn-GH";
+if (rStr1 == "ku-Arab-IQ"  ) return rStr2 == "ckb-IQ";
+if (rStr1 == "ku-Arab" ) return rStr2 == "ckb";
+if (rStr1 == "kmr-TR"  ) return rStr2 == "kmr-Latn-TR";
+if (rStr1 == "ku-TR"   ) return rStr2 == "kmr-Latn-TR";
+if (rStr1 == "kmr-SY"  ) return rStr2 == "kmr-Latn-SY";
+if (rStr1 == "ku-SY"   ) return rStr2 == "kmr-Latn-SY";
+if (rStr1 == "ku-IQ"   ) return rStr2 == "ckb-IQ";
+if (rStr1 == "ku-IR"   ) return rStr2 == "ckb-IR";
 return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index f9f34a5..5505540 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -506,10 +506,17 @@ static IsoLanguageCountryEntry const 
aImplIsoLangEntries[] =
 { LANGUAGE_OBSOLETE_USER_LOWER_SORBIAN,"dsb", "DE", 0 },
 { LANGUAGE_OCCITAN_FRANCE,  "oc", "FR", 0 },
 { LANGUAGE_OBSOLETE_USER_OCCITAN,   "oc", "FR", 0 },
-{ LANGUAGE_USER_KURDISH_TURKEY, "ku", "TR", 0 },
-{ LANGUAGE_USER_KURDISH_SYRIA,  "ku", "SY", 0 },
-{ LANGUAGE_USER_KURDISH_IRAQ,   "ku", "IQ", 0 },
-{ LANGUAGE_USER_KURDISH_IRAN,   "ku", "IR", 0 },
+{ LANGUAGE_USER_KURDISH_TURKEY,"kmr", "TR", kSAME },
+{ LANGUAGE_USER_KURDISH_TURKEY, "ku", "TR", kSAME },
+{ LANGUAGE_USER_KURDISH_SYRIA, "kmr", "SY", kSAME },
+{ LANGUAGE_USER_KURDISH_SYRIA,  "ku", "SY", kSAME },
+{ LANGUAGE_KURDISH_ARABIC_IRAQ,"ckb", "IQ", 0 },
+{ LANGUAGE_KURDISH_ARABIC_IRAQ, "ku", "IQ", kSAME },
+{ LANGUAGE_OBSOLETE_USER_KURDISH_IRAQ,  "ku", "IQ", 
LANGUAGE_KURDISH_ARABIC_IRAQ },
+{ LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ, "sdh", "IQ", 0 },
+{ LANGUAGE_USER_KURDISH_IRAN,  "ckb", "IR", 0 },
+{ LANGUAGE_USER_KURDISH_IRAN,   "ku", "IR", kSAME },
+{ LANGUAGE_KURDISH_ARABIC_LSO, "ckb", ""  , 0 },
 { LANGUAGE_USER_SARDINIAN,  "sc", "IT", 0 },// 
macrolanguage code
 { LANGUAGE_USER_SARDINIAN_CAMPIDANESE, "sro", "IT", 0 },
 { LANGUAGE_USER_SARDINIAN_GALLURESE,   "sdn", "IT", 0 },
@@ -697,8 +704,10 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_LATIN_LSO,   "la-Latn", ""  , kSAME },  
 // MS, though Latn is suppress-script
 { LANGUAGE_TAI_NUA_CHINA,  "tdd-Tale", "CN", 0 },  
 // MS reserved
 { LANGUAGE_LU_CHINA,   "khb-Talu", "CN", 0 },  
 // MS reserved
-{ LANGUAGE_KURDISH_ARABIC_IRAQ, "ku-Arab", "IQ", 0 },  
 // macrolanguage code, MS
-{ LANGUAGE_KURDISH_ARABIC_LSO,  "ku-Arab", ""  , 0 },  
 // macrolanguage code
+{ LANGUAGE_KURDISH_ARABIC_IRAQ, "ku-Arab", "IQ", kSAME },  
 // macrolanguage code, MS
+{ LANGUAGE_KURDISH_ARABIC_LSO,  "ku-Arab", ""  , kSAME },  
 // macrolanguage code, MS
+{ LANGUAGE_USER_KURDISH_TURKEY,"kmr-Latn", "TR", 0 },
+{ LANGUAGE_USER_KURDISH_SYRIA, "kmr-Latn", "SY", 0 },
 { LANGUAGE_PUNJABI_PAKISTAN,   "pnb-Arab", "PK", 0 },
 { LANGUAGE_PUNJABI_ARABIC_LSO, "pnb-Arab", ""  , 0 },
 { LANGUAGE_PUNJABI_PAKISTAN,"pa-Arab", "PK", 0 },  
 // MS, incorrect
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Armin Le Grand]

 svx/source/unodraw/UnoGraphicExporter.cxx |   91 ++
 1 file changed, 69 insertions(+), 22 deletions(-)

New commits:
commit 6e3fb2a5c7ad75fe10e0e1b1a8de0863f3b1ac23
Author: Armin Le Grand 
Date:   Mon Sep 2 12:13:37 2013 +

Resolves: #i122820# Corrected graphics creation...

allow bigger limits if directly requested

(cherry picked from commit 50f1445bda91cb44a1a1e8636ab0bcb6a8c4f381)

Signed-off-by: Andras Timar 

Conflicts:
svx/source/unodraw/UnoGraphicExporter.cxx

Change-Id: I33576ef9f95b9f8a9fa0ab6f6d83c93ecec8da9f

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index fb9e790..5480f24 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -210,6 +210,7 @@ namespace svx
 {
 // use new primitive conversion tooling
 basegfx::B2DRange aRange(basegfx::B2DPoint(0.0, 0.0));
+sal_uInt32 nMaximumQuadraticPixels(50);
 
 if(pSize)
 {
@@ -218,6 +219,10 @@ namespace svx
 const Size 
aSize100th(Application::GetDefaultDevice()->PixelToLogic(*pSize, 
MapMode(MAP_100TH_MM)));
 
 aRange.expand(basegfx::B2DPoint(aSize100th.Width(), 
aSize100th.Height()));
+
+// when explicitely pixels are requested from the 
GraphicExporter, use a *very* high limit
+// of 16gb (4096x4096 pixels), else use the default for the 
converters
+nMaximumQuadraticPixels = std::min(sal_uInt32(4096 * 4096), 
sal_uInt32(pSize->Width() * pSize->Height()));
 }
 else
 {
@@ -227,13 +232,42 @@ namespace svx
 aRange.expand(basegfx::B2DPoint(aSize100th.Width(), 
aSize100th.Height()));
 }
 
-aBmpEx = convertMetafileToBitmapEx(rMtf, aRange);
+aBmpEx = convertMetafileToBitmapEx(rMtf, aRange, 
nMaximumQuadraticPixels);
 }
 else
 {
 const SvtOptionsDrawinglayer aDrawinglayerOpt;
+Size aTargetSize(0, 0);
+
+if(pSize)
+{
+// #i122820# If a concrete target size in pixels is given, use 
it
+aTargetSize = *pSize;
+
+// get hairline and full bound rect to evtl. reduce given 
target pixel size when
+// it is known that it will be expanded to get the right and 
bottom hairlines right
+Rectangle aHairlineRect;
+const Rectangle 
aRect(rMtf.GetBoundRect(*Application::GetDefaultDevice(), &aHairlineRect));
+
+if(!aRect.IsEmpty() && !aHairlineRect.IsEmpty())
+{
+if(aRect.Right() == aHairlineRect.Right() || 
aRect.Bottom() == aHairlineRect.Bottom())
+{
+if(aTargetSize.Width())
+{
+aTargetSize.Width() -= 1;
+}
+
+if(aTargetSize.Height())
+{
+aTargetSize.Height() -= 1;
+}
+}
+}
+}
+
 const GraphicConversionParameters aParameters(
-pSize ? *pSize : Size(0, 0),
+aTargetSize,
 true, // allow unlimited size
 aDrawinglayerOpt.IsAntiAliasing(),
 aDrawinglayerOpt.IsSnapHorVerLinesToDiscrete());
@@ -414,26 +448,39 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* 
pPage, sal_uIntPtr nWid
 }
 
 pVDev->SetMapMode( aMM );
-#ifdef DBG_UTIL
-bool bAbort = !
-#endif
-pVDev->SetOutputSize(aPageSize);
-DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt");
-
-SdrView* pView = new SdrView(mpDoc, pVDev);
-pView->SetPageVisible( sal_False );
-pView->SetBordVisible( sal_False );
-pView->SetGridVisible( sal_False );
-pView->SetHlplVisible( sal_False );
-pView->SetGlueVisible( sal_False );
-pView->ShowSdrPage(pPage);
-Region aRegion (Rectangle( aPoint, aPageSize ) );
-
-ImplExportCheckVisisbilityRedirector aRedirector( mpCurrentPage );
-
-pView->CompleteRedraw(pVDev, aRegion, &aRedirector);
-
-delete pView;
+bool bSuccess(false);
+
+// #i122820# If available, use pixel size directly
+if(nWidthPixel && nHeightPixel)
+{
+bSuccess = pVDev->SetOutputSizePixel(Size(nWidthPixel, nHeightPixel));
+}
+else
+{
+bSuccess = pVDev->SetOutputSize(aPageSize);
+}
+
+if(bSuccess)
+{
+SdrView* pView = new SdrView(mpDoc, pVDev);
+pView->SetPageVisible( sal_False );
+pView->SetBordVisible( sal_False );
+pView->SetGridVisible( sal_False );
+pView->SetHlplVisible( sal_False );
+pView->SetGlueVisible( sal_False );
+pView->ShowSdrPage(pPage);

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 463f3d566c7885c0b74d77820279ceac42bb380d
Author: Christian Lohmaier 
Date:   Mon Nov 18 20:05:53 2013 +0100

update to 4.0.6 and 4.1.3

doesn't help to do the changes locally without pushing them...

diff --git a/check.php b/check.php
index 64c23f1..79ac091 100644
--- a/check.php
+++ b/check.php
@@ -218,6 +218,7 @@ $build_hash_to_version = array(
 
 # 4.0.6 versions
 '7168152d13aa529ba3718c9ae3700216a574137' => '4.0.6.1',
+'2e2573268451a50806fcd60ae2d9fe01dd0ce24' => '4.0.6.1', # Final
 
 ##
 # 4.1.0 versions
@@ -242,6 +243,11 @@ $build_hash_to_version = array(
 '40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38' => '4.1.2.3', # unscheduled, 
Final
 # 4.1.3
 'b42498da0e3f91b17e51b55c8295ec4f8f22087' => '4.1.3.1',
+'70feb7d99726f064edab4605a8ab840c50ec57a' => '4.1.3.2', # Final
+
+##
+# 4.2.0 versions
+'c2b9ad37f8a8de9c7dbdd76c86aecf638810705' => '4.2.0.0.a1', # alpha1
 );
 
 # Descriptions of the target versions
@@ -254,18 +260,18 @@ $build_hash_to_version = array(
 #   where '' and '' will be substitued with the right value
 #   NOTE: '&' in the URL has to be escaped as &
 $update_map = array(
-'stable' => array('gitid'   => 
'5464147a081647a250913f19c0715bca595af2f',
-  'id'  => 'LibreOffice 4.0.5',
-  'version' => '4.0.5',
+'stable' => array('gitid'   => 
'2e2573268451a50806fcd60ae2d9fe01dd0ce24',
+  'id'  => 'LibreOffice 4.0.6',
+  'version' => '4.0.6',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=4.0.5',
+  'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=4.0.6',
   'substitute'  => true ),
 
-'latest' => array('gitid'   => 
'40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38',
-  'id'  => 'LibreOffice 4.1.2',
-  'version' => '4.1.2',
+'latest' => array('gitid'   => 
'70feb7d99726f064edab4605a8ab840c50ec57a',
+  'id'  => 'LibreOffice 4.1.3',
+  'version' => '4.1.3',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=4.1.2',
+  'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=4.1.3',
   'substitute'  => true ),
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Vendors Name via UNO API / Basic Macros

[David Ostrovsky]

Lionel Elie Mamane wrote on Mon Nov 18 09:32:57 PST 2013

>> On Mon, Nov 18, 2013 at 06:10:34PM +0100, Fernand Vanrie wrote:
>> yep conversions are not the problem, its the exiting code who is
>> broken in many places ?

>What exiting code?

This Basic-Macros excerpt:

oDlg.getControl("myDateField").date = CDatetoIso(now())

was broken in LibreOffice 4.1.1. The only known migration path is to
adjust all broken places with:

REM broken oDlg.getControl("myDateField").date = CDatetoIso(now())
dim oDat as new com.sun.star.util.Date
with oDat
 .day = Day(now)
 .month = Month(now)
 .year = Year(now)
end with
oDlg.getControl("myDateField").date = oDat

Now, if you have thousands LoC of Basic Macros, ...

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

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

[Maxim Monastirsky]

 configure.ac |4 
 1 file changed, 4 insertions(+)

New commits:
commit 7cbf4629eadfe0f3da611ee0430a3ab6f2bd33ff
Author: Maxim Monastirsky 
Date:   Mon Nov 18 17:49:51 2013 +0200

fdo#65124 define HAVE_FMERGENEUTRALITEMS for MSVC build

It has been added because mingw headers are missing
fMergeNeutralItems in SCRIPT_CONTROL struct
(see commit f6deda85ef4f28426c09fab7205f274922af3d96),
so there is no apparent reason to disable it for MSVC.
It also resolves fdo#65124.

Change-Id: I4b7381f076c213f12f32cf03e2c0f321ccb1c4ce
Reviewed-on: https://gerrit.libreoffice.org/6711
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 0de54c6..44dcde8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5665,6 +5665,10 @@ using namespace std;
 AC_SUBST(MINGW_GXXDLL)
 fi
 
+if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+AC_DEFINE(HAVE_FMERGENEUTRALITEMS)
+fi
+
 if test "$WITH_MINGW" = "yes"; then
 AC_MSG_CHECKING([for fMergeNeutralItems in SCRIPT_CONTROL])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2eda905a2a843634f48b7a5ceb490505f9da5259
Author: Christian Lohmaier 
Date:   Mon Nov 18 20:07:55 2013 +0100

typo - actually 4.0.6.2

diff --git a/check.php b/check.php
index 79ac091..1017cc4 100644
--- a/check.php
+++ b/check.php
@@ -218,7 +218,7 @@ $build_hash_to_version = array(
 
 # 4.0.6 versions
 '7168152d13aa529ba3718c9ae3700216a574137' => '4.0.6.1',
-'2e2573268451a50806fcd60ae2d9fe01dd0ce24' => '4.0.6.1', # Final
+'2e2573268451a50806fcd60ae2d9fe01dd0ce24' => '4.0.6.2', # Final
 
 ##
 # 4.1.0 versions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tml/opencl-background-compilation' - 2 commits - sc/Module_sc.mk sc/source

[Tor Lillqvist]

 sc/Module_sc.mk |4 --
 sc/source/core/data/formulacell.cxx |   49 ++--
 2 files changed, 37 insertions(+), 16 deletions(-)

New commits:
commit 5783999465fe01fac923d2d5d764a0334bbe195c
Author: Tor Lillqvist 
Date:   Mon Nov 18 20:43:09 2013 +0200

Enable sc_opencl_test again

Change-Id: I28079dbda04529b1d9a63aca04a1a6b95ca4aa14

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index c4a38ee..2ca7ad2 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -47,13 +47,11 @@ $(eval $(call gb_Module_add_targets,sc,\
 
 endif
 
-# Disabled because fails on too many machines in
-# the OpenCL compiler
-# CppunitTest_sc_opencl_test \
 $(eval $(call gb_Module_add_check_targets,sc,\
 CppunitTest_sc_ucalc \
 CppunitTest_sc_filters_test \
 CppunitTest_sc_rangelst_test \
+CppunitTest_sc_opencl_test \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
commit 389570d1133d7307f02f8a7b2f899d453511d5b3
Author: Tor Lillqvist 
Date:   Mon Nov 18 20:27:48 2013 +0200

Try to make the background OpenCL compilation conditional at run-time

Change-Id: I2366465f4e786f905c32b17a15c16486c4c21d38

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index cf4516d..8a7d644 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "formulacell.hxx"
+#include "grouptokenconverter.hxx"
 
 #include "compiler.hxx"
 #include "document.hxx"
@@ -414,14 +415,18 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
 mbSubTotal(false),
 meCalcState(sc::GroupCalcEnabled)
 {
-if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+static bool bBackgroundCompilation = getenv("SC_BACKGROUND_COMPILATION") 
!= NULL;
+if (bBackgroundCompilation)
 {
-osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
-if (mnCount++ == 0)
+if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
 {
-assert(!mxCLKernelThread.is());
-mxCLKernelThread.set(new sc::CLBuildKernelThread);
-mxCLKernelThread->launch();
+osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
+if (mnCount++ == 0)
+{
+assert(!mxCLKernelThread.is());
+mxCLKernelThread.set(new sc::CLBuildKernelThread);
+mxCLKernelThread->launch();
+}
 }
 }
 }
@@ -431,7 +436,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup()
 if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
 {
 osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
-if (--mnCount == 0)
+if (--mnCount == 0 && mxCLKernelThread.is())
 {
 assert(mxCLKernelThread.is());
 mxCLKernelThread->finish();
@@ -3480,17 +3485,35 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (mxGroup->mbInvariant && false)
 return InterpretInvariantFormulaGroup();
 
-ScTokenArray aDummy;
 if (mxGroup->meCalcState == sc::GroupCalcEnabled)
+{
+ScTokenArray aCode;
+ScAddress aTopPos = aPos;
+aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
+ScGroupTokenConverter aConverter(aCode, *pDocument, *this, 
mxGroup->mpTopCell->aPos);
+if (!aConverter.convert(*pCode))
+{
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
 mxGroup->meCalcState = sc::GroupCalcRunning;
-if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aDummy))
+if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aCode))
+{
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
+mxGroup->meCalcState = sc::GroupCalcEnabled;
+}
+else
 {
-mxGroup->meCalcState = sc::GroupCalcDisabled;
-return false;
+ScTokenArray aDummy;
+if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aDummy))
+{
+mxGroup->meCalcState = sc::GroupCalcDisabled;
+return false;
+}
 }
 
-if (mxGroup->meCalcState == sc::GroupCalcRunning)
-mxGroup->meCalcState = sc::GroupCalcEnabled;
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/formulagroup.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4f096fbaeba808148e83410f4c64705047ce888f
Author: Kohei Yoshida 
Date:   Mon Nov 18 13:27:01 2013 -0500

Don't forget to generate RPN tokens here.

Change-Id: I03a0e0d9f82e9c8881b0ff225ba0b476a693afb1

diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 072f162..8eb1fde 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -424,6 +424,8 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument& 
rDoc, const ScAddres
 if (!pDest)
 return false;
 
+ScCompiler aComp(&rDoc, aTmpPos, aCode2);
+aComp.CompileTokenArray();
 ScInterpreter aInterpreter(pDest, &rDoc, aTmpPos, aCode2);
 aInterpreter.Interpret();
 aResults.push_back(aInterpreter.GetResultToken());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/source/app/svdata.cxx  |3 +
 vcl/source/window/window.cxx   |4 +-
 vcl/win/source/window/salframe.cxx |   13 
 winaccessibility/source/service/msaaservice_impl.cxx   |   21 ++---
 winaccessibility/source/service/winaccessibility.component |2 -
 5 files changed, 24 insertions(+), 19 deletions(-)

New commits:
commit dd327cc57ee4e718efe9b1657f22975768a624bf
Author: Michael Meeks 
Date:   Mon Nov 18 18:02:24 2013 +

uia: get component namespacing right.

Change-Id: Iaa985703507657c2800d8912b1d46db321aae7f1

diff --git a/winaccessibility/source/service/msaaservice_impl.cxx 
b/winaccessibility/source/service/msaaservice_impl.cxx
index b570446..99b6728 100755
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -373,12 +373,12 @@ static struct ::cppu::ImplementationEntry 
s_component_entries [] =
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL 
iacc2_component_getImplementationEnvironment(
 sal_Char const ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
 *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL iacc2_component_getFactory(
 sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
 registry::XRegistryKey * xRegistry )
 {
diff --git a/winaccessibility/source/service/winaccessibility.component 
b/winaccessibility/source/service/winaccessibility.component
index 3a73858..71ea6de 100644
--- a/winaccessibility/source/service/winaccessibility.component
+++ b/winaccessibility/source/service/winaccessibility.component
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-http://openoffice.org/2010/uno-components";>
   
 
commit b5ace73de803b30b8fa585f0d7b164fc38da2ac2
Author: Michael Meeks 
Date:   Mon Nov 18 18:30:00 2013 +

fix silly compile issues.

Change-Id: I6af3f6f894bb04ddd76635b5a68def207d078256

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 072aa9e..521b07c 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -324,7 +324,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool 
&rCancelled)
 // Windows only but safe here
 if ( !getenv ("SAL_DISABLE_IACCESSIBLE2") )
 {
-pSVData->mxAccessBridge = 
css::accessibility::MSAAService::create( xContext );
+// FIXME: convert to service ... pSVData->mxAccessBridge = 
css::accessibility::MSAAService::create( xContext );
+pSVData->mxAccessBridge = Reference< XComponent >( 
xContext->getServiceManager()->createInstanceWithContext( 
"com.sun.star.accessibility.MSAAService", xContext ), UNO_QUERY );
 return pSVData->mxAccessBridge.is();
 }
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d4b8ebb..90a15d9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8851,7 +8851,7 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
 
 case WINDOW_FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; 
break;
 case WINDOW_FIXEDLINE:
-if( GetText().Len() > 0 )
+if( !GetText().isEmpty() )
 nRole = accessibility::AccessibleRole::LABEL;
 else
 nRole = accessibility::AccessibleRole::SEPARATOR;
@@ -8938,7 +8938,7 @@ void Window::SetAccessibleName( const OUString& rName )
if ( !mpWindowImpl->mpAccessibleInfos )
 mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
 
-String oldName = GetAccessibleName();
+OUString oldName = GetAccessibleName();
 
 delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
 mpWindowImpl->mpAccessibleInfos->pAccessibleName = new OUString( rName );
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 5a2149b..8ee2cae 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5484,7 +5484,7 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam 
)
 
 // ---
 
-static bool ImplHandleIMENotify( HWND hWnd, LPARAM lParam, WPARAM wParam, long 
&nRet )
+static bool ImplHandleGetObject( HWND hWnd, LPARAM lParam, WPARAM wParam, long 
&nRet )
 {
 // IA2 should be enabled automatically
 AllSettings aSettings = Application::GetSettings();
@@ -5496,22 +5496,25 @@ static bool ImplHandleIMENotify( HWND hWnd, LPARAM 
lParam, WPARAM wParam, long &
 if (!Application::GetSettings().GetMiscSettings().GetEnableATTo

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

--- Comment #114 from jl...@mail.com ---
adding Bug 71248 - when multiple spreadsheets containing VBA macros are opened
simultaneously, the last opened document is always considered the "Active"
Document/Worksheet/Cell, even if a previous spreadsheet has the focus. 
Additionally, if the "last opened" document is closed, references to something
in the "Active" context fail completely.

-- 
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: Branch 'private/kohei/xlsx-import-speedup' - 5 commits - formula/source sc/inc sc/qa sc/source

[Kohei Yoshida]

Rebased ref, commits from common ancestor:
commit be4d4f4f700bf4265deb16c173f996cba2980f84
Author: Kohei Yoshida 
Date:   Fri Nov 15 21:52:43 2013 -0500

Try not to pass ScCompiler as a parameter.

Change-Id: I7ef58f0455f11a3eb2ac88ec76e9436fb48a74e2

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index c780cca..b6251f7 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -252,11 +252,11 @@ public:
 
 virtual OUString makeExternalNameStr( const OUString& rFile, const 
OUString& rName ) const = 0;
 
-virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const 
ScCompiler& rCompiler,
+virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const 
ScAddress& rPos,
  sal_uInt16 nFileId, const OUString& 
rTabName, const ScSingleRefData& rRef,
  ScExternalRefManager* pRefMgr ) const 
= 0;
 
-virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const 
ScCompiler& rCompiler,
+virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const 
ScAddress& rPos,
  sal_uInt16 nFileId, const OUString& 
rTabName, const ScComplexRefData& rRef,
  ScExternalRefManager* pRefMgr ) const 
= 0;
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index dee954b..d3e696e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -857,7 +857,7 @@ struct ConventionOOO_A1 : public Convention_A1
 return true;
 }
 
-void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& 
rCompiler,
+void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScAddress& 
rPos,
  sal_uInt16 nFileId, const OUString& 
rTabName, const ScSingleRefData& rRef,
  ScExternalRefManager* pRefMgr, bool bODF 
) const
 {
@@ -865,23 +865,23 @@ struct ConventionOOO_A1 : public Convention_A1
 rBuffer.append( '[');
 
 bool bEncodeUrl = bODF;
-makeExternalSingleRefStr(rBuffer, nFileId, rTabName, rRef, 
rCompiler.GetPos(), pRefMgr, true, bEncodeUrl);
+makeExternalSingleRefStr(rBuffer, nFileId, rTabName, rRef, rPos, 
pRefMgr, true, bEncodeUrl);
 if (bODF)
 rBuffer.append( ']');
 }
 
-virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const 
ScCompiler& rCompiler,
+virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& 
rPos,
  sal_uInt16 nFileId, const OUString& 
rTabName, const ScSingleRefData& rRef,
  ScExternalRefManager* pRefMgr ) const
 {
-makeExternalRefStrImpl( rBuffer, rCompiler, nFileId, rTabName, rRef, 
pRefMgr, false);
+makeExternalRefStrImpl(rBuffer, rPos, nFileId, rTabName, rRef, 
pRefMgr, false);
 }
 
-void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& 
rCompiler,
+void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScAddress& 
rPos,
  sal_uInt16 nFileId, const OUString& 
rTabName, const ScComplexRefData& rRef,
  ScExternalRefManager* pRefMgr, bool bODF 
) const
 {
-ScRange aAbsRange = rRef.toAbs(rCompiler.GetPos());
+ScRange aAbsRange = rRef.toAbs(rPos);
 
 if (bODF)
 rBuffer.append( '[');
@@ -890,7 +890,7 @@ struct ConventionOOO_A1 : public Convention_A1
 
 do
 {
-if (!makeExternalSingleRefStr(rBuffer, nFileId, rTabName, 
rRef.Ref1, rCompiler.GetPos(), pRefMgr, true, bEncodeUrl))
+if (!makeExternalSingleRefStr(rBuffer, nFileId, rTabName, 
rRef.Ref1, rPos, pRefMgr, true, bEncodeUrl))
 break;
 
 rBuffer.append(':');
@@ -916,17 +916,17 @@ struct ConventionOOO_A1 : public Convention_A1
 else if (bODF)
 rBuffer.append( '.');  // need at least the sheet 
separator in ODF
 makeExternalSingleRefStr( rBuffer, nFileId, aLastTabName,
-rRef.Ref2, rCompiler.GetPos(), pRefMgr, bDisplayTabName, 
bEncodeUrl);
+rRef.Ref2, rPos, pRefMgr, bDisplayTabName, bEncodeUrl);
 } while (0);
 if (bODF)
 rBuffer.append( ']');
 }
 
-virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const 
ScCompiler& rCompiler,
+virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& 
rPos,
  sal_uInt16 nFileId, const OUString& 
rTabName, const ScComplexRefData& rRef,
  ScExternalRefManager* pRefMgr ) const
 {
-makeExternalRefStrImpl( rBuffer, rCompiler, nFileId, rTabName, rRef, 
pRefMgr, false);
+makeExternalRefStrImpl(rBuffer, rPos, nFileId, rTabName, rRef, 
pRe

Re: Vendors Name via UNO API / Basic Macros

[Lionel Elie Mamane]

On Mon, Nov 18, 2013 at 06:10:34PM +0100, Fernand Vanrie wrote:
> On 18/11/2013 18:02, Lionel Elie Mamane wrote:
>>On Fri, Nov 15, 2013 at 03:43:10PM +0100, Thomas Krumbein wrote:
>>>Am 15.11.2013 15:35, schrieb Jan Holesovsky:
Thomas Krumbein píše v Pá 15. 11. 2013 v 13:43 +0100:
>Well, this change was a small technical thing - but with a very big
>influence on typical market applications. Every custom macro application
>with dialogs or forms for user interfaces is influenced if dialogs/forms
>using Date/time fields.
Have you filed a bugreport, please?  A minimal example of the macro that
fails would be most appreciated.
>>>Well - it´s not a bug, because you mentioned the change in release-notes
>>>of version 4.1.
>>>What´s happend, you can read my article on my homepage. It is in german
>>>language but I am sure, you get the context ;)
>>>http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1
>>I took a look; since ... 4.1.2? 4.1.3? not sure anymore, you can also
>>use:

>>  CDateFromUnoDate

>>to replace

>>  CDateFromIso

> yep conversions are not the problem, its the exiting code who is
> broken in many places ?

What exiting code?

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source vcl/source

[Caolán McNamara]

 sd/source/filter/eppt/epptbase.hxx|3 ++
 sd/source/filter/eppt/pptx-stylesheet.cxx |4 +-
 sd/source/filter/eppt/pptx-text.cxx   |   41 ++
 sd/source/filter/eppt/text.hxx|   28 +---
 vcl/source/filter/wmf/emfwr.cxx   |   19 +
 5 files changed, 62 insertions(+), 33 deletions(-)

New commits:
commit 82bce2c10fe5718a3a51125ce0c284c13315d00d
Author: Caolán McNamara 
Date:   Fri Nov 15 17:06:21 2013 +

Related: rhbz#1014990 valgrind reports uninitialized variable

(cherry picked from commit f3660062ce8a2c65d483b83c2800d9b958d12f08)

Conflicts:
sd/source/filter/eppt/epptbase.hxx

Change-Id: Ibaa2ed0ee2f1f3f00bceec91ccced968e4913e47

Related: rhbz#1014990 valgrind reports uninitialized another variable

Change-Id: I77f082ea145b0f20daa93c3ee04067ecb6c3b108
(cherry picked from commit b7069ad07dc651f5326cd3a671588d8c1ecf2534)

Related: rhbz#1014990 valgrind reports yet another uninitialized variable

Change-Id: Idf15ee825a34aa7788c422475aa6cea8ff802581
(cherry picked from commit e0840f70565062b712e544f952640ee35cfb6a27)

Related: rhbz#1014990 valgrind reports yet another unint variable

Change-Id: Idf6a0a1e12fffee6c090add41247723f1d9cf576
(cherry picked from commit b211b8b2e14bd961a7b32033468a94cbff52b5c4)
Reviewed-on: https://gerrit.libreoffice.org/6712
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/epptbase.hxx 
b/sd/source/filter/eppt/epptbase.hxx
index f84360d..2566b98 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -157,6 +157,9 @@ struct FontCollectionEntry
 
 FontCollectionEntry( const String& rName ) :
 Scaling ( 1.0 ),
+Family  ( 0 ),
+Pitch   ( 0 ),
+CharSet ( 0 ),
 Original( rName )
 {
 ImplInit( rName );
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx 
b/sd/source/filter/eppt/pptx-stylesheet.cxx
index d9fd8fd..24e98f1 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -286,8 +286,8 @@ void PPTExParaSheet::SetStyleSheet( const 
::com::sun::star::uno::Reference< ::co
 
 if ( !nLevel )
 {
-if ( ( aParagraphObj.meBullet ==  
::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-&& aParagraphObj.bExtendedParameters )
+if (aParagraphObj.bExtendedParameters &&
+ aParagraphObj.meBullet == 
::com::sun::star::beans::PropertyState_DIRECT_VALUE)
 {
 for ( sal_Int16 i = 0; i < 5; i++ )
 {
diff --git a/sd/source/filter/eppt/pptx-text.cxx 
b/sd/source/filter/eppt/pptx-text.cxx
index adadc44..cc0c769 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -628,10 +628,21 @@ PortionObj& PortionObj::operator=( const PortionObj& 
rPortionObj )
 return *this;
 }
 
-ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > & rXPropSet,
-PPTExBulletProvider& rProv ) :
-maMapModeSrc( MAP_100TH_MM ),
-maMapModeDest   ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 
576 ) )
+ParagraphObj::ParagraphObj(const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > & rXPropSet,
+PPTExBulletProvider& rProv)
+: maMapModeSrc(MAP_100TH_MM)
+, maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
+, mnTextSize(0)
+, mbFirstParagraph(false)
+, mbLastParagraph(false)
+, mnTextAdjust(0)
+, mnLineSpacing(0)
+, mbFixedLineSpacing(false)
+, mnLineSpacingTop(0)
+, mnLineSpacingBottom(0)
+, mbForbiddenRules(false)
+, mbParagraphPunctation(false)
+, mnBiDi(0)
 {
 mXPropSet = rXPropSet;
 
@@ -644,12 +655,22 @@ ParagraphObj::ParagraphObj( const 
::com::sun::star::uno::Reference< ::com::sun::
 ImplGetParagraphValues( rProv, sal_False );
 }
 
-ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextContent > & rXTextContent,
-ParaFlags aParaFlags, FontCollection& rFontCollection, 
PPTExBulletProvider& rProv ) :
-maMapModeSrc( MAP_100TH_MM ),
-maMapModeDest   ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 
576 ) ),
-mbFirstParagraph( aParaFlags.bFirstParagraph ),
-mbLastParagraph ( aParaFlags.bLastParagraph )
+ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextContent > & rXTextContent,
+ParaFlags aParaFlags, FontCollection& rFontCollection, 
PPTExBulletProvider& rProv )
+: maMapModeSrc(MAP_100TH_MM)
+, maMapModeDest(MAP_IN

Re: Vendors Name via UNO API / Basic Macros

[Fernand Vanrie]

On 18/11/2013 18:02, Lionel Elie Mamane wrote:

On Fri, Nov 15, 2013 at 03:43:10PM +0100, Thomas Krumbein wrote:

Am 15.11.2013 15:35, schrieb Jan Holesovsky:

Thomas Krumbein píše v Pá 15. 11. 2013 v 13:43 +0100:

Well, this change was a small technical thing - but with a very big
influence on typical market applications. Every custom macro application
with dialogs or forms for user interfaces is influenced if dialogs/forms
using Date/time fields.

Have you filed a bugreport, please?  A minimal example of the macro that
fails would be most appreciated.

Well - it´s not a bug, because you mentioned the change in release-notes
of version 4.1.
What´s happend, you can read my article on my homepage. It is in german
language but I am sure, you get the context ;)
http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1

I took a look; since ... 4.1.2? 4.1.3? not sure anymore, you can also
use:

  CDateFromUnoDate
  CDateFromUnoTime
  CDateFromUnoDateTime
  CDateToUnoDate
  CDateToUnoTime
  CDateToUnoDateTime

to replace

  CDateFromIso
  CDateToIso

Lionel,
yep conversions are not the problem, its the exiting code who is broken 
in many places ?


can you restore  the "Date" property as a ISO value and add a extra 
property "Cdate"  then no code is broken ?


Greetz

Fernand

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

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |6 +-
 writerfilter/source/dmapper/GraphicImport.cxx |2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit e7a0a1fd6c501b72838a858faaa7b515d1b89845
Author: Miklos Vajna 
Date:   Mon Nov 18 17:46:05 2013 +0100

DOCX drawingML shape import: handle position

Change-Id: I9a0cb95d875328dab21950ead06d56c4dac8305d

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index dad6d7d..b399ef5 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1508,8 +1508,12 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69548, "fdo69548.docx")
 DECLARE_OOXMLIMPORT_TEST(testWpsOnly, "wps-only.docx")
 {
 // Document has wp:anchor, not wp:inline, so handle it accordingly.
-text::TextContentAnchorType eValue = 
getProperty(getShape(1), "AnchorType");
+uno::Reference xShape = getShape(1);
+text::TextContentAnchorType eValue = 
getProperty(xShape, "AnchorType");
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, eValue);
+
+// Check position, it was 0. This is a shape, so use getPosition(), not a 
property.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(671830)), 
xShape->getPosition().X);
 }
 
 DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 7e1a42e..64b0561 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -999,7 +999,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 uno::Reference< beans::XPropertySet > 
xShapeProps(m_xShape, uno::UNO_QUERY_THROW);
 xShapeProps->setPropertyValue("AnchorType", 
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
 
-// TODO handle more properties here like 
HoriOrientPosition, etc.
+
m_xShape->setPosition(awt::Point(m_pImpl->nLeftPosition, 
m_pImpl->nTopPosition));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - avmedia/source include/avmedia svx/source

[Stephan Bergmann]

 avmedia/source/framework/mediacontrol.cxx  |2 
 avmedia/source/framework/mediaitem.cxx |9 --
 avmedia/source/viewer/mediawindow_impl.cxx |  119 +
 avmedia/source/viewer/mediawindow_impl.hxx |7 -
 include/avmedia/mediaitem.hxx  |2 
 svx/source/svdraw/svdomedia.cxx|   10 +-
 svx/source/unodraw/unoshap4.cxx|2 
 7 files changed, 50 insertions(+), 101 deletions(-)

New commits:
commit 4e593d690d4363b1065bc7638953b1156563a157
Author: Stephan Bergmann 
Date:   Mon Nov 18 18:04:37 2013 +0100

Elide some trivial avmedia::MediaWindowImpl private member functions

Change-Id: I272acbfc9ea158af1d6d6d117451a444c1585e19

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index ede40a3..4157f7a 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -176,21 +176,19 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, 
MediaWindow* pMediaWindow, bo
 
 MediaWindowImpl::~MediaWindowImpl()
 {
-uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
-
 mpEvents->cleanUp();
 
-if( xPlayerWindow.is() )
+if( mxPlayerWindow.is() )
 {
-xPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener >( 
mxEventsIf, uno::UNO_QUERY ) );
-xPlayerWindow->removeMouseListener( uno::Reference< 
awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
-xPlayerWindow->removeMouseMotionListener( uno::Reference< 
awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
+mxPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener 
>( mxEventsIf, uno::UNO_QUERY ) );
+mxPlayerWindow->removeMouseListener( uno::Reference< 
awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
+mxPlayerWindow->removeMouseMotionListener( uno::Reference< 
awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
 
-uno::Reference< lang::XComponent > xComponent( xPlayerWindow, 
uno::UNO_QUERY );
+uno::Reference< lang::XComponent > xComponent( mxPlayerWindow, 
uno::UNO_QUERY );
 if( xComponent.is() )
 xComponent->dispose();
 
-setPlayerWindow( NULL );
+mxPlayerWindow.clear();
 }
 
 uno::Reference< lang::XComponent > xComponent( mxPlayer, uno::UNO_QUERY );
@@ -292,7 +290,7 @@ const OUString& MediaWindowImpl::getURL() const
 
 bool MediaWindowImpl::isValid() const
 {
-return( getPlayer().is() );
+return( mxPlayer.is() );
 }
 
 Size MediaWindowImpl::getPreferredSize() const
@@ -473,29 +471,9 @@ void MediaWindowImpl::stopPlayingInternal( bool bStop )
 }
 }
 
-MediaWindow* MediaWindowImpl::getMediaWindow() const
-{
-return mpMediaWindow;
-}
-
-uno::Reference< media::XPlayer > MediaWindowImpl::getPlayer() const
-{
-return mxPlayer;
-}
-
-void MediaWindowImpl::setPlayerWindow( const uno::Reference< 
media::XPlayerWindow >& rxPlayerWindow )
-{
-mxPlayerWindow = rxPlayerWindow;
-}
-
-uno::Reference< media::XPlayerWindow > MediaWindowImpl::getPlayerWindow() const
-{
-return mxPlayerWindow;
-}
-
 void MediaWindowImpl::onURLChanged()
 {
-if( getPlayer().is() )
+if( mxPlayer.is() )
 {
 uno::Sequence< uno::Any >  aArgs( 3 );
 uno::Reference< media::XPlayerWindow > xPlayerWindow;
@@ -509,14 +487,14 @@ void MediaWindowImpl::onURLChanged()
 
 try
 {
-xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
+xPlayerWindow = mxPlayer->createPlayerWindow( aArgs );
 }
 catch( uno::RuntimeException )
 {
 // happens eg, on MacOSX where Java frames cannot be created from 
X11 window handles
 }
 
-setPlayerWindow( xPlayerWindow );
+mxPlayerWindow = xPlayerWindow;
 
 if( xPlayerWindow.is() )
 {
@@ -527,9 +505,9 @@ void MediaWindowImpl::onURLChanged()
 }
 }
 else
-setPlayerWindow( NULL );
+mxPlayerWindow.clear();
 
-if( getPlayerWindow().is() )
+if( mxPlayerWindow.is() )
 maChildWindow.Show();
 else
 maChildWindow.Hide();
@@ -554,12 +532,10 @@ void MediaWindowImpl::setPosSize( const Rectangle& rRect )
 
 void MediaWindowImpl::setPointer( const Pointer& rPointer )
 {
-uno::Reference< media::XPlayerWindow >  xPlayerWindow( getPlayerWindow() );
-
 SetPointer( rPointer );
 maChildWindow.SetPointer( rPointer );
 
-if( xPlayerWindow.is() )
+if( mxPlayerWindow.is() )
 {
 long nPointer;
 
@@ -573,7 +549,7 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer )
 default: nPointer = awt::SystemPointer::ARROW; break;
 }
 
-xPlayerWindow->setPointerType( nPointer );
+mxPlayerWindow->setPointerType( nPointer );
 }
 }
 
@@ -581,7 +557,6 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer )
 
 void MediaWindowImpl::Resiz

Re: Vendors Name via UNO API / Basic Macros

[Lionel Elie Mamane]

On Fri, Nov 15, 2013 at 03:43:10PM +0100, Thomas Krumbein wrote:
> Am 15.11.2013 15:35, schrieb Jan Holesovsky:

>> Thomas Krumbein píše v Pá 15. 11. 2013 v 13:43 +0100:

>>> Well, this change was a small technical thing - but with a very big
>>> influence on typical market applications. Every custom macro application
>>> with dialogs or forms for user interfaces is influenced if dialogs/forms
>>> using Date/time fields.

>> Have you filed a bugreport, please?  A minimal example of the macro that
>> fails would be most appreciated.

> Well - it´s not a bug, because you mentioned the change in release-notes
> of version 4.1.

> What´s happend, you can read my article on my homepage. It is in german
> language but I am sure, you get the context ;)

> http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1

I took a look; since ... 4.1.2? 4.1.3? not sure anymore, you can also
use:

 CDateFromUnoDate
 CDateFromUnoTime
 CDateFromUnoDateTime
 CDateToUnoDate
 CDateToUnoTime
 CDateToUnoDateTime

to replace

 CDateFromIso
 CDateToIso

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

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

[Michael Meeks]

New branch 'feature/ia2.4' available with the following commits:
commit da80d470d3040725c565f2e577f0dd4d402fcaa6
Author: Michael Meeks 
Date:   Mon Nov 18 15:41:26 2013 +

uia: merge VCL pieces of IAccessible2 work.

Original code from:
Author: Steve Yin 
Date:   Sat Nov 16 23:58:19 2013 +0100

Integrate branch of IAccessible2

With these improvements:

Move initial setup of windows into the bridge and clean, remove conditionals
Check for presence of AT in the bridge as well to clean. Merge VCL events
extensions and their handling. Clean and split WB_GETOBJECT handling out to
it's own method.

Change-Id: Ib19e38ddca71182018df438df27dcdb555d91402

commit 69e735276e8b3def179c53ad5e95e8b59a4c8ea2
Author: Michael Meeks 
Date:   Mon Nov 18 15:28:19 2013 +

uia: remove redundant component registration.

Change-Id: I913e6498d09021cca78be27b542421251f258535

commit bc511c671572504e8e01ddf7585b402c411a3c47
Author: Michael Meeks 
Date:   Mon Nov 18 13:25:49 2013 +

Remove obsolete statreg.cpp / atlimpl.cpp includes.

Change-Id: I51bd72f6aaeb33bb87e425118b9f205744359145

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

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

Fix minor compilation issues

Change-Id: I3567a42d7d071d61a2f41f1fb32d6831c9898d3a

commit 19a205dafe50bc17f36ce2a1954e3c08a6fbfde6
Author: Steve Yin 
Date:   Sat Nov 16 23:58:19 2013 +0100

Integrate branch of IAccessible2

Change-Id: Ied8b6941765c86a849467cb5df312ca7124f32b3

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

Disable _WIN32_WINNT definition

Change-Id: Ibfa5839700da5ec272c95199b09cd4265d82525d

commit 5ab621e46cacc82db2c7840c8582249d147d5951
Author: David Ostrovsky 
Date:   Sat Nov 16 14:33:41 2013 +0100

Remove obsolete IDL files

Change-Id: I4f38c1ec815a5f2e39b492657cb0532bb4e19967

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: Branch 'feature/ia2.4' - 0 commits -

[Unknown]

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: 5 commits - avmedia/Library_avmedia.mk avmedia/source include/avmedia svx/source

[Stephan Bergmann]

 avmedia/Library_avmedia.mk |1 
 avmedia/source/framework/mediacontrol.cxx  |2 
 avmedia/source/framework/mediaplayer.cxx   |   21 -
 avmedia/source/viewer/mediaevent_impl.cxx  |2 
 avmedia/source/viewer/mediawindow.cxx  |   36 --
 avmedia/source/viewer/mediawindow_impl.cxx |  314 ++-
 avmedia/source/viewer/mediawindow_impl.hxx |   66 +++-
 avmedia/source/viewer/mediawindowbase_impl.cxx |  412 -
 avmedia/source/viewer/mediawindowbase_impl.hxx |  121 ---
 include/avmedia/mediaplayer.hxx|   26 -
 include/avmedia/mediawindow.hxx|3 
 svx/source/gallery2/galctrl.cxx|4 
 12 files changed, 396 insertions(+), 612 deletions(-)

New commits:
commit df4adcc47a5cfad9e6562162ae6eb28a2271f344
Author: Stephan Bergmann 
Date:   Mon Nov 18 17:01:53 2013 +0100

Fix debug output

Change-Id: I785a3f223bd8897466f9402125df2da07615cd50

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index cb513dc..711eb48 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -239,8 +239,8 @@ uno::Reference< media::XPlayer > 
MediaWindowImpl::createPlayer( const OUString&
   "failed to create media player service " << 
aServiceName );
 } catch ( const uno::Exception &e ) {
 SAL_WARN( "avmedia",
-  "couldn't create media player " 
AVMEDIA_MANAGER_SERVICE_NAME
-  ", exception '" << e.Message << '\'');
+  "couldn't create media player " << aServiceName
+  << ", exception '" << e.Message << '\'');
 }
 }
 
commit 929baba5f08a59aeaf460d7c6b76238aca6c5d67
Author: Stephan Bergmann 
Date:   Mon Nov 18 17:01:35 2013 +0100

Simplify MediaWindow::mpImpl

Change-Id: Ia466a08a8135a7f2e43278354c767be3a063550a

diff --git a/avmedia/source/viewer/mediawindow.cxx 
b/avmedia/source/viewer/mediawindow.cxx
index 183a955..45c9901 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -52,19 +52,13 @@ MediaWindow::MediaWindow( Window* parent, bool 
bInternalMediaControl ) :
 
 // -
 
-MediaWindow::~MediaWindow()
-{
-mpImpl->cleanUp();
-delete mpImpl;
-mpImpl = NULL;
-}
+MediaWindow::~MediaWindow() {}
 
 // -
 
 void MediaWindow::setURL( const OUString& rURL )
 {
-if( mpImpl )
-mpImpl->setURL( rURL, OUString() );
+mpImpl->setURL( rURL, OUString() );
 }
 
 // -
@@ -78,7 +72,7 @@ const OUString& MediaWindow::getURL() const
 
 bool MediaWindow::isValid() const
 {
-return( mpImpl != NULL && mpImpl->isValid() );
+return mpImpl->isValid();
 }
 
 // -
@@ -148,64 +142,56 @@ Size MediaWindow::getPreferredSize() const
 
 void MediaWindow::setPosSize( const Rectangle& rNewRect )
 {
-if( mpImpl )
-{
-mpImpl->setPosSize( rNewRect );
-}
+mpImpl->setPosSize( rNewRect );
 }
 
 // -
 
 void MediaWindow::setPointer( const Pointer& rPointer )
 {
-if( mpImpl )
-mpImpl->setPointer( rPointer );
+mpImpl->setPointer( rPointer );
 }
 
 // -
 
 bool MediaWindow::start()
 {
-return( mpImpl != NULL && mpImpl->start() );
+return mpImpl->start();
 }
 
 // -
 
 void MediaWindow::updateMediaItem( MediaItem& rItem ) const
 {
-if( mpImpl )
-mpImpl->updateMediaItem( rItem );
+mpImpl->updateMediaItem( rItem );
 }
 
 // -
 
 void MediaWindow::executeMediaItem( const MediaItem& rItem )
 {
-if( mpImpl )
-mpImpl->executeMediaItem( rItem );
+mpImpl->executeMediaItem( rItem );
 }
 
 // -
 
 void MediaWindow::show()
 {
-if( mpImpl )
-mpImpl->Show();
+mpImpl->Show();
 }
 
 // -
 
 void MediaWindow::hide()
 {
-if( mpImpl )
-mpImpl->Hide();
+mpImpl->Hide();
 }
 
 // -
 
 Window* MediaWindow::getWindow() const
 {
-return mpImpl;
+return mpImpl.get();
 }
 
 // -
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawin

[Libreoffice-commits] core.git: Branch 'private/tml/opencl-background-compilation' - sc/source

[Tor Lillqvist]

 sc/source/core/data/formulacell.cxx  |2 +-
 sc/source/core/inc/dynamickernel.hxx |5 -
 sc/source/core/opencl/formulagroupcl.cxx |   17 ++---
 3 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit aa0389ab7ee0fc2070a595b9d2242e8f1f873ea3
Author: Tor Lillqvist 
Date:   Mon Nov 18 17:59:30 2013 +0200

Fix some life-cycle issues for backgroup OpenCL kernel compilation

Now it no longer asserts or crashes in light testing, but it doesn't
properly recalculate either.

Change-Id: I7dc117341eff5ac1b21d7400122cc6e04ae2baf7

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 9f6fa00..cf4516d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1771,7 +1771,7 @@ void ScFormulaCell::SetDirty( bool bDirtyFlag )
 void ScFormulaCell::SetDirtyVar()
 {
 bDirty = true;
-if (mxGroup)
+if (mxGroup && mxGroup->meCalcState == sc::GroupCalcRunning)
 mxGroup->meCalcState = sc::GroupCalcEnabled;
 
 // mark the sheet of this cell to be calculated
diff --git a/sc/source/core/inc/dynamickernel.hxx 
b/sc/source/core/inc/dynamickernel.hxx
index 5d5780f..e4a42aa 100644
--- a/sc/source/core/inc/dynamickernel.hxx
+++ b/sc/source/core/inc/dynamickernel.hxx
@@ -63,7 +63,7 @@ class DynamicKernel : public CompiledFormula
 {
 private:
 DynamicKernel(FormulaTreeNodeRef r):mpRoot(r),
-mpProgram(NULL), mpKernel(NULL), mpResClmem(NULL) {}
+mpProgram(NULL), mpKernel(NULL), mpResClmem(NULL), mpCode(NULL) {}
 
 public:
 static DynamicKernel *create(ScDocument& rDoc,
@@ -88,6 +88,8 @@ public:
 
 cl_mem GetResultBuffer(void) const { return mpResClmem; }
 
+void SetPCode(ScTokenArray *pCode) { mpCode = pCode; }
+
 private:
 void TraverseAST(FormulaTreeNodeRef);
 FormulaTreeNodeRef mpRoot;
@@ -99,6 +101,7 @@ private:
 cl_mem mpResClmem; // Results
 std::set inlineDecl;
 std::set inlineFun;
+ScTokenArray *mpCode;
 };
 
 }
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 3465dd9..a66e4e1 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -50,7 +50,6 @@ namespace sc { namespace opencl {
 size_t DynamicKernelArgument::Marshal(cl_kernel k, int argno, int)
 {
 FormulaToken *ref = mFormulaTree->GetFormulaToken();
-assert(mpClmem == NULL);
 double *pHostBuffer = NULL;
 size_t szHostBuffer = 0;
 if (ref->GetType() == formula::svSingleVectorRef) {
@@ -131,7 +130,6 @@ public:
 virtual size_t Marshal(cl_kernel k, int argno, int)
 {
 FormulaToken *ref = mFormulaTree->GetFormulaToken();
-assert(mpClmem == NULL);
 cl_uint hashCode = 0;
 if (ref->GetType() == formula::svString)
 {
@@ -221,7 +219,6 @@ public:
 size_t DynamicKernelStringArgument::Marshal(cl_kernel k, int argno, int)
 {
 FormulaToken *ref = mFormulaTree->GetFormulaToken();
-assert(mpClmem == NULL);
 // Obtain cl context
 KernelEnv kEnv;
 OpenclDevice::setKernelEnv(&kEnv);
@@ -1382,6 +1379,8 @@ DynamicKernel::~DynamicKernel()
 std::cerr<<"Freeing kernel "<< GetMD5() << " program\n";
 clReleaseProgram(mpProgram);
 }
+if (mpCode)
+delete mpCode;
 }
 /// Build code
 void DynamicKernel::CreateKernel(void)
@@ -1537,14 +1536,16 @@ CompiledFormula* 
FormulaGroupInterpreterOpenCL::createCompiledFormula(ScDocument
   
ScFormulaCellGroupRef& xGroup,
   
ScTokenArray& rCode)
 {
-ScTokenArray aCode;
-ScGroupTokenConverter aConverter(aCode, rDoc, *xGroup->mpTopCell, rTopPos);
+ScTokenArray *pCode = new ScTokenArray();
+ScGroupTokenConverter aConverter(*pCode, rDoc, *xGroup->mpTopCell, 
rTopPos);
 if (!aConverter.convert(rCode))
 {
 return NULL;
 }
 
-return DynamicKernel::create(rDoc, rTopPos, aCode);
+DynamicKernel *result = DynamicKernel::create(rDoc, rTopPos, *pCode);
+result->SetPCode(pCode);
+return result;
 }
 
 bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
@@ -1572,6 +1573,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument& rDoc,
 }
 else
 {
+assert(xGroup->meCalcState == sc::GroupCalcRunning);
 aGuard.clear();
 pKernel = static_cast(createCompiledFormula(rDoc, 
rTopPos, xGroup, rCode));
 }
@@ -1599,7 +1601,8 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument& rDoc,
 err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, res, resbuf, 0, NULL, 
NULL);
 if (err != CL_SUCCESS)
 throw OpenCLError(err);
-delete pKernel;
+if (xGroup->meCalcState == sc::GroupCalcRunning)
+delete pKernel;
 return true;
 }
 catch (const UnhandledToken

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

[Michael Meeks]

 vcl/source/app/svdata.cxx|7 +
 winaccessibility/Library_winaccessibility.mk |2 
 winaccessibility/source/service/msaaservice_impl.cxx |  109 ---
 3 files changed, 100 insertions(+), 18 deletions(-)

New commits:
commit 016188ad3cf23346e3f5299610942acf6aec4e4a
Author: Michael Meeks 
Date:   Mon Nov 18 15:41:26 2013 +

uia: move accessibility init into component to avoid platform conditionals

Code from Steve Yin , "Integrate branch of IAccessible2"

Change-Id: Ib19e38ddca71182018df438df27dcdb555d91402

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index b42eeea..072aa9e 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -321,6 +321,13 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool 
&rCancelled)
 {
 css::uno::Reference< XComponentContext > 
xContext(comphelper::getProcessComponentContext());
 
+// Windows only but safe here
+if ( !getenv ("SAL_DISABLE_IACCESSIBLE2") )
+{
+pSVData->mxAccessBridge = 
css::accessibility::MSAAService::create( xContext );
+return pSVData->mxAccessBridge.is();
+}
+
 css::uno::Reference< XExtendedToolkit > xToolkit =
 css::uno::Reference< XExtendedToolkit 
>(Application::GetVCLToolkit(), UNO_QUERY);
 
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx 
b/winaccessibility/source/service/msaaservice_impl.cxx
index ce720c3..3378437 100755
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 
 using namespace ::rtl; // for OUString
 using namespace ::com::sun::star; // for odk interfaces
@@ -49,16 +50,11 @@ extern void handleWindowOpened_impl( long pAcc);
 namespace my_sc_impl
 {
 
-  //extern Sequence< OUString > SAL_CALL  
getSupportedServiceNames_MSAAServiceImpl();
-  //static OUString SAL_CALL getImplementationName_MSAAServiceImpl();
-  //static Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
-  //  Reference< XComponentContext > const & xContext )
-  //  SAL_THROW( () );
 /**
-   * Method that returns the service name.
-   * @param
-   * @return Name sequence.
-   */
+ * Method that returns the service name.
+ * @param
+ * @return Name sequence.
+ */
 static Sequence< OUString > getSupportedServiceNames_MSAAServiceImpl()
 {
 static Sequence < OUString > *pNames = 0;
@@ -197,6 +193,89 @@ Sequence< OUString > 
MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeE
 return getSupportedServiceNames_MSAAServiceImpl();
 }
 
+void AccessBridgehandleExistingWindow(const Reference 
&xAccMgr,
+  Window * pWindow, bool bShow)
+{
+if ( pWindow )
+{
+css::uno::Reference< css::accessibility::XAccessible > xAccessible;
+
+// Test for combo box - drop down floating windows first
+Window * pParentWindow = pWindow->GetParent();
+
+if ( pParentWindow )
+{
+try
+{
+// The parent window of a combo box floating window should 
have the role COMBO_BOX
+css::uno::Reference< css::accessibility::XAccessible > 
xParentAccessible(pParentWindow->GetAccessible());
+if ( xParentAccessible.is() )
+{
+css::uno::Reference< 
css::accessibility::XAccessibleContext > xParentAC( 
xParentAccessible->getAccessibleContext() );
+if ( xParentAC.is() && 
(css::accessibility::AccessibleRole::COMBO_BOX == 
xParentAC->getAccessibleRole()) )
+{
+// O.k. - this is a combo box floating window 
corresponding to the child of role LIST of the parent.
+// Let's not rely on a specific child order, just 
search for the child with the role LIST
+sal_Int32 nCount = 
xParentAC->getAccessibleChildCount();
+for ( sal_Int32 n = 0; (n < nCount) && 
!xAccessible.is(); n++)
+{
+css::uno::Reference< 
css::accessibility::XAccessible > xChild = xParentAC->getAccessibleChild(n);
+if ( xChild.is() )
+{
+css::uno::Reference< 
css::accessibility::XAccessibleContext > xChildAC = 
xChild->getAccessibleContext();
+if ( xChildAC.is() && 
(css::accessibility::AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
+{
+xAccessible = xChild;
+}
+}
+}
+}
+}
+}
+catch (::com::sun::star::uno::RuntimeException e)
+{
+// I

Re: Merge enabled change tracking

[Norbert Thiebaud]

On Fri, Nov 15, 2013 at 5:47 AM, Peter Rakyta
 wrote:
> Dear Mail list subscribers!
>
> Recently the merge-enabled change tracking proposal (MCT) has been chosen as
> a prime orientation of change tracking developments in ODF documents by the
> OASIS ODF TC. MultiRacio Ltd. is developing an extension as a first
> implementation of the MCT proposal.
> Our company would like to share the results of the development with the
> developers of the office suite. We will be grateful for every idea, reported
> bug or other comment related to the extension.
> Notice, however, that the extension is still in experimental phase,
> containing many bugs and being unstable under numerous circumstances.
>
> The binaries of the extension and its documentation can be downloaded from
> the site below:
> http://itl88.elte.hu/~rakytap/EuroOffice_MCT.oxt
> http://itl88.elte.hu/~rakytap/MCT_extension.pdf

few remarks and question:

1/ the pdf indicate that your change's timestamp does not seems to
contain timezone information... are all these timestamp implicitely in
UTC ? or the spec does not anticipate collaboration across timezones ?

2/ digging in the oxt I found a license statement that says it is
gpl3+... so... where is the source ?

3/ looking for the source, I followed the crumb to EuroOffice2012...
which also claim to be open-source... yet I could not find the source
either...

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

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

[Michael Meeks]

 winaccessibility/source/UAccCOM/StdAfx.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit bc511c671572504e8e01ddf7585b402c411a3c47
Author: Michael Meeks 
Date:   Mon Nov 18 13:25:49 2013 +

Remove obsolete statreg.cpp / atlimpl.cpp includes.

Change-Id: I51bd72f6aaeb33bb87e425118b9f205744359145

diff --git a/winaccessibility/source/UAccCOM/StdAfx.cxx 
b/winaccessibility/source/UAccCOM/StdAfx.cxx
index 8d2859d..71ebbdb 100644
--- a/winaccessibility/source/UAccCOM/StdAfx.cxx
+++ b/winaccessibility/source/UAccCOM/StdAfx.cxx
@@ -21,9 +21,6 @@
 
 #ifdef _ATL_STATIC_REGISTRY
 #include 
-#include 
 #endif
 
-#include 
-
 /* 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: Branch 'distro/suse/suse-4.0' - vcl/qa vcl/source

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |5 +
 2 files changed, 5 insertions(+)

New commits:
commit ab7dd0fdbf1f3e26b64caf6c413c9c907633d29e
Author: Caolán McNamara 
Date:   Tue Nov 12 14:56:43 2013 +

Resolves: fdo#71307 out polygons are limited to 16bit point count

Change-Id: I4dbe9145466d6d93ebd3dea7f4fe434c9ee3de19
(cherry picked from commit cdd351b1487a8a97f481a9165d9cd361aaee2ca4)
Reviewed-on: https://gerrit.libreoffice.org/6655
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf
new file mode 100644
index 000..b89db21
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f8b9884..b74b992 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -330,6 +330,11 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const 
sal_Bool skipFirst)
 template 
 Polygon EnhWMFReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints)
 {
+bool bRecordOk = nPoints <= SAL_MAX_UINT16;
+SAL_WARN_IF(!bRecordOk, "svtools.filter", "polygon record has more 
polygons than we can handle");
+if (!bRecordOk)
+return Polygon();
+
 Polygon aPolygon(nPoints);
 for (sal_uInt16 i = nStartIndex ; i < nPoints && pWMF->good(); i++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1416056789c9352b9a96452cb947d1d46d096fc2
Author: Caolán McNamara 
Date:   Mon Nov 18 14:10:31 2013 +

Updated core
Project: help  bd79eebd63807c29ef7509516291635efecd246a

diff --git a/helpcontent2 b/helpcontent2
index f3a5452..bd79eeb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f3a5452927181f245084721c7ed0fc6047bf70e7
+Subproject commit bd79eebd63807c29ef7509516291635efecd246a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |2 --
 source/text/shared/optionen/01010200.xhp |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bd79eebd63807c29ef7509516291635efecd246a
Author: Caolán McNamara 
Date:   Mon Nov 18 14:10:31 2013 +

update help ids for alien warn dialog .ui conversion

Change-Id: If0a55a3048f66afb4b8faf9f09f0a1841d75ec3f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 27e7096..a3bf5c8 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3709,7 +3709,6 @@ HID_VS_BULLET,52982,
 HID_VS_NUM,52981,
 HID_VS_NUMBMP,52983,
 HID_VS_RULER,52984,
-HID_WARNING_ALIENFORMAT,33388,
 HID_WARNING_SECURITY_HYPERLINK,33374,
 HID_WIZARD_NEXT,33022,
 HID_WIZARD_PREVIOUS,33023,
@@ -6431,7 +6430,6 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237,
 sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236,
 sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235,
 sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
-sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF,557136,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_BACKWARDS,2187084816,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_MATCHCASE,2187084814,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_WHOLEWORDS,2187084813,
diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index c4ac995..0745f0b 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -157,7 +157,7 @@
   Some companies or organizations may require ODF 
documents in the ODF 1.0/1.1 format. You can select that format to save in the 
listbox. This older format cannot store all new features, so the new format ODF 
1.2 (Extended) is recommended where possible.
   The ODF 
1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. 
It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to 
older OpenOffice.org versions. It may be useful, if you need to interchange ODF 
documents with users, who use pre-ODF1.2 or ODF1.2-only legacy 
applications.
 
-
+
 Warn when not saving in ODF or default format
   You can choose to get a warning message when you save 
a document in a format that is not OpenDocument or which you did not set as 
default format in Load/Save - General in the Options dialog 
box.
   You can choose which file format will be applied as the default 
when saving documents of various document types. If you always exchange your 
documents with other persons who use Microsoft Office, for example, you may 
specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a 
default.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 13 commits - cui/source external/languagetool include/vcl sd/source sfx2/AllLangResTarget_sfx2.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/inc vcl/source

[Caolán McNamara]

 cui/source/dialogs/hlinettp.cxx   |   23 ---
 cui/source/dialogs/hyperdlg.hrc   |1 
 cui/source/inc/hlinettp.hxx   |2 
 external/languagetool/UnpackedTarball_languagetool.mk |2 
 external/languagetool/english.ireland.patch   |   11 +
 external/languagetool/esperanto.territory.patch   |   12 +
 include/vcl/window.hxx|7 
 sd/source/filter/eppt/epptbase.hxx|3 
 sd/source/filter/eppt/pptx-stylesheet.cxx |4 
 sd/source/filter/eppt/pptx-text.cxx   |   41 -
 sd/source/filter/eppt/text.hxx|   28 ++-
 sfx2/AllLangResTarget_sfx2.mk |1 
 sfx2/UIConfig_sfx.mk  |1 
 sfx2/source/dialog/alienwarn.cxx  |  133 +-
 sfx2/source/dialog/alienwarn.hrc  |   54 ---
 sfx2/source/dialog/alienwarn.src  |   83 ---
 sfx2/source/inc/alienwarn.hxx |   19 --
 sfx2/source/inc/helpid.hrc|1 
 sfx2/uiconfig/ui/alienwarndialog.ui   |   88 +++
 vcl/inc/window.h  |3 
 vcl/source/control/button.cxx |6 
 vcl/source/filter/wmf/emfwr.cxx   |   19 +-
 vcl/source/window/builder.cxx |4 
 vcl/source/window/layout.cxx  |   20 ++
 vcl/source/window/window.cxx  |1 
 vcl/source/window/window2.cxx |   12 +
 26 files changed, 235 insertions(+), 344 deletions(-)

New commits:
commit fcb7905a7f7c8ad3e46fb49324fb1d7eaae83192
Author: Caolán McNamara 
Date:   Mon Nov 18 13:57:14 2013 +

missing resource

this is missing since abad15bc31e99d554a68c6806a3ebb5f592dabbd

"small improvement of Insert -> Hyperlink -> Internet dialog". I can only
assume that removing the target button was intentional.

Change-Id: I71147394bcab348ed1d9e1e19e32b5ebdddc8c0e

diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 322ab74..ddaf986 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -47,7 +47,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window 
*pParent,
 maBtBrowse  ( this, CUI_RES (BTN_BROWSE) ),
 maFtLogin   ( this, CUI_RES (FT_LOGIN) ),
 maEdLogin   ( this, CUI_RES (ED_LOGIN) ),
-maBtTarget  ( this, CUI_RES (BTN_TARGET) ),
 maFtPassword( this, CUI_RES (FT_PASSWD) ),
 maEdPassword( this, CUI_RES (ED_PASSWD) ),
 maCbAnonymous   ( this, CUI_RES (CBX_ANONYMOUS) ),
@@ -55,7 +54,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window 
*pParent,
 {
 // Disable display of bitmap names.
 maBtBrowse.EnableTextDisplay (sal_False);
-maBtTarget.EnableTextDisplay (sal_False);
 
 InitStdControls();
 FreeResource();
@@ -76,7 +74,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window 
*pParent,
 maEdLogin.Show( sal_False );
 maEdPassword.Show( sal_False );
 maCbAnonymous.Show( sal_False );
-maBtTarget.Enable( sal_False );
 maBtBrowse.Enable( sal_True );
 
 ///
@@ -86,7 +83,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window 
*pParent,
 maRbtLinktypFTP.SetClickHdl ( aLink );
 maCbAnonymous.SetClickHdl   ( LINK ( this, SvxHyperlinkInternetTp, 
ClickAnonymousHdl_Impl ) );
 maBtBrowse.SetClickHdl  ( LINK ( this, SvxHyperlinkInternetTp, 
ClickBrowseHdl_Impl ) );
-maBtTarget.SetClickHdl  ( LINK ( this, SvxHyperlinkInternetTp, 
ClickTargetHdl_Impl ) );
 maEdLogin.SetModifyHdl  ( LINK ( this, SvxHyperlinkInternetTp, 
ModifiedLoginHdl_Impl ) );
 maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, 
LostFocusTargetHdl_Impl ) );
 maCbbTarget.SetModifyHdl( LINK ( this, SvxHyperlinkInternetTp, 
ModifiedTargetHdl_Impl ) );
@@ -94,8 +90,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window 
*pParent,
 
 maFtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
 maCbbTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
-maBtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
-maBtTarget.SetAccessibleRelationLabeledBy( &maFtTarget );
 maBtBrowse.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
 maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget );
 }
@@ -298,14 +292,12 @@ void SvxHyperlinkInternetTp::SetScheme(const OUString& 
rScheme)
 //update 'link target in document'-window and opening-button
 if (rScheme.startsWith(sHTTPScheme) || rScheme.isEmpty())
 {
-maBtTarget.Enable();
 if ( mbMarkWndOpen )
 ShowMark

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

[Matúš Kukan]

 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |4 -
 sc/source/ui/miscdlgs/datastreams.cxx|   27 
+-
 2 files changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 9c45345a680f7444df251f9403c7d56572380f21
Author: Matúš Kukan 
Date:   Mon Nov 18 13:31:39 2013 +0100

datastreams: make toolbar docked, hidden and show it when starting streaming

Change-Id: Icbf1abffc5424e213550c7cf27cdaa59126fa54d

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 8ef44d3..f5e294b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -56,13 +56,13 @@
   
   
 
-  false
+  true
 
 
   Data Streams
 
 
-  true
+  false
 
   
   
diff --git a/sc/source/ui/miscdlgs/datastreams.cxx 
b/sc/source/ui/miscdlgs/datastreams.cxx
index 1639dbc..dd5a821 100644
--- a/sc/source/ui/miscdlgs/datastreams.cxx
+++ b/sc/source/ui/miscdlgs/datastreams.cxx
@@ -9,14 +9,18 @@
 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
-#include 
 
 namespace datastreams {
 
@@ -80,6 +84,27 @@ void DataStreams::Start()
 mpScDocument->EnableUndo(false);
 mbRunning = true;
 mxThread->maStart.set();
+css::uno::Reference< css::frame::XFrame > xFrame =
+
mpScDocShell->GetViewData()->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface();
+if (!xFrame.is())
+return;
+
+css::uno::Reference< css::beans::XPropertySet > xPropSet(xFrame, 
css::uno::UNO_QUERY);
+if (!xPropSet.is())
+return;
+
+css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
+xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
+if (!xLayoutManager.is())
+return;
+
+const OUString sResourceURL( "private:resource/toolbar/datastreams" );
+css::uno::Reference< css::ui::XUIElement > xUIElement = 
xLayoutManager->getElement(sResourceURL);
+if (!xUIElement.is())
+{
+xLayoutManager->createElement( sResourceURL );
+xLayoutManager->showElement( sResourceURL );
+}
 }
 
 void DataStreams::Stop()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 framework/source/uiconfiguration/uiconfigurationmanager.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d4fa4c7b386157a7b313bacda0aa0b09ff40f5af
Author: Andras Timar 
Date:   Mon Nov 18 12:12:49 2013 +0100

fdo#69500: Revert "fix bug #60700 - de-crutify ODF files"

This reverts commit da06166015689eca260c702602bef4cea58afbd3.

diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx 
b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 3b264d9..bbfc282 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -513,6 +513,8 @@ void UIConfigurationManager::impl_Initialize()
 // Initialize the top-level structures with the storage data
 if ( m_xDocConfigStorage.is() )
 {
+long nModes = m_bReadOnly ? ElementModes::READ : 
ElementModes::READWRITE;
+
 // Try to access our module sub folder
 for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
   i++ )
@@ -520,7 +522,7 @@ void UIConfigurationManager::impl_Initialize()
 Reference< XStorage > xElementTypeStorage;
 try
 {
-xElementTypeStorage = m_xDocConfigStorage->openStorageElement( 
OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READ );
+xElementTypeStorage = m_xDocConfigStorage->openStorageElement( 
OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
 }
 catch ( const com::sun::star::container::NoSuchElementException& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: mso-dumper: utf16 conversion

[Thorsten Behrens]

Miklos Vajna wrote:
> [ Adding Thorsten / Kohei to CC, I guess they authored the
> getUTF8FromUTF16() function in question. ]
>
Sure, if it works - go for it. :)

And of course glad to hear the code is useful beyond its original
intention. ;)

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sfx2/source/doc/docfile.cxx  |3 +++
 sfx2/source/doc/objmisc.cxx  |4 
 sfx2/source/view/viewfrm.cxx |8 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 7dca2226394b8e07fe915e811bc02315580dd5b9
Author: Stephan Bergmann 
Date:   Mon Nov 18 12:20:46 2013 +0100

Set Referer for auto-reload

Change-Id: Ie6b664bcd2021820a5baf158582fce7a07c112af

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 590f53c..8751f42 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1445,6 +1445,10 @@ void AutoReloadTimer_Impl::Timeout()
 aSet.Put( SfxBoolItem( SID_AUTOLOAD, sal_True ) );
 if ( !aUrl.isEmpty() )
 aSet.Put(  SfxStringItem( SID_FILE_NAME, aUrl ) );
+if (pObjSh->HasName()) {
+aSet.Put(
+SfxStringItem(SID_REFERER, pObjSh->GetMedium()->GetName()));
+}
 SfxRequest aReq( SID_RELOAD, 0, aSet );
 pObjSh->Get_Impl()->pReloadTimer = 0;
 delete this;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3839350..1fa99c4 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -639,7 +639,13 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 pNewSet->Put( *pURLItem );
 
 // Filter Detection
-SfxMedium aMedium( pURLItem->GetValue(), 
SFX_STREAM_READWRITE );
+OUString referer;
+SFX_REQUEST_ARG(
+rReq, refererItem, SfxStringItem, SID_REFERER, false);
+if (refererItem != 0) {
+referer = refererItem->GetValue();
+}
+SfxMedium aMedium( pURLItem->GetValue(), referer, 
SFX_STREAM_READWRITE );
 SfxFilterMatcher().GuessFilter( aMedium, &pFilter );
 if ( pFilter )
 pNewSet->Put( SfxStringItem( SID_FILTER_NAME, 
pFilter->GetName() ) );
commit fd08abb5941f6815f8a49ae50e7fc93d93609543
Author: Stephan Bergmann 
Date:   Mon Nov 18 12:19:18 2013 +0100

Don't try lockfile creation when getting medium already failed

Change-Id: Idbca79b5224358eaaef040365b2b385f2e2af9dd

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 1b808ed..3d23f50 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1063,6 +1063,9 @@ void SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, 
sal_Bool bNoUI )
 {
 // let the stream be opened to check the system file 
locking
 GetMedium_Impl();
+if (GetError() != ERRCODE_NONE) {
+return;
+}
 }
 
 sal_Int8 bUIStatus = LOCK_UI_NOLOCK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - sw/qa sw/source writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfexport/rtfexport.cxx   |1 
 sw/qa/extras/rtfimport/data/copypaste-footnote.rtf |2 -
 sw/qa/extras/rtfimport/data/cp118.rtf  |   27 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   16 +++-
 sw/source/filter/ww8/rtfattributeoutput.cxx|   14 +-
 sw/source/filter/ww8/rtfexport.cxx |5 +++
 sw/source/filter/ww8/rtfexport.hxx |2 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |1 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 +
 9 files changed, 64 insertions(+), 16 deletions(-)

New commits:
commit 698c2829e0692f989cb9d4e6e55454d2d732f4ac
Author: Miklos Vajna 
Date:   Mon Nov 18 11:32:57 2013 +0100

cp#118 RTF export: avoid additional paragraph at footnote end

(cherry picked from commit 8299924b750f74f799dc683134788a285b38bd72)

Conflicts:
sw/source/filter/ww8/rtfattributeoutput.cxx

Change-Id: I430a7d705208f197050a7d521c9c20b267c33f26

diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 196334b..c8aca4a 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -440,10 +440,11 @@ void Test::testFdo53113()
 void Test::testFdo55939()
 {
 // The problem was that the exported RTF was invalid.
+// Also, the 'Footnote text.' had an additional newline at its end.
 uno::Reference xParagraph(getParagraph(1));
 getRun(xParagraph, 1, "Main text before footnote.");
 // Why the tab has to be removed here?
-CPPUNIT_ASSERT_EQUAL(OUString("Footnote text.\n"),
+CPPUNIT_ASSERT_EQUAL(OUString("Footnote text."),
 getProperty< uno::Reference >(getRun(xParagraph, 
2), "Footnote")->getText()->getString().replaceAll("\t", ""));
 getRun(xParagraph, 3, " Text after the footnote."); // However, this 
leading space is intentional and OK.
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 589f8a9..347c552 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -294,6 +294,12 @@ void RtfAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pTextN
 void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t 
pTextNodeInfoInner )
 {
 SAL_INFO("sw.rtf", OSL_THIS_FUNC);
+bool bLastPara = false;
+if (m_rExport.nTxtTyp == TXT_FTN || m_rExport.nTxtTyp == TXT_EDN)
+{
+// We're ending a paragraph that is the last paragraph of a footnote 
or endnote.
+bLastPara = m_rExport.m_nCurrentNodeIndex && 
m_rExport.m_nCurrentNodeIndex == m_rExport.pCurPam->End()->nNode.GetIndex();
+}
 
 FinishTableRowCell( pTextNodeInfoInner );
 
@@ -306,8 +312,12 @@ void RtfAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pTe
 else
 {
 aParagraph->append(m_rExport.sNewLine);
-aParagraph->append(OOO_STRING_SVTOOLS_RTF_PAR);
-aParagraph->append(' ');
+// RTF_PAR at the end of the footnote would cause an additional empty 
paragraph.
+if (!bLastPara)
+{
+aParagraph->append(OOO_STRING_SVTOOLS_RTF_PAR);
+aParagraph->append(' ');
+}
 }
 if (m_nColBreakNeeded)
 {
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index c98b780..3f094e3 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -755,8 +755,10 @@ void RtfExport::OutputLinkedOLE( const OUString& )
 
 void RtfExport::OutputTextNode( const SwTxtNode& rNode )
 {
+m_nCurrentNodeIndex = rNode.GetIndex();
 if ( !m_bOutOutlineOnly || rNode.IsOutline( ) )
 MSWordExportBase::OutputTextNode( rNode );
+m_nCurrentNodeIndex = 0;
 }
 
 void RtfExport::AppendSection( const SwPageDesc* pPageDesc, const 
SwSectionFmt* pFmt, sal_uLong nLnNum )
@@ -779,7 +781,8 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc 
*pDocument, SwPaM *pCurren
   rtl_getTextEncodingFromWindowsCharset(
   sw::ms::rtl_TextEncodingToWinCharset(DEF_ENCODING))),
   eCurrentEncoding(eDefaultEncoding),
-  bRTFFlySyntax(false)
+  bRTFFlySyntax(false),
+  m_nCurrentNodeIndex(0)
 {
 mbExportModeRTF = true;
 // the attribute output for the document
diff --git a/sw/source/filter/ww8/rtfexport.hxx 
b/sw/source/filter/ww8/rtfexport.hxx
index f4cbd43..ecc0d33 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -154,6 +154,8 @@ public:
 rtl_TextEncoding eCurrentEncoding;
 /// This is used by OutputFlyFrame_Impl() to control the written syntax
 bool bRTFFlySyntax;
+/// Index of the current SwTxtNode, if any.
+sal_uLong m_nCurrentNodeIndex;
 
 SvStream& Strm();
 SvStream& OutULong( sal_uLong nVal );
commit 7e8f19d93a58e009894e34942720

[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Stephan Bergmann]

 include/sfx2/docfile.hxx|2 +-
 sfx2/source/doc/docfile.cxx |   17 +
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit b15278891a4bce875502de1265f507ed8958
Author: Stephan Bergmann 
Date:   Mon Nov 18 12:10:46 2013 +0100

SfxMedium::LockOrigFileOnDemand return value is never used

Change-Id: I2f64cc8fbe78354f9ded7a9a6bf03d9c597b3897

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 7ef8b9e..33450a3 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -161,7 +161,7 @@ public:
 sal_BoolIsStorage();
 
 sal_Int8ShowLockedDocumentDialog( const css::uno::Sequence< 
OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock );
-boolLockOrigFileOnDemand( sal_Bool bLoading, sal_Bool 
bNoUI );
+voidLockOrigFileOnDemand( sal_Bool bLoading, sal_Bool 
bNoUI );
 voidUnlockFile( sal_Bool bReleaseLockStream );
 
 css::uno::Reference< css::embed::XStorage > GetStorage( sal_Bool 
bCreateTempIfNo = sal_True );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0a96f89..1b808ed 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -979,23 +979,17 @@ namespace
 
 #endif // HAVE_FEATURE_MULTIUSER_ENVIRONMENT
 
-// returns true if the document can be opened for editing ( even if it should 
be a copy )
-// otherwise the document should be opened readonly
+// sets SID_DOC_READONLY if the document cannot be opened for editing
 // if user cancel the loading the ERROR_ABORT is set
-bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
+void SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
 {
 #if !HAVE_FEATURE_MULTIUSER_ENVIRONMENT
 (void) bLoading;
 (void) bNoUI;
-return true;
 #else
-if (!IsLockingUsed())
-return true;
-
-if ( GetURLObject().HasError() )
-return false;
+if (!IsLockingUsed() || GetURLObject().HasError())
+return;
 
-bool bResult = false;
 try
 {
 if ( pImp->m_bLocked && bLoading && 
::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( 
INetURLObject::NO_DECODE ) ) )
@@ -1005,7 +999,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, 
sal_Bool bNoUI )
 GetLockingStream_Impl();
 }
 
-bResult = pImp->m_bLocked;
+bool bResult = pImp->m_bLocked;
 
 if ( !bResult )
 {
@@ -1224,7 +1218,6 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, 
sal_Bool bNoUI )
 {
 SAL_WARN( "sfx.doc", "Locking exception: high probability, that the 
content has not been created" );
 }
-return bResult;
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

[David Tardon]

 filter/Configuration_filter.mk   |6 +
 filter/source/config/fragments/filters/Beagle_Works.xcu  |4 -
 filter/source/config/fragments/filters/Great_Works.xcu   |4 -
 filter/source/config/fragments/filters/MacDoc.xcu|2 
 filter/source/config/fragments/filters/Mac_Acta.xcu  |   29 
 filter/source/config/fragments/filters/Mac_More.xcu  |   29 
 filter/source/config/fragments/types/writer_Beagle_Works.xcu |6 -
 filter/source/config/fragments/types/writer_Great_Works.xcu  |6 -
 filter/source/config/fragments/types/writer_Mac_Acta.xcu |   29 
 filter/source/config/fragments/types/writer_Mac_More.xcu |   29 
 writerperfect/source/writer/MWAWImportFilter.cxx |   37 ++-
 11 files changed, 167 insertions(+), 14 deletions(-)

New commits:
commit 78e2af8d7141015372995a3583242998c977e829
Author: David Tardon 
Date:   Mon Nov 18 11:29:47 2013 +0100

enable more formats supported by libmwaw

Change-Id: I60d5ff673843236436af12f86f40916b7d266cd3

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index bace597..347d00c 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -328,8 +328,11 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
writer_eDoc_Document \
writer_FullWrite_Professional \
writer_Great_Works \
+   writer_HanMac_Word_J \
writer_HanMac_Word_K \
writer_LightWayText \
+   writer_Mac_Acta \
+   writer_Mac_More \
writer_Mac_Word \
writer_Mac_Works \
writer_MacDoc \
@@ -384,8 +387,11 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
eDoc_Document \
FullWrite_Professional \
Great_Works \
+   HanMac_Word_J \
HanMac_Word_K \
LightWayText \
+   Mac_Acta \
+   Mac_More \
Mac_Word \
Mac_Works \
MacDoc \
diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu 
b/filter/source/config/fragments/filters/Beagle_Works.xcu
index f1cab85..e2f9d4c 100644
--- a/filter/source/config/fragments/filters/Beagle_Works.xcu
+++ b/filter/source/config/fragments/filters/Beagle_Works.xcu
@@ -7,7 +7,7 @@
  *
 -->
 
-
+
 
 IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED
 
@@ -15,7 +15,7 @@
 com.sun.star.comp.Writer.MWAWImportFilter
 
 
-Beagle Works Document
+BeagleWorks/WordPerfect Works v1 
Document
 
 
 0
diff --git a/filter/source/config/fragments/filters/Great_Works.xcu 
b/filter/source/config/fragments/filters/Great_Works.xcu
index 6090504..0e5aeb3 100644
--- a/filter/source/config/fragments/filters/Great_Works.xcu
+++ b/filter/source/config/fragments/filters/Great_Works.xcu
@@ -7,7 +7,7 @@
  *
 -->
 
-
+
 
 IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED
 
@@ -15,7 +15,7 @@
 com.sun.star.comp.Writer.MWAWImportFilter
 
 
-Great Works Document
+GreatWorks Document
 
 
 0
diff --git a/filter/source/config/fragments/filters/MacDoc.xcu 
b/filter/source/config/fragments/filters/MacDoc.xcu
index 70ce7d2..2692709 100644
--- a/filter/source/config/fragments/filters/MacDoc.xcu
+++ b/filter/source/config/fragments/filters/MacDoc.xcu
@@ -15,7 +15,7 @@
 com.sun.star.comp.Writer.MWAWImportFilter
 
 
-MacDoc Document
+MacDoc v1 Document
 
 
 0
diff --git a/filter/source/config/fragments/filters/Mac_Acta.xcu 
b/filter/source/config/fragments/filters/Mac_Acta.xcu
new file mode 100644
index 000..c60349a
--- /dev/null
+++ b/filter/source/config/fragments/filters/Mac_Acta.xcu
@@ -0,0 +1,29 @@
+
+
+
+
+IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED
+
+
+com.sun.star.comp.Writer.MWAWImportFilter
+
+
+Acta Mac Classic Document
+
+
+0
+
+
+writer_Mac_Acta
+
+
+com.sun.star.text.TextDocument
+
+
diff --git a/filter/source/config/fragments/filters/Mac_More.xcu 
b/filter/source/config/fragments/filters/Mac_More.xcu
new file mode 100644
index 000..c2485f6
--- /dev/null
+++ b/filter/source/config/fragments/filters/Mac_More.xcu
@@ -0,0 +1,29 @@
+
+
+
+
+IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED
+
+
+com.sun.star.comp.Writer.MWAWImportFilter
+
+
+More Mac v2-3 Document
+
+
+0
+
+
+writer_Mac_More
+
+
+com.sun.star.text.TextDocument
+
+
diff --git a/filter/source/config/fragments/types/writer_Beagle_Works.xcu 
b/filter/source/config/fragments/types/writer_Beagle_Works.xcu
index efe015d..5eb45c1 100644
--- a/filter/source/config/fragments/types/writer_Beagle_Works.xcu
+++ b/filter/source/config/fragments/types/writer_Beagle_Works.xcu
@@ -12,

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

[Miklos Vajna]

 sw/qa/extras/rtfexport/rtfexport.cxx|3 ++-
 sw/source/filter/ww8/rtfattributeoutput.cxx |   14 --
 sw/source/filter/ww8/rtfexport.cxx  |5 -
 sw/source/filter/ww8/rtfexport.hxx  |2 ++
 4 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 8299924b750f74f799dc683134788a285b38bd72
Author: Miklos Vajna 
Date:   Mon Nov 18 11:32:57 2013 +0100

cp#118 RTF export: avoid additional paragraph at footnote end

Change-Id: I430a7d705208f197050a7d521c9c20b267c33f26

diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 58df4b5..b6084cb 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -341,10 +341,11 @@ DECLARE_RTFEXPORT_TEST(testFdo53113, "fdo53113.odt")
 DECLARE_RTFEXPORT_TEST(testFdo55939, "fdo55939.odt")
 {
 // The problem was that the exported RTF was invalid.
+// Also, the 'Footnote text.' had an additional newline at its end.
 uno::Reference xParagraph(getParagraph(1));
 getRun(xParagraph, 1, "Main text before footnote.");
 // Why the tab has to be removed here?
-CPPUNIT_ASSERT_EQUAL(OUString("Footnote text.\n"),
+CPPUNIT_ASSERT_EQUAL(OUString("Footnote text."),
 getProperty< uno::Reference >(getRun(xParagraph, 
2), "Footnote")->getText()->getString().replaceAll("\t", ""));
 getRun(xParagraph, 3, " Text after the footnote."); // However, this 
leading space is intentional and OK.
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 1b466e6..3415be7 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -297,6 +297,12 @@ void RtfAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pTextN
 void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t 
pTextNodeInfoInner )
 {
 SAL_INFO("sw.rtf", OSL_THIS_FUNC);
+bool bLastPara = false;
+if (m_rExport.nTxtTyp == TXT_FTN || m_rExport.nTxtTyp == TXT_EDN)
+{
+// We're ending a paragraph that is the last paragraph of a footnote 
or endnote.
+bLastPara = m_rExport.m_nCurrentNodeIndex && 
m_rExport.m_nCurrentNodeIndex == m_rExport.pCurPam->End()->nNode.GetIndex();
+}
 
 FinishTableRowCell( pTextNodeInfoInner );
 
@@ -309,8 +315,12 @@ void RtfAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pTe
 else
 {
 aParagraph->append(SAL_NEWLINE_STRING);
-aParagraph->append(OOO_STRING_SVTOOLS_RTF_PAR);
-aParagraph->append(' ');
+// RTF_PAR at the end of the footnote would cause an additional empty 
paragraph.
+if (!bLastPara)
+{
+aParagraph->append(OOO_STRING_SVTOOLS_RTF_PAR);
+aParagraph->append(' ');
+}
 }
 if (m_nColBreakNeeded)
 {
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index e061d1a..05647b9 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -765,8 +765,10 @@ void RtfExport::OutputLinkedOLE( const OUString& )
 
 void RtfExport::OutputTextNode( const SwTxtNode& rNode )
 {
+m_nCurrentNodeIndex = rNode.GetIndex();
 if ( !m_bOutOutlineOnly || rNode.IsOutline( ) )
 MSWordExportBase::OutputTextNode( rNode );
+m_nCurrentNodeIndex = 0;
 }
 
 void RtfExport::AppendSection( const SwPageDesc* pPageDesc, const 
SwSectionFmt* pFmt, sal_uLong nLnNum )
@@ -789,7 +791,8 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc 
*pDocument, SwPaM *pCurren
   rtl_getTextEncodingFromWindowsCharset(
   sw::ms::rtl_TextEncodingToWinCharset(DEF_ENCODING))),
   eCurrentEncoding(eDefaultEncoding),
-  bRTFFlySyntax(false)
+  bRTFFlySyntax(false),
+  m_nCurrentNodeIndex(0)
 {
 mbExportModeRTF = true;
 // the attribute output for the document
diff --git a/sw/source/filter/ww8/rtfexport.hxx 
b/sw/source/filter/ww8/rtfexport.hxx
index 930c45a..e77adf9 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -148,6 +148,8 @@ public:
 rtl_TextEncoding eCurrentEncoding;
 /// This is used by OutputFlyFrame_Impl() to control the written syntax
 bool bRTFFlySyntax;
+/// Index of the current SwTxtNode, if any.
+sal_uLong m_nCurrentNodeIndex;
 
 SvStream& Strm();
 SvStream& OutULong( sal_uLong nVal );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 86fd7fd4f634d5a8a566500ec4248785ea2e790e
Author: Miklos Vajna 
Date:   Mon Nov 18 11:19:24 2013 +0100

CppunitTest_sw_ooxmlexport: disable two testcases on Mac

I guess the crop export code needs some love even on Linux, so instead
of trying to fix something blindly, better to just disable them there
for now.

Change-Id: Ie33fc0f95f01799dcb9002b95f7fb7a239d4ba12

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 892f3cc..e624bfb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1872,6 +1872,8 @@ DECLARE_OOXMLEXPORT_TEST(testParaAutoSpacing, 
"para-auto-spacing.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testGIFImageCrop, "test_GIF_ImageCrop.docx")
 {
+// FIXME why does this fail on Mac?
+#if !defined(MACOSX)
 uno::Reference image = getShape(1);
 uno::Reference imageProperties(image, uno::UNO_QUERY);
 ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
@@ -1884,10 +1886,13 @@ DECLARE_OOXMLEXPORT_TEST(testGIFImageCrop, 
"test_GIF_ImageCrop.docx")
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 4256 ), aGraphicCropStruct.Right );
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 1109 ), aGraphicCropStruct.Top );
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 1448 ), aGraphicCropStruct.Bottom );
+#endif
 }
 
 DECLARE_OOXMLEXPORT_TEST(testPNGImageCrop, "test_PNG_ImageCrop.docx")
 {
+// FIXME why does this fail on Mac?
+#if !defined(MACOSX)
 /* The problem was image cropping information was not getting saved
  * after roundtrip.
  * Check for presenece of cropping parameters in exported file.
@@ -1904,6 +1909,7 @@ DECLARE_OOXMLEXPORT_TEST(testPNGImageCrop, 
"test_PNG_ImageCrop.docx")
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 1295 ), aGraphicCropStruct.Right );
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 1358 ), aGraphicCropStruct.Top );
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 737 ), aGraphicCropStruct.Bottom );
+#endif
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFootnoteParagraphTag, "testFootnote.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/doc/objmisc.cxx |   20 
 sfx2/source/view/frame.cxx  |   16 
 2 files changed, 16 insertions(+), 20 deletions(-)

New commits:
commit 7f9fde2490610825c77dd1026e4b48c28d496036
Author: Stephan Bergmann 
Date:   Mon Nov 18 11:17:31 2013 +0100

Move SfxFrame::IsAutoLoadLocked_Impl to frame.cxx

Change-Id: I7b5d4a5fa6191cebeada363553c8d6d6d29c

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index f1db22e..590f53c 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1044,26 +1044,6 @@ void SfxObjectShell::PrepareReload( )
 {
 }
 
-// Can be moved to frame.cxx, when 358+36x-State have been merged
-
-sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
-{
-// Its own Docucument is locked?
-const SfxObjectShell* pObjSh = GetCurrentDocument();
-if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
-return sal_False;
-
-// Its children are locked?
-for ( sal_uInt16 n = GetChildFrameCount(); n--; )
-if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
-return sal_False;
-
-// otherwise allow AutoLoad
-return sal_True;
-}
-
-//-
-
 sal_Bool SfxObjectShell::IsAutoLoadLocked() const
 
 /* Returns whether an Autoload is allowed to be executed. Before the
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index e1999d5..f64b7b6 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -329,6 +329,22 @@ SfxDispatcher* SfxFrame::GetDispatcher_Impl() const
 return GetParentFrame()->GetDispatcher_Impl();
 }
 
+sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
+{
+// Its own Docucument is locked?
+const SfxObjectShell* pObjSh = GetCurrentDocument();
+if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
+return sal_False;
+
+// Its children are locked?
+for ( sal_uInt16 n = GetChildFrameCount(); n--; )
+if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
+return sal_False;
+
+// otherwise allow AutoLoad
+return sal_True;
+}
+
 SfxObjectShell* SfxFrame::GetCurrentDocument() const
 {
 return pImp->pCurrentViewFrame ?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Dev-Environment with Vagrant/VirtualBox?

[Michael Stahl]

On 16/11/13 20:57, bjoern wrote:
> On Fri, Nov 15, 2013 at 08:37:51PM +0100, Michael Stahl wrote:
>> 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.

on the other hand, if the newbies do the build themselves they will get
a sense of having achieved something.  which we can of course help by
only releasing image with a git repo at a revision that does in fact
build ;)

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

mso-dumper: making a PPT text extractor

[jf]

Hi,

While looking for a PPT text extractor, I found that mso-dumper was quite
close to doing a good job. I propose to make a few simple modifications to
make it work.

This would be quite useful because such a program is currently lacking, and
it is needed by text indexers:

 - catppt does not work at all on any semi-recent file.
 - unoconv works but it is extremely slow and often crashes.
 - Apache Tika probably have something but it's big and Java.

The modifications to mso-dumper would be as follows:

 - Make sure that all current output goes through the output() method
   inside glob.py instead of using direct print() calls
 - Add a command-line option to suppress printing from output()
 - Add a command-line option to accumulate and print the text from the
   String() and UniString() classes inside pptrecord.py: this would be the
   text extractor proper.

A quick test of the approach based on commenting and changing the
appropriate statements shows that the text extraction work very well (after
the charset conversion fixes posted earlier).

However this would need small changes to the code (print statements mostly)
in many places, so I would appreciate some kind of pre-approval from the
code owners before going to work.

It would also be useful to rename the "src" directory to something like
"msodump" so that the code can be installed as a Python package in a more
standard way (this would also need a change to the import statements in the
top level utilities).

Cheers,

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/inc svl/inc svl/source vcl/inc

[Herbert Dürr]

 solenv/inc/lldb4aoo.py |   17 +
 svl/inc/svl/zformat.hxx|4 ++--
 svl/source/numbers/zformat.cxx |4 ++--
 vcl/inc/win/g_msaasvc.h|   33 ++---
 4 files changed, 39 insertions(+), 19 deletions(-)

New commits:
commit 9c2bd795b65a5fa25f29c5773790d7281c227f4c
Author: Herbert Dürr 
Date:   Mon Nov 18 09:42:46 2013 +

#i123693# WaE: const type qualifier ignored on return value

this fix removes almost 120 compile warnings during the AOO build

diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 1f0becd..cae9f54 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -160,7 +160,7 @@ public:
 const SvNumberNatNum& GetNatNum() const { return aNatNum; }
 
 // check, if the format code contains a subformat for text
-const bool HasTextFormatCode() const;
+bool HasTextFormatCode() const;
 
 private:
 ImpSvNumberformatInfo aI;   // Hilfsstruct fuer die restlichen 
Infos
@@ -336,7 +336,7 @@ public:
 sal_Bool HasNewCurrency() const;
 
 // check, if the format code contains a subformat for text
-const bool HasTextFormatCode() const;
+bool HasTextFormatCode() const;
 
 // Build string from NewCurrency for saving it SO50 compatible
 void Build50Formatstring( String& rStr ) const;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index e8df25e..c5db134 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -406,7 +406,7 @@ sal_Bool ImpSvNumFor::HasNewCurrency() const
 return sal_False;
 }
 
-const bool ImpSvNumFor::HasTextFormatCode() const
+bool ImpSvNumFor::HasTextFormatCode() const
 {
 return aI.eScannedType == NUMBERFORMAT_TEXT;
 }
@@ -1722,7 +1722,7 @@ sal_Bool SvNumberformat::HasNewCurrency() const
 return sal_False;
 }
 
-const bool SvNumberformat::HasTextFormatCode() const
+bool SvNumberformat::HasTextFormatCode() const
 {
 for ( sal_uInt16 j=0; j<4; j++ )
 {
commit f1390100e005cece4fdc93a7c760c79929153a4d
Author: Herbert Dürr 
Date:   Mon Nov 18 08:32:52 2013 +

#i107914# adjust the g_msaasvc.h license header to the ALv2

as intended by IBM's contribution of the Symphony source code
and the individual ICLAs of the developers

diff --git a/vcl/inc/win/g_msaasvc.h b/vcl/inc/win/g_msaasvc.h
index e612fa3..2aa79e7 100644
--- a/vcl/inc/win/g_msaasvc.h
+++ b/vcl/inc/win/g_msaasvc.h
@@ -1,23 +1,26 @@
-/
+/**
  *
- * Licensed Materials - Property of IBM.
- * (C) Copyright IBM Corporation 2003, 2009.  All Rights Reserved.
- * U.S. Government Users Restricted Rights:
- * Use, duplication or disclosure restricted by GSA ADP Schedule Contract with 
IBM Corp.
- *
- /
-
-/*
+ * 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
  *
- * (C) Copyright IBM Corp. 2003, 2005
- * The source code for this program is not published or otherwise
- * divested of its IBM trade secrets, irrespective of what has
- * been deposited with the U.S. Copyright Office.
- * All rights reserved
+ * 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 _SV_G_MSASSVR_H_
 #define _SV_G_MSASSVR_H_
 extern com::sun::star::accessibility::XMSAAService* g_acc_manager1;
 #endif
+
commit a49de20398b27aba210e8f4b3a0bd7207853b90b
Author: Herbert Dürr 
Date:   Mon Nov 18 08:31:11 2013 +

#i107914# revert license header change which was introduced as svn-merge 
artifact

diff --git a/solenv/inc/lldb4aoo.py b/solenv/inc/lldb4aoo.py
index 3f64058..a9bc3fc 100644
--- a/solenv/inc/lldb4aoo.py
+++ b/solenv/inc/lldb4aoo.py
@@ -1,3 +1,20 @@
+# 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

Re: mso-dumper: utf16 conversion

[Miklos Vajna]

[ Adding Thorsten / Kohei to CC, I guess they authored the
getUTF8FromUTF16() function in question. ]


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Tor Lillqvist]

> It's unclear how much harm if any that did to us here ? ;-)

OK, not then.

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

mso-dumper: utf16 conversion

[jf]

Hi,

I am having a look at making a PowerPoint text extractor out of mso-dumper. 

While doing this, I found that the routine used to convert utf-16 text out
of the TextChars Atoms was not working for me.

The new version (first attached patch) was tested on a variety of inputs,
including chinese, vietnamese and several European languages, and produces
text corresponding to what libreoffice displays, instead of outputting "" messages. See the commit comment for more detailed
explanations. 

Also the method which processed text out of textBytes Atoms assumed that
these were ascii characters, which sometimes also caused problems (wrong
displays or exceptions).

The new version decodes from cp1252, and works better where I tried
it. Also see the commit message for more details about the choice of
encoding. 

Cheers,

jf



utf16conv.diff
Description: Binary data


8bitbytes.diff
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Michael Meeks]

On Sat, 2013-11-16 at 11:40 +0200, Tor Lillqvist wrote:
> Anyway, I tried building on Windows with --enable-mergelibs=all, did
> not succeed.

AFAIK 'all' is prolly not what we want, it's the extreme end; 'yes' is
prolly rather more conservative and helpful. If we can avoid loading
calc and writer just to start impress we're prolly winning - the same is
not true of all the hundred+ scattered tiny libraries though.

>  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.

Ah ok ;-)

> This once again shows how harmful it is to have tons of configuration
> options. They don't get tested and bit-rot.

It's unclear how much harm if any that did to us here ? ;-)

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

___
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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 9a28c1537c8687b72a4e89b80ed18ea46d77757e
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 03:09:24 2013 -0600

GPU Calc: re-enable parallel sum reduction after fixing regressions

Change-Id: Id274575e731c413e8e9b808ae5e651efe10f7b03

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 1594075..f6e6baf 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -405,6 +405,7 @@ protected:
 /// Handling a Double Vector that is used as a sliding window input
 /// to either a sliding window average or sum-of-products
 class OpSum; // Forward Declaration
+class OpAverage; // Forward Declaration
 template
 class DynamicKernelSlidingArgument: public Base
 {
@@ -423,9 +424,13 @@ public:
 }
 virtual bool NeedParallelReduction(void) const
 {
-return GetWindowSize()> 100 &&
-( (GetStartFixed() && GetEndFixed()) ||
-  (!GetStartFixed() && !GetEndFixed())  ) ;
+if (dynamic_cast(mpCodeGen.get())
+&& !dynamic_cast(mpCodeGen.get()))
+return GetWindowSize()> 100 &&
+( (GetStartFixed() && GetEndFixed()) ||
+  (!GetStartFixed() && !GetEndFixed())  ) ;
+else
+return false;
 }
 virtual void GenSlidingWindowFunction(std::stringstream &ss) {
 if (dynamic_cast(mpCodeGen.get()) && NeedParallelReduction())
@@ -496,7 +501,7 @@ public:
 {
 // set 100 as a temporary threshold for invoking reduction
 // kernel in NeedParalleLReduction function
-if (/*NeedParallelReduction()*/false)
+if (NeedParallelReduction())
 {
 std::string temp = Base::GetName() + "[gid0]";
 ss << "tmp = ";
@@ -511,7 +516,7 @@ public:
 {
 // set 100 as a temporary threshold for invoking reduction
 // kernel in NeedParalleLReduction function
-if (NeedParallelReduction()&&false)
+if (NeedParallelReduction())
 {
 std::string temp = Base::GetName() + "[0]";
 ss << "tmp = ";
@@ -563,7 +568,7 @@ public:
 
 virtual size_t Marshal(cl_kernel k, int argno, int w, cl_program mpProgram)
 {
-if (!NeedParallelReduction() || true)
+if (!NeedParallelReduction())
 return Base::Marshal(k, argno, w, mpProgram);
 
 assert(Base::mpClmem == NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ray]

 sc/source/core/opencl/formulagroupcl.cxx |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit dc113e8a86e9904df8f37a2980db39cbabcea78f
Author: I-Jui (Ray) Sung 
Date:   Mon Nov 18 03:09:24 2013 -0600

GPU Calc: re-enable parallel sum reduction after fixing regressions

Change-Id: Id274575e731c413e8e9b808ae5e651efe10f7b03

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index d2a6d8b..a863c94 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -405,6 +405,7 @@ protected:
 /// Handling a Double Vector that is used as a sliding window input
 /// to either a sliding window average or sum-of-products
 class OpSum; // Forward Declaration
+class OpAverage; // Forward Declaration
 template
 class DynamicKernelSlidingArgument: public Base
 {
@@ -423,9 +424,13 @@ public:
 }
 virtual bool NeedParallelReduction(void) const
 {
-return GetWindowSize()> 100 &&
-( (GetStartFixed() && GetEndFixed()) ||
-  (!GetStartFixed() && !GetEndFixed())  ) ;
+if (dynamic_cast(mpCodeGen.get())
+&& !dynamic_cast(mpCodeGen.get()))
+return GetWindowSize()> 100 &&
+( (GetStartFixed() && GetEndFixed()) ||
+  (!GetStartFixed() && !GetEndFixed())  ) ;
+else
+return false;
 }
 virtual void GenSlidingWindowFunction(std::stringstream &ss) {
 if (dynamic_cast(mpCodeGen.get()) && NeedParallelReduction())
@@ -496,7 +501,7 @@ public:
 {
 // set 100 as a temporary threshold for invoking reduction
 // kernel in NeedParalleLReduction function
-if (/*NeedParallelReduction()*/false)
+if (NeedParallelReduction())
 {
 std::string temp = Base::GetName() + "[gid0]";
 ss << "tmp = ";
@@ -511,7 +516,7 @@ public:
 {
 // set 100 as a temporary threshold for invoking reduction
 // kernel in NeedParalleLReduction function
-if (NeedParallelReduction()&&false)
+if (NeedParallelReduction())
 {
 std::string temp = Base::GetName() + "[0]";
 ss << "tmp = ";
@@ -563,7 +568,7 @@ public:
 
 virtual size_t Marshal(cl_kernel k, int argno, int w, cl_program mpProgram)
 {
-if (!NeedParallelReduction() || true)
+if (!NeedParallelReduction())
 return Base::Marshal(k, argno, w, mpProgram);
 
 assert(Base::mpClmem == NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits