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

[Chr . Rossmanith]

 svgio/source/svgreader/svgstyleattributes.cxx |6 +++---
 svgio/source/svgreader/svgtools.cxx   |4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 82a1d75ee59c46e6bb361b98c520cc4eff2e770c
Author: Chr. Rossmanith 
Date:   Wed Jun 19 22:25:24 2013 +0200

fdo#43460: Use isEmpty() instead of getLength() in svgio

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

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index c8dc5c4..d9e99e5 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1199,7 +1199,7 @@ namespace svgio
 
 if(pNode)
 {
-if(SVGTokenLinearGradient == pNode->getType() || 
SVGTokenRadialGradient  == pNode->getType())
+if(SVGTokenLinearGradient == pNode->getType() || 
SVGTokenRadialGradient == pNode->getType())
 {
 setSvgGradientNodeFill(static_cast< const 
SvgGradientNode* >(pNode));
 }
@@ -1790,7 +1790,7 @@ namespace svgio
 // style="display:none"
 // taken from a svg example; this needs to be parsed and 
set at the owning node. Do not call
 // mrOwner.parseAttribute(...) here, this would lead to a 
recursion
-if(aContent.getLength())
+if(!aContent.isEmpty())
 {
 mrOwner.setDisplay(getDisplayFromContent(aContent));
 }
@@ -1798,7 +1798,7 @@ namespace svgio
 }
 case SVGTokenBaselineShift:
 {
-if(aContent.getLength())
+if(!aContent.isEmpty())
 {
 static rtl::OUString 
aStrSub(rtl::OUString::createFromAscii("sub"));
 static rtl::OUString 
aStrSuper(rtl::OUString::createFromAscii("super"));
diff --git a/svgio/source/svgreader/svgtools.cxx 
b/svgio/source/svgreader/svgtools.cxx
index 7607a43..47b6e49 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -1169,9 +1169,7 @@ namespace svgio
 
 bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, 
OUString& rURL)
 {
-const sal_Int32 nLen(rCandidate.getLength());
-
-if(nLen)
+if( !rCandidate.isEmpty() )
 {
 basegfx::BColor aColor;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 formula/inc/formula/FormulaCompiler.hxx |4 ++--
 formula/source/core/api/FormulaCompiler.cxx |   14 +++---
 formula/source/core/api/token.cxx   |   11 +--
 sc/inc/compiler.hxx |4 +---
 sc/source/core/tool/token.cxx   |2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit a19db54f78720dc8200b3504e84cd19d445f4d18
Author: Eike Rathke 
Date:   Mon Jul 1 23:54:28 2013 +0200

resolved fdo#35411 redefined MAXCODE 512 to FORMULA_MAXTOKENS 8192

Also renamed MAXJUMPCOUNT to FORMULA_MAXJUMPCOUNT but without changing
the value as the runtime array size of ocChose depends on it, should be
changed before.

Eliminated the duplicated and error causing redefinition of both in
sc/inc/compiler.hxx

Change-Id: I0e87d1439c9564a4f475fcb2870ab51c3b586942
(cherry picked from commit 9c1ca6dca3b553c302a635357e33591605343b99)
Reviewed-on: https://gerrit.libreoffice.org/4668
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/formula/inc/formula/FormulaCompiler.hxx 
b/formula/inc/formula/FormulaCompiler.hxx
index 85295b2..01bf38d 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -36,8 +36,8 @@
 #include "formula/ExternalReferenceHelper.hxx"
 
 
-#define MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */
-#define MAXCODE  512/* maximum number of tokens in formula */
+#define FORMULA_MAXJUMPCOUNT32  /* maximum number of jumps (ocChose) */
+#define FORMULA_MAXTOKENS 8192  /* maximum number of tokens in formula */
 
 
 namespace com { namespace sun { namespace star {
diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 16b3fd5..5d38e6e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1194,7 +1194,7 @@ void FormulaCompiler::Factor()
 pFacToken->GetJump()[ 0 ] = 3;  // if, else, behind
 break;
 case ocChose:
-pFacToken->GetJump()[ 0 ] = MAXJUMPCOUNT+1;
+pFacToken->GetJump()[ 0 ] = FORMULA_MAXJUMPCOUNT + 1;
 break;
 case ocIfError:
 case ocIfNA:
@@ -1224,7 +1224,7 @@ void FormulaCompiler::Factor()
 nJumpMax = 3;
 break;
 case ocChose:
-nJumpMax = MAXJUMPCOUNT;
+nJumpMax = FORMULA_MAXJUMPCOUNT;
 break;
 case ocIfError:
 case ocIfNA:
@@ -1235,7 +1235,7 @@ void FormulaCompiler::Factor()
 SAL_WARN( "formula.core", "FormulaCompiler::Factor: forgot 
to add a jump max case?");
 }
 short nJumpCount = 0;
-while ( (nJumpCount < (MAXJUMPCOUNT - 1)) && (eOp == ocSep)
+while ( (nJumpCount < (FORMULA_MAXJUMPCOUNT - 1)) && (eOp == ocSep)
 && (!pArr->GetCodeError() || bIgnoreErrors) )
 {
 if ( ++nJumpCount <= nJumpMax )
@@ -1261,7 +1261,7 @@ void FormulaCompiler::Factor()
 bLimitOk = (nJumpCount <= 3);
 break;
 case ocChose:
-bLimitOk = (nJumpCount < MAXJUMPCOUNT); /* TODO: 
check, really <, not <=? */
+bLimitOk = (nJumpCount < FORMULA_MAXJUMPCOUNT); /* 
TODO: check, really <, not <=? */
 break;
 case ocIfError:
 case ocIfNA:
@@ -1545,7 +1545,7 @@ bool FormulaCompiler::CompileTokenArray()
 pArr->nRefs = 0;// count from start
 pArr->DelRPN();
 pStack = NULL;
-FormulaToken* pData[ MAXCODE ];
+FormulaToken* pData[ FORMULA_MAXTOKENS ];
 pCode = pData;
 bool bWasForced = pArr->IsRecalcModeForced();
 if ( bWasForced )
@@ -1950,9 +1950,9 @@ OpCode FormulaCompiler::NextToken()
 }
 void FormulaCompiler::PutCode( FormulaTokenRef& p )
 {
-if( pc >= MAXCODE-1 )
+if( pc >= FORMULA_MAXTOKENS - 1 )
 {
-if ( pc == MAXCODE-1 )
+if ( pc == FORMULA_MAXTOKENS - 1 )
 {
 p = new FormulaByteToken( ocStop );
 p->IncRef();
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index f6110e7c..480ee67 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -29,7 +29,6 @@
 #include "formula/tokenarray.hxx"
 #include "formula/FormulaCompiler.hxx"
 #include 
-#define MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */
 
 namespace formula
 {
@@ -716,8 +715,8 @@ FormulaToken* FormulaTokenArray::MergeArray( )
 FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 {
 if( !pCode )
-pCode = new FormulaToken*[ MAXCODE ];
-if( nLe

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

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx |   14 +++---
 formula/source/core/api/token.cxx   |   11 +--
 include/formula/FormulaCompiler.hxx |4 ++--
 sc/inc/compiler.hxx |4 +---
 sc/source/core/tool/token.cxx   |2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 1698abe554b0a657899b17381822efa4c46a8ca3
Author: Eike Rathke 
Date:   Mon Jul 1 23:54:28 2013 +0200

resolved fdo#35411 redefined MAXCODE 512 to FORMULA_MAXTOKENS 8192

Also renamed MAXJUMPCOUNT to FORMULA_MAXJUMPCOUNT but without changing
the value as the runtime array size of ocChose depends on it, should be
changed before.

Eliminated the duplicated and error causing redefinition of both in
sc/inc/compiler.hxx

Change-Id: I0e87d1439c9564a4f475fcb2870ab51c3b586942
(cherry picked from commit 9c1ca6dca3b553c302a635357e33591605343b99)
Reviewed-on: https://gerrit.libreoffice.org/4667
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 514d11c..afd6746 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1195,7 +1195,7 @@ void FormulaCompiler::Factor()
 pFacToken->GetJump()[ 0 ] = 3;  // if, else, behind
 break;
 case ocChose:
-pFacToken->GetJump()[ 0 ] = MAXJUMPCOUNT+1;
+pFacToken->GetJump()[ 0 ] = FORMULA_MAXJUMPCOUNT + 1;
 break;
 case ocIfError:
 case ocIfNA:
@@ -1225,7 +1225,7 @@ void FormulaCompiler::Factor()
 nJumpMax = 3;
 break;
 case ocChose:
-nJumpMax = MAXJUMPCOUNT;
+nJumpMax = FORMULA_MAXJUMPCOUNT;
 break;
 case ocIfError:
 case ocIfNA:
@@ -1236,7 +1236,7 @@ void FormulaCompiler::Factor()
 SAL_WARN( "formula.core", "FormulaCompiler::Factor: forgot 
to add a jump max case?");
 }
 short nJumpCount = 0;
-while ( (nJumpCount < (MAXJUMPCOUNT - 1)) && (eOp == ocSep)
+while ( (nJumpCount < (FORMULA_MAXJUMPCOUNT - 1)) && (eOp == ocSep)
 && (!pArr->GetCodeError() || bIgnoreErrors) )
 {
 if ( ++nJumpCount <= nJumpMax )
@@ -1262,7 +1262,7 @@ void FormulaCompiler::Factor()
 bLimitOk = (nJumpCount <= 3);
 break;
 case ocChose:
-bLimitOk = (nJumpCount < MAXJUMPCOUNT); /* TODO: 
check, really <, not <=? */
+bLimitOk = (nJumpCount < FORMULA_MAXJUMPCOUNT); /* 
TODO: check, really <, not <=? */
 break;
 case ocIfError:
 case ocIfNA:
@@ -1546,7 +1546,7 @@ bool FormulaCompiler::CompileTokenArray()
 pArr->nRefs = 0;// count from start
 pArr->DelRPN();
 pStack = NULL;
-FormulaToken* pData[ MAXCODE ];
+FormulaToken* pData[ FORMULA_MAXTOKENS ];
 pCode = pData;
 bool bWasForced = pArr->IsRecalcModeForced();
 if ( bWasForced )
@@ -1951,9 +1951,9 @@ OpCode FormulaCompiler::NextToken()
 }
 void FormulaCompiler::PutCode( FormulaTokenRef& p )
 {
-if( pc >= MAXCODE-1 )
+if( pc >= FORMULA_MAXTOKENS - 1 )
 {
-if ( pc == MAXCODE-1 )
+if ( pc == FORMULA_MAXTOKENS - 1 )
 {
 p = new FormulaByteToken( ocStop );
 p->IncRef();
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index b341cdc..9ea036c 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -29,7 +29,6 @@
 #include "formula/tokenarray.hxx"
 #include "formula/FormulaCompiler.hxx"
 #include 
-#define MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */
 
 namespace formula
 {
@@ -726,8 +725,8 @@ FormulaToken* FormulaTokenArray::MergeArray( )
 FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 {
 if( !pCode )
-pCode = new FormulaToken*[ MAXCODE ];
-if( nLen < MAXCODE-1 )
+pCode = new FormulaToken*[ FORMULA_MAXTOKENS ];
+if( nLen < FORMULA_MAXTOKENS - 1 )
 {
 CheckToken(*t);
 pCode[ nLen++ ] = t;
@@ -742,7 +741,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 else
 {
 t->Delete();
-if ( nLen == MAXCODE-1 )
+if ( nLen == FORMULA_MAXTOKENS - 1 )
 {
 t = new FormulaByteToken( ocStop );
 pCode[ nLen++ ] = t;
@@ -1194,11 +1193,11 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp )
 case ocIfNA:
 case ocChose:
 {
-short nJump[MAXJU

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

[Kohei Yoshida]

 sc/inc/column.hxx |1 
 sc/inc/formulacell.hxx|6 
 sc/inc/formularesult.hxx  |2 
 sc/inc/token.hxx  |   13 --
 sc/source/core/data/column.cxx|   56 +++-
 sc/source/core/data/formulacell.cxx   |   14 ++
 sc/source/core/tool/formularesult.cxx |   12 +
 sc/source/core/tool/interpr1.cxx  |  219 --
 sc/source/core/tool/token.cxx |   12 +
 9 files changed, 282 insertions(+), 53 deletions(-)

New commits:
commit 170c957cef174aac6a727ff15b67a49f96fa80f7
Author: Kohei Yoshida 
Date:   Tue Jul 2 01:12:27 2013 -0400

COUNT should skip formula cells with error.

Change-Id: I829eaf309056403f77949526877888315a2ad720

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 7df7335..9ade34f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -201,6 +201,7 @@ public:
 // display as empty string if formula::svEmptyCell result
 boolIsEmptyDisplayedAsString();
 boolIsValue();  // also true if formula::svEmptyCell
+bool IsValueNoError();
 boolIsHybridValueCell(); // for cells after import to deal 
with inherited number formats
 double  GetValue();
 double  GetValueAlways();   // ignore errors
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index e215daf..fdb5d31 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -130,6 +130,8 @@ public:
 details instead. */
 bool IsValue() const;
 
+bool IsValueNoError() const;
+
 /** Determines whether or not the result is a string containing more than
 one paragraph */
 bool IsMultiline() const;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ca5c7ae..7843f7c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -511,7 +511,7 @@ public:
 for (; it != itEnd; ++it)
 {
 ScFormulaCell& rCell = const_cast(**it);
-if (rCell.IsValue())
+if (rCell.IsValueNoError())
 ++mnCount;
 }
 }
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 96470e3..523995b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1726,6 +1726,15 @@ bool ScFormulaCell::IsValue()
 return aResult.IsValue();
 }
 
+bool ScFormulaCell::IsValueNoError()
+{
+MaybeInterpret();
+if (pCode->GetCodeError())
+return false;
+
+return aResult.IsValueNoError();
+}
+
 bool ScFormulaCell::IsHybridValueCell()
 {
 return aResult.GetType() == formula::svHybridValueCell;
diff --git a/sc/source/core/tool/formularesult.cxx 
b/sc/source/core/tool/formularesult.cxx
index 6052e66..baeef1d 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -265,6 +265,18 @@ bool ScFormulaResult::IsValue() const
 return isValue(GetCellResultType());
 }
 
+bool ScFormulaResult::IsValueNoError() const
+{
+switch (GetCellResultType())
+{
+case formula::svDouble:
+case formula::svEmptyCell:
+case formula::svHybridValueCell:
+return true;
+}
+return false;
+}
+
 bool ScFormulaResult::IsMultiline() const
 {
 if (meMultiline == MULTILINE_UNKNOWN)
commit b4ccd08f65e7236eca70651a6ee4169b4a980ccc
Author: Kohei Yoshida 
Date:   Tue Jul 2 00:51:10 2013 -0400

Re-implement SUM function to make use of new cell storage.

And fix a bug in my new COUNT function, where I forgot to tally numeric
formula cells.

Change-Id: I52d26be3e48f646f656821066e23594d52f78c6d

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 2630f6e..bde6e3d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -402,6 +402,7 @@ public:
 voidClearSelectionItems( const sal_uInt16* pWhich, const 
ScMarkData& rMark );
 voidChangeSelectionIndent( bool bIncrement, const ScMarkData& 
rMark );
 
+double SumNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW nRow1, 
SCROW nRow2 ) const;
 size_t CountNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW nRow1, 
SCROW nRow2 ) const;
 
 long GetNeededSize(
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index b15d090..ca5c7ae 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -468,18 +468,57 @@ void ScColumn::ChangeSelectionIndent( bool bIncrement, 
const ScMarkData& rMark )
 
 namespace {
 
+class NumericCellAccumulator
+{
+double mfSum;
+public:
+NumericCellAccumulator() : mfSum(0.0) {}
+
+void operator() (size_t, double fVal)
+{
+mfSum += fVal;
+}
+
+void operator() (size_t, const ScFormulaCell* pCell)
+{
+ScFormulaCell& rCell = const_cast(

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/formulacell.hxx|1 +
 sc/inc/formularesult.hxx  |2 ++
 sc/source/core/data/column.cxx|2 +-
 sc/source/core/data/formulacell.cxx   |9 +
 sc/source/core/tool/formularesult.cxx |   12 
 5 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit b82237c146284c3e3d88a30552eb820be071fbca
Author: Kohei Yoshida 
Date:   Tue Jul 2 01:12:27 2013 -0400

COUNT should skip formula cells with error.

Change-Id: I829eaf309056403f77949526877888315a2ad720

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index a63025c..52a1474 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -202,6 +202,7 @@ public:
 // display as empty string if formula::svEmptyCell result
 boolIsEmptyDisplayedAsString();
 boolIsValue();  // also true if formula::svEmptyCell
+bool IsValueNoError();
 boolIsHybridValueCell(); // for cells after import to deal 
with inherited number formats
 double  GetValue();
 double  GetValueAlways();   // ignore errors
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 6736a10..f1f7b5d 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -128,6 +128,8 @@ public:
 details instead. */
 bool IsValue() const;
 
+bool IsValueNoError() const;
+
 /** Determines whether or not the result is a string containing more than
 one paragraph */
 bool IsMultiline() const;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 64aae03..61f57ab 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -511,7 +511,7 @@ public:
 for (; it != itEnd; ++it)
 {
 ScFormulaCell& rCell = const_cast(**it);
-if (rCell.IsValue())
+if (rCell.IsValueNoError())
 ++mnCount;
 }
 }
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 1e86cfc..a129726 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1711,6 +1711,15 @@ bool ScFormulaCell::IsValue()
 return aResult.IsValue();
 }
 
+bool ScFormulaCell::IsValueNoError()
+{
+MaybeInterpret();
+if (pCode->GetCodeError())
+return false;
+
+return aResult.IsValueNoError();
+}
+
 bool ScFormulaCell::IsHybridValueCell()
 {
 return aResult.GetType() == formula::svHybridValueCell;
diff --git a/sc/source/core/tool/formularesult.cxx 
b/sc/source/core/tool/formularesult.cxx
index a20963b..72944a0 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -265,6 +265,18 @@ bool ScFormulaResult::IsValue() const
 return isValue(GetCellResultType());
 }
 
+bool ScFormulaResult::IsValueNoError() const
+{
+switch (GetCellResultType())
+{
+case formula::svDouble:
+case formula::svEmptyCell:
+case formula::svHybridValueCell:
+return true;
+}
+return false;
+}
+
 bool ScFormulaResult::IsMultiline() const
 {
 if (meMultiline == MULTILINE_UNKNOWN)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx   |1 
 sc/inc/formulacell.hxx  |5 
 sc/inc/token.hxx|   13 --
 sc/source/core/data/column.cxx  |   56 -
 sc/source/core/data/formulacell.cxx |5 
 sc/source/core/tool/interpr1.cxx|  219 ++--
 sc/source/core/tool/token.cxx   |   12 +
 7 files changed, 258 insertions(+), 53 deletions(-)

New commits:
commit e603b646f3cd4f0b7ffbf6aa206f476923d2a3ff
Author: Kohei Yoshida 
Date:   Tue Jul 2 00:51:10 2013 -0400

Re-implement SUM function to make use of new cell storage.

And fix a bug in my new COUNT function, where I forgot to tally numeric
formula cells.

Change-Id: I52d26be3e48f646f656821066e23594d52f78c6d

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7ce53ad..359b8ac 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -409,6 +409,7 @@ public:
 voidClearSelectionItems( const sal_uInt16* pWhich, const 
ScMarkData& rMark );
 voidChangeSelectionIndent( bool bIncrement, const ScMarkData& 
rMark );
 
+double SumNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW nRow1, 
SCROW nRow2 ) const;
 size_t CountNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW nRow1, 
SCROW nRow2 ) const;
 
 long GetNeededSize(
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8d3f625..64aae03 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -468,18 +468,57 @@ void ScColumn::ChangeSelectionIndent( bool bIncrement, 
const ScMarkData& rMark )
 
 namespace {
 
+class NumericCellAccumulator
+{
+double mfSum;
+public:
+NumericCellAccumulator() : mfSum(0.0) {}
+
+void operator() (size_t, double fVal)
+{
+mfSum += fVal;
+}
+
+void operator() (size_t, const ScFormulaCell* pCell)
+{
+ScFormulaCell& rCell = const_cast(*pCell);
+if (rCell.IsValue())
+mfSum += rCell.GetValue();
+}
+
+double getSum() const { return mfSum; }
+};
+
 class NumericCellCounter
 {
 size_t mnCount;
 public:
 NumericCellCounter() : mnCount(0) {}
 
-void operator() (const sc::CellStoreType::value_type& rNode, size_t 
/*nOffset*/, size_t nDataSize)
+void operator() (const sc::CellStoreType::value_type& rNode, size_t 
nOffset, size_t nDataSize)
 {
-if (rNode.type != sc::element_type_numeric)
-return;
-
-mnCount += nDataSize;
+switch (rNode.type)
+{
+case sc::element_type_numeric:
+mnCount += nDataSize;
+break;
+case sc::element_type_formula:
+{
+sc::formula_block::const_iterator it = 
sc::formula_block::begin(*rNode.data);
+std::advance(it, nOffset);
+sc::formula_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+for (; it != itEnd; ++it)
+{
+ScFormulaCell& rCell = const_cast(**it);
+if (rCell.IsValue())
+++mnCount;
+}
+}
+break;
+default:
+;
+}
 }
 
 size_t getCount() const { return mnCount; }
@@ -487,6 +526,13 @@ public:
 
 }
 
+double ScColumn::SumNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW 
nRow1, SCROW nRow2 ) const
+{
+NumericCellAccumulator aFunc;
+rPos.miCellPos = sc::ParseFormulaNumeric(rPos.miCellPos, maCells, nRow1, 
nRow2, aFunc);
+return aFunc.getSum();
+}
+
 size_t ScColumn::CountNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW 
nRow1, SCROW nRow2 ) const
 {
 NumericCellCounter aFunc;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f8acd73..d02a0bc 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3854,6 +3854,64 @@ void ScInterpreter::ScMax( bool bTextAsZero )
 
 namespace {
 
+class FuncCount : public sc::ColumnSpanSet::ColumnAction
+{
+sc::ColumnBlockConstPosition maPos;
+ScColumn* mpCol;
+size_t mnCount;
+sal_uInt32 mnNumFmt;
+
+public:
+FuncCount() : mnCount(0), mnNumFmt(0) {}
+
+virtual void startColumn(ScColumn* pCol)
+{
+mpCol = pCol;
+mpCol->InitBlockPosition(maPos);
+}
+
+virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal)
+{
+if (!bVal)
+return;
+
+mnCount += mpCol->CountNumericCells(maPos, nRow1, nRow2);
+mnNumFmt = mpCol->GetNumberFormat(nRow2);
+};
+
+size_t getCount() const { return mnCount; }
+sal_uInt32 getNumberFormat() const { return mnNumFmt; }
+};
+
+class FuncSum : public sc::ColumnSpanSet::ColumnAction
+{
+sc::ColumnBlockConstPosition maPos;
+ScColumn* mpCol;
+double mfSum;
+sal_uInt32 mnNumFmt;
+
+public:
+FuncSum() : mfSum(0.0), mnNumFmt(0) {}
+
+virtual void startC

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

[Kohei Yoshida]

 sc/inc/formulacell.hxx  |5 +
 sc/inc/token.hxx|   13 +
 sc/source/core/data/formulacell.cxx |5 +
 sc/source/core/tool/token.cxx   |   12 +++-
 4 files changed, 22 insertions(+), 13 deletions(-)

New commits:
commit 07010b8ea2465406df8eea9341c8644a6f7fed81
Author: Kohei Yoshida 
Date:   Tue Jul 2 00:06:22 2013 -0400

Put the matrix header back in for Windows build...

Change-Id: I676b3d9b702af51bf00dff9ef55d16e7fbdec65e

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 1f9b960..a63025c 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -259,10 +259,7 @@ public:
 const formula::FormulaGrammar::Grammar 
eGrammar )
 { aResult.SetHybridFormula( r); eTempGrammar = 
eGrammar; }
 
-void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& 
pMat, formula::FormulaToken* pUL )
-{
-aResult.SetMatrix(nCols, nRows, pMat, pUL);
-}
+void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& 
pMat, formula::FormulaToken* pUL );
 
 /** For import only: set a double result.
 Use this instead of SetHybridDouble() if there is no (temporary)
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 116022a..0839326 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -30,7 +30,7 @@
 #include "scdllapi.h"
 #include "formula/IFunctionDescription.hxx"
 #include "formula/token.hxx"
-#include "types.hxx"
+#include "scmatrix.hxx"
 
 class ScJumpMatrix;
 
@@ -318,7 +318,7 @@ public:
 virtual const String &  GetString() const;
 virtual const ScMatrix* GetMatrix() const;
 virtual booloperator==( const formula::FormulaToken& 
rToken ) const;
-virtual FormulaToken*   Clone() const { return new 
ScMatrixCellResultToken(*this); }
+virtual FormulaToken*   Clone() const;
 formula::StackVar   GetUpperLeftType() const
 {
 return xUpperLeft ?
@@ -357,12 +357,9 @@ public:
 SCCOL   GetMatCols() const  { return nCols; }
 SCROW   GetMatRows() const  { return nRows; }
 
-/** Assign matrix result, keep matrix formula
-dimension. */
-voidAssign( const ScMatrixCellResultToken & r )
-{
-ScMatrixCellResultToken::Assign( r);
-}
+/** Assign matrix result, keep matrix formula
+dimension. */
+void Assign( const ScMatrixCellResultToken & r );
 
 /** Assign any result, keep matrix formula
 dimension. If token is of type
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index f2d72da..1e86cfc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1591,6 +1591,11 @@ void ScFormulaCell::SetResultToken( const 
formula::FormulaToken* pToken )
 aResult.SetToken(pToken);
 }
 
+void ScFormulaCell::SetResultMatrix( SCCOL nCols, SCROW nRows, const 
ScConstMatrixRef& pMat, formula::FormulaToken* pUL )
+{
+aResult.SetMatrix(nCols, nRows, pMat, pUL);
+}
+
 void ScFormulaCell::SetErrCode( sal_uInt16 n )
 {
 /* FIXME: check the numerous places where ScTokenArray::GetCodeError() is
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 55c051d..e25ef60 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -37,7 +37,6 @@
 #include "rangeseq.hxx"
 #include "externalrefmgr.hxx"
 #include "document.hxx"
-#include "scmatrix.hxx"
 
 using ::std::vector;
 
@@ -1060,6 +1059,11 @@ bool ScMatrixCellResultToken::operator==( const 
FormulaToken& r ) const
 xMatrix == static_cast(r).xMatrix;
 }
 
+FormulaToken* ScMatrixCellResultToken::Clone() const
+{
+return new ScMatrixCellResultToken(*this);
+}
+
 void ScMatrixCellResultToken::Assign( const ScMatrixCellResultToken & r )
 {
 xMatrix = r.xMatrix;
@@ -1088,6 +1092,12 @@ bool ScMatrixFormulaCellToken::operator==( const 
FormulaToken& r ) const
 return p && ScMatrixCellResultToken::operator==( r ) &&
 nCols == p->nCols && nRows == p->nRows;
 }
+
+void ScMatrixFormulaCellToken::Assign( const ScMatrixCellResultToken & r )
+{
+ScMatrixCellResultToken::Assign( r);
+}
+
 void ScMatrixFormulaCellToken::Assign( const formula::FormulaToken& r )
 {
 if (this == &r)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/data/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cfa404448cb89d3dbf0ece13ac80279abd7ca05
Author: Kohei Yoshida 
Date:   Mon Jul 1 23:30:00 2013 -0400

Unused variable.

Change-Id: I1df58281896687e61d40675206d0fc3854d93866

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 50d6999..b15d090 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -474,7 +474,7 @@ class NumericCellCounter
 public:
 NumericCellCounter() : mnCount(0) {}
 
-void operator() (const sc::CellStoreType::value_type& rNode, size_t 
nOffset, size_t nDataSize)
+void operator() (const sc::CellStoreType::value_type& rNode, size_t 
/*nOffset*/, size_t nDataSize)
 {
 if (rNode.type != sc::element_type_numeric)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74361c91782832f07d3ef9b76c765997648dbe52
Author: Kohei Yoshida 
Date:   Mon Jul 1 23:30:00 2013 -0400

Unused variable.

Change-Id: I1df58281896687e61d40675206d0fc3854d93866

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 2a59e7e..8d3f625 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -474,7 +474,7 @@ class NumericCellCounter
 public:
 NumericCellCounter() : mnCount(0) {}
 
-void operator() (const sc::CellStoreType::value_type& rNode, size_t 
nOffset, size_t nDataSize)
+void operator() (const sc::CellStoreType::value_type& rNode, size_t 
/*nOffset*/, size_t nDataSize)
 {
 if (rNode.type != sc::element_type_numeric)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/column.hxx   |6 -
 sc/inc/columnspanset.hxx|   29 -
 sc/inc/document.hxx |3 
 sc/inc/table.hxx|4 
 sc/source/core/data/column.cxx  |   54 +
 sc/source/core/data/columnspanset.cxx   |   84 --
 sc/source/core/data/documen6.cxx|4 
 sc/source/core/data/document.cxx|   17 ++
 sc/source/core/data/listenercontext.cxx |4 
 sc/source/core/data/table3.cxx  |   31 +
 sc/source/core/tool/interpr1.cxx|  183 +++-
 11 files changed, 396 insertions(+), 23 deletions(-)

New commits:
commit f68990f3d806c1cb47cd465a888d8eed5a0fa8ee
Author: Kohei Yoshida 
Date:   Mon Jul 1 23:08:14 2013 -0400

Re-implement the COUNT function for efficiency.

By taking advantage of the block structure of the new cell storage.

Change-Id: Ib953c14d364ccdff7df5caf70d57cec86189e3be

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e1c37ca..2630f6e 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -44,6 +44,7 @@ namespace sc {
 class CopyToClipContext;
 class CopyToDocContext;
 class MixDocContext;
+class ColumnSpanSet;
 struct ColumnBlockPosition;
 class SingleColumnSpanSet;
 }
@@ -116,7 +117,6 @@ class ScColumn
 
 friend class ScDocument;// for FillInfo
 friend class ScTable;
-friend class ScDocumentIterator;
 friend class ScValueIterator;
 friend class ScHorizontalValueIterator;
 friend class ScDBQueryDataIterator;
@@ -127,6 +127,7 @@ friend class ScHorizontalAttrIterator;
 friend class ScColumnTextWidthIterator;
 friend class ScDocumentImport;
 friend class sc::SingleColumnSpanSet;
+friend class sc::ColumnSpanSet;
 
 ScColumn(const ScColumn&); // disabled
 ScColumn& operator= (const ScColumn&); // disabled
@@ -242,6 +243,7 @@ public:
 voidSwapCol(ScColumn& rCol);
 voidMoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol);
 
+void MarkSubTotalCells( sc::ColumnSpanSet& rSet, SCROW nRow1, SCROW nRow2, 
bool bVal ) const;
 
 bool HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst);
 
@@ -400,6 +402,8 @@ public:
 voidClearSelectionItems( const sal_uInt16* pWhich, const 
ScMarkData& rMark );
 voidChangeSelectionIndent( bool bIncrement, const ScMarkData& 
rMark );
 
+size_t CountNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW nRow1, 
SCROW nRow2 ) const;
+
 long GetNeededSize(
 SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY,
 const Fraction& rZoomX, const Fraction& rZoomY,
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 55c3f57..98533e2 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -16,8 +16,10 @@
 #include 
 #include 
 
+class ScDocument;
 class ScColumn;
 class ScMarkData;
+class ScRange;
 
 namespace sc {
 
@@ -30,12 +32,22 @@ struct ColumnBlockConstPosition;
 class ColumnSpanSet : boost::noncopyable
 {
 typedef mdds::flat_segment_tree ColumnSpansType;
-typedef std::vector TableType;
+
+struct ColumnType
+{
+ColumnSpansType maSpans;
+ColumnSpansType::const_iterator miPos;
+
+ColumnType(SCROW nStart, SCROW nEnd, bool bInit);
+};
+
+typedef std::vector TableType;
 typedef std::vector DocType;
 
 DocType maDoc;
+bool mbInit;
 
-ColumnSpansType& getColumnSpans(SCTAB nTab, SCCOL nCol);
+ColumnType& getColumn(SCTAB nTab, SCCOL nCol);
 
 public:
 class Action
@@ -46,12 +58,23 @@ public:
 virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) 
= 0;
 };
 
+class ColumnAction
+{
+public:
+virtual ~ColumnAction() = 0;
+virtual void startColumn(ScColumn* pCol) = 0;
+virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) = 0;
+};
+
+ColumnSpanSet(bool bInit);
 ~ColumnSpanSet();
 
 void set(SCTAB nTab, SCCOL nCol, SCROW nRow, bool bVal);
 void set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal);
+void set(const ScRange& rRange, bool bVal);
 
-void executeFromTop(Action& ac) const;
+void executeAction(Action& ac) const;
+void executeColumnAction(ScDocument& rDoc, ColumnAction& ac) const;
 };
 
 /**
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f51f058..ed3d675 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -53,6 +53,7 @@ namespace sc {
 class StartListeningContext;
 class EndListeningContext;
 class CopyFromClipContext;
+class ColumnSpanSet;
 struct ColumnBlockPosition;
 }
 class SvxFontItem;
@@ -228,6 +229,7 @@ friend class ScFormulaCell;
 friend class ScTable;
 friend struct ScRefCellValue;
 friend class ScDocumentImport;
+friend class sc::ColumnSpanSet;
 
 typedef ::std::vector TableContainer;
 private:
@@ -1966,6 +1968,7 @@ public:
 void AddSubTotalCell(ScFormulaCell* pCell);

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx   |6 -
 sc/inc/columnspanset.hxx|   29 -
 sc/inc/document.hxx |3 
 sc/inc/table.hxx|4 
 sc/source/core/data/column.cxx  |   54 +
 sc/source/core/data/columnspanset.cxx   |   84 --
 sc/source/core/data/documen6.cxx|4 
 sc/source/core/data/document.cxx|   17 ++
 sc/source/core/data/listenercontext.cxx |4 
 sc/source/core/data/table3.cxx  |   31 +
 sc/source/core/tool/interpr1.cxx|  183 +++-
 sc/source/core/tool/interpr5.cxx|   24 
 12 files changed, 396 insertions(+), 47 deletions(-)

New commits:
commit 0f43bf6e5d43fe4000765013e7a73d762b58
Author: Kohei Yoshida 
Date:   Mon Jul 1 23:08:14 2013 -0400

Re-implement the COUNT function for efficiency.

By taking advantage of the block structure of the new cell storage.

Change-Id: Ib953c14d364ccdff7df5caf70d57cec86189e3be

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6cc3c4b..7ce53ad 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -44,6 +44,7 @@ namespace sc {
 class CopyToClipContext;
 class CopyToDocContext;
 class MixDocContext;
+class ColumnSpanSet;
 struct ColumnBlockPosition;
 class SingleColumnSpanSet;
 }
@@ -116,7 +117,6 @@ class ScColumn
 
 friend class ScDocument;// for FillInfo
 friend class ScTable;
-friend class ScDocumentIterator;
 friend class ScValueIterator;
 friend class ScHorizontalValueIterator;
 friend class ScDBQueryDataIterator;
@@ -127,6 +127,7 @@ friend class ScHorizontalAttrIterator;
 friend class ScColumnTextWidthIterator;
 friend class ScDocumentImport;
 friend class sc::SingleColumnSpanSet;
+friend class sc::ColumnSpanSet;
 
 ScColumn(const ScColumn&); // disabled
 ScColumn& operator= (const ScColumn&); // disabled
@@ -242,6 +243,7 @@ public:
 voidSwapCol(ScColumn& rCol);
 voidMoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol);
 
+void MarkSubTotalCells( sc::ColumnSpanSet& rSet, SCROW nRow1, SCROW nRow2, 
bool bVal ) const;
 
 bool HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst);
 
@@ -407,6 +409,8 @@ public:
 voidClearSelectionItems( const sal_uInt16* pWhich, const 
ScMarkData& rMark );
 voidChangeSelectionIndent( bool bIncrement, const ScMarkData& 
rMark );
 
+size_t CountNumericCells( sc::ColumnBlockConstPosition& rPos, SCROW nRow1, 
SCROW nRow2 ) const;
+
 long GetNeededSize(
 SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY,
 const Fraction& rZoomX, const Fraction& rZoomY,
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 55c3f57..98533e2 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -16,8 +16,10 @@
 #include 
 #include 
 
+class ScDocument;
 class ScColumn;
 class ScMarkData;
+class ScRange;
 
 namespace sc {
 
@@ -30,12 +32,22 @@ struct ColumnBlockConstPosition;
 class ColumnSpanSet : boost::noncopyable
 {
 typedef mdds::flat_segment_tree ColumnSpansType;
-typedef std::vector TableType;
+
+struct ColumnType
+{
+ColumnSpansType maSpans;
+ColumnSpansType::const_iterator miPos;
+
+ColumnType(SCROW nStart, SCROW nEnd, bool bInit);
+};
+
+typedef std::vector TableType;
 typedef std::vector DocType;
 
 DocType maDoc;
+bool mbInit;
 
-ColumnSpansType& getColumnSpans(SCTAB nTab, SCCOL nCol);
+ColumnType& getColumn(SCTAB nTab, SCCOL nCol);
 
 public:
 class Action
@@ -46,12 +58,23 @@ public:
 virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) 
= 0;
 };
 
+class ColumnAction
+{
+public:
+virtual ~ColumnAction() = 0;
+virtual void startColumn(ScColumn* pCol) = 0;
+virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) = 0;
+};
+
+ColumnSpanSet(bool bInit);
 ~ColumnSpanSet();
 
 void set(SCTAB nTab, SCCOL nCol, SCROW nRow, bool bVal);
 void set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal);
+void set(const ScRange& rRange, bool bVal);
 
-void executeFromTop(Action& ac) const;
+void executeAction(Action& ac) const;
+void executeColumnAction(ScDocument& rDoc, ColumnAction& ac) const;
 };
 
 /**
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 806fb77..4d41565 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -53,6 +53,7 @@ namespace sc {
 class StartListeningContext;
 class EndListeningContext;
 class CopyFromClipContext;
+class ColumnSpanSet;
 struct ColumnBlockPosition;
 }
 class SvxFontItem;
@@ -228,6 +229,7 @@ friend class ScFormulaCell;
 friend class ScTable;
 friend struct ScRefCellValue;
 friend class ScDocumentImport;
+friend class sc::ColumnSpanSet;
 
 typedef ::std::vector TableContainer;
 private:
@@ -1960,6 +1962,7 @@ publ

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

[Kohei Yoshida]

 sc/source/core/tool/interpr5.cxx |   24 
 1 file changed, 24 deletions(-)

New commits:
commit 09c47c623b3f0177231d2e14042df8f7f6a06446
Author: Kohei Yoshida 
Date:   Mon Jul 1 21:08:37 2013 -0400

Nobody uses this. I forgot to remove it.

Change-Id: Ib035466e04f37ee1d7b61d352f7a380f005b3231

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 050160e..3d2ce0a 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1597,30 +1597,6 @@ void ScInterpreter::ScPow()
 
 namespace {
 
-bool mergeArray( std::vector& rRes, const std::vector& rOther )
-{
-if (rRes.size() != rOther.size())
-return false;
-
-double fNan;
-rtl::math::setNan(&fNan);
-
-std::vector::iterator it = rRes.begin(), itEnd = rRes.end();
-std::vector::const_iterator itOther = rOther.begin();
-for (; it != itEnd; ++it, ++itOther)
-{
-if (rtl::math::isNan(*it) || rtl::math::isNan(*itOther))
-{
-*it = fNan;
-continue;
-}
-
-*it *= *itOther;
-}
-
-return true;
-}
-
 class SumValues : std::unary_function
 {
 double mfSum;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/source/filter/excel/xetable.cxx   |   46 +--
 sc/source/filter/inc/xetable.hxx |3 +
 xmloff/source/chart/XMLChartStyleContext.cxx |   14 ++--
 3 files changed, 50 insertions(+), 13 deletions(-)

New commits:
commit 93a5b7ee36818d60963e4fbe21f9e6c43c7c5a80
Author: Markus Mohrhard 
Date:   Tue Jul 2 02:37:58 2013 +0200

don't forget the formula cell style during xls/xlsx export, fdo#66242

This reverts parts of commit 64223bda068cc6d82d3c5e359d465014568398bb.

Change-Id: I6d5379aaedbf011b39a4cf076f0a43bc8a6cbc93

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 39f2e03..8694a49 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -760,13 +760,55 @@ IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell )
 
 XclExpFormulaCell::XclExpFormulaCell(
 const XclExpRoot& rRoot, const XclAddress& rXclPos,
-sal_uInt32 nForcedXFId, const ScFormulaCell& rScFmlaCell,
+const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
+const ScFormulaCell& rScFmlaCell,
 XclExpArrayBuffer& rArrayBfr,
 XclExpShrfmlaBuffer& rShrfmlaBfr,
 XclExpTableopBuffer& rTableopBfr ) :
 XclExpSingleCellBase( EXC_ID2_FORMULA, 0, rXclPos, nForcedXFId ),
 mrScFmlaCell( const_cast< ScFormulaCell& >( rScFmlaCell ) )
 {
+// *** Find result number format overwriting cell number format *** ---
+
+if( GetXFId() == EXC_XFID_NOTFOUND )
+{
+SvNumberFormatter& rFormatter = rRoot.GetFormatter();
+XclExpNumFmtBuffer& rNumFmtBfr = rRoot.GetNumFmtBuffer();
+
+// current cell number format
+sal_uLong nScNumFmt = pPattern ?
+GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item, 
ATTR_VALUE_FORMAT, sal_uLong ) :
+rNumFmtBfr.GetStandardFormat();
+
+// alternative number format passed to XF buffer
+sal_uLong nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
+/*  Xcl doesn't know Boolean number formats, we write
+"TRUE";"FALSE" (language dependent). Don't do it for automatic
+formula formats, because Excel gets them right. */
+/*  #i8640# Don't set text format, if we have string results. */
+short nFormatType = mrScFmlaCell.GetFormatType();
+if( ((nScNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0) &&
+(nFormatType != NUMBERFORMAT_LOGICAL) &&
+(nFormatType != NUMBERFORMAT_TEXT) )
+nAltScNumFmt = nScNumFmt;
+/*  If cell number format is Boolean and automatic formula
+format is Boolean don't write that ugly special format. */
+else if( (nFormatType == NUMBERFORMAT_LOGICAL) &&
+(rFormatter.GetType( nScNumFmt ) == NUMBERFORMAT_LOGICAL) )
+nAltScNumFmt = rNumFmtBfr.GetStandardFormat();
+
+// #i41420# find script type according to result type (always latin 
for numeric results)
+sal_Int16 nScript = ApiScriptType::LATIN;
+bool bForceLineBreak = false;
+if( nFormatType == NUMBERFORMAT_TEXT )
+{
+String aResult = mrScFmlaCell.GetString();
+bForceLineBreak = mrScFmlaCell.IsMultilineResult();
+nScript = XclExpStringHelper::GetLeadingScriptType( rRoot, aResult 
);
+}
+SetXFId( rRoot.GetXFBuffer().InsertWithNumFmt( pPattern, nScript, 
nAltScNumFmt, bForceLineBreak ) );
+}
+
 // *** Convert the formula token array *** 
 
 ScAddress aScPos( static_cast< SCCOL >( rXclPos.mnCol ), static_cast< 
SCROW >( rXclPos.mnRow ), rRoot.GetCurrScTab() );
@@ -2336,7 +2378,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot 
) :
 case CELLTYPE_FORMULA:
 {
 xCell.reset(new XclExpFormulaCell(
-GetRoot(), aXclPos, nMergeBaseXFId,
+GetRoot(), aXclPos, pPattern, nMergeBaseXFId,
 *rScCell.mpFormula, maArrayBfr, maShrfmlaBfr, 
maTableopBfr));
 }
 break;
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index b0253b3..655d6ea 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -451,7 +451,8 @@ class XclExpFormulaCell : public XclExpSingleCellBase
 
 public:
 explicitXclExpFormulaCell( const XclExpRoot& rRoot, const 
XclAddress& rXclPos,
-sal_uInt32 nForcedXFId, const ScFormulaCell& 
rScFmlaCell,
+const ScPatternAttr* pPattern, sal_uInt32 
nForcedXFId,
+const ScFormulaCell& rScFmlaCell,
 XclExpArrayBuffer& rArrayBfr,
 XclExpShrfmlaBuffer& rShrfmlaBfr,
 XclExpTableopBuffer& rTableopBfr );
commit ae4e42c87f10eda7efd74cb250253a4f6815d427
Author: Markus Mohrhard 
Dat

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

[Kohei Yoshida]

 sc/source/core/tool/interpr5.cxx |   24 
 1 file changed, 24 deletions(-)

New commits:
commit e4b145089367277bff880731d020ef21c2b51d03
Author: Kohei Yoshida 
Date:   Mon Jul 1 21:08:37 2013 -0400

Nobody uses this. I forgot to remove it.

Change-Id: Ib035466e04f37ee1d7b61d352f7a380f005b3231

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 79a038d..26c2378 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1597,30 +1597,6 @@ void ScInterpreter::ScPow()
 
 namespace {
 
-bool mergeArray( std::vector& rRes, const std::vector& rOther )
-{
-if (rRes.size() != rOther.size())
-return false;
-
-double fNan;
-rtl::math::setNan(&fNan);
-
-std::vector::iterator it = rRes.begin(), itEnd = rRes.end();
-std::vector::const_iterator itOther = rOther.begin();
-for (; it != itEnd; ++it, ++itOther)
-{
-if (rtl::math::isNan(*it) || rtl::math::isNan(*itOther))
-{
-*it = fNan;
-continue;
-}
-
-*it *= *itOther;
-}
-
-return true;
-}
-
 class SumValues : std::unary_function
 {
 double mfSum;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41e0a3bde2b9a838e4ad55c2ea4ed1ec22627f99
Author: Kohei Yoshida 
Date:   Mon Jul 1 19:24:39 2013 -0400

Fix build breakage when opencl is enabled.

Change-Id: I8ffa87c19ce110452c8280f4ee91536cd6f563d4

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 54fd8e8..41e439c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -15,6 +15,7 @@
 #include "compiler.hxx"
 #include "interpre.hxx"
 #include "formula/vectortoken.hxx"
+#include "scmatrix.hxx"
 
 #include "openclwrapper.hxx"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f39875c7ff1073b878cf828acb3566607b3384be
Author: Kohei Yoshida 
Date:   Mon Jul 1 19:24:39 2013 -0400

Fix build breakage when opencl is enabled.

Change-Id: I8ffa87c19ce110452c8280f4ee91536cd6f563d4

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 54fd8e8..41e439c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -15,6 +15,7 @@
 #include "compiler.hxx"
 #include "interpre.hxx"
 #include "formula/vectortoken.hxx"
+#include "scmatrix.hxx"
 
 #include "openclwrapper.hxx"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c498a34d7c039a9cfc4162f91c66831ea13527b9
Author: Kohei Yoshida 
Date:   Mon Jul 1 19:24:39 2013 -0400

Fix build breakage when opencl is enabled.

Change-Id: I8ffa87c19ce110452c8280f4ee91536cd6f563d4

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 54fd8e8..41e439c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -15,6 +15,7 @@
 #include "compiler.hxx"
 #include "interpre.hxx"
 #include "formula/vectortoken.hxx"
+#include "scmatrix.hxx"
 
 #include "openclwrapper.hxx"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 2 commits - sc/inc sc/Library_sc.mk sc/source

[Kohei Yoshida]

 sc/Library_sc.mk |1 
 sc/inc/addincol.hxx  |4 
 sc/inc/externalrefmgr.hxx|2 
 sc/inc/queryparam.hxx|2 
 sc/inc/rangeseq.hxx  |2 
 sc/inc/scmatrix.hxx  |   14 --
 sc/inc/token.hxx |   56 ++---
 sc/inc/tokenarray.hxx|1 
 sc/inc/types.hxx |8 +
 sc/source/core/data/column2.cxx  |1 
 sc/source/core/data/dociter.cxx  |1 
 sc/source/core/data/documen4.cxx |1 
 sc/source/core/data/table1.cxx   |1 
 sc/source/core/data/validat.cxx  |6 -
 sc/source/core/inc/ddelink.hxx   |8 -
 sc/source/core/inc/doubleref.hxx |2 
 sc/source/core/inc/interpre.hxx  |2 
 sc/source/core/inc/jumpmatrix.hxx|  179 ---
 sc/source/core/tool/addincol.cxx |8 -
 sc/source/core/tool/compiler.cxx |1 
 sc/source/core/tool/ddelink.cxx  |   15 ++
 sc/source/core/tool/doubleref.cxx|1 
 sc/source/core/tool/formulagroup.cxx |2 
 sc/source/core/tool/formularesult.cxx|1 
 sc/source/core/tool/interpr5.cxx |   92 ++-
 sc/source/core/tool/jumpmatrix.cxx   |  173 +
 sc/source/core/tool/queryparam.cxx   |1 
 sc/source/core/tool/rangenam.cxx |2 
 sc/source/core/tool/scmatrix.cxx |  156 +++
 sc/source/core/tool/token.cxx|   40 ++
 sc/source/filter/excel/excform.cxx   |2 
 sc/source/filter/excel/xeformula.cxx |1 
 sc/source/filter/excel/xehelper.cxx  |1 
 sc/source/filter/excel/xihelper.cxx  |8 +
 sc/source/filter/excel/xilink.cxx|3 
 sc/source/filter/inc/xihelper.hxx|7 -
 sc/source/filter/inc/xilink.hxx  |2 
 sc/source/filter/xml/xmlcelli.cxx|1 
 sc/source/ui/docshell/externalrefmgr.cxx |1 
 sc/source/ui/unoobj/chart2uno.cxx|1 
 sc/source/ui/unoobj/linkuno.cxx  |1 
 41 files changed, 555 insertions(+), 256 deletions(-)

New commits:
commit 23b97880a00bdd5dd21ce937ea94a733bd487289
Author: Kohei Yoshida 
Date:   Mon Jul 1 16:04:35 2013 -0400

Reduce dependency on the matrix header.

Change-Id: Iade09d108aec78f8cbe92f9103f206d0c99fab8e

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 7afd018..d5b486e3 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -219,6 +219,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/interpr5 \
sc/source/core/tool/interpr6 \
sc/source/core/tool/interpr7 \
+   sc/source/core/tool/jumpmatrix \
sc/source/core/tool/lookupcache \
sc/source/core/tool/navicfg \
sc/source/core/tool/odffmap \
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 15abd4c..4b440a2 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -32,7 +32,7 @@
 #include "scdllapi.h"
 #include 
 
-#include "scmatrix.hxx"
+#include "types.hxx"
 
 #include 
 
@@ -233,7 +233,7 @@ public:
 boolHasVarRes() const   { return ( xVarRes.is() ); }
 double  GetValue() const{ return fValue; }
 const OUString& GetString() const   { return aString; }
-ScMatrixRef GetMatrix() const   { return xMatrix; }
+ScMatrixRef GetMatrix() const;
 com::sun::star::uno::Reference
 GetVarRes() const   { return xVarRes; }
 };
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 0a115c0..4e39a5d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -29,7 +29,7 @@
 #include "vcl/timer.hxx"
 #include "svl/zforlist.hxx"
 #include "svl/lstner.hxx"
-#include "scmatrix.hxx"
+#include "types.hxx"
 #include "rangelst.hxx"
 #include "formula/token.hxx"
 
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 26d2d1b..0d814cd 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -21,7 +21,7 @@
 #define SC_QUERYPARAM_HXX
 
 #include "global.hxx"
-#include "scmatrix.hxx"
+#include "types.hxx"
 
 #include 
 
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index bd8a900..b13233d 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -22,7 +22,7 @@
 
 #include 
 #include 
-#include "scmatrix.hxx"
+#include "types.hxx"
 
 class SvNumberFormatter;
 class ScDocument;
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index ccb989f..47231b3 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -34,14 +34,6 @@ class ScInterpreter;
 class SvNumberFormatter;
 class ScMatrixImpl;
 
-typedef sal_uInt8 ScMatValType;
-const ScMatValType SC_MATVAL_VALUE = 0x00;
-const ScMatValType SC_MATVAL_BOOLEAN   = 0x01;
-const ScMatValType SC_MATVAL_STRING= 0x02;
-const ScMatValType SC_MAT

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

[Lionel Elie Mamane]

 dbaccess/source/core/api/OptimisticSet.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 369e2d3e007fd9177c3500813feee22fc3a8a823
Author: Lionel Elie Mamane 
Date:   Tue Jul 2 00:56:57 2013 +0200

fdo#66464 initialise static join info at construct time

to ensure that isReadOnly returns something sensible as soon as construct() 
finishes

Change-Id: I5f9bef049297c5232df0ecdb9084add968a0052f

diff --git a/dbaccess/source/core/api/OptimisticSet.cxx 
b/dbaccess/source/core/api/OptimisticSet.cxx
index ac73c44..8fed9a3 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -136,11 +136,6 @@ void OptimisticSet::construct(const Reference< 
XResultSet>& _xDriverSet,const OU
 OKeySetValue keySetValue((ORowSetValueVector 
*)NULL,::std::pair >(0,(Reference)NULL));
 m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue));
 m_aKeyIter = m_aKeyMap.begin();
-}
-
-void OptimisticSet::makeNewStatement( )
-{
-OUStringBuffer aFilter = createKeyFilter();
 
 Reference< XSingleSelectQueryComposer> 
xSourceComposer(m_xComposer,UNO_QUERY);
 Reference< XMultiServiceFactory >  xFactory(m_xConnection, 
UNO_QUERY_THROW);
@@ -156,6 +151,17 @@ void OptimisticSet::makeNewStatement( )
 m_aSqlIterator.traverseAll();
 fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions());
 
+}
+
+void OptimisticSet::makeNewStatement( )
+{
+OUStringBuffer aFilter = createKeyFilter();
+
+Reference< XSingleSelectQueryComposer> 
xSourceComposer(m_xComposer,UNO_QUERY);
+Reference< XMultiServiceFactory >  xFactory(m_xConnection, 
UNO_QUERY_THROW);
+Reference 
xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
+xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery());
+
 const OUString sComposerFilter = m_xComposer->getFilter();
 if ( !m_sRowSetFilter.isEmpty() || !sComposerFilter.isEmpty() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/Library_sc.mk |1 
 sc/inc/addincol.hxx  |4 
 sc/inc/externalrefmgr.hxx|2 
 sc/inc/queryparam.hxx|2 
 sc/inc/rangeseq.hxx  |2 
 sc/inc/scmatrix.hxx  |   14 --
 sc/inc/token.hxx |   56 ++---
 sc/inc/tokenarray.hxx|1 
 sc/inc/types.hxx |8 +
 sc/source/core/data/column2.cxx  |1 
 sc/source/core/data/dociter.cxx  |1 
 sc/source/core/data/documen4.cxx |1 
 sc/source/core/data/table1.cxx   |1 
 sc/source/core/data/validat.cxx  |6 -
 sc/source/core/inc/ddelink.hxx   |8 -
 sc/source/core/inc/doubleref.hxx |2 
 sc/source/core/inc/interpre.hxx  |2 
 sc/source/core/inc/jumpmatrix.hxx|  179 ---
 sc/source/core/tool/addincol.cxx |8 -
 sc/source/core/tool/compiler.cxx |1 
 sc/source/core/tool/ddelink.cxx  |   15 ++
 sc/source/core/tool/doubleref.cxx|1 
 sc/source/core/tool/formulagroup.cxx |2 
 sc/source/core/tool/formularesult.cxx|1 
 sc/source/core/tool/interpr5.cxx |   92 ++-
 sc/source/core/tool/jumpmatrix.cxx   |  173 +
 sc/source/core/tool/queryparam.cxx   |1 
 sc/source/core/tool/rangenam.cxx |2 
 sc/source/core/tool/scmatrix.cxx |  156 +++
 sc/source/core/tool/token.cxx|   40 ++
 sc/source/filter/excel/excform.cxx   |2 
 sc/source/filter/excel/xeformula.cxx |1 
 sc/source/filter/excel/xehelper.cxx  |1 
 sc/source/filter/excel/xihelper.cxx  |8 +
 sc/source/filter/excel/xilink.cxx|3 
 sc/source/filter/inc/xihelper.hxx|7 -
 sc/source/filter/inc/xilink.hxx  |2 
 sc/source/filter/xml/xmlcelli.cxx|1 
 sc/source/ui/docshell/externalrefmgr.cxx |1 
 sc/source/ui/unoobj/chart2uno.cxx|1 
 sc/source/ui/unoobj/linkuno.cxx  |1 
 41 files changed, 555 insertions(+), 256 deletions(-)

New commits:
commit ed76237e41ecdb58f524e14ea6b8866f8dacf6a9
Author: Kohei Yoshida 
Date:   Mon Jul 1 16:04:35 2013 -0400

Reduce dependency on the matrix header.

Change-Id: Iade09d108aec78f8cbe92f9103f206d0c99fab8e

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 836f87f..5815fd0 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -225,6 +225,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/interpr5 \
sc/source/core/tool/interpr6 \
sc/source/core/tool/interpr7 \
+   sc/source/core/tool/jumpmatrix \
sc/source/core/tool/lookupcache \
sc/source/core/tool/navicfg \
sc/source/core/tool/odffmap \
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 15abd4c..4b440a2 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -32,7 +32,7 @@
 #include "scdllapi.h"
 #include 
 
-#include "scmatrix.hxx"
+#include "types.hxx"
 
 #include 
 
@@ -233,7 +233,7 @@ public:
 boolHasVarRes() const   { return ( xVarRes.is() ); }
 double  GetValue() const{ return fValue; }
 const OUString& GetString() const   { return aString; }
-ScMatrixRef GetMatrix() const   { return xMatrix; }
+ScMatrixRef GetMatrix() const;
 com::sun::star::uno::Reference
 GetVarRes() const   { return xVarRes; }
 };
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 0a115c0..4e39a5d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -29,7 +29,7 @@
 #include "vcl/timer.hxx"
 #include "svl/zforlist.hxx"
 #include "svl/lstner.hxx"
-#include "scmatrix.hxx"
+#include "types.hxx"
 #include "rangelst.hxx"
 #include "formula/token.hxx"
 
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 26d2d1b..0d814cd 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -21,7 +21,7 @@
 #define SC_QUERYPARAM_HXX
 
 #include "global.hxx"
-#include "scmatrix.hxx"
+#include "types.hxx"
 
 #include 
 
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index bd8a900..b13233d 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -22,7 +22,7 @@
 
 #include 
 #include 
-#include "scmatrix.hxx"
+#include "types.hxx"
 
 class SvNumberFormatter;
 class ScDocument;
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index ccb989f..47231b3 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -34,14 +34,6 @@ class ScInterpreter;
 class SvNumberFormatter;
 class ScMatrixImpl;
 
-typedef sal_uInt8 ScMatValType;
-const ScMatValType SC_MATVAL_VALUE = 0x00;
-const ScMatValType SC_MATVAL_BOOLEAN   = 0x01;
-const ScMatValType SC_MATVAL_STRING= 0x02;
-const ScMatValType SC_MATV

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

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx |   14 +++---
 formula/source/core/api/token.cxx   |   11 +--
 include/formula/FormulaCompiler.hxx |4 ++--
 sc/inc/compiler.hxx |4 +---
 sc/source/core/tool/token.cxx   |2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 9c1ca6dca3b553c302a635357e33591605343b99
Author: Eike Rathke 
Date:   Mon Jul 1 23:54:28 2013 +0200

resolved fdo#35411 redefined MAXCODE 512 to FORMULA_MAXTOKENS 8192

Also renamed MAXJUMPCOUNT to FORMULA_MAXJUMPCOUNT but without changing
the value as the runtime array size of ocChose depends on it, should be
changed before.

Eliminated the duplicated and error causing redefinition of both in
sc/inc/compiler.hxx

Change-Id: I0e87d1439c9564a4f475fcb2870ab51c3b586942

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 514d11c..afd6746 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1195,7 +1195,7 @@ void FormulaCompiler::Factor()
 pFacToken->GetJump()[ 0 ] = 3;  // if, else, behind
 break;
 case ocChose:
-pFacToken->GetJump()[ 0 ] = MAXJUMPCOUNT+1;
+pFacToken->GetJump()[ 0 ] = FORMULA_MAXJUMPCOUNT + 1;
 break;
 case ocIfError:
 case ocIfNA:
@@ -1225,7 +1225,7 @@ void FormulaCompiler::Factor()
 nJumpMax = 3;
 break;
 case ocChose:
-nJumpMax = MAXJUMPCOUNT;
+nJumpMax = FORMULA_MAXJUMPCOUNT;
 break;
 case ocIfError:
 case ocIfNA:
@@ -1236,7 +1236,7 @@ void FormulaCompiler::Factor()
 SAL_WARN( "formula.core", "FormulaCompiler::Factor: forgot 
to add a jump max case?");
 }
 short nJumpCount = 0;
-while ( (nJumpCount < (MAXJUMPCOUNT - 1)) && (eOp == ocSep)
+while ( (nJumpCount < (FORMULA_MAXJUMPCOUNT - 1)) && (eOp == ocSep)
 && (!pArr->GetCodeError() || bIgnoreErrors) )
 {
 if ( ++nJumpCount <= nJumpMax )
@@ -1262,7 +1262,7 @@ void FormulaCompiler::Factor()
 bLimitOk = (nJumpCount <= 3);
 break;
 case ocChose:
-bLimitOk = (nJumpCount < MAXJUMPCOUNT); /* TODO: 
check, really <, not <=? */
+bLimitOk = (nJumpCount < FORMULA_MAXJUMPCOUNT); /* 
TODO: check, really <, not <=? */
 break;
 case ocIfError:
 case ocIfNA:
@@ -1546,7 +1546,7 @@ bool FormulaCompiler::CompileTokenArray()
 pArr->nRefs = 0;// count from start
 pArr->DelRPN();
 pStack = NULL;
-FormulaToken* pData[ MAXCODE ];
+FormulaToken* pData[ FORMULA_MAXTOKENS ];
 pCode = pData;
 bool bWasForced = pArr->IsRecalcModeForced();
 if ( bWasForced )
@@ -1951,9 +1951,9 @@ OpCode FormulaCompiler::NextToken()
 }
 void FormulaCompiler::PutCode( FormulaTokenRef& p )
 {
-if( pc >= MAXCODE-1 )
+if( pc >= FORMULA_MAXTOKENS - 1 )
 {
-if ( pc == MAXCODE-1 )
+if ( pc == FORMULA_MAXTOKENS - 1 )
 {
 p = new FormulaByteToken( ocStop );
 p->IncRef();
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index b341cdc..9ea036c 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -29,7 +29,6 @@
 #include "formula/tokenarray.hxx"
 #include "formula/FormulaCompiler.hxx"
 #include 
-#define MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */
 
 namespace formula
 {
@@ -726,8 +725,8 @@ FormulaToken* FormulaTokenArray::MergeArray( )
 FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 {
 if( !pCode )
-pCode = new FormulaToken*[ MAXCODE ];
-if( nLen < MAXCODE-1 )
+pCode = new FormulaToken*[ FORMULA_MAXTOKENS ];
+if( nLen < FORMULA_MAXTOKENS - 1 )
 {
 CheckToken(*t);
 pCode[ nLen++ ] = t;
@@ -742,7 +741,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 else
 {
 t->Delete();
-if ( nLen == MAXCODE-1 )
+if ( nLen == FORMULA_MAXTOKENS - 1 )
 {
 t = new FormulaByteToken( ocStop );
 pCode[ nLen++ ] = t;
@@ -1194,11 +1193,11 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp )
 case ocIfNA:
 case ocChose:
 {
-short nJump[MAXJUMPCOUNT + 1];
+short nJump[FORMULA_MAXJUMPCOUNT + 1];
 if ( eOp == ocIf )
 nJump[ 0 ] = 3;
 else if ( eOp == ocChose )
-

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

[Michael Stahl]

 sw/source/core/unocore/unosett.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0520eaf9e661abddadf9a21cfbeab37b0b85dd68
Author: Michael Stahl 
Date:   Mon Jul 1 23:48:59 2013 +0200

fdo#65650: fix Writer ODF import of list style with bullets and color

For such lists xmloff tries to set a BulletColor property but
SwXNumberingRules::SetNumberingRuleByIndex() throws a RuntimeException
and does not set any of the list properties on the NumRule.

(regression from abf18610998aa8330f8330f1d769508e47ef5b20)

Change-Id: Id3e80ee1ed67497786258a1096bc5c8dec90ce21

diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 4f8e083..31dfa2dd 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1658,8 +1658,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
 const sal_uInt16 NotInChapterLast = 23;
 const sal_uInt16 InChapterFirst = 24;
 const sal_uInt16 InChapterLast = 24;
-const sal_uInt16 IgnoredFirst = 25;
-const sal_uInt16 IgnoredLast = 26;
 
 const beans::PropertyValue* pPropArray = rProperties.getConstArray();
 PropValDataArr aPropertyValues;
@@ -1670,8 +1668,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
 bExcept = true;
 for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++)
 {
-if( j >= IgnoredFirst && j <= IgnoredLast )
-continue;
 if( pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast )
 continue;
 if( !pDocShell && j >= InChapterFirst && j <= InChapterLast )
@@ -2090,7 +2086,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
 break;
 case 25: // BulletRelSize - unsupported - only available in 
Impress
 break;
-case 26: // ignored too
+case 26: // BulletColor - ignored too
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f74e6dd07e971d25a610edbe0197b98984dbf353
Author: Michael Meeks 
Date:   Mon Jul 1 21:55:24 2013 +0100

get quoting right.

Change-Id: I3b1508a3309ad4df9e095b1cb6c3091df4adff4a

diff --git a/configure.ac b/configure.ac
index aa440fb..66733ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9838,7 +9838,7 @@ if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = 
yes \) -a $_os = Darwin
 elif test "z$with_opencl_sdk" = "z"; then
 AC_MSG_RESULT([no])
 else
-if test -d $with_opencl_sdk/include; then
+if test -d "$with_opencl_sdk/include"; then
 ENABLE_OPENCL=TRUE
 OPENCL_CFLAGS="-I$with_opencl_sdk/include"
 OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - configure.ac

[Michael Meeks]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3afc54efa142c20adbbdc68900b3c429cae6bd6b
Author: Michael Meeks 
Date:   Mon Jul 1 21:54:09 2013 +0100

get quoting right.

diff --git a/configure.ac b/configure.ac
index 46cb73c..68b578a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9686,7 +9686,7 @@ AC_MSG_CHECKING([opencl sdk])
 if test "z$with_opencl_sdk" = "z"; then
AC_MSG_RESULT([no])
 else
-   if test -d $with_opencl_sdk/include; then
+   if test -d "$with_opencl_sdk/include"; then
ENABLE_OPENCL=TRUE
OPENCL_CFLAGS="-I$with_opencl_sdk/include"
OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/polynomialregression' - 3 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/Library_chartcontroller.mk chart2/source

[Tomaž Vajngerl]

 chart2/AllLangResTarget_chartcontroller.mk  |1 
 chart2/Library_chartcontroller.mk   |1 
 chart2/source/controller/dialogs/dlg_InsertTrendline.cxx|  106 
 chart2/source/controller/dialogs/dlg_InsertTrendline.hrc|   25 --
 chart2/source/controller/dialogs/dlg_InsertTrendline.src|   40 
 chart2/source/controller/dialogs/res_Trendline.cxx  |1 
 chart2/source/controller/inc/dlg_InsertTrendline.hxx|   62 ---
 chart2/source/controller/main/ChartController_Insert.cxx|   48 -
 chart2/source/controller/main/ControllerCommandDispatch.cxx |   10 -
 chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |   20 +-
 10 files changed, 22 insertions(+), 292 deletions(-)

New commits:
commit afd74d41e7c8c0014a3b67940f855dc469b306c5
Author: Tomaž Vajngerl 
Date:   Mon Jul 1 22:32:35 2013 +0200

Remove InsertTrendlineDialog as it is not used anymore.

Change-Id: I58dbdc416254e631f33784bb2a2cf124e69fc69a

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 0da17b2..006266a 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
 chart2/source/controller/dialogs/dlg_InsertLegend.src \
 chart2/source/controller/dialogs/dlg_InsertTitle.src \
-chart2/source/controller/dialogs/dlg_InsertTrendline.src \
 chart2/source/controller/dialogs/dlg_ObjectProperties.src \
 chart2/source/controller/dialogs/dlg_ShapeFont.src \
 chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
diff --git a/chart2/Library_chartcontroller.mk 
b/chart2/Library_chartcontroller.mk
index 45e4266..e90f716 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -98,7 +98,6 @@ $(eval $(call 
gb_Library_add_exception_objects,chartcontroller,\
 chart2/source/controller/dialogs/dlg_InsertErrorBars \
 chart2/source/controller/dialogs/dlg_InsertLegend \
 chart2/source/controller/dialogs/dlg_InsertTitle \
-chart2/source/controller/dialogs/dlg_InsertTrendline \
 chart2/source/controller/dialogs/dlg_NumberFormat \
 chart2/source/controller/dialogs/dlg_ObjectProperties \
 chart2/source/controller/dialogs/dlg_ShapeFont \
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx 
b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
deleted file mode 100644
index a00e424..000
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-
-#include "dlg_InsertTrendline.hxx"
-#include "dlg_InsertTrendline.hrc"
-#include "res_Trendline.hxx"
-#include "ResourceIds.hrc"
-#include "ResId.hxx"
-#include "Strings.hrc"
-#include "chartview/ExplicitValueProvider.hxx"
-#include "ChartModelHelper.hxx"
-#include "ObjectIdentifier.hxx"
-#include "DiagramHelper.hxx"
-#include "AxisHelper.hxx"
-#include "ObjectNameProvider.hxx"
-#include 
-#include 
-
-#include 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-
-namespace
-{
-void lcl_SetControlXPos( Control & rControl, long nPosPixel )
-{
-Point aPos( rControl.GetPosPixel());
-aPos.setX( nPosPixel );
-rControl.SetPosPixel( aPos );
-}
-} // anonymous namespace
-
-//.
-namespace chart
-{
-//.
-
-InsertTrendlineDialog::InsertTrendlineDialog( Window* pParent, const 
SfxItemSet& rMyAttrs ) :
-ModalDialog( pParent, SchResId( DLG_DATA_TRENDLINE )),
-rInAttrs( rMyAttrs ),
-aBtnOK( this, SchResId( BTN_OK )),
-aBtnCancel( this, SchResId( BTN_CANCEL )),
-aBtnHelp( this, SchResId( BTN_HELP )),
-m_apTrendlineResources( new TrendlineResources( this, rInAttrs, true ))
-{
-FreeResource();
-this->SetText( Objec

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 64989, which changed state.

Bug 64989 Summary: FILE SAVE:  A newline /paragraph is added after pictures 
(anchored as character) and fields, when saved as .doc
https://bugs.freedesktop.org/show_bug.cgi?id=64989

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

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

[Ivan Timofeev]

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

New commits:
commit 7c7ca0d0028cacad15a4fdc3dc02bc5f038c9f3c
Author: Ivan Timofeev 
Date:   Mon Jul 1 22:10:45 2013 +0400

WaE: pOldRanges may be used uninitialized

Change-Id: I22ff60e30b8c5697f648fcd6b7b22a302c6a2135

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1d0a8e8..3a8f7cd 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7503,7 +7503,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
 throw(uno::RuntimeException)
 {
 SolarMutexGuard aGuard;
-ScPrintRangeSaver* pOldRanges;
+ScPrintRangeSaver* pOldRanges = NULL;
 ScDocShell* pDocSh = GetDocShell();
 if ( pDocSh )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ivan Timofeev]

 vcl/inc/unx/gtk/gtkgdi.hxx|4 ++
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   39 ++
 2 files changed, 32 insertions(+), 11 deletions(-)

New commits:
commit cc06e7b6b8b73ae68a2eea72d94c6f45c9fbf497
Author: Ivan Timofeev 
Date:   Mon Jul 1 21:29:29 2013 +0400

gtk3: for checkbox map BUTTONVALUE_MIXED to GTK_STATE_FLAG_INCONSISTENT

Change-Id: I5f5810a1e2dc56afb0fba7fde20a383980e3ba51

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1821cbe..350d1e9 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -853,7 +853,9 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart
 break;
 case CTRL_CHECKBOX:
 flags = (GtkStateFlags)(flags |
-( (aValue.getTristateVal() == BUTTONVALUE_ON) ? 
GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
+( (aValue.getTristateVal() == BUTTONVALUE_ON) ? 
GTK_STATE_FLAG_ACTIVE :
+  (aValue.getTristateVal() == BUTTONVALUE_MIXED) ? 
GTK_STATE_FLAG_INCONSISTENT :
+  GTK_STATE_FLAG_NORMAL));
 context = mpCheckButtonStyle;
 styleClass = GTK_STYLE_CLASS_CHECK;
 renderType = RENDER_CHECK;
commit 76c9d45ccf8480f8b73815607ff8701a3d41a649
Author: Ivan Timofeev 
Date:   Mon Jul 1 21:24:25 2013 +0400

gtk3: add indicator-spacing to size of checkbox/radiobutton

Change-Id: Ifea43607c8cd5a8047796b7d2efdf14289b029e2

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 4d5ff7c..912e27e 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -103,6 +103,10 @@ private:
 ControlType nType,
 ControlPart nPart,
 const ImplControlValue& aValue );
+void PaintCheckOrRadio(GtkStyleContext *context,
+   cairo_t *cr,
+   const Rectangle& rControlRectangle,
+   ControlType nType);
 
 static bool style_loaded;
 };
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 3448615..1821cbe 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -751,6 +751,24 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext 
*context,
  arrowRect.GetWidth() );
 }
 
+void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context,
+   cairo_t *cr,
+   const Rectangle& rControlRectangle,
+   ControlType nType)
+{
+gint x, y, indicator_size;
+gtk_style_context_get_style(mpCheckButtonStyle,
+"indicator-size", &indicator_size,
+NULL );
+
+x = (rControlRectangle.GetWidth() - indicator_size) / 2;
+y = (rControlRectangle.GetHeight() - indicator_size) / 2;
+if (nType == CTRL_CHECKBOX)
+gtk_render_check(context, cr, x, y, indicator_size, indicator_size);
+else if (nType == CTRL_RADIOBUTTON)
+gtk_render_option(context, cr, x, y, indicator_size, indicator_size);
+}
+
 sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart 
nPart, const Rectangle& rControlRegion,
 ControlState nState, const 
ImplControlValue& aValue,
 const OUString& )
@@ -891,14 +909,8 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart
  rControlRegion.GetWidth(), 
rControlRegion.GetHeight());
 break;
 case RENDER_CHECK:
-gtk_render_check(context, cr,
- 0, 0,
- rControlRegion.GetWidth(), 
rControlRegion.GetHeight());
-break;
 case RENDER_RADIO:
-gtk_render_option(context, cr,
-  0, 0,
-  rControlRegion.GetWidth(), 
rControlRegion.GetHeight());
+PaintCheckOrRadio(context, cr, rControlRegion, nType);
 break;
 case RENDER_LINE:
 gtk_render_line(context, cr,
@@ -982,18 +994,21 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( 
ControlType nType, ControlPart
 {
 /* TODO: all this funcions needs improvements */
 Rectangle aEditRect = rControlRegion;
-gint indicator_size, point;
+gint indicator_size, indicator_spacing, point;
 
 if(((nType == CTRL_CHECKBOX) || (nType == CTRL_RADIOBUTTON)) &&
nPart == PART_ENTIRE_CONTROL)
 {
 gtk_style_context_get_style( mpCheckButtonStyle,
  "indicator-size", &indicator_size,
+ "indicator-spacing", &indicator_spacing,
   

Re: Hide and show slides from custom dialog

[Thorsten Behrens]

Guillermo Molleda Jimena wrote:
> Objective: to print a custom in PDF, hiding the rest of slides and
> presenting only those chosen.
> Can anyone help?
>
Hi Guillermo,

so you mean, beyond selecting certain slides, within that custom
selection, have some 'don't export this to pdf' meta-customization?

> I think it's something important for teachers with different
> students, the same base but different levels slide.
> 
Wouldn't that work with the custom slide shows itself, i.e. have
several different ones, for the various student levels, and then
export just the slides in the selected custom show? Can you elaborate
a bit more (preferably on the ux-advise list) how the interaction
would look like?

> But I don't know how do it.
> 
Beyond the question of the use case, and how to best do it (for which
I Cc the ux-advise list), the dialog and code to stick slide subset
selections into is:

 - impress pdf/export page render code: SdXImpressDocument::render()
   in sd/source/ui/unoidl/unomodel.cxx
 - pdf export dialog implementation: filter/source/pdf/impdialog.cxx

HTH,

-- Thorsten


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

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

[Michael Stahl]

 sw/source/filter/ww8/wrtw8nds.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a201ae63ce798438057a1328dc644dc8b64fe4e8
Author: Michael Stahl 
Date:   Mon Jul 1 19:04:38 2013 +0200

fdo#66165: WW8 export: fix duplicated paragraph breaks

MSWordExportBase::OutputTextNode(): in commit
8f2a21eac4a904db3cc4c448179e2d2cf5878ef4
(which is not merged) a "WriteCR( pTextNodeInfoInner );" was moved up
a few lines, so it shows up as context in the other commit, and
the bug is that the cherry-pick 83ba821c10392c08334f7d8d3775fe3e8d08f8fd
erroneously adds this context line so now there are 2 WriteCR().

Change-Id: I08434b284f3d8d8426fa997623be352c37d6c7c2

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 85d6b11..62b43a5 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2023,7 +2023,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& 
rNode )
 aAttrIter.OutFlys( nEnd );
 // insert final bookmarks if any before CR and after flys
 AppendBookmarks( rNode, nEnd, 1 );
-WriteCR( pTextNodeInfoInner );
 // #i120928 - position of the bullet's graphic is at end of doc
 if (bLastCR && (!bExported))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Godard]

 sc/source/filter/xml/xmltabi.cxx |   12 +---
 sc/source/ui/unoobj/cellsuno.cxx |7 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 92c7eca78e6ac84ef2b1be5dca102ecfaee9766b
Author: Laurent Godard 
Date:   Mon Jul 1 15:43:46 2013 +0200

simplify AddPrintRanges calls at import time

  - at import time, use directly core functions
  - honor IsUndoEnabled in uno calls

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

diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 1069f47..1701529 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -359,14 +359,12 @@ void ScXMLTableContext::EndElement()
 SCTAB nCurTab = rTables.GetCurrentSheet();
 if (!sPrintRanges.isEmpty())
 {
-Reference< sheet::XPrintAreas > xPrintAreas(
-rTables.GetCurrentXSheet(), UNO_QUERY);
-
-if( xPrintAreas.is() )
+ ScRangeList aRangeList;
+ScRangeStringConverter::GetRangeListFromString( aRangeList, 
sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
+size_t nCount = aRangeList.size();
+for (size_t i=0; i< nCount; i++ )
 {
-Sequence< table::CellRangeAddress > aRangeList;
-ScRangeStringConverter::GetRangeListFromString( aRangeList, 
sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
-xPrintAreas->setPrintAreas( aRangeList );
+pDoc->AddPrintRange( nCurTab, *aRangeList[i] );
 }
 }
 else if (!bPrintEntireSheet)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 763bf67..1d0a8e8 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7503,13 +7503,15 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
 throw(uno::RuntimeException)
 {
 SolarMutexGuard aGuard;
+ScPrintRangeSaver* pOldRanges;
 ScDocShell* pDocSh = GetDocShell();
 if ( pDocSh )
 {
 ScDocument* pDoc = pDocSh->GetDocument();
 SCTAB nTab = GetTab_Impl();
 
-ScPrintRangeSaver* pOldRanges = pDoc->CreatePrintRangeSaver();
+if ( pDoc->IsUndoEnabled() )
+pOldRanges = pDoc->CreatePrintRangeSaver();
 
 sal_uInt16 nCount = (sal_uInt16) aPrintAreas.getLength();
 pDoc->ClearPrintRanges( nTab );
@@ -7524,7 +7526,8 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
 }
 }
 
-PrintAreaUndo_Impl( pOldRanges );   // Undo, Umbrueche, Modified etc.
+if ( pDoc->IsUndoEnabled() )
+PrintAreaUndo_Impl( pOldRanges );   // Undo, Umbrueche, Modified 
etc.
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18npool/source/localedata/data/hr_HR.xml |  140 +++---
 1 file changed, 70 insertions(+), 70 deletions(-)

New commits:
commit cb44db2fe78b43424491d25f0c9e34f16aba5c24
Author: Eike Rathke 
Date:   Mon Jul 1 19:02:32 2013 +0200

sorted by formatindex for better comparability

Change-Id: I38f238878141b9ce7d479e66340ef3e78dc83843

diff --git a/i18npool/source/localedata/data/hr_HR.xml 
b/i18npool/source/localedata/data/hr_HR.xml
index f484830..f95dd02 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -56,55 +56,84 @@
 D.M.Y.
 D/M/Y
 D/M
-
-  MM.YY
+
+  General
 
-
-  MMM.DD
+
+  0
 
-
-  
+
+  0,00
 
-
-  QQ YY
+
+  #.##0
 
-
-  DD.MM.
+
+  #.##0,00
 
-
-  DD.MM.YY
+
+  #.###,00
 
-
-  YY-MM-DD
+
+  0,00E+00
 
-
-  -MM-DD
-  ISO 8601
+
+  0,00E+000
 
-
-  WW
+
+  0%
 
-
-  NN, DD.MMM.YY
+
+  0,00%
+
+
+  #.##0 [CURRENCY];-#.##0 [CURRENCY]
+
+
+  #.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]
+
+
+  #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]
+
+
+  #.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]
+
+
+  #.##0,00 CCC
+
+
+  #.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]
 
 
   D.MM.YY
 
-
-  MM.DD
-
 
   DD,  
 
+
+  DD.MM.YY
+
+
+  DD.MM.
+
 
   D, MMM YY
 
 
   D, MMM 
 
+
+  D, MMM 
+
 
   D,  
 
+
+  D,  YY
+
+
+  NN, DD.MMM.YY
+
 
   NN, D, MMM YY
 
@@ -114,41 +143,30 @@
 
   D,  
 
-
-  D, MMM 
-
-
-  D,  YY
-
-
-  General
-
-
-  0
-
-
-  0,00
+
+  MM.DD
 
-
-  #.##0
+
+  YY-MM-DD
 
-
-  #.##0,00
+
+  -MM-DD
+  ISO 8601
 
-
-  #.###,00
+
+  MM.YY
 
-
-  0,00E+00
+
+  MMM.DD
 
-
-  0,00E+000
+
+  
 
-
-  0%
+
+  QQ YY
 
-
-  0,00%
+
+  WW
 
 
   HH:MM
@@ -177,24 +195,6 @@
 
   DD.MM. HH:MM:SS AM/PM
 
-
-  #.##0 [CURRENCY];-#.##0 [CURRENCY]
-
-
-  #.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]
-
-
-  #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]
-
-
-  #.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]
-
-
-  #.##0,00 CCC
-
-
-  #.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]
-
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 include/svtools/roadmapwizard.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fe4a70f26107a47765348802290adef0b265997
Author: Lionel Elie Mamane 
Date:   Mon Jul 1 16:31:52 2013 +0200

typo in comment

Change-Id: Id81813365a36ce03a60f051994da8d8951c92054

diff --git a/include/svtools/roadmapwizard.hxx 
b/include/svtools/roadmapwizard.hxx
index 35067f1..27ad86b 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -42,7 +42,7 @@ namespace svt
 //
 //= RoadmapWizard
 //
-/** is - no, not a wizard for a raodmap, but the base class for wizards
+/** is - no, not a wizard for a roadmap, but the base class for wizards
 supporting a roadmap.
 
 The basic new concept introduced is a path:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin sw/source sysui/desktop

[Andre Fischer]

 solenv/bin/modules/installer/epmfile.pm |   12 +---
 sw/source/core/docnode/nodes.cxx|   24 
 sysui/desktop/debian/control|4 ++--
 3 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 7f250ed4ce273c5d54898a142f07ef93f38c3056
Author: Andre Fischer 
Date:   Mon Jul 1 15:10:21 2013 +

121479: Prevent crash when loading some RTF documents.

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1150d509..eddef2a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -522,6 +522,30 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 sal_uInt16 nSectNdCnt = 0;
 sal_Bool bSaveNewFrms = bNewFrms;
 
+// Check that the range of nodes to move is valid.
+// This is a very specific test that only checks that table nodes
+// are completely covered by the range.  Issue 121479 has a
+// document for which this test fails.
+SwNodeIndex aNodeIndex (aRg.aEnd);
+while (aNodeIndex > aRg.aStart)
+{
+SwNode* pNode = rNodes[aNodeIndex.GetIndex()];
+if (pNode->GetNodeType() != ND_ENDNODE)
+break;
+SwStartNode* pStartNode = pNode->pStartOfSection;
+if (pStartNode==NULL)
+break;
+if ( ! pStartNode->IsTableNode())
+break;
+aNodeIndex = *pStartNode;
+if (aNodeIndex < aRg.aStart.GetIndex())
+{
+return sal_False;
+}
+--aNodeIndex;
+}
+
+
 // bis alles verschoben ist
 while( aRg.aStart < aRg.aEnd )
 switch( (pAktNode = &aRg.aEnd.GetNode())->GetNodeType() )
commit e9991e068f17bbe588b97cdfa07fdd0a3f901f33
Author: Oliver-Rainer Wittmann 
Date:   Mon Jul 1 14:23:10 2013 +

121968: further changes for the creation of debian packages in order to get 
them installed when a former AOO resp. OOo version is installed.

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index cd7ed76..d0efdc0 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -538,23 +538,13 @@ sub create_epm_header
 if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; 
} # Debian allows no underline in package name
 $line = "%replaces" . " " . $onereplaces . "\n";
 push(@epmheader, $line);
-
-# Force the openofficeorg packages to get removed,
-# see 
http://www.debian.org/doc/debian-policy/ch-relationships.html
-# 7.5.2 Replacing whole packages, forcing their removal
-
-if ( $installer::globals::debian )
-{
-$line = "%incompat" . " " . $onereplaces . "\n";
-push(@epmheader, $line);
-}
 }
 
 if ( $installer::globals::debian && 
$variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
 {
 $line = "%provides" . " openoffice.org-unbundled\n";
 push(@epmheader, $line);
-$line = "%incompat" . " openoffice.org-bundled\n";
+$line = "%replaces" . " openoffice.org-bundled\n";
 push(@epmheader, $line);
 }
 }
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index a1db639..90f0c09 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -2,5 +2,5 @@ Description: %productname desktop integration
 Maintainer: Apache Software Foundation
 Architecture: all
 Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, 
openoffice.org-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, 
openoffice.org-debian-menus
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus, 
openoffice.org-bundled, openoffice.org-common
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on|66071   |

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on||66071

-- 
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: helpcontent2

[Andras Timar]

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

New commits:
commit a1df1de6ec140cfe49160fe08cc9eee7c0a60ba9
Author: Andras Timar 
Date:   Mon Jul 1 17:55:35 2013 +0200

Updated core
Project: help  a804914de5db3aef91f8c244db6acf59a1da0f78

diff --git a/helpcontent2 b/helpcontent2
index e26aa35..a804914 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e26aa35eb646a5f0e1256c72af000595c4845016
+Subproject commit a804914de5db3aef91f8c244db6acf59a1da0f78
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/text/shared/autokorr/0700.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a804914de5db3aef91f8c244db6acf59a1da0f78
Author: Andras Timar 
Date:   Mon Jul 1 17:55:35 2013 +0200

typo fix: You text -> Your text

Change-Id: I4543b50bca9bd9b8354ae0896c9d36e94606737b

diff --git a/source/text/shared/autokorr/0700.xhp 
b/source/text/shared/autokorr/0700.xhp
index c4c08b5..3a92857 100644
--- a/source/text/shared/autokorr/0700.xhp
+++ b/source/text/shared/autokorr/0700.xhp
@@ -34,7 +34,7 @@
 
 AutoCorrect has been activated
 Single quotes have been replaced
-You text was corrected by Autocorrect so that single quotation marks were 
replaced by typographical quotation marks.
+Your text was corrected by Autocorrect so that single quotation marks were 
replaced by typographical quotation marks.
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Statement - rezso

[Páder Rezső]

Hi all,


here is my license statement (for fdo#62966 and others):

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


Regards,

rezso


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 45/4614afbc43924380735b68f0f140584723d93b

[Caolán McNamara]

 45/4614afbc43924380735b68f0f140584723d93b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0fedc9dc14ba947087adf068b50e215913d2b6bd
Author: Caolán McNamara 
Date:   Mon Jul 1 16:47:55 2013 +0100

Notes added by 'git notes add'

diff --git a/45/4614afbc43924380735b68f0f140584723d93b 
b/45/4614afbc43924380735b68f0f140584723d93b
new file mode 100644
index 000..4dea33c
--- /dev/null
+++ b/45/4614afbc43924380735b68f0f140584723d93b
@@ -0,0 +1 @@
+merged as: b9ebdadf5a6ebf22b4df7589d86dd8fdfb675b1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e9/4681fb47e3c5bdba486cd8feca92705d44840d

[Caolán McNamara]

 e9/4681fb47e3c5bdba486cd8feca92705d44840d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c33c95bc3f8e6c1aa76bc75a12579405dc7835ca
Author: Caolán McNamara 
Date:   Mon Jul 1 16:47:40 2013 +0100

Notes added by 'git notes add'

diff --git a/e9/4681fb47e3c5bdba486cd8feca92705d44840d 
b/e9/4681fb47e3c5bdba486cd8feca92705d44840d
new file mode 100644
index 000..4dea33c
--- /dev/null
+++ b/e9/4681fb47e3c5bdba486cd8feca92705d44840d
@@ -0,0 +1 @@
+merged as: b9ebdadf5a6ebf22b4df7589d86dd8fdfb675b1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [No patch] Proposed tiny modification to lo-commit-stat

[Thorsten Behrens]

Adolfo Jayme Barrientos wrote:
> Oh, forgive me, Thorsten has already thought on this...
> 
Not at all - thanks for manually cleaning up, I should have noticed
earlier!

Cheers,

-- Thorsten


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

Re: Building LO 4.0.4.2 on illumos based OS

[Gabriele Bulfon]

On 01/07/13 16:43, Michael Stahl wrote:
On 01/07/13 14:58, Gabriele Bulfon wrote:
[build LNK] Executable/cppumaker
/usr/gnu/bin/ld: warning: libreg.so, needed by
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libunoidl.so,
not found (try using -rpath or -rpath-link)
I tried using the solaris.mk commented options:
@@ -120,6 +120,7 @@
-L$(SYSBASE)/lib \
-L$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
+ -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
$(SOLARLIB) \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
but no luck, still cannot solve.
did you try adding it to definition of gb_Library__get_rpath like it's
done in unxgcc.mk ? (perhaps just copy that)
ah sorry the relevant one is gb_Executable__get_rpath
I also tried using Sun ld, but looks like options for ld are always
gnu-ld ones, so compilation
stop much earlier.
...any clue?
sure, if you want to use Sun ld you need to change quite a few things in
solaris.mk to use different options.
Great suggestions! Path to the solution ;) it went through :)
Following your suggestion I found solaris.mk had many more lines about rpath,
the ones you pointed, and they were almost all changed from unxgcc.mk into
something different.
I guess the one who tried to do solaris.mk was using Sun ld instead of Gnu.
It's going on building now. ;)
Gabriele.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Frédéric Wang]

 include/xmloff/xmltoken.hxx  |3 ++
 starmath/source/mathmlexport.cxx |   42 +--
 xmloff/source/core/xmltoken.cxx  |3 ++
 3 files changed, 46 insertions(+), 2 deletions(-)

New commits:
commit bc51be7e7f2fc55456e1ce7dcdc70e6a15c53c0e
Author: Frédéric Wang 
Date:   Sat Jun 29 22:51:58 2013 +0200

 #fdo66277 - Add support for alignment in MathML export.

Change-Id: I78352ff93da5b4e912040c4019fcea924f7b0c20
Reviewed-on: https://gerrit.libreoffice.org/4625
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 5993b74..690aad0 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -430,6 +430,7 @@ namespace xmloff { namespace token {
 XML_COLUMN_NAME,
 XML_COLUMN_SEP,
 XML_COLUMN_WIDTH,
+XML_COLUMNALIGN,
 XML_COLUMNS,
 XML_COLUMNSPLIT_AUTO,
 XML_COLUMNSPLIT_AVOID,
@@ -590,6 +591,7 @@ namespace xmloff { namespace token {
 XML_DELAY,
 XML_DELETION,
 XML_DELETIONS,
+XML_DENOMALIGN,
 XML_DENOMINATOR_VALUE,
 XML_DEPENDENCE,
 XML_DEPENDENCES,
@@ -1276,6 +1278,7 @@ namespace xmloff { namespace token {
 XML_NUM_LETTER_SYNC,
 XML_NUM_PREFIX,
 XML_NUM_SUFFIX,
+XML_NUMALIGN,
 XML_NUMBER,
 XML_NUMBER_AND_NAME,
 XML_NUMBER_COLUMNS_REPEATED,
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index fbc1e97..34c6050 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -799,9 +799,25 @@ void SmXMLExport::ExportExpression(const SmNode *pNode, 
int nLevel)
 void SmXMLExport::ExportBinaryVertical(const SmNode *pNode, int nLevel)
 {
 OSL_ENSURE(pNode->GetNumSubNodes()==3,"Bad Fraction");
+const SmNode *pNum = pNode->GetSubNode(0);
+const SmNode *pDenom = pNode->GetSubNode(2);
+if (pNum->GetType() == NALIGN && pNum->GetToken().eType != TALIGNC)
+{
+// A left or right alignment is specified on the numerator:
+// attach the corresponding numalign attribute.
+AddAttribute(XML_NAMESPACE_MATH, XML_NUMALIGN,
+pNum->GetToken().eType == TALIGNL ? XML_LEFT : XML_RIGHT);
+}
+if (pDenom->GetType() == NALIGN && pDenom->GetToken().eType != TALIGNC)
+{
+// A left or right alignment is specified on the denominator:
+// attach the corresponding denomalign attribute.
+AddAttribute(XML_NAMESPACE_MATH, XML_DENOMALIGN,
+pDenom->GetToken().eType == TALIGNL ? XML_LEFT : XML_RIGHT);
+}
 SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC, 
sal_True, sal_True);
-ExportNodes(pNode->GetSubNode(0), nLevel);
-ExportNodes(pNode->GetSubNode(2), nLevel);
+ExportNodes(pNum, nLevel);
+ExportNodes(pDenom, nLevel);
 }
 
 void SmXMLExport::ExportBinaryDiagonal(const SmNode *pNode, int nLevel)
@@ -866,6 +882,19 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int 
nLevel)
 if (pTable)
 {
 pRow  = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, 
XML_MTR, sal_True, sal_True);
+if (pTemp->GetNumSubNodes() > 0)
+{
+  const SmNode *pFirstChild = pTemp->GetSubNode(0);
+  if (pFirstChild->GetType() == NALIGN &&
+  pFirstChild->GetToken().eType != TALIGNC)
+  {
+  // If a left or right alignment is specified on this 
line,
+  // attach the corresponding columnalign attribute.
+  AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN,
+  pFirstChild->GetToken().eType == TALIGNL ?
+  XML_LEFT : XML_RIGHT);
+  }
+}
 pCell = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, 
XML_MTD, sal_True, sal_True);
 }
 ExportNodes(pTemp, nLevel+1);
@@ -1481,6 +1510,15 @@ void SmXMLExport::ExportMatrix(const SmNode *pNode, int 
nLevel)
 for (sal_uLong x = 0; x < pMatrix->GetNumCols(); x++)
 if (const SmNode *pTemp = pNode->GetSubNode(i++))
 {
+if (pTemp->GetType() == NALIGN &&
+pTemp->GetToken().eType != TALIGNC)
+{
+// A left or right alignment is specified on this cell,
+// attach the corresponding columnalign attribute.
+AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN,
+pTemp->GetToken().eType == TALIGNL ?
+XML_LEFT : XML_RIGHT);
+}
 SvXMLElementExport aCell(*this, XML_NAMESPACE_MATH, XML_MTD, 
sal_True, sal_True);
 ExportNodes(pTemp, nLevel+1);
 }
diff --git a/xmloff/source/core/x

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

[Harri Pitkänen]

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/source/misc/langtab.src|2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 30213582c73f2dec6d4a980560192720f2f426ab
Author: Harri Pitkänen 
Date:   Wed Jun 19 10:07:32 2013 +0300

Add Cornish and Pite Sami to the list of spelling languages

Add Cornish (kw-UK) and Pite Sami (sje-SE) to the list of
available spell checking languages to support spell checkers
that are being currently developed:

  https://victorio.uit.no/langtech/trunk/langs/cor
  https://victorio.uit.no/langtech/trunk/langs/sje

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

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c830673..a27331f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -514,6 +514,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SIDAMA,"sid", "ET" },
 { LANGUAGE_USER_NKO,   "nqo", "GN" },
 { LANGUAGE_USER_UDMURT,"udm", "RU" },
+{ LANGUAGE_USER_CORNISH,   "kw",  "UK" },
+{ LANGUAGE_USER_SAMI_PITE_SWEDEN,  "sje", "SE" },
 { LANGUAGE_MULTIPLE,   "mul", ""   },   // multiple 
languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""   },   // undetermined 
language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""   },   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 53724c9..c2281cb 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -557,6 +557,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_NKO   0x0686
 #define LANGUAGE_USER_UDMURT0x0687
 #define LANGUAGE_USER_TIBETAN_INDIA 0x8051  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_TIBETAN)) */
+#define LANGUAGE_USER_CORNISH   0x0688
+#define LANGUAGE_USER_SAMI_PITE_SWEDEN  0x843B  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_SAMI_NORTHERN_NORWAY)) */
 
 #define LANGUAGE_USER_PRIV_JOKER0xFFEB  /* privateuse "*" (sic! 
bad! nasty!), primary 0x3eb, sub 0x3f */
 #define LANGUAGE_USER_PRIV_COMMENT  0xFFEC  /* privateuse "x-comment", 
primary 0x3ec, sub 0x3f */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f85ef6a..15abc14 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -363,6 +363,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "N'ko" ; LANGUAGE_USER_NKO ; > ;
 < "Udmurt" ; LANGUAGE_USER_UDMURT ; > ;
 < "Tibetan (India)" ; LANGUAGE_USER_TIBETAN_INDIA ; > ;
+< "Cornish" ; LANGUAGE_USER_CORNISH ; > ;
+< "Sami, Pite (Sweden)" ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC]Slide Layout Extendibility :Weekly Report #2

[Vishv Brahmbhatt]

Hello Everyone,

Here is the  
Link
to my blog for the weekly report update.

Thanks & Regards,
Vishv Brahmbhatt


On Fri, Jun 21, 2013 at 6:34 PM, Vishv Brahmbhatt <
vishvbrahmbhat...@gmail.com> wrote:

> Hello Everyone,
>
> Before the beginning of  this week ,I was debugging on impress slide
> layouts.Basically,I got to understand the mechanism of creation of slide
> layouts in the "normal" page,in the master pages like "notes" and "handout"
> and much more.
>
> Currently in the slide layouts, Placeholder object's height,width,position
> are hard-coded. So,I did following things during this week:
>
> +So at first ,I started with creation of XML file  which stores following
> information:
> (1) Layout Type
> (2) "PresObj" Kind
> (3) Position co-ordinates of "PresObj"
> (4) Size of "PreObj"(Width and Height)
>
> + I have started coding XML parser, which will read this information from
> XML file and set the appropriate parameters in the function
> "CalcAutoLayoutRectangles" (This function  calculates/sets  the Top
> Position,Height and Width of Rectangle "PresObj" used.) And this will
> parser will help in bringing configurability with Slide Layouts.
>
> + So XML parser should be fully completed, probably by "Monday" or
> "Tuesday"(mostly it should get completed by this weekend).
>
> + Next week,I will work on  understanding "Slide Mater View" and  on using
> "Slide Mater View" to edit the current built-in layouts.
>
> Regards,
> Vishv Brahmbhatt
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: shell/Package_scripts.mk shell/source vcl/inc

[Pader Rezso]

 shell/Package_scripts.mk   |4 +++-
 shell/source/unix/misc/cde-open-url.sh |   30 --
 vcl/inc/unx/desktops.hxx   |3 +--
 3 files changed, 4 insertions(+), 33 deletions(-)

New commits:
commit cea7cca5c8db3f273ed2c14efde45ff0e73dee7a
Author: Pader Rezso 
Date:   Mon Jul 1 15:38:36 2013 +0100

remove obsolete CDE integration, and make TDE launcher conditional.

Change-Id: I5e830cd3f44627d789d789748e1b0f0ff5590d91

diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index 3bccf28..d300337 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -11,8 +11,10 @@ $(eval $(call 
gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)
 
 $(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR)))
 
-$(eval $(call 
gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/cde-open-url,cde-open-url.sh))
 $(eval $(call 
gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh))
+
+ifeq ($(ENABLE_TDE),TRUE)
 $(eval $(call 
gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/tde-open-url,tde-open-url.sh))
+endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/source/unix/misc/cde-open-url.sh 
b/shell/source/unix/misc/cde-open-url.sh
deleted file mode 100644
index baa74df..000
--- a/shell/source/unix/misc/cde-open-url.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# 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 .
-#
-
-if [ -x /usr/bin/mktemp ]
-then
-  TMPFILE=`mktemp -t open-url.XX`
-else
-  DTTMPDIR=`xrdb -query | grep DtTmpDir`
-  TMPFILE=${DTTMPDIR:-$HOME/.dt/tmp}/open-url.$$
-fi
-
-if [ -z "$TMPFILE" ]; then exit 1; fi
-( echo "$1" > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) &
-exit 0
diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index 623c9f0..c97d708 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -24,10 +24,9 @@ enum DesktopType {
 DESKTOP_NONE, // headless, i.e. no X connection at all
 DESKTOP_UNKNOWN, // unknown desktop, simple WM, etc.
 DESKTOP_GNOME,
-DESKTOP_TDE,
 DESKTOP_KDE,
 DESKTOP_KDE4,
-DESKTOP_CDE
+DESKTOP_TDE
 }; // keep in sync with desktop_strings[] in salplug.cxx
 
 #endif // INCLUDED_VCL_DESKTOPS_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/calcmacros.hxx|   24 ++
 sc/inc/column.hxx|6 
 sc/inc/document.hxx  |7 
 sc/inc/dpcache.hxx   |2 
 sc/inc/dpfilteredcache.hxx   |2 
 sc/inc/dpitemdata.hxx|2 
 sc/inc/dpmacros.hxx  |   23 --
 sc/inc/dpnumgroupinfo.hxx|2 
 sc/inc/dpobject.hxx  |2 
 sc/inc/dptabdat.hxx  |2 
 sc/inc/dptabres.hxx  |2 
 sc/inc/mtvelements.hxx   |3 
 sc/inc/pivot.hxx |2 
 sc/inc/scmatrix.hxx  |3 
 sc/inc/table.hxx |7 
 sc/qa/unit/data/xls/shared-formula.xls   |binary
 sc/qa/unit/data/xlsx/shared-formula.xlsx |binary
 sc/qa/unit/filters-test.cxx  |   36 
 sc/qa/unit/subsequent_filters-test.cxx   |   37 
 sc/qa/unit/ucalc.cxx |   19 ++
 sc/source/core/data/column.cxx   |2 
 sc/source/core/data/column2.cxx  |  267 +++
 sc/source/core/data/documen2.cxx |2 
 sc/source/core/data/documen9.cxx |7 
 sc/source/core/data/document.cxx |   13 +
 sc/source/core/data/dptabsrc.cxx |2 
 sc/source/core/data/formulacell.cxx  |   16 +
 sc/source/core/data/table1.cxx   |   12 +
 sc/source/core/tool/interpr1.cxx |   65 ---
 sc/source/core/tool/scmatrix.cxx |  111 
 sc/source/ui/dbgui/fieldwnd.cxx  |2 
 31 files changed, 494 insertions(+), 186 deletions(-)

New commits:
commit bd4c6a7d7521abb0e36ebfba6e14685a1e195be8
Author: Kohei Yoshida 
Date:   Mon Jul 1 09:02:13 2013 -0400

Fix a crasher on copy to clip.

The logical row position equals the top block position plus offset within
block, not minus.

Change-Id: Ia6376d8e971f9d3379977895d14f97f43c5664ba

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a224b6f..aa82f4d1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1276,7 +1276,7 @@ public:
 
 void operator() (const sc::CellStoreType::value_type& aNode, size_t 
nOffset, size_t nDataSize)
 {
-size_t nTopRow = aNode.position - nOffset;
+size_t nTopRow = aNode.position + nOffset;
 
 switch (aNode.type)
 {
commit add9e14a4a45d29ac7284f9cecf762e3a075a01d
Author: Kohei Yoshida 
Date:   Fri Jun 28 19:37:50 2013 -0400

Add tests for matrix's min and max values, and fix one bug.

Apparently numeric_limits::min() is not to be used for signed types.

Change-Id: Ia9730328562905459eb1d3e5cfd1a023c644e219

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index be470b1..c7eda91 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2562,6 +2562,25 @@ void Test::testMatrix()
 CPPUNIT_ASSERT_EQUAL(1.5, pMat->GetDouble(0, 1));
 CPPUNIT_ASSERT_EQUAL(1.5, pMat->GetDouble(1, 0));
 CPPUNIT_ASSERT_MESSAGE("PutEmpty() call failed.", pMat->IsEmpty(1, 1));
+
+// Max and min values.
+pMat = new ScMatrix(2, 2, 0.0);
+pMat->PutDouble(-10, 0, 0);
+pMat->PutDouble(-12, 0, 1);
+pMat->PutDouble(-8, 1, 0);
+pMat->PutDouble(-25, 1, 1);
+CPPUNIT_ASSERT_EQUAL(-25.0, pMat->GetMinValue(false));
+CPPUNIT_ASSERT_EQUAL(-8.0, pMat->GetMaxValue(false));
+pMat->PutString("Test", 0, 0);
+CPPUNIT_ASSERT_EQUAL(0.0, pMat->GetMaxValue(true)); // text as zero.
+CPPUNIT_ASSERT_EQUAL(-8.0, pMat->GetMaxValue(false)); // ignore text.
+pMat->PutBoolean(true, 0, 0);
+CPPUNIT_ASSERT_EQUAL(1.0, pMat->GetMaxValue(false));
+pMat = new ScMatrix(2, 2, 10.0);
+pMat->PutBoolean(false, 0, 0);
+pMat->PutDouble(12.5, 1, 1);
+CPPUNIT_ASSERT_EQUAL(0.0, pMat->GetMinValue(false));
+CPPUNIT_ASSERT_EQUAL(12.5, pMat->GetMaxValue(false));
 }
 
 void Test::testEnterMixedMatrix()
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index bf3ea63..b0bef2e 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -940,7 +940,7 @@ public:
 
 struct MaxOp
 {
-static double init() { return std::numeric_limits::min(); }
+static double init() { return -std::numeric_limits::max(); }
 static double compare(double left, double right)
 {
 return std::max(left, right);
commit 58380c11216cb9f03a98e3d53dcee702576fedb8
Author: Kohei Yoshida 
Date:   Fri Jun 28 17:54:34 2013 -0400

Better to calculate max and min value of matrix *in* the matrix itself.

Change-Id: I410b345ac32550a188aa356e133ef8e0e9b13d9f

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 66b271b..d6ac279 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -349,6 +349,9 @@ public:
 IterateResult Product(bool bTextAsZero) const;
 size_t Count(bool bCountStrings) const;
 

Re: "_" prefix in Windows stdlib calls (was: [GSOC]Firebird Integration Weekly Update 03)

[Tor Lillqvist]

>
>
> Actually snprintf is not posix but (surprise?) C99.
>
>
Which, as far as I, know,  MSVC does not claim to conform to. What the
"stdlib" in the Subject refers to I don' t know. Standards are only worth
anything if there is a consensus among implementors to follow them.

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

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

[Khaled Hosny]

 vcl/coretext/ctfonts.cxx |   34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 8a2719b8fc65ab2f875f4d617c2202e573b7bc77
Author: Khaled Hosny 
Date:   Mon Jul 1 15:47:43 2013 +0200

Handle synthetic bold with Core Text

And fix the previous commit for synthetic italic a bit.

Change-Id: Ia5977d53739b7a6eaaccbf3aeb24adb820ca05c6

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index f5e1a98..d46d19d 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -59,6 +59,11 @@ private:
 
 // ===
 
+inline double toRadian(int nDegree)
+{
+return nDegree * (M_PI / 1800.0);
+}
+
 CTTextStyle::CTTextStyle( const FontSelectPattern& rFSD )
 :   ImplMacTextStyle( rFSD )
 ,   mpStyleDict( NULL )
@@ -69,24 +74,18 @@ CTTextStyle::CTTextStyle( const FontSelectPattern& rFSD )
 double fScaledFontHeight = pReqFont->mfExactHeight;
 
 // convert font rotation to radian
-mfFontRotation = pReqFont->mnOrientation * (M_PI / 1800.0);
+mfFontRotation = toRadian(pReqFont->mnOrientation);
+
+// dummy matrix so we can use CGAffineTransformConcat() below
+CGAffineTransform aMatrix = CGAffineTransformMakeTranslation(0, 0);
 
 // handle font stretching if any
-CGAffineTransform aMatrix = CGAffineTransformMakeScale(1.0, 1.0);
 if( (pReqFont->mnWidth != 0) && (pReqFont->mnWidth != pReqFont->mnHeight) )
 {
 mfFontStretch = (float)pReqFont->mnWidth / pReqFont->mnHeight;
 aMatrix = CGAffineTransformConcat(aMatrix, 
CGAffineTransformMakeScale(mfFontStretch, 1.0F));
 }
 
-// fake bold
-if ((pReqFont->GetWeight() >= WEIGHT_BOLD) && (mpFontData->GetWeight() < 
WEIGHT_SEMIBOLD))
-/* XXX */;
-// fake italic
-if (((pReqFont->GetSlant() == ITALIC_NORMAL) || (pReqFont->GetSlant() == 
ITALIC_OBLIQUE))
-&& !((mpFontData->GetSlant() == ITALIC_NORMAL) || (mpFontData->GetSlant() 
== ITALIC_OBLIQUE)))
-aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, 
tanf(14 * acosf(0) / 90), 1, 0, 0));
-
 // create the style object for CoreText font attributes
 static const CFIndex nMaxDictSize = 16; // TODO: does this really suffice?
 mpStyleDict = CFDictionaryCreateMutable( NULL, nMaxDictSize,
@@ -95,6 +94,21 @@ CTTextStyle::CTTextStyle( const FontSelectPattern& rFSD )
 CFBooleanRef pCFVertBool = pReqFont->mbVertical ? kCFBooleanTrue : 
kCFBooleanFalse;
 CFDictionarySetValue( mpStyleDict, kCTVerticalFormsAttributeName, 
pCFVertBool );
 
+// fake bold
+if ((pReqFont->GetWeight() >= WEIGHT_BOLD) && (mpFontData->GetWeight() < 
WEIGHT_SEMIBOLD))
+{
+int nStroke = -10.0;
+CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, 
&nStroke);
+CFDictionarySetValue(mpStyleDict, kCTStrokeWidthAttributeName, 
rStroke);
+}
+
+// fake italic
+if (((pReqFont->GetSlant() == ITALIC_NORMAL) || (pReqFont->GetSlant() == 
ITALIC_OBLIQUE))
+&& !((mpFontData->GetSlant() == ITALIC_NORMAL) || (mpFontData->GetSlant() 
== ITALIC_OBLIQUE)))
+{
+aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, 
toRadian(120), 1, 0, 0));
+}
+
 CTFontDescriptorRef pFontDesc = 
(CTFontDescriptorRef)mpFontData->GetFontId();
 CTFontRef pNewCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 
fScaledFontHeight, &aMatrix );
 CFDictionarySetValue( mpStyleDict, kCTFontAttributeName, pNewCTFont );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 85/5d5e3bc075e516edf1dc7e844924bbf9ab590c

[Caolán McNamara]

 85/5d5e3bc075e516edf1dc7e844924bbf9ab590c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit de587b0a2c1e0788322f3eab157f88bd10647a97
Author: Caolán McNamara 
Date:   Mon Jul 1 14:46:53 2013 +0100

Notes added by 'git notes add'

diff --git a/85/5d5e3bc075e516edf1dc7e844924bbf9ab590c 
b/85/5d5e3bc075e516edf1dc7e844924bbf9ab590c
new file mode 100644
index 000..3c0e422
--- /dev/null
+++ b/85/5d5e3bc075e516edf1dc7e844924bbf9ab590c
@@ -0,0 +1 @@
+merged as: 4dda042c354b4cfaf190bca35092bbd5f6dc2a1f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 chart2/source/inc/InternalDataProvider.hxx   |9 +--
 chart2/source/tools/ChartModelHelper.cxx |   32 ++-
 chart2/source/tools/InternalDataProvider.cxx |   17 +++---
 3 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit 4dda042c354b4cfaf190bca35092bbd5f6dc2a1f
Author: Armin Le Grand 
Date:   Mon Jul 1 10:43:33 2013 +

Resolves: #i120559# Corrected load for charts without RangeString...

but with local row-oriented data

(cherry picked from commit 855d5e3bc075e516edf1dc7e844924bbf9ab590c)

Conflicts:
chart2/source/tools/ChartModelHelper.cxx

Change-Id: I4979b639f5652a1c27b640b6b469f66c65a888aa

diff --git a/chart2/source/inc/InternalDataProvider.hxx 
b/chart2/source/inc/InternalDataProvider.hxx
index 3b6cd9a..71a61a5 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -71,8 +71,13 @@ class InternalDataProvider :
 {
 public:
 explicit InternalDataProvider(const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext > & _xContext);
-explicit InternalDataProvider( const ::com::sun::star::uno::Reference<
-   
::com::sun::star::chart2::XChartDocument > & xChartDoc, bool bConnectToModel );
+
+// #i120559# allow handing over a default for data orientation
+// (DataInColumns) that will be used when no data is available
+explicit InternalDataProvider(
+const ::com::sun::star::uno::Reference< 
::com::sun::star::chart2::XChartDocument > & xChartDoc,
+bool bConnectToModel,
+bool bDefaultDataInColumns );
 explicit InternalDataProvider( const InternalDataProvider & rOther );
 virtual ~InternalDataProvider();
 
diff --git a/chart2/source/tools/ChartModelHelper.cxx 
b/chart2/source/tools/ChartModelHelper.cxx
index 7002a47..5c1e78d 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -25,6 +25,8 @@
 #include "RangeHighlighter.hxx"
 #include "InternalDataProvider.hxx"
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -50,7 +52,35 @@ uno::Reference< chart2::data::XRangeHighlighter > 
ChartModelHelper::createRangeH
 uno::Reference< chart2::data::XDataProvider > 
ChartModelHelper::createInternalDataProvider(
 const uno::Reference< ::com::sun::star::chart2::XChartDocument >& 
xChartDoc, bool bConnectToModel )
 {
-return new InternalDataProvider( xChartDoc, bConnectToModel );
+bool bDefaultDataInColumns(true);
+
+// #i120559# Try to access the current state of "DataRowSource" for the
+// chart data and use it as default for creating a new InternalDataProvider
+if(xChartDoc.is())
+{
+::com::sun::star::uno::Reference< 
::com::sun::star::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY);
+
+if(xDoc.is())
+{
+::com::sun::star::uno::Reference< 
::com::sun::star::chart::XDiagram > aDiagram = xDoc->getDiagram();
+
+if(aDiagram.is())
+{
+::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY);
+
+if(xProp.is())
+{
+::com::sun::star::chart::ChartDataRowSource 
aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
+
+xProp->getPropertyValue( 
::rtl::OUString::createFromAscii("DataRowSource")) >>= aDataRowSource;
+
+bDefaultDataInColumns = 
(::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
+}
+}
+}
+}
+
+return new InternalDataProvider( xChartDoc, bConnectToModel, 
bDefaultDataInColumns );
 }
 
 uno::Reference< XDiagram > ChartModelHelper::findDiagram( const 
uno::Reference< frame::XModel >& xModel )
diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index 147afc8..2def119 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -315,8 +315,11 @@ InternalDataProvider::InternalDataProvider( const 
Reference< uno::XComponentCont
 : m_bDataInColumns( true )
 {}
 
-InternalDataProvider::InternalDataProvider( const Reference< 
chart2::XChartDocument > & xChartDoc, bool bConnectToModel )
-: m_bDataInColumns( true )
+InternalDataProvider::InternalDataProvider(
+const Reference< chart2::XChartDocument > & xChartDoc,
+bool bConnectToModel,
+bool bDefaultDataInColumns)
+:   m_bDataInColumns( bDefaultDataInColumns )
 {
 try
 {
@@ -331,7 +334,15 @@ InternalDataProvider::InternalDataProvider( const 
Reference< chart2::XChartDocum
 bool bFirstCellAsLabel = true;
 bool bHasCategories = true;
 uno::Sequence< sal_Int32 > aSequenceMapping;
-DataSourceHelper::detectRangeSegmentation( xChartModel, 
aRang

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

[Khaled Hosny]

 vcl/coretext/ctlayout.cxx |   66 +++---
 1 file changed, 51 insertions(+), 15 deletions(-)

New commits:
commit 6ccc588a522f1068706fe05f5c819e488b6628eb
Author: Khaled Hosny 
Date:   Sat Jun 29 14:43:23 2013 +0200

Fix jitter when editing RTL text

When drawing right aligned text, rounding errors in the position
returned by GetDrawPosition() cause the right margin of the text to
change whenever text width changes causing "jumping letters" effect. So
here we calculate the drawing position relative to the right margin on
our own to avoid the rounding errors. That is basically a hack, and it
should go away if one day we managed to get rid of those rounding
errors.

Continue using GetDrawPosition() for non-right aligned text, to minimize
any unforeseen side effects.

Change-Id: Ia095a17a41f723f5fb7afc99df4250262e9a0051
Reviewed-on: https://gerrit.libreoffice.org/4618
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 05f9aa8..632d6f5 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -50,6 +50,9 @@ public:
 virtual voidSimplify( bool bIsBase );
 
 private:
+CGPoint GetTextDrawPosition(void) const;
+double  GetWidth(void) const;
+
 const CTTextStyle* constmpTextStyle;
 
 // CoreText specific objects
@@ -64,7 +67,7 @@ private:
 
 // x-offset relative to layout origin
 // currently only used in RTL-layouts
-mutable longmnBaseAdv;
+mutable double  mfBaseAdv;
 };
 
 // ===
@@ -75,7 +78,7 @@ CTLayout::CTLayout( const CTTextStyle* pTextStyle )
 ,   mpCTLine( NULL )
 ,   mnCharCount( 0 )
 ,   mfCachedWidth( -1 )
-,   mnBaseAdv( 0 )
+,   mfBaseAdv( 0 )
 {
 CFRetain( mpTextStyle->GetStyleDict() );
 }
@@ -143,7 +146,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 // in RTL-layouts trailing spaces are leftmost
 // TODO: use BiDi-algorithm to thoroughly check this assumption
 if( rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL)
-mnBaseAdv = rint( fTrailingSpace );
+mfBaseAdv = fTrailingSpace;
 
 // return early if there is nothing to do
 if( nPixelWidth <= 0 )
@@ -165,11 +168,42 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 }
 CFRelease( mpCTLine );
 mpCTLine = pNewCTLine;
-mfCachedWidth = -1; // TODO: can we set it directly to target width we 
requested? For now we re-measure
+mfCachedWidth = nPixelWidth;
 }
 
 // ---
 
+// When drawing right aligned text, rounding errors in the position returned by
+// GetDrawPosition() cause the right margin of the text to change whenever text
+// width changes causing "jumping letters" effect. So here we calculate the
+// drawing position relative to the right margin on our own to avoid the
+// rounding errors. That is basically a hack, and it should go away if one day
+// we managed to get rid of those rounding errors.
+//
+// We continue using GetDrawPosition() for non-right aligned text, to minimize
+// any unforeseen side effects.
+CGPoint CTLayout::GetTextDrawPosition(void) const
+{
+float fPosX, fPosY;
+
+if (mnLayoutFlags & SAL_LAYOUT_RIGHT_ALIGN)
+{
+// text is always drawn at its leftmost point
+const Point aPos = DrawBase();
+fPosX = aPos.X() + mfBaseAdv - GetWidth();
+fPosY = aPos.Y();
+}
+else
+{
+const Point aPos = GetDrawPosition(Point(mfBaseAdv, 0));
+fPosX = aPos.X();
+fPosY = aPos.Y();
+}
+
+CGPoint aTextPos = { +fPosX, -fPosY };
+return aTextPos;
+}
+
 void CTLayout::DrawText( SalGraphics& rGraphics ) const
 {
 AquaSalGraphics& rAquaGraphics = static_cast(rGraphics);
@@ -187,8 +221,7 @@ void CTLayout::DrawText( SalGraphics& rGraphics ) const
 CGContextSetShouldAntialias( rAquaGraphics.mrContext, 
!rAquaGraphics.mbNonAntialiasedText );
 
 // Draw the text
-const Point aVclPos = GetDrawPosition( Point(mnBaseAdv,0) );
-CGPoint aTextPos = { (CGFloat) +aVclPos.X(), (CGFloat) -aVclPos.Y() };
+CGPoint aTextPos = GetTextDrawPosition();
 
 if( mpTextStyle->mfFontRotation != 0.0 )
 {
@@ -327,7 +360,7 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* 
pGlyphIDs, Point& rPos, int&
 
 // ---
 
-long CTLayout::GetTextWidth() const
+double CTLayout::GetWidth() const
 {
 if( (mnCharCount <= 0) || !mpCTLine )
 return 0;
@@ -336,10 +369,13 @@ long CTLayout::GetTextWidth() const
 mfCachedWidth = CTLineGetTypographicBounds( mpCTLine, NULL, NULL, 
NULL);
 }
 
-const long nScaledWidth = lrint( mfCachedWidth );
-return nScaledWidth;
+return mfCachedWidth;
 }
 
+long CTLayout::GetTextWid

[Libreoffice-commits] core.git: filter/source starmath/source

[Frédéric Wang]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   12 +++---
 starmath/source/mathmlexport.cxx   |   24 ++---
 2 files changed, 24 insertions(+), 12 deletions(-)

New commits:
commit 1ef63d0842dab4154c5ca2fc42e416950bd7459a
Author: Frédéric Wang 
Date:   Fri Jun 28 17:07:11 2013 +0200

 fdo#66278 - MathML export: distinguish inline/display equations.

Change-Id: Ia764c2fd64ab772342ce86f67ee290ab38dc4a83
Reviewed-on: https://gerrit.libreoffice.org/4607
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index d9de0e9..e83195c 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2949,9 +2949,7 @@
 -->


-   http://www.w3.org/1998/Math/MathML";>
-   
-   
+   

 

@@ -2966,6 +2964,12 @@


 
-   
+   
+   
+   
+   
+
+   
+   
 
 
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index fb1e6c3..fbc1e97 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -599,6 +599,22 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
 
 void SmXMLExport::_ExportContent()
 {
+uno::Reference  xModel = GetModel();
+uno::Reference  xTunnel;
+xTunnel = uno::Reference  (xModel,uno::UNO_QUERY);
+SmModel *pModel = reinterpret_cast
+(xTunnel->getSomething(SmModel::getUnoTunnelId()));
+SmDocShell *pDocShell = pModel ?
+static_cast(pModel->GetObjectShell()) : 0;
+OSL_ENSURE( pDocShell, "doc shell missing" );
+
+if (pDocShell && !pDocShell->GetFormat().IsTextmode())
+{
+// If the Math equation is not in text mode, we attach a 
display="block"
+// attribute on the  root. We don't do anything if it is in
+// text mode, the default display="inline" value will be used.
+AddAttribute(XML_NAMESPACE_MATH, XML_DISPLAY, XML_BLOCK);
+}
 SvXMLElementExport aEquation(*this, XML_NAMESPACE_MATH, XML_MATH, 
sal_True, sal_True);
 SvXMLElementExport *pSemantics=0;
 
@@ -613,14 +629,6 @@ void SmXMLExport::_ExportContent()
 if (aText.Len())
 {
 // Convert symbol names
-uno::Reference  xModel = GetModel();
-uno::Reference  xTunnel;
-xTunnel = uno::Reference  (xModel,uno::UNO_QUERY);
-SmModel *pModel = reinterpret_cast
-(xTunnel->getSomething(SmModel::getUnoTunnelId()));
-SmDocShell *pDocShell = pModel ?
-static_cast(pModel->GetObjectShell()) : 0;
-OSL_ENSURE( pDocShell, "doc shell missing" );
 if (pDocShell)
 {
 SmParser &rParser = pDocShell->GetParser();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/source/ui/condformat/condformatdlgentry.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 22f2ad0088d57fc9e3a0bd8b975a5c549810fa7d
Author: Markus Mohrhard 
Date:   Sat Jun 29 05:38:37 2013 +0200

hide the style boxes to collapse the date entries fully

Change-Id: I58f06a57a05ef007afc203c737acfe29df6ea6a3
(cherry picked from commit def32c7e14ad9743e2b55804442be5d596f6c21c)
Reviewed-on: https://gerrit.libreoffice.org/4617
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index e0f78a5..2fb93e0 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1258,6 +1258,7 @@ void ScDateFrmtEntry::SetActive()
 maLbDateEntry.Show();
 maFtStyle.Show();
 maWdPreview.Show();
+maLbStyle.Show();
 
 Select();
 }
@@ -1267,6 +1268,7 @@ void ScDateFrmtEntry::SetInactive()
 maLbDateEntry.Hide();
 maFtStyle.Hide();
 maWdPreview.Hide();
+maLbStyle.Hide();
 
 Deselect();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/source/ui/condformat/condformatdlgentry.cxx |   57 -
 sc/source/ui/inc/condformatdlgentry.hxx|   14 +-
 2 files changed, 67 insertions(+), 4 deletions(-)

New commits:
commit 8c69cc28fd6cb9ac22f1c896d6007d92dffe9012
Author: Markus Mohrhard 
Date:   Sat Jun 29 05:16:14 2013 +0200

update all style lists when a new style is added

Change-Id: Ib404958e2bc0e3bfe075d1c94f348e907ee004c8
(cherry picked from commit aa028cab4a72660c773a9eac0cd8a19a0d655c01)
Reviewed-on: https://gerrit.libreoffice.org/4616
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 46feaa8..e0f78a5 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -167,7 +167,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* 
pParent, ScDocument* pDoc, c
 maEdVal2( this, NULL, NULL, ScResId( ED_VAL2 ) ),
 maFtStyle( this, ScResId( FT_STYLE ) ),
 maLbStyle( this, ScResId( LB_STYLE ) ),
-maWdPreview( this, ScResId( WD_PREVIEW ) )
+maWdPreview( this, ScResId( WD_PREVIEW ) ),
+mbIsInStyleCreate(false)
 {
 
 FreeResource();
@@ -175,6 +176,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* 
pParent, ScDocument* pDoc, c
 
 Init();
 
+StartListening(*pDoc->GetStyleSheetPool(), true);
+
 if(pFormatEntry)
 {
 OUString aStyleName = pFormatEntry->GetStyle();
@@ -436,6 +439,35 @@ void ScConditionFrmtEntry::SetInactive()
 
 namespace {
 
+void UpdateStyleList(ListBox& rLbStyle, ScDocument* pDoc)
+{
+OUString aSelectedStyle = rLbStyle.GetSelectEntry();
+for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i)
+{
+rLbStyle.RemoveEntry(i);
+}
+FillStyleListBox(pDoc, rLbStyle);
+rLbStyle.SelectEntry(aSelectedStyle);
+}
+
+}
+
+void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const SfxHint& rHint)
+{
+SfxStyleSheetHint* pHint = PTR_CAST(SfxStyleSheetHint, &rHint);
+if(!pHint)
+return;
+
+sal_uInt16 nHint = pHint->GetHint();
+if(nHint == SFX_STYLESHEET_MODIFIED)
+{
+if(!mbIsInStyleCreate)
+UpdateStyleList(maLbStyle, mpDoc);
+}
+}
+
+namespace {
+
 void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& 
rWdPreview )
 {
 if(rLbStyle.GetSelectEntryPos() == 0)
@@ -503,7 +535,9 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, 
SvxFontPrevWindow& rWdPre
 
 IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl)
 {
+mbIsInStyleCreate = true;
 StyleSelect( maLbStyle, mpDoc, maWdPreview );
+mbIsInStyleCreate = false;
 return 0;
 }
 
@@ -1189,11 +1223,14 @@ ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, 
ScDocument* pDoc, const ScCon
 maLbDateEntry( this, ScResId( LB_DATE_TYPE ) ),
 maFtStyle( this, ScResId( FT_STYLE ) ),
 maLbStyle( this, ScResId( LB_STYLE ) ),
-maWdPreview( this, ScResId( WD_PREVIEW ) )
+maWdPreview( this, ScResId( WD_PREVIEW ) ),
+mbIsInStyleCreate(false)
 {
 Init();
 FreeResource();
 
+StartListening(*pDoc->GetStyleSheetPool(), sal_True);
+
 if(pFormat)
 {
 sal_Int32 nPos = static_cast(pFormat->GetDateType());
@@ -1234,6 +1271,20 @@ void ScDateFrmtEntry::SetInactive()
 Deselect();
 }
 
+void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint )
+{
+SfxStyleSheetHint* pHint = PTR_CAST(SfxStyleSheetHint, &rHint);
+if(!pHint)
+return;
+
+sal_uInt16 nHint = pHint->GetHint();
+if(nHint == SFX_STYLESHEET_MODIFIED)
+{
+if(!mbIsInStyleCreate)
+UpdateStyleList(maLbStyle, mpDoc);
+}
+}
+
 ScFormatEntry* ScDateFrmtEntry::GetEntry() const
 {
 ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
@@ -1250,7 +1301,9 @@ OUString ScDateFrmtEntry::GetExpressionString()
 
 IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl )
 {
+mbIsInStyleCreate = true;
 StyleSelect( maLbStyle, mpDoc, maWdPreview );
+mbIsInStyleCreate = false;
 
 return 0;
 }
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx 
b/sc/source/ui/inc/condformatdlgentry.hxx
index 7727d28..77054ab 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -11,6 +11,8 @@
 #include "conditio.hxx"
 #include 
 
+#include 
+
 class ScIconSetFrmtDataEntry;
 
 namespace condformat {
@@ -76,7 +78,7 @@ public:
 virtual condformat::entry::ScCondFrmtEntryType GetType() = 0;
 };
 
-class ScConditionFrmtEntry : public ScCondFrmtEntry
+class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener
 {
 //cond format ui elements
 ListBox maLbCondType;
@@ -85,6 +87,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry
 FixedText maFtStyle;
 ListBox maLbStyle;
 SvxFontPrevWindow maWdPreview;
+bool mbIsInStyleCreate;
 
 ScFormatEntry* createConditionEntr

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

[Markus Mohrhard]

 sc/source/filter/xml/xmlcondformat.cxx |5 +++--
 sc/source/filter/xml/xmlexprt.cxx  |6 --
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 297363822d460321c0b3bdd4a8acc9f689f4661b
Author: Markus Mohrhard 
Date:   Sat Jun 29 02:50:48 2013 +0200

handle localized default style names, fdo#61339

We need to map localized style names during import and export from and
to ODF. The default styles are the only localized style names and are
not imported with the name written into the file.

Change-Id: Ibdc2f750b7a4b7ce6994b22248e237fe95ac638d
(cherry picked from commit 5b9bad7482a98f2d0d37c4b75a13292abe653ea3)
Reviewed-on: https://gerrit.libreoffice.org/4615
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/filter/xml/xmlcondformat.cxx 
b/sc/source/filter/xml/xmlcondformat.cxx
index 41f4f3d..afeec54 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -18,6 +18,7 @@
 #include "rangeutl.hxx"
 #include "docfunc.hxx"
 #include "XMLConverter.hxx"
+#include "stylehelper.hxx"
 
 
 ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& 
rImport, sal_uInt16 nPrfx,
@@ -566,7 +567,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, 
sal_uInt16 nPrfx,
 sExpression = sValue;
 break;
 case XML_TOK_CONDITION_APPLY_STYLE_NAME:
-sStyle = sValue;
+sStyle = 
ScStyleNameConversion::ProgrammaticToDisplayName(sValue, SFX_STYLE_FAMILY_PARA 
);
 break;
 case XML_TOK_CONDITION_BASE_CELL_ADDRESS:
 sAddress = sValue;
@@ -764,7 +765,7 @@ ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, 
sal_uInt16 nPrfx,
 sDateType = sValue;
 break;
 case XML_TOK_COND_DATE_STYLE:
-sStyle = sValue;
+sStyle = 
ScStyleNameConversion::ProgrammaticToDisplayName(sValue, SFX_STYLE_FAMILY_PARA 
);
 break;
 default:
 break;
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 2b72e89..9089f27 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -59,6 +59,7 @@
 #include "colorscale.hxx"
 #include "conditio.hxx"
 #include "cellvalue.hxx"
+#include "stylehelper.hxx"
 
 #include 
 #include 
@@ -4011,7 +4012,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
 default:
 SAL_WARN("sc", "unimplemented conditional 
format export");
 }
-OUString sStyle = pEntry->GetStyle();
+OUString sStyle = 
ScStyleNameConversion::DisplayToProgrammaticName(pEntry->GetStyle(), 
SFX_STYLE_FAMILY_PARA);
 AddAttribute(XML_NAMESPACE_CALC_EXT, 
XML_APPLY_STYLE_NAME, sStyle);
 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, 
aCond.makeStringAndClear());
 
@@ -4138,7 +4139,8 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
 {
 const ScCondDateFormatEntry& mrDateFormat = 
static_cast(*pFormatEntry);
 OUString aDateType = 
getDateStringForType(mrDateFormat.GetDateType());
-AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, 
mrDateFormat.GetStyleName());
+OUString aStyleName = 
ScStyleNameConversion::DisplayToProgrammaticName(mrDateFormat.GetStyleName(), 
SFX_STYLE_FAMILY_PARA );
+AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, 
aStyleName);
 AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE, 
aDateType);
 SvXMLElementExport aElementDateFormat(*this, 
XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, 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-1' - sc/inc sc/Library_sc.mk sc/source

[Markus Mohrhard]

 sc/Library_sc.mk|1 
 sc/inc/stylehelper.hxx  |   29 ++
 sc/inc/styleuno.hxx |9 --
 sc/source/core/tool/stylehelper.cxx |  157 
 sc/source/ui/unoobj/cellsuno.cxx|1 
 sc/source/ui/unoobj/fmtuno.cxx  |1 
 sc/source/ui/unoobj/styleuno.cxx|  143 
 7 files changed, 190 insertions(+), 151 deletions(-)

New commits:
commit 902f6d61e1e9ffdf39544d8b168996b0093ac57e
Author: Markus Mohrhard 
Date:   Sat Jun 29 02:06:25 2013 +0200

extract this functionality from the uno code

we need this code in our next step for some mappings in the filters code

Change-Id: I059d9d05877846215e1a967123dc253de605417e
(cherry picked from commit b3aabf223ec7bc2678fd6dfb79ab7f079e5b)
Reviewed-on: https://gerrit.libreoffice.org/4614
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 94ad19e..2583937 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -238,6 +238,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/scmatrix \
sc/source/core/tool/simplerangelist \
sc/source/core/tool/stringutil \
+   sc/source/core/tool/stylehelper \
sc/source/core/tool/subtotal \
sc/source/core/tool/token \
sc/source/core/tool/typedstrdata \
diff --git a/sc/inc/stylehelper.hxx b/sc/inc/stylehelper.hxx
new file mode 100644
index 000..31f79d1
--- /dev/null
+++ b/sc/inc/stylehelper.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
+#include 
+
+class ScStyleNameConversion
+{
+public:
+static OUString DisplayToProgrammaticName( const OUString& rDispName, 
sal_uInt16 nType );
+static OUString ProgrammaticToDisplayName( const OUString& rProgName, 
sal_uInt16 nType );
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index bd7d8a4..29ab960 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -43,15 +43,6 @@ class ScDocShell;
 class ScStyleFamilyObj;
 class ScStyleObj;
 
-
-class ScStyleNameConversion
-{
-public:
-static String DisplayToProgrammaticName( const String& rDispName, 
sal_uInt16 nType );
-static String ProgrammaticToDisplayName( const String& rProgName, 
sal_uInt16 nType );
-};
-
-
 class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4<
 ::com::sun::star::container::XIndexAccess,
 ::com::sun::star::container::XNameAccess,
diff --git a/sc/source/core/tool/stylehelper.cxx 
b/sc/source/core/tool/stylehelper.cxx
new file mode 100644
index 000..a5e5b5b
--- /dev/null
+++ b/sc/source/core/tool/stylehelper.cxx
@@ -0,0 +1,157 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
+#include 
+
+#include "stylehelper.hxx"
+#include "global.hxx"
+#include "globstr.hrc"
+
+//  conversion programmatic <-> display (visible) name
+//  currently, the core always has the visible names
+//  the api is required to use programmatic names for default styles
+//  these programmatic names must never change!
+
+#define SC_STYLE_PROG_STANDARD  "Default"
+#define SC_STYLE_PR

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

[Markus Mohrhard]

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 336d684a940165d15b3581a72d8bd45743bf98ee
Author: Markus Mohrhard 
Date:   Sat Jun 29 01:08:22 2013 +0200

only clean the cond format if we want to write attribs, fdo#62267

Change-Id: I2f4feecb3180b165f6b9b299ecb3dcdbb65f87e3
(cherry picked from commit d4f631e8ceb7f02a18565cf0470c8170215e69f8)
Reviewed-on: https://gerrit.libreoffice.org/4613
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 5df2ac1..a44c602 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -775,7 +775,7 @@ void ScTable::CopyFromClip(
 aCol[i].CopyFromClip(rCxt, nRow1, nRow2, nDy, pTable->aCol[i - 
nDx]);
 
 
-if (rCxt.getInsertFlag() != IDF_OBJECTS)
+if (rCxt.getInsertFlag() == IDF_ATTRIB)
 {
 // make sure that there are no old references to the cond formats
 sal_uInt16 nWhichArray[2];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/source/ui/condformat/condformatdlgentry.cxx |   28 +++--
 1 file changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 9b557cfd01131544639285dace81e11ed3c49aa7
Author: Markus Mohrhard 
Date:   Thu Jun 27 20:44:19 2013 +0200

use the local setting aware method for the UI, fdo#64754

Change-Id: Ie3117c26b347e1a8996ef9cbcb8b0d6ee561b5b3
(cherry picked from commit a539cf2c09bdd62d1c4a0124ed536f88d4fd01d5)
Reviewed-on: https://gerrit.libreoffice.org/4612
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index d8acc85..46feaa8 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -596,6 +596,14 @@ void ScFormulaFrmtEntry::SetInactive()
 
 namespace {
 
+OUString convertNumberToString(double nVal, ScDocument* pDoc)
+{
+SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+OUString aText;
+pNumberFormatter->GetInputLineString(nVal, 0, aText);
+return aText;
+}
+
 void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& 
rLbType, Edit& rEdit, ColorListBox& rLbCol, ScDocument* pDoc )
 {
 // entry Automatic is not available for color scales
@@ -612,10 +620,7 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& 
rEntry, ListBox& rLbType,
 case COLORSCALE_PERCENT:
 {
 double nVal = rEntry.GetValue();
-SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
-OUString aText;
-pNumberFormatter->GetInputLineString(nVal, 0, aText);
-rEdit.SetText(aText);
+rEdit.SetText(convertNumberToString(nVal, pDoc));
 }
 break;
 case COLORSCALE_FORMULA:
@@ -1259,14 +1264,15 @@ class ScIconSetFrmtDataEntry : public Control
 ListBox maLbEntryType;
 
 public:
-ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, 
sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
+ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, 
ScDocument* pDoc,
+sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
 
 ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& 
rPos) const;
 
 void SetFirstEntry();
 };
 
-ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType 
eType, sal_Int32 i, const ScColorScaleEntry* pEntry ):
+ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType 
eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry ):
 Control( pParent, ScResId( RID_ICON_SET_ENTRY ) ),
 maImgIcon( this, ScResId( IMG_ICON ) ),
 maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ),
@@ -1280,15 +1286,15 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* 
pParent, ScIconSetType e
 {
 case COLORSCALE_VALUE:
 maLbEntryType.SelectEntryPos(0);
-maEdEntry.SetText(OUString::valueOf(pEntry->GetValue()));
+maEdEntry.SetText(convertNumberToString(pEntry->GetValue(), 
pDoc));
 break;
 case COLORSCALE_PERCENTILE:
 maLbEntryType.SelectEntryPos(2);
-maEdEntry.SetText(OUString::valueOf(pEntry->GetValue()));
+maEdEntry.SetText(convertNumberToString(pEntry->GetValue(), 
pDoc));
 break;
 case COLORSCALE_PERCENT:
 maLbEntryType.SelectEntryPos(1);
-maEdEntry.SetText(OUString::valueOf(pEntry->GetValue()));
+maEdEntry.SetText(convertNumberToString(pEntry->GetValue(), 
pDoc));
 break;
 case COLORSCALE_FORMULA:
 maLbEntryType.SelectEntryPos(3);
@@ -1367,7 +1373,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, 
ScDocument* pDoc, const
 for(size_t i = 0, n = pIconSetFormatData->maEntries.size();
 i < n; ++i)
 {
-maEntries.push_back( new ScIconSetFrmtDataEntry( this, eType, i, 
&pIconSetFormatData->maEntries[i] ) );
+maEntries.push_back( new ScIconSetFrmtDataEntry( this, eType, 
pDoc, i, &pIconSetFormatData->maEntries[i] ) );
 Point aPos = maEntries[0].GetPosPixel();
 aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
 maEntries[i].SetPosPixel( aPos );
@@ -1397,7 +1403,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 
 for(size_t i = 0; i < nElements; ++i)
 {
-maEntries.push_back( new ScIconSetFrmtDataEntry( this, 
static_cast(nPos), i ) );
+maEntries.push_back( new ScIconSetFrmtDataEntry( this, 
static_cast(nPos), mpDoc, i ) );
 Point aPos = maEntries[0].GetPosPixel();
 aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
 maEntries[i].SetPos

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

[Lionel Elie Mamane]

 dbaccess/source/ui/dlg/generalpage.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a94f9210ca74ea959a59dbb4cb6ea05b6450118
Author: Lionel Elie Mamane 
Date:   Wed Jun 5 10:24:25 2013 +0200

fdo#64447 when changing setup mode, trigger changed DatasourceType event

Change-Id: I961118331f534de103b83766a2c21a6bec479241
Reviewed-on: https://gerrit.libreoffice.org/4430
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 354d3e9..2c32e94 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -578,6 +578,7 @@ namespace dbaui
 {
 if ( m_aCreationModeHandler.IsSet() )
 m_aCreationModeHandler.Call(this);
+OnDatasourceTypeSelected(m_pDatasourceType.get());
 return 1L;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/data/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a189859341240afedb5293ed50e6da15cc0518b1
Author: Kohei Yoshida 
Date:   Mon Jul 1 09:02:13 2013 -0400

Fix a crasher on copy to clip.

The logical row position equals the top block position plus offset within
block, not minus.

Change-Id: Ia6376d8e971f9d3379977895d14f97f43c5664ba

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 25a20f6..edd552b 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1276,7 +1276,7 @@ public:
 
 void operator() (const sc::CellStoreType::value_type& aNode, size_t 
nOffset, size_t nDataSize)
 {
-size_t nTopRow = aNode.position - nOffset;
+size_t nTopRow = aNode.position + nOffset;
 
 switch (aNode.type)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Petr Mladek]

 dbaccess/source/ui/dlg/generalpage.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 40d76398f2be1f6efb11f79865c3b8adc3186f24
Author: Petr Mladek 
Date:   Tue May 21 10:46:45 2013 +0200

allow to create new database using the wizard again (fdo#62937)

To be honest, I do not userstand the code much. Julien pointed out that
the setParentTitle and onTypeSelected were newer called. The condition
looked like an optimisation and it helped to remove it.

It would be great to put it back. It might be enough to hand the
intial values.

Change-Id: Id06cc9c63a9e578cb3c698c8526851fec71ef9da
Reviewed-on: https://gerrit.libreoffice.org/4429
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index f637155..354d3e9 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -357,7 +357,6 @@ namespace dbaui
 sConnectURL = pUrlItem->GetValue();
 }
 
-::rtl::OUString eOldSelection = m_eCurrentSelection;
 m_eNotSupportedKnownType =  ::dbaccess::DST_UNKNOWN;
 implSetCurrentType(  ::rtl::OUString() );
 
@@ -388,11 +387,9 @@ namespace dbaui
 m_pDatasourceType->SelectEntry(sDisplayName);
 
 // notify our listener that our type selection has changed (if so)
-if ( eOldSelection != m_eCurrentSelection )
-{
-setParentTitle(m_eCurrentSelection);
-onTypeSelected(m_eCurrentSelection);
-}
+// FIXME: how to detect that it did not changed? (fdo#62937)
+setParentTitle(m_eCurrentSelection);
+onTypeSelected(m_eCurrentSelection);
 
 // a special message for the current page state
 switchMessage(m_eCurrentSelection);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: "_" prefix in Windows stdlib calls (was: [GSOC]Firebird Integration Weekly Update 03)

[Tor Lillqvist]

> a lot of 'normal' c/posix function 'foo' are named _foo on windows for
> some reason...
>
>
That would be POSIX functions in particular, because (surprise?) Windows is
not POSIX. The C library has some nominally POSIX-like API but don't let
that fool you into thinking it would attempt any "emulation".

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

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 747988e8362faeb3f18271d8b33cf55905e5e860
Author: Kohei Yoshida 
Date:   Mon Jul 1 09:02:13 2013 -0400

Fix a crasher on copy to clip.

The logical row position equals the top block position plus offset within
block, not minus.

Change-Id: Ia6376d8e971f9d3379977895d14f97f43c5664ba

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a224b6f..aa82f4d1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1276,7 +1276,7 @@ public:
 
 void operator() (const sc::CellStoreType::value_type& aNode, size_t 
nOffset, size_t nDataSize)
 {
-size_t nTopRow = aNode.position - nOffset;
+size_t nTopRow = aNode.position + nOffset;
 
 switch (aNode.type)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LO 4.0.4.2 on illumos based OS

[Gabriele Bulfon]

On Mon, Jul 1, 2013 at 6:39 AM, Gabriele Bulfon
gabriele.bul...@sonicle.com
wrote:
Hi, because I need to work on a consolidated tar.gz source version, I'm not
using master, so
I cannot pull changes at the moment.
Can you suggest me what modifications I need?
http://cgit.freedesktop.org/libreoffice/core/commit/?id=99a4baf89c470d1e73b4e87fe9adf37a09230a2c
Ok, now I'm stuck again with libreg.so not being resolved:
[build LNK] Executable/cppumaker
/usr/gnu/bin/ld: warning: libreg.so, needed by 
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libunoidl.so,
 not found (try using -rpath or -rpath-link)
I tried using the solaris.mk commented options:
@@ -120,6 +120,7 @@
-L$(SYSBASE)/lib \
-L$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
+   -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
$(SOLARLIB) \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
but no luck, still cannot solve.
I also tried using Sun ld, but looks like options for ld are always gnu-ld 
ones, so compilation
stop much earlier.
...any clue?
Gabriele.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/sfx2 sc/inc

[Caolán McNamara]

 include/sfx2/sfxsids.hrc |1 +
 sc/inc/sc.hrc|3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d4d5c97b4eb0b0d28aac635482bca547d60b7cdc
Author: Caolán McNamara 
Date:   Mon Jul 1 11:46:05 2013 +0100

Resolves: fdo#66263 calc's protect records doesn't do anything, sid 
collision

Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef
(cherry picked from commit 257ba103fb9ffae87189eb5d435969961fe4e98c)
Reviewed-on: https://gerrit.libreoffice.org/4651
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index d1227e3..f17124a 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -750,6 +750,7 @@
 #define SC_VIEW_START   (SID_SC_START)
 #endif
 #define FID_CHG_RECORD  (EDIT_MENU_START + 18)
+//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
 #define SID_CHG_PROTECT (SC_VIEW_START + 84)
 
 // eof 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6fbe3f0..b688cdd 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -123,6 +123,7 @@
 #define SID_NUMBER_DECDEC   (SC_VIEW_START + 58)
 
 // misc:
+#define SID_COLLABORATION   (SC_VIEW_START + 59)
 #define SID_LINKS   (SC_VIEW_START + 60)
 #define SID_INSERT_SIMAGE   (SC_VIEW_START + 61)
 #define SID_INSERT_SMATH(SC_VIEW_START + 63)
@@ -153,7 +154,7 @@
 
 #define SID_CHOOSE_DESIGN   (SC_VIEW_START + 82)
 #define SID_EURO_CONVERTER  (SC_VIEW_START + 83)
-#define SID_COLLABORATION   (SC_VIEW_START + 84)
+//See include/sfx2/sfxsids.hrc for reserved usage of (SC_VIEW_START + 84)
 #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85)
 
 #define SID_SC_INPUT_TEXTWYSIWYG(SC_VIEW_START + 86)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311

[Caolán McNamara]

 16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2271d0218cec9d7677a1c3d29a5b7c2ddf5598c4
Author: Caolán McNamara 
Date:   Mon Jul 1 13:54:17 2013 +0100

Notes added by 'git notes add'

diff --git a/16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311 
b/16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311
new file mode 100644
index 000..82f2fd8
--- /dev/null
+++ b/16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311
@@ -0,0 +1 @@
+merged as: a70d429b96be02f0aa407216ab91edbe7883c7c7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sun Ying]

 sd/source/filter/eppt/eppt.hxx   |2 
 sd/source/filter/eppt/epptso.cxx |  213 +--
 2 files changed, 121 insertions(+), 94 deletions(-)

New commits:
commit a70d429b96be02f0aa407216ab91edbe7883c7c7
Author: Sun Ying 
Date:   Wed Sep 12 01:09:22 2012 +

Resolves: #i120730# fix table with merged cell becoming group shape...

when exporting ppt file

Reported by: Liu Ping Tan
Patch by: Ying Sun
Review by: Jian Yuan Li

(cherry picked from commit 1619e67c0c225ca6cc14a1fbebd4a97fb1b26311)

Conflicts:
sd/source/filter/eppt/epptso.cxx

Change-Id: I96ff7d3e2b3f822a5ba84e918f20b2dff81e5a70

diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 982ddee..42f7226 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -266,7 +266,7 @@ class PPTWriter : public PPTWriterBase, public 
PPTExBulletProvider
 PageType ePageType,
 sal_Bool bMaster,
 int nPageNumber = 
0 );
-voidImplCreateCellBorder( const CellBorder* 
pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
+sal_BoolImplCreateCellBorder( const CellBorder* 
pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
 voidImplCreateTable( com::sun::star::uno::Reference< 
com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& 
aSolverContainer,
 EscherPropertyContainer& aPropOpt );
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 16552a8..7a0ebb7 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3580,11 +3580,12 @@ struct CellBorder
 CellBorder() : mnPos ( 0 ), mnLength( 0 ){};
 };
 
-void PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 
nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 )
+sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, 
sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2)
 {
 sal_Int32 nLineWidth = pCellBorder->maCellBorder.OuterLineWidth + 
pCellBorder->maCellBorder.InnerLineWidth;
 if ( nLineWidth )
 {
+nLineWidth *= 2;
 mnAngle = 0;
 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
 EscherPropertyContainer aPropOptSp;
@@ -3609,7 +3610,44 @@ void PPTWriter::ImplCreateCellBorder( const CellBorder* 
pCellBorder, sal_Int32 n
 << nX2
 << nY2;
 mpPptEscherEx->CloseContainer();
+return sal_True;
 }
+return sal_False;
+}
+
+//get merged cell's width
+sal_Int32 GetCellRight( sal_Int32 nColumn,
+Rectangle& rect,
+std::vector< std::pair< sal_Int32, sal_Int32 > >& aColumns,
+uno::Reference< table::XMergeableCell >& xCell )
+{
+sal_Int32 nRight = aColumns[ nColumn ].first + aColumns[ nColumn ].second;
+for ( sal_Int32 nColumnSpan = 1; nColumnSpan < xCell->getColumnSpan(); 
nColumnSpan++ )
+{
+sal_uInt32 nC = nColumnSpan + nColumn;
+if ( nC < aColumns.size() )
+nRight += aColumns[ nC ].second;
+else
+nRight = rect.Right();
+}
+return nRight;
+}
+//get merged cell's height
+sal_Int32 GetCellBottom( sal_Int32 nRow,
+Rectangle& rect,
+std::vector< std::pair< sal_Int32, sal_Int32 > >& aRows,
+uno::Reference< table::XMergeableCell >& xCell )
+{
+sal_Int32 nBottom = aRows[nRow].first + aRows[nRow].second;
+for ( sal_Int32 nRowSpan = 1; nRowSpan < xCell->getRowSpan(); nRowSpan++ )
+{
+sal_uInt32 nR = nRowSpan + nRow;
+if ( nR < aRows.size() )
+nBottom += aRows[ nR ].second;
+else
+nBottom = rect.Bottom();
+}
+return nBottom;
 }
 
 void PPTWriter::WriteCString( SvStream& rSt, const String& rString, sal_uInt32 
nInstance )
@@ -3718,25 +3756,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< 
drawing::XShape >& rXShape, Esc
 {
 sal_Int32 nLeft   = aColumns[ nColumn ].first;
 sal_Int32 nTop= aRows[ nRow ].first;
-sal_Int32 nRight  = nLeft + aColumns[ nColumn 
].second;
-sal_Int32 nBottom = nTop + aRows[ nRow ].second;
-
-for ( sal_Int32 nColumnSpan = 1; nColumnSpan < 
xCell->getColumnSpan(); nColumnSpan++ )
-{
-sal_uInt32 nC = nColumnSpan + nColumn;
-if ( nC < aColumns.size() )
-nRight += aColumns[ nC ].second;
-else
-nRight = maRect.Right

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

[Michael Stahl]

 unotest/source/cpp/bootstrapfixturebase.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 247b182fc55a05e9cd54b94dbf3de7ba9a13094f
Author: Michael Stahl 
Date:   Mon Jul 1 14:40:45 2013 +0200

unotest: re-add test::BootstrapFixtureBase::getPathFromWorkdir

also erroneously removed in 6a59659541e45198b8cda162f87f6abcd68c6101

Change-Id: Id9e942cf012d901546b5b403d0d04e749fd20695

diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx 
b/unotest/source/cpp/bootstrapfixturebase.cxx
index 1ffab1e..31a5d44 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -76,6 +76,21 @@ OUString test::BootstrapFixtureBase::getPathFromSrc( const 
char *pPath )
 return m_aSrcRootPath + OUString::createFromAscii( pPath );
 }
 
+// just temporarily ifdef this out as it's currently unused (callcatcher)
+// if you start using it on linux just remove the ifdef
+#ifndef LINUX
+OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath )
+{
+return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
+}
+
+OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
+{
+return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
+
+}
+#endif
+
 void test::BootstrapFixtureBase::setUp()
 {
 // set UserInstallation to user profile dir in test/user-template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Wielaard]

 io/source/TextInputStream/TextInputStream.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2fc0fa62b26ce34675fcb94de59194592421eeb5
Author: Mark Wielaard 
Date:   Sun Jun 30 17:03:37 2013 +0200

Fix memory leak in OTextInputStream.

Delete mpBuffer when done in destructor or replaced in implResizeBuffer.

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

diff --git a/io/source/TextInputStream/TextInputStream.cxx 
b/io/source/TextInputStream/TextInputStream.cxx
index ff734fa..0d6645d 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -128,6 +128,8 @@ OTextInputStream::~OTextInputStream()
 rtl_destroyUnicodeToTextContext( mConvText2Unicode, 
mContextText2Unicode );
 rtl_destroyUnicodeToTextConverter( mConvText2Unicode );
 }
+
+delete[] mpBuffer;
 }
 
 void OTextInputStream::implResizeBuffer( void )
@@ -135,6 +137,7 @@ void OTextInputStream::implResizeBuffer( void )
 sal_Int32 mnNewBufferSize = mnBufferSize * 2;
 sal_Unicode* pNewBuffer = new sal_Unicode[ mnNewBufferSize ];
 memcpy( pNewBuffer, mpBuffer, mnCharsInBuffer * sizeof( sal_Unicode ) );
+delete[] mpBuffer;
 mpBuffer = pNewBuffer;
 mnBufferSize = mnNewBufferSize;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Wielaard]

 sw/source/filter/ww8/ww8par3.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5c3f673c1ff25c835da6b905a63b36087aaa405e
Author: Mark Wielaard 
Date:   Sun Jun 30 17:07:05 2013 +0200

Robustify WW8FormulaControl::FormulaRead reading SvStream.

The >>operator of SvStream doesn't initialize a variable if the stream
is faulty. So initialize the variables before usage to prevent reading
wrong/random bits.

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

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 6f2375f..e00b6d2 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2176,7 +2176,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType 
nWhich,
 {
 sal_uInt8 nField;
 // nHeaderBype == version
-sal_uInt32 nHeaderByte;
+sal_uInt32 nHeaderByte = 0;
 
 // The following is a FFData structure as described in
 // Microsoft's DOC specification (chapter 2.9.78)
@@ -2185,9 +2185,9 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType 
nWhich,
 
 // might be better to read the bits as a 16 bit word
 // ( like it is in the spec. )
-sal_uInt8 bits1;
+sal_uInt8 bits1 = 0;
 *pDataStream >> bits1;
-sal_uInt8 bits2;
+sal_uInt8 bits2 = 0;
 *pDataStream >> bits2;
 
 sal_uInt8 iType = ( bits1 & 0x3 );
@@ -2199,10 +2199,10 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType 
nWhich,
 
 sal_uInt8 iRes = (bits1 & 0x7C) >> 2;
 
-sal_uInt16 cch;
+sal_uInt16 cch = 0;
 *pDataStream >> cch;
 
-sal_uInt16 hps;
+sal_uInt16 hps = 0;
 *pDataStream >> hps;
 
 // xstzName
@@ -2241,9 +2241,9 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType 
nWhich,
 {
 bool bAllOk = true;
 // SSTB (see Spec. 2.2.4)
-sal_uInt16 fExtend;
+sal_uInt16 fExtend = 0;
 *pDataStream >> fExtend;
-sal_uInt16 nNoStrings;
+sal_uInt16 nNoStrings = 0;
 
 // Isn't it that if fExtend isn't 0x then fExtend actually
 // doesn't exist and we really have just read nNoStrings ( or cData )?
@@ -2252,7 +2252,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType 
nWhich,
 *pDataStream >> nNoStrings;
 
 // I guess this should be zero ( and we should ensure that )
-sal_uInt16 cbExtra;
+sal_uInt16 cbExtra = 0;
 *pDataStream >> cbExtra;
 
 OSL_ENSURE(bAllOk,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 include/vcl/outdev.hxx |4 +-
 vcl/source/gdi/outdev3.cxx |   72 ++---
 2 files changed, 6 insertions(+), 70 deletions(-)

New commits:
commit 92ffe57f6bf40ec0f19e2abed24721137c569063
Author: Khaled Hosny 
Date:   Sat Jun 15 14:24:21 2013 +0200

Don’t shrink text from fallback fonts

This code is bogus in multiple ways:
* It scales text based on ascent or descent, but this makes no sense
  as those control line height and nothing else, if one is to scale two
  different fonts to “fit” together, cap or x height would be more
  appropriate. This results in some text being ridiculously shrunk.
* Not only that, but it is comparing apples to oranges; original font
  ascent/descent with the bounding box of the fallback glyphs, which
  results in different scale ratios depending on the shape of the glyphs
  at hand, which leads to all sorts of funny and irregular text.
* Even worse, the PDF export is completely broken in this case; it uses
  the scaled down glyph widths but the unscaled font size, resulting in
  cramped unreadable text.

Change-Id: Iaa6117ecfdad837d9a03b538e7327544ad5e
Reviewed-on: https://gerrit.libreoffice.org/4293
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b97f416..688d75d 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -541,9 +541,9 @@ public:
 // Helper for line geometry paint with support for graphic expansion 
(pattern and fat_to_area)
 void impPaintLineGeometryWithEvtlExpand(const LineInfo& rInfo, 
basegfx::B2DPolyPolygon aLinePolyPolygon);
 
-SAL_DLLPRIVATE SalLayout* getFallbackFontThatFits(ImplFontEntry 
&rFallbackFont,
+SAL_DLLPRIVATE SalLayout* getFallbackFont(ImplFontEntry &rFallbackFont,
 FontSelectPattern &rFontSelData, int nFallbackLevel,
-ImplLayoutArgs& rLayoutArgs, const ImplFontMetricData& rOrigMetric) 
const;
+ImplLayoutArgs& rLayoutArgs) const;
 protected:
 OutputDevice();
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 38f1f25..999f703 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5877,9 +5877,9 @@ SalLayout* OutputDevice::ImplLayout( const OUString& 
rOrigStr, sal_Int32 nMinInd
 return pSalLayout;
 }
 
-SalLayout* OutputDevice::getFallbackFontThatFits(ImplFontEntry &rFallbackFont,
+SalLayout* OutputDevice::getFallbackFont(ImplFontEntry &rFallbackFont,
 FontSelectPattern &rFontSelData, int nFallbackLevel,
-ImplLayoutArgs& rLayoutArgs, const ImplFontMetricData& rOrigMetric) const
+ImplLayoutArgs& rLayoutArgs) const
 {
 rFallbackFont.mnSetFontFlags = mpGraphics->SetFont( &rFontSelData, 
nFallbackLevel );
 
@@ -5896,68 +5896,8 @@ SalLayout* 
OutputDevice::getFallbackFontThatFits(ImplFontEntry &rFallbackFont,
 return NULL;
 }
 
-Rectangle aBoundRect;
-bool bHaveBounding = false;
-Rectangle aRectangle;
-
 pFallback->AdjustLayout( rLayoutArgs );
 
-// All we care about here is getting the vertical bounds of this text and
-// make sure it will fit inside the available space
-Point aPos;
-for( int nStart = 0;;)
-{
-sal_GlyphId nLGlyph;
-if( !pFallback->GetNextGlyphs( 1, &nLGlyph, aPos, nStart ) )
-break;
-
-sal_GlyphId nFontTag = nFallbackLevel << GF_FONTSHIFT;
-nLGlyph |= nFontTag;
-
-// get bounding rectangle of individual glyph
-if( mpGraphics->GetGlyphBoundRect( nLGlyph, aRectangle ) )
-{
-// merge rectangle
-aRectangle += aPos;
-aBoundRect.Union( aRectangle );
-bHaveBounding = true;
-}
-}
-
-// Shrink it down if it won't fit
-if (bHaveBounding)
-{
-long  nGlyphsAscent = -aBoundRect.Top();
-float fScaleTop = nGlyphsAscent > rOrigMetric.mnAscent ?
-rOrigMetric.mnAscent/(float)nGlyphsAscent : 1;
-long  nGlyphsDescent = aBoundRect.Bottom();
-float fScaleBottom = nGlyphsDescent > rOrigMetric.mnDescent ?
-rOrigMetric.mnDescent/(float)nGlyphsDescent : 1;
-float fScale = fScaleBottom < fScaleTop ? fScaleBottom : fScaleTop;
-if (fScale < 1)
-{
-long nOrigHeight = rFontSelData.mnHeight;
-long nNewHeight = 
static_cast(static_cast(rFontSelData.mnHeight) * fScale);
-
-if (nNewHeight == nOrigHeight)
---nNewHeight;
-
-pFallback->Release();
-
-rFontSelData.mnHeight = nNewHeight;
-rFallbackFont.mnSetFontFlags = mpGraphics->SetFont( &rFontSelData, 
nFallbackLevel );
-rFontSelData.mnHeight = nOrigHeight;
-
-rLayoutArgs.ResetPos();
-pFallback = mpGraphics->GetTextLayo

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

[Chris Hoppe]

 include/svx/svdoashp.hxx |2 -
 include/svx/svdoattr.hxx |   10 
 include/svx/svdomeas.hxx |   56 +++
 3 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 3c26d63b22f9ae2b4c2cb90f4b1218985f1d6131
Author: Chris Hoppe 
Date:   Mon Jul 1 13:10:56 2013 +0100

Translate German comments.

Change-Id: Ibdd5bb021973624c1bb2a0e7bbbebd15fca5c731

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index ee7e11b..91890dc 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -30,7 +30,7 @@
 #include "svx/svxdllapi.h"
 
 //
-//   Vorausdeklarationen
+//   Initial Declarations
 //
 
 class SdrObjList;
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index 46f1da0..c6c62d4 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -29,7 +29,7 @@
 #include "svx/svxdllapi.h"
 
 //
-//   Vorausdeklarationen
+//   Initial Declarations
 //
 
 class SfxPoolItem;
@@ -53,10 +53,10 @@ protected:
 Rectangle   maSnapRect;
 
 protected:
-// Strichstaerke ermitteln. Keine Linie -> 0.
+/// Detects the width of the line. No line ->0.
 sal_Int32 ImpGetLineWdt() const;
 
-// Zuhoeren, ob sich ein StyleSheet aendert
+/// Detects when a stylesheet is changed
 virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
 SdrAttrObj();
@@ -65,10 +65,10 @@ protected:
 public:
 TYPEINFO();
 
-// Feststellen, ob bFilledObj && Fuellung!=FillNone
+// Detects if bFilledObj && Fill != FillNone
 sal_Bool HasFill() const;
 
-// Feststellen, ob Linie!=LineNone
+// Detects if Line != LineNone
 sal_Bool HasLine() const;
 
 virtual const Rectangle& GetSnapRect() const;
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 39018d1..8076635 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -25,7 +25,7 @@
 #include 
 
 //
-//   Vorausdeklarationen
+//  Initial Declarations
 //
 
 class SdrOutliner;
@@ -37,7 +37,7 @@ namespace sdr { namespace properties {
 }}
 
 //
-//   Hilfsklasse SdrMeasureObjGeoData
+//   Auxiliary Class SdrMeasureObjGeoData
 //
 
 class SdrMeasureObjGeoData : public SdrTextObjGeoData
@@ -156,52 +156,52 @@ public:
 //
 // Creating:
 // ~
-// Dragging von Bezugspunkt 1 zu Bezugspunkt 2 -> Bezugskante
+// dragging reference point 1 to reference point 2 -> reference edge
 //
-// Die Defaults:
+// Defaults:
 // ~
-// Masslinie und Masshilfslinien: Haarlinien solid schwarz
-// Pfeile: 2mm x 4mm
-// Textgroesse
+// dimension line and auxiliary dimension lines:  solid black hairlines
+// arrows : 2mm x 4mm
+// text size
 //  ___
-// |Masszahl   | 2mm
+// |dimension  | 2mm
 // |<->|---
 // |   | 8mm
 // |   |
-//Pt1#Pt2-- 

Re: Building LO 4.0.4.2 on illumos based OS

[Gabriele Bulfon]

On Mon, Jul 1, 2013 at 6:39 AM, Gabriele Bulfon
gabriele.bul...@sonicle.com
wrote:
Hi, because I need to work on a consolidated tar.gz source version, I'm not
using master, so
I cannot pull changes at the moment.
Can you suggest me what modifications I need?
http://cgit.freedesktop.org/libreoffice/core/commit/?
id=99a4baf89c470d1e73b4e87fe9adf37a09230a2c
Thanks Norbert :) it worked great ;)
Gabriele.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 1b5763c40686c8ca3f6e26f9b495bca57271872c
Author: Michael Stahl 
Date:   Mon Jul 1 14:10:59 2013 +0200

BluetoothServer::addCommunicator not unused after all

was erroneously removed in 6a59659541e45198b8cda162f87f6abcd68c6101

Change-Id: Ib95fccaaccb8baf269f7d393af00d9b95b25161a

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 37836ee..f8843ea 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -420,6 +420,11 @@ void incomingCallback( void *userRefCon,
 pCommunicator->launch();
 }
 
+void BluetoothServer::addCommunicator( Communicator* pCommunicator )
+{
+mpCommunicators->push_back( pCommunicator );
+}
+
 #endif // MACOSX
 
 #ifdef LINUX_BLUETOOTH
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/textenc svtools/source

[Takeshi Abe]

 sal/textenc/tencinfo.cxx |   12 ++--
 svtools/source/misc/sampletext.cxx   |4 ++--
 svtools/source/table/defaultinputhandler.cxx |2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 6c912701dc9fd82dc1fec0481119f3c9d753e161
Author: Takeshi Abe 
Date:   Mon Jul 1 21:00:55 2013 +0900

Mark as const

Change-Id: Ic71f39aaebf07d3b0435882986be71cf2b0390c2

diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index ded6bc5..ccbfe40 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -294,32 +294,32 @@ rtl_TextEncoding SAL_CALL 
rtl_getTextEncodingFromUnixCharset( const char* pUnixC
 { NULL, RTL_TEXTENCODING_DONTKNOW }
 };
 
-static ImplStrCharsetDef aUnixCharsetJISX0208Tab[] =
+static ImplStrCharsetDef const aUnixCharsetJISX0208Tab[] =
 {
 { NULL, RTL_TEXTENCODING_JIS_X_0208 }
 };
 
-static ImplStrCharsetDef aUnixCharsetJISX0201Tab[] =
+static ImplStrCharsetDef const aUnixCharsetJISX0201Tab[] =
 {
 { NULL, RTL_TEXTENCODING_JIS_X_0201 }
 };
 
-static ImplStrCharsetDef aUnixCharsetJISX0212Tab[] =
+static ImplStrCharsetDef const aUnixCharsetJISX0212Tab[] =
 {
 { NULL, RTL_TEXTENCODING_JIS_X_0212 }
 };
 
-static ImplStrCharsetDef aUnixCharsetGBTab[] =
+static ImplStrCharsetDef const aUnixCharsetGBTab[] =
 {
 { NULL, RTL_TEXTENCODING_GB_2312 }
 };
 
-static ImplStrCharsetDef aUnixCharsetGBKTab[] =
+static ImplStrCharsetDef const aUnixCharsetGBKTab[] =
 {
 { NULL, RTL_TEXTENCODING_GBK }
 };
 
-static ImplStrCharsetDef aUnixCharsetBIG5Tab[] =
+static ImplStrCharsetDef const aUnixCharsetBIG5Tab[] =
 {
 { NULL, RTL_TEXTENCODING_BIG5 }
 };
diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index bacde29..f3279c9 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -92,9 +92,9 @@ OUString 
makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice)
 }
 }
 
-static sal_Unicode aImplSymbolFontText[] = {
+static const sal_Unicode aImplSymbolFontText[] = {
 0xF021,0xF032,0xF043,0xF054,0xF065,0xF076,0xF0B7,0xF0C8,0};
-static sal_Unicode aImplStarSymbolText[] = {
+static const sal_Unicode aImplStarSymbolText[] = {
 0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0};
 const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : 
aImplSymbolFontText;
 OUString sSampleText(pText);
diff --git a/svtools/source/table/defaultinputhandler.cxx 
b/svtools/source/table/defaultinputhandler.cxx
index ed47403..ff098f2 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -147,7 +147,7 @@ namespace svt { namespace table
 sal_uInt16  nKeyModifier;
 TableControlAction  eAction;
 }
-static aKnownActions[] = {
+static const aKnownActions[] = {
 { KEY_DOWN, 0,  cursorDown },
 { KEY_UP,   0,  cursorUp },
 { KEY_LEFT, 0,  cursorLeft },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source

[Armin Le Grand]

 chart2/source/inc/InternalDataProvider.hxx   |9 +--
 chart2/source/tools/ChartModelHelper.cxx |   33 ++-
 chart2/source/tools/InternalDataProvider.cxx |   17 +++--
 3 files changed, 53 insertions(+), 6 deletions(-)

New commits:
commit 855d5e3bc075e516edf1dc7e844924bbf9ab590c
Author: Armin Le Grand 
Date:   Mon Jul 1 10:43:33 2013 +

i120559 Corrected load for charts without RangeString bu twith local 
row-oriented data

diff --git a/chart2/source/inc/InternalDataProvider.hxx 
b/chart2/source/inc/InternalDataProvider.hxx
index 4272c58..2596467 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -75,8 +75,13 @@ class InternalDataProvider :
 {
 public:
 explicit InternalDataProvider(const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext > & _xContext);
-explicit InternalDataProvider( const ::com::sun::star::uno::Reference<
-   
::com::sun::star::chart2::XChartDocument > & xChartDoc, bool bConnectToModel );
+
+// #120559# allow handing over a default for data orientation 
(DataInColumns) that will
+// be used when no data is available
+explicit InternalDataProvider(
+const ::com::sun::star::uno::Reference< 
::com::sun::star::chart2::XChartDocument > & xChartDoc,
+bool bConnectToModel,
+bool bDefaultDataInColumns );
 explicit InternalDataProvider( const InternalDataProvider & rOther );
 virtual ~InternalDataProvider();
 
diff --git a/chart2/source/tools/ChartModelHelper.cxx 
b/chart2/source/tools/ChartModelHelper.cxx
index a743c9f..563c15a 100755
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -43,6 +43,9 @@
 // header for define DBG_ASSERT
 #include 
 
+#include 
+#include 
+
 //.
 namespace chart
 {
@@ -59,7 +62,35 @@ uno::Reference< chart2::data::XRangeHighlighter > 
ChartModelHelper::createRangeH
 uno::Reference< chart2::data::XDataProvider > 
ChartModelHelper::createInternalDataProvider(
 const uno::Reference< ::com::sun::star::chart2::XChartDocument >& 
xChartDoc, bool bConnectToModel )
 {
-return new InternalDataProvider( xChartDoc, bConnectToModel );
+bool bDefaultDataInColumns(true);
+
+// #120559# Try to access the current state of "DataRowSource" fo rthe 
chart data and
+// use it as default for creating a new InternalDataProvider
+if(xChartDoc.is())
+{
+::com::sun::star::uno::Reference< 
::com::sun::star::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY);
+
+if(xDoc.is())
+{
+::com::sun::star::uno::Reference< 
::com::sun::star::chart::XDiagram > aDiagram = xDoc->getDiagram();
+
+if(aDiagram.is())
+{
+::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY);
+
+if(xProp.is())
+{
+::com::sun::star::chart::ChartDataRowSource 
aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
+
+xProp->getPropertyValue( 
::rtl::OUString::createFromAscii("DataRowSource")) >>= aDataRowSource;
+
+bDefaultDataInColumns = 
(::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
+}
+}
+}
+}
+
+return new InternalDataProvider( xChartDoc, bConnectToModel, 
bDefaultDataInColumns );
 }
 
 uno::Reference< XDiagram > ChartModelHelper::findDiagram( const 
uno::Reference< frame::XModel >& xModel )
diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index d904adf..7c1fc27 100755
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -337,8 +337,11 @@ InternalDataProvider::InternalDataProvider( const 
Reference< uno::XComponentCont
 : m_bDataInColumns( true )
 {}
 
-InternalDataProvider::InternalDataProvider( const Reference< 
chart2::XChartDocument > & xChartDoc, bool bConnectToModel )
-: m_bDataInColumns( true )
+InternalDataProvider::InternalDataProvider(
+const Reference< chart2::XChartDocument > & xChartDoc,
+bool bConnectToModel,
+bool bDefaultDataInColumns)
+:   m_bDataInColumns( bDefaultDataInColumns )
 {
 try
 {
@@ -353,7 +356,15 @@ InternalDataProvider::InternalDataProvider( const 
Reference< chart2::XChartDocum
 bool bFirstCellAsLabel = true;
 bool bHasCategories = true;
 uno::Sequence< sal_Int32 > aSequenceMapping;
-DataSourceHelper::detectRangeSegmentation( xChartModel, 
aRangeString, aSequenceMapping, m_bDataInColumns, bFirstCellAsLabel, 
bHasCategories );
+const bool bSomethingDetected(
+DataSourceHelper::detectRangeSegmenta

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

[Sean Young]

 vcl/source/gdi/outdev3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c150dd7fdc593dd320f6bd67828d769312517e81
Author: Sean Young 
Date:   Sat May 25 20:06:15 2013 +0100

fix OUString conversion

This used to be equalsAscii( "hg", 0, 2 ) before conversion.

Fixes 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10

Change-Id: I2cf61d88c79b3ab33c0ee7d077ee65b16053c05c
Reviewed-on: https://gerrit.libreoffice.org/4035
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 
Signed-off-by: Michael Meeks 

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index d5d019a..3b8e3c5 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2392,7 +2392,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( 
FontSelectPattern& rFSD,
 // #114999# special emboldening for Ricoh fonts
 // TODO: smarter check for special cases by using PreMatch 
infrastructure?
 if( (rFSD.GetWeight() > WEIGHT_MEDIUM)
-&&  aSearchName.equalsIgnoreAsciiCase( "hg" ) )
+&&  aSearchName.startsWithIgnoreAsciiCase( "hg" ) )
 {
 OUString aBoldName;
 if( aSearchName.equalsIgnoreAsciiCase( "hggothicb" ) )
___
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/unocore/unocrsrhelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3090cfc972287da3fbdc567387527b65b3bfd128
Author: Caolán McNamara 
Date:   Mon Jul 1 12:56:17 2013 +0100

Resolves: rhbz#979758 crash on 'Diagrammen in LibreOffice' help page

Change-Id: I269846840b8e2f67838da525c020a305901cf903

diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index deeb5ba..66202c0 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -176,7 +176,7 @@ void GetSelectableFromAny(uno::Reference 
const& xIfc,
 if (pRanges)
 {
 SwUnoCrsr const* pUnoCrsr = pRanges->GetCursor();
-if (pUnoCrsr->GetDoc() == &rTargetDoc)
+if (pUnoCrsr && pUnoCrsr->GetDoc() == &rTargetDoc)
 {
 o_rpPaM = lcl_createPamCopy(*pUnoCrsr);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 basegfx/source/vector/b2ivector.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee5ea3b629c55f628ee23078f4c1800d83b8514b
Author: Caolán McNamara 
Date:   Mon Jul 1 12:51:22 2013 +0100

fOne should be 1.0 not 10.0

Change-Id: I1e51ea9f06be698641287e8d85a5288220879d3f

diff --git a/basegfx/source/vector/b2ivector.cxx 
b/basegfx/source/vector/b2ivector.cxx
index ff3cade..b2cfb7b 100644
--- a/basegfx/source/vector/b2ivector.cxx
+++ b/basegfx/source/vector/b2ivector.cxx
@@ -51,7 +51,7 @@ namespace basegfx
 
 if(!::basegfx::fTools::equalZero(fLenNow))
 {
-const double fOne(10.0);
+const double fOne(1.0);
 
 if(!::basegfx::fTools::equal(fOne, fLenNow))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a1/817251fd384d58a3942d28849723ac84bd315d

[Caolán McNamara]

 a1/817251fd384d58a3942d28849723ac84bd315d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f8ebd9c1dc59afcec3d882ee92d09dd733e3ec98
Author: Caolán McNamara 
Date:   Mon Jul 1 12:45:33 2013 +0100

Notes added by 'git notes add'

diff --git a/a1/817251fd384d58a3942d28849723ac84bd315d 
b/a1/817251fd384d58a3942d28849723ac84bd315d
new file mode 100644
index 000..c46ad7e
--- /dev/null
+++ b/a1/817251fd384d58a3942d28849723ac84bd315d
@@ -0,0 +1 @@
+ignore: We have a totally different pivot cache code now
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui |   34 
 1 file changed, 34 insertions(+)

New commits:
commit 20661599f402cda97915e77667368422a2382b78
Author: Caolán McNamara 
Date:   Mon Jul 1 12:41:44 2013 +0100

add missing .ui

Change-Id: I3cf3d730fee95a54d8b51779835eda8d24d50ff3

diff --git a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui 
b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
new file mode 100644
index 000..20e19961
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
@@ -0,0 +1,34 @@
+
+
+  
+  
+False
+12
+Cannot add label
+dialog
+True
+error
+ok
+Cannot add label
+Predefined labels 
cannot be overwritten, use another name.
+
+  
+False
+vertical
+24
+
+  
+False
+end
+  
+  
+False
+True
+end
+0
+  
+
+  
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LO 4.0.4.2 on illumos based OS

[Gabriele Bulfon]

Hi, because I need to work on a consolidated tar.gz source version, I'm not 
using master, so
I cannot pull changes at the moment.
Can you suggest me what modifications I need?
Gabriele.
--
Da: Michael Stahl
A: Gabriele Bulfon
Cc: libreoffice@lists.freedesktop.org Raffaele Fullone
Jonathan Adams
Data: 1 luglio 2013 13.34.58 CEST
Oggetto: Re: Building LO 4.0.4.2 on illumos based OS
On 01/07/13 11:03, Gabriele Bulfon wrote:
[build LNK] Library/libuno_sal.so
ERROR: aux-target missing, library deleted, please try running make again
make[2]: ***
[/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Library//libuno_sal.so.3]
Error 1
Running make again as suggested, repeats the error.
Any idea?
apparently the solaris.mk is out of sync with the unxgcc.mk from which
it was copied; i've pushed 99a4baf89c470d1e73b4e87fe9adf37a09230a2c to
fix the dynamic link command.
this duplication needs to be reverted in the long run, solaris.mk should
include unxgcc.mk.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Petr Vorel]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |5 -
 sd/source/ui/view/ViewShellBase.cxx|7 ---
 unotest/source/cpp/bootstrapfixturebase.cxx|   12 
 unusedcode.easy|3 ---
 4 files changed, 27 deletions(-)

New commits:
commit 6a59659541e45198b8cda162f87f6abcd68c6101
Author: Petr Vorel 
Date:   Thu Jun 27 21:36:48 2013 +0200

Remove unused code

Change-Id: Id789250d6aeae642ef5c712e33c5583628638218
Reviewed-on: https://gerrit.libreoffice.org/4604
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index ce8bc3c..37836ee 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -274,11 +274,6 @@ bluezDetachCloseSocket( GMainContext *pContext, GPollFD 
*pSocketFD )
 
 #endif // LINUX_BLUETOOTH
 
-void BluetoothServer::addCommunicator( Communicator* pCommunicator )
-{
-mpCommunicators->push_back( pCommunicator );
-}
-
 #if defined(MACOSX)
 
 OSXBluetoothWrapper::OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ) :
diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 66707c3..b1e671fa 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -223,13 +223,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell);
 // new ViewShellBase object has been constructed.
 
 SfxViewFactory* ViewShellBase::pFactory;
-SfxViewShell* ViewShellBase::CreateInstance (
-SfxViewFrame *pFrame, SfxViewShell *pOldView)
-{
-ViewShellBase* pBase = new ViewShellBase(pFrame, pOldView);
-pBase->LateInit("");
-return pBase;
-}
 
 SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0))
 {
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx 
b/unotest/source/cpp/bootstrapfixturebase.cxx
index 2192b79..1ffab1e 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -76,18 +76,6 @@ OUString test::BootstrapFixtureBase::getPathFromSrc( const 
char *pPath )
 return m_aSrcRootPath + OUString::createFromAscii( pPath );
 }
 
-
-OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath )
-{
-return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
-}
-
-OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
-{
-return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
-
-}
-
 void test::BootstrapFixtureBase::setUp()
 {
 // set UserInstallation to user profile dir in test/user-template
diff --git a/unusedcode.easy b/unusedcode.easy
index 8a9bec0..50ec494 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -43,6 +43,3 @@ sd::BluetoothServer::addCommunicator(sd::Communicator*)
 sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
 sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
-sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*)
-test::BootstrapFixtureBase::getPathFromWorkdir(char const*)
-test::BootstrapFixtureBase::getURLFromWorkdir(char const*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/c8978a16536738bbad7a52cdfb9f37a4d19ed0

[Caolán McNamara]

 94/c8978a16536738bbad7a52cdfb9f37a4d19ed0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 568acb50246dac4dcbc82c323724bdbfaac97a2b
Author: Caolán McNamara 
Date:   Mon Jul 1 12:35:12 2013 +0100

Notes added by 'git notes add'

diff --git a/94/c8978a16536738bbad7a52cdfb9f37a4d19ed0 
b/94/c8978a16536738bbad7a52cdfb9f37a4d19ed0
new file mode 100644
index 000..28c60f0
--- /dev/null
+++ b/94/c8978a16536738bbad7a52cdfb9f37a4d19ed0
@@ -0,0 +1 @@
+merged as: ba8bcc2681d8e9788ae2d6fef11308d5f0fcae05
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yong Lin Ma]

 vcl/source/window/dialog.cxx |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit ba8bcc2681d8e9788ae2d6fef11308d5f0fcae05
Author: Yong Lin Ma 
Date:   Tue Jul 10 02:29:03 2012 +

Resolves: #i119994# Range picker dialog is changed to modal mode wrongly

Patch by: Peng YunQuan
Review by: mayongl
Reported by: Yan Ji

(cherry picked from commit 94c8978a16536738bbad7a52cdfb9f37a4d19ed0)

Change-Id: I66bb91bf07a5c52b2a5e2b2a91187ac9580fbb0a

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index aca80f1b..0a63d25 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1083,8 +1083,21 @@ void Dialog::SetModalInputMode( sal_Bool bModal )
 mpPrevExecuteDlg->EnableInput( sal_True, sal_True, sal_True, this 
);
 // ensure continued modality of prev dialog
 // do not change modality counter
-mpPrevExecuteDlg->SetModalInputMode( sal_False );
-mpPrevExecuteDlg->SetModalInputMode( sal_True );
+
+
+// #i119994# need find the last modal dialog before reactive it
+Dialog * pPrevModalDlg = mpPrevExecuteDlg;
+
+while( pPrevModalDlg && !pPrevModalDlg->IsModalInputMode() )
+pPrevModalDlg = pPrevModalDlg->mpPrevExecuteDlg;
+
+if( pPrevModalDlg &&
+( pPrevModalDlg == mpPrevExecuteDlg
+|| !pPrevModalDlg->IsWindowOrChild( this, sal_True ) ) )
+{
+mpPrevExecuteDlg->SetModalInputMode( sal_False );
+mpPrevExecuteDlg->SetModalInputMode( sal_True );
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 solenv/gbuild/platform/solaris.mk |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 99a4baf89c470d1e73b4e87fe9adf37a09230a2c
Author: Michael Stahl 
Date:   Mon Jul 1 13:27:54 2013 +0200

gbuild: sync solaris.mk linker invocation with unxgcc.mk

Change-Id: Ib7ef6fe87673c601ad3c24f3ed3f382c039551f4

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 20fc2a9..240204c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -171,7 +171,9 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
+   $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call 
gb_Library_get_linktargetname,$(lib))),$*),$(gb_LTOFLAGS)) \
+   $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir 
$(1)).$(SOVERSION)) \
+   $(if 
$(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
@@ -181,13 +183,16 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
-Wl$(COMMA)--start-group $(foreach 
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) 
-Wl$(COMMA)--end-group \
+   -Wl$(COMMA)--no-as-needed \
$(LIBS) \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach 
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib) \
-   -o $(1))
+   -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)))
+   $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1))
$(if $(filter Library,$(TARGETTYPE)),\
-   $(NM) --extern-only --dynamic --format=posix $(1) \
-   | cut -d' ' -f1-2 | grep -v U$$ \
-   > $(1).exports.tmp && \
+   readelf -d $(1) | grep SONAME > $(1).exports.tmp ; \
+   $(NM) --dynamic --extern-only --defined-only --format=posix 
$(1) \
+   | cut -d' ' -f1-2 \
+   >> $(1).exports.tmp && \
if cmp -s $(1).exports.tmp $(1).exports; \
then rm $(1).exports.tmp; \
else mv $(1).exports.tmp $(1).exports; touch -r $(1) 
$(1).exports; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 33/5891f630924e6080ac887efd9aa8811404a307

[Caolán McNamara]

 33/5891f630924e6080ac887efd9aa8811404a307 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 18804332a7f6207fefc586ec795556c11c6a2896
Author: Caolán McNamara 
Date:   Mon Jul 1 12:06:57 2013 +0100

Notes added by 'git notes add'

diff --git a/33/5891f630924e6080ac887efd9aa8811404a307 
b/33/5891f630924e6080ac887efd9aa8811404a307
new file mode 100644
index 000..7f418a2
--- /dev/null
+++ b/33/5891f630924e6080ac887efd9aa8811404a307
@@ -0,0 +1 @@
+prefer: c6560c6f07f7f71842d7314157feaca2fa4a03c9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee

[Caolán McNamara]

 4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5700b06de74af1b6f813da5d230ac46ae60112c0
Author: Caolán McNamara 
Date:   Mon Jul 1 12:04:26 2013 +0100

Notes added by 'git notes add'

diff --git a/4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee 
b/4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/23dda62c32085f8665483e38345ee13389860e

[Caolán McNamara]

 8f/23dda62c32085f8665483e38345ee13389860e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3582e4b0451b9b4ce8ca01edd3ec5a2fa0c15be2
Author: Caolán McNamara 
Date:   Mon Jul 1 11:59:34 2013 +0100

Notes added by 'git notes add'

diff --git a/8f/23dda62c32085f8665483e38345ee13389860e 
b/8f/23dda62c32085f8665483e38345ee13389860e
new file mode 100644
index 000..e715aca
--- /dev/null
+++ b/8f/23dda62c32085f8665483e38345ee13389860e
@@ -0,0 +1 @@
+merged as: 53a08b03a88e7f6c387988c01f7c6e2183967176
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andre Fischer]

 connectivity/source/resource/conn_shared_res.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53a08b03a88e7f6c387988c01f7c6e2183967176
Author: Andre Fischer 
Date:   Mon Jul 1 09:18:36 2013 +

122658: Fixed typo in localized string.

Found by: jteera
Reported by: Andrea Pescetti
(cherry picked from commit 8f23dda62c32085f8665483e38345ee13389860e)

diff --git a/connectivity/source/resource/conn_shared_res.src 
b/connectivity/source/resource/conn_shared_res.src
index a5133d0..b98a560 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -395,7 +395,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME
 };
 String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
 {
-Text [ en-US ] = "The index could not be created. The size of the chosen 
column is to big.";
+Text [ en-US ] = "The index could not be created. The size of the chosen 
column is too big.";
 };
 
 String STR_SQL_NAME_ERROR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/sfx2 sc/inc sw/source sw/UIConfig_swriter.mk

[Caolán McNamara]

 include/sfx2/sfxsids.hrc   |1 +
 sc/inc/sc.hrc  |3 ++-
 sw/UIConfig_swriter.mk |1 +
 sw/source/ui/envelp/labfmt.cxx |3 ++-
 sw/source/ui/envelp/labfmt.hrc |3 +--
 sw/source/ui/envelp/labfmt.src |6 --
 6 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 257ba103fb9ffae87189eb5d435969961fe4e98c
Author: Caolán McNamara 
Date:   Mon Jul 1 11:46:05 2013 +0100

Resolves: fdo#66263 calc's protect records doesn't do anything, sid 
collision

Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index d1227e3..f17124a 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -750,6 +750,7 @@
 #define SC_VIEW_START   (SID_SC_START)
 #endif
 #define FID_CHG_RECORD  (EDIT_MENU_START + 18)
+//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
 #define SID_CHG_PROTECT (SC_VIEW_START + 84)
 
 // eof 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e0bbdca..5bfe313 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -123,6 +123,7 @@
 #define SID_NUMBER_DECDEC   (SC_VIEW_START + 58)
 
 // misc:
+#define SID_COLLABORATION   (SC_VIEW_START + 59)
 #define SID_LINKS   (SC_VIEW_START + 60)
 #define SID_INSERT_SIMAGE   (SC_VIEW_START + 61)
 #define SID_INSERT_SMATH(SC_VIEW_START + 63)
@@ -153,7 +154,7 @@
 
 #define SID_CHOOSE_DESIGN   (SC_VIEW_START + 82)
 #define SID_EURO_CONVERTER  (SC_VIEW_START + 83)
-#define SID_COLLABORATION   (SC_VIEW_START + 84)
+//See include/sfx2/sfxsids.hrc for reserved usage of (SC_VIEW_START + 84)
 #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85)
 
 #define SID_SC_INPUT_TEXTWYSIWYG(SC_VIEW_START + 86)
commit 14c619f10f88dd42c4f8af05aa6a1daabe11475e
Author: Caolán McNamara 
Date:   Mon Jul 1 10:38:00 2013 +0100

convert predefined label warning dialog to .ui

Change-Id: I6f7cbc6aea1acbd7c803cd418ba2e9ed71fb2c50

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index b0a2966..f85c018 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autotext \
sw/uiconfig/swriter/ui/bibliographyentry \
sw/uiconfig/swriter/ui/bulletsandnumbering \
+   sw/uiconfig/swriter/ui/cannotsavelabeldialog \
sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/characterproperties \
sw/uiconfig/swriter/ui/charurlpage \
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 770ae65..89d12f4 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 
 #include "swtypes.hxx"
@@ -631,7 +632,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
 if ( rCfg.IsPredefinedLabel(sMake, sType) )
 {
 SAL_WARN( "sw.envelp", "label is predefined and cannot be 
overwritten" );
-WarningBox( this, SW_RES( WB_PREDEFINED_LABEL ) ).Execute();
+MessageDialog(this, "CannotSaveLabelDialog", 
"modules/swriter/ui/cannotsavelabeldialog.ui").Execute();
 return 0;
 }
 String sTmp(aQueryMB.GetMessText());
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index 7469b93..00c5eca 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -72,11 +72,10 @@
 #define STR_ROWS (RC_LABFMT_BEGIN +  8)
 #define STR_PWIDTH   (RC_LABFMT_BEGIN +  9)
 #define STR_PHEIGHT  (RC_LABFMT_BEGIN + 10)
-#define WB_PREDEFINED_LABEL (RC_LABFMT_BEGIN + 11)
 
 // overflow check 
 
-#define LABFMT_ACT_END WB_PREDEFINED_LABEL
+#define LABFMT_ACT_END STR_PHEIGHT
 
 #if LABFMT_ACT_END > RC_LABFMT_END
 #error Resource overflow in #file, #line
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 96efd28..2be92d7 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -303,12 +303,6 @@ String STR_PHEIGHT
 {
 Text [ en-US ] = "Page Height" ;
 };
-WarningBox WB_PREDEFINED_LABEL
-{
-BUTTONS = WB_OK;
-DEFBUTTON = WB_DEF_OK;
-Message [ en-US ] = "Predefined labels cannot be overwritten, use another 
name." ;
-};
 ModalDialog DLG_SAVE_LABEL
 {
 HelpID = HID_SAVE_LABEL_DLG ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Hide and show slides from custom dialog

[Guillermo Molleda Jimena]

Hi, I am trying add a functionality for hide or show the slides included 
in a custom user presentation (menu Slide show - Custom slide show...).


Objective: to print a custom in PDF, hiding the rest of slides and 
presenting only those chosen.

Can anyone help?
I think it's something important for teachers with different students, 
the same base but different levels slide.


I have added the buttons "Show" and "Hide" to 
/libreoffice/sd/uiconfig/ui/customslideshows.ui with Glade:

terminal:
$ export GLADE_CATALOG_SEARCH_PATH=~/.../libreoffice/install/share/glade
$ glade

I add size for put two buttons: Show and Hide, code buttons:
--code buttons in 
.../libreoffice/sd/uiconfig/ui/customslideshows.ui



Sho_w
False
True
True
True
False
True


False
True
7




_Hide
False
True
True
True
False
True


False
True
8


--END code buttons in 
.../libreoffice/sd/uiconfig/ui/customslideshows.ui
In 
/home/deb/Descargas/libreoffice/libreoffice/sd/source/ui/inc/custdlg.hxx 
I add:

-- Change custdlg.hxx -
class SdCustomShowDlg : public ModalDialog
{
private:
ListBox* m_pLbCustomShows;
CheckBox*m_pCbxUseCustomShow;
PushButton*  m_pBtnNew;
PushButton*  m_pBtnEdit;
PushButton*  m_pBtnRemove;
PushButton*  m_pBtnCopy;
HelpButton*  m_pBtnHelp;
PushButton*  m_pBtnStartShow;
OKButton*m_pBtnOK;
+PushButton*  m_pBtnShow;
+PushButton*  m_pBtnHide;
--END Change custdlg.hxx -

In .../libreoffice/sd/source/ui/dlg/custdlg.cxx

I add in constructor:
get( m_pBtnStartShow, "startshow" );
get( m_pBtnOK, "ok" );
+get( m_pBtnShow, "show" );
+get( m_pBtnHide, "hide" );
get( m_pLbCustomShows, "customshowlist");
...
m_pCbxUseCustomShow->SetClickHdl( aLink );
m_pLbCustomShows->SetSelectHdl( aLink );
+m_pBtnShow->SetClickHdl( aLink );
+m_pBtnHide->SetClickHdl( aLink );

m_pBtnStartShow->SetClickHdl( LINK( this, SdCustomShowDlg, 
StartShowHdl ) ); // for test


In function CheckState I add:
void SdCustomShowDlg::CheckState()
{
sal_uInt16 nPos = m_pLbCustomShows->GetSelectEntryPos();

sal_Bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND;
m_pBtnEdit->Enable( bEnable );
m_pBtnRemove->Enable( bEnable );
m_pBtnCopy->Enable( bEnable );
m_pCbxUseCustomShow->Enable( bEnable );
m_pBtnStartShow->Enable( true );
+m_pBtnShow->Enable( bEnable );
+m_pBtnHide->Enable( bEnable );

if( bEnable )
pCustomShowList->Seek( nPos );
}

Now the hard part:
/**
 * ButtonHdl()
 */
IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
{
... the buttons source implementation ...
// show CustomShow
else if( p == m_pBtnShow ) // or else if( p == m_pBtnShow || p == 
m_pBtnHide )

{
sal_uInt16 nPos = m_pLbCustomShows->GetSelectEntryPos();
sal_Bool bDifferent = sal_False;
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
DBG_ASSERT( pCustomShowList, "pCustomShowList does not 
exist" );

pCustomShow = (*pCustomShowList)[ nPos ];
bDifferent = sal_True;
for( pCustomShow = (SdCustomShow*) pCustomShowList->First();
 pCustomShow != NULL && bDifferent;
 pCustomShow = (SdCustomShow*) 
pCustomShowList->Next() )

{
// What code will I put here?
if (p == m_pBtnShow )
   { HERE
   }
else
   { HERE
   }
 //if( aStr == OUString( pCustomShow->GetName() ) )
//bDifferent = sal_False;
}
}

}

Is right the actual code? (loop, ...)

I have seen code for hide or show the slides in 
/core/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx

HIDE:
case SID_HIDE_SLIDE:
ChangeSlideExclusionState(model::SharedPageDescriptor(), true);
SHOW:
case SID_SHOW_SLIDE
ChangeSlideExclusionState(model::SharedPageDescriptor(), false);

Or for selections in 
/core/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
234 void SelectionManager::SelectionHasChanged (const bool 
bMakeSelectionVisible)


But I don't know how do it.

Best regards.








--

El inglés, francés, alemán o chino mandarín son muy ineficientes para su 
aprendizaje como segundo idioma (mejor tercero) y fuente de grandes movimientos 
de divisas de países pobres hacia los más ricos. Igual que aprendes a escribir 
primero trazos y no directamente las letras, es mejor para el cerebro aprender 
primero una lengua regular y planificada.

*
  Guillermo Molleda Jimena

Departamento de Economía Financiera y
  Dirección de Operaciones
   Facultad de Turismo y Finanzas
   Universidad de Sevilla

   Avda. San Francisco Javier s/n
   41018 Sevilla
Tfno: 954 55 16 

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

[Luboš Luňák]

 sw/source/core/crsr/swcrsr.cxx  |   65 +---
 sw/source/core/docnode/nodedump.cxx |   43 ++-
 2 files changed, 45 insertions(+), 63 deletions(-)

New commits:
commit dc7498e4f0632c10a0019564d2e71b5403e40812
Author: Luboš Luňák 
Date:   Fri Jun 28 17:04:49 2013 +0200

don't show section/table nodes as plain start nodes in debug dump

Change-Id: I8b4901d98c210f5a3228981a2b180f2fcc06c768

diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 96e787a..01ba1d2 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -220,25 +220,36 @@ void SwStartNode::dumpAsXml( xmlTextWriterPtr w )
 {
 WriterHelper writer( w );
 const char* name = "???";
-switch( GetStartNodeType())
+switch( GetNodeType() )
 {
-case SwNormalStartNode:
-name = "start";
-break;
-case SwTableBoxStartNode:
-name = "tablebox";
-break;
-case SwFlyStartNode:
-name = "fly";
-break;
-case SwFootnoteStartNode:
-name = "footnote";
+case ND_TABLENODE:
+name = "table";
 break;
-case SwHeaderStartNode:
-name = "header";
+case ND_SECTIONNODE:
+name = "section";
 break;
-case SwFooterStartNode:
-name = "footer";
+default:
+switch( GetStartNodeType())
+{
+case SwNormalStartNode:
+name = "start";
+break;
+case SwTableBoxStartNode:
+name = "tablebox";
+break;
+case SwFlyStartNode:
+name = "fly";
+break;
+case SwFootnoteStartNode:
+name = "footnote";
+break;
+case SwHeaderStartNode:
+name = "header";
+break;
+case SwFooterStartNode:
+name = "footer";
+break;
+}
 break;
 }
 writer.startElement( name );
commit ed1d006e1ab594ff0b64a41eadd1b8fe48ab0414
Author: Luboš Luňák 
Date:   Mon Jun 24 20:15:06 2013 +0200

remove strange #ifdefs, presumably a workaround for ancient compiler bug

Change-Id: I77287909b88be01615e2aae302c48904c1adf933

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 6b4a772..9dadc67 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -482,13 +482,6 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
 return sal_False;
 }
 
-#if defined( UNX )
-#define IDX (*pCellStt)
-#else
-#define IDX aCellStt
-#endif
-
-
 sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr )
 {
 SwCntntNode* pCNd = GetCntntNode();
@@ -540,32 +533,24 @@ sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, 
sal_Bool bChgCrsr )
 // search next valid box
 // if there is another StartNode after the EndNode of a cell then
 // there is another cell
-#if defined( UNX )
-SwNodeIndex* pCellStt = new SwNodeIndex( *GetNode()->
-FindTableBoxStartNode()->EndOfSectionNode(), 1 );
-#else
 SwNodeIndex aCellStt( 
*GetNode()->FindTableBoxStartNode()->EndOfSectionNode(), 1 );
-#endif
 sal_Bool bProt = sal_True;
 GoNextCell:
 do {
-if( !IDX.GetNode().IsStartNode() )
+if( !aCellStt.GetNode().IsStartNode() )
 break;
-++IDX;
-if( 0 == ( pCNd = IDX.GetNode().GetCntntNode() ))
-pCNd = IDX.GetNodes().GoNext( &IDX );
+++aCellStt;
+if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+pCNd = aCellStt.GetNodes().GoNext( &aCellStt );
 if( 0 == ( bProt = pCNd->IsProtect() ))
 break;
-IDX.Assign( *pCNd->FindTableBoxStartNode()->EndOfSectionNode(), 1 
);
+aCellStt.Assign( 
*pCNd->FindTableBoxStartNode()->EndOfSectionNode(), 1 );
 } while( bProt );
 
 SetNextCrsr:
 if( !bProt ) // found free cell
 {
-GetPoint()->nNode = IDX;
-#if defined( UNX )
-delete pCellStt;
-#endif
+GetPoint()->nNode = aCellStt;
 SwCntntNode* pTmpCNd = GetCntntNode();
 if( pTmpCNd )
 {
@@ -576,19 +561,16 @@ SetNextCrsr:
  nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
 }
 // end of table, so go to next node
-++IDX;
+++aCellStt;
 SwNode* pNd;
-if( ( pNd = &IDX.GetNode())->IsEndNode() || HasMark())
+if( ( pNd = &aCellStt.GetNode())->IsEndNode() || HasMark())
 {
 // if only table in FlyFrame or SSelection then stay on o

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

[Michael Stahl]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 49a454225e35699d7351faaba3d296e1858c6107
Author: Michael Stahl 
Date:   Mon Jul 1 12:14:37 2013 +0200

fdo#66324 fix locking in webdav_ucp::Content::getResourceType()

Crash in there while accessing an evidently deleted DAVResourceAccess
instance with about 4 other threads also in various webdav_ucp::Content
methods.

The problem is apparently that the "outer" getResourceType() passes the
m_xResAccess to the "inner" getResourceType(), which accesses it
without locking the mutex, while another thread resets m_xResAccess
and thereby deletes the current instance.

(regression from 0c3500115c4fd86284a027fc32be704afcf77061)

Change-Id: I1c67021c536e303d766c7ff93fb71e40f991f3af

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 4ad76c4..49e8655 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3164,7 +3164,19 @@ Content::ResourceType Content::getResourceType(
 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 throw ( uno::Exception )
 {
-return getResourceType( xEnv, m_xResAccess );
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+std::auto_ptr< DAVResourceAccess > xResAccess;
+SAL_WNODEPRECATED_DECLARATIONS_POP
+{
+osl::MutexGuard aGuard( m_aMutex );
+xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
+}
+Content::ResourceType const ret = getResourceType( xEnv, xResAccess );
+{
+osl::Guard< osl::Mutex > aGuard( m_aMutex );
+m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+}
+return ret;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - connectivity/source officecfg/registry sfx2/source

[Oliver-Rainer Wittmann]

 connectivity/source/resource/conn_shared_res.src  |2 
 officecfg/registry/data/org/openoffice/Office/makefile.mk |4 +
 sfx2/source/doc/docfile.cxx   |   35 +-
 3 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit 335891f630924e6080ac887efd9aa8811404a307
Author: Oliver-Rainer Wittmann 
Date:   Mon Jul 1 09:54:24 2013 +

121143: SfxMedium - assure that name of internal used temporary file does 
not clash with SfxMedium's name

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2bca9f9..02a17a2 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -585,7 +585,9 @@ Reference < XContent > SfxMedium::GetContent() const
 SvStream* SfxMedium::GetInStream()
 {
 if ( pInStream )
+{
 return pInStream;
+}
 
 if ( pImp->pTempFile )
 {
@@ -601,13 +603,17 @@ SvStream* SfxMedium::GetInStream()
 pInStream = NULL;
 }
 else
+{
 return pInStream;
+}
 }
 
 GetMedium_Impl();
 
 if ( GetError() )
+{
 return NULL;
+}
 
 return pInStream;
 }
@@ -2330,14 +2336,20 @@ void SfxMedium::GetMedium_Impl()
 
 //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
 if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() )
+{
 SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+}
 
 if ( !GetError() )
 {
 if ( pImp->xStream.is() )
+{
 pInStream = utl::UcbStreamHelper::CreateStream( pImp->xStream 
);
+}
 else if ( pImp->xInputStream.is() )
+{
 pInStream = utl::UcbStreamHelper::CreateStream( 
pImp->xInputStream );
+}
 }
 
 pImp->bDownloadDone = sal_True;
@@ -3455,7 +3467,15 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
 aName = String();
 }
 
-pImp->pTempFile = new ::utl::TempFile();
+do
+{
+pImp->pTempFile = new ::utl::TempFile();
+if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+{
+delete pImp->pTempFile;
+pImp->pTempFile = NULL;
+}
+} while ( pImp->pTempFile == NULL );
 pImp->pTempFile->EnableKillingFile( sal_True );
 aName = pImp->pTempFile->GetFileName();
 ::rtl::OUString aTmpURL = pImp->pTempFile->GetURL();
@@ -3551,9 +3571,20 @@ void SfxMedium::CreateTempFileNoCopy()
 {
 // this call always replaces the existing temporary file
 if ( pImp->pTempFile )
+{
 delete pImp->pTempFile;
+pImp->pTempFile = NULL;
+}
 
-pImp->pTempFile = new ::utl::TempFile();
+do
+{
+pImp->pTempFile = new ::utl::TempFile();
+if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+{
+delete pImp->pTempFile;
+pImp->pTempFile = NULL;
+}
+} while ( pImp->pTempFile == NULL );
 pImp->pTempFile->EnableKillingFile( sal_True );
 aName = pImp->pTempFile->GetFileName();
 if ( !aName.Len() )
commit 8f23dda62c32085f8665483e38345ee13389860e
Author: Andre Fischer 
Date:   Mon Jul 1 09:18:36 2013 +

122658: Fixed typo in localized string.

Found by: jteera
Reported by: Andrea Pescetti

diff --git a/connectivity/source/resource/conn_shared_res.src 
b/connectivity/source/resource/conn_shared_res.src
index 442328c..dd2b0ec 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -396,7 +396,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME
 };
 String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
 {
-Text [ en-US ] = "The index could not be created. The size of the chosen 
column is to big.";
+Text [ en-US ] = "The index could not be created. The size of the chosen 
column is too big.";
 };
 
 String STR_SQL_NAME_ERROR
commit 4b22bc8d225baf9abab3e6c1d7153e7a851fb6ee
Author: Jürgen Schmidt 
Date:   Mon Jul 1 09:15:37 2013 +

#122619# mark Impress.xcu anmd PresenterScreen.xcu as localized

diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk 
b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index aa97150..dac316d 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -109,7 +109,9 @@ LOCALIZEDFILES= \
 Embedding.xcu \
 WebWizard.xcu \
 FormWizard.xcu \
-Writer.xcu
+Writer.xcu \
+Impress.xcu \
+PresenterScreen.xcu
 
 
 .INCLUDE :  target.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Godard]

 sc/source/filter/xml/xmlexprt.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8be462fde98a8f22f182b5b3e63657f7007ed165
Author: Laurent Godard 
Date:   Mon Jul 1 11:32:47 2013 +0200

the calculation of the progressbar leads to very slow saving

Change-Id: Ibba31126161b77b499561c5a74c057a56c07a4a8
Reviewed-on: https://gerrit.libreoffice.org/4647
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 0062479..1943238 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2432,10 +2432,10 @@ void ScXMLExport::_ExportAutoStyles()
 if (xCellRangesQuery.is())
 {
 Reference 
xSheetCellRanges(xCellRangesQuery->queryContentCells(sheet::CellFlags::FORMATTED));
-Reference 
xSheetOperation(xSheetCellRanges, uno::UNO_QUERY);
-if (xSheetCellRanges.is() && xSheetOperation.is())
+if (xSheetCellRanges.is())
 {
-sal_uInt32 
nCount(sal_uInt32(xSheetOperation->computeFunction(sheet::GeneralFunction_COUNT)));
+uno::Sequence< table::CellRangeAddress > 
aCellRangeAddresses (xSheetCellRanges->getRangeAddresses());
+sal_uInt32 nCount(aCellRangeAddresses.getLength());
 Reference 
xCellsAccess(xSheetCellRanges->getCells());
 if (xCellsAccess.is())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/tabpages/autocdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ce8756b9e9b76f3f4eac1d5e9209aef51f46c44
Author: Caolán McNamara 
Date:   Mon Jul 1 10:38:51 2013 +0100

Resolves: fdo#66403 infinite loop, typo i should be it

Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936
(cherry picked from commit e21544132a6732334a14194e02232b28e559303b)
Reviewed-on: https://gerrit.libreoffice.org/4648
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2e11890..bfde63b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1434,7 +1434,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet&  
)
 }
 }
 
-for(std::vector::iterator it = 
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i)
+for(std::vector::iterator it = 
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); 
++it)
 {
 String* s = new String(*it);
 if(!pWrdList->insert(s).second)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/tabpages/autocdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3367c767fec1b02f4493490e1ef5b2929dfbbd46
Author: Caolán McNamara 
Date:   Mon Jul 1 10:38:51 2013 +0100

Resolves: fdo#66403 infinite loop, typo i should be it

Conflicts:
cui/source/tabpages/autocdlg.cxx

Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936
Reviewed-on: https://gerrit.libreoffice.org/4649
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a99ec37..f8a5fe5 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1445,7 +1445,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet&  
)
 }
 }
 
-for(std::vector::iterator it = 
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i)
+for(std::vector::iterator it = 
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); 
++it)
 {
 String* s = new String(*it);
 if(!pWrdList->insert(s).second)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits