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

[Tor Lillqvist]

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

New commits:
commit 49ce8c126c962d75e2fefd5b4a578c213ff6a9bf
Author: Tor Lillqvist 
Date:   Fri Dec 13 09:50:52 2013 +0200

WaE: variable 'itResEnd' set but not used

Change-Id: I6594472b1e93c083fdc52133a6b120c031dff64a

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 517f43d..bf32280 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5631,7 +5631,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 }
 else
 {
-std::vector::const_iterator itRes = 
aResArray.begin(), itResEnd = aResArray.end();
+std::vector::const_iterator itRes = 
aResArray.begin();
 for (size_t nCol = 0; nCol < nColSize; ++nCol)
 {
 for (size_t nRow = 0; nRow < nRowSize; ++nRow, ++itRes)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Steve Yin]

 svx/source/accessibility/AccessibleShape.cxx |   17 +++--
 svx/source/table/accessibletableshape.cxx|2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 6f53c4f2f46691d41ccf2c2a99ae40105606e489
Author: Steve Yin 
Date:   Fri Dec 13 05:20:32 2013 +

fixes for issues checked out by coverity

diff --git a/svx/source/accessibility/AccessibleShape.cxx 
b/svx/source/accessibility/AccessibleShape.cxx
index c34397d..ca55eb2 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -436,18 +436,17 @@ uno::Reference SAL_CALL
 {
 ::osl::MutexGuard aGuard (maMutex);
 ::utl::AccessibleRelationSetHelper* pRelationSet = new 
utl::AccessibleRelationSetHelper;
-uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
-aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
 
 //this mxshape is the captioned shape, only for sw
-if(aSequence[0].get())
-{
-pRelationSet->AddRelation(
-AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, 
aSequence ) );
-}
-
 if (pRelationSet != NULL)
 {
+uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
+if(aSequence[0].get())
+{
+pRelationSet->AddRelation(
+AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, 
aSequence ) );
+}
 return uno::Reference (
 new ::utl::AccessibleRelationSetHelper (*pRelationSet));
 }
@@ -455,8 +454,6 @@ uno::Reference SAL_CALL
 {
 return uno::Reference(NULL);
 }
-
-return uno::Reference();
 }
 
 /** Return a copy of the state set.
diff --git a/svx/source/table/accessibletableshape.cxx 
b/svx/source/table/accessibletableshape.cxx
index d148740..eba58ba 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -328,6 +328,7 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const 
EventObject& /*Source*/
 AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& 
rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo)
 : AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo)
 , mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) )
+, mnPreviousSelectionCount(0)
 {
 }
 
@@ -343,7 +344,6 @@ void AccessibleTableShape::Init()
 {
 try
 {
-mnPreviousSelectionCount = 0;
 Reference< XPropertySet > xSet( mxShape, UNO_QUERY_THROW );
 Reference< XTable > xTable( xSet->getPropertyValue(C2U("Model")), 
UNO_QUERY_THROW );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2013-12-13

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things ! 
+ fdo#72598 Remove SunStudio cruft from code base
  in https://gerrit.libreoffice.org/7066 from Jelle van der Waa
  about module bridges, chart2, connectivity, idlc, sal
+ Support DOCX exporting 'Track Changes - Deleted Paragraph Mark'
  in https://gerrit.libreoffice.org/7061 from Adam CloudOn
  about module sw
+ Parameter rename - pRedline -> pRedlineData
  in https://gerrit.libreoffice.org/7060 from Adam CloudOn
  about module sw
+ Change 'StartRedline' and 'EndRedline' func signature in DOCX export
  in https://gerrit.libreoffice.org/7059 from Adam CloudOn
  about module sw
+ Revert code that push copy of 'rPr' inside 'pPr' in DOCX export
  in https://gerrit.libreoffice.org/7058 from Adam CloudOn
  about module sw
+ Add OS X 10.5 support to configure.ac
  in https://gerrit.libreoffice.org/7030 from Douglas Mencken
  about module build
+ Bump curl version check to 7.19.4 in configure.ac
  in https://gerrit.libreoffice.org/7050 from Douglas Mencken
  about module build
+ fdo#72304 Write Chart Data Table information back to XML. During export a
  in https://gerrit.libreoffice.org/7049 from Nikhil Walvekar
  about module include, oox
+ fdo#72304 Preserve Chart data table properties during ODF import/export.
  in https://gerrit.libreoffice.org/7048 from Nikhil Walvekar
  about module chart2, include, offapi, xmloff
+ fdo#72304 Added properties to store Chart data table information, during 
  in https://gerrit.libreoffice.org/7047 from Nikhil Walvekar
  about module include, oox
+ Add check for touch -h to configure.ac
  in https://gerrit.libreoffice.org/7046 from Douglas Mencken
  about module build
+ convert OUString** in HtmlExport to std::vector
  in https://gerrit.libreoffice.org/7044 from Noel Grandin
  about module sd
 End of freshness 



* Merged changes on master for project core changed in the last 25 hours:

+ Convert OUString** to std::vector in ScFuncDesc
  in https://gerrit.libreoffice.org/7057 from Noel Grandin
+ Update bundled Graphite to 1.2.4
  in https://gerrit.libreoffice.org/7056 from Khaled Hosny
+ Add new 'SwRedlineExtraData_FormattingChanges' class for formatting chang
  in https://gerrit.libreoffice.org/6901 from Adam CloudOn
+ Don't hold css::uno::Type instances by pointer
  in https://gerrit.libreoffice.org/7037 from Stephan Bergmann


* Abandoned changes on master for project core changed in the last 25 hours:

+ Related fdo#60698: Remove not used static library
  in https://gerrit.libreoffice.org/7055 from Marcos Souza
+ fdo#72125 optimize Expert Config dialog
  in https://gerrit.libreoffice.org/7011 from Noel Grandin


* Open changes needing tweaks, but being untouched for more than a week:

+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ Code clean-up/consolidation task.
  in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ fdo#71043 -  Use STACK lint tool to clean code
  in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz
+ new cell-border handling in calc
  in https://gerrit.libreoffice.org/6093 from Viktor Varga
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source sw/source toolkit/source vcl/source winaccessibility/source xmloff/source

[Takeshi Abe]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |2 --
 sw/source/core/access/accframebase.cxx|1 -
 sw/source/core/access/accmap.cxx  |1 -
 sw/source/core/access/accpara.cxx |4 
 sw/source/core/access/acctable.cxx|1 -
 toolkit/source/awt/vclxmenu.cxx   |2 --
 vcl/source/filter/wmf/winmtf.cxx  |1 -
 vcl/source/gdi/impimagetree.cxx   |1 -
 winaccessibility/source/service/AccObject.cxx |1 -
 xmloff/source/style/impastpl.hxx  |1 -
 10 files changed, 15 deletions(-)

New commits:
commit ed2238156618b5eae5a7e3b040dd0973793eace0
Author: Takeshi Abe 
Date:   Fri Dec 13 12:50:42 2013 +0900

Drop duplicate #include

Change-Id: I63612bc5bd4e13fcc5c4e57ac73bd9c7bbf4f0e6

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 4c10181..e722ce3 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -76,8 +76,6 @@
 #include 
 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accframebase.cxx 
b/sw/source/core/access/accframebase.cxx
index 8697c57..b22c899 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -35,7 +35,6 @@
 #include "accframebase.hxx"
 
 #include 
-#include "fesh.hxx"
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index ce9d912..7deaeff 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -53,7 +53,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 3dfd7f0..a70569f 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -83,7 +83,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -94,15 +93,12 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include "../../ui/inc/fldmgr.hxx"
 #include "fldbas.hxx"  // SwField
 
-#include 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::container;
diff --git a/sw/source/core/access/acctable.cxx 
b/sw/source/core/access/acctable.cxx
index 9233ee9..49ffcdb 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -44,7 +44,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index ea5a018..48d52dc 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -31,8 +31,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index dd3b3b6..bfd30eb 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -27,7 +27,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 1c67667..708f3c2 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -45,7 +45,6 @@
 #include "vcl/settings.hxx"
 #include "vcl/svapp.hxx"
 #include "impimagetree.hxx"
-#include 
 
 namespace {
 
diff --git a/winaccessibility/source/service/AccObject.cxx 
b/winaccessibility/source/service/AccObject.cxx
index b14d314..4bc03c4 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -27,7 +27,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 4293372..a2f06f2 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -32,7 +32,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 class SvXMLAutoStylePoolP;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4-2-milestone-5'

[Kohei Yoshida]

Tag 'libreoffice-4-2-milestone-5' created by Michael Meeks 
 at 2013-12-13 00:36 -0800

milestone five

Changes since libreoffice-4-2-milestone-4-48:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/tool/interpr1.cxx |   66 +++
 1 file changed, 33 insertions(+), 33 deletions(-)

New commits:
commit da443ab58158d2b7ffa52742cec2be76e3aa2026
Author: Kohei Yoshida 
Date:   Thu Dec 12 15:19:57 2013 -0500

Fix performance regression from ScMatrix conversion to multi_type_matrix.

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 9bd5680..19179a7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5277,7 +5277,9 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 }
 else
 {
-ScMatrixRef pResMat;
+std::vector aResArray;
+size_t nRowSize = 0;
+size_t nColSize = 0;
 double fVal = 0.0;
 double fSum = 0.0;
 double fMem = 0.0;
@@ -5440,17 +5442,11 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 return 0;
 
 // initialize temporary result matrix
-if (!pResMat)
+if (aResArray.empty())
 {
-SCSIZE nResC, nResR;
-nResC = nCol2 - nCol1 + 1;
-nResR = nRow2 - nRow1 + 1;
-pResMat = GetNewMat(nResC, nResR, false);
-if (!pResMat)
-{
-SetError( errIllegalParameter);
-return 0;
-}
+nColSize = nCol2 - nCol1 + 1;
+nRowSize = nRow2 - nRow1 + 1;
+aResArray.resize(nColSize*nRowSize, 0);
 }
 
 ScQueryParam rParam;
@@ -5494,9 +5490,19 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 return 0;
 }
 
-// query and result matrices have same geometry, and the
 // result matrix is filled with boolean values.
-*pResMat += *pResultMatrix;
+std::vector aResValues;
+pResultMatrix->GetDoubleArray(aResValues, true);
+if (aResArray.size() != aResValues.size())
+{
+SetError( errIllegalParameter);
+return 0;
+}
+
+std::vector::iterator itRes = aResArray.begin(), 
itResEnd = aResArray.end();
+std::vector::const_iterator itThisRes = 
aResValues.begin();
+for (; itRes != itResEnd; ++itRes, ++itThisRes)
+*itRes += *itThisRes;
 }
 else
 {
@@ -5507,9 +5513,9 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 {
 do
 {
-SCSIZE nC = aCellIter.GetCol() + nColDiff;
-SCSIZE nR = aCellIter.GetRow() + nRowDiff;
-pResMat->PutDouble(pResMat->GetDouble(nC, nR)+1.0, nC, 
nR);
+size_t nC = aCellIter.GetCol() + nColDiff;
+size_t nR = aCellIter.GetRow() + nRowDiff;
+++aResArray[nC*nRowSize+nR];
 } while ( aCellIter.GetNext() );
 }
 }
@@ -5594,16 +5600,15 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 aAdr.SetTab( nMainTab1 );
 if (pMainMatrix)
 {
-std::vector aResValues, aMainValues;
-pResMat->GetDoubleArray(aResValues, true);
+std::vector aMainValues;
 pMainMatrix->GetDoubleArray(aMainValues, false); // Map empty 
values to NaN's.
-if (aResValues.size() != aMainValues.size())
+if (aResArray.size() != aMainValues.size())
 {
 SetError( errIllegalArgument);
 return 0;
 }
 
-std::vector::const_iterator itRes = 
aResValues.begin(), itResEnd = aResValues.end();
+std::vector::const_iterator itRes = 
aResArray.begin(), itResEnd = aResArray.end();
 std::vector::const_iterator itMain = 
aMainValues.begin();
 for (; itRes != itResEnd; ++itRes, ++itMain)
 {
@@ -5626,13 +5631,12 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 }
 else
 {
-SCSIZE nC, nR;
-pResMat->GetDimensions(nC, nR);
-for (SCSIZE nCol = 0; nCol < nC; ++nCol)
+std::vector::const_iterator itRes = 
aResArray.begin(), itResEnd = aResArray.end();
+for (size_t nCol = 0; nCol < nColSize; ++nCol)
 {
-for (SCSIZE nRow = 0; nRow < nR; ++nRow)
+for (size_t nRow = 0; nRow < nRowSize; ++nRow, ++itRes)
 {
-if (pResMat->GetDouble( nCol, nRow) == nQueryCount)
+if (

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

[Kohei Yoshida]

 sc/source/core/tool/interpr1.cxx |   66 +++
 1 file changed, 33 insertions(+), 33 deletions(-)

New commits:
commit b578d23d3131f30d775e07baa6fa26e247ea999d
Author: Kohei Yoshida 
Date:   Thu Dec 12 15:19:57 2013 -0500

Fix performance regression from ScMatrix conversion to multi_type_matrix.

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f6b5382..517f43d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5277,7 +5277,9 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 }
 else
 {
-ScMatrixRef pResMat;
+std::vector aResArray;
+size_t nRowSize = 0;
+size_t nColSize = 0;
 double fVal = 0.0;
 double fSum = 0.0;
 double fMem = 0.0;
@@ -5440,17 +5442,11 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 return 0;
 
 // initialize temporary result matrix
-if (!pResMat)
+if (aResArray.empty())
 {
-SCSIZE nResC, nResR;
-nResC = nCol2 - nCol1 + 1;
-nResR = nRow2 - nRow1 + 1;
-pResMat = GetNewMat(nResC, nResR, false);
-if (!pResMat)
-{
-SetError( errIllegalParameter);
-return 0;
-}
+nColSize = nCol2 - nCol1 + 1;
+nRowSize = nRow2 - nRow1 + 1;
+aResArray.resize(nColSize*nRowSize, 0);
 }
 
 ScQueryParam rParam;
@@ -5494,9 +5490,19 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 return 0;
 }
 
-// query and result matrices have same geometry, and the
 // result matrix is filled with boolean values.
-*pResMat += *pResultMatrix;
+std::vector aResValues;
+pResultMatrix->GetDoubleArray(aResValues, true);
+if (aResArray.size() != aResValues.size())
+{
+SetError( errIllegalParameter);
+return 0;
+}
+
+std::vector::iterator itRes = aResArray.begin(), 
itResEnd = aResArray.end();
+std::vector::const_iterator itThisRes = 
aResValues.begin();
+for (; itRes != itResEnd; ++itRes, ++itThisRes)
+*itRes += *itThisRes;
 }
 else
 {
@@ -5507,9 +5513,9 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 {
 do
 {
-SCSIZE nC = aCellIter.GetCol() + nColDiff;
-SCSIZE nR = aCellIter.GetRow() + nRowDiff;
-pResMat->PutDouble(pResMat->GetDouble(nC, nR)+1.0, nC, 
nR);
+size_t nC = aCellIter.GetCol() + nColDiff;
+size_t nR = aCellIter.GetRow() + nRowDiff;
+++aResArray[nC*nRowSize+nR];
 } while ( aCellIter.GetNext() );
 }
 }
@@ -5594,16 +5600,15 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 aAdr.SetTab( nMainTab1 );
 if (pMainMatrix)
 {
-std::vector aResValues, aMainValues;
-pResMat->GetDoubleArray(aResValues, true);
+std::vector aMainValues;
 pMainMatrix->GetDoubleArray(aMainValues, false); // Map empty 
values to NaN's.
-if (aResValues.size() != aMainValues.size())
+if (aResArray.size() != aMainValues.size())
 {
 SetError( errIllegalArgument);
 return 0;
 }
 
-std::vector::const_iterator itRes = 
aResValues.begin(), itResEnd = aResValues.end();
+std::vector::const_iterator itRes = 
aResArray.begin(), itResEnd = aResArray.end();
 std::vector::const_iterator itMain = 
aMainValues.begin();
 for (; itRes != itResEnd; ++itRes, ++itMain)
 {
@@ -5626,13 +5631,12 @@ double ScInterpreter::IterateParametersIfs( 
ScIterFuncIfs eFunc )
 }
 else
 {
-SCSIZE nC, nR;
-pResMat->GetDimensions(nC, nR);
-for (SCSIZE nCol = 0; nCol < nC; ++nCol)
+std::vector::const_iterator itRes = 
aResArray.begin(), itResEnd = aResArray.end();
+for (size_t nCol = 0; nCol < nColSize; ++nCol)
 {
-for (SCSIZE nRow = 0; nRow < nR; ++nRow)
+for (size_t nRow = 0; nRow < nRowSize; ++nRow, ++itRes)
 {
-if (pResMat->GetDouble( nCol, nRow) == nQueryCount)
+if (

[Libreoffice-commits] metafile/piechart.emf

[Libreoffice Gerrit user]

 metafile/piechart.emf |binary
 1 file changed

New commits:
commit f72b50b0f87aa371d14b34bdae9c79b11b5e49d8
Author: Michael Meeks 
Date:   Fri Dec 13 00:26:49 2013 +

Add piechart EMF+ primitive record test case.

diff --git a/metafile/piechart.emf b/metafile/piechart.emf
new file mode 100644
index 000..4abf1fb
Binary files /dev/null and b/metafile/piechart.emf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: l10n process, en_US version, Help files

[Mat M]

Hi all

My grain of salt there. I strongly believe we need to cross-talk, so I go  
on cross-posting.


Le Thu, 12 Dec 2013 13:54:05 +0100, Sophie  a  
écrit:



Hi Andras, all,
Le 12/12/2013 11:18, Andras Timar a écrit :

On 2013.12.11. 17:19, Sophie wrote:

*About the en_US overall quality

Further discussed


- but that doesn't solve the several typos that already exist and that
are overlooked by the l10n team (e.g in the Character > Font Effect
dialog, there is Overline _c_olor and Underline _C_olor and this is the
same for several dialogs)



[...]

Not sure, as Khaled said, it may be because the load of work on
translation is enough to not take care of other things.


We have three steps here:
- Seeing the typo / obvious inconsistency
- Marking the typo
- Fixing the typo

* See : With a en-US ui, you can catch some during normal work
Else, you are in a chase for them (QA, l10n, someone ? ).

* Next step is to mark them.
When you are in a chase, you can organize stuff to avoid duplicate work  
and jot all references to, say, a wiki page or an etherpad, whatever fits
When you catch one on LO: what will make you go further ? Easiness. We  
need a simple process to submit. The counterpart is that we may have many  
false positives, so more filtering to do. Conclusion : either we provide a  
simple way to report a miss in the text because it may provide useful  
input, or we consider not having enough people to filter, and we limit  
ourselves to chases.


* And... fixing !
Easy hacks or l10n sessions to fix that are both valid choices. We may  
want to automate finding occurrences of text in the code. We began with  
fdo#39439, but further steps are required.





* About the help files
- I always wonder why there is a Help button on a new dialog when no
help file is appended ;)


Probably it is prescribed by some rule, e.g. Gnome HIG, that every
dialog must have a Help button. So dialog creator application puts it
there, and the developer leaves it there thinking that someone may write
a help page for it later.


Well, may be, but unfortunately the help page is never created.

And who is this someone ?

BTW, I don't really know the workflow to provide some help content, but I  
think the developer creating a help button should at list input some draft  
so people have a start to improve (like we had some lengthy comments on  
usage in code before).
We may have a script to parse the code and find help links without  
targets, but to fight against obsolescence, we need people involved and  
scanning the help, or like typos an easy way to report.
We are more in a typewriting & review process than a l10n one, so maybe we  
need doc@ here.



- more and more functions are undocumented or their help is obsolete. I
always think that an undocumented function is lost for the user and a
sad thing for a developer because his function will not be used as  
expected.


As I wrote above, many functions/new dialogs are self-describing. I
hated to translate Gnome help 10 years ago, which was full of sentences
like this: "Click on Close button to close the dialog." So we need to
limit the scope here. It would be good, if you could give examples, what
needs further clarification in help.


They may be self describing for you, but not for most of our users. I've
collected some issues where the help needs to be amended or is missing,
but it would be better to have a general process and try to include more
people in it.
If I admit your example is quite useless, Andras, we have many not-at-all  
savvy users which actually needs the help, and the basic one, not the  
expert one. That is the hard stuff. I don't want to dive into tutorials in  
help, but a good explanantion and an example may help people figure how to  
use something or to determine if this something is what they are searching  
for.
Remember that we have many facilities in LibreOffice, and we don't know  
them all. So at one point you have to search for them. And here goes the  
help system.





May be, but I don't know how heavy it would be for developers, the
solution would be to open an issue with a special tag like NF for each
new feature, with three lines about what the feature is supposed to
do. Searching on BZ with this special tag would allow to involve more
people in the loop to test it and document it.


The problem is that you cannot enforce any rule to developers. You can

[...]


That I know :)
 But I have an idea. What about prolonging the

string freeze date of help until the first bug fix release? That would

[...]


That's a good idea, but we still need help authors. I'm sure some people
will jump in, even earlier, if they only know where, hence the proposal
for a dedicated issue. As I said in another mail, I don't want to add
more processes, rules, etc. But there is some areas that impact more
than one team where it would be good to have some worflows.


We can have a start saying all contributore to libreoffice are nice :)
Then, we can ask

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

[Tor Lillqvist]

 vcl/inc/cupsmgr.hxx  |1 -
 vcl/inc/salframe.hxx |2 +-
 vcl/inc/salprn.hxx   |2 +-
 vcl/inc/salvd.hxx|2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9a03791dc8e46f90566aab5d121309d61ad1576b
Author: Tor Lillqvist 
Date:   Thu Dec 12 23:43:36 2013 +0200

Bin a few nonsense comments

Change-Id: I65b83b4eda76501a5d37d853df3644b157f296de

diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 8c659fe..a5f8a84 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -67,7 +67,6 @@ class CUPSManager : public PrinterInfoManager
 void runDests();
 OString threadedCupsGetPPD(const char* pPrinter);
 public:
-/// public for stub
 static void runDestThread(void* pMgr);
 
 static CUPSManager* tryLoadCUPS();
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index d75a460..4c69655 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -102,7 +102,7 @@ class VCL_PLUGIN_PUBLIC SalFrame : public 
vcl::DeletionNotifier
 Window* m_pWindow;
 SALFRAMEPROCm_pProc;
 
-public: // public for Sal Implementation
+public:
 SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {}
 virtual ~SalFrame();
 
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index b608439..3e96c55 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -86,7 +86,7 @@ public:
 
 class VCL_PLUGIN_PUBLIC SalPrinter
 {
-public: // public for Sal Implementation
+public:
 SalPrinter() {}
 virtual ~SalPrinter();
 
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 74e4930..55a0372 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -28,7 +28,7 @@ class SalGraphics;
 
 class VCL_PLUGIN_PUBLIC SalVirtualDevice
 {
-public: // public for Sal Implementation
+public:
 SalVirtualDevice() {}
 virtual ~SalVirtualDevice();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: General LibreOffice architecture information request

[Sébastien Wilmet]

Hi,

On Wed, Dec 11, 2013 at 12:54:46PM +0100, Kalmann, D.J. wrote:
> We are a project team for a university course called Software Patterns. In
> this course, we want to analyze the architecture of LibreOffice. Using this
> architecture we want to find any Software Patterns used in your project. We
> would like to get answers to some questions in order to get our report
> started, initially we would like to have some information about your
> stakeholders and key drivers. Is somebody available for us to communicate
> with about these questions? Of course when the document is finished, we
> would like to deliver the report to the LibreOffice community.

Don't ask to ask, just ask.

My 2 cents,
Sébastien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Arnaud Versini  changed:

   What|Removed |Added

 Depends on||72650

--- Comment #37 from Arnaud Versini  ---
Adding  Startup is slow due to the new startcenter, not confirmed but really
important

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

[Miklos Vajna]

 filter/source/msfilter/rtfutil.cxx |  145 +++--
 1 file changed, 75 insertions(+), 70 deletions(-)

New commits:
commit adc1b6b5bbfc727bcd6a188c8d47f026b61da1eb
Author: Miklos Vajna 
Date:   Thu Dec 12 22:13:11 2013 +0100

filter: whitespace fixes in rtfutil

Change-Id: Ifb1a112d632410ae685fa09f3ddff8a021ddd68b

diff --git a/filter/source/msfilter/rtfutil.cxx 
b/filter/source/msfilter/rtfutil.cxx
index 5471456..847ba34 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -11,30 +11,32 @@
 #include 
 #include 
 
-namespace msfilter {
-namespace rtfutil {
+namespace msfilter
+{
+namespace rtfutil
+{
 
 OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 {
 sal_Char aNToABuf[] = "";
 
-OSL_ENSURE( nLen < sizeof(aNToABuf), "nLen is too big" );
-if( nLen >= sizeof(aNToABuf) )
+OSL_ENSURE(nLen < sizeof(aNToABuf), "nLen is too big");
+if (nLen >= sizeof(aNToABuf))
 nLen = (sizeof(aNToABuf)-1);
 
 // Set pointer to the buffer end
 sal_Char* pStr = aNToABuf + (sizeof(aNToABuf)-1);
-for( sal_uInt8 n = 0; n < nLen; ++n )
+for (sal_uInt8 n = 0; n < nLen; ++n)
 {
-*(--pStr) = (sal_Char)(nHex & 0xf ) + 48;
-if( *pStr > '9' )
+*(--pStr) = (sal_Char)(nHex & 0xf) + 48;
+if (*pStr > '9')
 *pStr += 39;
 nHex >>= 4;
 }
 return OString(pStr);
 }
 
-OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, bool* 
pSuccess, bool bUnicode)
+OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, bool* 
pSuccess, bool bUnicode)
 {
 if (pSuccess)
 *pSuccess = true;
@@ -43,87 +45,90 @@ OString OutChar(sal_Unicode c, int *pUCMode, 
rtl_TextEncoding eDestEnc, bool* pS
 // 0x0b instead of \n, etc because of the replacements in 
SwWW8AttrIter::GetSnippet()
 switch (c)
 {
-case 0x0b:
-// hard line break
-pStr = OOO_STRING_SVTOOLS_RTF_LINE;
-break;
-case '\t':
-pStr = OOO_STRING_SVTOOLS_RTF_TAB;
-break;
-case '\\':
-case '}':
-case '{':
-aBuf.append('\\');
+case 0x0b:
+// hard line break
+pStr = OOO_STRING_SVTOOLS_RTF_LINE;
+break;
+case '\t':
+pStr = OOO_STRING_SVTOOLS_RTF_TAB;
+break;
+case '\\':
+case '}':
+case '{':
+aBuf.append('\\');
+aBuf.append((sal_Char)c);
+break;
+case 0xa0:
+// non-breaking space
+pStr = "\\~";
+break;
+case 0x1e:
+// non-breaking hyphen
+pStr = "\\_";
+break;
+case 0x1f:
+// optional hyphen
+pStr = "\\-";
+break;
+default:
+if (c >= ' ' && c <= '~')
 aBuf.append((sal_Char)c);
-break;
-case 0xa0:
-// non-breaking space
-pStr = "\\~";
-break;
-case 0x1e:
-// non-breaking hyphen
-pStr = "\\_";
-break;
-case 0x1f:
-// optional hyphen
-pStr = "\\-";
-break;
-default:
-if (c >= ' ' && c <= '~')
-aBuf.append((sal_Char)c);
-else {
-OUString sBuf(&c, 1);
-OString sConverted;
-if (pSuccess)
-*pSuccess &= sBuf.convertToString(&sConverted, eDestEnc, 
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | 
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR);
-else
-sBuf.convertToString(&sConverted, eDestEnc, 
OUSTRING_TO_OSTRING_CVTFLAGS);
-const sal_Int32 nLen = sConverted.getLength();
+else
+{
+OUString sBuf(&c, 1);
+OString sConverted;
+if (pSuccess)
+*pSuccess &= sBuf.convertToString(&sConverted, eDestEnc, 
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | 
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR);
+else
+sBuf.convertToString(&sConverted, eDestEnc, 
OUSTRING_TO_OSTRING_CVTFLAGS);
+const sal_Int32 nLen = sConverted.getLength();
 
-if (pUCMode && bUnicode)
+if (pUCMode && bUnicode)
+{
+if (*pUCMode != nLen)
 {
-if (*pUCMode != nLen)
-{
-aBuf.append("\\uc");
-aBuf.append((sal_Int32)nLen);
-// #i47831# add an additional whitespace, so that 
"document whitespaces" are not ignored.
-aBuf.append(' ');
-*pUCMode = nLen;
-}
-aBuf.append("\\u");
-aBuf.append((sal_Int32)c);
+aBuf.append("\\uc");
+aBuf.append((sal_Int32)nLen);
+// #i47831# add an additional

Font style and size dropdown widths

[Keith Curtis]

One thing I'm looking at right now is changing the font style and size
dropdown width. With Gnome 3.10 out of the box, I can fit 7 digits into the
size box ;-) The font style dropdown also feels a bit too big. So I trimmed
25% off the style name and 33% from the font size which still leaves plenty
of room. I didn't consider to change the font name because it seems fine
and they are often longer than style names.

The first change is in a .src file so I can't do any special logic coding
and it doesn't seem like it should be necessary with APPFONT dimensions.
Would it be okay if we trimmed those values somewhat? I haven't looked yet
if logical dimensions are based on dpi or font size so maybe that should be
changed. My fixes can mostly be proven to not break the standard-res
behavior, but these two can't, And they might not necessarily look good on
Macs or various other scripts either.

Thanks!

-Keith

diff --git a/svx/source/tbxctrls/tbcontrl.src
b/svx/source/tbxctrls/tbcontrl.src
index 4d2cfbc..665f0fa 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -74,7 +74,7 @@ String RID_SVXSTR_FRAME_COLOR
 ComboBox RID_SVXTBX_STYLE
 {
 HelpId = HID_STYLE_LISTBOX ;
-Size = MAP_APPFONT ( 67 , 86 ) ;
+Size = MAP_APPFONT ( 50 , 86 ) ;
 DropDown = TRUE ;
 Sort = TRUE ;
 AutoHScroll = TRUE ;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx
b/svx/source/tbxctrls/tbunocontroller.cxx
index 36e257e..c343844 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -85,7 +85,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
 FontSizeBox( _pParent, WinBits( WB_DROPDOWN ) ),

 m_pCtrl ( &_rCtrl ),
-m_aLogicalSize  ( 30,100 ),
+m_aLogicalSize  ( 20,100 ),
 m_bRelease  ( true ),
 m_xDispatchProvider ( _rDispatchProvider ),
 m_xFrame( _xFrame )
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 72598] [Easyhack] Remove SunStudio cruft from code base

[bugzilla-daemon]

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

Jelle van der Waa  changed:

   What|Removed |Added

 CC||je...@vdwaa.nl

--- Comment #1 from Jelle van der Waa  ---
I am going to work on this easyhack.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - cui/source cui/uiconfig officecfg/registry

[Jan Holesovsky]

 cui/source/options/optjava.cxx |3 +++
 cui/uiconfig/ui/optadvancedpage.ui |5 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 137de1dce92f4cf05adefc3d0dbe09d6a2a339af
Author: Jan Holesovsky 
Date:   Thu Dec 12 21:22:43 2013 +0100

Expert config: 6px between lines + center the button.

Change-Id: I91899493479eb60c955dac3891a38913ad871376

diff --git a/cui/uiconfig/ui/optadvancedpage.ui 
b/cui/uiconfig/ui/optadvancedpage.ui
index 4554014..7f06e78 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -326,6 +326,7 @@
   
 True
 False
+6
 
   
 Enable 
experimental features
@@ -361,10 +362,12 @@
 
 
   
-Expert Config 
Page
+Expert 
Configuration
 True
 True
 True
+center
+True
   
   
 0
commit 189573c14ba39eb791350c15578f7a794ff6976c
Author: Jan Holesovsky 
Date:   Thu Dec 12 21:15:45 2013 +0100

Expert config: Introduce configuration key to disable expert config.

It is /org.openoffice.Office.Common/Security/EnableExpertConfiguration with
values true/false; defaults to true.

Change-Id: I5a18d16182c28a13169677b11f68884f34c11c63

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1841c40..ce5c162 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -23,6 +23,7 @@
 #include "optjava.hxx"
 #include 
 
+#include 
 #include 
 
 #include 
@@ -183,6 +184,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, 
const SfxItemSet& rSet
 m_aResetTimer.SetTimeout( RESET_TIMEOUT );
 
 m_pExpertConfigBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, 
ExpertConfigHdl_Impl) );
+if (!officecfg::Office::Common::Security::EnableExpertConfiguration::get())
+m_pExpertConfigBtn->Disable();
 
 xDialogListener->SetDialogClosedLink( LINK( this, SvxJavaOptionsPage, 
DialogClosedHdl ) );
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 069a128..affd280 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2417,6 +2417,13 @@
   
 Contains security specific Office settings.
   
+  
+
+  Determines if the user has access to the entire
+  configuration via the Expert Configuration button.
+
+true
+  
   
 
   Contains security settings regarding Basic scripts.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/uiconfig/ui/aboutconfigdialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 58d22176a7b4ce732c1ac552dfb5914ff6f680cb
Author: Caolán McNamara 
Date:   Thu Dec 12 20:17:39 2013 +

set ok as the default button

Change-Id: I44386a004f94a237fd03b301248b8dc260f47bbd

diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index b92e63f..495b0eab 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -47,6 +47,8 @@
 gtk-ok
 True
 True
+True
+True
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/core/api/BookmarkSet.cxx  |5 +
 dbaccess/source/core/api/BookmarkSet.hxx  |1 +
 dbaccess/source/core/api/CacheSet.cxx |   10 --
 dbaccess/source/core/api/CacheSet.hxx |3 ++-
 dbaccess/source/core/api/KeySet.cxx   |   11 ++-
 dbaccess/source/core/api/KeySet.hxx   |2 +-
 dbaccess/source/core/api/OptimisticSet.cxx|   10 --
 dbaccess/source/core/api/OptimisticSet.hxx|1 -
 dbaccess/source/core/api/RowSet.cxx   |4 
 dbaccess/source/core/api/RowSetCache.cxx  |2 +-
 dbaccess/source/core/api/StaticSet.cxx|   12 
 dbaccess/source/core/api/StaticSet.hxx|2 ++
 dbaccess/source/core/api/WrappedResultSet.cxx |5 +
 dbaccess/source/core/api/WrappedResultSet.hxx |1 +
 14 files changed, 48 insertions(+), 21 deletions(-)

New commits:
commit dd0990db74a4a5c3a129a7ff0ed2a739cd74a381
Author: Lionel Elie Mamane 
Date:   Thu Dec 12 20:13:40 2013 +0100

fdo#72463 RowSet: on execute when not dirty, rebuild cache

Change-Id: I3f27b7572b88cd1200483121614c29d414c37e20

diff --git a/dbaccess/source/core/api/BookmarkSet.cxx 
b/dbaccess/source/core/api/BookmarkSet.cxx
index 96636e9..262b11f 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -43,6 +43,11 @@ void OBookmarkSet::construct(const Reference< XResultSet>& 
_xDriverSet,const OUS
 m_xRowLocate.set(_xDriverSet,UNO_QUERY);
 }
 
+void OBookmarkSet::reset(const Reference< XResultSet>& _xDriverSet)
+{
+construct(_xDriverSet, m_sRowSetFilter);
+}
+
 Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException)
 {
SAL_INFO("dbaccess", "OBookmarkSet::getBookmark" );
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx 
b/dbaccess/source/core/api/BookmarkSet.hxx
index c02ced3..76e92e9 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -40,6 +40,7 @@ namespace dbaccess
 }
 
 virtual void construct(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& 
i_sRowSetFilter);
+virtual void reset(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSet>& _xDriverSet);
 virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition);
 // ::com::sun::star::sdbcx::XRowLocate
 virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index 09519c7..23ad484 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -78,10 +78,13 @@ OUString OCacheSet::getIdentifierQuoteString() const
 return sQuote;
 }
 
-void OCacheSet::construct(  const Reference< XResultSet>& _xDriverSet,const 
OUString& /*i_sRowSetFilter*/)
+void OCacheSet::construct(  const Reference< XResultSet>& _xDriverSet,const 
OUString &i_sRowSetFilter)
 {
 SAL_INFO("dbaccess", "OCacheSet::construct" );
 OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet");
+
+m_sRowSetFilter = i_sRowSetFilter;
+
 if(_xDriverSet.is())
 {
 m_xDriverSet = _xDriverSet;
@@ -666,11 +669,6 @@ bool OCacheSet::isResultSetChanged() const
 return false;
 }
 
-void OCacheSet::reset(const Reference< XResultSet>& /*_xDriverSet*/)
-{
-SAL_WARN("dbaccess", "Illegal call!");
-}
-
 void OCacheSet::mergeColumnValues(sal_Int32 
i_nColumnIndex,ORowSetValueVector::Vector& 
/*io_aInsertRow*/,ORowSetValueVector::Vector& 
/*io_aRow*/,::std::vector& o_aChangedColumns)
 {
 o_aChangedColumns.push_back(i_nColumnIndex);
diff --git a/dbaccess/source/core/api/CacheSet.hxx 
b/dbaccess/source/core/api/CacheSet.hxx
index 5247f61..a975699 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -53,6 +53,7 @@ namespace dbaccess
 sal_Boolm_bInserted;
 sal_Boolm_bUpdated;
 sal_Boolm_bDeleted;
+OUStringm_sRowSetFilter;
 
 OCacheSet(sal_Int32 i_nMaxRows);
 virtual ~OCacheSet();
@@ -135,7 +136,7 @@ namespace dbaccess
 virtual void SAL_CALL moveToCurrentRow(  ) 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException) = 0;
 
 virtual bool isResultSetChanged() const;
-virtual void reset(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSet>& _xDriverSet);
+virtual void reset(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSet>& _xDriverSet) = 0;
 virtual void mergeColumnValues(sal_Int32 
i_nColumnIndex,ORowSetValueVector::Vector& 
io_aInsertRow,ORowSetValueVector:

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

[Tor Lillqvist]

 0 files changed

New commits:
commit 2e535b6178dd160dc27195cbb9a35bb3b17663d3
Author: Tor Lillqvist 
Date:   Thu Dec 12 21:24:15 2013 +0200

chmod -x

Change-Id: I51d817cf01ba3cd87a2b78e00c96707dbdb78a3b

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #36 from V Stuart Foote  ---
Adding bug 72647 regression in UAA <-> Windows Java Accessibility API JAB
bridge as potential Windows build release blocker--Accessibility regression

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||72647

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

[Jacobo Aragunde Pérez]

 writerfilter/source/filter/ImportFilter.cxx |  186 
 writerfilter/source/filter/WriterFilter.hxx |3 
 2 files changed, 60 insertions(+), 129 deletions(-)

New commits:
commit 629706f24dcc9b4654f1d717a31d584769137a53
Author: Jacobo Aragunde Pérez 
Date:   Thu Dec 12 18:50:18 2013 +0100

writerfilter: refactor code to fill document grab bag

There were several chunks of identical code to add attributes to the
document grab bag. I have refactored the common code to a method.

Change-Id: Ia1de75280a7725ab9703b08b1b08e7a7d1e0a8f2

diff --git a/writerfilter/source/filter/ImportFilter.cxx 
b/writerfilter/source/filter/ImportFilter.cxx
index 708b9f7..2854088 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -119,140 +119,30 @@ sal_Bool WriterFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDes
 
 pDocument->resolve(*pStream);
 
-// Adding the saved Theme DOM to the document's grab bag
-try
-{
-uno::Reference xDocProps(m_xDstDoc, 
uno::UNO_QUERY);
-if (xDocProps.is())
-{
-uno::Reference xPropsInfo = 
xDocProps->getPropertySetInfo();
+// Adding some properties to the document's grab bag for 
interoperability purposes:
+uno::Sequence aGrabBagProperties(6);
 
-const OUString aGrabBagPropName = "InteropGrabBag";
-if( xPropsInfo.is() && xPropsInfo->hasPropertyByName( 
aGrabBagPropName ) )
-{
-uno::Sequence aGrabBag;
-
-// We want to keep the previous items
-xDocProps->getPropertyValue( aGrabBagPropName ) >>= 
aGrabBag;
-sal_Int32 length = aGrabBag.getLength();
-aGrabBag.realloc(length+1);
+// Adding the saved Theme DOM
+aGrabBagProperties[0].Name = "OOXTheme";
+aGrabBagProperties[0].Value = uno::makeAny( pDocument->getThemeDom() );
 
-uno::Reference aThemeDom = 
pDocument->getThemeDom();
+// Adding the saved custom xml DOM
+aGrabBagProperties[1].Name = "OOXCustomXml";
+aGrabBagProperties[1].Value = uno::makeAny( 
pDocument->getCustomXmlDomList() );
+aGrabBagProperties[2].Name = "OOXCustomXmlProps";
+aGrabBagProperties[2].Value = uno::makeAny( 
pDocument->getCustomXmlDomPropsList() );
 
-beans::PropertyValue* pValue = aGrabBag.getArray();
-pValue[length].Name = "OOXTheme";
-pValue[length].Value = uno::makeAny( aThemeDom );
+// Adding the saved ActiveX DOM
+aGrabBagProperties[3].Name = "OOXActiveX";
+aGrabBagProperties[3].Value = uno::makeAny( 
pDocument->getActiveXDomList() );
+aGrabBagProperties[4].Name = "OOXActiveXBin";
+aGrabBagProperties[4].Value = uno::makeAny( 
pDocument->getActiveXBinList() );
 
-xDocProps->setPropertyValue( aGrabBagPropName, uno::Any( 
aGrabBag ) );
-}
-}
-}
-catch(const uno::Exception&)
-{
-SAL_WARN("writerfilter","Failed to save theme dom to documents 
grab bag");
-}
+// Adding the saved w:themeFontLang setting
+aGrabBagProperties[5].Name = "ThemeFontLangProps";
+aGrabBagProperties[5].Value = uno::makeAny( 
aDomainMapper->GetThemeFontLangProperties() );
 
-// Adding the saved custom xml DOM to the document's grab bag
-try
-{
-  uno::Reference xDocProps(m_xDstDoc, 
uno::UNO_QUERY);
-  if (xDocProps.is())
-  {
-  uno::Reference xPropsInfo = 
xDocProps->getPropertySetInfo();
-
-  const OUString aGrabBagPropName = "InteropGrabBag";
-  if( xPropsInfo.is() && xPropsInfo->hasPropertyByName( 
aGrabBagPropName ) )
-  {
-  uno::Sequence aGrabBag;
-
-  // We want to keep the previous items
-  xDocProps->getPropertyValue( aGrabBagPropName ) >>= 
aGrabBag;
-  sal_Int32 length = aGrabBag.getLength();
-  aGrabBag.realloc(length+2);
-
-  beans::PropertyValue* pValue = aGrabBag.getArray();
-  pValue[length].Name = "OOXCustomXml";
-  pValue[length].Value = uno::makeAny( 
pDocument->getCustomXmlDomList() );
-
-  pValue[length+1].Name = "OOXCustomXmlProps";
-  pValue[length+1].Value = uno::makeAny( 
pDocument->getCustomXmlDomPropsList() );
-
-  xDocProps->setPropertyValue( aGrabBagPropName, uno::Any( 
aGrabBag ) );
-
-
-  }
-  }
-}
-catch(const uno::Exception&)
-{
-SAL_WARN("writerfilter","Failed to save custom xml dom to 
documents grab bag");
-

[ANN] LibreOffice 4.1.4 RC2 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the second release
candidate of LibreOffice 4.1.4. The upcoming 4.1.4 will be the fourth
in a sequence of frequent bugfix releases for our feature-packed 4.1
line. Please be aware that LibreOffice 4.1.4 RC2 is not been flagged as ready
for production use yet, you should continue to use LibreOffice 4.1.3 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.libreoffice.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.1.4 RC2 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.1.4/RC2

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

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

[Kohei Yoshida]

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

New commits:
commit de27adb9d92463ec346977270fd92feb20aea7f6
Author: Kohei Yoshida 
Date:   Thu Dec 12 13:22:42 2013 -0500

Fix "fit to column" breakage.

I broke it during the grand cell storage refactoring.

Change-Id: I75361750a859b42d83f76dd4e30ad6b134af81c5
(cherry picked from commit 3c95f901d5f30919b339695ddac94bf5a67aa9a9)

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 8759c51..307d42b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -611,7 +611,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth(
 
 sc::SingleColumnSpanSet aSpanSet;
 sc::SingleColumnSpanSet::SpansType aMarkedSpans;
-if (pMarkData)
+if (pMarkData && (pMarkData->IsMarked() || pMarkData->IsMultiMarked()))
 {
 aSpanSet.scan(*pMarkData, nTab, nCol);
 aSpanSet.getSpans(aMarkedSpans);
___
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/data/column2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c95f901d5f30919b339695ddac94bf5a67aa9a9
Author: Kohei Yoshida 
Date:   Thu Dec 12 13:22:42 2013 -0500

Fix "fit to column" breakage.

I broke it during the grand cell storage refactoring.

Change-Id: I75361750a859b42d83f76dd4e30ad6b134af81c5

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 8759c51..307d42b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -611,7 +611,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth(
 
 sc::SingleColumnSpanSet aSpanSet;
 sc::SingleColumnSpanSet::SpansType aMarkedSpans;
-if (pMarkData)
+if (pMarkData && (pMarkData->IsMarked() || pMarkData->IsMultiMarked()))
 {
 aSpanSet.scan(*pMarkData, nTab, nCol);
 aSpanSet.getSpans(aMarkedSpans);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/vcl/sysdata.hxx |   42 --
 1 file changed, 4 insertions(+), 38 deletions(-)

New commits:
commit 38b7c4f1b78044a4b127499743d24a2369fb445a
Author: Tor Lillqvist 
Date:   Thu Dec 12 20:20:01 2013 +0200

Add CGContext field to SystemGraphicsData for iOS, too

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index cd1f26e..af65ce6 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -121,7 +121,7 @@ struct SystemGraphicsData
 #elif defined( ANDROID )
 // Nothing
 #elif defined( IOS )
-// Nothing
+CGContextRefrCGContext; // CoreGraphics graphic context
 #elif defined( UNX )
 void*   pDisplay;   // the relevant display connection
 longhDrawable;  // a drawable
@@ -136,11 +136,11 @@ struct SystemGraphicsData
 #if defined( WNT )
 , hDC( 0 )
 #elif defined( MACOSX )
-// Nothing
+, rCGContext( NULL )
 #elif defined( ANDROID )
 // Nothing
 #elif defined( IOS )
-// Nothing
+, rCGContext( NULL )
 #elif defined( UNX )
 , pDisplay( NULL )
 , hDrawable( 0 )
commit c275a2edf663431f43106ba7da11b9d2b9503981
Author: Tor Lillqvist 
Date:   Thu Dec 12 20:18:40 2013 +0200

Cosmetics

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 100854b..cd1f26e 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -51,10 +51,6 @@ typedef struct CGContext *CGContextRef;
 #endif
 #endif
 
-// -
-// - SystemEnvData -
-// -
-
 struct SystemEnvData
 {
 unsigned long   nSize;  // size in bytes of this structure
@@ -72,7 +68,7 @@ struct SystemEnvData
 void*   pSalFrame;  // contains a salframe, if object has 
one
 void*   pWidget;// the corresponding widget
 void*   pVisual;// the visual in use
-int nScreen;// the current screen of the window
+int nScreen;// the current screen of the window
 int nDepth; // depth of said visual
 longaColormap;  // the colormap being used
 void*   pAppContext;// the application context in use
@@ -81,10 +77,6 @@ struct SystemEnvData
 #endif
 };
 
-// 
-// - SystemParentData -
-// 
-
 struct SystemParentData
 {
 unsigned long   nSize;// size in bytes of this structure
@@ -103,10 +95,6 @@ struct SystemParentData
 #endif
 };
 
-// 
-// - SystemMenuData -
-// 
-
 struct SystemMenuData
 {
 unsigned long   nSize;  // size in bytes of this structure
@@ -123,10 +111,6 @@ struct SystemMenuData
 #endif
 };
 
-// 
-// - SystemGraphicsData -
-// 
-
 struct SystemGraphicsData
 {
 unsigned long   nSize;  // size in bytes of this structure
@@ -169,11 +153,6 @@ struct SystemGraphicsData
 { }
 };
 
-
-// 
-// - SystemWindowData -
-// 
-
 struct SystemWindowData
 {
 unsigned long   nSize;  // size in bytes of this structure
@@ -189,11 +168,6 @@ struct SystemWindowData
 #endif
 };
 
-
-// 
-// - SystemGlyphData -
-// 
-
 struct SystemGlyphData
 {
 unsigned longindex;
@@ -202,10 +176,6 @@ struct SystemGlyphData
 int  fallbacklevel;
 };
 
-
-// 
-// - SystemFontData -
-// 
 struct SystemFontData
 {
 unsigned long   nSize;  // size in bytes of this structure
@@ -238,10 +208,6 @@ struct SystemFontData
 }
 };
 
-// 
-// - SystemTextLayoutData -
-// 
-
 typedef std::vector SystemGlyphDataVector;
 
 struct SystemTextLayoutData
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/Accessibility/AccessibleCell.cxx|   14 ++-
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |   83 +--
 sc/source/ui/inc/AccessibleCell.hxx  |   12 ++
 sc/source/ui/inc/AccessibleSpreadsheet.hxx   |   11 +-
 4 files changed, 57 insertions(+), 63 deletions(-)

New commits:
commit 639fc4988f43eaf7866f17095293cbf1de268ddb
Author: Stephan Bergmann 
Date:   Thu Dec 12 18:10:56 2013 +0100

Only call ScAccessibleCell::Init once on freshly created cells

Change-Id: I64542af7585cea9d361a99f83e110e1e8135bf2d

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 74c9d72..742496c 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -50,7 +50,19 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
-//=  internal  
+rtl::Reference ScAccessibleCell::create(
+const uno::Reference& rxParent,
+ScTabViewShell* pViewShell,
+ScAddress& rCellAddress,
+sal_Int32 nIndex,
+ScSplitPos eSplitPos,
+ScAccessibleDocument* pAccDoc)
+{
+rtl::Reference x(new ScAccessibleCell(
+rxParent, pViewShell, rCellAddress, nIndex, eSplitPos, pAccDoc));
+x->Init();
+return x;
+}
 
 ScAccessibleCell::ScAccessibleCell(
 const uno::Reference& rxParent,
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx 
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 6aa263b..40d2d39 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -258,7 +258,6 @@ ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
 mbIsSpreadsheet( sal_True ),
 m_bFormulaMode(sal_False),
 m_bFormulaLastMode(sal_False),
-m_pAccFormulaCell(NULL),
 m_nMinX(0),m_nMaxX(0),m_nMinY(0),m_nMaxY(0)
 {
 ConstructScAccessibleSpreadsheet( pAccDoc, pViewShell, nTab, eSplitPos );
@@ -289,7 +288,7 @@ void 
ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet(
 mpMarkedRanges = 0;
 mpSortedMarkedCells = 0;
 mpAccDoc = pAccDoc;
-mpAccCell = 0;
+mpAccCell.clear();
 meSplitPos = eSplitPos;
 mnTab = nTab;
 mbHasSelection = false;
@@ -306,8 +305,6 @@ void 
ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet(
 mbHasSelection = rMarkData.GetTableSelect(maActiveCell.Tab()) &&
 (rMarkData.IsMarked() || rMarkData.IsMultiMarked());
 mpAccCell = GetAccessibleCellAt(maActiveCell.Row(), 
maActiveCell.Col());
-mpAccCell->acquire();
-mpAccCell->Init();
 ScDocument* pScDoc= GetDocument(mpViewShell);
 if (pScDoc)
 {
@@ -324,11 +321,7 @@ void SAL_CALL ScAccessibleSpreadsheet::disposing()
 mpViewShell->RemoveAccessibilityObject(*this);
 mpViewShell = NULL;
 }
-if (mpAccCell)
-{
-mpAccCell->release();
-mpAccCell = NULL;
-}
+mpAccCell.clear();
 
 ScAccessibleTableBase::disposing();
 }
@@ -359,8 +352,7 @@ void ScAccessibleSpreadsheet::LostFocus()
 AccessibleEventObject aEvent;
 aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
 aEvent.Source = uno::Reference< XAccessibleContext >(this);
-uno::Reference< XAccessible > xOld = mpAccCell;
-aEvent.OldValue <<= xOld;
+aEvent.OldValue <<= uno::Reference(mpAccCell.get());
 
 CommitChange(aEvent);
 
@@ -375,7 +367,7 @@ void ScAccessibleSpreadsheet::GotFocus()
 uno::Reference< XAccessible > xNew;
 if (IsFormulaMode())
 {
-if (!m_pAccFormulaCell || !m_bFormulaLastMode)
+if (!m_pAccFormulaCell.is() || !m_bFormulaLastMode)
 {
 ScAddress aFormulaAddr;
 if(!GetFormulaCurrentFocusCell(aFormulaAddr))
@@ -383,19 +375,14 @@ void ScAccessibleSpreadsheet::GotFocus()
 return;
 }
 m_pAccFormulaCell = 
GetAccessibleCellAt(aFormulaAddr.Row(),aFormulaAddr.Col());
-
-m_pAccFormulaCell->acquire();
-m_pAccFormulaCell->Init();
-
-
 }
-xNew = m_pAccFormulaCell;
+xNew = m_pAccFormulaCell.get();
 }
 else
 {
 if(mpAccCell->GetCellAddress() == maActiveCell)
 {
-xNew = mpAccCell;
+xNew = mpAccCell.get();
 }
 else
 {
@@ -450,11 +437,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, 
const SfxHint& rHint
 {//Last Notify Mode  Is Formula Mode.
 m_vecFormulaLastMyAddr.clear();
 RemoveFormulaSelection(sal_True);
-if(m_pAccFormulaCell)
-{
-m_pAccFormulaCell->release();
-m_pAccFormulaCell =NULL;
-}
+m_pAccForm

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

[Noel Grandin]

 sc/inc/funcdesc.hxx   |4 -
 sc/source/core/data/funcdesc.cxx  |   79 +-
 sc/source/core/tool/addincol.cxx  |   14 +++---
 sc/source/ui/formdlg/dwfunctr.cxx |4 -
 sc/source/ui/unoobj/appluno.cxx   |   10 +---
 5 files changed, 52 insertions(+), 59 deletions(-)

New commits:
commit f7b675475b88d35728ddc1b38eaf26ea5600a30e
Author: Noel Grandin 
Date:   Thu Dec 12 16:31:45 2013 +0200

Convert OUString** to std::vector in ScFuncDesc

There is no point in storing a ref-counted value type like OUString by
pointer.
And while we're there, convert array to std::vector

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

diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index fb892ec..ed4a85c 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -200,8 +200,8 @@ public:
 
 OUString  *pFuncName;  /**< Function name */
 OUString  *pFuncDesc;  /**< Description of function */
-OUString **ppDefArgNames;  /**< Parameter name(s) */
-OUString **ppDefArgDescs;  /**< Description(s) of parameter(s) 
*/
+std::vector maDefArgNames;  /**< Parameter name(s) */
+std::vector maDefArgDescs;  /**< Description(s) of 
parameter(s) */
 ParameterFlags   *pDefArgFlags;   /**< Flags for each 
parameter */
 sal_uInt16nFIndex;/**< Unique function index */
 sal_uInt16nCategory;  /**< Function category */
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index f93fe0c..1262925 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -66,8 +66,6 @@ public:
 ScFuncDesc::ScFuncDesc() :
 pFuncName   (NULL),
 pFuncDesc   (NULL),
-ppDefArgNames   (NULL),
-ppDefArgDescs   (NULL),
 pDefArgFlags(NULL),
 nFIndex (0),
 nCategory   (0),
@@ -90,18 +88,11 @@ void ScFuncDesc::Clear()
 nArgs -= VAR_ARGS - 1;
 if (nArgs)
 {
-for (sal_uInt16 i=0; inArgCount   = nArgs;
 if (nArgs)
 {
+pDesc->maDefArgNames.clear();
+pDesc->maDefArgNames.resize(nArgs);
+pDesc->maDefArgDescs.clear();
+pDesc->maDefArgDescs.resize(nArgs);
 pDesc->pDefArgFlags  = new ScFuncDesc::ParameterFlags[nArgs];
-pDesc->ppDefArgNames = new OUString*[nArgs];
-pDesc->ppDefArgDescs = new OUString*[nArgs];
 for (sal_uInt16 j = 0; j < nArgs; ++j)
 {
 pDesc->pDefArgFlags[j].bOptional = false;
 pDesc->pDefArgFlags[j].bSuppress = false;
 pAddInFuncData->getParamDesc( aArgName, aArgDesc, j+1 );
 if ( !aArgName.isEmpty() )
-pDesc->ppDefArgNames[j] = new OUString( aArgName );
+pDesc->maDefArgNames[j] = aArgName;
 else
 {
 switch (pAddInFuncData->GetParamType(j+1))
 {
 case PTR_DOUBLE:
-pDesc->ppDefArgNames[j] = new OUString( 
aDefArgNameValue );
+pDesc->maDefArgNames[j] = aDefArgNameValue;
 break;
 case PTR_STRING:
-pDesc->ppDefArgNames[j] = new OUString( 
aDefArgNameString );
+pDesc->maDefArgNames[j] = aDefArgNameString;
 break;
 case PTR_DOUBLE_ARR:
-pDesc->ppDefArgNames[j] = new OUString( 
aDefArgNameValues );
+pDesc->maDefArgNames[j] = aDefArgNameValues;
 break;
 case PTR_STRING_ARR:
-pDesc->ppDefArgNames[j] = new OUString( 
aDefArgNameStrings );
+pDesc->maDefArgNames[j] = aDefArgNameStrings;
 break;
 case PTR_CELL_ARR:
-pDesc->ppDefArgNames[j] = new OUString( 
aDefArgNameCells );
+pDesc->maDefArgNames[j] = aDefArgNameCells;
 break;
 default:
-pDesc->ppDefArgNames[j] = new OUString( 
aDefArgNameNone );
+pDesc->maDefArgNames[j] = aDefArgNameNone;
 break;
 }
 }
 if ( !aArgDesc.isEmpty() )
-pDesc->ppDefArgDescs[j] = new OUString( aArgDesc );
+pDesc->maDefArgDescs[j] = aArgDesc;
 else
 {
 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util

[Herbert Dürr]

 instsetoo_native/util/makefile.mk |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bca5a8e8e53830c59aeb283a4fdbde8b2bb472e8
Author: Herbert Dürr 
Date:   Thu Dec 12 17:38:18 2013 +

#i123532# avoid build breaker when pkgformat contains an "archive" target

If the configure option --with-package-format contains an "archive" target
then instset_native makefile.mk has two build targets with the same name.
This breaks the build. The temporary fix here disables the second recipe
to allow the buildbots to work again.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index e084559..0988ebd0 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -259,14 +259,14 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) 
openoffice_$L.$P)) .PHO
 $(PRJ)$/util$/update.xml   \
 > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,L,$(alllangiso) openoffice_$L.archive) :
-$(MAKE_INSTALLER_COMMAND)  \
--p Apache_OpenOffice   \
--msitemplate $(MSIOFFICETEMPLATEDIR)
-$(GEN_UPDATE_INFO_COMMAND) \
---product Apache_OpenOffice\
-$(PRJ)$/util$/update.xml   \
-> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+#$(foreach,L,$(alllangiso) openoffice_$L.archive) :
+#  $(MAKE_INSTALLER_COMMAND)   \
+#  -p Apache_OpenOffice\
+#  -msitemplate $(MSIOFFICETEMPLATEDIR)
+#  $(GEN_UPDATE_INFO_COMMAND)  \
+#  --product Apache_OpenOffice \
+#  $(PRJ)$/util$/update.xml\
+#  > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 #openofficewithjre_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) 
openofficewithjre_$L.$P)) .PHONY :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/src/scfuncs.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 45bd5635730f6faa6d1d9d82c00e63b487bf141d
Author: Eike Rathke 
Date:   Thu Dec 12 18:55:28 2013 +0100

resolved fdo#67205 CRITBINOM and BINOM.INV, use ODF OpenFormula description

Change-Id: Ibbf2f47b3d6fb67cd49d78d437e28a6399f42691
(cherry picked from commit 0c447b5d32b5d65960e61969d1a0ead4f4dbe7c0)

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 7425093..455c231 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -6180,7 +6180,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 {
 String 1 // Description
 {
-Text [ en-US ] = "Border arguments of the binomial distribution." ;
+Text [ en-US ] = "Returns the smallest value for which the 
cumulative binomial distribution is greater than or equal to a criterion 
value." ;
 };
 ExtraData =
 {
@@ -6220,7 +6220,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 {
 String 1 // Description
 {
-Text [ en-US ] = "Border arguments of the binomial distribution." ;
+Text [ en-US ] = "Returns the smallest value for which the 
cumulative binomial distribution is greater than or equal to a criterion 
value." ;
 };
 ExtraData =
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/src/scfuncs.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0c447b5d32b5d65960e61969d1a0ead4f4dbe7c0
Author: Eike Rathke 
Date:   Thu Dec 12 18:55:28 2013 +0100

resolved fdo#67205 CRITBINOM and BINOM.INV, use ODF OpenFormula description

Change-Id: Ibbf2f47b3d6fb67cd49d78d437e28a6399f42691

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index c58e9ba..63794f5 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -6180,7 +6180,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 {
 String 1 // Description
 {
-Text [ en-US ] = "Border arguments of the binomial distribution." ;
+Text [ en-US ] = "Returns the smallest value for which the 
cumulative binomial distribution is greater than or equal to a criterion 
value." ;
 };
 ExtraData =
 {
@@ -6220,7 +6220,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 {
 String 1 // Description
 {
-Text [ en-US ] = "Border arguments of the binomial distribution." ;
+Text [ en-US ] = "Returns the smallest value for which the 
cumulative binomial distribution is greater than or equal to a criterion 
value." ;
 };
 ExtraData =
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/graphite Makefile.fetch

[Khaled Hosny]

 Makefile.fetch|2 -
 download.lst  |3 +-
 external/graphite/UnpackedTarball_graphite.mk |2 -
 external/graphite/graphite2.patch |   29 --
 4 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 94886f8324b7eae3ed1a75191f86be4c358a600d
Author: Khaled Hosny 
Date:   Thu Dec 12 16:34:07 2013 +0200

Update bundled Graphite to 1.2.4

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

diff --git a/Makefile.fetch b/Makefile.fetch
index 5b3f501..104644e 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -80,6 +80,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
$(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
+   $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
$(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
@@ -117,7 +118,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FONTCONFIG,$(FONTCONFIG_TARBALL)) \
$(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \
$(GOOGLE_DOCS_EXTENSION_PACK) \
-   $(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \
$(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \
$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
diff --git a/download.lst b/download.lst
index 42a75db..b740df7 100644
--- a/download.lst
+++ b/download.lst
@@ -18,6 +18,8 @@ FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5
 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
 # export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz
+GRAPHITE_MD5SUM := 2ef839348fe28e3b923bf8cced440227
+export GRAPHITE_TARBALL := graphite2-1.2.4.tgz
 HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
 export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
@@ -53,7 +55,6 @@ export FONT_PTSERIF_TARBALL := 
c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.
 export FONT_SOURCECODE_TARBALL := 
0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz
 export FONT_SOURCESANS_TARBALL := 
1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz
 export FREETYPE_TARBALL := 
dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
-export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
diff --git a/external/graphite/UnpackedTarball_graphite.mk 
b/external/graphite/UnpackedTarball_graphite.mk
index 35ca233..4c4a0d0 100644
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -11,10 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 
-# http://projects.palaso.org/issues/1030
 # http://projects.palaso.org/issues/1115
 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\
-   external/graphite/graphite2.patch \
external/graphite/graphite2.issue1115.patch.1 \
 ))
 
diff --git a/external/graphite/graphite2.patch 
b/external/graphite/graphite2.patch
deleted file mode 100644
index c7739ad..000
--- a/external/graphite/graphite2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 misc/graphite2-1.2.0/include/graphite2/Types.h 2011-02-12 
16:54:16.0 +0100
-+++ misc/build/graphite2-1.2.0/include/graphite2/Types.h   2011-03-15 
21:38:06.264788098 +0100
-@@ -41,7 +41,8 @@
- };
- 
- // Definitions for library publicly exported symbols
--#if defined _WIN32 || defined __CYGWIN__
-+#define GR2_STATIC 1
-+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
-   #if defined GRAPHITE2_STATIC
- #define GR2_API
-   #elif defined GRAPHITE2_EXPORTING
 misc/graphite2-1.2.0/src/inc/json.h
-+++ misc/build/graphite2-1.2.0/src/inc/json.h
-@@ -146,6 +146,14 @@
- inline
- json & operator << (json & j, unsigned int d) throw() { 
return j << json::integer(d); }
- 
-+#if defined(_WIN64)
-+inline
-+json & operator << (json & j, __int64 d) throw()  { return j << 
json::integer((unsigned int)d); }
-+
-+inline
-+json & operator << (json & j, size_t d) thr

[Libreoffice-commits] help.git: Branch 'libreoffice-4-2' - source/text

[Eike Rathke]

 source/text/scalc/01/04060183.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ced1a84353e7bc399b078b55b2f911dabcce9ba2
Author: Eike Rathke 
Date:   Thu Dec 12 18:32:49 2013 +0100

resolved fdo#67205 CRITBINOM "greater than or equal"

Change-Id: I89e5fdec3708f06017ede1df0cf4aa9f0f60ea37
(cherry picked from commit 392217fbe5d2432d2834e4593457cb2d236b99dd)

diff --git a/source/text/scalc/01/04060183.xhp 
b/source/text/scalc/01/04060183.xhp
index dfd8df8..6a2b1de 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -119,7 +119,7 @@
 
 
 CRITBINOM
-Returns the smallest value for 
which the cumulative binomial distribution is less than or equal to a criterion 
value.
+Returns the smallest value for 
which the cumulative binomial distribution is greater than or equal to a 
criterion value.
 Syntax
 CRITBINOM(Trials; SP; Alpha)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - helpcontent2

[Eike Rathke]

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

New commits:
commit 683f4583d52940c75685be5b3ae2878fccd07b4b
Author: Eike Rathke 
Date:   Thu Dec 12 18:32:49 2013 +0100

Updated core
Project: help  ced1a84353e7bc399b078b55b2f911dabcce9ba2

diff --git a/helpcontent2 b/helpcontent2
index d7a11bf..ced1a84 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d7a11bfd59babbe6fb88bd4076211fa6cec9f724
+Subproject commit ced1a84353e7bc399b078b55b2f911dabcce9ba2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Eike Rathke]

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

New commits:
commit 3cdf111672ae41f85f7fa6f90d4d000182e8d50b
Author: Eike Rathke 
Date:   Thu Dec 12 18:32:49 2013 +0100

Updated core
Project: help  392217fbe5d2432d2834e4593457cb2d236b99dd

diff --git a/helpcontent2 b/helpcontent2
index 63d213b..392217f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 63d213bbd4e500d4bae0e36208c439ab2f346846
+Subproject commit 392217fbe5d2432d2834e4593457cb2d236b99dd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 source/text/scalc/01/04060183.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 392217fbe5d2432d2834e4593457cb2d236b99dd
Author: Eike Rathke 
Date:   Thu Dec 12 18:32:49 2013 +0100

resolved fdo#67205 CRITBINOM "greater than or equal"

Change-Id: I89e5fdec3708f06017ede1df0cf4aa9f0f60ea37

diff --git a/source/text/scalc/01/04060183.xhp 
b/source/text/scalc/01/04060183.xhp
index dfd8df8..6a2b1de 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -119,7 +119,7 @@
 
 
 CRITBINOM
-Returns the smallest value for 
which the cumulative binomial distribution is less than or equal to a criterion 
value.
+Returns the smallest value for 
which the cumulative binomial distribution is greater than or equal to a 
criterion value.
 Syntax
 CRITBINOM(Trials; SP; Alpha)
 
___
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' - ce/b2dee36c581811c3aba380fcf994c3ccd116b5

[Caolán McNamara]

 ce/b2dee36c581811c3aba380fcf994c3ccd116b5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f79475f44bfa090dc96a13881503c0e80877b26c
Author: Caolán McNamara 
Date:   Thu Dec 12 17:34:56 2013 +

Notes added by 'git notes add'

diff --git a/ce/b2dee36c581811c3aba380fcf994c3ccd116b5 
b/ce/b2dee36c581811c3aba380fcf994c3ccd116b5
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/ce/b2dee36c581811c3aba380fcf994c3ccd116b5
@@ -0,0 +1 @@
+ignore: fixed
___
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' - ff/19bc876f2e2c13f9040e148c32ed8c1c1ab9ca

[Caolán McNamara]

 ff/19bc876f2e2c13f9040e148c32ed8c1c1ab9ca |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 17246bfaa44e269bf319cc35a58915ecabc5729a
Author: Caolán McNamara 
Date:   Thu Dec 12 17:33:40 2013 +

Notes added by 'git notes add'

diff --git a/ff/19bc876f2e2c13f9040e148c32ed8c1c1ab9ca 
b/ff/19bc876f2e2c13f9040e148c32ed8c1c1ab9ca
new file mode 100644
index 000..a0dd15a
--- /dev/null
+++ b/ff/19bc876f2e2c13f9040e148c32ed8c1c1ab9ca
@@ -0,0 +1 @@
+prefer: 785bf20ab312dd46f3269f70e62b2c9d58bcb8af
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[V Stuart Foote]

 
Michael Meeks-5 wrote
> + decide on whether to remove legacy Java Access Bridge from 4.2
> (Michael S)
> [ decided not to for now, historically good to have old RTF + new
> RTF
>   filters, so it's easy to try out if new bugs are causd by new
> code ]

While probably sound, this is a problem as we seem to have clobbered the
Java Access Bridge implementation in the 4.2.0 beta builds after we got
IAccessible2 working--  between commits 23 Nov - 25 Nov --  
f4ca7b35f580827ad2c69ea6d29f7c9b48ebbac7..12ebbb7e471d851eec940a47e6737c7c89d0f7f8

  




--
View this message in context: 
http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4087962p4087976.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/7c8cd9c6772d9b9e5747e74768c61143a7ed01

[Caolán McNamara]

 5e/7c8cd9c6772d9b9e5747e74768c61143a7ed01 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1280b3b617928b5287933963b8e21430065ee7a7
Author: Caolán McNamara 
Date:   Thu Dec 12 17:32:39 2013 +

Notes added by 'git notes add'

diff --git a/5e/7c8cd9c6772d9b9e5747e74768c61143a7ed01 
b/5e/7c8cd9c6772d9b9e5747e74768c61143a7ed01
new file mode 100644
index 000..9a17d34
--- /dev/null
+++ b/5e/7c8cd9c6772d9b9e5747e74768c61143a7ed01
@@ -0,0 +1 @@
+merged as: e262c072d9a4d39dd3e293b59ddc74f5348b3d3a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Herbert Dürr]

 vcl/quartz/salgdicommon.cxx |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit e262c072d9a4d39dd3e293b59ddc74f5348b3d3a
Author: Herbert Dürr 
Date:   Thu Dec 12 14:08:12 2013 +

Related: #i123840# use CoreGraphic helper methods for primitives

C++11 says that narrowing conversions in array initializers are illegal.
This often happened for signed/unsigned and 32bit/64bit mismatches when
initializing CoreGraphics elementary types. Using CoreGraphic helper
methods for primitives is recommended.

(cherry picked from commit 5e7c8cd9c6772d9b9e5747e74768c61143a7ed01)

Conflicts:
vcl/aqua/source/gdi/salgdi.cxx

Change-Id: I5927790d97decea57ff236b0a52561e08f017163

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 8c5aef2..85e6a9e 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -328,7 +328,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, 
SalGraphics *pSrcGrap
 
 DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from 
non-layered graphics" );
 
-const CGPoint aDstPoint = { static_cast(+rPosAry.mnDestX - 
rPosAry.mnSrcX), static_cast(rPosAry.mnDestY - rPosAry.mnSrcY) };
+const CGPoint aDstPoint = CGPointMake(+rPosAry.mnDestX - rPosAry.mnSrcX, 
rPosAry.mnDestY - rPosAry.mnSrcY);
 if( (rPosAry.mnSrcWidth == rPosAry.mnDestWidth &&
  rPosAry.mnSrcHeight == rPosAry.mnDestHeight) &&
 (!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // 
workaround a Quartz crasher
@@ -344,7 +344,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, 
SalGraphics *pSrcGrap
 }
 }
 CGContextSaveGState( xCopyContext );
-const CGRect aDstRect = { { static_cast(rPosAry.mnDestX), 
static_cast(rPosAry.mnDestY) }, { 
static_cast(rPosAry.mnDestWidth), 
static_cast(rPosAry.mnDestHeight) } };
+const CGRect aDstRect = CGRectMake(rPosAry.mnDestX, rPosAry.mnDestY, 
rPosAry.mnDestWidth, rPosAry.mnDestHeight);
 CGContextClipToRect( xCopyContext, aDstRect );
 
 // draw at new destination
@@ -461,10 +461,10 @@ void AquaSalGraphics::copyArea( long nDstX, long 
nDstY,long nSrcX, long nSrcY,
 CGLayerRef xSrcLayer = mxLayer;
 // TODO: if( mnBitmapDepth > 0 )
 {
-const CGSize aSrcSize = { static_cast(nSrcWidth), 
static_cast(nSrcHeight) };
+const CGSize aSrcSize = CGSizeMake(nSrcWidth, nSrcHeight);
 xSrcLayer = ::CGLayerCreateWithContext( xCopyContext, aSrcSize, NULL );
 const CGContextRef xSrcContext = CGLayerGetContext( xSrcLayer );
-CGPoint aSrcPoint = { static_cast(-nSrcX), 
static_cast(-nSrcY) };
+CGPoint aSrcPoint = CGPointMake(-nSrcX, -nSrcY);
 if( IsFlipped() )
 {
 ::CGContextTranslateCTM( xSrcContext, 0, +nSrcHeight );
@@ -475,7 +475,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long 
nSrcX, long nSrcY,
 }
 
 // draw at new destination
-const CGPoint aDstPoint = { static_cast(+nDstX), 
static_cast(+nDstY) };
+const CGPoint aDstPoint = CGPointMake(+nDstX, +nDstY);
 ::CGContextDrawLayerAtPoint( xCopyContext, aDstPoint, xSrcLayer );
 
 // cleanup
@@ -526,7 +526,7 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& 
rTR,
 }
 if ( CheckContext() )
 {
-const CGRect aDstRect = { { static_cast(rTR.mnDestX), 
static_cast(rTR.mnDestY) }, { static_cast(rTR.mnDestWidth), 
static_cast(rTR.mnDestHeight) } };
+const CGRect aDstRect = CGRectMake( rTR.mnDestX, rTR.mnDestY, 
rTR.mnDestWidth, rTR.mnDestHeight);
 CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
 RefreshRect( aDstRect );
 }
@@ -566,7 +566,7 @@ bool AquaSalGraphics::drawTransformedBitmap(
 CGContextConcatCTM( mrContext, aCGMat );
 
 // draw the transformed image
-const CGRect aSrcRect = {{0,0}, {static_cast(aSize.Width()), 
static_cast(aSize.Height())}};
+const CGRect aSrcRect = CGRectMake(0, 0, aSize.Width(), aSize.Height());
 CGContextDrawImage( mrContext, aSrcRect, xImage );
 CGImageRelease( xImage );
 // restore the Quartz graphics state
@@ -590,7 +590,7 @@ bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long 
nWidth,
 CGContextSaveGState( mrContext );
 CGContextSetAlpha( mrContext, (100-nTransparency) * (1.0/100) );
 
-CGRect aRect = { { static_cast(nX), static_cast(nY) }, { 
static_cast(nWidth-1), static_cast(nHeight-1) } };
+CGRect aRect = CGRectMake(nX, nY, nWidth-1, nHeight-1);
 if( IsPenVisible() )
 {
 aRect.origin.x += 0.5;
@@ -620,8 +620,8 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect& 
rPosAry, const SalBitmap& rS
 {
 return;
 }
-const CGRect aDstRect = { { static_cast(rPosAry.mnDestX), 
static_cast(rPosAry.mnDestY) },
-  { static_cast(rPosAry.mnDestWidth), 
static_ca

minutes of ESC call ...

[Michael Meeks]

* Present
+ Markus, Lionel, Eike, Miklos, Kendy, Stephan, Jacobo, cloph, Andras,
  Caolan, Norbert, Michael M, Michael S, Robinson, Kohei, Bjoern, Adam

* Completed Action Items
+ promote Planet TDF on your blog (~Any)
+ blog about the death of the solver (Michael S)
[ abandoned ]
+ actually produce callgrind performance metrics from VM (Matus)
   [ done and available ... growing set of test docs here:
  http://dev-builds.libreoffice.org/callgrind_report/ ]
+ decide on whether to remove legacy Java Access Bridge from 4.2 (Michael S)
[ decided not to for now, historically good to have old RTF + new RTF
  filters, so it's easy to try out if new bugs are causd by new code ]
+ work out what type of builds / configs QA wants from tinderboxes 
(Robinson)
[ asked QA guys, just having daily builds for current master + 4.2 + 
4.1 is
  the primary desire / concern. Consistent naming & consistent 
descriptions
  of who built what build are more concerning.
  + in all file names an @ and a number is the ID of the tinderbox 
(Norbert)
  + now up-loading 4.1 and 4.2 dailies for Mac (Norbert)
]
+ look into debug symbol up-load wrt. data set & up-load size (Christian)
[ size is manageable, so will provide debug symbols for the next
  4.2 build, will be on the http://dev-downloads.libreoffice.org/ 
eventually ]
+ poke at strings from browser to default for 4.2 Mac 64 download (Cloph)
[ all 3x major browsers send Mac OS version tag we can use to 
pre-select the
  64bit version, so RC1 for 4.2 will default to the right thing ]
+ cherry-pick icon Sifr fixes to libreoffice-4-2 branch (Abdulmajid)
[ Abdulmajeed pushed that already ]

* Pending Action Items:
+ partition document test loads / run them on tinderboxen (Norbert)
[ works, can run tests - but needs reporting / aggregation work on
  the back-end in an effective fashion. On Mac can capture back-traces
  easily & want to integrate that. ]
+ need design for copying styles between templates (Cor Nouws/other UX?)
cf. 
http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html

http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html

* Release Engineering update (Christian)
+ 4.1.4 RC2 - announced to early testing, pushed to mirrors later today
+ release planned for next week.
+ 4.2.0 RC1 - deadline: Monday - Dec 16th (English string & UI freeze)
+ Then a Christmas break of 2x weeks in the schedule ...
+ 4.2 - next deadline Jan 6th. (hard code freeze and branch-off)
+ GSOC / Android & iOS remote control releases for 4.2
[ Android - problems with bluetooth & lifecycle, rotating the screen
  caused it to disconnect.
  iOS - don't have a device, hope working fine.
AI:   Open a separate product - for pre-releases for Android & iOS (Cloph)
AI:   Buy & expense an iPhone for testing (Cloph) ]
+ 4.2 Feature freeze update / status
+ expert config page - still ~infinitely slow needs fixing
[ now fixed by Noel & Kendy: snappy on my Windows machine ]
AI:  add a simple boolean key to disable it (Kendy) ]
+ GL / chart pieces (Michael/Moggi)
[ concerns; tripple review later perhaps ? ]
+ 4.2 MAB count - still v. high for this point in the cycle.
+ placeholder for 4.2 issue (Michael)
+ please ensure that release notes are up-to-date:
+ https://wiki.documentfoundation.org/ReleaseNotes/4.2

* Pootle / l10n / string re-work (Andras)
+ latest issue set getting sorted out on the list,
  lets deal with it there.

+ how do we deal with a typo in English ? (Caolan)
+ usually fix in the translation repo & pootle (Andras)
   + if find the person responsible for that language,
 should notify them.
   + is there a way to file a bug-report / request for
 a string in pootle ? (Eike)
+ a few open bugs for impossible shortcuts (Caolan)
   + some indic characters added to shortcuts - impossible to type
   + can we add that to build tooling or do something
 on the pootle side ?
   + there is a script that sanitises translations (Cloph)
   + could be added there
 l10ntools/source/pocheck.cxx ...
   + can add quality checks to pootle (Andras)
   + translators can ignore the warnings + errors.

* Default Template (Michael M)
+ font discussion ? and/or did we consider using C* equivalents ?
   + in place of Liberation* for interop and prettiness ?
   + not a good idea - people can't use for LibreOffice 4.0.x (Michael S)
  + should prolly wait a bit before more widely distributed.

* Extending ODF issues (Eike)
+ should be 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sc/source vcl/aqua xmlsecurity/source

[Herbert Dürr]

 sc/source/ui/docshell/docsh.cxx |2 -
 vcl/aqua/source/gdi/salgdi.cxx  |   34 
 xmlsecurity/source/xmlsec/nss/ciphercontext.cxx |4 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit ceb2dee36c581811c3aba380fcf994c3ccd116b5
Author: Herbert Dürr 
Date:   Thu Dec 12 14:25:58 2013 +

#i123840# fix narrowing conversions when initializing SC's szMSFilterNames 
array

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 8c63247..8e540e6 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -204,7 +204,7 @@ namespace
 static const struct
 {
 const char * mpFilterName;
-unsigned mnFilterNameLen;
+size_t mnFilterNameLen;
 } szMSFilterNames [] =
 {
 { pFilterExcel4, strlen( pFilterExcel4 ) },
commit ff19bc876f2e2c13f9040e148c32ed8c1c1ab9ca
Author: Herbert Dürr 
Date:   Thu Dec 12 14:14:49 2013 +

#i123840# fix a 64->32bit narrowing conversion in nss/ciphercontext.cxx

diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx 
b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
index fe505ae..080ac9a 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
@@ -38,11 +38,11 @@ uno::Reference< xml::crypto::XCipherContext > 
OCipherContext::Create( CK_MECHANI
 xResult->m_pSlot = PK11_GetBestSlot( nNSSCipherID, NULL );
 if ( xResult->m_pSlot )
 {
-SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >( 
reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ), 
aKey.getLength() };
+SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >( 
reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ), 
static_cast(aKey.getLength()) };
 xResult->m_pSymKey = PK11_ImportSymKey( xResult->m_pSlot, 
nNSSCipherID, PK11_OriginDerive, bEncryption ? CKA_ENCRYPT : CKA_DECRYPT, 
&aKeyItem, NULL );
 if ( xResult->m_pSymKey )
 {
-SECItem aIVItem = { siBuffer, const_cast< unsigned char* >( 
reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray() 
) ), aInitializationVector.getLength() };
+SECItem aIVItem = { siBuffer, const_cast< unsigned char* >( 
reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray() 
) ), static_cast(aInitializationVector.getLength()) };
 xResult->m_pSecParam = PK11_ParamFromIV( nNSSCipherID, &aIVItem );
 if ( xResult->m_pSecParam )
 {
commit 5e7c8cd9c6772d9b9e5747e74768c61143a7ed01
Author: Herbert Dürr 
Date:   Thu Dec 12 14:08:12 2013 +

#i123840# fix narrowing conversions in CoreGraphic's array initializers

C++11 says that narrowing conversions in array initializers are illegal.
This often happened for signed/unsigned and 32bit/64bit mismatches when
initializing CoreGraphics elementary types. Using CoreGraphic helper
methods for primitives solves these problems and is recommended anyway.

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 366cda1..abc74a5 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -592,7 +592,7 @@ bool AquaSalGraphics::setClipRegion( const Region& i_rClip )
 
 if(nH)
 {
-CGRect aRect = {{ aRectIter->Left(), aRectIter->Top() }, { 
nW, nH }};
+const CGRect aRect = CGRectMake( aRectIter->Left(), 
aRectIter->Top(), nW, nH);
 CGPathAddRect( mxClipPath, NULL, aRect );
 }
 }
@@ -676,7 +676,7 @@ void AquaSalGraphics::ImplDrawPixel( long nX, long nY, 
const RGBAColor& rColor )
 // overwrite the fill color
 CGContextSetFillColor( mrContext, rColor.AsArray() );
 // draw 1x1 rect, there is no pixel drawing in Quartz
-CGRect aDstRect = {{nX,nY,},{1,1}};
+const CGRect aDstRect = CGRectMake( nX, nY, 1, 1);
 CGContextFillRect( mrContext, aDstRect );
 RefreshRect( aDstRect );
 // reset the fill color
@@ -1133,7 +1133,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect& 
rPosAry, SalGraphics *pSrcGrap
 
 DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from 
non-layered graphics" );
 
-const CGPoint aDstPoint = { +rPosAry.mnDestX - rPosAry.mnSrcX, 
rPosAry.mnDestY - rPosAry.mnSrcY };
+const CGPoint aDstPoint = CGPointMake( +rPosAry.mnDestX - rPosAry.mnSrcX, 
rPosAry.mnDestY - rPosAry.mnSrcY);
 if( (rPosAry.mnSrcWidth == rPosAry.mnDestWidth && rPosAry.mnSrcHeight == 
rPosAry.mnDestHeight) &&
 (!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // 
workaround a Quartz crasher
 {
@@ -1145,7 +1145,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect& 
rPosAry, SalGraphics *pSrcGrap
 xCopyContext = mpXorEmulation->G

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

[Eike Rathke]

 sc/source/ui/src/scfuncs.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d30652b2b9686c8e185f0ecb4fe616adafa725dd
Author: Eike Rathke 
Date:   Thu Dec 12 17:09:32 2013 +0100

probabilty -> probability

Change-Id: I77fd6a82895f3a65c31f1c166e25b27153ab194a
(cherry picked from commit c0c37983b61af172539d8af88f101929f4de56b0)

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 314355c..7425093 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7214,7 +7214,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 11 // Description of Parameter 5
 {
-Text [ en-US ] = "Cumulated. TRUE calculates the probabilty mass 
function, FALSE the cumulative distribution function." ;
+Text [ en-US ] = "Cumulated. TRUE calculates the probability mass 
function, FALSE the cumulative distribution function." ;
 };
 };
  // -=*# Resource for function TVERT #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/src/scfuncs.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0c37983b61af172539d8af88f101929f4de56b0
Author: Eike Rathke 
Date:   Thu Dec 12 17:09:32 2013 +0100

probabilty -> probability

Change-Id: I77fd6a82895f3a65c31f1c166e25b27153ab194a

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 960177b..c58e9ba 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7326,7 +7326,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 11 // Description of Parameter 5
 {
-Text [ en-US ] = "Cumulated. TRUE calculates the probabilty mass 
function, FALSE the cumulative distribution function." ;
+Text [ en-US ] = "Cumulated. TRUE calculates the probability mass 
function, FALSE the cumulative distribution function." ;
 };
 };
  // -=*# Resource for function TVERT #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 55066] FILEOPEN: flaws in importing 123 files

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

  Attachment #67348|application/octet-stream|application/vnd.lotus-1-2-3
  mime type||

-- 
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 55066] FILEOPEN: flaws in importing 123 files

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

  Attachment #67347|application/octet-stream|application/vnd.lotus-1-2-3
  mime type||

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/uiconfig

[Jan Holesovsky]

 sfx2/uiconfig/ui/startcenter.ui |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 3856ca359649dee944584ae1b230d63fcb34c206
Author: Jan Holesovsky 
Date:   Thu Dec 12 16:33:43 2013 +0100

startcenter: Smaller frame around the entire start center area (6 -> 1px).

Based on Mirek's suggestion; looks better.

Change-Id: I3468450ee4c8ba27cd26a40c7ed11f0b4df9c42d

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index adbad28..dd175fb 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -2,21 +2,6 @@
 
   
   
-  
-True
-False
-res/ods_32_8.png
-  
-  
-True
-False
-res/odb_32_8.png
-  
-  
-True
-False
-res/odg_32_8.png
-  
   
 False
 
@@ -25,7 +10,7 @@
 False
 True
 True
-6
+1
 
   
 True
@@ -374,6 +359,21 @@
   
 
   
+  
+True
+False
+res/ods_32_8.png
+  
+  
+True
+False
+res/odb_32_8.png
+  
+  
+True
+False
+res/odg_32_8.png
+  
   
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - framework/uiconfig

[Jan Holesovsky]

 framework/uiconfig/startmodule/menubar/menubar.xml |9 +
 1 file changed, 9 insertions(+)

New commits:
commit b33986252aeb2ef6105231169e4d78e7940a0522
Author: Jan Holesovsky 
Date:   Tue Dec 3 12:28:48 2013 +0100

Start center: Re-introduce the Macros menu, people use it.

Change-Id: I99da1fbbd158622933445f7e97f4266a24a2d85d

diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml 
b/framework/uiconfig/startmodule/menubar/menubar.xml
index 1df6209..248b88c 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -30,6 +30,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sfx2/source/control/templateview.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cda18152416d05d99aac16a18c34732850025470
Author: Jan Holesovsky 
Date:   Thu Dec 5 14:41:56 2013 +0100

Start center: Use the welcome text that was agreed by UX / design team.

Change-Id: I1af05f68ef7c2a10209f138e59a9245d3d1ac081

diff --git a/sfx2/source/control/templateview.src 
b/sfx2/source/control/templateview.src
index ef2eede..3b866bd 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -25,7 +25,7 @@ FixedText FT_NAME
 
 String STR_WELCOME
 {
-Text [ en-US ] = "Welcome! You can open or create a new document!";
+Text [ en-US ] = "Welcome to %PRODUCTNAME. Use the sidebar to open or 
create a file.";
 };
 
 Image IMG_WELCOME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

  Attachment #78547|application/octet-stream|application/vnd.openxmlform
  mime type||ats-officedocument.presenta
   ||tionml.presentation

-- 
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 53920] EDITING: Data Validity Cell Range not being applied to multiple selected cells

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

  Attachment #66064|application/octet-stream|application/vnd.oasis.opend
  mime type||ocument.spreadsheet

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 72125, which changed state.

Bug 72125 Summary: Expert config dialog takes too much time to come up
https://bugs.freedesktop.org/show_bug.cgi?id=72125

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
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: vcl/osx

[Herbert Dürr]

 vcl/osx/DataFlavorMapping.cxx |   23 ---
 vcl/osx/DataFlavorMapping.hxx |   10 +-
 vcl/osx/clipboard.cxx |8 
 vcl/osx/clipboard.hxx |4 ++--
 4 files changed, 23 insertions(+), 22 deletions(-)

New commits:
commit 4b9bbe7b8f45bc6d985aad48d056bf9242704ad4
Author: Herbert Dürr 
Date:   Thu Dec 12 13:37:51 2013 +

Resolves: #i123841# fix constness issues in OSX 64bit clipboard handling

(cherry picked from commit 0801e9b488660e792a09d12717da951d224b26e0)

Conflicts:
vcl/aqua/source/dtrans/DataFlavorMapping.cxx
vcl/aqua/source/dtrans/DataFlavorMapping.hxx
vcl/aqua/source/dtrans/aqua_clipboard.cxx
vcl/aqua/source/dtrans/aqua_clipboard.hxx

Change-Id: Ifaf90c9aafcc22dd93923250d2342346806f9e88

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index c5a79b3..4590e97 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -56,7 +56,7 @@ namespace // private
 return ((len > 0) && ((dtype == getCppuType((Sequence*)0)) || 
(dtype == getCppuType( (OUString*)0 ;
   }
 
-  OUString NSStringToOUString(NSString* cfString)
+  OUString NSStringToOUString( const NSString* cfString)
   {
 BOOST_ASSERT(cfString && "Invalid parameter");
 
@@ -101,7 +101,7 @@ namespace // private
 
   struct FlavorMap
   {
-NSString* SystemFlavor;
+const NSString* SystemFlavor;
 const char* OOoFlavor;
 const char* HumanPresentableName;
 bool DataTypeOUString; // sequence otherwise
@@ -109,7 +109,7 @@ namespace // private
 
   /* At the moment it appears as if only MS Office pastes "public.html" to the 
clipboard.
*/
-  FlavorMap flavorMap[] =
+  static const FlavorMap flavorMap[] =
 {
   { NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text 
(UTF-16)", true },
   { NSRTFPboardType, "text/richtext", "Rich Text Format", false },
@@ -504,13 +504,13 @@ DataFlavorMapper::~DataFlavorMapper()
 }
 }
 
-DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* 
systemDataFlavor) const
+DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* 
systemDataFlavor) const
 {
   DataFlavor oOOFlavor;
 
   for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++)
 {
-  if ([systemDataFlavor caseInsensitiveCompare: flavorMap[i].SystemFlavor] 
== NSOrderedSame)
+  if ([systemDataFlavor 
caseInsensitiveCompare:const_cast(flavorMap[i].SystemFlavor)] == 
NSOrderedSame)
 {
   oOOFlavor.MimeType = 
OUString::createFromAscii(flavorMap[i].OOoFlavor);
   oOOFlavor.HumanPresentableName = 
OUString::createFromAscii(flavorMap[i].HumanPresentableName);
@@ -532,9 +532,10 @@ DataFlavor 
DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor
 return oOOFlavor;
 }
 
-NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& 
oOOFlavor, bool& rbInternal) const
+const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor& 
oOOFlavor, bool& rbInternal) const
 {
-NSString* sysFlavor = NULL;
+const NSString* sysFlavor = NULL;
+rbInternal = false;
 rbInternal = false;
 
 for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
@@ -566,7 +567,7 @@ NSString* 
DataFlavorMapper::openOfficeImageToSystemFlavor(NSPasteboard* pPastebo
 return sysFlavor;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, 
Reference rTransferable) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
systemFlavor, Reference rTransferable) const
 {
   DataProviderPtr_t dp;
 
@@ -620,12 +621,12 @@ DataProviderPtr_t 
DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
   return dp;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* 
/*systemFlavor*/, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
/*systemFlavor*/, NSArray* systemData) const
 {
   return DataProviderPtr_t(new FileListDataProvider(systemData));
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* 
systemFlavor, NSData* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
systemFlavor, NSData* systemData) const
 {
   DataProviderPtr_t dp;
 
@@ -684,7 +685,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const 
com::sun::star::uno:
   }
   else
   {
-  NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
+  const NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
 
   if (str != NULL)
   {
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index 70f7736..a80bd41 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -74,14 +74,14 @@ public:
  mapping from a system data flavor to a OpenOffice data
  flavor.
   */
-  com::sun::star::datatransfer::DataFlavor

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 08/01e9b488660e792a09d12717da951d224b26e0

[Caolán McNamara]

 08/01e9b488660e792a09d12717da951d224b26e0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1b1bb53ffadb684b786166603006c1b8804ec3f8
Author: Caolán McNamara 
Date:   Thu Dec 12 15:24:23 2013 +

Notes added by 'git notes add'

diff --git a/08/01e9b488660e792a09d12717da951d224b26e0 
b/08/01e9b488660e792a09d12717da951d224b26e0
new file mode 100644
index 000..73cd155
--- /dev/null
+++ b/08/01e9b488660e792a09d12717da951d224b26e0
@@ -0,0 +1 @@
+merged as: 4b9bbe7b8f45bc6d985aad48d056bf9242704ad4
___
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 sc/uiconfig sw/source sw/uiconfig

[Eike Rathke]

 sc/source/ui/view/tabvwsh.cxx|1 +
 sc/uiconfig/scalc/menubar/menubar.xml|1 +
 sw/source/ui/uiview/view0.cxx|1 +
 sw/uiconfig/sglobal/menubar/menubar.xml  |1 +
 sw/uiconfig/sweb/menubar/menubar.xml |1 +
 sw/uiconfig/swform/menubar/menubar.xml   |1 +
 sw/uiconfig/swreport/menubar/menubar.xml |1 +
 sw/uiconfig/swriter/menubar/menubar.xml  |1 +
 sw/uiconfig/swxform/menubar/menubar.xml  |1 +
 9 files changed, 9 insertions(+)

New commits:
commit 4c0ac90b4864d5eee401b54cdcd54e29ae4ddc53
Author: Eike Rathke 
Date:   Wed Dec 11 23:34:55 2013 +0100

fdo#68160 Revert "Resolves: #ii122335# Disabling the old task pane"

fdo#68160 Revert "Partly revert "Resolves: #ii122335# Disabling the old 
task pane""

This reverts commit cb4225144f1fff44f9bb972fe06f51524da11b8b.

To be able to revert 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872 entirely.

fdo#68160 Revert "Resolves: #ii122335# Disabling the old task pane"

This reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872.

We need a TaskPane even in Writer and Calc to be used by extensions.
Sidebar is experimental so TaskPane is needed anyway for Impress (see
fdo#72371).

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

diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 7949e17..537499b 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,6 +54,7 @@ 
SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
 SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
 SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
+SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
 
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 777c324..ca8d8ba 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -139,6 +139,7 @@
 
 
 
+  
   
   
 
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 73555a8..e5f7b3b 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -90,6 +90,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
 SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
 {
 SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
+SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
 
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 3c310f2..f79d0ec 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -137,6 +137,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 30229a7..3cb3b76 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -108,6 +108,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index 4f22cf1..806da2d 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -136,6 +136,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 39284e8..bc90989 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -137,6 +137,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 618e757..9506ab9 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -141,6 +141,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index e1d2c83..84b1fc3 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -138,6 +138,7 @@
   
   
   
+  
   
   
   
___

Dogulas Mencken (dougmencken) license statement

[Douglas Mencken]

All of my contributions to LibreOffice are public domain,
or — at your option — are licensed under the WTFPLv2+ license.

https://en.wikipedia.org/wiki/WTFPL
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement : Synerzip

[Nikhil Walvekar]

Hi All,

For the record,

All contributions past and present made to LibreOffice from Synerzip
are available under the terms the MPL / LGPLv3+.
Until further notice, future contributions made to LibreOffice from Synerzip
are available under the terms the MPL / LGPLv3+.

Regards,

Nikhil

-- 
This e-mail, including any attached files, may contain confidential and 
privileged information for the sole use of the intended recipient. Any 
review, use, distribution, or disclosure by others is strictly prohibited. 
If you are not the intended recipient (or authorized to receive information 
for the intended recipient), please contact the sender by reply e-mail and 
delete all copies of this message.

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

Re: Videotutorial for extensions creation

[Adam Tauno Williams]

On Mon, 2013-12-09 at 09:15 +0100, Miklos Vajna wrote: 
> On Sat, Dec 07, 2013 at 10:20:17AM +0100, -  wrote:
> > I have seen you are an extensions developer.
> Where did you see that?
> > I would like to ask
> > you, if you would like to create a simple videotutorial showing how
> > to create an extension for LibreOffice?
> > Something simple, like a dialog box with the Hello World?
> > I need to start creating extensions, but I see a bunch of
> > documentation and really I don't know how to start step by step.
> > A simple tutorial, I think would help a lot to the community.
> I don't plan to create video tutorials, but here are links to good
> documentation on this topic:
> - extension development in general
>   https://wiki.documentfoundation.org/Development/Extension_Development
> - python example
>   
> http://extensions.libreoffice.org/extension-center/libreoffice-does-print-on-tuesdays

Possibly I am a bit slow [although I've been around LibreOffice for
awhile] ... but how does this second Python-example work?  Nowhere on
that page can I find how to download this extension to look at the code.

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua

[Herbert Dürr]

 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |   23 ---
 vcl/aqua/source/dtrans/DataFlavorMapping.hxx |   13 +++--
 vcl/aqua/source/dtrans/aqua_clipboard.cxx|8 
 vcl/aqua/source/dtrans/aqua_clipboard.hxx|4 ++--
 4 files changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 0801e9b488660e792a09d12717da951d224b26e0
Author: Herbert Dürr 
Date:   Thu Dec 12 13:37:51 2013 +

#i123841# fix constness issues in OSX 64bit clipboard handling

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index c784602..c3650e5 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -64,7 +64,7 @@ namespace // private
 
   typedef vector UnicodeBuffer;
 
-  OUString NSStringToOUString(NSString* cfString)
+  OUString NSStringToOUString( const NSString* cfString)
   {
 BOOST_ASSERT(cfString && "Invalid parameter");
 
@@ -113,7 +113,7 @@ namespace // private
 
   struct FlavorMap
   {
-NSString* SystemFlavor;
+const NSString* SystemFlavor;
 const char* OOoFlavor;
 const char* HumanPresentableName;
 Type DataType;
@@ -121,7 +121,7 @@ namespace // private
 
   /* At the moment it appears as if only MS Office pastes "public.html" to the 
clipboard.
*/
-  FlavorMap flavorMap[] =
+  static const FlavorMap flavorMap[] =
 {
   { NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text 
(UTF-16)", CPPUTYPE_OUSTRING },
   { NSRTFPboardType, "text/richtext", "Rich Text Format", CPPUTYPE_SEQINT8 
},
@@ -521,13 +521,13 @@ DataFlavorMapper::~DataFlavorMapper()
 }
 }
 
-DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* 
systemDataFlavor) const
+DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* 
systemDataFlavor) const
 {
   DataFlavor oOOFlavor;
 
   for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++)
 {
-  if ([systemDataFlavor caseInsensitiveCompare: flavorMap[i].SystemFlavor] 
== NSOrderedSame)
+  if ([systemDataFlavor 
caseInsensitiveCompare:const_cast(flavorMap[i].SystemFlavor)] == 
NSOrderedSame)
 {
   oOOFlavor.MimeType = OUString::createFromAscii( 
flavorMap[i].OOoFlavor);
   oOOFlavor.HumanPresentableName = OUString::createFromAscii( 
flavorMap[i].HumanPresentableName);
@@ -549,9 +549,10 @@ DataFlavor 
DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor
 return oOOFlavor;
 }
 
-NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& 
oOOFlavor, bool& rbInternal) const
+const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor& 
oOOFlavor, bool& rbInternal) const
 {
-NSString* sysFlavor = NULL;
+const NSString* sysFlavor = NULL;
+rbInternal = false;
 rbInternal = false;
 
 for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
@@ -583,7 +584,7 @@ NSString* 
DataFlavorMapper::openOfficeImageToSystemFlavor(NSPasteboard* pPastebo
 return sysFlavor;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, 
Reference rTransferable) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
systemFlavor, Reference rTransferable) const
 {
   DataProviderPtr_t dp;
 
@@ -639,12 +640,12 @@ DataProviderPtr_t 
DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
   return dp;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* 
/*systemFlavor*/, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
/*systemFlavor*/, NSArray* systemData) const
 {
   return DataProviderPtr_t(new FileListDataProvider(systemData));
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* 
systemFlavor, NSData* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
systemFlavor, NSData* systemData) const
 {
   DataProviderPtr_t dp;
 
@@ -708,7 +709,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const 
com::sun::star::uno:
   }
   else
   {
-  NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
+  const NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
 
   if (str != NULL)
   {
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 9a9e709..6adf3fb 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -78,14 +78,14 @@ public:
  mapping from a system data flavor to a OpenOffice data
  flavor.
   */
-  com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor(NSString* 
systemDataFlavor) const;
+  com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const 
NSString* systemDataFlavor) const;
 
 
   /* Map an OpenOffice data flavor to a system data flavor.
  If there is no suiteable mapp

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

[Matúš Kukan]

 sc/source/ui/docshell/datastream.cxx |6 ++
 sc/source/ui/inc/gridwin.hxx |2 +-
 sc/source/ui/inc/tabview.hxx |1 +
 sc/source/ui/view/tabview3.cxx   |   10 +++---
 4 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit dbbcdd877b1644d9a7b1bb013460681428a00855
Author: Matúš Kukan 
Date:   Thu Dec 12 14:53:27 2013 +0100

CheckInverted() is not used anywhere.

Change-Id: I5d22948314a16370d7ac75bfd25151cfa04a2491

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 0a499c7..d5311da 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -376,7 +376,6 @@ public:
 voidStopMarking();
 voidUpdateInputContext();
 
-voidCheckInverted() { if (nPaintCount) bNeedsRepaint = 
true; }
 boolNeedsRepaint() { return bNeedsRepaint; }
 
 voidDoInvertRect( const Rectangle& rPixel );
commit 29533e1871ea161bf6b919abed95d908c035c250
Author: Matúš Kukan 
Date:   Thu Dec 12 14:46:34 2013 +0100

datastreams: Wait with import if we need to repaint.

Change-Id: I31e8371999afafeeaad201496becf1f2f9d8d276

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index db974c7..7f529dd 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -390,6 +390,9 @@ void DataStream::Text2Doc()
 
 bool DataStream::ImportData()
 {
+if (ScDocShell::GetViewData()->GetViewShell()->NeedsRepaint())
+return mbRunning;
+
 MoveData();
 if (mbValuesInLine)
 {
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 7818cc7..0a499c7 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -377,6 +377,7 @@ public:
 voidUpdateInputContext();
 
 voidCheckInverted() { if (nPaintCount) bNeedsRepaint = 
true; }
+boolNeedsRepaint() { return bNeedsRepaint; }
 
 voidDoInvertRect( const Rectangle& rPixel );
 
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 8832da4..0c1c7a1 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -437,6 +437,7 @@ public:
 voidUpdateFormulas();
 voidInterpretVisible();
 voidCheckNeedsRepaint();
+boolNeedsRepaint();
 
 voidPaintRangeFinder( long nNumber = -1 );
 voidAddHighlightRange( const ScRange& rRange, const Color& 
rColor );
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index e258761..cedb9ba 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2634,8 +2634,12 @@ void ScTabView::CheckNeedsRepaint()
 pGridWin[i]->CheckNeedsRepaint();
 }
 
-
-
-
+bool ScTabView::NeedsRepaint()
+{
+for (size_t i = 0; i < 4; i++)
+if (pGridWin[i] && pGridWin[i]->IsVisible() && 
pGridWin[i]->NeedsRepaint())
+return true;
+return false;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 78e4da913c12867ce6f2607a4a05bda66e73a213
Author: Matúš Kukan 
Date:   Thu Dec 12 10:49:07 2013 +0100

datastreams: Broadcast data changes.

Change-Id: Iedf07a9ef59a695cb56c2e160f269cd5d542735b

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 1d99af2..db974c7 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -378,6 +378,7 @@ void DataStream::Text2Doc()
 aDocImport.setNumericCell(aAddress, aCell.toDouble());
 else
 aDocImport.setStringCell(aAddress, aCell);
+mpScDocument->Broadcast(ScHint(SC_HINT_DATACHANGED, aAddress));
 }
 ++nCol;
 }
@@ -418,10 +419,12 @@ bool DataStream::ImportData()
 else
 aDocImport.setStringCell(aAddress, sValue);
 aRangeList.Join(aAddress);
+mpScDocument->Broadcast(ScHint(SC_HINT_DATACHANGED, aAddress));
 }
 aDocImport.finalize();
 mpScDocShell->PostPaint( aRangeList, PAINT_GRID );
 }
+mpScDocShell->SetDocumentModified();
 if (meMove == NO_MOVE)
 return mbRunning;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Efficient UNO component linkage & GC ...

[Michael Meeks]

Hi Stephan,

Thanks for the review ! Matus should start work on this shortly.

On Fri, 2013-10-11 at 17:20 +0200, Stephan Bergmann wrote:
> DllComponentLoader is mostly dead by now, only comes into play during 
...
> Handling of the prefix feature is done entirely in 
> cppuhelper/source/servicemanger.cxx and cppu::loadSharedLibComponentFactory.

Ah right my bad; as you say we should add this here: 

> To split into smaller,  unconnected parts would mean to split existing
>  XML entities into smaller ones, each with its own prefix 

That would suck IMHO :-) we have enough scattered files.

> Or, as you detail below, go further and add more efficient support for 
> the "single-object-implementation" factory case.  (Do you have any idea 
> whether this is worth it, given we have to continue supporting the other 
> case for extension-compatibility anyway?)

Sure it's worth it given we're primarily looking for size savings for
mobile; for the Linux case we get only marginal wins here I think.

> Anyway, given that the current "prefix" feature should only be used by 
> internal code we have under full control (see recent discussion 
> elsewhere on this mailing list), should we go down that road, I'd prefer 
> to replace the existing "prefix" feature with something new (e.g., an 
> extension of the components XML schema that associates an individual 
>  rather than a  with a prefix attribute), 
> rather than keeping both.  (Though we could support both for a 
> transition period while we incrementally update the existing code.)

Yep - agreed; it's nice we're flexible here, just some inevitable
transition period where we'd try the direct symbol approach, and then
fallback to the old prefix'd factory function.

> What would likely be more entertaining is to get rid of the 
> cppu::createSingleFactory layer of indirection.  (As you come to in part 
> three.  But note that there are service implementations that rather act 
> like singletons and always hand out the same object instance; that needs 
> to be taken care of.)

Yes - hopefully that's easily done. Luckily it's all internal, was just
chatting with Matus and considering the symbol could point to a C struct
easily enough something like:

extern "C" struct {
const char*pImplementationName;
ComponentInstantiation pCreateFunction
const char*pServiceNames[];
} ComponentEntryPoint;

And have some wrappers to help with converting the ComponentEntryPoint
record into the results we want from the XServiceInfo methods
(getSupportedServiceNames etc.)

> An alternative is to extend the components XML schema to support lookup 
> of the factory function directly in the executable (say) rather than a 
> given dynamic library (e.g., by having a local="true" attribute rather 
> than a uri="..." one).  Since the uri attributes are already inserted 
> into the .component XML files at build-time, it shouldn't be too hard to 
> combine that with a configurable list of components that end up directly 
> linked into the executable.

Interesting idea. I'd like to see how this shakes out in a few
iterations here I think. I agree that we're going to need something
like:

 http://openoffice.org/2010/uno-components";>
- 
+ 

  
  


  

Incidentally - do we actually use the service information in anger ?
ie. could we not populate / store the data required for the XServiceInfo
interface from the services.rdb at run-time, rather than having it
duplicated in the code ? or is there some benefit to that ?

> In addition to having them stored as XML files that are parsed at start-up in 
> cppuhelper::ServiceManager::init, one could optionally have them 
> pre-compiled into some data structure that is accessible from 
> cppuhelper/source/servicemanager.cxx.  In which case the data structures 
> for such local="true" components could directly contain function 
> pointers to the corresponding factories.

Very true =) perhaps that would get rid of the whole native-code.cxx
mess as well - centralizing it and making it fully generic - that would
be nice.

> > * Part three - faster component instantiation
> >
> > The wonderful work Noel has been doing around more beautiful
> > ways to instantiate components should dove-tail with this nicely.
...
> > Which should be much smaller and neater.
> 
> Question is how much that "much" would actually be.  (And one would have 
> to generate two variants of service/singleton C++ headers, an optimized 
> one for internal use and a traditional one for external use.)

Well if we call directly into the method that instantiates the object,
then LTO can potentially start to inline a lot of things and ignore a
lot of exceptions that we know are not thrown etc. presumably it may
have some benefits for a merged-libs case.

Anyhow - thanks for the feedback - moving ahead here soon (I hope) on
master.

   

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

[Caolán McNamara]

 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |   44 +
 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |   12 -
 2 files changed, 46 insertions(+), 10 deletions(-)

New commits:
commit be366ad7690b190c5ef4dc42311a4df6b7dcce4b
Author: Caolán McNamara 
Date:   Thu Dec 12 12:37:43 2013 +

pages with equal Priority and Class getting dropped

Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715
(cherry picked from commit 9790588da4b2de455ffc7a2cc69f26539823c3da)

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 8db2bce..cdc2b57 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -40,9 +40,14 @@ public:
 bool operator() (const Request& rRequest1, const Request& rRequest2)
 {
 if (rRequest1.meClass == rRequest2.meClass)
-return (rRequest1.mnPriorityInClass > 
rRequest2.mnPriorityInClass);
-else
-return (rRequest1.meClass < rRequest2.meClass);
+{
+if (rRequest1.mnPriorityInClass == rRequest2.mnPriorityInClass)
+{
+return rRequest1.maKey < rRequest2.maKey;
+}
+return rRequest1.mnPriorityInClass > 
rRequest2.mnPriorityInClass;
+}
+return rRequest1.meClass < rRequest2.meClass;
 }
 };
 /** Request data is compared arbitrarily by their addresses in memory.
commit 026e9335d792c6557255f064960e0ef6d28728e0
Author: Caolán McNamara 
Date:   Thu Dec 12 10:39:06 2013 +

fix occasional crash on dragging and dropping pages in slidesorters

pages go into the cache, and sometimes they get deleted before the
cache gets processed. Remove deleted pages when they go away

Change-Id: I291072a8541f4ca36979e9914975d81cc23a9497
(cherry picked from commit abe9d1463282690313aaf91d2a54011d10b900b9)

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index d02bae1..8db2bce 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -89,6 +89,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& 
rpCacheContext)
 
 RequestQueue::~RequestQueue (void)
 {
+Clear();
 }
 
 
@@ -115,7 +116,15 @@ void RequestQueue::AddRequest (
 // order.
 sal_Int32 nPriority (mpCacheContext->GetPriority(aKey));
 Request aRequest (aKey, nPriority, eRequestClass);
-mpRequestQueue->insert(aRequest);
+
+std::pair ret = mpRequestQueue->insert(aRequest);
+bool bInserted = ret.second == true;
+
+if (bInserted)
+{
+SdrPage *pPage = const_cast(aRequest.maKey);
+pPage->AddPageUser(*this);
+}
 
 SSCD_SET_REQUEST_CLASS(aKey,eRequestClass);
 
@@ -126,8 +135,11 @@ void RequestQueue::AddRequest (
 #endif
 }
 
-
-
+void RequestQueue::PageInDestruction(const SdrPage& rPage)
+{
+//remove any requests pending for this page which is going away now
+RemoveRequest(&rPage);
+}
 
 bool RequestQueue::RemoveRequest (
 CacheKey aKey)
@@ -147,7 +159,11 @@ bool RequestQueue::RemoveRequest (
 mnMinimumPriority++;
 else if (aRequestIterator->mnPriorityInClass == 
mnMaximumPriority-1)
 mnMaximumPriority--;
+
+SdrPage *pPage = const_cast(aRequestIterator->maKey);
+pPage->RemovePageUser(*this);
 mpRequestQueue->erase(aRequestIterator);
+
 bRequestWasRemoved = true;
 
 if (bRequestWasRemoved)
@@ -224,7 +240,10 @@ void RequestQueue::PopFront (void)
 {
 SSCD_SET_STATUS(maRequestQueue.begin()->mpData->GetPage(),NONE);
 
-mpRequestQueue->erase(mpRequestQueue->begin());
+Container::const_iterator aIter(mpRequestQueue->begin());
+SdrPage *pPage = const_cast(aIter->maKey);
+pPage->RemovePageUser(*this);
+mpRequestQueue->erase(aIter);
 
 // Reset the priority counter if possible.
 if (mpRequestQueue->empty())
@@ -251,6 +270,12 @@ void RequestQueue::Clear (void)
 {
 ::osl::MutexGuard aGuard (maMutex);
 
+for (Container::iterator aI = mpRequestQueue->begin(), aEnd = 
mpRequestQueue->end(); aI != aEnd; ++aI)
+{
+SdrPage *pPage = const_cast(aI->maKey);
+pPage->RemovePageUser(*this);
+}
+
 mpRequestQueue->clear();
 mnMinimumPriority = 0;
 mnMaximumPriority = 1;
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index dc5a92f..c9eb9a9 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -24,7 +24,8 @@
 #include "cache/SlsCacheContext.hxx"
 #include "taskpane/SlideSorterCacheDisplay.hxx"
 #include 
-#include "osl/mutex.hxx"
+#in

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b2/20aecac531570269078b602c80e56d41d05c51

[Caolán McNamara]

 b2/20aecac531570269078b602c80e56d41d05c51 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 165bba188a9c9c268e6382ff6e4d1bc3843cb7b3
Author: Caolán McNamara 
Date:   Thu Dec 12 13:39:11 2013 +

Notes added by 'git notes add'

diff --git a/b2/20aecac531570269078b602c80e56d41d05c51 
b/b2/20aecac531570269078b602c80e56d41d05c51
new file mode 100644
index 000..2ac2bc9
--- /dev/null
+++ b/b2/20aecac531570269078b602c80e56d41d05c51
@@ -0,0 +1 @@
+ignore: does not seem necessary
___
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' - c6/8012e7d7544126c6b674f3deebd2f33ed7bb2d

[Caolán McNamara]

 c6/8012e7d7544126c6b674f3deebd2f33ed7bb2d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55f96b5d32f342a23839e6996e17cf9724e8799f
Author: Caolán McNamara 
Date:   Thu Dec 12 13:38:40 2013 +

Notes added by 'git notes add'

diff --git a/c6/8012e7d7544126c6b674f3deebd2f33ed7bb2d 
b/c6/8012e7d7544126c6b674f3deebd2f33ed7bb2d
new file mode 100644
index 000..d77edff
--- /dev/null
+++ b/c6/8012e7d7544126c6b674f3deebd2f33ed7bb2d
@@ -0,0 +1 @@
+prefer: d83de4b1a93ba7ed7bc3243073be3de96a44bfa9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 include/oox/export/shapes.hxx   |2 ++
 oox/source/export/shapes.cxx|   27 ---
 sw/source/filter/ww8/docxexport.cxx |4 +++-
 3 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit dbdc31fc0a09181d80909819d93a2dacde3eac79
Author: Miklos Vajna 
Date:   Thu Dec 12 14:32:39 2013 +0100

oox: initial ShapeExport::WriteGroupShape

For now, enable it only for DOCX.

Change-Id: I424d8fb3f1c1e7c9a03e7103c91473c3ff85bc77

diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 65fafc9..bfcaaf7 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -94,6 +94,8 @@ public:
 virtual ShapeExport&
 WriteGraphicObjectShape( 
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
 virtual ShapeExport&
+WriteGroupShape( ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > xShape );
+virtual ShapeExport&
 WriteLineShape( ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > xShape );
 virtual ShapeExport&
 WriteNonVisualDrawingProperties( 
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, 
const char* sName );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5689215..e2e7a13 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -243,6 +243,25 @@ ShapeExport& ShapeExport::WriteOpenBezierShape( Reference< 
XShape > xShape )
 return WriteBezierShape( xShape, sal_False );
 }
 
+ShapeExport& ShapeExport::WriteGroupShape(uno::Reference 
xShape)
+{
+FSHelperPtr pFS = GetFS();
+pFS->startElementNS(mnXmlNamespace, XML_wgp, FSEND);
+
+// non visual properties
+pFS->singleElementNS(mnXmlNamespace, XML_cNvGrpSpPr, FSEND);
+
+// visual properties
+pFS->startElementNS(mnXmlNamespace, XML_grpSpPr, FSEND);
+WriteShapeTransformation(xShape, XML_a);
+pFS->endElementNS(mnXmlNamespace, XML_grpSpPr);
+
+// TODO: children
+
+pFS->endElementNS(mnXmlNamespace, XML_wgp);
+return *this;
+}
+
 ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
 {
 DBG(printf("write custom shape\n"));
@@ -679,7 +698,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< 
XShape > xShape )
 typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > );
 typedef boost::unordered_map< const char*, ShapeConverter, rtl::CStringHash, 
rtl::CStringEqual> NameToConvertMapType;
 
-static const NameToConvertMapType& lcl_GetConverters()
+static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType 
eDocumentType)
 {
 static bool shape_map_inited = false;
 static NameToConvertMapType shape_converters;
@@ -712,6 +731,8 @@ static const NameToConvertMapType& lcl_GetConverters()
 shape_converters[ "com.sun.star.presentation.OutlinerShape" ]   = 
&ShapeExport::WriteTextShape;
 shape_converters[ "com.sun.star.presentation.SlideNumberShape" ]= 
&ShapeExport::WriteTextShape;
 shape_converters[ "com.sun.star.presentation.TitleTextShape" ]  = 
&ShapeExport::WriteTextShape;
+if (eDocumentType == DrawingML::DOCUMENT_DOCX)
+shape_converters[ "com.sun.star.drawing.GroupShape" ] = 
&ShapeExport::WriteGroupShape;
 shape_map_inited = true;
 
 return shape_converters;
@@ -721,8 +742,8 @@ ShapeExport& ShapeExport::WriteShape( Reference< XShape > 
xShape )
 {
 OUString sShapeType = xShape->getShapeType();
 DBG( printf( "write shape: %s\n", USS( sShapeType ) ) );
-NameToConvertMapType::const_iterator aConverter = 
lcl_GetConverters().find( USS( sShapeType ) );
-if( aConverter == lcl_GetConverters().end() )
+NameToConvertMapType::const_iterator aConverter = 
lcl_GetConverters(GetDocumentType()).find( USS( sShapeType ) );
+if( aConverter == lcl_GetConverters(GetDocumentType()).end() )
 {
 DBG( printf( "unknown shape\n" ) );
 return WriteUnknownShape( xShape );
commit 10c3c9ec9b6af1b4124ff2cd458d22f13f4ebc39
Author: Miklos Vajna 
Date:   Thu Dec 12 14:26:45 2013 +0100

DocxExport::OutputDML: use the right namespace for groupshapes

Change-Id: Idd270e5519587440fe96e73f5cf51851f7680d59

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 35383d4..6c7a66b 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -331,7 +331,9 @@ OString DocxExport::OutputChart( uno::Reference< 
frame::XModel >& xModel, sal_In
 
 void DocxExport::OutputDML(uno::Reference& xShape)
 {
-oox::drawingml::ShapeExport aExport(XML_wps, m_pDocumentFS, 0, m_pFilter, 
oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
+uno::Reference xServiceInfo(xShape, 
uno::UNO_QUERY_THROW);
+bool bGroupShape = 
xServiceInfo->supportsService("com.sun.star.drawi

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b9/08fff1715f34373212c10f77244bf88574db10

[Caolán McNamara]

 b9/08fff1715f34373212c10f77244bf88574db10 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a9dea34c5e25d9a8496ce732ff747b46fe1e034
Author: Caolán McNamara 
Date:   Thu Dec 12 13:36:34 2013 +

Notes added by 'git notes add'

diff --git a/b9/08fff1715f34373212c10f77244bf88574db10 
b/b9/08fff1715f34373212c10f77244bf88574db10
new file mode 100644
index 000..d77edff
--- /dev/null
+++ b/b9/08fff1715f34373212c10f77244bf88574db10
@@ -0,0 +1 @@
+prefer: d83de4b1a93ba7ed7bc3243073be3de96a44bfa9
___
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' - 8c/1f2d28eb4ec226a37eac0f96dc079c9974771f

[Caolán McNamara]

 8c/1f2d28eb4ec226a37eac0f96dc079c9974771f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a5bc4f8d82aa9e0464ad107b63c9f3cc7367ddf5
Author: Caolán McNamara 
Date:   Thu Dec 12 13:35:41 2013 +

Notes added by 'git notes add'

diff --git a/8c/1f2d28eb4ec226a37eac0f96dc079c9974771f 
b/8c/1f2d28eb4ec226a37eac0f96dc079c9974771f
new file mode 100644
index 000..b4c1564
--- /dev/null
+++ b/8c/1f2d28eb4ec226a37eac0f96dc079c9974771f
@@ -0,0 +1 @@
+merged as: 08bb8fca4144608237418d64b1479840c408256f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |   62 -
 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |   12 +++-
 2 files changed, 59 insertions(+), 15 deletions(-)

New commits:
commit 9790588da4b2de455ffc7a2cc69f26539823c3da
Author: Caolán McNamara 
Date:   Thu Dec 12 12:37:43 2013 +

pages with equal Priority and Class getting dropped

Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index c01847d..8c96d83 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -40,9 +40,14 @@ public:
 bool operator() (const Request& rRequest1, const Request& rRequest2)
 {
 if (rRequest1.meClass == rRequest2.meClass)
-return (rRequest1.mnPriorityInClass > 
rRequest2.mnPriorityInClass);
-else
-return (rRequest1.meClass < rRequest2.meClass);
+{
+if (rRequest1.mnPriorityInClass == rRequest2.mnPriorityInClass)
+{
+return rRequest1.maKey < rRequest2.maKey;
+}
+return rRequest1.mnPriorityInClass > 
rRequest2.mnPriorityInClass;
+}
+return rRequest1.meClass < rRequest2.meClass;
 }
 };
 /** Request data is compared arbitrarily by their addresses in memory.
commit bd6dfbae4fd22767e227c5317d6696a70ed61c58
Author: Caolán McNamara 
Date:   Thu Dec 12 12:34:08 2013 +

remove unused ctor variant

Change-Id: I0c9afcb5819fc83f75ee8c639de56b788c3d516d

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 8db2bce..c01847d 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -49,11 +49,19 @@ public:
 This just establishes an order so that the STL containers are happy.
 The order is not semantically interpreted.
 */
-class DataComparator { public:
-DataComparator (const Request&rRequest):maKey(rRequest.maKey){}
-DataComparator (const CacheKey aKey):maKey(aKey){}
-bool operator() (const Request& rRequest) { return maKey == 
rRequest.maKey; }
-private: const CacheKey maKey;
+class DataComparator
+{
+public:
+DataComparator (const CacheKey aKey)
+: maKey(aKey)
+{
+}
+bool operator() (const Request& rRequest) const
+{
+return maKey == rRequest.maKey;
+}
+private:
+const CacheKey maKey;
 };
 
 CacheKey maKey;
commit abe9d1463282690313aaf91d2a54011d10b900b9
Author: Caolán McNamara 
Date:   Thu Dec 12 10:39:06 2013 +

fix occasional crash on dragging and dropping pages in slidesorters

pages go into the cache, and sometimes they get deleted before the
cache gets processed. Remove deleted pages when they go away

Change-Id: I291072a8541f4ca36979e9914975d81cc23a9497

diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index d02bae1..8db2bce 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -89,6 +89,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& 
rpCacheContext)
 
 RequestQueue::~RequestQueue (void)
 {
+Clear();
 }
 
 
@@ -115,7 +116,15 @@ void RequestQueue::AddRequest (
 // order.
 sal_Int32 nPriority (mpCacheContext->GetPriority(aKey));
 Request aRequest (aKey, nPriority, eRequestClass);
-mpRequestQueue->insert(aRequest);
+
+std::pair ret = mpRequestQueue->insert(aRequest);
+bool bInserted = ret.second == true;
+
+if (bInserted)
+{
+SdrPage *pPage = const_cast(aRequest.maKey);
+pPage->AddPageUser(*this);
+}
 
 SSCD_SET_REQUEST_CLASS(aKey,eRequestClass);
 
@@ -126,8 +135,11 @@ void RequestQueue::AddRequest (
 #endif
 }
 
-
-
+void RequestQueue::PageInDestruction(const SdrPage& rPage)
+{
+//remove any requests pending for this page which is going away now
+RemoveRequest(&rPage);
+}
 
 bool RequestQueue::RemoveRequest (
 CacheKey aKey)
@@ -147,7 +159,11 @@ bool RequestQueue::RemoveRequest (
 mnMinimumPriority++;
 else if (aRequestIterator->mnPriorityInClass == 
mnMaximumPriority-1)
 mnMaximumPriority--;
+
+SdrPage *pPage = const_cast(aRequestIterator->maKey);
+pPage->RemovePageUser(*this);
 mpRequestQueue->erase(aRequestIterator);
+
 bRequestWasRemoved = true;
 
 if (bRequestWasRemoved)
@@ -224,7 +240,10 @@ void RequestQueue::PopFront (void)
 {
 SSCD_SET_STATUS(maRequestQueue.begin()->mpData->GetPage(),NONE);
 
-mpRequestQueue->eras

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

[Muthu Subramanian]

 sd/qa/unit/data/pptx/n828390_3.pptx |binary
 sd/qa/unit/import-tests.cxx |   35 +++
 2 files changed, 35 insertions(+)

New commits:
commit eea8c671e42b91c8486e3796869d140d70b1a7eb
Author: Muthu Subramanian 
Date:   Thu Dec 12 18:54:00 2013 +0530

n#828390: Unit test for resetting char escapement.

diff --git a/sd/qa/unit/data/pptx/n828390_3.pptx 
b/sd/qa/unit/data/pptx/n828390_3.pptx
new file mode 100644
index 000..ad95758
Binary files /dev/null and b/sd/qa/unit/data/pptx/n828390_3.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index f912d11..630891c 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -50,6 +50,7 @@ public:
 void testFdo71075();
 void testN828390();
 void testN828390_2();
+void testN828390_3();
 void testFdo68594();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
@@ -61,6 +62,7 @@ public:
 CPPUNIT_TEST(testFdo71075);
 CPPUNIT_TEST(testN828390);
 CPPUNIT_TEST(testN828390_2);
+CPPUNIT_TEST(testN828390_3);
 CPPUNIT_TEST(testFdo68594);
 
 CPPUNIT_TEST_SUITE_END();
@@ -248,6 +250,39 @@ void SdFiltersTest::testN828390_2()
 CPPUNIT_ASSERT(aEdit.GetText(1) == OUString("Standard Platform"));
 }
 
+void SdFiltersTest::testN828390_3()
+{
+bool bPassed = true;
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_3.pptx") );
+CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( "not in destruction", 
!xDocShRef->IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+const SdrPage *pPage = pDoc->GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+
+SdrObject *pObj = pPage->GetObj(0);
+SdrTextObj *pTxtObj = dynamic_cast( pObj );
+const EditTextObject& aEdit = 
pTxtObj->GetOutlinerParaObject()->GetTextObject();
+std::vector rLst;
+aEdit.GetCharAttribs(1, rLst);
+for( std::vector::reverse_iterator it = rLst.rbegin(); 
it!=rLst.rend(); ++it)
+{
+const SvxEscapementItem *pFontEscapement = dynamic_cast((*it).pAttr);
+if(pFontEscapement)
+{
+if( pFontEscapement->GetEsc() != 0 )
+{
+bPassed = false;
+break;
+}
+}
+}
+CPPUNIT_ASSERT_MESSAGE("CharEscapment not imported properly", bPassed);
+}
+
 void SdFiltersTest::testN778859()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: l10n process, en_US version, Help files

[Sophie]

Hi Andras, all,
Le 12/12/2013 11:18, Andras Timar a écrit :
> On 2013.12.11. 17:19, Sophie wrote:
>> *About the en_US overall quality
>> - the process to rely on the l10n team to fix the en_US version is ok,
>> even if it gives us extra work to understand what is meant before we
>> realized it's a mistake. So it's also error prone for all the translations.
> 
> Discissions in this mailing list usually helped to clarify the meaning.
> Failing that, git log / git blame -- find out who the author was and ask
> him or her. Translators are welcome to test new features, sometimes it
> is obvious what a function does, despite the confusing UI text.

and sometimes not because you may also translate the product without
being an experienced user, or simply because you use Writer but not
Calc, etc...
> 
>> - but that doesn't solve the several typos that already exist and that
>> are overlooked by the l10n team (e.g in the Character > Font Effect
>> dialog, there is Overline _c_olor and Underline _C_olor and this is the
>> same for several dialogs)
> 
> If it's overlooked by 60+ active translation teams + beta testers, then
> probably it is not that much important. We can live with it. :)

Not sure, as Khaled said, it may be because the load of work on
translation is enough to not take care of other things.
> 
>> * About the help files
>> - I always wonder why there is a Help button on a new dialog when no
>> help file is appended ;)
> 
> Probably it is prescribed by some rule, e.g. Gnome HIG, that every
> dialog must have a Help button. So dialog creator application puts it
> there, and the developer leaves it there thinking that someone may write
> a help page for it later.

Well, may be, but unfortunately the help page is never created.
> 
>> - more and more functions are undocumented or their help is obsolete. I
>> always think that an undocumented function is lost for the user and a
>> sad thing for a developer because his function will not be used as expected.
> 
> As I wrote above, many functions/new dialogs are self-describing. I
> hated to translate Gnome help 10 years ago, which was full of sentences
> like this: "Click on Close button to close the dialog." So we need to
> limit the scope here. It would be good, if you could give examples, what
> needs further clarification in help.

They may be self describing for you, but not for most of our users. I've
collected some issues where the help needs to be amended or is missing,
but it would be better to have a general process and try to include more
people in it.
> 
>> May be, but I don't know how heavy it would be for developers, the
>> solution would be to open an issue with a special tag like NF for each
>> new feature, with three lines about what the feature is supposed to
>> do. Searching on BZ with this special tag would allow to involve more
>> people in the loop to test it and document it.
> 
> The problem is that you cannot enforce any rule to developers. You can
> write a mail to the list, newcomers will not see it. You can write wiki
> pages, some people will not read it. You can ask people individually,
> some will ignore you.

That I know :)
 But I have an idea. What about prolonging the
> string freeze date of help until the first bug fix release? That would
> give developers/help authors/translators more time to concentrate on
> documentation of new features. So we could say, with x.y.0 you get all
> new features, and x.y.1 will come with updated help.

That's a good idea, but we still need help authors. I'm sure some people
will jump in, even earlier, if they only know where, hence the proposal
for a dedicated issue. As I said in another mail, I don't want to add
more processes, rules, etc. But there is some areas that impact more
than one team where it would be good to have some worflows.

Cheers
Sophie

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

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

[Muthu Subramanian]

 oox/source/drawingml/textcharacterproperties.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fdf77f50ab825bd2b44e980552f3383acf637b12
Author: Muthu Subramanian 
Date:   Thu Dec 12 18:24:42 2013 +0530

n#828390: Reset charescapement.

Unless the value is reset - the escapement
seems to continue to the next set of textruns.

diff --git a/oox/source/drawingml/textcharacterproperties.cxx 
b/oox/source/drawingml/textcharacterproperties.cxx
index febb28c..c99a44a 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -119,6 +119,9 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& 
rPropMap, const XmlFil
 if( moBaseline.has() ) {
 rPropMap[ PROP_CharEscapement ] <<= sal_Int16(moBaseline.get( 0 ) / 
1000);
 rPropMap[ PROP_CharEscapementHeight ] <<= sal_Int8(DFLT_ESC_PROP);
+} else {
+rPropMap[ PROP_CharEscapement ] <<= sal_Int16(0);
+rPropMap[ PROP_CharEscapementHeight ] <<= sal_Int8(100); // 100%
 }
 
 if( !bUseOptional || moBold.has() ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/uiconfig

[Jan Holesovsky]

 sfx2/uiconfig/ui/startcenter.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3857e8c31fd61d997b94b58b7ed898e7a6546a4a
Author: Jan Holesovsky 
Date:   Thu Dec 12 12:20:58 2013 +0100

startcenter: Update the button descriptions to the UX team decision.

Change-Id: Ie0813e8faa1cc97aa77fc89659b829226d0e5736

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 42e093f..adbad28 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -105,7 +105,7 @@
 
 
   
-New 
_Document
+Writer 
_Document
 True
 True
 True
@@ -125,7 +125,7 @@
 
 
   
-New 
_Spreadsheet
+Calc 
_Spreadsheet
 True
 True
 True
@@ -145,7 +145,7 @@
 
 
   
-New 
_Presentation
+Impress 
_Presentation
 True
 True
 True
@@ -165,7 +165,7 @@
 
 
   
-New 
D_rawing
+Draw 
D_rawing
 True
 True
 True
@@ -185,7 +185,7 @@
 
 
   
-New 
For_mula
+Math 
For_mula
 True
 True
 True
@@ -205,7 +205,7 @@
 
 
   
-New 
D_atabase
+Base 
D_atabase
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cppu/util

[Herbert Dürr]

 cppu/util/uno_purpenvhelpers5abi.map |   30 ++
 1 file changed, 30 insertions(+)

New commits:
commit c68012e7d7544126c6b674f3deebd2f33ed7bb2d
Author: Herbert Dürr 
Date:   Thu Dec 12 10:08:52 2013 +

#i122195# provide a uno_purpenvhelpers map file for the OSX 64bit UNO bridge

almost a verbatim copy of the uno_purpenvhelpers map for generic gcc3 
targets
which works because the mangled symbol names match for the OSX 64bit target.

diff --git a/cppu/util/uno_purpenvhelpers5abi.map 
b/cppu/util/uno_purpenvhelpers5abi.map
new file mode 100644
index 000..3c6f21f
--- /dev/null
+++ b/cppu/util/uno_purpenvhelpers5abi.map
@@ -0,0 +1,30 @@
+###
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+###
+
+UDK_3_0_0 {
+global:
+ 
_ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
+
_ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
+
+local:
+*;
+};
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 vcl/unx/kde4/KDESalDisplay.cxx |   22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 8b4775458600dc2a2e8eb17e0bade35221c6b2ea
Author: Jan-Marek Glogowski 
Date:   Thu Nov 21 12:40:57 2013 +0100

fdo#67011: Run Display::Yield through KDEXLib::Yield.

Drag'n'Drop is handled in a second thread, which tries to "yield
the display" while the main Qt thread probably is already
yielding. Both need the YieldMutex, which freezes the application
until the D'n'D thread times out.

Trying to yield the display throught the application yield
results in a recursive loop.

So this catches and breaks the recursion, but just inside the Qt
thread, so other processes can "yield on the display", instead
of simply disabling the Display::Yield.

Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
Reviewed-on: https://gerrit.libreoffice.org/6750
Tested-by: Jan-Marek Glogowski 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 21440fc..ee330e7 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 SalKDEDisplay* SalKDEDisplay::selfptr = NULL;
 
 SalKDEDisplay::SalKDEDisplay( Display* pDisp )
@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay()
 
 void SalKDEDisplay::Yield()
 {
-if( DispatchInternalEvent() )
+// We yield the display throught the main Qt thread.
+// Actually this Yield may call the Display::Yield, which results in an
+// unlimited cycle.
+static bool break_cyclic_yield_recursion = false;
+bool is_qt_gui_thread = ( qApp->thread() == QThread::currentThread() );
+
+if( DispatchInternalEvent() || break_cyclic_yield_recursion )
 return;
 
+if( is_qt_gui_thread )
+break_cyclic_yield_recursion = true;
+
 DBG_ASSERT( 
static_cast(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId()
 ==
 osl::Thread::getCurrentIdentifier(),
 "will crash soon since solar mutex not locked in 
SalKDEDisplay::Yield" );
 
-XEvent event;
-XNextEvent( pDisp_, &event );
-if( checkDirectInputEvent( &event ))
-return;
-qApp->x11ProcessEvent( &event );
+static_cast(GetXLib())->Yield( true, false );
+
+if( is_qt_gui_thread )
+break_cyclic_yield_recursion = false;
 }
 
 // HACK: When using Qt event loop, input methods (japanese, etc.) will get 
broken because
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 editeng/source/editeng/eehtml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1114d9275950b69c1667435793bac7d77147476b
Author: Noel Grandin 
Date:   Thu Dec 12 13:31:40 2013 +0200

fix OUString simplify

In my commit fb847101519ad74c02183672c04ebf1d700aae83
"simplify - use OUString::startsWith where possible"

I incorrectly converted
 if ( !aURL.isEmpty() && ( aURL[ 0 ] != '#' ) )
to
 if ( aURL.startsWith("#") )

Change-Id: I7fa3a814e13724dc65821e09c03db898b92626ec

diff --git a/editeng/source/editeng/eehtml.cxx 
b/editeng/source/editeng/eehtml.cxx
index f09f9fd..d44c937 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -783,7 +783,7 @@ void EditHTMLParser::AnchorStart()
 if ( !aRef.isEmpty() )
 {
 OUString aURL = aRef;
-if ( aURL.startsWith("#") )
+if ( !aURL.isEmpty() && ( aURL[ 0 ] != '#' ) )
 {
 INetURLObject aTargetURL;
 INetURLObject aRootURL( aBaseURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: l10n process, en_US version, Help files

[khagaroth]

On Thu, Dec 12, 2013 at 11:40 AM, Khaled Hosny wrote:

> On Thu, Dec 12, 2013 at 11:18:59AM +0100, Andras Timar wrote:
> > On 2013.12.11. 17:19, Sophie wrote:
> > > - but that doesn't solve the several typos that already exist and that
> > > are overlooked by the l10n team (e.g in the Character > Font Effect
> > > dialog, there is Overline _c_olor and Underline _C_olor and this is the
> > > same for several dialogs)
> >
> > If it's overlooked by 60+ active translation teams + beta testers, then
> > probably it is not that much important. We can live with it. :)
>
> If the localizers don’t test the actual UI (which I doubt they do, given
> how long it takes to build LibreOffice) and just translate the strings
> in Pootle, they are very unlikely to spot such inconsistencies, no
> matter how many teams we have.
>
> Regards,
> Khaled
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>


And frankly, most translators don't bother reporting such errors (or any
errors at all). There is enough work with the translation itself and Pootle
not having any way to report errors (though that function is already being
worked on) doesn't help.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan Holesovsky]

 sfx2/uiconfig/ui/startcenter.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3c65cee396d8e761113272daa47d8df17fa5d820
Author: Jan Holesovsky 
Date:   Thu Dec 12 12:20:58 2013 +0100

startcenter: Update the button descriptions to the UX team decision.

Change-Id: Ie0813e8faa1cc97aa77fc89659b829226d0e5736

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 42e093f..adbad28 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -105,7 +105,7 @@
 
 
   
-New 
_Document
+Writer 
_Document
 True
 True
 True
@@ -125,7 +125,7 @@
 
 
   
-New 
_Spreadsheet
+Calc 
_Spreadsheet
 True
 True
 True
@@ -145,7 +145,7 @@
 
 
   
-New 
_Presentation
+Impress 
_Presentation
 True
 True
 True
@@ -165,7 +165,7 @@
 
 
   
-New 
D_rawing
+Draw 
D_rawing
 True
 True
 True
@@ -185,7 +185,7 @@
 
 
   
-New 
For_mula
+Math 
For_mula
 True
 True
 True
@@ -205,7 +205,7 @@
 
 
   
-New 
D_atabase
+Base 
D_atabase
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - configmgr/source desktop/source editeng/source i18npool/source oox/source sal/qa sc/source sd/source sfx2/source starmath/source stoc/source svl/source tool

[Noel Grandin]

 configmgr/source/access.cxx   |2 
 desktop/source/deployment/misc/dp_misc.cxx|2 
 desktop/source/deployment/registry/sfwk/dp_sfwk.cxx   |2 
 editeng/source/editeng/eehtml.cxx |5 
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   16 -
 i18npool/source/localedata/LocaleNode.cxx |2 
 oox/source/core/filterbase.cxx|2 
 oox/source/dump/dumperbase.cxx|6 
 oox/source/vml/vmlinputstream.cxx |2 
 sal/qa/osl/security/osl_Security.cxx  |2 
 sc/source/core/data/dputil.cxx|4 
 sc/source/core/tool/compiler.cxx  |6 
 sc/source/core/tool/token.cxx |4 
 sc/source/filter/oox/worksheetbuffer.cxx  |2 
 sc/source/filter/oox/worksheethelper.cxx  |2 
 sc/source/ui/formdlg/formula.cxx  |2 
 sc/source/ui/unoobj/cellsuno.cxx  |2 
 sc/source/ui/view/viewdata.cxx|2 
 sd/source/core/anminfo.cxx|2 
 sd/source/ui/docshell/docshel4.cxx|4 
 sd/source/ui/unoidl/unomodel.cxx  |2 
 sfx2/source/appl/appopen.cxx  |2 
 sfx2/source/bastyp/fltfnc.cxx |2 
 sfx2/source/dialog/splitwin.cxx   |2 
 sfx2/source/doc/sfxbasemodel.cxx  |2 
 starmath/source/parse.cxx |2 
 stoc/source/uriproc/UriReferenceFactory.cxx   |4 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |2 
 svl/source/misc/urihelper.cxx |2 
 toolkit/source/awt/vclxwindows.cxx|2 
 tools/source/fsys/urlobj.cxx  |  127 
--
 ucb/source/regexp/regexp.cxx  |2 
 ucb/source/ucp/ext/ucpext_datasupplier.cxx|2 
 vcl/unx/generic/printer/ppdparser.cxx |2 
 34 files changed, 111 insertions(+), 115 deletions(-)

New commits:
commit 80612512fe3d681f13b794e84e30072ba149b698
Author: Noel Grandin 
Date:   Tue Dec 10 09:26:03 2013 +0200

remove unnecessary casts

It is no longer necessary to cast to sal_Unicode when calling
OUStringBuffer::append

Change-Id: Iab3d1e12eef472cfe11f1d0d1969ca404091dd7d

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index c9ba6b2..43e5b85 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -301,7 +301,7 @@ OUString toRoman( sal_Int32 n )
 
 OUStringBuffer sTmp;
 while(nOver1000--)
-sTmp.append(sal_Unicode(*coRomanArr));
+sTmp.append(*coRomanArr);
 
 while( nMask )
 {
@@ -312,17 +312,17 @@ OUString toRoman( sal_Int32 n )
 if( 5 < nZahl )
 {
 if( nZahl < 9 )
-sTmp.append(sal_Unicode(*(cRomanStr-1)));
+sTmp.append(*(cRomanStr-1));
 ++nDiff;
 nZahl -= 5;
 }
 switch( nZahl )
 {
-case 3: sTmp.append(sal_Unicode(*cRomanStr));   //no break!
-case 2: sTmp.append(sal_Unicode(*cRomanStr));   //no break!
-case 1: sTmp.append(sal_Unicode(*cRomanStr));   break;
-case 4: 
sTmp.append(sal_Unicode(*cRomanStr)).append(sal_Unicode(*(cRomanStr-nDiff))); 
break;
-case 5: sTmp.append(sal_Unicode(*(cRomanStr-nDiff)));   break;
+case 3: sTmp.append(*cRomanStr);   //no break!
+case 2: sTmp.append(*cRomanStr);   //no break!
+case 1: sTmp.append(*cRomanStr);   break;
+case 4: sTmp.append(*cRomanStr).append(*(cRomanStr-nDiff)); break;
+case 5: sTmp.append(*(cRomanStr-nDiff));   break;
 }
 
 nMask /= 10;// to the next decade
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index e21b2a8..14b8639 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -47,7 +47,7 @@ void appendDateStr(O

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

[Miklos Vajna]

 oox/source/token/tokens.txt  |1 +
 sw/source/filter/ww8/docxattributeoutput.cxx |7 +--
 sw/source/filter/ww8/docxexport.cxx  |1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1957303363ea9bd308b5781da09beaa09df7420c
Author: Miklos Vajna 
Date:   Thu Dec 12 11:48:29 2013 +0100

DOCX: when writing a group shape, require wpg

Change-Id: I046c778cd998582446e96ac1e55f3e2da1e61081

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b30604d..f4aefbb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -76,6 +76,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3433,8 +3434,9 @@ void DocxAttributeOutput::WriteDMLDrawing( const 
SdrObject* pSdrObject, const Sw
 m_pSerializer->startElementNS( XML_a, XML_graphic,
 FSNS( XML_xmlns, XML_a ), 
"http://schemas.openxmlformats.org/drawingml/2006/main";,
 FSEND );
+const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, pSdrObject);
 m_pSerializer->startElementNS( XML_a, XML_graphicData,
-XML_uri, 
"http://schemas.microsoft.com/office/word/2010/wordprocessingShape";,
+XML_uri, (pObjGroup ? 
"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"; : 
"http://schemas.microsoft.com/office/word/2010/wordprocessingShape";),
 FSEND );
 
 uno::Reference 
xShape(const_cast(pSdrObject)->getUnoShape(), uno::UNO_QUERY_THROW);
@@ -3450,8 +3452,9 @@ void DocxAttributeOutput::WriteDMLAndVMLDrawing(const 
SdrObject* sdrObj, const S
 {
 m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, FSEND);
 
+const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj);
 m_pSerializer->startElementNS(XML_mc, XML_Choice,
-XML_Requires, "wps",
+XML_Requires, (pObjGroup ? "wpg" : "wps"),
 FSEND);
 WriteDMLDrawing(sdrObj, &rFrmFmt);
 m_pSerializer->endElementNS(XML_mc, XML_Choice);
commit ae6b44c32582d40cd63e7b475cb76047aea49e65
Author: Miklos Vajna 
Date:   Thu Dec 12 11:38:47 2013 +0100

DOCX export: declare wpg namespace

Change-Id: If204d95142826d4cc194aed8a97c68a121187b8a

diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 648162e..fbdd2fc 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5663,6 +5663,7 @@ wrapTopAndBottom
 wrapTrailSpaces
 wrapcoords
 writeProtection
+wpg
 wps
 wsp
 wsDr
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 17cf70f..35383d4 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1058,6 +1058,7 @@ XFastAttributeListRef DocxExport::MainXmlNamespaces( 
FSHelperPtr serializer )
 pAttr->add( FSNS( XML_xmlns, XML_w10 ), 
"urn:schemas-microsoft-com:office:word" );
 pAttr->add( FSNS( XML_xmlns, XML_wp ), 
"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"; );
 pAttr->add( FSNS( XML_xmlns, XML_wps ), 
"http://schemas.microsoft.com/office/word/2010/wordprocessingShape"; );
+pAttr->add( FSNS( XML_xmlns, XML_wpg ), 
"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"; );
 pAttr->add( FSNS( XML_xmlns, XML_mc ), 
"http://schemas.openxmlformats.org/markup-compatibility/2006"; );
 return XFastAttributeListRef( pAttr );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/unoidl/unopage.cxx |6 +++---
 svx/source/unodraw/unoprov.cxx  |   12 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 7b3c5cb12e91ce2a88b232c099366e7d1f633e7e
Author: Stephan Bergmann 
Date:   Thu Dec 12 11:58:59 2013 +0100

Fix C++03 digraphs

Change-Id: I456469c27b60290ad8280fe12fcb82958e1a6c85

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index c285a6a..6a0e9d1 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -147,7 +147,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( 
sal_Bool bImpress, PageKin
 { OUString("TransitionFadeColor"),  WID_TRANSITION_FADE_COLOR, 
::getCppuType((const sal_Int32*)0), 0,  0},
 { OUString("TransitionDuration"),   WID_TRANSITION_DURATION, 
::getCppuType((const double*)0),  0,  0},
 { OUString("LoopSound"),WID_LOOP_SOUND, 
::getBooleanCppuType(),0, 0},
-{ OUString("NavigationOrder"),  WID_NAVORDER, 
cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0,  0},
+{ OUString("NavigationOrder"),  WID_NAVORDER, 
cppu::UnoType::get(),0,  0},
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
 
@@ -174,7 +174,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( 
sal_Bool bImpress, PageKin
 { OUString("IsDateTimeFixed"),  WID_PAGE_DATETIMEFIXED, 
::getBooleanCppuType(),0, 0},   
  \
 { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, 
::getCppuType((const OUString*)0),  0,  0}, 
   \
 { OUString("DateTimeFormat"),   WID_PAGE_DATETIMEFORMAT, 
::getCppuType((const sal_Int32*)0),   0,  0},   
 \
-{ OUString("NavigationOrder"),  WID_NAVORDER, 
cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0,  0}, 
   \
+{ OUString("NavigationOrder"),  WID_NAVORDER, 
cppu::UnoType::get(),0,  0},  
  \
 { OUString(), 0, css::uno::Type(), 0, 0 }
 
 static const SfxItemPropertyMapEntry 
aDrawPageNotesHandoutPropertyMap_Impl[] =
@@ -204,7 +204,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( 
sal_Bool bImpress, PageKin
 { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, 
::getCppuType((const Reference< ::com::sun::star::container::XNameContainer 
>*)0)  , 0, 0},  \
 { OUString(sUNO_Prop_BookmarkURL),  WID_PAGE_BOOKMARK,  
::getCppuType((const OUString*)0), 0,  0},  
   \
 { OUString("IsBackgroundDark"), WID_PAGE_ISDARK,
::getBooleanCppuType(),
beans::PropertyAttribute::READONLY, 0}, 
\
-{ OUString("NavigationOrder"),  WID_NAVORDER, 
cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0,  0}, 
\
+{ OUString("NavigationOrder"),  WID_NAVORDER, 
cppu::UnoType::get(),0,  0},  
   \
 { OUString(), 0, css::uno::Type(), 0, 0 }
 
 static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 0ec21af..4972b49 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -245,7 +245,7 @@ SfxItemPropertyMapEntry const * 
ImplGetSvxGraphicObjectPropertyMap()
 { OUString("IsMirrored"), OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 
0, 0},
 { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, 
::getCppuType((const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >*)0)  ,0, 0},
 { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, 
::getCppuType((const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >*)0)  ,0, 0},
-{ OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, 
cppu::UnoType<::com::sun::star::io::XInputStream>::get(), 
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+{ OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, 
cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
 
@@ -726,7 +726,7 @@ SfxItemPropertyMapEntry const * 
ImplGetSvxMediaShapePropertyMap()
 // #i

[Libreoffice-commits] core.git: 4 commits - include/comphelper sd/inc

[Stephan Bergmann]

 include/comphelper/PropertyInfoHash.hxx |   14 +---
 include/comphelper/SettingsHelper.hxx   |   52 +++-
 sd/inc/CustomAnimationPreset.hxx|4 ++
 3 files changed, 24 insertions(+), 46 deletions(-)

New commits:
commit 7956ceaf225b4459070e68e6c743396d998b588d
Author: Stephan Bergmann 
Date:   Thu Dec 12 11:47:47 2013 +0100

Missing include

Change-Id: I7c8ffab5cef828980faf1bb8768dde9d79a0258b

diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 1d8b98d..c380ba6 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX
 #define INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
commit 2b0063dd49b298153233052a8628eeb8260a2069
Author: Stephan Bergmann 
Date:   Thu Dec 12 11:36:53 2013 +0100

Remove unnecessary comphelper::eqFunc

Change-Id: I94d5e3fff2d1e039051bddfedcedfac04487529a

diff --git a/include/comphelper/PropertyInfoHash.hxx 
b/include/comphelper/PropertyInfoHash.hxx
index 6796977..25a1e8d 100644
--- a/include/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
@@ -42,24 +42,14 @@ namespace comphelper
 : mnMapId ( nMapId )
 , mpInfo ( pInfo ) {}
 };
-struct eqFunc
-{
-sal_Bool operator()( const OUString &r1,
- const OUString &r2) const
-{
-return r1 == r2;
-}
-};
 }
 
 typedef boost::unordered_map < OUString,
 ::comphelper::PropertyInfo*,
-OUStringHash,
-::comphelper::eqFunc > PropertyInfoHash;
+OUStringHash > PropertyInfoHash;
 typedef boost::unordered_map < OUString,
 ::comphelper::PropertyData*,
-OUStringHash,
-::comphelper::eqFunc > PropertyDataHash;
+OUStringHash > PropertyDataHash;
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 21f901f9fcb8d550fec37ca9caa9645aaae73aa7
Author: Stephan Bergmann 
Date:   Thu Dec 12 11:27:19 2013 +0100

Fold SettingsHelperNoState, ChainableHelperNoState

Change-Id: I94bd49e6460855c58cc9fe2d1c7b1f5f7e6e589a

diff --git a/include/comphelper/SettingsHelper.hxx 
b/include/comphelper/SettingsHelper.hxx
index 13cfd64..20cca7a 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -22,14 +22,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
 namespace comphelper
 {
-class ChainablePropertySet;
-class ChainablePropertySetInfo;
-
 typedef  cppu::WeakImplHelper3
 <
 ::com::sun::star::beans::XPropertySet,
@@ -37,15 +35,15 @@ namespace comphelper
 ::com::sun::star::lang::XServiceInfo
 >
 HelperBaseNoState;
-template < class ComphelperBase, class ComphelperBaseInfo > class 
SettingsHelperNoState :
+class ChainableHelperNoState :
 public HelperBaseNoState,
-public ComphelperBase
+public ChainablePropertySet
 {
 public:
-SettingsHelperNoState ( ComphelperBaseInfo *pInfo, SolarMutex* pMutex 
= NULL)
-: ComphelperBase ( pInfo, pMutex )
+ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* 
pMutex = NULL)
+: ChainablePropertySet ( pInfo, pMutex )
 {}
-virtual ~SettingsHelperNoState () throw( ) {}
+virtual ~ChainableHelperNoState () throw( ) {}
 com::sun::star::uno::Any SAL_CALL queryInterface( const 
com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException)
 { return HelperBaseNoState::queryInterface( aType ); }
 void SAL_CALL acquire(  ) throw ()
@@ -56,49 +54,43 @@ namespace comphelper
 // XPropertySet
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
 throw(::com::sun::star::uno::RuntimeException)
-{ return ComphelperBase::getPropertySetInfo(); }
+{ return ChainablePropertySet::getPropertySetInfo(); }
 virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 
const ::com::sun::star::uno::Any& aValue )
 throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::beans::PropertyVetoException, 
::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException)
-{ ComphelperBase::setPropertyValue ( aPropertyName, aValue ); }
+{ ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); }
 virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const 
OUString& PropertyName )
 throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::

Re: l10n process, en_US version, Help files

[Khaled Hosny]

On Thu, Dec 12, 2013 at 11:18:59AM +0100, Andras Timar wrote:
> On 2013.12.11. 17:19, Sophie wrote:
> > - but that doesn't solve the several typos that already exist and that
> > are overlooked by the l10n team (e.g in the Character > Font Effect
> > dialog, there is Overline _c_olor and Underline _C_olor and this is the
> > same for several dialogs)
> 
> If it's overlooked by 60+ active translation teams + beta testers, then
> probably it is not that much important. We can live with it. :)

If the localizers don’t test the actual UI (which I doubt they do, given
how long it takes to build LibreOffice) and just translate the strings
in Pootle, they are very unlikely to spot such inconsistencies, no
matter how many teams we have.

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

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

[Jan Holesovsky]

 svx/source/table/cell.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a85afa5140782301d5ee1382d35a04d2155084b
Author: Jan Holesovsky 
Date:   Thu Dec 12 11:25:17 2013 +0100

<: could be a digram - fix tinderbox.

Change-Id: I128d6912ce556cfc17c38ed51267fc965c384fea

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index aea7ea3..8685e7a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -72,7 +72,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
 {
 FILL_PROPERTIES
 //  { "HasLevels",OWN_ATTR_HASLEVELS, 
::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,   
   0},
-{ OUString("Style"),OWN_ATTR_STYLE,
 cppu::UnoType<::com::sun::star::style::XStyle>::get(), 
   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("Style"),OWN_ATTR_STYLE,
 cppu::UnoType< ::com::sun::star::style::XStyle >::get(),   
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString(UNO_NAME_TEXT_WRITINGMODE),  SDRATTR_TEXTDIRECTION, 
 ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ), 
0,  0},
 { OUString(UNO_NAME_TEXT_HORZADJUST),   SDRATTR_TEXT_HORZADJUST,   
 ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  
0,  0}, \
 { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, 
 ::getCppuType((const sal_Int32*)0),0,  SFX_METRIC_ITEM}, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: l10n process, en_US version, Help files

[Andras Timar]

On 2013.12.11. 17:19, Sophie wrote:
> *About the en_US overall quality
> - the process to rely on the l10n team to fix the en_US version is ok,
> even if it gives us extra work to understand what is meant before we
> realized it's a mistake. So it's also error prone for all the translations.

Discissions in this mailing list usually helped to clarify the meaning.
Failing that, git log / git blame -- find out who the author was and ask
him or her. Translators are welcome to test new features, sometimes it
is obvious what a function does, despite the confusing UI text.

> - but that doesn't solve the several typos that already exist and that
> are overlooked by the l10n team (e.g in the Character > Font Effect
> dialog, there is Overline _c_olor and Underline _C_olor and this is the
> same for several dialogs)

If it's overlooked by 60+ active translation teams + beta testers, then
probably it is not that much important. We can live with it. :)

> * About the help files
> - I always wonder why there is a Help button on a new dialog when no
> help file is appended ;)

Probably it is prescribed by some rule, e.g. Gnome HIG, that every
dialog must have a Help button. So dialog creator application puts it
there, and the developer leaves it there thinking that someone may write
a help page for it later.

> - more and more functions are undocumented or their help is obsolete. I
> always think that an undocumented function is lost for the user and a
> sad thing for a developer because his function will not be used as expected.

As I wrote above, many functions/new dialogs are self-describing. I
hated to translate Gnome help 10 years ago, which was full of sentences
like this: "Click on Close button to close the dialog." So we need to
limit the scope here. It would be good, if you could give examples, what
needs further clarification in help.

> May be, but I don't know how heavy it would be for developers, the
> solution would be to open an issue with a special tag like NF for each
> new feature, with three lines about what the feature is supposed to
> do. Searching on BZ with this special tag would allow to involve more
> people in the loop to test it and document it.

The problem is that you cannot enforce any rule to developers. You can
write a mail to the list, newcomers will not see it. You can write wiki
pages, some people will not read it. You can ask people individually,
some will ignore you. But I have an idea. What about prolonging the
string freeze date of help until the first bug fix release? That would
give developers/help authors/translators more time to concentrate on
documentation of new features. So we could say, with x.y.0 you get all
new features, and x.y.1 will come with updated help.

Best regards,
Andras

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

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

[Andras Timar]

 cui/uiconfig/ui/effectspage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 64768111078222b36a0fd3d0d666ee3b14634c1b
Author: Andras Timar 
Date:   Thu Dec 12 11:11:05 2013 +0100

fix sentence case: Underline Color -> Underline color

Change-Id: I2935e5d8e94a9d016a02ea1e1b3c316ee4d53c9f

diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 12676c2..dcbfe4a 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -327,7 +327,7 @@
 True
 False
 0
-Underline 
Color
+Underline 
color
   
   
 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: locking foo ...

[Michael Meeks]

On Wed, 2013-12-11 at 22:45 +0100, Michael Stahl wrote:
> ... but alas now i see it won't help much - when creating a window there
> is the same problem with WinSalFrame::CreateFrame using SendMessage with
> SAL_MSG_CREATEFRAME (to get the Win32 window created on the main
> thread), and in that case it's of course hopeless to do anything
> asynchronously.

My ultimate question would be: why use CoCreateInstance to create any
instance and create this problem ? :-) Ultimately we can create our own
COM objects just nicely - AFAIK everything implementing IUnknown is
that, and then hand them out ?

Surely that then avoids all of these issues ?

ATB,

Michael.

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

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - binaryurp/source bridges/source configmgr/source

[Herbert Dürr]

 binaryurp/source/cache.hxx|  125 +++---
 binaryurp/source/lessoperators.cxx|   45 +-
 binaryurp/source/lessoperators.hxx|4 
 bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx |2 
 bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx  |2 
 configmgr/source/modifications.hxx|7 -
 6 files changed, 96 insertions(+), 89 deletions(-)

New commits:
commit b220aecac531570269078b602c80e56d41d05c51
Author: Herbert Dürr 
Date:   Thu Dec 12 09:48:15 2013 +

#i122208# force boost *map for configmgr's Modifications Node structure

The C++ standards allows that the instantiation of incomplete types fails. 
The
Node structure had this problem because it contained a map of Node 
structures
itself. Boost containers explicitly allow recursive types so they solve 
that.

diff --git a/configmgr/source/modifications.hxx 
b/configmgr/source/modifications.hxx
index f532af9..1aa0d24 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -26,20 +26,19 @@
 
 #include "sal/config.h"
 
-#include 
+#include  // using the boost container because it 
explicitly allows recursive types
 
 #include "boost/noncopyable.hpp"
 
 #include "path.hxx"
-
-namespace rtl { class OUString; }
+#include "rtl/ustring.hxx"
 
 namespace configmgr {
 
 class Modifications: private boost::noncopyable {
 public:
 struct Node {
-typedef std::map< rtl::OUString, Node > Children;
+typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > 
Children;
 
 Children children;
 };
commit b908fff1715f34373212c10f77244bf88574db10
Author: Herbert Dürr 
Date:   Thu Dec 12 09:23:56 2013 +

#i122195# fix leak when handling exceptions in the UNO bridge for OSX 64bit

diff --git a/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx 
b/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
index 3ffaa4b..96a65fc 100644
--- a/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
@@ -213,8 +213,6 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
 static void deleteException( void * pExc )
 {
 __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-if( !header->exceptionType) // TODO: remove this when getRTTI() always 
returns non-NULL
-return; // NOTE: leak for now
 typelib_TypeDescription * pTD = 0;
 OUString unoName( toUNOname( header->exceptionType->name() ) );
 ::typelib_typedescription_getByName( &pTD, unoName.pData );
diff --git a/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx 
b/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
index bcda4d6..279b275 100644
--- a/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
@@ -40,7 +40,7 @@ struct _Unwind_Exception
 void * exception_cleanup;
 uintptr_t private_1;
 uintptr_t private_2;
-} __attribute__((__aligned__));
+};
 
 struct __cxa_exception
 {
commit 8c1f2d28eb4ec226a37eac0f96dc079c9974771f
Author: Herbert Dürr 
Date:   Thu Dec 12 08:50:55 2013 +

#i122208# replace the binaryurp cache for improved C++ compatibility

The C++ standards allows that the instantiation of incomplete types fails. 
The
Map::iterator in binaryurp Cache's Entry members had this problem. This 
rewrite
makes the code work with all compliant C++ compilers/STLs such as 
clang/libc++.
A Cache variant using an unordered_map is also provided and may be faster.
An interesting alternative would be to use boost's multi_index_container.

diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 308edba..135a61d 100755
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -27,7 +27,12 @@
 #include "sal/config.h"
 
 #include 
-#include 
+#include 
+#ifdef USE_UNORDERED_MAP
+#include 
+#else
+#include 
+#endif
 
 #include "boost/noncopyable.hpp"
 #include "osl/diagnose.h"
@@ -41,90 +46,66 @@ enum { size = 256, ignore = 0x };
 
 }
 
-template< typename T > class Cache: private boost::noncopyable {
+template< typename T > class Cache : private boost::noncopyable {
 public:
+typedef sal_uInt16 IdxType;
+
 explicit Cache(std::size_t size):
-size_(size), first_(map_.end()), last_(map_.end())
+size_(size)
 {
 OSL_ASSERT(size < cache::ignore);
 }
 
-sal_uInt16 add(T const & content, bool * found) {
-OSL_ASSERT(found != 0);
-typename Map::iterator i(map_.find(content));
-*found = i != map_.end();
-if (i == map_.end()) {
-typename Map::size_type n = map_.size();
-if (n < size_) {
-i =
-(map_.insert(
-typename Map::value_type(
-content,
-  

libebook filter sniffing cost ...

[Michael Meeks]

Hi David & Fridrich,

Just doing some load time profiling, and I notice that the libebook
filter chews just under 3% of the load-time of (quite a large) XLSX
file ;-)

It seems the filter / sniffing / detection code there is particularly
problematic. I wonder if we need something like this:

git log -u -1 53138c9968e28a25a8cd6d2b5e3d31cbb3257852

To avoid thrashing the XStream read function ? we do 52k 'read' calls
on the XStream which is really not a fast interface to use for small
reads.

http://people.freedesktop.org/~michael/sheet-profile.txt

Has the profile there; compare EBookImportFilter::detect to
framework::LoadEnv::startLoading.

For thumbnailing we had a similar problem with reading strings improved
but not fixed by:

commit d67cd21033877c9c09d9cc4f14c2c4658e973f57
Author: Mathieu Parent 
Date:   Mon Oct 14 22:23:05 2013 +0100

fdo#56007 - Read more bytes on Zip read (for thumbnails)

Particularly on remote file-systems we'd do many remote calls here -
which is really not ideal.

I've pushed a small patch to avoid some of the more silly reallocing
calling of:

template< class E >
inline void Sequence< E >::realloc( sal_Int32 nSize )
{
const Type & rType = ::cppu::getTypeFavourUnsigned( this );
sal_Bool success =
::uno_type_sequence_realloc(
&_pSequence, rType.getTypeLibType(), nSize,
(uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release );
if (!success)
throw ::std::bad_alloc();
}

Un-conditionally even when the sequence is the same length seems
particularly silly ;-) [ I assume that the WPXSvInputStream by keeping
the sequence around should save that allocation & be quite efficient
through a blizzard of identical sized reads anyhow ;-].

It makes me wonder whether the above should have a fast-past for
pointless reallocs to the same size though.

Thoughts appreciated though; is there some ordering of sniffing such
that we can prioritize common formats over less common ones ? and has
perhaps libebook got into that stack too high up ?

ATB,

Michael.

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

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

CppUnit CMake build system

[Bernhard Seßler]

Hi @cppunit developers / users,

I'm currently working on replacing the autoconf build system and the MSVC
solutions used by cppunit with a CMake based build system. Currently it
successfully builds the libraries on Windows and Linux - using the GCC, MSVC and
Borland C++ compilers. I started this "project" in order to be able to _easily_
build cppunit on different platforms with a variety of compilers, as my company
is using it for testing different projects.

All I wanted to know know now is whether there's official interest in getting
this (IMHO quite drastic) change mainline. If so, I would clean up my CMake
branch (and the work I've done so far) and post patches on this ML. Please also
that in its current state merely the library itself is built and installed, I've
not yet started working on the examples and platform specific test runners. But
it's on my roadmap to integrate these, too. The next step would therefore be to
get the msvc6 related stuff working as well as porting the qttestrunner module
to Qt4 and Qt5. (it's still based on Qt3).

Any feedback on this would be appreciated.

-- 
Mit freundlichen Grüßen / Kind Regards,

Bernhard Seßler, B.A.
R&D

Corscience GmbH & Co. KG
Henkestr. 91
D-91052 Erlangen
Germany

Tel: +49 9131 977986-516
Fax: +49 9131 977986-445
e-mail: bernhard.sess...@corscience.de 
Internet: www.corscience.de 

--
Corscience GmbH & Co. KG
Sitz der Gesellschaft/Place of business: Erlangen
Amtsgericht/Local court: Fürth
Handelsregisternummer/Commercial Register No.: HRA 7510
Geschäftsführer/Managing director: Prof. Dr. Armin Bolz, Dipl.-Volksw. Marc 
Griefahn

CONFIDENTIALITY:
This e-mail and any attachments are confidential and may also be
privileged. If received in error, please do not disclose the contents to
anyone, but notify us immediately by return e-mail and delete this e-mail
and any attachments from your system. Thank you.

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

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

[Jan Holesovsky]

 cui/source/options/optaboutconfig.cxx |2 +-
 cui/uiconfig/ui/aboutconfigvaluedialog.ui |   10 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 0096575d2269e1d5931e18c10d26ab00bcabf495
Author: Jan Holesovsky 
Date:   Thu Dec 12 10:32:13 2013 +0100

About config: Make the value box dialog a bit nicer.

Change-Id: I5e25401b76458e712070bc76c86083bbd9ae2daa

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 56b945a..08cfbc5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -121,7 +121,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& 
rKeyEvent )
 
 Size CuiCustomMultilineEdit::GetOptimalSize() const
 {
-return LogicToPixel(Size(150,30),MAP_APPFONT);
+return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
 }
 
 Size CuiAboutConfigTabPage::GetOptimalSize() const
diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui 
b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
index 8c359d7..8995bd5 100644
--- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
+++ b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
@@ -1,6 +1,7 @@
 
 
   
+  
   
 False
 6
@@ -9,12 +10,12 @@
 
   
 False
+vertical
 12
 
   
 False
-vertical
-start
+end
 
   
 gtk-ok
@@ -72,6 +73,7 @@
 True
 False
 True
+True
 vertical
 6
 
@@ -79,7 +81,7 @@
 True
 False
 0
-Value
+Value:
   
   
 False
@@ -91,7 +93,7 @@
   
 True
 True
-True
+True
 char
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 cui/source/options/optaboutconfig.cxx  |2 +-
 cui/uiconfig/ui/aboutconfigvaluedialog.ui  |   10 ++
 extras/source/glade/libreoffice-catalog.xml.in |3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 7bf2f528ef22f50aa167ba57f2e25d4452977060
Author: Jan Holesovsky 
Date:   Thu Dec 12 10:32:13 2013 +0100

About config: Make the value box dialog a bit nicer.

Change-Id: I5e25401b76458e712070bc76c86083bbd9ae2daa

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 56b945a..08cfbc5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -121,7 +121,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& 
rKeyEvent )
 
 Size CuiCustomMultilineEdit::GetOptimalSize() const
 {
-return LogicToPixel(Size(150,30),MAP_APPFONT);
+return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
 }
 
 Size CuiAboutConfigTabPage::GetOptimalSize() const
diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui 
b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
index 8c359d7..8995bd5 100644
--- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
+++ b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
@@ -1,6 +1,7 @@
 
 
   
+  
   
 False
 6
@@ -9,12 +10,12 @@
 
   
 False
+vertical
 12
 
   
 False
-vertical
-start
+end
 
   
 gtk-ok
@@ -72,6 +73,7 @@
 True
 False
 True
+True
 vertical
 6
 
@@ -79,7 +81,7 @@
 True
 False
 0
-Value
+Value:
   
   
 False
@@ -91,7 +93,7 @@
   
 True
 True
-True
+True
 char
   
   
commit b3708761fbecda222af806a9606c63ab4e340c0c
Author: Jan Holesovsky 
Date:   Thu Dec 12 10:15:21 2013 +0100

Add CuiCustomMultilineEdit to the catalog.

Change-Id: I80cbd580e4fd59330a4f9b38dca5eb3fc0aec29a

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 7391791..157a34f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -278,6 +278,9 @@
 
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 include/oox/export/drawingml.hxx |   17 +-
 include/oox/export/shapes.hxx|2 -
 oox/source/export/drawingml.cxx  |   31 +++
 oox/source/export/shapes.cxx |4 +--
 oox/source/export/vmlexport.cxx  |2 +
 sw/source/filter/ww8/docxattributeoutput.cxx |2 -
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +-
 sw/source/filter/ww8/docxexport.cxx  |2 -
 8 files changed, 55 insertions(+), 8 deletions(-)

New commits:
commit 2440d0ba34d6cbc9eae6d2cb196a964840f084e4
Author: Miklos Vajna 
Date:   Thu Dec 12 10:24:10 2013 +0100

oox: allow a callback to be registered for shape text DML export

Change-Id: Ice4dea8da117f61d947ad14ebbfccae0d2ed94df

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index bba93cd..67feca1 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -53,6 +53,8 @@ namespace io {
 }
 }}}
 
+class OutlinerParaObject;
+
 namespace oox {
 namespace core {
 class XmlFilterBase;
@@ -60,6 +62,16 @@ namespace core {
 
 namespace drawingml {
 
+/// Interface to be implemented by the parent exporter that knows how to 
handle shape text.
+class OOX_DLLPUBLIC DMLTextExport
+{
+public:
+virtual void WriteOutliner(const OutlinerParaObject& rParaObj) = 0;
+protected:
+DMLTextExport() {}
+virtual ~DMLTextExport() {}
+};
+
 class OOX_DLLPUBLIC DrawingML {
 public:
 enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX };
@@ -69,6 +81,8 @@ private:
 
 /// To specify where write eg. the images to (like 'ppt', or 'word' - 
according to the OPC).
 DocumentType meDocumentType;
+/// Parent exporter, used for text callback.
+DMLTextExport* mpTextExport;
 
 protected:
 ::com::sun::star::uno::Any mAny;
@@ -87,7 +101,8 @@ protected:
 const char* GetRelationCompPrefix();
 
 public:
-DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* 
pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : meDocumentType( 
eDocumentType ), mpFS( pFS ), mpFB( pFB ) {}
+DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* 
pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* 
pTextExport = 0 )
+: meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( 
pFS ), mpFB( pFB ) {}
 void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
 ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; }
 ::oox::core::XmlFilterBase* GetFB() { return mpFB; }
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 750d74f..65fafc9 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -76,7 +76,7 @@ private:
 
 public:
 
-ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, 
ShapeHashMap* pShapeMap = NULL, ::oox::core::XmlFilterBase* pFB = NULL, 
DocumentType eDocumentType = DOCUMENT_PPTX );
+ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, 
ShapeHashMap* pShapeMap = NULL, ::oox::core::XmlFilterBase* pFB = NULL, 
DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 );
 virtual ~ShapeExport() {}
 
 static sal_Bool NonEmptyText( ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface > xIface );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5109309..e542df8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1345,6 +1346,36 @@ void DrawingML::WriteText( Reference< XInterface > 
rXIface, bool bBodyPr, bool b
 if( !enumeration.is() )
 return;
 
+SdrObject* pSdrObject = 
GetSdrObjectFromXShape(uno::Reference(rXIface, 
uno::UNO_QUERY_THROW));
+const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, pSdrObject);
+if (pTxtObj && mpTextExport)
+{
+const OutlinerParaObject* pParaObj = 0;
+bool bOwnParaObj = false;
+
+/*
+#i13885#
+When the object is actively being edited, that text is not set into
+the objects normal text object, but lives in a separate object.
+*/
+if (pTxtObj->IsTextEditActive())
+{
+pParaObj = pTxtObj->GetEditOutlinerParaObject();
+bOwnParaObj = true;
+}
+else
+pParaObj = pTxtObj->GetOutlinerParaObject();
+
+if (pParaObj)
+{
+// this is reached only in case some text is attached to the shape
+mpTextExport->WriteOutliner(*pParaObj);
+if (bOwnParaObj)
+delete pParaObj;
+}
+return;
+}
+
 while( enumeration->hasMoreElements() ) {
 Reference< XTextContent > paragraph;
 Any any ( enumeration->nextElement() );
diff --git a/oox/sour

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

[Stephan Bergmann]

 writerfilter/inc/pch/precompiled_writerfilter.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8e825e8fc9373f89c777092643c162226a2687e2
Author: Stephan Bergmann 
Date:   Thu Dec 12 10:22:54 2013 +0100

PCH fix

Change-Id: Ic1f84c257fbf7d88869ebb9f5ef206d438a768fc

diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx 
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 61ee415..5d5af7d 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -14,7 +14,6 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "doctok/resources.hxx"
 #include "ooxml/OOXMLFastTokens.hxx"
 #include 
 #include 
@@ -162,7 +161,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/quartz/ctlayout.cxx|   33 -
 vcl/source/gdi/outdev3.cxx |2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)

New commits:
commit fec3f8a8bab77ffb5345a401739114e0afaafcb2
Author: Tor Lillqvist 
Date:   Thu Dec 12 10:51:08 2013 +0200

Much better fix for the iOS text colour problem

Just use the same simple trick as for OS X in
OutputDevice::ImplLayout().

Thanks to Khaled Hosny for pointing out this.

This reverts commit 9aba69e8cc034526c53f6135a41fc62dc3c5dce3.

Change-Id: I27ba92ef8ebd1ebdb9eb74f670d8170649078881

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index b1ce5fb..56d8696 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -64,8 +64,6 @@ private:
 // mutable members since these details are all lazy initialized
 mutable double  mfCachedWidth;  // cached value of resulting 
typographical width
 
-mutable float mfAdjustedLineLength;
-
 // x-offset relative to layout origin
 // currently only used in RTL-layouts
 mutable double  mfBaseAdv;
@@ -77,7 +75,6 @@ CTLayout::CTLayout( const CoreTextStyle* pTextStyle )
 ,   mpCTLine( NULL )
 ,   mnCharCount( 0 )
 ,   mfCachedWidth( -1 )
-,   mfAdjustedLineLength( 0 )
 ,   mfBaseAdv( 0 )
 {
 }
@@ -162,7 +159,6 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 CFRelease( mpCTLine );
 mpCTLine = pNewCTLine;
 mfCachedWidth = nPixelWidth;
-mfAdjustedLineLength = nPixelWidth - fTrailingSpace;
 }
 
 // When drawing right aligned text, rounding errors in the position returned by
@@ -225,36 +221,7 @@ void CTLayout::DrawText( SalGraphics& rGraphics ) const
 }
 
 CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y 
);
-#ifdef MACOSX
-// For some reason on OS X the problem with text colour being out of sync
-// does not seem to occur.
 CTLineDraw( mpCTLine, rAquaGraphics.mrContext );
-#else
-if( CFDictionaryGetValue( mpTextStyle->GetStyleDict(), 
kCTFontAttributeName) )
-{
-// We did likely not know the correct intended colour of the
-// text in LayoutText(), so have to redo layout and justify.
-CFStringRef aCFText = CFAttributedStringGetString( mpAttrString );
-CFAttributedStringRef pAttrString = CFAttributedStringCreate( NULL, 
aCFText, mpTextStyle->GetStyleDict() );
-CTLineRef pCTLine = CTLineCreateWithAttributedString( pAttrString );
-CFRelease( pAttrString );
-if( mfAdjustedLineLength > 0 )
-{
-CTLineRef pNewCTLine = CTLineCreateJustifiedLine( pCTLine, 1.0, 
mfAdjustedLineLength );
-CFRelease( pCTLine );
-pCTLine = pNewCTLine;
-}
-CTLineDraw( pCTLine, rAquaGraphics.mrContext );
-CFRelease( pCTLine );
-}
-else
-{
-// FIXME: can the colour be wrong also the other way around:
-// some leftover wrong colour was used in LayoutText(), but
-// then here the style does not actually contain any colour?
-CTLineDraw( mpCTLine, rAquaGraphics.mrContext );
-}
-#endif
 #ifndef IOS
 // request an update of the changed window area
 if( rAquaGraphics.IsWindowGraphics() )
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index f3f5a77..7f09937 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5783,7 +5783,7 @@ SalLayout* OutputDevice::ImplLayout( const OUString& 
rOrigStr, sal_Int32 nMinInd
 
 ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs( aStr, nMinIndex, nLen, 
nPixelWidth, pDXArray );
 
-#ifdef MACOSX
+#if defined(MACOSX) || defined(IOS)
 // CoreText layouts are immutable and already contain the text color
 // so we need to provide the color already for the layout request
 // even if this layout will never be drawn
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 72125, which changed state.

Bug 72125 Summary: Expert config dialog takes too much time to come up
https://bugs.freedesktop.org/show_bug.cgi?id=72125

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Jan Holesovsky]

 svtools/source/contnr/svlbitm.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 3e6ce9e2102a923bd0dab0b791db3587c6e434f2
Author: Jan Holesovsky 
Date:   Thu Dec 12 09:55:35 2013 +0100

fdo#72125: GetTextWidth() can get very expensive.

Let's just count an approximate width using a cached value when we have too
many entries.

Change-Id: I2113887c477bc774dd00df538ec1a01f102f4726

diff --git a/svtools/source/contnr/svlbitm.cxx 
b/svtools/source/contnr/svlbitm.cxx
index ca3b342..e47baaa 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -247,7 +247,25 @@ void SvLBoxString::InitViewData(
 DBG_CHKTHIS(SvLBoxString,0);
 if( !pViewData )
 pViewData = pView->GetViewDataItem( pEntry, this );
-pViewData->maSize = Size(pView->GetTextWidth(maText), 
pView->GetTextHeight());
+
+// fdo#72125: GetTextWidth() can get very expensive; let's just count
+// an approximate width using a cached value when we have many entries
+long nTextWidth;
+if (pView->GetEntryCount() > 100)
+{
+static SvTreeListBox *pPreviousView = NULL;
+static float fApproximateCharWidth = 0.0;
+if (pPreviousView != pView)
+{
+pPreviousView = pView;
+fApproximateCharWidth = pView->approximate_char_width();
+}
+nTextWidth = maText.getLength() * fApproximateCharWidth;
+}
+else
+nTextWidth = pView->GetTextWidth(maText);
+
+pViewData->maSize = Size(nTextWidth, pView->GetTextHeight());
 }
 
 // ***
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 svtools/source/contnr/svlbitm.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 62ea355b2679073b8ee326df5793231996136da9
Author: Jan Holesovsky 
Date:   Thu Dec 12 09:55:35 2013 +0100

fdo#72125: GetTextWidth() can get very expensive.

Let's just count an approximate width using a cached value when we have too
many entries.

Change-Id: I2113887c477bc774dd00df538ec1a01f102f4726

diff --git a/svtools/source/contnr/svlbitm.cxx 
b/svtools/source/contnr/svlbitm.cxx
index ca3b342..e47baaa 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -247,7 +247,25 @@ void SvLBoxString::InitViewData(
 DBG_CHKTHIS(SvLBoxString,0);
 if( !pViewData )
 pViewData = pView->GetViewDataItem( pEntry, this );
-pViewData->maSize = Size(pView->GetTextWidth(maText), 
pView->GetTextHeight());
+
+// fdo#72125: GetTextWidth() can get very expensive; let's just count
+// an approximate width using a cached value when we have many entries
+long nTextWidth;
+if (pView->GetEntryCount() > 100)
+{
+static SvTreeListBox *pPreviousView = NULL;
+static float fApproximateCharWidth = 0.0;
+if (pPreviousView != pView)
+{
+pPreviousView = pView;
+fApproximateCharWidth = pView->approximate_char_width();
+}
+nTextWidth = maText.getLength() * fApproximateCharWidth;
+}
+else
+nTextWidth = pView->GetTextWidth(maText);
+
+pViewData->maSize = Size(nTextWidth, pView->GetTextHeight());
 }
 
 // ***
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 include/oox/export/drawingml.hxx |2 +-
 oox/source/export/drawingml.cxx  |   25 +
 oox/source/export/shapes.cxx |8 +---
 3 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit e74ddf429e39df01c751a3d2b452bf939fdc9a33
Author: Miklos Vajna 
Date:   Thu Dec 12 09:44:50 2013 +0100

oox: fix ShapeExport::WriteTextBox() for DOCX when shape has text

This is still not perfect (oox needs to call back to sw to do the real
export of the text), but content down to the wps:txbx element is now
fine.

Change-Id: I355178ab6492d65099397874ff50818fa1f35949

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index f5a89dd..bba93cd 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -118,7 +118,7 @@ public:
 void WriteTransformation( const Rectangle& rRectangle,
   sal_Int32 nXmlNamespace, sal_Bool bFlipH = false, sal_Bool 
bFlipV = false, sal_Int32 nRotation = 0 );
 
-void WriteText( ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface > rXIface );
+void WriteText( ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface > rXIface, bool bBodyPr = true, bool bText = 
true, sal_Int32 nXmlNamespace = 0);
 void WriteParagraph( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextContent > rParagraph );
 void WriteParagraphProperties( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextContent > rParagraph );
 void WriteParagraphNumbering( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7526741..5109309 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1242,7 +1242,7 @@ void DrawingML::WriteParagraph( Reference< XTextContent > 
rParagraph )
 mpFS->endElementNS( XML_a, XML_p );
 }
 
-void DrawingML::WriteText( Reference< XInterface > rXIface  )
+void DrawingML::WriteText( Reference< XInterface > rXIface, bool bBodyPr, bool 
bText, sal_Int32 nXmlNamespace )
 {
 Reference< XText > xXText( rXIface, UNO_QUERY );
 Reference< XPropertySet > rXPropSet( rXIface, UNO_QUERY );
@@ -1325,19 +1325,20 @@ void DrawingML::WriteText( Reference< XInterface > 
rXIface  )
 bHasWrap = sal_True;
 }
 
-mpFS->singleElementNS( XML_a, XML_bodyPr,
-   XML_wrap, bHasWrap && !bWrap ? "none" : NULL,
-   XML_lIns, (nLeft != DEFLRINS) ? IS( MM100toEMU( 
nLeft ) ) : NULL,
-   XML_rIns, (nRight != DEFLRINS) ? IS( MM100toEMU( 
nRight ) ) : NULL,
-   XML_tIns, (nTop != DEFTBINS) ? IS( MM100toEMU( nTop 
) ) : NULL,
-   XML_bIns, (nBottom != DEFTBINS) ? IS( MM100toEMU( 
nBottom ) ) : NULL,
-   XML_anchor, sVerticalAlignment,
-   XML_anchorCtr, bHorizontalCenter ? "1" : NULL,
-   XML_vert, sWritingMode,
-   FSEND );
+if (bBodyPr)
+mpFS->singleElementNS( (nXmlNamespace ? nXmlNamespace : XML_a), 
XML_bodyPr,
+   XML_wrap, bHasWrap && !bWrap ? "none" : NULL,
+   XML_lIns, (nLeft != DEFLRINS) ? IS( MM100toEMU( 
nLeft ) ) : NULL,
+   XML_rIns, (nRight != DEFLRINS) ? IS( 
MM100toEMU( nRight ) ) : NULL,
+   XML_tIns, (nTop != DEFTBINS) ? IS( MM100toEMU( 
nTop ) ) : NULL,
+   XML_bIns, (nBottom != DEFTBINS) ? IS( 
MM100toEMU( nBottom ) ) : NULL,
+   XML_anchor, sVerticalAlignment,
+   XML_anchorCtr, bHorizontalCenter ? "1" : NULL,
+   XML_vert, sWritingMode,
+   FSEND );
 
 Reference< XEnumerationAccess > access( xXText, UNO_QUERY );
-if( !access.is() )
+if( !access.is() || !bText )
 return;
 
 Reference< XEnumeration > enumeration( access->createEnumeration() );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 3616c4e..2c69810 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -738,9 +738,11 @@ ShapeExport& ShapeExport::WriteTextBox( Reference< 
XInterface > xIface, sal_Int3
 {
 FSHelperPtr pFS = GetFS();
 
-pFS->startElementNS( nXmlNamespace, XML_txBody, FSEND );
-WriteText( xIface );
-pFS->endElementNS( nXmlNamespace, XML_txBody );
+pFS->startElementNS( nXmlNamespace, (GetDocumentType() != 
DOCUMENT_DOCX ? XML_txBody : XML_txbx), FSEND );
+WriteText( xIface, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX), 
/*bText=*/true );
+pFS->endElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX 
? XML_txBody : XML_txbx) );
+if (Ge

Re: Fix the iOS coloured text problem

[Tor Lillqvist]

Ah! Thanks...

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