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

[Tor Lillqvist]

 sc/source/core/opencl/formulagroupcl.cxx |6 --
 sw/source/filter/html/css1atr.cxx|6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ab431b632e1e329372b8058bebdb69e1815840c2
Author: Tor Lillqvist 
Date:   Tue Dec 16 08:18:15 2014 +0200

WaE: replace '+' between string literals with juxtaposition

Change-Id: I64690ce1d6960dea52bae6a5bc1d0f1de742cb63

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 69f1ac7..72ab5c3 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -255,13 +255,13 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char 
*pProp,
 if (bCfgPrintLayout) {
 sOut.append(
 "p." + OString(sCSS2_P_CLASS_leaders) + "{max-width:" + 
OString::number(DOT_LEADERS_MAX_WIDTH) +
-"cm;padding:0;overflow-x:hidden;line-height:120%}" +
+"cm;padding:0;overflow-x:hidden;line-height:120%}"
 "p." + OString(sCSS2_P_CLASS_leaders) + 
":after{float:left;width:0;white-space:nowrap;content:\"");
 for (int i = 0; i < 100; i++ )
 sOut.append(". ");
 sOut.append(
-"\"}p." + OString(sCSS2_P_CLASS_leaders) + " 
span:first-child{padding-right:0.33em;background:white}" +
-"p." + OString(sCSS2_P_CLASS_leaders) + " 
span+span{float:right;padding-left:0.33em;" +
+"\"}p." + OString(sCSS2_P_CLASS_leaders) + " 
span:first-child{padding-right:0.33em;background:white}"
+"p." + OString(sCSS2_P_CLASS_leaders) + " 
span+span{float:right;padding-left:0.33em;"
 "background:white;position:relative;z-index:1}");
 }
 Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
commit 7f3441467324e413974dcc9ceee4c3cb8dbda0ea
Author: Tor Lillqvist 
Date:   Tue Dec 16 08:16:46 2014 +0200

WaE: Unreferenced function definition

Change-Id: I25bc6231f4efd76b33db028f6ffea19799519083

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 10d9bcd..28519b5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3726,10 +3726,12 @@ public:
 mpKernel = pKernel;
 }
 
+#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION
 void setUnmanagedKernel( DynamicKernel* pKernel )
 {
 mpKernel = pKernel;
 }
+#endif
 
 CLInterpreterResult launchKernel()
 {
commit 634fdb75b5d087df769158063dde7c96c0d705f2
Author: Tor Lillqvist 
Date:   Tue Dec 16 08:11:46 2014 +0200

SAL_WARN itself already prints __FILE__ and __LINE__ of its call site

Change-Id: I214ee188793e7ef189417460ea32eeaf0a8b6a29

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index a2c254c..10d9bcd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3687,7 +3687,7 @@ public:
 
 if (err != CL_SUCCESS)
 {
-SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " 
<< err << " at " << __FILE__ << ":" << __LINE__);
+SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " 
<< err);
 return false;
 }
 
@@ -3696,7 +3696,7 @@ public:
 err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, res, resbuf, 0, NULL, 
NULL);
 if (err != CL_SUCCESS)
 {
-SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " 
<< err << " at " << __FILE__ << ":" << __LINE__);
+SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " 
<< err);
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Markus Mohrhard]

Hey

On Tue, Dec 16, 2014 at 12:50 AM, Crashtest VM <
crashtest.libreoff...@gmail.com> wrote:
>
> New crashtest update available at
> http://dev-builds.libreoffice.org/crashtest/68b8f008c8893b6b7d2314c21679bf2dbcd1b4e5/
>
>
>
Correct log for validation errors is attached. There was a python error
which prevented the update of the log. The improvements in xlsx validation
errors comes purely from fixing 2 bugs in officeotron.
pptx,xlsx,docx,,odp,ods,odt,odb,odf,odg
553,598,6802,,3296,3090,1352,1382,,210
499,796,16944,,2983,3759,3487,1387,,214
558,848,17363,,3420,3870,3564,1406,6,224
573,777,17486,,3432,2874,4607,1421,6,226
608,891,14313,,3436,3913,3457,1411,6,227
609,893,17532,,3439,3920,4508,1411,6,227
609,882,17495,,3435,3909,4491,1410,6,226
613,909,17787,,3480,3977,4562,1433,6,228
610,1018,17425,,3478,3226,4415,1432,6,229
617,1019,15589,,3488,3229,3758,173,6,229
606,1027,17834,,3433,3317,4564,173,6,229
604,1024,17834,,3431,3312,4566,173,6,228
614,4163,20120,,3478,3307,4550,360,6,228
616,4148,20138,,3476,3301,4544,173,6,228
602,1026,14342,,3483,3309,4551,173,6,228
540,1018,14112,,3322,3304,4510,360,6,228
548,1028,13109,,3166,3305,4019,173,6,228
545,1019,14233,,3166,3302,4517,335,5,228
604,1030,12358,,3485,3314,4533,169,5,228
604,1026,12375,,3484,3312,4536,150,6,229
607,868,12310,,3490,3318,4543,165,5,229
561,870,14203,,3395,3326,4361,1309,,243
604,876,14234,,3560,3366,4385,1215,,243
605,876,14259,,3561,3371,4392,1213,,243
608,870,14261,,3561,3364,4392,1426,,243
607,876,14307,,3561,3370,4429,1427,,243
606,876,14415,,3571,3373,4451,1432,,303
609,877,14420,,3568,2027,4407,1432,,299
590,910,14314,,3544,1957,4373,1429,,298
605,914,14419,,3566,1954,4412,1430,,299
601,1040,14423,,3551,1997,4411,1432,,299
604,1048,14418,,3558,1512,4400,1421,,288
592,1042,14383,,3484,1505,4389,1423,,299
605,1033,14429,,3558,1500,4410,1441,,298
605,1039,13107,,3559,1513,4408,1440,,299
609,324,13105,0,3562,1513,4409,1455,0,299
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida]

 sc/inc/formulacell.hxx  |2 +-
 sc/source/core/data/formulacell.cxx |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 017d16bdc2b02af03a9c08bb162229ba391dfd6a
Author: Kohei Yoshida 
Date:   Mon Dec 15 22:16:01 2014 -0500

Reduce the size of ScFormulaCell by packing the matrix flag value.

Change-Id: I07ee4f03ba74415c11188f7b63879ccad542537c

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 86b8045..0ed021f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -129,8 +129,8 @@ private:
 ScFormulaCell*  pPreviousTrack;
 ScFormulaCell*  pNextTrack;
 sal_uInt16  nSeenInIteration;   // Iteration cycle in which the cell 
was last encountered
-sal_uInt8   cMatrixFlag;// One of ScMatrixMode
 short   nFormatType;
+sal_uInt8   cMatrixFlag: 2; // One of ScMatrixMode
 boolbDirty : 1; // Must be (re)calculated
 boolbChanged   : 1; // Whether something changed regarding 
display/representation
 boolbRunning   : 1; // Already interpreting right now
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 3162ba7..d8c79b9 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -593,8 +593,8 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const 
ScAddress& rPos ) :
 pPreviousTrack(0),
 pNextTrack(0),
 nSeenInIteration(0),
-cMatrixFlag(MM_NONE),
 nFormatType(NUMBERFORMAT_NUMBER),
+cMatrixFlag(MM_NONE),
 bDirty(false),
 bChanged(false),
 bRunning(false),
@@ -622,8 +622,8 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const 
ScAddress& rPos,
 pPreviousTrack(0),
 pNextTrack(0),
 nSeenInIteration(0),
-cMatrixFlag ( cMatInd ),
 nFormatType ( NUMBERFORMAT_NUMBER ),
+cMatrixFlag ( cMatInd ),
 bDirty( true ), // -> Because of the use of the Auto Pilot Function was: 
cMatInd != 0
 bChanged( false ),
 bRunning( false ),
@@ -654,8 +654,8 @@ ScFormulaCell::ScFormulaCell(
 pPreviousTrack(0),
 pNextTrack(0),
 nSeenInIteration(0),
-cMatrixFlag ( cMatInd ),
 nFormatType ( NUMBERFORMAT_NUMBER ),
+cMatrixFlag ( cMatInd ),
 bDirty( true ),
 bChanged( false ),
 bRunning( false ),
@@ -702,8 +702,8 @@ ScFormulaCell::ScFormulaCell(
 pPreviousTrack(0),
 pNextTrack(0),
 nSeenInIteration(0),
-cMatrixFlag ( cMatInd ),
 nFormatType ( NUMBERFORMAT_NUMBER ),
+cMatrixFlag ( cMatInd ),
 bDirty( true ),
 bChanged( false ),
 bRunning( false ),
@@ -749,8 +749,8 @@ ScFormulaCell::ScFormulaCell(
 pPreviousTrack(0),
 pNextTrack(0),
 nSeenInIteration(0),
-cMatrixFlag ( cInd ),
 nFormatType(xGroup->mnFormatType),
+cMatrixFlag ( cInd ),
 bDirty(true),
 bChanged( false ),
 bRunning( false ),
@@ -778,8 +778,8 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, 
ScDocument& rDoc, cons
 pPreviousTrack(0),
 pNextTrack(0),
 nSeenInIteration(0),
-cMatrixFlag ( rCell.cMatrixFlag ),
 nFormatType( rCell.nFormatType ),
+cMatrixFlag ( rCell.cMatrixFlag ),
 bDirty( rCell.bDirty ),
 bChanged( rCell.bChanged ),
 bRunning( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/formulagroup.hxx  |   10 
 sc/source/core/data/formulacell.cxx  |4 
 sc/source/core/inc/formulagroupcl.hxx|   15 
 sc/source/core/opencl/formulagroupcl.cxx |  716 +--
 sc/source/core/tool/formulagroup.cxx |6 
 5 files changed, 417 insertions(+), 334 deletions(-)

New commits:
commit 990dbcab759265de1497b15a93e53a5fe81ff48d
Author: Kohei Yoshida 
Date:   Mon Dec 15 21:07:28 2014 -0500

Pass group length to context / result objects to reduce # of params.

It looks cleaner this way.

Change-Id: Id46cb52863fb9366d83ac17d3f8521e5a13a59c9

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index e455c8e..a2c254c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3657,13 +3657,16 @@ class CLInterpreterResult
 {
 DynamicKernel* mpKernel;
 
+SCROW mnGroupLength;
+
 public:
-CLInterpreterResult() : mpKernel(NULL) {}
-CLInterpreterResult( DynamicKernel* pKernel ) : mpKernel(pKernel) {}
+CLInterpreterResult() : mpKernel(NULL), mnGroupLength(0) {}
+CLInterpreterResult( DynamicKernel* pKernel, SCROW nGroupLength ) :
+mpKernel(pKernel), mnGroupLength(nGroupLength) {}
 
 bool isValid() const { return mpKernel != NULL; }
 
-bool pushResultToDocument( ScDocument& rDoc, const ScAddress& rTopPos, 
SCROW nLength )
+bool pushResultToDocument( ScDocument& rDoc, const ScAddress& rTopPos )
 {
 if (!isValid())
 return false;
@@ -3679,7 +3682,7 @@ public:
 double* resbuf = (double*)clEnqueueMapBuffer(kEnv.mpkCmdQueue,
 res,
 CL_TRUE, CL_MAP_READ, 0,
-nLength * sizeof(double), 0, NULL, NULL,
+mnGroupLength * sizeof(double), 0, NULL, NULL,
 &err);
 
 if (err != CL_SUCCESS)
@@ -3688,7 +3691,7 @@ public:
 return false;
 }
 
-rDoc.SetFormulaResults(rTopPos, resbuf, nLength);
+rDoc.SetFormulaResults(rTopPos, resbuf, mnGroupLength);
 
 err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, res, resbuf, 0, NULL, 
NULL);
 if (err != CL_SUCCESS)
@@ -3706,7 +3709,11 @@ class CLInterpreterContext
 std::shared_ptr mpKernelStore; /// for managed kernel 
instance.
 DynamicKernel* mpKernel;
 
+SCROW mnGroupLength;
+
 public:
+CLInterpreterContext( SCROW nGroupLength ) :
+mpKernel(NULL), mnGroupLength(nGroupLength) {}
 
 bool isValid() const
 {
@@ -3724,7 +3731,7 @@ public:
 mpKernel = pKernel;
 }
 
-CLInterpreterResult launchKernel( SCROW nLength )
+CLInterpreterResult launchKernel()
 {
 CLInterpreterResult aRes; // invalid by default.
 
@@ -3734,7 +3741,7 @@ public:
 try
 {
 // Run the kernel.
-mpKernel->Launch(nLength);
+mpKernel->Launch(mnGroupLength);
 }
 catch (const UnhandledToken& ut)
 {
@@ -3757,7 +3764,7 @@ public:
 return CLInterpreterResult();
 }
 
-return CLInterpreterResult(mpKernel);
+return CLInterpreterResult(mpKernel, mnGroupLength);
 }
 };
 
@@ -3765,7 +3772,7 @@ public:
 CLInterpreterContext createCLInterpreterContext(
 ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode )
 {
-CLInterpreterContext aCxt;
+CLInterpreterContext aCxt(xGroup->mnLength);
 
 #if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION
 if (rGroup.meKernelState == sc::OpenCLKernelCompilationScheduled ||
@@ -3813,11 +3820,11 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument& rDoc,
 if (!aCxt.isValid())
 return false;
 
-CLInterpreterResult aRes = aCxt.launchKernel(xGroup->mnLength);
+CLInterpreterResult aRes = aCxt.launchKernel();
 if (!aRes.isValid())
 return false;
 
-return aRes.pushResultToDocument(rDoc, rTopPos, xGroup->mnLength);
+return aRes.pushResultToDocument(rDoc, rTopPos);
 }
 
 }} // namespace sc::opencl
commit cf7d8b41a9c0c2a4015217b49266f781c9558d9e
Author: Kohei Yoshida 
Date:   Mon Dec 15 20:57:35 2014 -0500

Refactor OpenCL interpreter impl code to make it more modular.

Change-Id: I8fe6aeb2ee1cd67df3e0e657b271b255516dbc18

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index dc280b0..e455c8e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3651,114 +3651,173 @@ CompiledFormula* 
FormulaGroupInterpreterOpenCL::createCompiledFormula(
 return DynamicKernel::create(rCode, rGroup.mnLength);
 }
 
-bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
-const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup,
-ScTokenArray& rCode )
+namespace {
+
+class CLInterpreterResult
 {
-ScCompiler aComp(&rDoc, rTopPos, rCode);
-aComp.SetGrammar(rDoc.GetGrammar());
-// Disable special ordering for jump

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - sc/source

[Eike Rathke]

 sc/source/core/data/formulacell.cxx  |2 +-
 sc/source/filter/oox/sheetdatabuffer.cxx |7 ++-
 sc/source/filter/oox/unitconverter.cxx   |2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 71868d36c77d770099658ebb6a1c29af1da53eba
Author: Eike Rathke 
Date:   Tue Dec 16 01:56:58 2014 +0100

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

Change-Id: I3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index e68fe16..8f78e8b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -751,7 +751,7 @@ ScFormulaCell::ScFormulaCell(
 nSeenInIteration(0),
 cMatrixFlag ( cInd ),
 nFormatType(xGroup->mnFormatType),
-bDirty(false),
+bDirty(true),
 bChanged( false ),
 bRunning( false ),
 bCompile( false ),
commit ce2c2affdff3eb2616638eddae7334eba43d5b4a
Author: Eike Rathke 
Date:   Tue Dec 16 01:37:31 2014 +0100

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b
(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 7cdf627..1e66c87 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -197,11 +197,16 @@ void SheetDataBuffer::setBooleanCell( const CellModel& 
rModel, bool bValue )
 
 void SheetDataBuffer::setErrorCell( const CellModel& rModel, const OUString& 
rErrorCode )
 {
-setErrorCell( rModel, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+// Using the formula compiler now we can simply pass on the error string.
+getFormulaBuffer().setCellFormula( rModel.maCellAddr, rErrorCode);
+setCellFormat( rModel );
 }
 
 void SheetDataBuffer::setErrorCell( const CellModel& rModel, sal_uInt8 
nErrorCode )
 {
+assert(!"stringizing any NaN will only give 'nan'");
+/* FIXME: map nErrorCode to error string and call setErrorCell() above. */
+
 OUStringBuffer aBuf;
 aBuf.append('{');
 aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
commit 9e1ce14754939800d15f3510ebb12342d1da9936
Author: Eike Rathke 
Date:   Mon Dec 15 23:53:06 2014 +0100

correct error string, #N/A instead of #NA

is that mapping used at all?

Change-Id: I15019072b6e812b9ffe29d3ee6afacd9ab526948
(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)

diff --git a/sc/source/filter/oox/unitconverter.cxx 
b/sc/source/filter/oox/unitconverter.cxx
index 84a1f26..aca0d51 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -112,7 +112,7 @@ UnitConverter::UnitConverter( const WorkbookHelper& rHelper 
) :
 addErrorCode( BIFF_ERR_REF,   "#REF!" );
 addErrorCode( BIFF_ERR_NAME,  "#NAME?" );
 addErrorCode( BIFF_ERR_NUM,   "#NUM!" );
-addErrorCode( BIFF_ERR_NA,"#NA" );
+addErrorCode( BIFF_ERR_NA,"#N/A" );
 }
 
 void UnitConverter::finalizeImport()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/data/formulacell.cxx  |2 +-
 sc/source/filter/oox/sheetdatabuffer.cxx |7 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit a1dc5e97da273bf35d58d54e625149022569a993
Author: Eike Rathke 
Date:   Tue Dec 16 01:56:58 2014 +0100

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

Change-Id: I3a541f74d3d25e1515a1c6d47f02ec6a8e817c93

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 7cf0656..56776ae 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -751,7 +751,7 @@ ScFormulaCell::ScFormulaCell(
 nSeenInIteration(0),
 cMatrixFlag ( cInd ),
 nFormatType(xGroup->mnFormatType),
-bDirty(false),
+bDirty(true),
 bChanged( false ),
 bRunning( false ),
 bCompile( false ),
commit 994607b55104b9ae4554554c13b001b8d5d513b6
Author: Eike Rathke 
Date:   Tue Dec 16 01:37:31 2014 +0100

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 7cdf627..1e66c87 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -197,11 +197,16 @@ void SheetDataBuffer::setBooleanCell( const CellModel& 
rModel, bool bValue )
 
 void SheetDataBuffer::setErrorCell( const CellModel& rModel, const OUString& 
rErrorCode )
 {
-setErrorCell( rModel, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+// Using the formula compiler now we can simply pass on the error string.
+getFormulaBuffer().setCellFormula( rModel.maCellAddr, rErrorCode);
+setCellFormat( rModel );
 }
 
 void SheetDataBuffer::setErrorCell( const CellModel& rModel, sal_uInt8 
nErrorCode )
 {
+assert(!"stringizing any NaN will only give 'nan'");
+/* FIXME: map nErrorCode to error string and call setErrorCell() above. */
+
 OUStringBuffer aBuf;
 aBuf.append('{');
 aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 sw/source/filter/html/css1atr.cxx  |   52 -
 sw/source/filter/html/css1kywd.cxx |1 
 sw/source/filter/html/css1kywd.hxx |1 
 sw/source/filter/html/htmlatr.cxx  |   23 
 sw/source/filter/html/wrthtml.cxx  |   22 +++
 sw/source/filter/html/wrthtml.hxx  |7 
 6 files changed, 104 insertions(+), 2 deletions(-)

New commits:
commit c074df40639593f73993e36be08aa8c685b55b55
Author: László Németh 
Date:   Tue Dec 16 01:34:38 2014 +0100

HTML export: optional CSS2 dot leaders in the Table of Contents

To use it, enable "Print layout" in Options->Load/Save->HTML Compatibility,
and select the HTML Document file type in the Writer Save As dialog.

Change-Id: I763ab8340a59050fd5c68677715679f41fd91fb3

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 049fdb17..b059fea 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -112,6 +112,8 @@ using editeng::SvxBorderLine;
 #define CSS1_FRMSIZE_ANYHEIGHT  0x0e
 #define CSS1_FRMSIZE_PIXEL  0x10
 
+#define DOT_LEADERS_MAX_WIDTH   18
+
 extern SwAttrFnTab aCSS1AttrFnTab;
 
 static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
@@ -220,6 +222,48 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
 OutNewLine();
 sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_style) + " " +
 OString(OOO_STRING_SVTOOLS_HTML_O_type) + 
"=\"text/css\">");
+//  Optional CSS2 code for dot leaders (dotted line between the Table of 
Contents titles and page numbers):
+//  (More inforation: http://www.w3.org/Style/Examples/007/leaders.en.html)
+//
+//  p.leaders {
+//  /* FIXME:
+// (1) dots line up vertically only in the paragraphs with the 
same alignation/level
+// (2) max-width = 18 cm instead of 80em; possible improvement 
with the new CSS3 calc() */
+//  max-width: 18cm; /* note: need to overwrite max-width with 
max-width - border-left_of_the_actual_paragraph */
+//  padding: 0;
+//  overflow-x: hidden;
+//  line-height: 120%; /* note: avoid HTML scrollbars and missing 
descenders of the letters */
+//  }
+//  p.leaders:after {
+//  float: left;
+//  width: 0;
+//  white-space: nowrap;
+//  content: ". . . . . . . . . . . . . . . . . . ...";
+//  }
+//  p.leaders span:first-child {
+//  padding-right: 0.33em;
+//  background: white;
+//  }
+//  p.leaders span + span {
+//  float: right;
+//  padding-left: 0.33em;
+//  background: white;
+//  position: relative;
+//  z-index: 1
+//  }
+
+if (bCfgPrintLayout) {
+sOut.append(
+"p." + OString(sCSS2_P_CLASS_leaders) + "{max-width:" + 
OString::number(DOT_LEADERS_MAX_WIDTH) +
+"cm;padding:0;overflow-x:hidden;line-height:120%}" +
+"p." + OString(sCSS2_P_CLASS_leaders) + 
":after{float:left;width:0;white-space:nowrap;content:\"");
+for (int i = 0; i < 100; i++ )
+sOut.append(". ");
+sOut.append(
+"\"}p." + OString(sCSS2_P_CLASS_leaders) + " 
span:first-child{padding-right:0.33em;background:white}" +
+"p." + OString(sCSS2_P_CLASS_leaders) + " 
span+span{float:right;padding-left:0.33em;" +
+"background:white;position:relative;z-index:1}");
+}
 Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
 IncIndentLevel();
@@ -2739,7 +2783,8 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, 
const SfxPoolItem& rHt )
 
 if( nHeight )
 rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
-else if( nPrcHeight )
+else if( nPrcHeight &&
+!(nPrcHeight < 115 && rHTMLWrt.bParaDotLeaders )) // avoid HTML 
scrollbars and missing descenders
 {
 OString sHeight(OString::number(nPrcHeight) + "%");
 rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
@@ -2954,6 +2999,11 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const 
SfxPoolItem& rHt )
 if( rHTMLWrt.nDfltLeftMargin != nLeftMargin )
 {
 rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_left, nLeftMargin );
+
+// max-width = max-width - margin-left for TOC paragraphs with dot 
leaders
+if( rHTMLWrt.bParaDotLeaders )
+rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, 
(long)(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin );
+
 }
 
 if( rHTMLWrt.nDfltRightMargin != rLRItem.GetRight() )
diff --git a/sw/source/filter/html/css1kywd.cxx 
b/sw/source/filter/html/css1kywd.cxx
index da15ac9..6088d42 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -189,6 +189,7 @@ const sal_Char* sCSS1_PV_inset = "inset";
 const sal

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

[László Németh]

 sw/source/filter/html/css1atr.cxx  |   52 -
 sw/source/filter/html/css1kywd.cxx |1 
 sw/source/filter/html/css1kywd.hxx |1 
 sw/source/filter/html/htmlatr.cxx  |   23 
 sw/source/filter/html/wrthtml.cxx  |   22 +++
 sw/source/filter/html/wrthtml.hxx  |7 
 6 files changed, 104 insertions(+), 2 deletions(-)

New commits:
commit 3e17677f705d004ebb87d1268d640da1a1c8cdf4
Author: László Németh 
Date:   Tue Dec 16 01:34:38 2014 +0100

HTML export: optional CSS2 dot leaders in the Table of Contents

To use it, enable "Print layout" in Options->Load/Save->HTML Compatibility,
and select the HTML Document file type in the Writer Save As dialog.

Change-Id: I763ab8340a59050fd5c68677715679f41fd91fb3

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index c69bac5..69f1ac7 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -112,6 +112,8 @@ using editeng::SvxBorderLine;
 #define CSS1_FRMSIZE_ANYHEIGHT  0x0e
 #define CSS1_FRMSIZE_PIXEL  0x10
 
+#define DOT_LEADERS_MAX_WIDTH   18
+
 extern SwAttrFnTab aCSS1AttrFnTab;
 
 static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
@@ -220,6 +222,48 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
 OutNewLine();
 sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_style) + " " +
 OString(OOO_STRING_SVTOOLS_HTML_O_type) + 
"=\"text/css\">");
+//  Optional CSS2 code for dot leaders (dotted line between the Table of 
Contents titles and page numbers):
+//  (More inforation: http://www.w3.org/Style/Examples/007/leaders.en.html)
+//
+//  p.leaders {
+//  /* FIXME:
+// (1) dots line up vertically only in the paragraphs with the 
same alignation/level
+// (2) max-width = 18 cm instead of 80em; possible improvement 
with the new CSS3 calc() */
+//  max-width: 18cm; /* note: need to overwrite max-width with 
max-width - border-left_of_the_actual_paragraph */
+//  padding: 0;
+//  overflow-x: hidden;
+//  line-height: 120%; /* note: avoid HTML scrollbars and missing 
descenders of the letters */
+//  }
+//  p.leaders:after {
+//  float: left;
+//  width: 0;
+//  white-space: nowrap;
+//  content: ". . . . . . . . . . . . . . . . . . ...";
+//  }
+//  p.leaders span:first-child {
+//  padding-right: 0.33em;
+//  background: white;
+//  }
+//  p.leaders span + span {
+//  float: right;
+//  padding-left: 0.33em;
+//  background: white;
+//  position: relative;
+//  z-index: 1
+//  }
+
+if (bCfgPrintLayout) {
+sOut.append(
+"p." + OString(sCSS2_P_CLASS_leaders) + "{max-width:" + 
OString::number(DOT_LEADERS_MAX_WIDTH) +
+"cm;padding:0;overflow-x:hidden;line-height:120%}" +
+"p." + OString(sCSS2_P_CLASS_leaders) + 
":after{float:left;width:0;white-space:nowrap;content:\"");
+for (int i = 0; i < 100; i++ )
+sOut.append(". ");
+sOut.append(
+"\"}p." + OString(sCSS2_P_CLASS_leaders) + " 
span:first-child{padding-right:0.33em;background:white}" +
+"p." + OString(sCSS2_P_CLASS_leaders) + " 
span+span{float:right;padding-left:0.33em;" +
+"background:white;position:relative;z-index:1}");
+}
 Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
 IncIndentLevel();
@@ -2739,7 +2783,8 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, 
const SfxPoolItem& rHt )
 
 if( nHeight )
 rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
-else if( nPrcHeight )
+else if( nPrcHeight &&
+!(nPrcHeight < 115 && rHTMLWrt.bParaDotLeaders )) // avoid HTML 
scrollbars and missing descenders
 {
 OString sHeight(OString::number(nPrcHeight) + "%");
 rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
@@ -2954,6 +2999,11 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const 
SfxPoolItem& rHt )
 if( rHTMLWrt.nDfltLeftMargin != nLeftMargin )
 {
 rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_left, nLeftMargin );
+
+// max-width = max-width - margin-left for TOC paragraphs with dot 
leaders
+if( rHTMLWrt.bParaDotLeaders )
+rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, 
(long)(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin );
+
 }
 
 if( rHTMLWrt.nDfltRightMargin != rLRItem.GetRight() )
diff --git a/sw/source/filter/html/css1kywd.cxx 
b/sw/source/filter/html/css1kywd.cxx
index da15ac9..6088d42 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -189,6 +189,7 @@ const sal_Char* sCSS1_PV_inset = "inset";
 const sal_

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

[Tor Lillqvist]

 sc/source/core/data/formulacell.cxx  |4 +++-
 sc/source/core/tool/formulagroup.cxx |7 +--
 sc/source/core/tool/interpr5.cxx |   12 
 3 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 1c0b8b8f06e1ecf39789f00cff0c6ebc712aa272
Author: Tor Lillqvist 
Date:   Tue Dec 9 12:45:41 2014 +0200

fdo#87119: Don't use of the broken "Software" group interpreter

FormulaGroupInterpreterSoftware is known to be broken, says moggi. We should
not use it as a fallback to OpenCL.

Not sure whether it makes sense, but let's keep it in the code for now.  
Make
using it conditional on setting the environment variable
SC_ALLOW_BROKEN_SOFTWARE_INTERPRETER (to any value). Only a developer who
wants to work on it should set that.

sc::FormulaGroupInterpreter::getStatic() can now return NULL, adapt callers
accordingly.

Change-Id: I20f6e2658f556e2d4a0687f3730dccdbedb88603
Reviewed-on: https://gerrit.libreoffice.org/13397
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index b4e56b2..e68fe16 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3779,7 +3779,9 @@ bool ScFormulaCell::InterpretFormulaGroup()
 // The converted code does not have RPN tokens yet.  The interpreter will
 // generate them.
 mxGroup->meCalcState = sc::GroupCalcRunning;
-if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, 
mxGroup->mpTopCell->aPos, mxGroup, aCode))
+sc::FormulaGroupInterpreter *pInterpreter = 
sc::FormulaGroupInterpreter::getStatic();
+if (pInterpreter == NULL ||
+!pInterpreter->interpret(*pDocument, mxGroup->mpTopCell->aPos, 
mxGroup, aCode))
 {
 SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " 
<< (int) mxGroup->meCalcState << ") failed, disabling");
 mxGroup->meCalcState = sc::GroupCalcDisabled;
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index cc4f805..32ee19a 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -528,7 +528,9 @@ FormulaGroupInterpreter 
*FormulaGroupInterpreter::getStatic()
 if (officecfg::Office::Common::Misc::UseOpenCL::get())
 switchOpenCLDevice(rConfig.maOpenCLDevice, 
rConfig.mbOpenCLAutoSelect, false);
 #endif
-if ( !msInstance ) // software fallback
+static bool bAllowSoftwareInterpreter = 
(getenv("SC_ALLOW_BROKEN_SOFTWARE_INTERPRETER") != NULL);
+
+if ( !msInstance && bAllowSoftwareInterpreter ) // software fallback
 {
 SAL_INFO("sc.formulagroup", "Create S/W interpreter");
 msInstance = new sc::FormulaGroupInterpreterSoftware();
@@ -550,7 +552,8 @@ void 
FormulaGroupInterpreter::fillOpenCLInfo(std::vector& rP
 bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, 
bool bAutoSelect, bool bForceEvaluation)
 {
 bool bOpenCLEnabled = officecfg::Office::Common::Misc::UseOpenCL::get();
-if (!bOpenCLEnabled || rDeviceId == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME)
+static bool bAllowSoftwareInterpreter = 
(getenv("SC_ALLOW_BROKEN_SOFTWARE_INTERPRETER") != NULL);
+if (!bOpenCLEnabled || (bAllowSoftwareInterpreter && rDeviceId == 
OPENCL_SOFTWARE_DEVICE_CONFIG_NAME))
 {
 if(msInstance)
 {
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 05936fa..e334846 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -911,11 +911,15 @@ void ScInterpreter::ScMatInv()
 
 if (officecfg::Office::Common::Misc::UseOpenCL::get())
 {
-ScMatrixRef xResMat = 
sc::FormulaGroupInterpreter::getStatic()->inverseMatrix(*pMat);
-if (xResMat)
+sc::FormulaGroupInterpreter *pInterpreter = 
sc::FormulaGroupInterpreter::getStatic();
+if (pInterpreter != NULL)
 {
-PushMatrix(xResMat);
-return;
+ScMatrixRef xResMat = pInterpreter->inverseMatrix(*pMat);
+if (xResMat)
+{
+PushMatrix(xResMat);
+return;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/68b8f008c8893b6b7d2314c21679bf2dbcd1b4e5/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/filter/oox/unitconverter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 758755e31b3d9e1ed2eab522d4794282178346ac
Author: Eike Rathke 
Date:   Mon Dec 15 23:53:06 2014 +0100

correct error string, #N/A instead of #NA

is that mapping used at all?

Change-Id: I15019072b6e812b9ffe29d3ee6afacd9ab526948

diff --git a/sc/source/filter/oox/unitconverter.cxx 
b/sc/source/filter/oox/unitconverter.cxx
index 84a1f26..aca0d51 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -112,7 +112,7 @@ UnitConverter::UnitConverter( const WorkbookHelper& rHelper 
) :
 addErrorCode( BIFF_ERR_REF,   "#REF!" );
 addErrorCode( BIFF_ERR_NAME,  "#NAME?" );
 addErrorCode( BIFF_ERR_NUM,   "#NUM!" );
-addErrorCode( BIFF_ERR_NA,"#NA" );
+addErrorCode( BIFF_ERR_NA,"#N/A" );
 }
 
 void UnitConverter::finalizeImport()
___
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.2' - sc/source

[Markus Mohrhard]

 sc/source/ui/dbgui/asciiopt.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d156a160a45337fdcdca25515cb8c723d799cb21
Author: Markus Mohrhard 
Date:   Sun Dec 14 21:03:08 2014 +0100

no separator really means no separator, fdo#83027

Change-Id: I612a46701e7447db63f38ed709e8693d0533710d
Reviewed-on: https://gerrit.libreoffice.org/13474
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 1072a89..4b7c1b8 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -366,8 +366,7 @@ sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const 
OUString & rFieldSeps, bo
 OUString aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, 
bMergeFieldSeps) : rFieldSeps);
 if (aFieldSeps.isEmpty())
 {
-SAL_WARN( "sc.ui", "ScAsciiOptions::GetWeightedFieldSep - no separator 
at all, using ',' comma");
-return ',';
+return 0;
 }
 else if (aFieldSeps.getLength() == 1)
 return aFieldSeps[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 11 commits - include/vcl sc/source vcl/generic vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win

[Markus Mohrhard]

 include/vcl/bitmap.hxx   |4 
 include/vcl/bmpacc.hxx   |  120 +
 include/vcl/opengl/OpenGLContext.hxx |8 
 include/vcl/salbtype.hxx |   10 
 sc/source/ui/dbgui/asciiopt.cxx  |3 
 vcl/generic/print/genpspgraphics.cxx |4 
 vcl/headless/svpbmp.cxx  |6 
 vcl/inc/cairotextrender.hxx  |1 
 vcl/inc/headless/svpbmp.hxx  |4 
 vcl/inc/impbmp.hxx   |5 
 vcl/inc/opengl/framebuffer.hxx   |8 
 vcl/inc/opengl/salbmp.hxx|4 
 vcl/inc/openglgdiimpl.hxx|2 
 vcl/inc/quartz/salbmp.h  |4 
 vcl/inc/salbmp.hxx   |5 
 vcl/inc/unx/salbmp.h |4 
 vcl/inc/win/salbmp.h |4 
 vcl/opengl/framebuffer.cxx   |   26 +-
 vcl/opengl/gdiimpl.cxx   |   36 +-
 vcl/opengl/salbmp.cxx|   34 +-
 vcl/opengl/scale.cxx |2 
 vcl/quartz/salbmp.cxx|6 
 vcl/source/gdi/bitmap.cxx|   23 +
 vcl/source/gdi/bmpacc.cxx|  138 ++-
 vcl/source/gdi/impbmp.cxx|   10 
 vcl/source/opengl/OpenGLContext.cxx  |  288 ---
 vcl/unx/generic/gdi/cairotextrender.cxx  |4 
 vcl/unx/generic/gdi/gdiimpl.cxx  |   12 
 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |   39 ++-
 vcl/unx/generic/gdi/openglx11cairotextrender.hxx |1 
 vcl/unx/generic/gdi/salbmp.cxx   |6 
 vcl/unx/generic/gdi/x11cairotextrender.cxx   |6 
 vcl/unx/generic/gdi/x11cairotextrender.hxx   |1 
 vcl/unx/generic/window/salframe.cxx  |   11 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   11 
 vcl/unx/gtk/window/gtksalframe.cxx   |8 
 vcl/win/source/gdi/gdiimpl.cxx   |3 
 vcl/win/source/gdi/salbmp.cxx|   24 -
 38 files changed, 590 insertions(+), 295 deletions(-)

New commits:
commit e9aa788f6c2016953f3e9ff4483f8d4215c9edea
Author: Markus Mohrhard 
Date:   Sun Dec 14 21:03:08 2014 +0100

no separator really means no separator, fdo#83027

Change-Id: I612a46701e7447db63f38ed709e8693d0533710d
Reviewed-on: https://gerrit.libreoffice.org/13474
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index b4a72d1..602eca3 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -353,8 +353,7 @@ sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const 
OUString & rFieldSeps, bo
 OUString aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, 
bMergeFieldSeps) : rFieldSeps);
 if (aFieldSeps.isEmpty())
 {
-SAL_WARN( "sc.ui", "ScAsciiOptions::GetWeightedFieldSep - no separator 
at all, using ',' comma");
-return ',';
+return 0;
 }
 else if (aFieldSeps.getLength() == 1)
 return aFieldSeps[0];
commit 6815305703b93f2bc4945c33510aecaec1df4512
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:27:38 2014 -0500

vcl: Don't keep a reference to the texture in the FBO object

Change-Id: I240d2b44e77d28af3cd5952b6d666a1709c4c54a

diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
index e9c9065..915008c 100644
--- a/vcl/inc/opengl/framebuffer.hxx
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -18,10 +18,10 @@
 class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
 {
 private:
-GLuintmnId;
-OpenGLTexture maAttachedTexture;
+GLuint  mnId;
 int mnWidth;
 int mnHeight;
+GLuint  mnAttachedTexture;
 
 public:
 OpenGLFramebuffer();
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index e760b53..c4dfb05 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -17,6 +17,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() :
 mnId( 0 ),
 mnWidth( 0 ),
 mnHeight( 0 ),
+mnAttachedTexture( 0 ),
 mpPrevFramebuffer( NULL ),
 mpNextFramebuffer( NULL )
 {
@@ -45,30 +46,37 @@ void OpenGLFramebuffer::Unbind()
 
 bool OpenGLFramebuffer::IsFree() const
 {
-return (!maAttachedTexture);
+return (!mnAttachedTexture);
 }
 
 bool OpenGLFramebuffer::IsAttached( const OpenGLTexture& rTexture ) const
 {
-return ( maAttachedTexture == rTexture );
+return ( mnAttachedTexture == rTexture.Id() );
 }
 
 void OpenGLFramebuffer::AttachTexture( const OpenGLTexture& rTexture )
 {
+if( rTexture.Id() == mnAttachedTexture )
+return;
+
 SAL_INFO( "vcl.opengl", "Attaching texture " << rTexture.Id() << " to 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 4 commits - dbaccess/Module_dbaccess.mk external/poppler sw/source

[Michael Stahl]

 dbaccess/Module_dbaccess.mk |2 ++
 external/poppler/ExternalProject_poppler.mk |1 +
 sw/source/core/txtnode/ndtxt.cxx|   11 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 5152c52de76bc650cceb6fcf2fce060b3e765f86
Author: Michael Stahl 
Date:   Mon Dec 15 22:01:09 2014 +0100

fdo#74981: sw: fix input field handling when splitting paragraphs

The SwInputFld is copied because it doesn't have HasDummyChar() set
although it has 2 dummy characters; TODO why is that...

Change-Id: Iee91c1d0cf7a7a928e7383c1839f8192e8d4d5b0
(cherry picked from commit a1718045bd6218e07caebda7c4cacdcb853eabd3)

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5e0fd19..db941ba 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1575,11 +1575,12 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const 
sal_Int32 nTxtStartIdx,
 const sal_Int32 *const pEndIdx = pHt->GetEnd();
 if ( pEndIdx && !pHt->HasDummyChar() )
 {
-if ( ( *pEndIdx > nTxtStartIdx
-   || ( *pEndIdx == nTxtStartIdx
-&& nAttrStartIdx == nTxtStartIdx ) ) )
+sal_uInt16 const nWhich = pHt->Which();
+if (RES_TXTATR_INPUTFIELD != nWhich // fdo#74981 skip fields
+&& (*pEndIdx > nTxtStartIdx
+|| (*pEndIdx == nTxtStartIdx
+&& nAttrStartIdx == nTxtStartIdx)))
 {
-sal_uInt16 const nWhich = pHt->Which();
 if ( RES_TXTATR_REFMARK != nWhich )
 {
 // attribute in the area => copy
commit d1f4dc626cab09c8ab7e37f6f7b695267bef78c2
Author: Michael Stahl 
Date:   Mon Dec 15 21:19:01 2014 +0100

fdo#85876: Revert "fdo#74981: cutting nothing should do nothing, ...

... should fix field dupes"

This reverts commit f384598d8eec91c3c0f84a07ff3e59b8e3e13b3f.

The attributes have to be copied in case splitting a paragraph creates
an empty paragraph.

Change-Id: Icd5730dd9ab8a68f737492645988a4d2f07af7a0
(cherry picked from commit 0f78ae1ca33f83737553ad204c869a63498b7d2d)

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5b347df..5e0fd19 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2014,8 +2014,6 @@ OUString SwTxtNode::InsertText( const OUString & rStr, 
const SwIndex & rIdx,
 void SwTxtNode::CutText( SwTxtNode * const pDest,
 const SwIndex & rStart, const sal_Int32 nLen )
 {
-if(nLen == 0)
-return;
 if(pDest)
 {
 SwIndex aDestStt(pDest, pDest->GetTxt().getLength());
commit adaf8d3b84720f3417072049d1d38c8b56c54ed4
Author: Michael Stahl 
Date:   Mon Dec 15 20:29:30 2014 +0100

dbaccess: the PythonTest requires Java for hsqldb

Change-Id: Idaea12aae68ad21ee06f785167cdf1867101ec4b
(cherry picked from commit 6d8ab70f1da785767e539383087258bd666fbf62)

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 2dccdf8..5ac463a 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -69,10 +69,12 @@ $(eval $(call 
gb_Module_add_subsequentcheck_targets,dbaccess,\
 ))
 
 ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
PythonTest_dbaccess_python \
 ))
 endif
+endif
 
 endif
 
commit 35aab33a864cc98dd186ad6842ab366fd66b5d96
Author: Michael Stahl 
Date:   Mon Dec 15 17:42:45 2014 +0100

poppler: let's disable Qt5 too

Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7
(cherry picked from commit aaf717a8fad0b097b84cbd803acea1330bd925a5)

diff --git a/external/poppler/ExternalProject_poppler.mk 
b/external/poppler/ExternalProject_poppler.mk
index 5d9c56b..278807e 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
--disable-cairo-output \
--disable-poppler-glib \
--disable-poppler-qt4 \
+   --disable-poppler-qt5 \
--disable-gtk-test \
--disable-utils \
--disable-cms \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - dbaccess/Module_dbaccess.mk external/poppler sw/source

[Michael Stahl]

 dbaccess/Module_dbaccess.mk |2 ++
 external/poppler/ExternalProject_poppler.mk |1 +
 sw/source/core/txtnode/ndtxt.cxx|   11 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit a1718045bd6218e07caebda7c4cacdcb853eabd3
Author: Michael Stahl 
Date:   Mon Dec 15 22:01:09 2014 +0100

fdo#74981: sw: fix input field handling when splitting paragraphs

The SwInputFld is copied because it doesn't have HasDummyChar() set
although it has 2 dummy characters; TODO why is that...

Change-Id: Iee91c1d0cf7a7a928e7383c1839f8192e8d4d5b0

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 20fc669..dfc0536 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1575,11 +1575,12 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const 
sal_Int32 nTxtStartIdx,
 const sal_Int32 *const pEndIdx = pHt->GetEnd();
 if ( pEndIdx && !pHt->HasDummyChar() )
 {
-if ( ( *pEndIdx > nTxtStartIdx
-   || ( *pEndIdx == nTxtStartIdx
-&& nAttrStartIdx == nTxtStartIdx ) ) )
+sal_uInt16 const nWhich = pHt->Which();
+if (RES_TXTATR_INPUTFIELD != nWhich // fdo#74981 skip fields
+&& (*pEndIdx > nTxtStartIdx
+|| (*pEndIdx == nTxtStartIdx
+&& nAttrStartIdx == nTxtStartIdx)))
 {
-sal_uInt16 const nWhich = pHt->Which();
 if ( RES_TXTATR_REFMARK != nWhich )
 {
 // attribute in the area => copy
commit 0f78ae1ca33f83737553ad204c869a63498b7d2d
Author: Michael Stahl 
Date:   Mon Dec 15 21:19:01 2014 +0100

fdo#85876: Revert "fdo#74981: cutting nothing should do nothing, ...

... should fix field dupes"

This reverts commit f384598d8eec91c3c0f84a07ff3e59b8e3e13b3f.

The attributes have to be copied in case splitting a paragraph creates
an empty paragraph.

Change-Id: Icd5730dd9ab8a68f737492645988a4d2f07af7a0

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 211c26d..20fc669 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2014,8 +2014,6 @@ OUString SwTxtNode::InsertText( const OUString & rStr, 
const SwIndex & rIdx,
 void SwTxtNode::CutText( SwTxtNode * const pDest,
 const SwIndex & rStart, const sal_Int32 nLen )
 {
-if(nLen == 0)
-return;
 if(pDest)
 {
 SwIndex aDestStt(pDest, pDest->GetTxt().getLength());
commit 6d8ab70f1da785767e539383087258bd666fbf62
Author: Michael Stahl 
Date:   Mon Dec 15 20:29:30 2014 +0100

dbaccess: the PythonTest requires Java for hsqldb

Change-Id: Idaea12aae68ad21ee06f785167cdf1867101ec4b

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 2dccdf8..5ac463a 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -69,10 +69,12 @@ $(eval $(call 
gb_Module_add_subsequentcheck_targets,dbaccess,\
 ))
 
 ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
PythonTest_dbaccess_python \
 ))
 endif
+endif
 
 endif
 
commit aaf717a8fad0b097b84cbd803acea1330bd925a5
Author: Michael Stahl 
Date:   Mon Dec 15 17:42:45 2014 +0100

poppler: let's disable Qt5 too

Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7

diff --git a/external/poppler/ExternalProject_poppler.mk 
b/external/poppler/ExternalProject_poppler.mk
index 5d9c56b..278807e 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
--disable-cairo-output \
--disable-poppler-glib \
--disable-poppler-qt4 \
+   --disable-poppler-qt5 \
--disable-gtk-test \
--disable-utils \
--disable-cms \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - vcl/inc vcl/opengl

[Luboš Luňák]

 vcl/inc/openglgdiimpl.hxx  |   14 ++-
 vcl/opengl/gdiimpl.cxx |  197 -
 vcl/opengl/win/gdiimpl.cxx |2 
 vcl/opengl/x11/gdiimpl.cxx |4 
 4 files changed, 188 insertions(+), 29 deletions(-)

New commits:
commit 5bedf7301d66c6a1473c3c807e6ed3758d6c5648
Author: Luboš Luňák 
Date:   Mon Dec 15 20:00:45 2014 +0100

use AA for lines only when AA is active

Change-Id: I9965f58b8f06f1cec2c419dcf16d8aebf9cd97b8

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 03d1c23..3621aab 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -40,8 +40,9 @@ class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public 
SalGraphicsImpl
 protected:
 
 OpenGLContext* mpContext;
+SalGraphics& mrParent;
 /// Pointer to the SalFrame or SalVirtualDevice
-SalGeometryProvider* mpParent;
+SalGeometryProvider* mpProvider;
 OpenGLFramebuffer* mpFramebuffer;
 OpenGLProgram* mpProgram;
 
@@ -66,11 +67,14 @@ public:
 bool UseSolid( SalColor nColor, sal_uInt8 nTransparency );
 bool UseSolid( SalColor nColor, double fTransparency );
 bool UseSolid( SalColor nColor );
+bool UseSolidAA( SalColor nColor );
 bool UseInvert();
 
 void DrawPoint( long nX, long nY );
 void DrawLine( long nX1, long nY1, long nX2, long nY2 );
 void DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
+void DrawLineAA( long nX1, long nY1, long nX2, long nY2 );
+void DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose 
);
 void DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
 void DrawConvexPolygon( const Polygon& rPolygon );
 void DrawRect( long nX, long nY, long nWidth, long nHeight );
@@ -92,13 +96,13 @@ public:
 
 public:
 // get the width of the device
-GLfloat GetWidth() const { return mpParent ? mpParent->GetWidth() : 1; }
+GLfloat GetWidth() const { return mpProvider ? mpProvider->GetWidth() : 1; 
}
 
 // get the height of the device
-GLfloat GetHeight() const { return mpParent ? mpParent->GetHeight() : 1; }
+GLfloat GetHeight() const { return mpProvider ? mpProvider->GetHeight() : 
1; }
 
 // check whether this instance is used for offscreen rendering
-bool IsOffscreen() const { return mpParent ? mpParent->IsOffScreen() : 
true; }
+bool IsOffscreen() const { return mpProvider ? mpProvider->IsOffScreen() : 
true; }
 
 // operations to do before painting
 virtual void PreDraw();
@@ -120,7 +124,7 @@ protected:
 virtual bool UseContext( OpenGLContext* pContext ) = 0;
 
 public:
-OpenGLSalGraphicsImpl(SalGeometryProvider* pParent);
+OpenGLSalGraphicsImpl(SalGraphics& pParent, SalGeometryProvider 
*pProvider);
 virtual ~OpenGLSalGraphicsImpl ();
 
 OpenGLContext* GetOpenGLContext();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b8d6319..611b72d 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -36,9 +36,10 @@
 
 #include 
 
-OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGeometryProvider* pParent)
+OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, 
SalGeometryProvider *pProvider)
 : mpContext(0)
-, mpParent(pParent)
+, mrParent(rParent)
+, mpProvider(pProvider)
 , mpFramebuffer(NULL)
 , mpProgram(NULL)
 , mbUseScissor(false)
@@ -372,6 +373,18 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
 return UseSolid( nColor, 0.0f );
 }
 
+// Like UseSolid(), but sets up for AA drawing, which uses gradients to create 
the AA.
+bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
+{
+if( !mrParent.getAntiAliasB2DDraw())
+return UseSolid( nColor );
+if( !UseProgram( "textureVertexShader", "linearGradientFragmentShader" ) )
+return false;
+mpProgram->SetColorf( "start_color", nColor, 0.0f );
+mpProgram->SetColorf( "end_color", nColor, 1.0f );
+return true;
+}
+
 bool OpenGLSalGraphicsImpl::UseInvert()
 {
 if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
@@ -393,8 +406,24 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
 
 void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
 {
+GLfloat pPoints[4];
+
+pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
+pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
+pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
+pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+
+mpProgram->SetVertices( pPoints );
+glDrawArrays( GL_LINES, 0, 2 );
+}
+
+void OpenGLSalGraphicsImpl::DrawLineAA( long nX1, long nY1, long nX2, long nY2 
)
+{
+if( !mrParent.getAntiAliasB2DDraw())
+return DrawLine( nX1, nY1, nX2, nY2 );
+
 if( nX1 == nX2 || nY1 == nY2 )
-{   // horizontal/vertical, no need for AA
+{   // Horizontal/vertical, no need for AA, both points have normal color.
 GLfloat pPoints[4];
 
 pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
@@ -403,6 +43

[Libreoffice-commits] core.git: vcl/inc vcl/opengl

[Luboš Luňák]

 vcl/inc/openglgdiimpl.hxx  |   14 +
 vcl/opengl/gdiimpl.cxx |   70 ++---
 vcl/opengl/win/gdiimpl.cxx |2 -
 vcl/opengl/x11/gdiimpl.cxx |4 +-
 4 files changed, 65 insertions(+), 25 deletions(-)

New commits:
commit 5e7709c5e9c1a5f444b1bff4096b0d3d3a541235
Author: Luboš Luňák 
Date:   Mon Dec 15 20:00:45 2014 +0100

use AA for lines only when AA is active

Change-Id: I9965f58b8f06f1cec2c419dcf16d8aebf9cd97b8

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index a8ffe4d..2c911ee 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -40,8 +40,9 @@ class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public 
SalGraphicsImpl
 protected:
 
 OpenGLContext* mpContext;
+SalGraphics& mrParent;
 /// Pointer to the SalFrame or SalVirtualDevice
-SalGeometryProvider* mpParent;
+SalGeometryProvider* mpProvider;
 OpenGLFramebuffer* mpFramebuffer;
 OpenGLProgram* mpProgram;
 
@@ -66,11 +67,14 @@ public:
 bool UseSolid( SalColor nColor, sal_uInt8 nTransparency );
 bool UseSolid( SalColor nColor, double fTransparency );
 bool UseSolid( SalColor nColor );
+bool UseSolidAA( SalColor nColor );
 bool UseInvert();
 
 void DrawPoint( long nX, long nY );
 void DrawLine( long nX1, long nY1, long nX2, long nY2 );
 void DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
+void DrawLineAA( long nX1, long nY1, long nX2, long nY2 );
+void DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose 
);
 void DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
 void DrawConvexPolygon( const Polygon& rPolygon );
 void DrawRect( long nX, long nY, long nWidth, long nHeight );
@@ -92,13 +96,13 @@ public:
 
 public:
 // get the width of the device
-GLfloat GetWidth() const { return mpParent ? mpParent->GetWidth() : 1; }
+GLfloat GetWidth() const { return mpProvider ? mpProvider->GetWidth() : 1; 
}
 
 // get the height of the device
-GLfloat GetHeight() const { return mpParent ? mpParent->GetHeight() : 1; }
+GLfloat GetHeight() const { return mpProvider ? mpProvider->GetHeight() : 
1; }
 
 // check whether this instance is used for offscreen rendering
-bool IsOffscreen() const { return mpParent ? mpParent->IsOffScreen() : 
true; }
+bool IsOffscreen() const { return mpProvider ? mpProvider->IsOffScreen() : 
true; }
 
 // operations to do before painting
 virtual void PreDraw();
@@ -120,7 +124,7 @@ protected:
 virtual bool UseContext( OpenGLContext* pContext ) = 0;
 
 public:
-OpenGLSalGraphicsImpl(SalGeometryProvider* pParent);
+OpenGLSalGraphicsImpl(SalGraphics& pParent, SalGeometryProvider 
*pProvider);
 virtual ~OpenGLSalGraphicsImpl ();
 
 OpenGLContext* GetOpenGLContext();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 09ffbf6..69db79b 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -36,9 +36,10 @@
 
 #include 
 
-OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGeometryProvider* pParent)
+OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, 
SalGeometryProvider *pProvider)
 : mpContext(0)
-, mpParent(pParent)
+, mrParent(rParent)
+, mpProvider(pProvider)
 , mpFramebuffer(NULL)
 , mpProgram(NULL)
 , mbUseScissor(false)
@@ -381,6 +382,18 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
 return UseSolid( nColor, 0.0f );
 }
 
+// Like UseSolid(), but sets up for AA drawing, which uses gradients to create 
the AA.
+bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
+{
+if( !mrParent.getAntiAliasB2DDraw())
+return UseSolid( nColor );
+if( !UseProgram( "textureVertexShader", "linearGradientFragmentShader" ) )
+return false;
+mpProgram->SetColorf( "start_color", nColor, 0.0f );
+mpProgram->SetColorf( "end_color", nColor, 1.0f );
+return true;
+}
+
 bool OpenGLSalGraphicsImpl::UseInvert()
 {
 if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
@@ -402,8 +415,24 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
 
 void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
 {
+GLfloat pPoints[4];
+
+pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
+pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
+pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
+pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+
+mpProgram->SetVertices( pPoints );
+glDrawArrays( GL_LINES, 0, 2 );
+}
+
+void OpenGLSalGraphicsImpl::DrawLineAA( long nX1, long nY1, long nX2, long nY2 
)
+{
+if( !mrParent.getAntiAliasB2DDraw())
+return DrawLine( nX1, nY1, nX2, nY2 );
+
 if( nX1 == nX2 || nY1 == nY2 )
-{   // horizontal/vertical, no need for AA
+{   // Horizontal/vertical, no need for AA, both points have normal color.
 GLfloat pPoints[4];
 
 pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
@@ -4

[Bug 86929] Kill FOREACHPAM_START for good

[bugzilla-daemon]

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

--- Comment #8 from Commit Notification 
 ---
Julien Nabet committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8286e92417794e68f6a53f887a426d5708fef0f6

Related fdo#86929: Kill FOREACHPAM_START for good (part1)

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: sw/source

[Julien Nabet]

 sw/source/core/frmedt/fecopy.cxx |  428 +++
 sw/source/core/frmedt/fedesc.cxx |   11 -
 sw/source/core/frmedt/fefly1.cxx |7 
 3 files changed, 224 insertions(+), 222 deletions(-)

New commits:
commit 8286e92417794e68f6a53f887a426d5708fef0f6
Author: Julien Nabet 
Date:   Sat Dec 13 18:41:06 2014 +0100

Related fdo#86929: Kill FOREACHPAM_START for good (part1)

Change-Id: Ifdb896108cf0db0a9be7ba419df785da536c0fab
Reviewed-on: https://gerrit.libreoffice.org/13465
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 907bb9b..2fb7377 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -812,286 +812,286 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool 
bIncludingPageFrames )
 }
 else
 {
-FOREACHPAM_START(GetCrsr())
-
-if( pSrcNd &&
-0 != ( pDestNd = GetDoc()->IsIdxInTbl( PCURCRSR->GetPoint()->nNode 
)))
+for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
 {
-SwPosition aDestPos( *PCURCRSR->GetPoint() );
-
-bool bParkTblCrsr = false;
-const SwStartNode* pSttNd =  
PCURCRSR->GetNode().FindTableBoxStartNode();
 
-// TABLE IN TABLE: copy table in table
-// search boxes via the layout
-SwSelBoxes aBoxes;
-if( IsTableMode() ) // table selection?
+if( pSrcNd &&
+0 != ( pDestNd = GetDoc()->IsIdxInTbl( rPaM.GetPoint()->nNode 
)))
 {
-GetTblSel( *this, aBoxes );
-ParkTblCrsr();
-bParkTblCrsr = true;
-}
-else if( !PCURCRSR->HasMark() && PCURCRSR->GetNext() == PCURCRSR &&
+SwPosition aDestPos( *rPaM.GetPoint() );
+
+bool bParkTblCrsr = false;
+const SwStartNode* pSttNd =  
rPaM.GetNode().FindTableBoxStartNode();
+
+// TABLE IN TABLE: copy table in table
+// search boxes via the layout
+SwSelBoxes aBoxes;
+if( IsTableMode() ) // table selection?
+{
+GetTblSel( *this, aBoxes );
+ParkTblCrsr();
+bParkTblCrsr = true;
+}
+else if( !rPaM.HasMark() && rPaM.GetNext() == &rPaM &&
  ( !pSrcNd->GetTable().IsTblComplex() ||
pDestNd->GetTable().IsNewModel() ) )
-{
-// make relative table copy
-SwTableBox* pBox = pDestNd->GetTable().GetTblBox(
+{
+// make relative table copy
+SwTableBox* pBox = pDestNd->GetTable().GetTblBox(
 pSttNd->GetIndex() );
-OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
-aBoxes.insert( pBox );
-}
+OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
+aBoxes.insert( pBox );
+}
 
-SwNodeIndex aNdIdx( *pDestNd->EndOfSectionNode());
-if( !bParkTblCrsr )
-{
-// exit first the complete table
-//  what about only table in a frame ?
-SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
-SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
-// #i59539: Don't remove all redline
-SwPaM const tmpPaM(*pDestNd, *pDestNd->EndOfSectionNode());
-::PaMCorrAbs(tmpPaM, aPos);
-}
+SwNodeIndex aNdIdx( *pDestNd->EndOfSectionNode());
+if( !bParkTblCrsr )
+{
+// exit first the complete table
+//  what about only table in a frame ?
+SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
+SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
+// #i59539: Don't remove all redline
+SwPaM const tmpPaM(*pDestNd, *pDestNd->EndOfSectionNode());
+::PaMCorrAbs(tmpPaM, aPos);
+}
 
-bRet = GetDoc()->InsCopyOfTbl( aDestPos, aBoxes, 
&pSrcNd->GetTable(),
+bRet = GetDoc()->InsCopyOfTbl( aDestPos, aBoxes, 
&pSrcNd->GetTable(),
 false, false );
 
-if( bParkTblCrsr )
-GetCrsr();
-else
-{
-// return to the box
-aNdIdx = *pSttNd;
-SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
-SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
-// #i59539: Don't remove all redline
-SwNode & rNode(PCURCRSR->GetPoint()->nNode.Ge

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

[Julien Nabet]

 sw/source/core/edit/edatmisc.cxx |   24 
 sw/source/core/edit/edattr.cxx   |   10 +++---
 sw/source/core/edit/eddel.cxx|   44 +++--
 sw/source/core/edit/edfcol.cxx   |9 +++---
 sw/source/core/edit/edfld.cxx|   18 ++--
 sw/source/core/edit/edglss.cxx   |   55 ++--
 sw/source/core/edit/editsh.cxx   |   58 ---
 sw/source/core/edit/edredln.cxx  |7 ++--
 sw/source/core/edit/edsect.cxx   |   26 +
 sw/source/core/edit/edtab.cxx|   20 +++--
 sw/source/core/edit/edtox.cxx|   12 
 11 files changed, 149 insertions(+), 134 deletions(-)

New commits:
commit bbf59cb82eabee984926fb11dc5281dc84e62fb6
Author: Julien Nabet 
Date:   Sat Dec 13 19:30:48 2014 +0100

Related fdo#86929: Kill FOREACHPAM_START for good (part2)

Change-Id: Ia6e166a4158d28f1a4145e51040f2f5637827197
Reviewed-on: https://gerrit.libreoffice.org/13466
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index 56a1a33..4b08a62 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -54,11 +54,12 @@ void SwEditShell::ResetAttr( const std::set 
&attrs, SwPaM* pPaM )
 
 void SwEditShell::GCAttr()
 {
-FOREACHPAM_START(GetCrsr())
-if ( !PCURCRSR->HasMark() )
+for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
+{
+if ( !rPaM.HasMark() )
 {
 SwTxtNode *const pTxtNode =
-PCURCRSR->GetPoint()->nNode.GetNode().GetTxtNode();
+rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
 if (pTxtNode)
 {
 pTxtNode->GCAttr();
@@ -66,8 +67,8 @@ void SwEditShell::GCAttr()
 }
 else
 {
-const SwNodeIndex& rEnd = PCURCRSR->End()->nNode;
-SwNodeIndex aIdx( PCURCRSR->Start()->nNode );
+const SwNodeIndex& rEnd = rPaM.End()->nNode;
+SwNodeIndex aIdx( rPaM.Start()->nNode );
 SwNode* pNd = &aIdx.GetNode();
 do {
 if( pNd->IsTxtNode() )
@@ -76,7 +77,7 @@ void SwEditShell::GCAttr()
 while( 0 != ( pNd = GetDoc()->GetNodes().GoNext( &aIdx )) &&
 aIdx <= rEnd );
 }
-FOREACHPAM_END()
+}
 }
 
 /// Set the attribute as new default attribute in the document.
@@ -104,13 +105,14 @@ void SwEditShell::SetAttrItem( const SfxPoolItem& rHint, 
sal_uInt16 nFlags )
 bool bIsTblMode = IsTableMode();
 GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
-FOREACHPAM_START(GetCrsr())
-if( PCURCRSR->HasMark() && ( bIsTblMode ||
-*PCURCRSR->GetPoint() != *PCURCRSR->GetMark() ))
+for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
+{
+if( rPaM.HasMark() && ( bIsTblMode ||
+*rPaM.GetPoint() != *rPaM.GetMark() ))
 {
-
GetDoc()->getIDocumentContentOperations().InsertPoolItem(*PCURCRSR, rHint, 
nFlags );
+GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, 
rHint, nFlags );
 }
-FOREACHPAM_END()
+}
 
 GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_INSATTR, NULL);
 }
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 3d8a190..ffa6d63 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -481,10 +481,10 @@ bool SwEditShell::IsMoveLeftMargin( bool bRight, bool 
bModulus ) const
 if( !nDefDist )
 return false;
 
-FOREACHPAM_START(GetCrsr())
-
-sal_uLong nSttNd = PCURCRSR->GetMark()->nNode.GetIndex(),
-  nEndNd = PCURCRSR->GetPoint()->nNode.GetIndex();
+for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
+{
+sal_uLong nSttNd = rPaM.GetMark()->nNode.GetIndex(),
+  nEndNd = rPaM.GetPoint()->nNode.GetIndex();
 
 if( nSttNd > nEndNd )
 std::swap(nSttNd, nEndNd);
@@ -516,7 +516,7 @@ bool SwEditShell::IsMoveLeftMargin( bool bRight, bool 
bModulus ) const
 if( !bRet )
 break;
 
-FOREACHPAM_END()
+}
 return bRet;
 }
 
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 7cc0973..a700116 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -121,9 +121,10 @@ long SwEditShell::Delete()
 GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_DELETE, 
&aRewriter);
 }
 
-FOREACHPAM_START(GetCrsr())
-DeleteSel( *PCURCRSR, &bUndo );
-FOREACHPAM_END()
+for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
+{
+DeleteSel( rPaM, &bUndo );
+}
 
 // If undo container then close here
 if( bUndo )
@@ -151,15 +152,15 @@ long SwEditShell::Copy( SwEditShel

[Bug 86929] Kill FOREACHPAM_START for good

[bugzilla-daemon]

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

--- Comment #7 from Commit Notification 
 ---
Julien Nabet committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=bbf59cb82eabee984926fb11dc5281dc84e62fb6

Related fdo#86929: Kill FOREACHPAM_START for good (part2)

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: Changes to 'private/moggi/opengl-4-4-build-test'

[Louis-Francis Ratté-Boulianne]

New branch 'private/moggi/opengl-4-4-build-test' available with the following 
commits:
commit d917ae4330d3af16a3f2af96f7666581d38854a6
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:27:38 2014 -0500

vcl: Don't keep a reference to the texture in the FBO object

Change-Id: I240d2b44e77d28af3cd5952b6d666a1709c4c54a

commit f13df3095481c11aed24b573dc6b84a8b42bd768
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:25:56 2014 -0500

vcl: Re-use a framebuffer of the same size when possible

Conflicts:
include/vcl/opengl/OpenGLContext.hxx

Change-Id: Id9c7932976ce9d9282776c20d93d9cca4d290056

commit 920bd8b2a6d0253da16e7eff2e8ebaa1f5f922b5
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:21:50 2014 -0500

vcl: Keep the same context for VirtualDevice to avoid FBO switches

Change-Id: I66496fae902db9df5b8301b00bb779f42adaa7a7

commit e0d4c67be6dd06ba4bc7d83b99b4e1d89d4dba97
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 22:17:58 2014 -0500

vcl: Reset context when the backend window is destroyed

Conflicts:
vcl/source/opengl/OpenGLContext.cxx

Conflicts:
vcl/source/opengl/OpenGLContext.cxx

Change-Id: Ie2b93de8efe5ea56b0420adf23639c0153103385

commit 89078402b31362dd62de0efe7eee1dd9945b0ba5
Author: Michael Stahl 
Date:   Wed Nov 26 15:59:28 2014 +0100

vcl: prefix global variable g_vShareList

Conflicts:
vcl/source/opengl/OpenGLContext.cxx

Change-Id: I13ecc76d8bd75ee65e626670995d7c93efc953ca

commit dd70fa7107d0ac8f5c07f82c869306e22941a3d3
Author: Louis-Francis Ratté-Boulianne 
Date:   Thu Dec 4 11:45:55 2014 -0500

vcl: Limit Cairo surface size to the clipping region to improve performance

Conflicts:
vcl/unx/generic/gdi/openglx11cairotextrender.cxx

Change-Id: I469b34c9f1047a274550229391d3dfb578291df6

commit 340d706c8bd78cef165edcb38b73c045204201ea
Author: Louis-Francis Ratté-Boulianne 
Date:   Wed Dec 3 17:05:01 2014 -0500

vcl: Reset data buffer after resizing bitmap on GPU

Change-Id: I516cdbc466f3d6427e36fea8c5cdbe718ce7d0ea

commit 74f71a70ea2f0bf71b4110bde500515314a17ab0
Author: Louis-Francis Ratté-Boulianne 
Date:   Wed Dec 3 17:04:15 2014 -0500

vcl: Use right size to draw native GTK window background

Change-Id: Id446d20599f072f657c6106d6c6457fce08830e6

commit f78f83cb0185c7d8ecb4fd46d00a9a5a4290ad71
Author: Louis-Francis Ratté-Boulianne 
Date:   Wed Dec 3 17:02:37 2014 -0500

vcl: Add BitmapInfoAccess for bitmaps' metadata access

Change-Id: Iec9f8c7d8f7cded0aef9e017373e44387dc0b05c

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

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

[Kohei Yoshida]

 package/source/zippackage/ZipPackageStream.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit cc52524e5b556ae694800df758e5e6917f1ace6c
Author: Kohei Yoshida 
Date:   Mon Dec 15 15:03:51 2014 -0500

fdo#87210: Re-enable parallel deflate, which was not the root cause.

With f92183833fa569006602ac7e93c906d2094e0d4d, export no longer crashes,
and there is no reason to leave this piece disabled any more.  Let's
re-enable this.

Change-Id: Ibeca8869f152cbcd80f1dcb55f8199110125741d
(cherry picked from commit 3fcd2ccb443653740d114b3e4dc371c6b0b6525b)

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 54d0def..e22b234 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -810,8 +810,6 @@ bool ZipPackageStream::saveChild(
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
 
-bParallelDeflate = false; // globally disable parallel deflate 
for now.
-
 if (bParallelDeflate)
 {
 // Start a new thread deflating this zip entry
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 package/source/zippackage/ZipPackageStream.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3fcd2ccb443653740d114b3e4dc371c6b0b6525b
Author: Kohei Yoshida 
Date:   Mon Dec 15 15:03:51 2014 -0500

fdo#87210: Re-enable parallel deflate, which was not the root cause.

With f92183833fa569006602ac7e93c906d2094e0d4d, export no longer crashes,
and there is no reason to leave this piece disabled any more.  Let's
re-enable this.

Change-Id: Ibeca8869f152cbcd80f1dcb55f8199110125741d

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 54d0def..e22b234 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -810,8 +810,6 @@ bool ZipPackageStream::saveChild(
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
 
-bParallelDeflate = false; // globally disable parallel deflate 
for now.
-
 if (bParallelDeflate)
 {
 // Start a new thread deflating this zip entry
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - package/inc package/source

[Matúš Kukan]

 package/inc/ZipOutputEntry.hxx |8 -
 package/inc/ZipOutputStream.hxx|1 
 package/source/zipapi/ZipOutputEntry.cxx   |   35 +
 package/source/zipapi/ZipOutputStream.cxx  |   21 ++-
 package/source/zippackage/ZipPackage.cxx   |6 +---
 package/source/zippackage/ZipPackageStream.cxx |7 ++---
 6 files changed, 57 insertions(+), 21 deletions(-)

New commits:
commit a7d05673ba6d909e62b5b703f85dc1d1ef96f3d0
Author: Matúš Kukan 
Date:   Sun Dec 14 00:11:53 2014 +0100

package: Better to use temporary files for huge memory zip streams

ZipPackageBuffer was holding the whole compressed data stream in one
uno::Sequence which seems to be a lot for big documents in some cases.

Change-Id: Ib10d00ac54df9674231f4bbf047fab7e9b0a7d45
(cherry picked from commit f92183833fa569006602ac7e93c906d2094e0d4d)

diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index 1cf499f..48e33eb 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_PACKAGE_INC_ZIPOUTPUTENTRY_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,7 +37,7 @@ class ZipOutputEntry
 {
 ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer;
 ZipUtils::Deflater m_aDeflater;
-css::uno::Reference< ZipPackageBuffer > m_pBuffer;
+css::uno::Reference< css::io::XTempFile > m_xTempFile;
 css::uno::Reference< css::io::XOutputStream > m_xOutStream;
 
 ::com::sun::star::uno::Reference< 
::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext;
@@ -56,7 +57,7 @@ public:
 
 ~ZipOutputEntry();
 
-css::uno::Sequence< sal_Int8 > getData();
+css::uno::Reference< css::io::XInputStream > getData();
 ZipEntry* getZipEntry() { return m_pCurrentEntry; }
 ZipPackageStream* getZipPackageStream() { return m_pCurrentStream; }
 bool isEncrypt() { return m_bEncryptCurrentEntry; }
diff --git a/package/source/zipapi/ZipOutputEntry.cxx 
b/package/source/zipapi/ZipOutputEntry.cxx
index abffb1d..8243bdc 100644
--- a/package/source/zipapi/ZipOutputEntry.cxx
+++ b/package/source/zipapi/ZipOutputEntry.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -57,8 +58,8 @@ ZipOutputEntry::ZipOutputEntry(
 }
 else
 {
-m_pBuffer = new ZipPackageBuffer(n_ConstBufferSize);
-m_xOutStream = m_pBuffer;
+m_xTempFile = io::TempFile::create(rxContext);
+m_xOutStream = m_xTempFile->getOutputStream();
 }
 assert(m_pCurrentEntry->nMethod == DEFLATED && "Use 
ZipPackageStream::rawWrite() for STORED entries");
 if (m_bEncryptCurrentEntry)
@@ -72,10 +73,12 @@ ZipOutputEntry::~ZipOutputEntry( void )
 {
 }
 
-uno::Sequence< sal_Int8 > ZipOutputEntry::getData()
+uno::Reference< io::XInputStream > ZipOutputEntry::getData()
 {
-m_pBuffer->realloc(m_pBuffer->getPosition());
-return m_pBuffer->getSequence();
+m_xOutStream->closeOutput();
+uno::Reference< io::XSeekable > xTempSeek(m_xOutStream, UNO_QUERY_THROW);
+xTempSeek->seek(0);
+return m_xTempFile->getInputStream();
 }
 
 void ZipOutputEntry::closeEntry()
diff --git a/package/source/zipapi/ZipOutputStream.cxx 
b/package/source/zipapi/ZipOutputStream.cxx
index 23e2a30..9c56f45 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -101,7 +102,20 @@ void ZipOutputStream::finish()
 for (size_t i = 0; i < m_aEntries.size(); i++)
 {
 writeLOC(m_aEntries[i]->getZipEntry(), m_aEntries[i]->isEncrypt());
-rawWrite(m_aEntries[i]->getData());
+
+sal_Int32 nRead;
+uno::Sequence< sal_Int8 > aSequence(n_ConstBufferSize);
+uno::Reference< io::XInputStream > xInput = m_aEntries[i]->getData();
+do
+{
+nRead = xInput->readBytes(aSequence, n_ConstBufferSize);
+if (nRead < n_ConstBufferSize)
+aSequence.realloc(nRead);
+
+rawWrite(aSequence);
+}
+while (nRead == n_ConstBufferSize);
+
 rawCloseEntry(m_aEntries[i]->isEncrypt());
 
 
m_aEntries[i]->getZipPackageStream()->successfullyWritten(m_aEntries[i]->getZipEntry());
commit d0b2be18fdb5f85162542b28755d6e124dcbe57c
Author: Matúš Kukan 
Date:   Sat Dec 13 23:09:10 2014 +0100

package: Create memory buffer only when we need it - if we use parallelism

Otherwise write directly to the resulting zip file.

Change-Id: I75097969f0cccf0b45da591c71221e5ae18668cb
(cherry picked from commit 43eca2d9f8d87363b5f4bf8c5df92bf06be08c08)

diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index 26ebb15..1cf499f 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_PACKAGE_INC_ZIPO

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/vcl vcl/opengl vcl/qa vcl/source

[Luboš Luňák]

 include/vcl/bitmap.hxx|   23 +++
 vcl/opengl/scale.cxx  |4 ++--
 vcl/qa/cppunit/graphicfilter/filters-test.cxx |2 +-
 vcl/source/gdi/bitmap3.cxx|2 ++
 4 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 9a5535f59c9747ec5f151cf3478682405c544ba2
Author: Luboš Luňák 
Date:   Mon Dec 15 18:36:32 2014 +0100

do not hardcode what specific "generic" bitmap scaling operations use

I.e. make it possible for the opengl backend to decide to use a different
scaling algorithm.

Change-Id: I36e76de071797129c7636b3048c93bc6e5d93aca

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index accb763..3f6ceef 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -35,18 +35,17 @@
 
 
 #define BMP_SCALE_NONE  0xUL
-#define BMP_SCALE_FAST  0x0001UL
-#define BMP_SCALE_INTERPOLATE   0x0002UL
-#define BMP_SCALE_SUPER 0x0003UL
-#define BMP_SCALE_LANCZOS   0x0004UL
-#define BMP_SCALE_BICUBIC   0x0005UL
-#define BMP_SCALE_BILINEAR  0x0006UL
-#define BMP_SCALE_BOX   0x0007UL
-
-// Aliases, try to use these two (or BMP_SCALE_FAST/BMP_SCALE_NONE),
-// use a specific algorithm only if you really need to.
-#define BMP_SCALE_BESTQUALITY   BMP_SCALE_LANCZOS
-#define BMP_SCALE_DEFAULT   BMP_SCALE_SUPER
+// Try to preferably use these.
+#define BMP_SCALE_DEFAULT   0x0001UL
+#define BMP_SCALE_FAST  0x0002UL
+#define BMP_SCALE_BESTQUALITY   0x0003UL
+// Specific algorithms,  use only if you really need to.
+#define BMP_SCALE_INTERPOLATE   0x0004UL
+#define BMP_SCALE_SUPER 0x0005UL
+#define BMP_SCALE_LANCZOS   0x0006UL
+#define BMP_SCALE_BICUBIC   0x0007UL
+#define BMP_SCALE_BILINEAR  0x0008UL
+#define BMP_SCALE_BOX   0x0009UL
 
 
 #define BMP_DITHER_NONE 0xUL
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 7bcf7c0..571be98 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -202,13 +202,13 @@ bool OpenGLSalBitmap::ImplScale( const double& rScaleX, 
const double& rScaleY, s
 {
 return ImplScaleFilter( rScaleX, rScaleY, GL_LINEAR );
 }
-else if( nScaleFlag == BMP_SCALE_SUPER )
+else if( nScaleFlag == BMP_SCALE_SUPER || nScaleFlag == BMP_SCALE_DEFAULT )
 {
 const Lanczos3Kernel aKernel;
 
 return ImplScaleConvolution( rScaleX, rScaleY, aKernel );
 }
-else if( nScaleFlag == BMP_SCALE_LANCZOS )
+else if( nScaleFlag == BMP_SCALE_LANCZOS || nScaleFlag == 
BMP_SCALE_BESTQUALITY  )
 {
 const Lanczos3Kernel aKernel;
 
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index 48b1045..0b04dbf 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -62,7 +62,7 @@ bool VclFiltersTest::load(const OUString &,
 
 void VclFiltersTest::testScaling()
 {
-for (unsigned int i = BMP_SCALE_FAST; i <= BMP_SCALE_BOX; i++)
+for (unsigned int i = BMP_SCALE_NONE + 1; i <= BMP_SCALE_BOX; i++)
 {
 Bitmap aBitmap( Size( 413, 409 ), 24 );
 BitmapEx aBitmapEx( aBitmap );
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 1a7e1cf..38816e4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -927,6 +927,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nSc
 break;
 }
 case BMP_SCALE_SUPER:
+case BMP_SCALE_DEFAULT:
 {
 if (GetSizePixel().Width() < 2 || GetSizePixel().Height() < 2)
 {
@@ -941,6 +942,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nSc
 break;
 }
 case BMP_SCALE_LANCZOS :
+case BMP_SCALE_BESTQUALITY:
 {
 const Lanczos3Kernel kernel;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák]

 include/vcl/bitmap.hxx|   23 +++
 vcl/opengl/scale.cxx  |4 ++--
 vcl/qa/cppunit/graphicfilter/filters-test.cxx |2 +-
 vcl/source/gdi/bitmap3.cxx|2 ++
 4 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 9dc134a6df9255b4ca294cd2e9b88026624e6125
Author: Luboš Luňák 
Date:   Mon Dec 15 18:36:32 2014 +0100

do not hardcode what specific "generic" bitmap scaling operations use

I.e. make it possible for the opengl backend to decide to use a different
scaling algorithm.

Change-Id: I36e76de071797129c7636b3048c93bc6e5d93aca

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 80b76e4..26a221c 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -35,18 +35,17 @@
 
 
 #define BMP_SCALE_NONE  0xUL
-#define BMP_SCALE_FAST  0x0001UL
-#define BMP_SCALE_INTERPOLATE   0x0002UL
-#define BMP_SCALE_SUPER 0x0003UL
-#define BMP_SCALE_LANCZOS   0x0004UL
-#define BMP_SCALE_BICUBIC   0x0005UL
-#define BMP_SCALE_BILINEAR  0x0006UL
-#define BMP_SCALE_BOX   0x0007UL
-
-// Aliases, try to use these two (or BMP_SCALE_FAST/BMP_SCALE_NONE),
-// use a specific algorithm only if you really need to.
-#define BMP_SCALE_BESTQUALITY   BMP_SCALE_LANCZOS
-#define BMP_SCALE_DEFAULT   BMP_SCALE_SUPER
+// Try to preferably use these.
+#define BMP_SCALE_DEFAULT   0x0001UL
+#define BMP_SCALE_FAST  0x0002UL
+#define BMP_SCALE_BESTQUALITY   0x0003UL
+// Specific algorithms,  use only if you really need to.
+#define BMP_SCALE_INTERPOLATE   0x0004UL
+#define BMP_SCALE_SUPER 0x0005UL
+#define BMP_SCALE_LANCZOS   0x0006UL
+#define BMP_SCALE_BICUBIC   0x0007UL
+#define BMP_SCALE_BILINEAR  0x0008UL
+#define BMP_SCALE_BOX   0x0009UL
 
 
 #define BMP_DITHER_NONE 0xUL
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 4703c1f..01a9963 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -203,13 +203,13 @@ bool OpenGLSalBitmap::ImplScale( const double& rScaleX, 
const double& rScaleY, s
 {
 return ImplScaleFilter( rScaleX, rScaleY, GL_LINEAR );
 }
-else if( nScaleFlag == BMP_SCALE_SUPER )
+else if( nScaleFlag == BMP_SCALE_SUPER || nScaleFlag == BMP_SCALE_DEFAULT )
 {
 const Lanczos3Kernel aKernel;
 
 return ImplScaleConvolution( rScaleX, rScaleY, aKernel );
 }
-else if( nScaleFlag == BMP_SCALE_LANCZOS )
+else if( nScaleFlag == BMP_SCALE_LANCZOS || nScaleFlag == 
BMP_SCALE_BESTQUALITY  )
 {
 const Lanczos3Kernel aKernel;
 
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index 48b1045..0b04dbf 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -62,7 +62,7 @@ bool VclFiltersTest::load(const OUString &,
 
 void VclFiltersTest::testScaling()
 {
-for (unsigned int i = BMP_SCALE_FAST; i <= BMP_SCALE_BOX; i++)
+for (unsigned int i = BMP_SCALE_NONE + 1; i <= BMP_SCALE_BOX; i++)
 {
 Bitmap aBitmap( Size( 413, 409 ), 24 );
 BitmapEx aBitmapEx( aBitmap );
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 1a7e1cf..38816e4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -927,6 +927,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nSc
 break;
 }
 case BMP_SCALE_SUPER:
+case BMP_SCALE_DEFAULT:
 {
 if (GetSizePixel().Width() < 2 || GetSizePixel().Height() < 2)
 {
@@ -941,6 +942,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& 
rScaleY, sal_uInt32 nSc
 break;
 }
 case BMP_SCALE_LANCZOS :
+case BMP_SCALE_BESTQUALITY:
 {
 const Lanczos3Kernel kernel;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build problem, PythonTest_pyuno_pytests_ssl fails

[Pavel Laštovička]

Hi Michael,

Dne 15.12.2014 v 16:54 Michael Stahl napsal(a):

On 15.12.2014 16:12, Pavel Laštovička wrote:

Hello,

so far I found that Python in 4.3 somehow suppresses output. I can call it
interactively or run a hello world script, but nothing is displayed in console. 
This
did not happen with 4.2. I am not sure how to proceed when I can't see any error
message.

On Windows, i don't remember this ever working in a Cygwin terminal;
python.exe seems to print only to a Windows cmd.exe terminal.
For me, python.exe works the same regardless if I run it from a Cygwin or cmd.exe 
terminal.

hmm... perhaps try setting a breakpoint on exit() or _exit() ?
I would have to get it compiled with debug information first. I am not sure how to 
do that.

But by trial and error I found python fails on the following line:

import _ssl

Meanwhile, I have decided to remove this python check so I can continue with 
building.

Pavel

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

Website Design At Low Cost

[Sofia Lewis]

Dear fridrich.blogspot.com owner,


I hope you are doing well

We are a trusted web design and development agency offering creative and
innovative web design & development services. We have experienced designers
and developers focused entirely on design and development services. We have
the skills and expertise to help structure and mould your ideas into
designs and functionalities.


*Types of Services:*


*1.  PSD Conversion*

 1.) HTML/HTML5 Conversion

 2.) Wordpress Conversion

 3.) Joomla Conversion

 4.) E-Commerce Conversion

 5.) Magento Conversion


*2.  Responsive Website Design*


*3.  CMS Website Design*

1.) WordPress Theme Design & Customization

2.) Custom themes, Plugins & Widget Development

3.) WordPress CMS Configuration, Development, Customization

4.) WORDPRESS Installation & Maintenance

5.) WORDPRESS Ecommerce Websites

 6.) Custom Templates, Modules, Plugins Design & Development



*4.  Webshop and **Ecommerce Website*


   1.) Magento Templates Design & Customizations

   2.) WORDPRESS Ecommerce Websites



We can serve any of your requirements with complete dedication

Our web designing and development services echo the values and ethos of
your business. We are an approachable, high performing web development
company with a passion for making websites work for business.



Thanks


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

Re: Build problem, PythonTest_pyuno_pytests_ssl fails

[Michael Stahl]

On 15.12.2014 16:12, Pavel Laštovička wrote:
> Hello,
> 
> so far I found that Python in 4.3 somehow suppresses output. I can call it 
> interactively or run a hello world script, but nothing is displayed in 
> console. This 
> did not happen with 4.2. I am not sure how to proceed when I can't see any 
> error 
> message.

On Windows, i don't remember this ever working in a Cygwin terminal;
python.exe seems to print only to a Windows cmd.exe terminal.

> Dne 11.12.2014 v 16:12 Pavel Laštovička napsal(a):
>> Hi all,
>>
>> I have a problem trying to build LibreOffice 4.3.4. Build fails with:
>>
>>> Error: a unit test failed, please do one of:
>>>
>>> export DEBUGCPPUNIT=TRUE# for exception catching
>>> export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux
>>> export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for 
>>> interactive
>>> debugging in Visual Studio
>>> export VALGRIND=memcheck# for memory checking
>>>
>>> and retry using: make PythonTest_pyuno_pytests_ssl
>>
>> It is on Windows, with Visual C++ 2010 Express. Python simply returns 1 with 
>> no 
>> output. I tried running it under Visual Studio and I did not see any 
>> exception 
>> thrown.

hmm... perhaps try setting a breakpoint on exit() or _exit() ?


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

[Libreoffice-commits] core.git: jvmfwk/inc

[Stephan Bergmann]

 jvmfwk/inc/vendorplugin.hxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 72d8747ad95dbde1d3511b0fe48cd72999a43faf
Author: Stephan Bergmann 
Date:   Mon Dec 15 16:51:11 2014 +0100

Remove obsolete comment

Change-Id: I66dcf6284bd1b7afb1c60c8382052e06072b

diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 25d9246..f96b094 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -44,11 +44,6 @@
version and vendor as one entity. One without the other does not guarantee
the existence of a particular set of features or bug fixes. An 
implementation
of this API may support multiple vendors. 
-   
-   Libraries which implement this interface will be dynamically loaded and
-   unloaded by the java framework (jvmfwk/framework.h). Therefore they must not
-   keep global variables.
-   
  */
 
 typedef enum
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - desktop/unx

[Michael Stahl]

 desktop/unx/source/file_image_unx.c |6 --
 1 file changed, 6 deletions(-)

New commits:
commit a6b2f1facadf23c258d7b5a75241f4d3bde47690
Author: Michael Stahl 
Date:   Thu Oct 9 20:41:11 2014 +0200

desktop: -Werror=unused-macros

The documented feature test macro is _BSD_SOURCE, and anyway, feature
test macros must be defined before the first libc header is included, so
this one is evidently useless.

Change-Id: Ib4b2db0c6151c2f3df322992b189257f5dd0ea22
(cherry picked from commit 2e69b60cc2abb8e0a6773e101c03050c57a12ca3)

diff --git a/desktop/unx/source/file_image_unx.c 
b/desktop/unx/source/file_image_unx.c
index 89df91e..f1320cc 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -24,12 +24,6 @@
 #include 
 #include 
 
-#if defined(LINUX)
-#  ifndef __USE_BSD
-#define __USE_BSD /* madvise, MADV_WILLNEED */
-#  endif
-#endif /* Linux */
-
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/uibase/shells/txtcrsr.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit bc84b64c59aaa513142f41b261b1f10820c4a953
Author: Michael Stahl 
Date:   Mon Dec 15 16:33:05 2014 +0100

fdo#82614: sw: Revert "Simplify code path"

This reverts commit 07c00671443f3f0a2e2e6c3a54c391f040e8fd2b.

The bug is because the check of the GotoHeaderTxt() is inverted.

Actually in the old code it is a bit easier to understand what is intended,
even though it is more verbose, so just revert the commit.

(cherry picked from commit 86910c87c193345e5e36104e21b8e26790d6846d)

diff --git a/sw/source/uibase/shells/txtcrsr.cxx 
b/sw/source/uibase/shells/txtcrsr.cxx
index 151212e..cadbbe1 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -362,14 +362,26 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
 break;
 case FN_TO_HEADER:
 rSh.MoveCrsr();
-if ( ( FRMTYPE_HEADER & rSh.GetFrmType(0,false) ) || 
rSh.GotoHeaderTxt() )
+if ( FRMTYPE_HEADER & rSh.GetFrmType(0,false) )
 rSh.SttPg();
+else
+{
+bool bMoved = rSh.GotoHeaderTxt();
+if ( !bMoved )
+rSh.SttPg();
+}
 bSetRetVal = false;
 break;
 case FN_TO_FOOTER:
 rSh.MoveCrsr();
-if ( ( FRMTYPE_FOOTER & rSh.GetFrmType(0,false) ) || 
rSh.GotoFooterTxt() )
+if ( FRMTYPE_FOOTER & rSh.GetFrmType(0,false) )
 rSh.EndPg();
+else
+{
+bool bMoved = rSh.GotoFooterTxt();
+if ( !bMoved )
+rSh.EndPg();
+}
 bSetRetVal = false;
 break;
 case FN_FOOTNOTE_TO_ANCHOR:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/jvmfwk jvmfwk/inc jvmfwk/plugins jvmfwk/source

[Stephan Bergmann]

 include/jvmfwk/framework.h  |   56 ++-
 jvmfwk/inc/vendorbase.hxx   |  184 
 jvmfwk/inc/vendorplugin.hxx |   86 +
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |  108 +++
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx  |  137 +
 jvmfwk/plugins/sunmajor/pluginlib/util.hxx  |   47 +--
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx|  184 
 jvmfwk/source/framework.cxx |  291 
 8 files changed, 697 insertions(+), 396 deletions(-)

New commits:
commit 5e9a2e9b0f33ab50aa3a84728db75383aede19d9
Author: Stephan Bergmann 
Date:   Mon Dec 15 16:42:03 2014 +0100

Check each potential JRE location only once

i.e., after recent "fdo#83753: consider JAVA_HOME and PATH when selecting 
JRE"
fix, if jfw_findAndSelectJRE found no suitable JRE in
jfw_plugin_getJavaInfoFromJavaHome or jfw_plugin_getJavaInfosFromPath, do 
not
re-check those locations in jfw_plugin_getAllJavaInfos.

Change-Id: If4e085b4fceff5b2494c7b7b84ac51691dbc78cc

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx 
b/jvmfwk/inc/vendorbase.hxx
similarity index 100%
rename from jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
rename to jvmfwk/inc/vendorbase.hxx
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 35131df..25d9246 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -22,11 +22,13 @@
 #define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
 
 #include 
+#include 
 #include 
 #include "jni.h"
 #include 
 #include 
 #include "../source/elements.hxx"
+#include 
 
 /**
@file
@@ -112,13 +114,15 @@ typedef enum
 version strings.
  */
 javaPluginError jfw_plugin_getAllJavaInfos(
+bool checkJavaHomeAndPath,
 OUString const& sVendor,
 OUString const& sMinVersion,
 OUString const& sMaxVersion,
 rtl_uString * * arExcludeList,
 sal_Int32  nSizeExcludeList,
 JavaInfo*** parJavaInfo,
-sal_Int32 *nSizeJavaInfo);
+sal_Int32 *nSizeJavaInfo,
+std::vector> & infos);
 
 /** obtains information for a JRE at a given location.
 
@@ -202,7 +206,8 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
  */
 javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
 std::vector> const& vecVendorInfos,
-JavaInfo ** ppInfo);
+JavaInfo ** ppInfo,
+std::vector> & infos);
 
 
 /** obtains information about installations of Java Runtime Environments (JREs)
@@ -244,7 +249,8 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
 
 javaPluginError jfw_plugin_getJavaInfosFromPath(
 std::vector> const& vecVendorInfos,
-std::vector & vecJavaInfosFromPath);
+std::vector & vecJavaInfosFromPath,
+std::vector> & infos);
 
 /** starts a Java Virtual Machine.
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 1771bcc..d3ac151 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -299,13 +299,15 @@ javaPluginError checkJavaVersionRequirements(
 }
 
 javaPluginError jfw_plugin_getAllJavaInfos(
+bool checkJavaHomeAndPath,
 OUString const& sVendor,
 OUString const& sMinVersion,
 OUString const& sMaxVersion,
 rtl_uString  * *arExcludeList,
 sal_Int32  nLenList,
 JavaInfo*** parJavaInfo,
-sal_Int32 *nLenInfoList)
+sal_Int32 *nLenInfoList,
+std::vector> & infos)
 {
 OSL_ASSERT(parJavaInfo);
 OSL_ASSERT(nLenInfoList);
@@ -326,7 +328,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
 
 //Find all JREs
 vector > vecInfos =
-getAllJREInfos();
+addAllJREInfos(checkJavaHomeAndPath, infos);
 vector > vecVerifiedInfos;
 
 typedef vector >::iterator it;
@@ -406,15 +408,17 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
 
 javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
 std::vector> const& vecVendorInfos,
-JavaInfo ** ppInfo)
+JavaInfo ** ppInfo, std::vector> & infos)
 {
 if (!ppInfo)
 return JFW_PLUGIN_E_INVALID_ARG;
 
-rtl::Reference infoJavaHome = getJavaInfoFromJavaHome();
+std::vector> infoJavaHome;
+addJavaInfoFromJavaHome(infos, infoJavaHome);
 
-if (!infoJavaHome.is())
+if (infoJavaHome.empty())
 return JFW_PLUGIN_E_NO_JRE;
+assert(infoJavaHome.size() == 1);
 
 //Check if the detected JRE matches the version requirements
 typedef std::vector>::const_iterator 
ci_pl;
@@ -423,10 +427,10 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
 const OUString& vendor = vendorInfo->first;
 jfw::VersionInfo versionInfo = vendorInfo->second;
 
-if (vendor.equals(infoJavaHome->getVendor()))
+if (vendor.equals(infoJavaHome[0]->getVendor()))
 {
 javaPluginError errorcode = checkJavaVersionRequirements(
-infoJavaHome,
+   

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

[Michael Stahl]

 sw/source/uibase/shells/txtcrsr.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 86910c87c193345e5e36104e21b8e26790d6846d
Author: Michael Stahl 
Date:   Mon Dec 15 16:33:05 2014 +0100

fdo#82614: sw: Revert "Simplify code path"

This reverts commit 07c00671443f3f0a2e2e6c3a54c391f040e8fd2b.

The bug is because the check of the GotoHeaderTxt() is inverted.

Actually in the old code it is a bit easier to understand what is intended,
even though it is more verbose, so just revert the commit.

diff --git a/sw/source/uibase/shells/txtcrsr.cxx 
b/sw/source/uibase/shells/txtcrsr.cxx
index 871eb5a..d33e34a 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -362,14 +362,26 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
 break;
 case FN_TO_HEADER:
 rSh.MoveCrsr();
-if ( ( FRMTYPE_HEADER & rSh.GetFrmType(0,false) ) || 
rSh.GotoHeaderTxt() )
+if ( FRMTYPE_HEADER & rSh.GetFrmType(0,false) )
 rSh.SttPg();
+else
+{
+bool bMoved = rSh.GotoHeaderTxt();
+if ( !bMoved )
+rSh.SttPg();
+}
 bSetRetVal = false;
 break;
 case FN_TO_FOOTER:
 rSh.MoveCrsr();
-if ( ( FRMTYPE_FOOTER & rSh.GetFrmType(0,false) ) || 
rSh.GotoFooterTxt() )
+if ( FRMTYPE_FOOTER & rSh.GetFrmType(0,false) )
 rSh.EndPg();
+else
+{
+bool bMoved = rSh.GotoFooterTxt();
+if ( !bMoved )
+rSh.EndPg();
+}
 bSetRetVal = false;
 break;
 case FN_FOOTNOTE_TO_ANCHOR:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - android/experimental

[Miklos Vajna]

 android/experimental/LOAndroid3/AndroidManifest.xml.in |   29 -
 1 file changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 90a94db73c6c9c1ec0a10e248fd8c1eff955b375
Author: Miklos Vajna 
Date:   Mon Dec 15 16:29:10 2014 +0100

android: don't associate with ods, fods, ots, xls, xlsx, xltx and csv

It's pointless to do that till Calc tiled rendering is not supported on
master.

Change-Id: Ib1ba01c18621d0a6e39ed45052ced715defaa4d4

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index b14074a..119046a8 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -35,14 +35,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
+
 
 
 
@@ -52,24 +53,25 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
 
 
+
 
 
 
-
-
+
+
 
 
 
commit 7992c34a1759c25781854f6230ec27eb33222003
Author: Miklos Vajna 
Date:   Mon Dec 15 16:24:38 2014 +0100

android: associate with ott, otg, otp, dotx and potx files as well

Change-Id: If77eb099cb132ea889f623b895b32b3eef223d76

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index 8eb4dbb..b14074a 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
@@ -54,8 +60,13 @@
 
 
 
+
 
 
+
+
+
+
 
 
 
@@ -85,3 +96,5 @@
 
 
 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - sw/qa

[Tor Lillqvist]

 sw/qa/extras/htmlexport/htmlexport.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a150daa0fea2219471d99df649d8588cac96ab28
Author: Tor Lillqvist 
Date:   Mon Dec 15 17:24:06 2014 +0200

Remove extra #endif

Change-Id: Idfa956a811d3614e566cbb7fdc0661f053a15c80

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8c0843e..15834fe 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -183,8 +183,6 @@ DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState, 
"checkbox-radiobutto
 }
 #endif
 
-#endif
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build problem, PythonTest_pyuno_pytests_ssl fails

[Pavel Laštovička]

Hello,

so far I found that Python in 4.3 somehow suppresses output. I can call it 
interactively or run a hello world script, but nothing is displayed in console. This 
did not happen with 4.2. I am not sure how to proceed when I can't see any error 
message.


Pavel

Dne 11.12.2014 v 16:12 Pavel Laštovička napsal(a):

Hi all,

I have a problem trying to build LibreOffice 4.3.4. Build fails with:


Error: a unit test failed, please do one of:

export DEBUGCPPUNIT=TRUE# for exception catching
export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux
export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for interactive
debugging in Visual Studio
export VALGRIND=memcheck# for memory checking

and retry using: make PythonTest_pyuno_pytests_ssl


It is on Windows, with Visual C++ 2010 Express. Python simply returns 1 with no 
output. I tried running it under Visual Studio and I did not see any exception 
thrown.


Regards



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

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

[Tor Lillqvist]

 cui/source/options/optgdlg.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f52deabd8173a82a9fc9f67535251a71768224aa
Author: Tor Lillqvist 
Date:   Mon Dec 15 16:46:40 2014 +0200

WaE: private field 'm_pSystemFont' is not used

Change-Id: I620209bd008a20efc1fdc64e11eff7300162150a

diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 3353457..9a78d53 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -85,7 +85,6 @@ private:
 MetricField*m_pWindowSizeMF;
 ListBox*m_pIconSizeLB;
 ListBox*m_pIconStyleLB;
-CheckBox*   m_pSystemFont;
 
 CheckBox*   m_pFontAntiAliasing;
 FixedText*  m_pAAPointLimitLabel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: proposed patch: Bug 69609 - registrymodification.xcu in presets folder not implemented in newly created profiles.

[Justin Luth]

On 15/12/14 14:18, Noel Grandin wrote:
> Perhaps we need an official, bundled (but off by default) extension
> that performs this job?

An example extension won't be enough.  However, a config builder tool
could do the job.


1.)  Identifying the setting change difficulties:
-does a setting change modify multiple keys?  How do I know if the
change I am making is valid, and isn't missing a dependency?
-comparing before/after XML snapshots is not easy because XML keys can
move around a lot.   xmldiff can't handle big files.  (It was tedious
trying to isolate the settings I needed.)
-if I don't know English, how can I connect my "GUI Interface" setting
change with a change in the XML file?
-many settings may have been written to the user profile, just because I
visited one settings page - even if no changes were made.  That can make
it hard to isolate the relevant setting keys.

2.)  Finding the XML path
-In a huge XML file (like registrymodifications.xcu), it is not easy to
identify each node in the path.  My personal approach is to use firefox
and minimize each subsection as I go up.  Probably there is a better
way... but I don't know of it.
-hopefully most experienced sysadmins have a general knowledge of XML -
but I know that I have rarely needed it, so definitely I am rusty and
uncomfortable dealing with it.  Trying to write code to manage XML is
difficult and confusing for me.  (perl, xmlstarlet).  I know that we
aren't talking about coding here, but this is just to say that dealing
with XML is probably fairly foreign to sysadmins, and now to take chunks
of XML from the settings and altering those chunks to fit into an
extension might not be as easy for a sysadmin as programmers think that
it should be.

3.)  Packaging the extension
-it is a black box that only works if you have everything right.
-even the thought of writing an extension is a blocker.  It sounds like
a big deal - probably sounds bigger than it actually is.
-nothing is "cut and paste".  The root node is different in all three
XML files - system, extension, and user  (at least it is different in
our extension).  That's confusing and dis-orienting.  Extensions seem to
follow SYSTEM xml layout (change group to node) closer than user layout
- and yet we had to use the user's registrymodifications.xcu to identify
the changes.


So you can see there are a million things that could go wrong.  If you
get ONE of them wrong, then your extension simply won't do what you
want, but there is no feedback mechanism to give any hints as to what
that error might be.



SYSADMIN TOOL TO CREATE EXTENSIONS:
-read a registrymodifications.xcu file that the user has created.
-for every setting - checkmark to include in extension.   checkmark to
make mandatory (over-ride user settings).
-group together at least at the first level to reduce the "noise".
-search/filter/find
-filter:  attach a comparison .xcu.  filter out any settings not
different between the two .xcu's
-builtin list of common things to hide/exclude - like file
history.   Hidden by default, option to show all.
-output extension


This would eliminate a lot of the problems:
1.)  discoverable settings based in real time.  Generic enough to work
across different versions of LO.
2.)  easier to identify specific settings (any way to help non-English
speakers?) (any way to tap into LO rules about related settings?)
3.)  finding XML path / managing XML names will be a moot problem if the
tool takes care of all of that.  (but must be maintained: a place where
you need to take care of forward-compatibility)
4.)  packaging the extension should be easy for a tool (but must be
maintained).
5.)  testing portion would be nice, but I can't think of how that would
be possible in a tool.

Coding this would be WAY beyond me.



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

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

[Gary Houston]

 oox/source/drawingml/diagram/diagramdefinitioncontext.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 84ce458a841f9b09b87ff045403b546c88c79168
Author: Gary Houston 
Date:   Mon Dec 15 14:25:31 2014 +

Resolves: fdo#87281 Crash on importing diagram in .docx file

Change-Id: Ic2c7326ab83258e2e9dcbac88aa9f76f771a9b12
(cherry picked from commit de41a2038ac44f71a9adef97e6ccea83c99dd1c2)

diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx 
b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 7f43761..88b69f2 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -48,7 +48,9 @@ DiagramDefinitionContext::DiagramDefinitionContext( 
ContextHandler2Helper& rPare
 
 DiagramDefinitionContext::~DiagramDefinitionContext()
 {
-mpLayout->getNode()->dump(0);
+LayoutNodePtr node = mpLayout->getNode();
+if (node)
+node->dump(0);
 }
 
 ContextHandlerRef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gary Houston]

 include/vcl/svapp.hxx |   12 --
 oox/source/drawingml/diagram/diagramdefinitioncontext.cxx |4 
 vcl/source/app/svapp.cxx  |   15 --
 vcl/source/window/settings.cxx|   80 --
 4 files changed, 3 insertions(+), 108 deletions(-)

New commits:
commit de41a2038ac44f71a9adef97e6ccea83c99dd1c2
Author: Gary Houston 
Date:   Mon Dec 15 14:25:31 2014 +

Resolves: fdo#87281 Crash on importing diagram in .docx file

Change-Id: Ic2c7326ab83258e2e9dcbac88aa9f76f771a9b12

diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx 
b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 7f43761..88b69f2 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -48,7 +48,9 @@ DiagramDefinitionContext::DiagramDefinitionContext( 
ContextHandler2Helper& rPare
 
 DiagramDefinitionContext::~DiagramDefinitionContext()
 {
-mpLayout->getNode()->dump(0);
+LayoutNodePtr node = mpLayout->getNode();
+if (node)
+node->dump(0);
 }
 
 ContextHandlerRef
commit e2a41b4415f59c2c6a75f40775a19c8ce4cbdb42
Author: Caolán McNamara 
Date:   Mon Dec 15 14:04:08 2014 +

don't screw around with the system font selection

Change-Id: I491a6410f70b063fd74834d5837be34e4b9552d7

diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 6525240..862626e 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -154,86 +154,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& 
rSettings, bool bCallHdl )
 rSettings.SetStyleSettings( aTmpSt );
 ImplGetFrame()->UpdateSettings( rSettings );
 
-// Verify availability of the configured UI font, otherwise choose "Andale 
Sans UI"
-
-// WTF, what makes Andale Sans UI a suitable cross-platform fallback font?
-
-OUString aUserInterfaceFont;
-bool bUseSystemFont = rSettings.GetStyleSettings().GetUseSystemUIFonts();
-
-// check whether system UI font can display a typical UI text
-if( bUseSystemFont )
-bUseSystemFont = ImplCheckUIFont( 
rSettings.GetStyleSettings().GetAppFont() );
-
-if ( !bUseSystemFont )
-{
-OutputDevice *pOutDev = GetOutDev();
-pOutDev->ImplInitFontList();
-OUString aConfigFont = 
utl::DefaultFontConfiguration::get().getUserInterfaceFont( 
rSettings.GetUILanguageTag() );
-sal_Int32 nIndex = 0;
-while( nIndex != -1 )
-{
-OUString aName( aConfigFont.getToken( 0, ';', nIndex ) );
-if ( !aName.isEmpty() && 
mpWindowImpl->mpFrameData->mpFontCollection->FindFontFamily( aName ) )
-{
-aUserInterfaceFont = aConfigFont;
-break;
-}
-}
-
-if ( aUserInterfaceFont.isEmpty() )
-{
-OUString aFallbackFont ("Andale Sans UI" );
-if ( mpWindowImpl->mpFrameData->mpFontCollection->FindFontFamily( 
aFallbackFont ) )
-aUserInterfaceFont = aFallbackFont;
-}
-}
-
-if ( !bUseSystemFont && !aUserInterfaceFont.isEmpty() )
-{
-StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-vcl::Font aFont = aStyleSettings.GetAppFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetAppFont( aFont );
-aFont = aStyleSettings.GetHelpFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetHelpFont( aFont );
-aFont = aStyleSettings.GetTitleFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetTitleFont( aFont );
-aFont = aStyleSettings.GetFloatTitleFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetFloatTitleFont( aFont );
-aFont = aStyleSettings.GetMenuFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetMenuFont( aFont );
-aFont = aStyleSettings.GetToolFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetToolFont( aFont );
-aFont = aStyleSettings.GetLabelFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetLabelFont( aFont );
-aFont = aStyleSettings.GetInfoFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetInfoFont( aFont );
-aFont = aStyleSettings.GetRadioCheckFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetRadioCheckFont( aFont );
-aFont = aStyleSettings.GetPushButtonFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetPushButtonFont( aFont );
-aFont = aStyleSettings.GetFieldFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings.SetFieldFont( aFont );
-aFont = aStyleSettings.GetIconFont();
-aFont.SetName( aUserInterfaceFont );
-aStyleSettings

[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Julien Nabet]

 cui/source/options/optgdlg.cxx |   34 --
 cui/uiconfig/ui/optviewpage.ui |   16 
 2 files changed, 50 deletions(-)

New commits:
commit 324de04a408a77656a473cbfd2cc1ce77664b0c0
Author: Julien Nabet 
Date:   Fri Dec 5 13:21:36 2014 +0100

Resolves fdo#87016 Kill "Use system font for user interface" for good

Change-Id: Ica648d4a49ef4f36fdab557a98e7df9d31a3a240
Reviewed-on: https://gerrit.libreoffice.org/13311
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e68743d..e41c247 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -561,19 +561,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pWindowSizeMF, "windowsize");
 get(m_pIconSizeLB, "iconsize");
 get(m_pIconStyleLB, "iconstyle");
-get(m_pSystemFont, "systemfont");
-
-VclContainer *pRef = get("refgrid");
-//fdo#65595, we need height-for-width support here, but for now we can
-//bodge it
-Size aPrefSize(m_pSystemFont->get_preferred_size());
-Size aSize(pRef->get_preferred_size());
-if (aPrefSize.Width() > aSize.Width())
-{
-aSize = m_pSystemFont->CalcMinimumSize(aSize.Width());
-m_pSystemFont->set_width_request(aSize.Width());
-m_pSystemFont->set_height_request(aSize.Height());
-}
 
 get(m_pFontAntiAliasing, "aafont");
 get(m_pAAPointLimitLabel, "aafrom");
@@ -602,12 +589,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 // #i97672#
 m_pSelectionCB->SetToggleHdl( LINK( this, OfaViewTabPage, 
OnSelectionToggled ) );
 
-if( ! Application::ValidateSystemFont() )
-{
-m_pSystemFont->Check(false);
-m_pSystemFont->Enable(false);
-}
-
 // Set known icon themes
 OUString sAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
 m_pIconStyleLB->Clear();
@@ -826,21 +807,12 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 }
 
 SvtAccessibilityOptions aAccessibilityOptions;
-if( aAccessibilityOptions.GetIsSystemFont() != m_pSystemFont->IsChecked() 
&&
-m_pSystemFont->IsEnabled() )
-{
-aAccessibilityOptions.SetIsSystemFont( m_pSystemFont->IsChecked() );
-bModified = true;
-bMenuOptModified = true;
-}
 
 if( bMenuOptModified )
 {
 // Set changed settings to the application instance
 AllSettings aAllSettings = Application::GetSettings();
 StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
-if( m_pSystemFont->IsEnabled() )
-aStyleSettings.SetUseSystemUIFonts( m_pSystemFont->IsChecked() );
 aAllSettings.SetStyleSettings(aStyleSettings);
 Application::MergeSystemSettings( aAllSettings );
 Application::SetSettings(aAllSettings);
@@ -888,12 +860,6 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
 m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection );
 m_pIconStyleLB->SaveValue();
 
-if( m_pSystemFont->IsEnabled() )
-{
-SvtAccessibilityOptions aAccessibilityOptions;
-m_pSystemFont->Check( aAccessibilityOptions.GetIsSystemFont() );
-}
-
 // Screen Scaling
 m_pWindowSizeMF->SetValue ( pAppearanceCfg->GetScaleFactor() );
 // Mouse Snap
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index a81d736..67105b9 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -428,22 +428,6 @@
   
 
 
-  
-Use system 
_font for user interface
-True
-True
-False
-True
-True
-0
-True
-  
-  
-0
-1
-  
-
-
   
 Screen font 
antialiasin_g
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Eike Rathke]

 sc/source/filter/xml/xmlfilti.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 08f89a78e899b1f463d78fe31696418f7ba07ea7
Author: Eike Rathke 
Date:   Fri Dec 12 14:49:09 2014 +0100

resolved fdo#86809 connect filter conditions correctly

Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a
single filter stack were OR connected, regardless whether filter-and was
given in the file.

Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c
(cherry picked from commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4)
Reviewed-on: https://gerrit.libreoffice.org/13450
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/xml/xmlfilti.cxx 
b/sc/source/filter/xml/xmlfilti.cxx
index 34327eb..03cfdfd 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -178,12 +178,19 @@ bool ScXMLFilterContext::GetConnection()
 // secondary item gets the current connection.
 return rItem.mbOr;
 
+// The next condition of this stack will get the current connection.
+++rItem.mnCondCount;
+
 if (maConnStack.size() < 2)
 // There is no last stack.  Likely the first condition in the first
-// stack whose connection is not used.
-return true;
+// stack whose connection is not used.  Default in
+// ScQueryEntry::eConnect is SC_AND, so return false (AND instead of
+// OR) here. Otherwise, when saving the document again, we'd write a
+// uselessly stacked
+// 
...
+// for two conditions connected with AND.
+return false;
 
-++rItem.mnCondCount;
 std::vector::reverse_iterator itr = maConnStack.rbegin();
 ++itr;
 return itr->mbOr; // connection of the last stack.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 sw/uiconfig/swriter/ui/printmergedialog.ui |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d795be27560343929822ed189e7b88309adec166
Author: Adolfo Jayme Barrientos 
Date:   Fri Dec 12 11:20:18 2014 -0600

fdo#86671 Swap default order of Yes/No to suit what Windows users expect

Change-Id: Iac3917c42ff70b6cd594355fe5296aff97cb70b9
Reviewed-on: https://gerrit.libreoffice.org/13453
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/uiconfig/swriter/ui/printmergedialog.ui 
b/sw/uiconfig/swriter/ui/printmergedialog.ui
index cc72307..a092e26 100644
--- a/sw/uiconfig/swriter/ui/printmergedialog.ui
+++ b/sw/uiconfig/swriter/ui/printmergedialog.ui
@@ -20,10 +20,12 @@
 False
 end
 
-  
-gtk-no
+  
+gtk-yes
 True
 True
+True
+True
 True
 True
 True
@@ -35,12 +37,10 @@
   
 
 
-  
-gtk-yes
+  
+gtk-no
 True
 True
-True
-True
 True
 True
 True
@@ -76,8 +76,8 @@
   
 
 
-  no
   yes
+  no
   cancel
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/htmlexport/htmlexport.cxx|4 +-
 sw/qa/extras/rtfimport/data/fdo85179.rtf  |4 ++
 sw/qa/extras/rtfimport/data/fdo86761.rtf  |   42 ++
 sw/qa/extras/rtfimport/rtfimport.cxx  |6 +++
 writerfilter/source/dmapper/GraphicImport.cxx |3 +
 writerfilter/source/rtftok/rtfsdrimport.cxx   |2 +
 6 files changed, 58 insertions(+), 3 deletions(-)

New commits:
commit cfb770dc619fc33796b98ca900eb3fd7f714139e
Author: Miklos Vajna 
Date:   Sun Dec 14 11:13:17 2014 +0100

fdo#86761 RTF import: positive border width and fLine=0 means no border

Regression from 01a32b7d074511bed24044dc94e1159aea62722b (fdo#85179 RTF
filter: import image border, 2014-10-23), there were a number of
problems here:

- CppunitTest_sw_htmlexport: revert back to the old behavior, where in
  case there is no border, we don't set the color of it.
- The testcase of the above commit omitted fLine=1 shape property, which
  is present in the original bugdoc, and only with that should we put a
  border around the shape.
- Let fLine=1 explicitly change the line style from NONE.
- dmapper: if line style is NONE, then don't bother setting the border
  color and width.

(cherry picked from commit 4568d1d298bf4fc98dcd86384743a04587a2fe6f)

Conflicts:
writerfilter/source/dmapper/GraphicImport.cxx

Change-Id: Iffee41066d42822b699c478821645b9742df3f58
Reviewed-on: https://gerrit.libreoffice.org/13470
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 15834fe..a377195 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -122,7 +122,7 @@ DECLARE_HTMLEXPORT_TEST(testExportOfImages, 
"textAndImage.docx")
 CPPUNIT_ASSERT(pDoc);
 
 assertXPath(pDoc, "/html/body", 1);
-assertXPath(pDoc, "/html/body/p/font/img", 1);
+assertXPath(pDoc, "/html/body/p/img", 1);
 }
 
 DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled, 
"textAndImage.docx")
@@ -131,7 +131,7 @@ 
DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled, "textAndImage.do
 CPPUNIT_ASSERT(pDoc);
 
 assertXPath(pDoc, "/html/body", 1);
-assertXPath(pDoc, "/html/body/p/font/img", 0);
+assertXPath(pDoc, "/html/body/p/img", 0);
 }
 
 DECLARE_HTMLEXPORT_TEST(testSkipImageEmbedded, "skipimage-embedded.doc")
diff --git a/sw/qa/extras/rtfimport/data/fdo85179.rtf 
b/sw/qa/extras/rtfimport/data/fdo85179.rtf
index fb9bcfa..8c69d31 100644
--- a/sw/qa/extras/rtfimport/data/fdo85179.rtf
+++ b/sw/qa/extras/rtfimport/data/fdo85179.rtf
@@ -15,6 +15,10 @@
 {\sn lineWidth}
 {\sv 50800}
 }
+{\sp
+{\sn fLine}
+{\sv 1}
+}
 }
 
\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw1806\pich1806\picwgoal1024\pichgoal1024\pngblip
 
89504e470d0a1a0a000d4948445200400040080460b955000467414d41b18f0bfc610500017352474200aece1ce9
diff --git a/sw/qa/extras/rtfimport/data/fdo86761.rtf 
b/sw/qa/extras/rtfimport/data/fdo86761.rtf
new file mode 100644
index 000..f22d836
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo86761.rtf
@@ -0,0 +1,42 @@
+{\rtf1
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid3346813 
\hich\af31506\dbch\af31505\loch\f31506 Image with no border
+\par }
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 
\lang1024\langfe1024\noproof\insrsid986338\charrsid3761114
+{\*\shppict
+{\pict
+{\*\picprop\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 75}
+}
+{\sp
+{\sn fLockAgainstSelect}
+{\sv 0}
+}
+{\sp
+{\sn fLine}
+{\sv 0}
+}
+{\sp
+{\sn wzName}
+{\sv Picture 1}
+}
+}
+\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0
+\picw3598\pich4233\picwgoal2040\pichgoal2400\jpegblip\bliptag-859510685
+{\*\blipuid ccc4e863fe2f64c0500a0ae3f1b81a42}
+89504e470d0a1a0a000d4948445200400040080460b955000467414d41b18f0bfc610500017352474200aece1ce9
+00206348524d7a268084fa0080e87530ea603a9817709cba513c0002624b4744aa8d233200096f464673
+0006000c7355d30009704859730dd70dd70142289b78000976704167004c0040009d31381b01cd4944415468
+deedd93d4fc24018c0f17f89c6cdc44940e3e222be2c0e7e0417e3a8113571707632514012a320c6f84d34be2c2ec2b750f40be8e6e4a00113cfe14a5b69b108
+f4589ee71652eefafce0b9f42e3d7063822aaac3f641d173a75d3efee85b6582c0c8749c5eb7332cfb4e6f213d336ed29807304477b1c7a94db80ae9e9c934d0
+fcdd12e7ffcefcc9168f9a0059143b8cb0d2de581f609854073fbecc220f60b18722479d0d14abed8c8cb5d3293ce2949903b0d8a7047cb1c98541008cba840c
+a736e1d2200046b967567f740961d3b197008873cf74835002eaac736319ca0d4296121675d2dc1a0440d2256428625163ed2f42cf011e8245d621b42c44
+0400485261a699706d192fa100d4490713220240dc25e438b1090185880ca09f8ece5c28d9843b009e82471ca25069d5cb785529bd007fdbfb8541b65b2f
+531100947a51530d42c1d92f9829818e31ca4ce9421c70e427

[Libreoffice-commits] buildbot.git: lcov-report/lcov-report.sh

[Maarten Hoes]

 lcov-report/lcov-report.sh |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 1bd824172fb3ee780268f6f11f3ba441996e11a7
Author: Maarten Hoes 
Date:   Mon Dec 15 09:02:22 2014 +0100

Be more intelligent with 'readlink -f' for paths that dont exist yet.

Change-Id: I9575466e2705f9cbc75ab2a2a6a1209530556232
Reviewed-on: https://gerrit.libreoffice.org/13475
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/lcov-report/lcov-report.sh b/lcov-report/lcov-report.sh
index 8a20a46..20cd233 100755
--- a/lcov-report/lcov-report.sh
+++ b/lcov-report/lcov-report.sh
@@ -28,17 +28,20 @@ init()
 fi
 
 if [ -n "${SRC_DIR?}" ] ; then
+if [ "${SRC_DIR?}" = "${BUILD_DIR?}" ] ; then
+die "Cannot set the source directory to the same value as the 
build directory."
+fi
+
 if [ ! -d "${SRC_DIR?}" ] ; then
 die "Failed to locate source code directory $SRC_DIR."
+else
+SRC_DIR=$(readlink -f "${SRC_DIR?}")
 fi
 
 if [ ! -d "${SRC_DIR?}/.git" ] ; then
 die "${SRC_DIR?} is not a git repository."
 fi
 
-if [ "${SRC_DIR?}" = "${BUILD_DIR?}" ] ; then
-die "Cannot set the source directory to the same value as the 
build directory."
-fi
 fi
 
 if [ "${AFTER?}" = "TRUE" ] ; then
@@ -60,9 +63,11 @@ init()
 
 if [ ! -d "${HTML_DIR?}" ] ; then
 mkdir "${HTML_DIR?}" || die "Failed to create html directory 
${HTML_DIR?}."
+HTML_DIR=$(readlink -f "${HTML_DIR?}")
 else
 rm -rf "${HTML_DIR?}"
 mkdir "${HTML_DIR?}" || die "Failed to create html directory 
${HTML_DIR?}."
+HTML_DIR=$(readlink -f "${HTML_DIR?}")
 fi
 fi
 
@@ -83,9 +88,11 @@ init()
 if [ "${BEFORE?}" = "TRUE" ] ; then
 if [ ! -d "${TRACEFILE_DIR?}" ] ; then
 mkdir "${TRACEFILE_DIR?}" || die "Failed to create tracefile 
directory ${TRACEFILE_DIR?}."
+TRACEFILE_DIR=$(readlink -f "${TRACEFILE_DIR?}")
 else
 rm -rf "${TRACEFILE_DIR?}"
 mkdir "${TRACEFILE_DIR?}" || die "Failed to create tracefile 
directory ${TRACEFILE_DIR?}."
+TRACEFILE_DIR=$(readlink -f "${TRACEFILE_DIR?}")
 fi
 fi
 
@@ -99,9 +106,11 @@ init()
 fi
 if [ ! -d "$BUILD_DIR" ] ; then
 mkdir "$BUILD_DIR" || die "Failed to create source compile 
directory $BUILD_DIR."
+BUILD_DIR=$(readlink -f "${BUILD_DIR?}")
 else
 rm -rf "$BUILD_DIR"
 mkdir "$BUILD_DIR" || die "Failed to create source compile 
directory $BUILD_DIR."
+BUILD_DIR=$(readlink -f "${BUILD_DIR?}")
 fi
 fi
 }
@@ -219,19 +228,19 @@ fi
 while getopts ":s:t:w:C:d:abc" opt ; do
 case "$opt" in
 s)
-SRC_DIR=$(readlink -f "${OPTARG?}")
+SRC_DIR="${OPTARG?}"
 ;;
 t)
-TRACEFILE_DIR=$(readlink -f "${OPTARG?}")
+TRACEFILE_DIR="${OPTARG?}"
 ;;
 w)
-HTML_DIR=$(readlink -f "${OPTARG?}")
+HTML_DIR="${OPTARG?}"
 ;;
 c)
 SOURCE_COMPILE=TRUE
 ;;
 C)
-BUILD_DIR=$(readlink -f "${OPTARG?}")
+BUILD_DIR="${OPTARG?}"
 ;;
 b)
 BEFORE=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/layout/ssfrm.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f
Author: Caolán McNamara 
Date:   Mon Dec 15 13:27:48 2014 +

Resolves: fdo#87199 deregister during destroy as lower of upper

Change-Id: I7e52bba78a0fbe32814510b44ad049d3504e7164

diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 02f834f..f4831ed 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -367,6 +367,12 @@ void SwFrm::Destroy()
 delete mpDrawObjs;
 mpDrawObjs = 0;
 }
+
+SwLayoutFrm *pFrm = GetUpper();
+if (pFrm && pFrm->pLower == this)
+{
+pFrm->pLower = NULL;
+}
 }
 
 SwFrm::~SwFrm()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Library_merged.mk solenv/gbuild

[Matúš Kukan]

 Library_merged.mk   |   65 
 solenv/gbuild/LinkTarget.mk |5 ++
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |2 
 solenv/gbuild/platform/com_MSC_class.mk |2 
 solenv/gbuild/platform/macosx.mk|2 
 solenv/gbuild/platform/mingw.mk |2 
 6 files changed, 13 insertions(+), 65 deletions(-)

New commits:
commit 8cc1e7a7c3ec897129cc6318b254e8dafc682435
Author: Matúš Kukan 
Date:   Mon Dec 15 14:37:44 2014 +0100

gbuild: More automagic for libmerged

Only gb_Library_use_libraries stays because I think it's a good idea to see
dependent libraries (potential candidates for merging) and hopefully the
list does not change often anyway.
This commit extends b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca

Change-Id: I2682456f53cb2e8d7ea63eae15f8979a3c828401

diff --git a/Library_merged.mk b/Library_merged.mk
index 8431efc..fa2f24d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,61 +30,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,merged,\
-   $(if $(filter LINUX,$(OS)),glxtest) \
-   $(if $(filter unx,$(GUIBASE)),headless) \
-))
-
-ifeq (ALL,$(MERGELIBS))
-$(eval $(call gb_Library_use_static_libraries,merged,\
-   ulingu \
-))
-endif
-
-ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_add_libs,merged,\
-   -lX11 \
-   -lXext \
-   -lSM \
-   -lICE \
-))
-endif
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,merged,\
-   -lm \
-   -ldl \
-   -lGL \
-   -lGLU \
-   -lpthread \
-   -lrt \
-   -lX11 \
-))
-endif
-
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_system_win32_libs,merged,\
-   advapi32 \
-   gdi32 \
-   gdiplus \
-   glu32 \
-   imm32 \
-   mpr \
-   msimg32 \
-   oldnames \
-   ole32 \
-   oleaut32 \
-   opengl32 \
-   shell32 \
-   shlwapi \
-   setupapi \
-   user32 \
-   usp10 \
-   uuid \
-   version \
-   winmm \
-   winspool \
-))
 # prevent warning spamming
 $(eval $(call gb_Library_add_ldflags,merged,\
/ignore:4049 \
@@ -96,17 +42,6 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_use_libraries,merged,\
AppleRemote \
 ))
-$(eval $(call gb_Library_add_libs,merged,\
-   -lobjc \
-))
-$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
-   Carbon \
-   Cocoa \
-   CoreFoundation \
-   CoreServices \
-   OpenGL \
-   QuickTime \
-))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e59b425..948f656 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -713,6 +713,8 @@ endef
 # call gb_LinkTarget_add_libs,linktarget,libs
 define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(2)
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+  $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,merged)) : 
T_LIBS += $(2))
 
 endef
 
@@ -893,6 +895,9 @@ endef
 # call gb_LinkTarget_use_static_libraries,linktarget,staticlibs
 define gb_LinkTarget_use_static_libraries
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if 
$$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+   $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,merged)) : \
+   LINKED_STATIC_LIBS += $$(if $$(filter-out 
StaticLibrary,$$(TARGETTYPE)),$(2)))
 
 ifeq ($(DISABLE_DYNLOADING),)
 $(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call 
gb_StaticLibrary_get_target,$(lib)))
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index e17df72..df1a03a 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -136,6 +136,8 @@ endef
 
 define gb_LinkTarget_use_system_darwin_frameworks
 $(call gb_LinkTarget_add_libs,$(1),$(foreach fw,$(2),-framework $(fw)))
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+  $(call gb_LinkTarget_add_libs,$(call 
gb_Library_get_linktarget,merged),$(foreach fw,$(2),-framework $(fw
 endef
 
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 1ebd72e..7d220c5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -198,6 +198,8 @@ endef
 
 define gb_LinkTarget_use_system_win32_libs
 $(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(call 
gb_MSVCRT_subst,$(lib)).lib))
+$(if $(call gb_LinkTarget__is_merged,$(1)),\
+   $(call gb_LinkTarget_add_libs,$(call 
gb_Library_get_linktarget,merged),$(foreach lib,$(2),$(call 
gb_MSVCRT_subst,$(lib)).lib)))
 endef
 
 # Flags common for PE executables (EXEs and DLLs) 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4aa813f..62bc7cc 10064

[Libreoffice-commits] core.git: Library_merged.mk RepositoryModule_host.mk solenv/gbuild

[Matúš Kukan]

 Library_merged.mk   |   47 
 RepositoryModule_host.mk|   17 +--
 solenv/gbuild/LinkTarget.mk |   14 ++---
 3 files changed, 21 insertions(+), 57 deletions(-)

New commits:
commit b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca
Author: Matúš Kukan 
Date:   Mon Dec 15 13:49:08 2014 +0100

gbuild: Do not require gb_Library_use_externals for libmerged

Instead, automatically get the externals when parsing other makefiles.
This commit fixes the build and hopefully avoids problems in future
because people didn't know they had to add externals for libmerged too.
Similar should be done for other functions like add_libs...

Change-Id: I5aea4c43f4b6838092ada81c310ef1100f241108

diff --git a/Library_merged.mk b/Library_merged.mk
index 90f30a1..8431efc 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -35,60 +35,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\
$(if $(filter unx,$(GUIBASE)),headless) \
 ))
 
-$(eval $(call gb_Library_use_externals,merged,\
-   icu_headers \
-   icui18n \
-   icuuc \
-   boost_headers \
-   boostdatetime \
-   $(call gb_Helper_optional,DESKTOP,clucene) \
-   $(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \
-   cups \
-   curl \
-   dbus \
-   expat \
-   gconf \
-   gio \
-   glew \
-   graphite \
-   $(if $(ENABLE_GTK),gtk) \
-   harfbuzz \
-   hunspell \
-   jpeg \
-   lcms2 \
-   $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
-   libeot \
-   liblangtag \
-   libxml2 \
-   libxslt \
-   mesa_headers \
-   mythes \
-   nss3 \
-   $(call gb_Helper_optional,COLLADA2GLTF,opencollada_parser) \
-   $(call gb_Helper_optional,COLLADA2GLTF,png) \
-   telepathy \
-   zlib \
-))
-
 ifeq (ALL,$(MERGELIBS))
 $(eval $(call gb_Library_use_static_libraries,merged,\
ulingu \
 ))
-$(eval $(call gb_Library_use_externals,merged,\
-   cppunit \
-   hyphen \
-   libexslt \
-   libexttextcat \
-   $(if $(filter-out ANDROID IOS,$(OS)),openldap) \
-   $(call gb_Helper_optional,PYUNO,python) \
-))
 endif
 
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_use_externals,merged,\
-   fontconfig \
-   freetype \
-))
 $(eval $(call gb_Library_add_libs,merged,\
-lX11 \
-lXext \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a3567c4..f6a9c6e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -11,6 +11,16 @@
 
 $(eval $(call gb_Module_Module,libreoffice))
 
+# This makefile needs to be read first because some variables like T_LIBS
+# for libmerged are cleared there and then later we append stuff to it
+# through e.g. gb_Library_use_external for various libraries in libmerged.
+ifneq ($(MERGELIBS),)
+$(eval $(call gb_Module_add_targets,libreoffice,\
+   Library_merged \
+   $(if $(URELIBS),Library_urelibs) \
+))
+endif
+
 $(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
android \
@@ -155,13 +165,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
xmlsecurity \
 ))
 
-ifneq ($(MERGELIBS),)
-$(eval $(call gb_Module_add_targets,libreoffice,\
-   Library_merged \
-   $(if $(URELIBS),Library_urelibs) \
-))
-endif
-
 # Especially when building everything with symbols, the linking of the largest
 # libraries takes enormous amounts of RAM. To prevent annoying OOM 
situations
 # etc., try to prevent linking these in parallel by adding artificial build
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9478130..e59b425 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -853,6 +853,10 @@ define gb_LinkTarget__is_build_tool
 $(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(call 
gb_BUILD_HELPER_TOOLS)),$(true),$(false))
 endef
 
+define gb_LinkTarget__is_merged
+$(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_linktarget,$(lib
+endef
+
 # call gb_LinkTarget_use_libraries,linktarget,libs
 define gb_LinkTarget_use_libraries
 ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
@@ -865,7 +869,7 @@ $(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4))
 else
 $(call gb_LinkTarget__use_libraries,$(1),$(2),$(strip \
$(if $(filter $(gb_MERGEDLIBS),$(2)), \
-   $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_linktarget,$(lib, \
+   $(if $(call gb_LinkTarget__is_merged,$(1)), \
$(filter $(gb_MERGEDLIBS),$(2)), merged)) \
$(if $(filter $(gb_URELIBS),$(2)), \
$(if $(filter $(1),$(foreach lib,$(gb_URELIBS),$(call 
gb_Library_get_linktarget,$(lib, \
@@ -1328,11 +1332,15 @@ $(call gb_LinkTarget_get_target,$(1)) :| \
 endef
 
 # this forwards to functions that must be defined in RepositoryExternal

Re: proposed patch: Bug 69609 - registrymodification.xcu in presets folder not implemented in newly created profiles.

[Justin Luth]

When my co-worker wrote the extension on Feb 4, he said:  " I think it
now meets the "standards" for writing an extension.  But it was a long
hard path to get there: like stabbing in the dark."  "After much pain
and scant documentation, and a lot of trial and error (MOSTLY error) I
think it is working."  (I can't find the "by luck" statement anymore -
basically it means he didn't understand what he did to finally get it
working, and he couldn't offer me any advice when I failed later on.)

Prior to the extension, I had already identified the XML paths, and
wrote DOS and Linux scripts using xmlstarlet to adjust the system
setting files in /usr/lib/libreoffice/share/registry, so we already had
done a lot of the legwork to identify the XML stuff. XMLStarlet worked
fine for Windows, where we manually installed updates, and so could
re-run our script after each install when the system registry config was
replaced by the installer, but that approach doesn't work under Linux,
so we were forced to get extensions working.  So, our extension
struggles came after all of the config/XML basics were already
understood.  All we needed to do was simply repackage our knowledge into
an extension.

Debugging:   How can you tell what your extension is doing?  Nothing
warns you if you have a spelling mistake, invalid XML. There is zero
feedback anywhere - either you have it all right, or nothing happens.
How do you even find the setting name and the XML path?  What happens if
you don't know English, and you only know the setting name from your own
language's interface?  "July 14: tried to add “onlineupdate.xcu” to the
extension to disable automatic updates for windows computers. Failed
miserably. I hate LibreOffice's useless, inconsistent deployment
configuration and lack of documentation."   Quite honestly, I'm not sure
what my problem was on July 14 - perhaps the setting was already in my
own .xcu and so wasn't over-written by an extension.  Otherwise it was
simply an error in my thinking or coding. When I tried again on Nov 22,
it just worked immediately.

Inconsistent:  layout of XML for /usr/lib/libreoffice/share/registry is
very different from registrymodifications.xcu.
lack of documentation:  I had reviewed what documentation I could,
including Thorsten's LibreOffice configuration management.odp (which I
didn't really understand), and even tried his ooconfig - which didn't
work at all for me.

I'm not sure you can document well enough for this task.  You almost
need to build a customizing tool to create extensions if you want to
limit yourselves to the extension approach, especially if you need to
add support on how to "enforce" extension settings
(?oor:finalized="true"?) overtop of user settings.  I like to pretend
I'm a pretty good sysadmin, but the kind of effort required to dive into
the guts of LO just to do basic, automated user profile management is
way too much, and most sysadmins will bail out early like I did.  That's
why I'm really pushing this issue - especially since with very little
coding I think can show that it can be so much simpler and elegant.  All
the pieces were already in place - it only needed to be tied together.

Configuration extensions are fine for governments, and big corporation's
who can have a LO expert learn it all, but for the hundred's of small
sysadmins who have to do everything on their own, something else is needed.



On 15/12/14 14:18, Noel Grandin wrote:
>
>
> On 2014-12-15 12:37 PM, Stephan Bergmann wrote:
>>
>> An alternative would be to make it easier for the target audience to
>> achieve their goals with extensions.  That could
>> include better documentation and examples.  What were the problems
>> you encountered when trying it (what was your
>> co-workers "by luck" thing, and what was the problem adding an
>> additional change to the existing extension)?
>
> Perhaps we need an official, bundled (but off by default) extension
> that performs this job?

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

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

[Markus Mohrhard]

 sc/source/ui/dbgui/asciiopt.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 13de511e7c3c7423dbac7e8751c95cac17194b69
Author: Markus Mohrhard 
Date:   Sun Dec 14 21:03:08 2014 +0100

no separator really means no separator, fdo#83027

Change-Id: I612a46701e7447db63f38ed709e8693d0533710d
Reviewed-on: https://gerrit.libreoffice.org/13474
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index b57ed3f..931feba 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -353,8 +353,7 @@ sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const 
OUString & rFieldSeps, bo
 OUString aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, 
bMergeFieldSeps) : rFieldSeps);
 if (aFieldSeps.isEmpty())
 {
-SAL_WARN( "sc.ui", "ScAsciiOptions::GetWeightedFieldSep - no separator 
at all, using ',' comma");
-return ',';
+return 0;
 }
 else if (aFieldSeps.getLength() == 1)
 return aFieldSeps[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - android/experimental

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java  
|   17 +---
 android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java   
|6 +
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
  |   40 +-
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
 |8 ++
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
   |   12 +++
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java
 |   14 ++-
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
   |4 -
 7 files changed, 68 insertions(+), 33 deletions(-)

New commits:
commit 857f4950f5eaef17a4ec0cc9f69c215dc5d3c2f2
Author: Tomaž Vajngerl 
Date:   Mon Dec 15 21:53:19 2014 +0900

android: clear tiles when adding a new tile, various

Change-Id: Ifc6e01a1beb39187a5231019d1bf7ac816052e78

diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
index 3c6fb82..7c41db1 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
@@ -128,10 +128,12 @@ public abstract class ComposedTileLayer extends Layer {
 float newZoom = viewportMetrics.zoomFactor;
 
 if (!currentViewport.equals(newCurrentViewPort) || currentZoom != 
newZoom) {
+if (newZoom == 1.0f) {
+Log.i(LOGTAG, "Suspisious zoom 1.0");
+}
 currentViewport = newCurrentViewPort;
 currentZoom = newZoom;
 
-clearMarkedTiles();
 addNewTiles(viewportMetrics);
 markTiles(viewportMetrics);
 }
@@ -180,7 +182,7 @@ public abstract class ComposedTileLayer extends Layer {
 float zoom = getZoom(viewportMetrics);
 for (SubTile tile : tiles) {
 if (FloatUtils.fuzzyEquals(tile.id.zoom, zoom)) {
-RectF tileRect = new RectF(tile.id.x, tile.id.y, tile.id.x + 
tileSize.width, tile.id.y + tileSize.height);
+RectF tileRect = tile.id.getRect();
 if (!RectF.intersects(currentViewport, tileRect)) {
 tile.markForRemoval();
 Log.i(LOGTAG, "Mark for remove - " + currentViewport + " " 
+ tileRect);
@@ -198,6 +200,7 @@ public abstract class ComposedTileLayer extends Layer {
 }
 
 public void addTile(SubTile tile) {
+clearMarkedTiles();
 tile.beginTransaction();
 tiles.add(tile);
 }
commit 8daef3639af1d83616d455aa6f9f7757afd64d4f
Author: Tomaž Vajngerl 
Date:   Mon Dec 15 21:49:51 2014 +0900

android: skip tiles that are already outside of viewport

Change-Id: I65f286797b459f30885560577a4dcb3d1108c0bf

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 99d44cf..7888095 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -27,11 +27,13 @@ public class LOKitThread extends Thread {
 }
 
 private void tileRequest(ComposedTileLayer composedTileLayer, 
TileIdentifier tileId) {
-mLayerClient.beginDrawing();
-CairoImage image = mTileProvider.createTile(tileId.x, tileId.y, 
tileId.size, tileId.zoom);
-SubTile tile = new SubTile(image, tileId);
-composedTileLayer.addTile(tile);
-mLayerClient.endDrawing(mViewportMetrics);
+if (composedTileLayer.isStillValid(tileId)) {
+mLayerClient.beginDrawing();
+CairoImage image = mTileProvider.createTile(tileId.x, tileId.y, 
tileId.size, tileId.zoom);
+SubTile tile = new SubTile(image, tileId);
+composedTileLayer.addTile(tile);
+mLayerClient.endDrawing(mViewportMetrics);
+}
 }
 
 /** Handle the geometry change + draw. */
diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
index 221cd8d..3c6fb82 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
@@ -201,4 +201,8 @@ public abstract class ComposedTileLayer extends Layer {
 tile.beginTransaction();
 tiles.add(tile);
 }
+
+public boolean isStillValid(TileIdentifier tileId) {
+return RectF.intersects(currentViewport, tileId.getRect()) || 
currentViewport.contains(tileId.getRect());
+}
 }
\ No new

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

[Caolán McNamara]

 vcl/opengl/gdiimpl.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 580e21154196a4b1f3e48d3d4d2395d1c182c580
Author: Caolán McNamara 
Date:   Mon Dec 15 12:55:49 2014 +

-Werror=unused-but-set-variable

Change-Id: Ia65754272ff5c1661241dd503cef23c7a89b660e

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 137a84d..09ffbf6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -472,7 +472,6 @@ void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, 
long nX2, long nY2 )
 //determine angle of the line to horizontal
 double tx=0,ty=0; //core thinkness of a line
 double Rx=0,Ry=0; //fading edge of a line
-double cx=0,cy=0; //cap of a line
 double dx=x2-x1;
 double dy=y2-y1;
 if ( w < 3)
@@ -513,7 +512,6 @@ void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, 
long nX2, long nY2 )
 double L=sqrt(dx*dx+dy*dy);
 dx/=L;
 dy/=L;
-cx=-0.6*dy; cy=0.6*dx;
 tx=t*dx; ty=t*dy;
 Rx=R*dx; Ry=R*dy;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/test connectivity/qa dbaccess/qa javaunohelper/test jurt/com jurt/test jurt/workbench odk/source qadevOOo/runner qadevOOo/testdocs qadevOOo/tests sc/qa sfx2/qa

[Noel Grandin]

 bridges/test/java_uno/any/TestAny.java|   20 
--
 bridges/test/java_uno/equals/TestEquals.java  |2 -
 bridges/test/lib/TestBed.java |2 -
 bridges/test/testclient.java  |2 -
 connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java|8 

 dbaccess/qa/complex/dbaccess/DatabaseDocument.java|2 -
 javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java  |2 -
 javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java |2 -
 javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java |2 -
 jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java   |2 +
 jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java |8 

 jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java |2 -
 jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java|2 -
 odk/source/com/sun/star/lib/loader/InstallationFinder.java|2 -
 qadevOOo/runner/util/WaitUnreachable.java |1 
 qadevOOo/testdocs/qadevlibs/source/test/Job.java  |2 -
 qadevOOo/tests/java/mod/_forms/OListBoxModel.java |2 -
 qadevOOo/tests/java/mod/_forms/OTimeModel.java|4 --
 qadevOOo/tests/java/mod/_remotebridge/uno/various.java|8 

 qadevOOo/tests/java/mod/_remotebridge/various.java|   13 
--
 qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java  |2 -
 qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java  |2 -
 qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java |2 -
 sc/qa/complex/dataPilot/_XPropertySet.java|2 -
 sfx2/qa/complex/sfx2/DocumentMetadataAccess.java  |1 
 sw/qa/complex/writer/TextPortionEnumerationTest.java  |2 -
 toolkit/test/accessibility/AccessibilityTree.java |3 -
 toolkit/test/accessibility/AccessibilityWorkBench.java|3 -
 unoxml/qa/complex/unoxml/DOMTest.java |3 -
 wizards/com/sun/star/wizards/form/FormWizard.java |6 
---
 wizards/com/sun/star/wizards/query/QueryWizard.java   |5 --
 wizards/com/sun/star/wizards/report/GroupFieldHandler.java|6 
---
 wizards/com/sun/star/wizards/report/ReportWizard.java |5 --
 wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java  |2 -
 34 files changed, 19 insertions(+), 113 deletions(-)

New commits:
commit 454d9995ad7c6f865729d160814f5a9f093a
Author: Noel Grandin 
Date:   Fri Dec 12 14:05:04 2014 +0200

java: remove some unused fields and variables

Change-Id: I5d6071096307adbe7df0178000346cf915afa3e7
Reviewed-on: https://gerrit.libreoffice.org/13477
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/bridges/test/java_uno/any/TestAny.java 
b/bridges/test/java_uno/any/TestAny.java
index 752f2c3..1e1f066 100644
--- a/bridges/test/java_uno/any/TestAny.java
+++ b/bridges/test/java_uno/any/TestAny.java
@@ -2182,10 +2182,6 @@ final class TestAny {
 super(0);
 }
 
-public static Enum1 fromInt(int value) {
-return new Enum1();
-}
-
 @Override
 public boolean equals(Object obj) {
 return obj != null && obj.getClass() == Enum1.class;
@@ -2216,10 +2212,6 @@ final class TestAny {
 private static class BaseException extends com.sun.star.uno.Exception {
 public BaseException() {}
 
-private BaseException(String message) {
-super(message);
-}
-
 @Override
 public boolean equals(Object obj) {
 return obj != null && obj.getClass() == BaseException.class;
@@ -2229,10 +2221,6 @@ final class TestAny {
 private static class DerivedException extends BaseException {
 public DerivedException() {}
 
-public DerivedException(String message) {
-super(message);
-}
-
 @Override
 public boolean equals(Object obj) {
 return obj != null && obj.getClass() == DerivedException.class;
@@ -2244,10 +2232,6 @@ final class TestAny {
 {
 public BaseRuntimeException() {}
 
-private BaseRuntimeException(String message) {
-super(message);
-}
-
 @Override
 public boolean equals(Object obj) {
 return obj != null
@@ -2259,10 +2243,6 @@ final class TestAny {
 {
 public DerivedRuntimeException() {}
 
-public DerivedRuntimeException(String message) {
-super(message);
-}
-
 @Override
 public boolean equals(Objec

[Libreoffice-commits] core.git: extensions/qa forms/qa

[Noel Grandin]

 extensions/qa/integration/extensions/TestSkeleton.java |   58 -
 forms/qa/integration/forms/TestSkeleton.java   |   71 -
 2 files changed, 129 deletions(-)

New commits:
commit f8fbef265329dc2e6e153d22c0a3317fdc0789e1
Author: Noel Grandin 
Date:   Fri Dec 12 10:23:05 2014 +0200

java: remove more test skeleton code

Change-Id: I37a82554de4f77be7e0fb3e42245a70b53beb83c
Reviewed-on: https://gerrit.libreoffice.org/13476
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/extensions/qa/integration/extensions/TestSkeleton.java 
b/extensions/qa/integration/extensions/TestSkeleton.java
deleted file mode 100644
index ca77d20..000
--- a/extensions/qa/integration/extensions/TestSkeleton.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-package integration.extensions;
-
-import com.sun.star.lang.XMultiServiceFactory;
-
-public class TestSkeleton extends complexlib.ComplexTestCase
-{
-private XMultiServiceFactorym_orb;
-
-/* -- */
-@Override
-public String[] getTestMethodNames()
-{
-return new String[] {
-"checkSomething"
-};
-}
-
-/* -- */
-@Override
-public String getTestObjectName()
-{
-return "Test Skeleton";
-}
-
-/* -- */
-public void before() throws java.lang.Exception
-{
-m_orb = param.getMSF();
-}
-
-/* -- */
-public void after() throws java.lang.Exception
-{
-}
-
-/* -- */
-public void checkSomething() throws com.sun.star.uno.Exception, 
java.lang.Exception
-{
-}
-}
diff --git a/forms/qa/integration/forms/TestSkeleton.java 
b/forms/qa/integration/forms/TestSkeleton.java
deleted file mode 100644
index d0a9e09..000
--- a/forms/qa/integration/forms/TestSkeleton.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-package integration.forms;
-
-import com.sun.star.uno.Exception;
-
-public class TestSkeleton extends TestCase
-{
-/** Creates a new instance of TestSkeleton */
-public TestSkeleton()
-{
-super( DocumentType.WRITER );
-}
-
-/* -- */
-@Override
-public String[] getTestMethodNames()
-{
-return new String[] {
-"checkTestSkeleton"
-};
-}
-
-/* -- */
-@Override
-public String getTestObjectName()
-{
-return "Test Skeleton";
-}
-
-/* -- */
-public void checkTestSkeleton() throws com.sun.star.uno.Exception, 
java.lang.Exception
-{
-}
-
-/* -- */
-@Override
-public void before() throws Exception, java.lang.Exception
-{
-super.before();
-}
-
-/* -- */
-@Override
-public void after() throws Exception, jav

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/opengl

[Louis-Francis Ratté-Boulianne]

 vcl/opengl/texture.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 4dd7f8e49449f73ef597025a773f524ef54cae12
Author: Louis-Francis Ratté-Boulianne 
Date:   Tue Nov 18 00:13:30 2014 -0500

vcl: Fix crash when requesting coordonnates for empty texture

Change-Id: I424ac73f23bed5b3782c148d9242ca8fc29d200d

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index e4bc532..d727d8b 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -186,6 +186,14 @@ int OpenGLTexture::GetHeight() const
 void OpenGLTexture::GetCoord( GLfloat* pCoord, const SalTwoRect& rPosAry, bool 
bInverted ) const
 {
 SAL_INFO( "vcl.opengl", "Getting coord " << Id() << " [" << maRect.Left() 
<< "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() );
+
+if( mpImpl == NULL )
+{
+pCoord[0] = pCoord[1] = pCoord[2] = pCoord[3] = 0.0f;
+pCoord[4] = pCoord[5] = pCoord[6] = pCoord[7] = 0.0f;
+return;
+}
+
 pCoord[0] = pCoord[2] = (maRect.Left() + rPosAry.mnSrcX) / (double) 
mpImpl->mnWidth;
 pCoord[4] = pCoord[6] = (maRect.Left() + rPosAry.mnSrcX + 
rPosAry.mnSrcWidth) / (double) mpImpl->mnWidth;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Louis-Francis Ratté-Boulianne]

 vcl/opengl/texture.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 214ba32cd4d20691c8ba16b94a7ae621575839f4
Author: Louis-Francis Ratté-Boulianne 
Date:   Tue Nov 18 00:13:30 2014 -0500

vcl: Fix crash when requesting coordonnates for empty texture

Change-Id: I424ac73f23bed5b3782c148d9242ca8fc29d200d

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index e4bc532..d727d8b 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -186,6 +186,14 @@ int OpenGLTexture::GetHeight() const
 void OpenGLTexture::GetCoord( GLfloat* pCoord, const SalTwoRect& rPosAry, bool 
bInverted ) const
 {
 SAL_INFO( "vcl.opengl", "Getting coord " << Id() << " [" << maRect.Left() 
<< "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() );
+
+if( mpImpl == NULL )
+{
+pCoord[0] = pCoord[1] = pCoord[2] = pCoord[3] = 0.0f;
+pCoord[4] = pCoord[5] = pCoord[6] = pCoord[7] = 0.0f;
+return;
+}
+
 pCoord[0] = pCoord[2] = (maRect.Left() + rPosAry.mnSrcX) / (double) 
mpImpl->mnWidth;
 pCoord[4] = pCoord[6] = (maRect.Left() + rPosAry.mnSrcX + 
rPosAry.mnSrcWidth) / (double) mpImpl->mnWidth;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - bridges/source filter/source idlc/source javaunohelper/source oox/source sw/source

[Caolán McNamara]

 bridges/source/cpp_uno/shared/vtablefactory.cxx |1 
 filter/source/svg/svgexport.cxx |1 
 idlc/source/idlccompile.cxx |1 
 javaunohelper/source/preload.cxx|   16 +
 oox/source/drawingml/table/tableproperties.cxx  |6 
 sw/source/filter/ww8/ww8glsy.cxx|2 -
 sw/source/filter/ww8/ww8par.cxx |6 ++--
 sw/source/filter/ww8/ww8par2.cxx|2 -
 sw/source/filter/ww8/ww8par5.cxx|2 -
 sw/source/filter/ww8/ww8scan.cxx|   29 +++-
 sw/source/filter/ww8/ww8scan.hxx|2 -
 11 files changed, 37 insertions(+), 31 deletions(-)

New commits:
commit c96e8a174f915e46b0f0814271e53938d8f07373
Author: Caolán McNamara 
Date:   Mon Dec 15 12:17:06 2014 +

Resolves: fdo#87248 assume 0 chse means use encoding that matches lid

Change-Id: I813cc6bdc92b03bdfdd5202a85e958020a9c52c8

diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 2836518..cb60ebf 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -197,7 +197,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool 
bSaveRelFile )
 std::vector aData;
 
 rtl_TextEncoding eStructCharSet =
-WW8Fib::GetFIBCharset(pGlossary->chseTables);
+WW8Fib::GetFIBCharset(pGlossary->chseTables, pGlossary->lid);
 
 WW8ReadSTTBF(true, *xTableStream, pGlossary->fcSttbfglsy,
 pGlossary->lcbSttbfglsy, 0, eStructCharSet, aStrings, &aData );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4d24c0a..94962bc 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5001,8 +5001,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, 
const SwPosition &rPos)
 bVer67 = bVer6 || bVer7;
 bVer8  = (8 == pWwFib->nVersion);
 
-eTextCharSet = WW8Fib::GetFIBCharset(pWwFib->chse);
-eStructCharSet = WW8Fib::GetFIBCharset(pWwFib->chseTables);
+eTextCharSet = WW8Fib::GetFIBCharset(pWwFib->chse, pWwFib->lid);
+eStructCharSet = WW8Fib::GetFIBCharset(pWwFib->chseTables, pWwFib->lid);
 
 bWWBugNormal = pWwFib->nProduct == 0xc03d;
 
@@ -5568,7 +5568,7 @@ namespace
 OUString sUniPassword = QueryPasswordForMedium( rMedium );
 
 OString sPassword(OUStringToOString(sUniPassword,
-WW8Fib::GetFIBCharset(pWwFib->chseTables)));
+WW8Fib::GetFIBCharset(pWwFib->chseTables, pWwFib->lid)));
 
 sal_Int32 nLen = sPassword.getLength();
 if( nLen <= 15 )
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index bbea4c0..4929642 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4216,7 +4216,7 @@ void WW8RStyle::ImportOldFormatStyles()
 }
 
 rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(
-pIo->pWwFib->chseTables);
+pIo->pWwFib->chseTables, pIo->pWwFib->lid);
 
 sal_uInt16 cstcStd(0);
 rSt.ReadUInt16( cstcStd );
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index f5b71fb..dbc1de5 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3984,7 +3984,7 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const 
WW8Fib& rFib)
 
 pBook[1] = new WW8PLCFspecial(pTblSt,rFib.fcPlcfbkl,rFib.lcbPlcfbkl,0);
 
-rtl_TextEncoding eStructChrSet = 
WW8Fib::GetFIBCharset(rFib.chseTables);
+rtl_TextEncoding eStructChrSet = 
WW8Fib::GetFIBCharset(rFib.chseTables, rFib.lid);
 
 WW8ReadSTTBF( (7 < rFib.nVersion), *pTblSt, rFib.fcSttbfbkmk,
 rFib.lcbSttbfbkmk, 0, eStructChrSet, aBookNames );
@@ -5944,14 +5944,23 @@ bool WW8Fib::Write(SvStream& rStrm)
 return 0 == rStrm.GetError();
 }
 
-rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs)
+rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs, sal_uInt16 nLidLocale)
 {
 OSL_ENSURE(chs <= 0x100, "overflowed winword charset set");
-rtl_TextEncoding eCharSet =
-(0x0100 == chs)
-? RTL_TEXTENCODING_APPLE_ROMAN
-: rtl_getTextEncodingFromWindowsCharset( static_cast(chs) );
-return eCharSet;
+if (chs == 0x0100)
+return RTL_TEXTENCODING_APPLE_ROMAN;
+if (chs == 0 && nLidLocale != 0 && nLidLocale >= 999)
+{
+/*
+ nLidLocale:
+language stamp -- localized version In pre-WinWord 2.0 files this
+value was the nLocale. If value is < 999, then it is the nLocale,
+otherwise it is the lid.
+*/
+::com::sun::star::lang::Locale 
aLocale(LanguageTag::convertToLocale(nLidLocale));
+return msfilter::util::getBestTextEncodingFromLocale(aLocale);
+}
+return rtl_getTextEncodingFromWindowsCharset(static_cast(chs));
 }
 
 WW8Style::WW8Style(SvStream& rStream,

Re: Failing unit test in Mac OS X Yosemite 10.10.1

[Renato Ferreira]

>
>
> Each time I write such an assertion, I add a comment about what was the
> old/wrong value, so in case you get 1999 instead of 2000, you have a
> chance to judge if the old rounding error is back or in fact the 1999 vs
> 2000 is not a big difference in this case. In this case, it says "the
> image become invisible", so hopefully you can easily just manually load
> and save the document and verify if on your machine the image becomes
> invisible in Word or not. :-)
>
>
>
I tried doing this, however I'm still having trouble simulating the test. I
figured out that the export is a Word export, and if I unzip it
word/document.xml contains what I want.

However, how does the export/import/export thing works? I tried loading the
.docx, saving it as .odt and exporting again, but unless I did something
wrong, I think I ended up with the same file...

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

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

[Stephan Bergmann]

 jvmfwk/source/framework.cxx |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 8814eb4770403dc2c210feb3a3dd2b5078c27c59
Author: Stephan Bergmann 
Date:   Mon Dec 15 13:18:56 2014 +0100

Remove unused cModule leftovers

Change-Id: Id08194460e9a42896591047e36b3a95e5fbc47be

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 05dd3fd..d43423d 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -76,9 +76,8 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo 
***pparInfo, sal_Int32 *pSi
 settings.getJRELocations();
 //Use every plug-in library to get Java installations.
 typedef std::vector::const_iterator ci_pl;
-int cModule = 0;
- for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i, 
++cModule)
- {
+for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i)
+{
 const OUString & vendor = *i;
 jfw::VersionInfo versionInfo =
 aVendorSettings.getVersionInformation(vendor);
@@ -393,8 +392,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo 
**pInfo)
 //Use every vendor to get Java installations. At the first usable
 //Java the loop will break
 typedef std::vector::const_iterator ci_pl;
-int cModule = 0;
-for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i, 
++cModule)
+for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i)
 {
 const OUString & vendor = *i;
 jfw::VersionInfo versionInfo =
@@ -660,9 +658,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
 //Use every plug-in library to determine if the path represents a
 //JRE. If a plugin recognized it then the loop will break
 typedef std::vector::const_iterator ci_pl;
-int cModule = 0;
-for (ci_pl i = vecVendors.begin(); i != vecVendors.end();
- ++i, ++cModule)
+for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i)
 {
 const OUString & vendor = *i;
 jfw::VersionInfo versionInfo =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - vcl/opengl

[Luboš Luňák]

 vcl/opengl/gdiimpl.cxx |  157 +++--
 1 file changed, 138 insertions(+), 19 deletions(-)

New commits:
commit f8520e299983c5b6a0ee1720218260e8e0084c7f
Author: Luboš Luňák 
Date:   Mon Dec 15 13:05:35 2014 +0100

draw lines anti-aliased (opengl vcl)

Change-Id: I3a67da89cedbb6a58b2556abf4553857125af5a6

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 694f6d2..137a84d 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -402,33 +402,150 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
 
 void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-GLfloat pPoints[4];
+if( nX1 == nX2 || nY1 == nY2 )
+{   // horizontal/vertical, no need for AA
+GLfloat pPoints[4];
 
-pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
-pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
-pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
-pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
+pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
+pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
+pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
 
-mpProgram->SetVertices( pPoints );
-glDrawArrays( GL_LINES, 0, 2 );
-}
+mpProgram->SetVertices( pPoints );
+glDrawArrays( GL_LINES, 0, 2 );
+return;
+}
 
-void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints, const SalPoint* 
pPtAry, bool bClose )
-{
-std::vector aPoints(nPoints * 2);
-sal_uInt32 i, j;
+// Draw the line anti-aliased. Based on code with the following notice:
+/* Drawing nearly perfect 2D line segments in OpenGL
+ * You can use this code however you want.
+ * I just hope you to cite my name and the page of this technique:
+ * 
http://artgrammer.blogspot.com/2011/05/drawing-nearly-perfect-2d-line-segments.html
+ * http://www.codeproject.com/KB/openGL/gllinedraw.aspx
+ *
+ * Enjoy. Chris Tsang.*/
 
-for( i = 0, j = 0; i < nPoints; i++ )
+if( !UseProgram( "textureVertexShader", "linearGradientFragmentShader" ) )
+return;
+mpProgram->SetColorf( "start_color", mnLineColor, 0.0f );
+mpProgram->SetColorf( "end_color", mnLineColor, 1.0f );
+
+double x1 = nX1;
+double y1 = nY1;
+double x2 = nX2;
+double y2 = nY2;
+const int w = 1; // line width
+
+double t;
+double R;
+//determine parameters t,R
+switch( w )
 {
-aPoints[j++] = (2 * pPtAry[i].mnX) / GetWidth()  - 1.0f;
-aPoints[j++] = 1.0f - (2 * pPtAry[i].mnY) / GetHeight();
+case 0:
+return;
+case 1:
+t=0.05;
+R=0.768;
+break;
+case 2:
+t=0.38;
+R=1.08;
+break;
+case 3:
+t=0.96;
+R=1.08;
+break;
+case 4:
+t=1.44;
+R=1.08;
+break;
+case 5:
+t=1.9;
+R=1.08;
+break;
+default:
+t=2.5+(w-6)*0.50;
+R=1.08;
+break;
 }
 
-mpProgram->SetVertices( &aPoints[0] );
-if( bClose )
-glDrawArrays( GL_LINE_LOOP, 0, nPoints );
+//determine angle of the line to horizontal
+double tx=0,ty=0; //core thinkness of a line
+double Rx=0,Ry=0; //fading edge of a line
+double cx=0,cy=0; //cap of a line
+double dx=x2-x1;
+double dy=y2-y1;
+if ( w < 3)
+{   //approximate to make things even faster
+double m=dy/dx;
+//and calculate tx,ty,Rx,Ry
+if ( m>-0.4142 && m<=0.4142)
+{
+// -22.5< angle <= 22.5, approximate to 0 (degree)
+tx=t*0.1; ty=t;
+Rx=R*0.6; Ry=R;
+}
+else if ( m>0.4142 && m<=2.4142)
+{
+// 22.5< angle <= 67.5, approximate to 45 (degree)
+tx=t*-0.7071; ty=t*0.7071;
+Rx=R*-0.7071; Ry=R*0.7071;
+}
+else if ( m>2.4142 || m<=-2.4142)
+{
+// 67.5 < angle <=112.5, approximate to 90 (degree)
+tx=t; ty=t*0.1;
+Rx=R; Ry=R*0.6;
+}
+else if ( m>-2.4142 && m<-0.4142)
+{
+// 112.5 < angle < 157.5, approximate to 135 (degree)
+tx=t*0.7071; ty=t*0.7071;
+Rx=R*0.7071; Ry=R*0.7071;
+}
+else
+assert( false );
+}
 else
-glDrawArrays( GL_LINE_STRIP, 0, nPoints );
+{ //calculate to exact
+dx=y1-y2;
+dy=x2-x1;
+double L=sqrt(dx*dx+dy*dy);
+dx/=L;
+dy/=L;
+cx=-0.6*dy; cy=0.6*dx;
+tx=t*dx; ty=t*dy;
+Rx=R*dx; Ry=R*dy;
+}
+
+GLfloat vertices[]=
+{
+#define convertX( x ) GLfloat( (2 * (x)) / GetWidth()  - 1.0f)
+#define convertY( y ) GLfloat( 1.0f - (2 * (y)) / GetHeight())
+convertX(x1-tx-Rx), convertY(y1-ty-Ry), //fading edge1
+conve

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 160 commits - basic/source bridges/Library_cpp_uno.mk chart2/source config_host.mk.in configure.ac connectivity/source cui/source cu

[Eike Rathke]

 basic/source/runtime/methods.cxx   
|5 
 basic/source/sbx/sbxvar.cxx
|5 
 bridges/Library_cpp_uno.mk 
|8 
 chart2/source/controller/dialogs/tp_DataSource.cxx 
|   11 
 config_host.mk.in  
|1 
 configure.ac   
|   20 
 connectivity/source/drivers/hsqldb/HView.cxx   
|   81 
 connectivity/source/inc/hsqldb/HView.hxx   
|   11 
 cui/source/customize/cfg.cxx   
|   18 
 cui/source/dialogs/colorpicker.cxx 
|1 
 cui/source/tabpages/paragrph.cxx   
|2 
 cui/uiconfig/ui/areatabpage.ui 
|  194 
 cui/uiconfig/ui/eventassignpage.ui 
|   35 
 dbaccess/uiconfig/ui/queryfilterdialog.ui  
|4 
 download.lst   
|4 
 drawinglayer/source/processor2d/vclprocessor2d.cxx 
|2 
 editeng/qa/unit/core-test.cxx  
|   39 
 editeng/source/editeng/editdoc.cxx 
|2 
 editeng/source/editeng/editobj.cxx 
|   15 
 editeng/source/editeng/editundo.cxx
|2 
 editeng/source/editeng/impedit2.cxx
|2 
 editeng/source/editeng/textconv.cxx
|7 
 extensions/Executable_pluginapp.bin.mk 
|   17 
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx
|4 
 extensions/source/propctrlr/formcomponenthandler.cxx   
|   38 
 external/icu/ExternalProject_icu.mk
|2 
 external/icu/UnpackedTarball_icu.mk
|2 
 external/icu/icu4c-icu11131.patch.1
|   68 
 external/icu/icu4c-scriptrun.patch 
|   58 
 external/libmwaw/0001-initialize-image-data.patch  
|   25 
 external/libmwaw/UnpackedTarball_libmwaw.mk
|1 
 external/lpsolve/lp_solve_5.5-windows.patch
|2 
 external/python3/python-msvc-disable-sse2.patch.1  
|   11 
 filter/source/graphicfilter/ios2met/ios2met.cxx
|   29 
 filter/source/msfilter/msdffimp.cxx
|8 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx   
|   15 
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx   
|1 
 framework/source/uielement/toolbarmanager.cxx  
|   17 
 i18npool/source/localedata/data/nds_DE.xml 
|   10 
 i18npool/source/localedata/data/zh_CN.xml  
|2 
 icon-themes/galaxy/cmd/lc_wraptext.png 
|binary
 icon-themes/galaxy/cmd/sc_wraptext.png 
|binary
 icon-themes/galaxy/svx/res/fr01.png
|binary
 icon-themes/galaxy/svx/res/fr010.png   
|binary
 icon-themes/galaxy/svx/res

[Libreoffice-commits] core.git: 3 commits - include/ucbhelper offapi/com

[Miklos Vajna]

 include/ucbhelper/interactionrequest.hxx  |4 ++--
 offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl |6 --
 offapi/com/sun/star/ucb/XInteractionAuthFallback.idl  |5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ca92bb9bef9893b0791fadc4a8a665fd4315f27b
Author: Miklos Vajna 
Date:   Mon Dec 15 12:42:31 2014 +0100

Marking as published was not intentional

Change-Id: Ic0d5ed7824f4897708a81617521367af61562401

diff --git a/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl 
b/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl
index a1d4af5..3147bbb 100644
--- a/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl
+++ b/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl
@@ -18,7 +18,7 @@ module com { module sun { module star { module ucb {
 
 @since LibreOffice 4.4
 */
-published exception AuthenticationFallbackRequest: 
com::sun::star::task::ClassifiedInteractionRequest
+exception AuthenticationFallbackRequest: 
com::sun::star::task::ClassifiedInteractionRequest
 {
 /** Instructions to be followed by the user
 */
diff --git a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl 
b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
index a95022d..8431748 100644
--- a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
+++ b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
@@ -19,7 +19,7 @@
 
 @since LibreOffice 4.4
  */
-published interface XInteractionAuthFallback: 
com::sun::star::task::XInteractionContinuation
+interface XInteractionAuthFallback: 
com::sun::star::task::XInteractionContinuation
 {
 /* Authentication code submited by the user */
 void setCode( [in] string code );
commit 0c59b57b47a8d5ca3753cb03b01b5523a221b12d
Author: Miklos Vajna 
Date:   Mon Dec 15 12:42:03 2014 +0100

Missing @since tags

Change-Id: I6393e839a7aee88bb8580837db8c78550d9b6475

diff --git a/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl 
b/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl
index c92660e..a1d4af5 100644
--- a/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl
+++ b/offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl
@@ -14,7 +14,9 @@
 
 module com { module sun { module star { module ucb {
 
-/** An interaction continuation handing back some authentication data.
+/** An interaction continuation handing back some authentication data
+
+@since LibreOffice 4.4
 */
 published exception AuthenticationFallbackRequest: 
com::sun::star::task::ClassifiedInteractionRequest
 {
diff --git a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl 
b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
index f4c9a84..a95022d 100644
--- a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
+++ b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
@@ -16,6 +16,8 @@
  module com {  module sun {  module star {  module ucb {
 
 /** An interaction continuation specifying authentication success.
+
+@since LibreOffice 4.4
  */
 published interface XInteractionAuthFallback: 
com::sun::star::task::XInteractionContinuation
 {
commit 26e564db14fcb3c229d30a0d5fe232b3d768343f
Author: Miklos Vajna 
Date:   Mon Dec 15 12:37:28 2014 +0100

ucbhelper::InteractionAuthFallback::getCode() can be an implementation 
detail

Change-Id: I4967e5e12aa348692b3b954398faede843db381b

diff --git a/include/ucbhelper/interactionrequest.hxx 
b/include/ucbhelper/interactionrequest.hxx
index 0671a3a..ca86acf 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -687,8 +687,8 @@ public:
 // XAuthFallback
 virtual void SAL_CALL setCode( const OUString& code )
 throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE;
-virtual OUString SAL_CALL getCode()
-throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE;
+OUString SAL_CALL getCode()
+throw (::css::uno::RuntimeException, ::std::exception);
 
 
 };
diff --git a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl 
b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
index cf0f2ec..f4c9a84 100644
--- a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
+++ b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
@@ -21,7 +21,6 @@ published interface XInteractionAuthFallback: 
com::sun::star::task::XInteraction
 {
 /* Authentication code submited by the user */
 void setCode( [in] string code );
-string getCode( );
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: proposed patch: Bug 69609 - registrymodification.xcu in presets folder not implemented in newly created profiles.

[Noel Grandin]

On 2014-12-15 12:37 PM, Stephan Bergmann wrote:


An alternative would be to make it easier for the target audience to achieve 
their goals with extensions.  That could
include better documentation and examples.  What were the problems you 
encountered when trying it (what was your
co-workers "by luck" thing, and what was the problem adding an additional 
change to the existing extension)?


Perhaps we need an official, bundled (but off by default) extension that 
performs this job?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675
Bug 65675 depends on bug 59613, which changed state.

Bug 59613 Summary: RTL VIEWING: Increasing size of dialogs to right or bottom 
causes artifacts
https://bugs.freedesktop.org/show_bug.cgi?id=59613

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
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: include/ucbhelper

[Stephan Bergmann]

 include/ucbhelper/interactionrequest.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26fdaa2bae87f9d6079a184491be84d8def2e336
Author: Stephan Bergmann 
Date:   Mon Dec 15 12:00:11 2014 +0100

-Werror,-Winconsistent-missing-override

Change-Id: I6af9c26873154010c7384112615ca96f273e02f4

diff --git a/include/ucbhelper/interactionrequest.hxx 
b/include/ucbhelper/interactionrequest.hxx
index 2138983..0671a3a 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -686,9 +686,9 @@ public:
 
 // XAuthFallback
 virtual void SAL_CALL setCode( const OUString& code )
-throw (::css::uno::RuntimeException, ::std::exception);
+throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE;
 virtual OUString SAL_CALL getCode()
-throw (::css::uno::RuntimeException, ::std::exception);
+throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE;
 
 
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 svx/source/dialog/linkwarn.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 935bb47c1ac4d8fc0ccda475c531ff7cd9d97e35
Author: Andras Timar 
Date:   Mon Dec 15 10:19:14 2014 +0100

fdo#87292 use system dependent path instead of file URL

Change-Id: I3da4cd7af16a8ecfb19ce23e01117e735e9dd8d6
(cherry picked from commit efe3e06dd1b99215d82b6373aa7434a8f25a22f2)

diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 6ecced4..9015d1a 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 
@@ -27,7 +28,10 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* 
pParent, const OUString
 
 // replace filename
 OUString sInfoText = get_primary_text();
-sInfoText = sInfoText.replaceAll("%FILENAME", _rFileName);
+OUString aPath;
+if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( 
_rFileName, aPath ) )
+aPath = _rFileName;
+sInfoText = sInfoText.replaceAll("%FILENAME", aPath);
 set_primary_text( sInfoText );
 
 // load state of "warning on" checkbox from misc options
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: proposed patch: Bug 69609 - registrymodification.xcu in presets folder not implemented in newly created profiles.

[Stephan Bergmann]

On 12/11/2014 08:26 PM, Justin Luth wrote:

By far, the best way to manage default settings is to write a
configuration extension.  However, that is a HUGE, daunting step for
your average sysadmin to take.  Documentation is sparse, debugging
ability is non-existent, and intimate knowledge of XML in general and
LibreOffice configuration in particular is required.   The barrier to
entry is extremely high.  (I wrote it off as too difficult initially, a
co-worker implemented it successfully 'by luck', and even after that I
still failed to successfully modify our extension to add another change
and gave up after a few hours.  I finally got it right the last time I
tried.)

A popular, simpler alternative is to copy a pre-configured profile
over-top of the existing one in the user's home directory, but that kind
of scripting is annoying and unreliable (or using an /etc/skel or
Default User profile for brand-new users - but that doesn't catch
existing users).

This bug fix tries to find the middle ground approach. The barrier to
entry in this case is extremely minimal.  An administrator only needs to
know about the existence of the .../presets folder.  Then they can
simply copy a "known good" profile into that location.  They don't need
to identify the specific XML entries for the settings they want to
change, and they don't need to mess with individual's profiles or
scripting.  (The big downside compared to a config extension is that
changes can't be made after a profile already exists, but perhaps you
could get away with just deleting individual's profiles, and then they
start with a fresh one automatically.)


I'm somewhat undecided.  On the one hand, I see the demand to make 
things simple, and the proposed patch's approach does look sound 
technically.


On the other hand, we already have a well-established way to do this 
with extensions.  The presets folder and registrymodifications.xcu have 
never been advertised as modification vectors.  "Officially" introducing 
this additional way of making modifications would mean more places where 
we need to take care of backwards-compatibility going forward.


An alternative would be to make it easier for the target audience to 
achieve their goals with extensions.  That could include better 
documentation and examples.  What were the problems you encountered when 
trying it (what was your co-workers "by luck" thing, and what was the 
problem adding an additional change to the existing extension)?

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

[Libreoffice-commits] core.git: 11 commits - config_host/config_oauth2.h.in configure.ac download.lst external/libcmis include/ucbhelper offapi/com offapi/UnoApi_offapi.mk officecfg/registry svtools/s

[Miklos Vajna]

 config_host/config_oauth2.h.in   |   10 
 configure.ac |   35 +
 download.lst |2 
 external/libcmis/StaticLibrary_cmis.mk   |   19 
 external/libcmis/UnpackedTarball_cmis.mk |4 
 external/libcmis/libcmis-0.4.1-empty-path.patch  |   13 
 external/libcmis/libcmis-0.4.1-properties-fix.patch  |  280 
--
 external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch |   96 ---
 external/libcmis/libcmis-0.4.1.patch |   95 ---
 external/libcmis/libcmis-libxml2_compatibility.patch |2 
 include/ucbhelper/authenticationfallback.hxx |   52 +
 include/ucbhelper/interactionrequest.hxx |   34 +
 offapi/UnoApi_offapi.mk  |2 
 offapi/com/sun/star/ucb/AuthenticationFallbackRequest.idl|   35 +
 offapi/com/sun/star/ucb/XInteractionAuthFallback.idl |   32 +
 officecfg/registry/data/org/openoffice/Office/Common.xcu |4 
 svtools/source/dialogs/ServerDetailsControls.cxx |6 
 ucb/source/ucp/cmis/auth_provider.cxx|   48 +
 ucb/source/ucp/cmis/auth_provider.hxx|   11 
 ucb/source/ucp/cmis/cmis_content.cxx |9 
 ucb/source/ucp/cmis/cmis_repo_content.cxx|9 
 ucbhelper/Library_ucbhelper.mk   |1 
 ucbhelper/source/provider/authenticationfallback.cxx |   35 +
 ucbhelper/source/provider/interactionrequest.cxx |   56 ++
 uui/Library_uui.mk   |1 
 uui/UIConfig_uui.mk  |1 
 uui/source/authfallbackdlg.cxx   |   63 ++
 uui/source/authfallbackdlg.hxx   |   44 +
 uui/source/iahndl-authentication.cxx |   23 
 uui/source/iahndl.cxx|9 
 uui/source/iahndl.hxx|6 
 uui/uiconfig/ui/authfallback.ui  |   96 +++
 32 files changed, 640 insertions(+), 493 deletions(-)

New commits:
commit f31568f5ca97ec9765e68477e4d11c6aeba73235
Author: Miklos Vajna 
Date:   Mon Dec 15 11:05:28 2014 +0100

we need system libcmis 0.5.0 now

Change-Id: I2bbac86709669bf67fc71d08075abd4afc19525a

diff --git a/configure.ac b/configure.ac
index c1adcfa..2b1a0a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7538,7 +7538,7 @@ dnl Check for system libcmis
 dnl ===
 # libcmis requires curl and we can't build curl for iOS
 if test $_os != iOS; then
-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.0])
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.5 >= 0.5.0])
 ENABLE_CMIS=TRUE
 else
 ENABLE_CMIS=
commit 3ec288f401a1aff83ef2fd1a5ecf19a7ee855528
Author: Mihai Varga 
Date:   Sun Dec 14 12:17:04 2014 +0100

Fixed OneDrive scope to enable content access

Change-Id: I1956db7dc46e710c1fb44281afaeef6843303944

diff --git a/config_host/config_oauth2.h.in b/config_host/config_oauth2.h.in
index 72c19a8..f3616ee 100644
--- a/config_host/config_oauth2.h.in
+++ b/config_host/config_oauth2.h.in
@@ -41,7 +41,7 @@
 #define ONEDRIVE_AUTH_URL "https://login.live.com/oauth20_authorize.srf";
 #define ONEDRIVE_TOKEN_URL "https://login.live.com/oauth20_token.srf";
 #define ONEDRIVE_REDIRECT_URI "https://login.live.com/oauth20_desktop.srf";
-#define ONEDRIVE_SCOPE "wl.offline_access"
+#define ONEDRIVE_SCOPE "wl.skydrive_update wl.offline_access"
 
 #endif
 
commit fdb58084b1a6bbeb01a767048980e5172d5b819b
Author: Mihai Varga 
Date:   Mon Aug 11 13:23:53 2014 +0300

SharePoint binding settings, part 2

Change-Id: If4e08c851fd721252c0cf6ae05c85b88cd9ef8e7

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index fd51b4b..8895602 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -581,6 +581,7 @@
 http:///_vti_bin/CMISSoapwsdl.aspx
 https://www.googleapis.com/drive/v2
 https://apis.live.net/v5.0
+http:///_api/Web
   
 
 
@@ -596,6 +597,7 @@
 SharePoint 2010
 Google Drive
 OneDrive
+SharePoint 2013
   
 
   
commit ac5bdc79cde62d41b35af0fa9cc5226504928c91
Author: Mihai Varga 
Date:   Fri Aug 1 12:51:45 2014 +0300

OneDrive auth fallback dialog makefile

Change-Id: I5e759248ae5c461c7e47fefac894c314451810be

diff --g

[Libreoffice-commits] core.git: 6 commits - helpcompiler/source sc/source sd/inc sd/source svl/source svx/source

[Caolán McNamara]

 helpcompiler/source/HelpCompiler.cxx  |   18 
 sc/source/filter/lotus/tool.cxx   |4 +++
 sc/source/filter/starcalc/scflt.cxx   |3 +-
 sd/inc/sdundo.hxx |2 -
 sd/source/ui/view/drviews3.cxx|   28 +-
 svl/source/items/poolio.cxx   |7 ++
 svx/source/sidebar/area/AreaPropertyPanel.cxx |3 --
 7 files changed, 39 insertions(+), 26 deletions(-)

New commits:
commit 52a242e5bccc4307a1adcff093cfd4df7e6af101
Author: Caolán McNamara 
Date:   Mon Dec 15 09:28:51 2014 +

coverity#704777 Explicit null dereferenced

Change-Id: Ia9a3a45183b7aa8367b3146061bde5036bcd8cfe

diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 7563640..60bb645 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -33,7 +33,7 @@ public:
 : mpDoc(pSdDrawDocument)  {}
 virtual ~SdUndoAction() {}
 
-voidSetComment(OUString& rStr) { maComment = rStr; }
+voidSetComment(const OUString& rStr) { maComment = 
rStr; }
 virtual OUStringGetComment() const SAL_OVERRIDE { return 
maComment; }
 virtual SdUndoAction*   Clone() const { return NULL; }
 
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 6152834..c5da809 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -492,20 +492,14 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 const Point aPagePos( GetActiveWindow()->GetViewOrigin() );
 Size aPageSize = mpActualPage->GetSize();
 Size aViewSize = GetActiveWindow()->GetViewSize();
-SdUndoGroup* pUndoGroup = NULL;
-
-if ( rReq.GetSlot() == SID_ATTR_LONG_LRSPACE ||
- rReq.GetSlot() == SID_ATTR_LONG_ULSPACE )
-{
-pUndoGroup = new SdUndoGroup(GetDoc());
-OUString aString(SdResId(STR_UNDO_CHANGE_PAGEBORDER));
-pUndoGroup->SetComment(aString);
-}
 
 switch ( rReq.GetSlot() )
 {
 case SID_ATTR_LONG_LRSPACE:
 {
+SdUndoGroup* pUndoGroup = new SdUndoGroup(GetDoc());
+pUndoGroup->SetComment(SdResId(STR_UNDO_CHANGE_PAGEBORDER));
+
 const SvxLongLRSpaceItem& rLRSpace = static_cast(
 pArgs->Get(GetPool().GetWhich(SID_ATTR_LONG_LRSPACE)));
 
@@ -559,10 +553,17 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 }
 InvalidateWindows();
 }
+
+// give the undo group to the undo manager
+GetViewFrame()->GetObjectShell()->GetUndoManager()->
+AddUndoAction(pUndoGroup);
 break;
 }
 case SID_ATTR_LONG_ULSPACE:
 {
+SdUndoGroup* pUndoGroup = new SdUndoGroup(GetDoc());
+pUndoGroup->SetComment(SdResId(STR_UNDO_CHANGE_PAGEBORDER));
+
 const SvxLongULSpaceItem& rULSpace = static_cast(
 pArgs->Get(GetPool().GetWhich(SID_ATTR_LONG_ULSPACE)));
 
@@ -617,6 +618,11 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 }
 InvalidateWindows();
 }
+
+// give the undo group to the undo manager
+GetViewFrame()->GetObjectShell()->GetUndoManager()->
+AddUndoAction(pUndoGroup);
+
 break;
 }
 
@@ -846,10 +852,6 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 break;
 }
 }
-if ( pUndoGroup )
-// give the undo group to the undo manager
-GetViewFrame()->GetObjectShell()->GetUndoManager()->
-AddUndoAction(pUndoGroup);
 }
 
 void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
commit d03d1ad55e0ef37d922aa88a7ed23ed4f7fdca02
Author: Caolán McNamara 
Date:   Mon Dec 15 09:22:15 2014 +

coverity#704150 Resource leak in object

and

coverity#704151 Resource leak in object
coverity#704152 Resource leak in object

Change-Id: I68c455adc25375b8027236fd44d99a397e372994

diff --git a/helpcompiler/source/HelpCompiler.cxx 
b/helpcompiler/source/HelpCompiler.cxx
index a43864f..03cb4f4 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -247,9 +247,9 @@ public:
 std::string documentId;
 std::string fileName;
 std::string title;
-HashSet *hidlist;
-Hashtable *keywords;
-Stringtable *helptexts;
+std::unique_ptr hidlist;
+std::unique_ptr keywords;
+std::unique_ptr helptexts;
 private:
 HashSet extendedHelpText;
 public:
@@ -257,9 +257,9 @@ public:
 const std::string &intitle) : documentId(indocumentId), 
fileName(infileName),
 title(intitle)
 {
-hidlist = new HashSet;
-keywords = new Hashtable;
-helptexts = new Stringtable;
+hidli

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

[Takeshi Abe]

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

New commits:
commit ace8c9a8c6df3d170087844e122ad1c77338087d
Author: Takeshi Abe 
Date:   Mon Dec 15 18:27:37 2014 +0900

reality

Change-Id: I498507ad7d951a71f7be2c0d3c411756e0462f7d

diff --git a/external/cppunit/README b/external/cppunit/README
index f71c260..e1d4e82 100644
--- a/external/cppunit/README
+++ b/external/cppunit/README
@@ -1,3 +1,3 @@
 C++ port of the JUnit framework for unit testing.
 
-From [http://sourceforge.net/projects/cppunit/]
+From [http://www.freedesktop.org/wiki/Software/cppunit/]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 svx/source/dialog/linkwarn.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit efe3e06dd1b99215d82b6373aa7434a8f25a22f2
Author: Andras Timar 
Date:   Mon Dec 15 10:19:14 2014 +0100

fdo#87292 use system dependent path instead of file URL

Change-Id: I3da4cd7af16a8ecfb19ce23e01117e735e9dd8d6

diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 6ecced4..9015d1a 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 
@@ -27,7 +28,10 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* 
pParent, const OUString
 
 // replace filename
 OUString sInfoText = get_primary_text();
-sInfoText = sInfoText.replaceAll("%FILENAME", _rFileName);
+OUString aPath;
+if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( 
_rFileName, aPath ) )
+aPath = _rFileName;
+sInfoText = sInfoText.replaceAll("%FILENAME", aPath);
 set_primary_text( sInfoText );
 
 // load state of "warning on" checkbox from misc options
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 21 commits - fpicker/source hwpfilter/source oox/source package/source reportdesign/source scaddins/source sc/inc sc/qa scripting/source sc/source sdext/source sd/qa sd

[Stephan Bergmann]

 fpicker/source/office/OfficeControlAccess.cxx |2 
 hwpfilter/source/formula.cxx  |  121 
 hwpfilter/source/hwpreader.cxx| 2374 +++---
 oox/source/core/filterdetect.cxx  |   28 
 oox/source/core/xmlfilterbase.cxx |6 
 oox/source/drawingml/table/tableproperties.cxx|6 
 oox/source/drawingml/textfield.cxx|2 
 oox/source/ole/olehelper.cxx  |4 
 oox/source/ppt/animationtypes.cxx |4 
 oox/source/ppt/pptshape.cxx   |2 
 oox/source/ppt/timenodelistcontext.cxx|2 
 oox/source/vml/vmldrawing.cxx |2 
 oox/source/vml/vmlshape.cxx   |6 
 oox/source/vml/vmlshapecontext.cxx|4 
 package/source/manifest/ManifestImport.cxx|2 
 reportdesign/source/filter/xml/xmlGroup.cxx   |2 
 reportdesign/source/ui/inspection/DataProviderHandler.cxx |4 
 reportdesign/source/ui/inspection/GeometryHandler.cxx |   10 
 sc/inc/editutil.hxx   |2 
 sc/inc/miscuno.hxx|4 
 sc/qa/unit/ucalc_pivottable.cxx   |   26 
 sc/source/core/data/dptabsrc.cxx  |  110 
 sc/source/core/tool/chgtrack.cxx  |   14 
 sc/source/core/tool/compiler.cxx  |4 
 sc/source/core/tool/editutil.cxx  |4 
 sc/source/core/tool/interpr1.cxx  |   28 
 sc/source/core/tool/interpr5.cxx  |   10 
 sc/source/core/tool/rangeutl.cxx  |2 
 sc/source/filter/excel/xestyle.cxx|2 
 sc/source/filter/excel/xihelper.cxx   |2 
 sc/source/filter/xml/xmldrani.cxx |4 
 sc/source/filter/xml/xmlfilti.cxx |   24 
 sc/source/filter/xml/xmlimprt.cxx |   47 
 sc/source/filter/xml/xmlsorti.cxx |4 
 sc/source/ui/app/inputhdl.cxx |   11 
 sc/source/ui/dbgui/asciiopt.cxx   |8 
 sc/source/ui/dbgui/dbnamdlg.cxx   |2 
 sc/source/ui/dbgui/imoptdlg.cxx   |6 
 sc/source/ui/docshell/docsh.cxx   |   83 
 sc/source/ui/docshell/servobj.cxx |6 
 sc/source/ui/miscdlgs/linkarea.cxx|2 
 sc/source/ui/undo/undodat.cxx |2 
 sc/source/ui/unoobj/addruno.cxx   |   20 
 sc/source/ui/unoobj/afmtuno.cxx   |   24 
 sc/source/ui/unoobj/appluno.cxx   |   72 
 sc/source/ui/unoobj/chartuno.cxx  |8 
 sc/source/ui/unoobj/confuno.cxx   |  120 
 sc/source/ui/unoobj/dapiuno.cxx   |  112 
 sc/source/ui/unoobj/datauno.cxx   |  150 
 sc/source/ui/unoobj/defltuno.cxx  |8 
 sc/source/ui/unoobj/docuno.cxx|  146 
 sc/source/ui/unoobj/eventuno.cxx  |6 
 sc/source/ui/unoobj/filtuno.cxx   |   12 
 sc/source/ui/unoobj/fmtuno.cxx|   50 
 sc/source/ui/unoobj/linkuno.cxx   |   40 
 sc/source/ui/unoobj/shapeuno.cxx  |   40 
 sc/source/ui/unoobj/srchuno.cxx   |   52 
 sc/source/ui/unoobj/styleuno.cxx  |   12 
 sc/source/ui/unoobj/targuno.cxx   |4 
 sc/source/ui/unoobj/tokenuno.cxx  |   24 
 sc/source/ui/unoobj/viewuno.cxx   |   94 
 sc/source/ui/vba/vbachartobject.cxx   |2 
 sc/source/ui/view/formatsh.cxx|4 
 sc/source/ui/view/prevwsh.cxx |4 
 sc/source/ui/view/viewdata.cxx|   90 
 scaddins/source/analysis/analysis.cxx |4 
 scaddins/source/pricing/pricing.cxx   |   19 
 scripting/source/dlgprov/dlgevtatt.cxx|2 
 scripting/source/protocolhandler/scripthandler.cxx|4 
 scripting/source/provider/URIHelper.cxx   |8 
 sd/qa/unit/export-tests.cxx   |2 
 sd/source/filter/ppt/pptinanimations.cxx  |4 
 sd/source/ui/app/optsitem.cxx |   28 
 sd/source/ui/dlg/dlgass.cxx   |4 
 sd/source/ui/framework/fac

[Libreoffice-commits] core.git: 5 commits - chart2/source cui/source dbaccess/source filter/source forms/source

[Stephan Bergmann]

 chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx |2 
 chart2/source/view/main/DummyXShape.cxx|2 
 cui/source/customize/cfg.cxx   |   40 +--
 cui/source/dialogs/colorpicker.cxx |2 
 dbaccess/source/core/api/KeySet.cxx|2 
 dbaccess/source/core/dataaccess/ContentHelper.cxx  |6 
 dbaccess/source/core/dataaccess/databasedocument.cxx   |2 
 dbaccess/source/core/dataaccess/documentcontainer.cxx  |2 
 dbaccess/source/core/dataaccess/documentdefinition.cxx |8 
 dbaccess/source/core/misc/dsntypes.cxx |   31 +-
 dbaccess/source/filter/xml/xmlfilter.cxx   |2 
 dbaccess/source/inc/apitools.hxx   |   22 +-
 dbaccess/source/ui/browser/brwctrlr.cxx|2 
 dbaccess/source/ui/browser/genericcontroller.cxx   |4 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx |4 
 dbaccess/source/ui/dlg/sqlmessage.cxx  |4 
 dbaccess/source/ui/querydesign/querycontroller.cxx |4 
 dbaccess/source/ui/uno/unoDirectSql.cxx|4 
 dbaccess/source/ui/uno/unoadmin.cxx|4 
 filter/source/config/cache/filterfactory.cxx   |2 
 filter/source/msfilter/msvbahelper.cxx |2 
 filter/source/pdf/pdfexport.cxx|4 
 filter/source/svg/svgdialog.cxx|4 
 filter/source/svg/svgwriter.cxx|   16 -
 filter/source/t602/t602filter.cxx  |  180 -
 filter/source/xsltfilter/LibXSLTTransformer.cxx|3 
 forms/source/component/Filter.cxx  |6 
 forms/source/misc/InterfaceContainer.cxx   |8 
 forms/source/xforms/binding.cxx|2 
 29 files changed, 184 insertions(+), 190 deletions(-)

New commits:
commit 0c1b8516cb290f072e59da62198575cdbc131fce
Author: Stephan Bergmann 
Date:   Mon Dec 15 10:12:09 2014 +0100

forms: Use appropriate OUString functions on string constants

Change-Id: I196e847e2f63d1bac6ed0f520cba67508aec1a5d

diff --git a/forms/source/component/Filter.cxx 
b/forms/source/component/Filter.cxx
index 3b566e9..9e1d53e 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -800,19 +800,19 @@ namespace frm
 continue;
 }
 
-if ( pName->equalsAscii( "MessageParent" ) )
+if ( *pName == "MessageParent" )
 {
 // the message parent
 *pValue >>= m_xMessageParent;
 OSL_ENSURE( m_xMessageParent.is(), 
"OFilterControl::initialize: invalid MessageParent!" );
 }
-else if ( pName->equalsAscii( "NumberFormatter" ) )
+else if ( *pName == "NumberFormatter" )
 {
 // the number format. This argument is optional.
 *pValue >>= m_xFormatter;
 OSL_ENSURE( m_xFormatter.is(), "OFilterControl::initialize: 
invalid NumberFormatter!" );
 }
-else if ( pName->equalsAscii( "ControlModel" ) )
+else if ( *pName == "ControlModel" )
 {
 // the control model for which we act as filter control
 if ( !(*pValue >>= xControlModel ) )
diff --git a/forms/source/misc/InterfaceContainer.cxx 
b/forms/source/misc/InterfaceContainer.cxx
index e740c37..0d4ef2d 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -359,15 +359,15 @@ struct TransformEventTo52Format : public 
::std::unary_function< ScriptEventDescr
 {
 void operator()( ScriptEventDescriptor& _rDescriptor )
 {
-if ( _rDescriptor.ScriptType.equalsAscii( "StarBasic" ) )
+if ( _rDescriptor.ScriptType == "StarBasic" )
 {   // it's a starbasic macro
 sal_Int32 nPrefixLength = _rDescriptor.ScriptCode.indexOf( ':' );
 if ( 0 <= nPrefixLength )
 {   // the macro name does not already contain a :
 #ifdef DBG_UTIL
 const OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, 
nPrefixLength );
-DBG_ASSERT( sPrefix.equalsAscii( "document" )
-||  sPrefix.equalsAscii( "application" ),
+DBG_ASSERT( sPrefix == "document"
+||  sPrefix == "application",
 "TransformEventTo52Format: invalid (unknown) prefix!" 
);
 #endif
 // cut the prefix
@@ -382,7 +382,7 @@ struct TransformEventTo60Format : public 
::std::unary_function< ScriptEventDescr
 {
 void operator()( ScriptEventDescriptor& _rDescriptor )
 {
-if ( _rDescriptor.ScriptType.equalsAscii( "StarBasic" ) )
+if ( _rDescriptor.ScriptType == "StarBasic" )
 {   // it's a starbasic macro
 if ( _rDescriptor.ScriptCode

Alexander Kuvaev license statement

[Alexander Kuvaev]

Hello!
All of my past & future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.


--
Best regards,
Alexander Kuvaev
IRC: Vinatorul

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

Re: Failing unit test in Mac OS X Yosemite 10.10.1

[Stephan Bergmann]

On 12/15/2014 09:53 AM, Stephan Bergmann wrote:

21856 is what I consistently get on a 15" retina Mac, building against
10.10 SDK.


...and running on 10.10.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Failing unit test in Mac OS X Yosemite 10.10.1

[Stephan Bergmann]

On 12/13/2014 12:44 AM, Renato Ferreira wrote:

commit b1b29ae795ff86097b21907f814d94bd5488929d
Author: Stephan Bergmann mailto:sberg...@redhat.com>>
Date:   Thu Nov 20 12:06:11 2014 +0100

 ...at least, that's the value for me on Mac with retina
 Change-Id: I041b497bab9415b2b33d6b4b91f3c58ea9dbc05f

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 519ad65..96b0d0ee 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -484,9 +484,7 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel,
"crop-pixel.docx")
  // This is 17667 in the original document, was 504666 (so the
image
  // become invisible), now is around 19072.
  (void) pXmlDoc;
-#ifndef MACOSX
-CPPUNIT_ASSERT(getXPath(pXmlDoc, "//a:srcRect", "l").toInt32()
< 2);
-#endif
+CPPUNIT_ASSERT(getXPath(pXmlDoc, "//a:srcRect", "l").toInt32()
<= 21856);
  }
  }

My Mac (Retina 13") gives the value 22452, but I'm not able to tell
which value is "valid", or on which Mac with retina the other value was
produced. Does anybody else use OS X Yosemite here?


21856 is what I consistently get on a 15" retina Mac, building against 
10.10 SDK.


And as 21856 appears be be reasonably close still to 17667, at least in 
comparison to 504666, I thought I give that commit a try as an 
improvement over the blunt 
 
"disable specific oox_export unit for macosx," without further insight 
into why values actually differ though.

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

Re: gtktiledviewer

[Stephan Bergmann]

On 12/13/2014 09:40 AM, Juergen Funk Mailinglist wrote:

I make tests with the gtktiledviewer, and now the application start but it 
doesn't show the content of the given document, on Linux.

In the past it would be work, but now nothing what is wrong?


With a current master build on Linux x86-64,


bin/run gtktiledviewer $PWD/instdir/program ~/Documents/test.odt


shows the document for me allright.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Failing unit test in Mac OS X Yosemite 10.10.1

[Miklos Vajna]

Hi,

On Fri, Dec 12, 2014 at 06:52:03PM -0500, Kohei Yoshida 
 wrote:
> > Test name: testCropPixel::Import_Export_Import
> > assertion failed
> > - Expression: getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() <= 21856
> ...
> > 
> > My Mac (Retina 13") gives the value 22452, but I'm not able to tell
> > which value is "valid", or on which Mac with retina the other value
> > was produced. Does anybody else use OS X Yosemite here?
> 
> I do, and I'm getting exactly the same thing.  Every time.

Strange, as on tinderbox complains. Anyway, the problem is not specific
to Writer, it affects Calc and Impress as well, see commit
e16b01a9e4e111b1267c4eec1f5d168e5c2b8e53 (it's the shared drawingML
export code).

> Usually, each import export test has an associated file you can open,
> then by comparing the content of the file and the code in the test, one
> can perhaps make a best effort guess of what the test expects, and what
> expectation is incorrect and/or whether there is a real bug in it...

Each time I write such an assertion, I add a comment about what was the
old/wrong value, so in case you get 1999 instead of 2000, you have a
chance to judge if the old rounding error is back or in fact the 1999 vs
2000 is not a big difference in this case. In this case, it says "the
image become invisible", so hopefully you can easily just manually load
and save the document and verify if on your machine the image becomes
invisible in Word or not. :-)

Thanks,

Miklos


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

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

[Noel Grandin]

 sd/source/filter/ppt/pptin.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 97c573036a3071bd03726905e6902979ccd32a47
Author: Noel Grandin 
Date:   Mon Dec 15 09:54:15 2014 +0200

-Werror,-Wswitch

Change-Id: Icbf6fa0ef02d7d8329839d7967e7e45d3e9f2b77

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index f8c17c5..70a8ba0 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1067,6 +1067,7 @@ bool ImplSdPPTImport::Import()
 case PptPlaceholder::VERTICALTEXTBODY :
 eAutoLayout = 
AUTOLAYOUT_TITLE_VERTICAL_OUTLINE;
 break;
+default: break;
 }
 }
 break;
@@ -2151,6 +2152,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 case PptPlaceholder::MASTERSLIDENUMBER :ePresKind = 
PRESOBJ_SLIDENUMBER;break;
 case PptPlaceholder::MASTERFOOTER : ePresKind = 
PRESOBJ_FOOTER; break;
 case PptPlaceholder::MASTERHEADER : ePresKind = 
PRESOBJ_HEADER; break;
+default: break;
 }
 }
 switch ( pTextObj->GetDestinationInstance() )
@@ -2328,6 +2330,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 case PptPlaceholder::TABLE : 
ePresObjKind = PRESOBJ_TABLE; break;
 case PptPlaceholder::CLIPART : 
ePresObjKind = PRESOBJ_GRAPHIC; break;
 case 
PptPlaceholder::ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break;
+default: break;
 }
 }
 };
@@ -2346,6 +2349,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj* pObj
 case PptPlaceholder::TABLE : ePresObjKind = 
PRESOBJ_CALC; break;
 case PptPlaceholder::CLIPART : ePresObjKind = 
PRESOBJ_GRAPHIC; break;
 case PptPlaceholder::ORGANISZATIONCHART : 
ePresObjKind = PRESOBJ_ORGCHART; break;
+default: break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/inc/paratr.hxx |2 ++
 sw/source/core/doc/textboxhelper.cxx  |3 ---
 sw/source/core/docnode/nodedump.cxx   |4 +++-
 sw/source/core/para/paratr.cxx|9 +
 sw/source/filter/ww8/docxsdrexport.cxx|6 --
 sw/source/filter/ww8/docxtablestyleexport.cxx |1 -
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   10 --
 sw/source/filter/ww8/rtfexport.cxx|8 
 writerfilter/source/filter/RtfFilter.cxx  |1 -
 9 files changed, 14 insertions(+), 30 deletions(-)

New commits:
commit 0f18e9de72c9e2ba7507a881bbf279eab420cdbc
Author: Miklos Vajna 
Date:   Mon Dec 15 08:55:32 2014 +0100

Unused includes

Change-Id: I84e475a64cf09e4eeea524b73f8febf7f0a1a46b

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index d0c99df..d447b5b 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -26,9 +26,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 
 #include 
 #include 
@@ -38,7 +36,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 3e86967..9b05166 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -10,10 +10,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -21,14 +17,12 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx 
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 23757dd..53194d1 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -13,7 +13,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace com::sun::star;
 using namespace oox;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index ea0bd99..d6e6115 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -23,15 +23,12 @@
 #include "writerwordglue.hxx"
 #include "ww8par.hxx"
 #include "fmtcntnt.hxx"
-#include "fchrfmt.hxx"
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -44,8 +41,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -55,11 +50,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -68,8 +60,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index fc7acc1..7cdd3da 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -27,19 +27,12 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -49,7 +42,6 @@
 #include 
 #include 
 #include 
-#include 
 #if OSL_DEBUG_LEVEL > 1
 #include 
 #endif
diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index aaa533c..1eba5b6 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
commit a741f682a74a2b43310edf606d8ed12ea0436151
Author: Miklos Vajna 
Date:   Mon Dec 15 08:55:25 2014 +0100

Factor out SwNumRuleItem::dumpAsXml() from nodedump

Change-Id: I893d358f8a842e19248cfeb151170ed2872c3dae

diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 53492fa..b94acc8 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -168,6 +168,8 @@ public:
 
 virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId ) const SAL_OVERRIDE;
 virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId ) SAL_OVERRIDE;
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 class SwParaConnectBorderItem : public SfxBoolItem
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 7104951..877a41f 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -410,6 +410,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 case RES_PARATR_OUTLINELEVEL:
 static_cast(pItem)->dumpAsXml(writer);
 break;
+case RES_PARATR_NUMRULE:
+static_cast(pItem)->dumpAsXml(writer);
+b