LibreOffice Gerrit News for core on 2014-04-30

2014-04-30 Thread gerrit
Moin!

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

 First time contributors doing great things! 
+ fdo#77725 LO not able to open/save file when exported multiple times.
  in https://gerrit.libreoffice.org/9112 from Ravindra Vidhate
  about module sw
+ fdo#78075 PDF Import: Use absolute positions in svg:d parameter
  in https://gerrit.libreoffice.org/9199 from Vort
  about module sdext
+ fdo#77727 PAGEBREAK In first paragraph was not rendered and exported.
  in https://gerrit.libreoffice.org/9191 from Sushil Shinde
  about module sw, writerfilter
 End of freshness 

+ move INetContentTypes::scan() to INetURLObject::scanContentType()
  in https://gerrit.libreoffice.org/9212 from Christina Roßmanith
  about module include, svl, tools
+ fdo#77812 :FILESAVE :DOCX : Extra Section Break gets added in file
  in https://gerrit.libreoffice.org/9200 from Pallavi Jadhav
  about module sw
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
  about module sw, writerfilter


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

+ upgrade to ICU 53.1, fdo#77071 related
  in https://gerrit.libreoffice.org/9204 from Eike Rathke
+ ignore legacy OpenOffice.org-*-version, when a LibreOffice-*-version is g
  in https://gerrit.libreoffice.org/8853 from Björn Michaelsen
+ set OOo reference version to 4.1 for incompatible MessageBox changes
  in https://gerrit.libreoffice.org/8852 from Björn Michaelsen
+ make signing depend on slowchecks being done
  in https://gerrit.libreoffice.org/9176 from Christian Lohmaier


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

None

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

+ move inettype.{hc}xx from svl to tools
  in https://gerrit.libreoffice.org/8926 from Christina Roßmanith
+ fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
  in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
+ new method INetURLObject::getData() for data urls
  in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
  in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
  in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
  in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
  in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
  in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
  in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
  in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in https://gerrit.libreoffice.org/8160 from Andras Timar
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate Paste Special entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
  in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
  in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt


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: ios/experimental

2014-04-30 Thread Tor Lillqvist
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c1addbb684236c8ed7b4864e481daf925c10bbd0
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 08:40:24 2014 +0300

ICU has been bumped to 53

Change-Id: I55cf9fa0364856169e9781f77c65bae047ce1ca8

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 986da7f..60c0e6e 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
 
 /* Begin PBXBuildFile section */
-   BE03BF9318F9A7CC00620DC7 /* icudt52l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */; };
+   BE03BF9318F9A7CC00620DC7 /* icudt53l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */; };
BE55B06D18D87CC600950228 /* DocumentTableViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = BE55B06C18D87CC600950228 /* 
DocumentTableViewController.m */; };
BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* 
Foundation.framework */; };
BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* 
CoreGraphics.framework */; };
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; 
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree 
= group; };
-   BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt52l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt52l.dat; sourceTree 
= group; };
+   BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt53l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt53l.dat; sourceTree 
= group; };
BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; 
sourceTree = group; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; 
path = ../../../vcl/source/app/brand.cxx; sourceTree = group; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; 
path = ../../../vcl/source/app/dbggui.cxx; sourceTree = group; };
@@ -1743,7 +1743,7 @@
BEEEFDFE1860A82C00FBDE67 /* unorc */,
BEEE02D01860ABB700FBDE67 /* ure */,
BEEEF9691860A25400FBDE67 /* test1.odt */,
-   BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */,
+   BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */,
);
name = Resources;
path = TiledLibreOffice;
@@ -1809,7 +1809,7 @@
BEEEFE041860A89100FBDE67 /* rc in Resources */,
BEEEFE051860A89100FBDE67 /* services.rdb in 
Resources */,
BEEE02D21860ABDB00FBDE67 /* share in Resources 
*/,
-   BE03BF9318F9A7CC00620DC7 /* icudt52l.dat in 
Resources */,
+   BE03BF9318F9A7CC00620DC7 /* icudt53l.dat in 
Resources */,
BEEEFE061860A89100FBDE67 /* types.rdb in 
Resources */,
BEEEFE071860A89100FBDE67 /* unorc in Resources 
*/,
BEEE02D31860ABDB00FBDE67 /* ure in Resources */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


RE: fdo77985 Calc function NETWORKDAYS()

2014-04-30 Thread Winfried Donkers
Hi Miguel (adding the mailing list again)

Yes, you are right, I messed up my message. Actually, I think it makes 
implementing full ODF-compliance easier :-)

Winfried


-Oorspronkelijk bericht-
Van: mari...@miguelangel.mobi [mailto:mari...@miguelangel.mobi] 
Verzonden: dinsdag 29 april 2014 16:24
Aan: Winfried Donkers
Onderwerp: NETWORKDAYS()

Hi Winfried,

maybe I'm wrong but reading in ODF definition I think the third parameter it's 
the same as excel. It's a fourth parameter for ODF about what weekdays are the 
workdays.

The optional 3rd parameter Holidays can be used to specify a list of dates to 
be treated as holidays. Note that this parameter can be omitted as an empty 
parameter (two consecutive ;; semicolons) to be able to pass the set of 
Workdays without Holidays.
The optional 4th parameter Workdays can be used to specify a different 
definition for the standard work week...

Best regards.
Miguel Ángel.

_
Sent from http://nabble.documentfoundation.org

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


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

2014-04-30 Thread Noel Grandin
 sdext/source/minimizer/optimizerdialogcontrols.cxx |   50 ++---
 1 file changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 8306e6cfb4504c6a08f877df88a5ea5ca2ad8b00
Author: Noel Grandin n...@peralex.com
Date:   Wed Apr 30 09:01:07 2014 +0200

sdext, fix sal_Bool-bool conversion

in commit 1e2c8cf578fe84c95fdd884846545d9faa47fa31

Change-Id: Id488736b183ddd02e07179fa0186a9ff342cafdf

diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx 
b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 73c7d6b..9f74c73 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -179,7 +179,7 @@ OUString InsertCheckBox( OptimizerDialog rOptimizerDialog, 
const OUString rCon
 OUString(Width) };
 
 Any pValues[] = {
-Any( sal_True ),
+Any( true ),
 Any( nHeight ),
 Any( rLabel ),
 Any( nXPos ),
@@ -221,7 +221,7 @@ OUString InsertFormattedField( OptimizerDialog 
rOptimizerDialog, const OUString
 Any pValues[] = {
 Any( fEffectiveMax ),
 Any( fEffectiveMin ),
-Any( sal_True ),
+Any( true ),
 Any( (sal_Int32)12 ),
 Any( nXPos ),
 Any( nYPos ),
@@ -266,7 +266,7 @@ OUString InsertComboBox( OptimizerDialog rOptimizerDialog, 
const OUString rCon
 OUString(Width) };
 
 Any pValues[] = {
-Any( sal_True ),
+Any( true ),
 Any( bEnabled ),
 Any( nHeight ),
 Any( (sal_Int16)8),
@@ -344,11 +344,11 @@ OUString InsertListBox( OptimizerDialog 
rOptimizerDialog, const OUString rCont
 OUString(Width) };
 
 Any pValues[] = {
-Any( sal_True ),
+Any( true ),
 Any( bEnabled ),
 Any( nHeight ),
 Any( (sal_Int16)8),
-Any( sal_False ),
+Any( false ),
 Any( nXPos ),
 Any( nYPos ),
 Any( (sal_Int16)0 ),
@@ -384,7 +384,7 @@ void OptimizerDialog::InitNavigationBar()
 InsertButton( *this, btnNavFinish, mxActionListener, nFinishPosX, 
BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, true, STR_FINISH, 
PushButtonType_STANDARD );
 InsertButton( *this, btnNavCancel, mxActionListener, nCancelPosX, 
BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, true, STR_CANCEL, 
PushButtonType_STANDARD );
 
-setControlProperty( btnNavNext, DefaultButton, Any( sal_True ) );
+setControlProperty( btnNavNext, DefaultButton, Any( true ) );
 }
 
 
@@ -440,9 +440,9 @@ void OptimizerDialog::InitPage0()
 
 void OptimizerDialog::UpdateControlStatesPage1()
 {
-bool bDeleteUnusedMasterPages( GetConfigProperty( 
TK_DeleteUnusedMasterPages, sal_False ) );
-bool bDeleteHiddenSlides( GetConfigProperty( TK_DeleteHiddenSlides, 
sal_False ) );
-bool bDeleteNotesPages( GetConfigProperty( TK_DeleteNotesPages, sal_False 
) );
+bool bDeleteUnusedMasterPages( GetConfigProperty( 
TK_DeleteUnusedMasterPages, false ) );
+bool bDeleteHiddenSlides( GetConfigProperty( TK_DeleteHiddenSlides, false 
) );
+bool bDeleteNotesPages( GetConfigProperty( TK_DeleteNotesPages, false ) );
 
 setControlProperty( CheckBox0Pg3, State, Any( 
(sal_Int16)bDeleteUnusedMasterPages ) );
 setControlProperty( CheckBox1Pg3, State, Any( 
(sal_Int16)bDeleteNotesPages ) );
@@ -469,9 +469,9 @@ void OptimizerDialog::InitPage1()
 maControlPages.push_back( aControlList );
 DeactivatePage( 1 );
 
-setControlProperty( CheckBox3Pg3, State, Any( sal_False ) );
+setControlProperty( CheckBox3Pg3, State, Any( false ) );
 setControlProperty( CheckBox3Pg3, Enabled, Any( 
aCustomShowList.getLength() != 0 ) );
-setControlProperty( ListBox0Pg3, Enabled, Any( sal_False ) );
+setControlProperty( ListBox0Pg3, Enabled, Any( false ) );
 
 UpdateControlStatesPage1();
 }
@@ -480,9 +480,9 @@ void OptimizerDialog::InitPage1()
 
 void OptimizerDialog::UpdateControlStatesPage2()
 {
-bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, sal_False ) 
);
-bool bRemoveCropArea( GetConfigProperty( TK_RemoveCropArea, sal_False ) );
-bool bEmbedLinkedGraphics( GetConfigProperty( TK_EmbedLinkedGraphics, 
sal_True ) );
+bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, false ) );
+bool bRemoveCropArea( GetConfigProperty( TK_RemoveCropArea, false ) );
+bool bEmbedLinkedGraphics( GetConfigProperty( TK_EmbedLinkedGraphics, true 
) );
 sal_Int32 nJPEGQuality( GetConfigProperty( TK_JPEGQuality, (sal_Int32)90 ) 
);
 
 sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, 
(sal_Int32)0 ) );
@@ -545,7 +545,7 @@ void OptimizerDialog::InitPage2()
 
 void OptimizerDialog::UpdateControlStatesPage3()
 {
-bool bConvertOLEObjects( GetConfigProperty( TK_OLEOptimization, sal_False 
) );
+bool bConvertOLEObjects( GetConfigProperty( TK_OLEOptimization, false ) );
 sal_Int16 nOLEOptimizationType( GetConfigProperty( 

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

2014-04-30 Thread Tor Lillqvist
 sw/qa/extras/inc/swmodeltestbase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a83960b9547652a09cc5de4f50aedce55bb5733
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 10:14:37 2014 +0300

WaE: virtual function declaration not marked 'override'

Change-Id: I5142142cea4a9f3ffdb61c7df61a5845572b6e0d

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 6c5236a..daac08b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -582,7 +582,7 @@ protected:
 /**
  * Helper method to return nodes represented by rXPath.
  */
-virtual void registerNamespaces(xmlXPathContextPtr pXmlXpathCtx)
+virtual void registerNamespaces(xmlXPathContextPtr pXmlXpathCtx) 
SAL_OVERRIDE
 {
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w), 
BAD_CAST(http://schemas.openxmlformats.org/wordprocessingml/2006/main;));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(v), 
BAD_CAST(urn:schemas-microsoft-com:vml));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Miklos Vajna
 include/test/xmltesttools.hxx |   26 ++
 test/source/xmltesttools.cxx  |   26 --
 2 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 76715b105fcfeffa140b03fb54d5c0846db1fba2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 30 09:30:48 2014 +0200

test: move XmlTestTools API documentation to the header

Change-Id: Iae56b1fb68fde0cbc44f6b9e37ba1a66194b25e0

diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index a12d780..5a9cdb1 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -31,14 +31,40 @@ protected:
 virtual void registerNamespaces(xmlXPathContextPtr pXmlXpathCtx);
 
 xmlNodeSetPtr getXPathNode(xmlDocPtr pXmlDoc, const OString rXPath);
+/**
+ * Same as the assertXPath(), but don't assert: return the string instead.
+ */
 OUString  getXPath(xmlDocPtr pXmlDoc, const OString rXPath, const 
OString rAttribute);
+/**
+ * Same as the assertXPathContent(), but don't assert: return the string 
instead.
+ */
 OUString  getXPathContent(xmlDocPtr pXmlDoc, const OString rXPath);
+/**
+ * Get the position of the child named rName of the parent node specified 
by rXPath.
+ * Useful for checking relative order of elements.
+ */
 int   getXPathPosition(xmlDocPtr pXmlDoc, const OString rXPath, 
const OUString rChildName);
+/**
+ * Assert that rXPath exists, and returns exactly one node.
+ * In case rAttribute is provided, the rXPath's attribute's value must
+ * equal to the rExpected value.
+ */
 void  assertXPath(xmlDocPtr pXmlDoc, const OString rXPath,
   const OString rAttribute = OString(),
   const OUString rExpectedValue = OUString());
+/**
+ * Assert that rXPath exists, and returns exactly nNumberOfNodes nodes.
+ * Useful for checking that we do _not_ export some node (nNumberOfNodes 
== 0).
+ */
 void  assertXPath(xmlDocPtr pXmlDoc, const OString rXPath, int 
nNumberOfNodes);
+/**
+ * Assert that rXPath exists, and its content equals rContent.
+ */
 void  assertXPathContent(xmlDocPtr pXmlDoc, const OString rXPath, 
const OUString rContent);
+/**
+ * Assert that rXPath exists, and has exactly nNumberOfChildNodes child 
nodes.
+ * Useful for checking that we do have a no child nodes to a specific node 
(nNumberOfChildNodes == 0).
+ */
 void  assertXPathChildren(xmlDocPtr pXmlDoc, const OString 
rXPath, int nNumberOfChildNodes);
 
 };
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 9815351..e80674d 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -27,9 +27,6 @@ void XmlTestTools::registerNamespaces(xmlXPathContextPtr 
/*pXmlXpathCtx*/)
 {
 }
 
-/**
- * Same as the assertXPath(), but don't assert: return the string instead.
- */
 OUString XmlTestTools::getXPath(xmlDocPtr pXmlDoc, const OString rXPath, 
const OString rAttribute)
 {
 xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath);
@@ -41,9 +38,6 @@ OUString XmlTestTools::getXPath(xmlDocPtr pXmlDoc, const 
OString rXPath, const
 return OUString::createFromAscii((const char*)xmlGetProp(pXmlNode, 
BAD_CAST(rAttribute.getStr(;
 }
 
-/**
- * Same as the assertXPathContent(), but don't assert: return the string 
instead.
- */
 OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, const OString 
rXPath)
 {
 xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath);
@@ -55,11 +49,6 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, 
const OString rXPath)
 return OUString::createFromAscii((const 
char*)((pXmlNode-children[0]).content));
 }
 
-/**
- * Assert that rXPath exists, and returns exactly one node.
- * In case rAttribute is provided, the rXPath's attribute's value must
- * equal to the rExpected value.
- */
 void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString rXPath, const 
OString rAttribute, const OUString rExpectedValue)
 {
 OUString aValue = getXPath(pXmlDoc, rXPath, rAttribute);
@@ -67,10 +56,6 @@ void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const 
OString rXPath, const O
  rExpectedValue, aValue);
 }
 
-/**
- * Assert that rXPath exists, and returns exactly nNumberOfNodes nodes.
- * Useful for checking that we do _not_ export some node (nNumberOfNodes == 0).
- */
 void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString rXPath, int 
nNumberOfNodes)
 {
 xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath);
@@ -78,18 +63,11 @@ void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const 
OString rXPath, int nNu
  nNumberOfNodes, 
xmlXPathNodeSetGetLength(pXmlNodes));
 }
 
-/**
- * Assert that rXPath exists, and its content equals rContent.
- */
 void 

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

2014-04-30 Thread Ravindra Vidhate
 sw/qa/extras/ooxmlexport/data/fdo77725.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   12 
 sw/source/filter/ww8/docxattributeoutput.cxx |   12 
 3 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 74126c42c309d3166235748980ee5e1e4a5fecb0
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date:   Mon Apr 21 16:32:58 2014 +0530

fdo#77725 LO not able to open/save file when exported multiple times.

Problem description:
The LO is not able to save the file if exported multiple times and the 
exported file is used as input.
The main root cause is Extra Line breaks getting added even though there is 
no text available.

Change-Id: I0afb52380912cae140d7ded694cb7cae9a8362a9
Reviewed-on: https://gerrit.libreoffice.org/9112
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlexport/data/fdo77725.docx 
b/sw/qa/extras/ooxmlexport/data/fdo77725.docx
new file mode 100644
index 000..7813459
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77725.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b1bc8c2..2edbd28 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3185,6 +3185,18 @@ DECLARE_OOXMLEXPORT_TEST(testFDO75431, fdo75431.docx)
 assertXPath(pXmlDoc, //w:p/w:pPr/w:sectPr/w:type, val, nextPage);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFDO77725, fdo77725.docx)
+{
+xmlDocPtr pXmlFootnotes = parseExport(word/footnotes.xml);
+if (!pXmlFootnotes)
+return;
+
+assertXPath(pXmlFootnotes, 
//w:footnotes[1]/w:footnote[3]/w:p[3]/w:r[1]/w:br[1], 0);
+assertXPath(pXmlFootnotes, 
//w:footnotes[1]/w:footnote[3]/w:p[3]/w:r[1]/w:br[2], 0);
+assertXPath(pXmlFootnotes, 
//w:footnotes[1]/w:footnote[3]/w:p[3]/w:r[1]/w:br[3], 0);
+
+}
+
 DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, fdo77759.docx)
 {
 xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1bc6305..7fd9a37 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1610,7 +1610,7 @@ void DocxAttributeOutput::FootnoteEndnoteRefTag()
 1, meaning that it skips one character after the text.  This is to make
 the switch in DocxAttributeOutput::RunText() nicer ;-)
  */
-static void impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken,
+static bool impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken,
 const sal_Unicode* rBegin, const sal_Unicode* pEnd, bool bMove = true 
)
 {
 const sal_Unicode *pBegin = rBegin;
@@ -1620,7 +1620,7 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, 
sal_Int32 nTextToken,
 rBegin = pEnd + 1;
 
 if ( pBegin = pEnd )
-return; // we want to write at least one character
+return false; // we want to write at least one character
 
 // we have to add 'preserve' when starting/ending with space
 if ( *pBegin == ' ' || *( pEnd - 1 ) == ' ' )
@@ -1633,6 +1633,8 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, 
sal_Int32 nTextToken,
 pSerializer-writeEscaped( OUString( pBegin, pEnd - pBegin ) );
 
 pSerializer-endElementNS( XML_w, nTextToken );
+
+return true;
 }
 
 void DocxAttributeOutput::RunText( const OUString rText, rtl_TextEncoding 
/*eCharSet*/ )
@@ -1660,8 +1662,10 @@ void DocxAttributeOutput::RunText( const OUString 
rText, rtl_TextEncoding /*eCh
 m_pSerializer-singleElementNS( XML_w, XML_tab, FSEND );
 break;
 case 0x0b: // line break
-impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
-m_pSerializer-singleElementNS( XML_w, XML_br, FSEND );
+{
+if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin, 
pIt ))
+m_pSerializer-singleElementNS( XML_w, XML_br, FSEND );
+}
 break;
 case 0x1E: //non-breaking hyphen
 impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Paris LibreOffice hackfest

2014-04-30 Thread Charles-H. Schulz
Hello Italo, 

On 30 avril 2014 00:25:02 CEST, Italo Vignoli it...@italovignoli.com wrote:
On 29/04/14 17:07, Charles-H. Schulz wrote:

 This is to let you know that TDF and Simplon.co will organize a
 LibreOffice Hackfest in Paris, on the 27th and 28th of June. The
event
 will take place in Paris/Montreui and you can check Simplon.co's page
 here: http://www.simplon.co

What about a press meeting on Friday, June 27 ? Although we do not have
any announcement close to that date, we can invite journalists for an
informal update about the project.


Yes that would be great and attracting the press to simplon would please the 
Simplon immensely.

Best, 

Charles. 

-- 
Envoyé de mon téléphone avec Kaiten Mail. Excusez la brièveté.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2014-04-30 Thread Caolán McNamara
 sd/source/ui/remotecontrol/Communicator.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f812ad553ab1702424357495c36cee2f2619e2c1
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 16 20:41:44 2014 +0100

coverity#1202882 Dereference before null check

Change-Id: Ie61df08c11b687c0b4a3ae212b3f9a6c95171396
(cherry picked from commit c152349f69acfb6bb873ed1cd12ca1b6dc325f1f)
Reviewed-on: https://gerrit.libreoffice.org/9095
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-on: https://gerrit.libreoffice.org/9133
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx 
b/sd/source/ui/remotecontrol/Communicator.cxx
index d3af697..bf399ca 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -122,10 +122,9 @@ void Communicator::execute()
 pTransmitter-join();
 pTransmitter = NULL;
 
-if( mpSocket )
-mpSocket-close();
+mpSocket-close();
 delete mpSocket;
-
+mpSocket = NULL;
 
 RemoteServer::removeCommunicator( this );
 }
___
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-4' - sd/source

2014-04-30 Thread Andrzej Hunt
 sd/source/ui/remotecontrol/BluetoothServer.cxx  |  673 +---
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 
 sd/source/ui/remotecontrol/Communicator.cxx |2 
 3 files changed, 605 insertions(+), 72 deletions(-)

New commits:
commit 4482307ba537d42a9654a78e8bbe3c321f5f9017
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Thu Apr 10 21:58:29 2014 +0100

fdo#74697 Add Bluez 5 support for impress remote.

This time we:
 - Don't break SAL_WARN with an fprintf like syntax.
 - Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might
   be building on dbus-glib versions that do not support it (however
   presumably anyone running bluez 5 will have a dbus version that is
   new enough to support this, i.e. purely a build-time issue).
 - Remove various C++11'isms.

Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32
Reviewed-on: https://gerrit.libreoffice.org/8924
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
(cherry picked from commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c)
Reviewed-on: https://gerrit.libreoffice.org/8931
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 3adb6f809f19d3132062bed405de5ef128a8)
Reviewed-on: https://gerrit.libreoffice.org/9132
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 63407a6..a447900 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -13,6 +13,8 @@
 #include iomanip
 #include new
 
+#include boost/scoped_ptr.hpp
+
 #include sal/log.hxx
 
 #ifdef LINUX_BLUETOOTH
@@ -90,25 +92,40 @@ struct DBusObject {
 }
 };
 
+static DBusObject* getBluez5Adapter(DBusConnection *pConnection);
+
 struct sd::BluetoothServer::Impl {
 // the glib mainloop running in the thread
 GMainContext *mpContext;
 DBusConnection *mpConnection;
 DBusObject *mpService;
 volatile bool mbExitMainloop;
+enum BluezVersion { BLUEZ4, BLUEZ5, UNKNOWN };
+BluezVersion maBluezVersion;
 
 Impl()
 : mpContext( g_main_context_new() )
 , mpConnection( NULL )
 , mpService( NULL )
 , mbExitMainloop( false )
+, maBluezVersion( UNKNOWN )
 { }
 
 DBusObject *getAdapter()
 {
-if( !mpService )
+if (mpService)
+{
+DBusObject* pAdapter = mpService-cloneForInterface( 
org.bluez.Adapter );
+return pAdapter;
+}
+else if (spServer-mpImpl-maBluezVersion == BLUEZ5)
+{
+return getBluez5Adapter(mpConnection);
+}
+else
+{
 return NULL;
-return mpService-cloneForInterface( org.bluez.Adapter );
+}
 }
 };
 
@@ -156,37 +173,181 @@ sendUnrefAndWaitForReply( DBusConnection *pConnection, 
DBusMessage *pMsg )
 return pMsg;
 }
 
+static bool
+isBluez5Available(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+
+// Simplest wasy to check whether we have Bluez 5+ is to check
+// that we can obtain adapters using the new interfaces.
+// The first two error checks however don't tell us anything as they should
+// succeed as long as dbus is working correctly.
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager 
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No GetManagedObjects call created);
+return false;
+}
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No reply received);
+return false;
+}
+
+// If dbus is working correctly and we aren't on bluez 5 this is where we
+// should actually get the error.
+if (dbus_message_get_error_name( pMsg ))
+{
+SAL_INFO( sdremote.bluetooth, GetManagedObjects call failed with \
+ dbus_message_get_error_name( pMsg )
+ \ -- we don't seem to have Bluez 5 available);
+return false;
+}
+SAL_INFO(sdremote.bluetooth, GetManagedObjects call seems to have 
succeeded -- we must be on Bluez 5);
+dbus_message_unref(pMsg);
+return true;
+}
+
+
+static DBusObject*
+getBluez5Adapter(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+// This returns a list of objects where we need to find the first
+// org.bluez.Adapter1 .
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager 
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+return 

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

2014-04-30 Thread Michael Stahl
 sw/source/ui/wrtsh/delete.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d1782bfa94e1f526b90587b74f51b236b3b774c7
Author: Michael Stahl mst...@redhat.com
Date:   Fri Apr 25 20:09:47 2014 +0200

fdo#60967: fix deletion of paragraph following table

Surprisingly MovePara(fnParaCurr, fnParaEnd) actually moves to the end
of the next paragraph if the current one is empty.

Change-Id: I780bf663b19044252f1d4532d5467c3a599c8a49
(cherry picked from commit f5fb361df94449850a83be3b412f68e1f9b949c5)
Reviewed-on: https://gerrit.libreoffice.org/9195
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index bba3c3d..a9928aa 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -466,7 +466,10 @@ long SwWrtShell::DelToEndOfSentence()
 if (SwCrsrShell::Right(1,CRSR_SKIP_CHARS))
 {
 SetMark();
-SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
+if (!IsEndPara()) // can only be at the end if it's empty
+{   // for an empty paragraph this would actually select the _next_
+SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
+}
 if (!IsEndOfDoc()) // do not delete last paragraph in body text
 {
 nRet = DelFullPara() ? 1 : 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: unusedcode.easy

2014-04-30 Thread Caolán McNamara
 unusedcode.easy |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit f43adf986601f2158f182b884bc3a15deeb1435e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 09:18:22 2014 +0100

callcatcher: update unused code

Change-Id: I015247c5687476d02e8d2aa0f62a58a00347c5ee

diff --git a/unusedcode.easy b/unusedcode.easy
index b07368f..9cf9e88 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -26,6 +26,7 @@ MenuBar::GetMenuBarButtonRectPixel(unsigned short)
 MenuBar::RemoveMenuBarButton(unsigned short)
 MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const)
 OpenGLContext::getOpenGLWindow()
+OpenGLRender::CreateTextTexture(rtl::OUString, Font, long, 
com::sun::star::awt::Point, com::sun::star::awt::Size, long)
 OutputDevice::GetCanvas() const
 OutputDevice::HasAlpha()
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const, MapMode const, 
MapMode const)
@@ -208,6 +209,29 @@ 
canvas::createSurfaceProxyManager(boost::shared_ptrcanvas::IRenderModule const
 
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext
 const)
 
chart::ShapeToolbarController::create(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext
 const)
 chart::opengl3D::Line::Line(unsigned int)
+chart::opengl3D::OpenGL3DRenderer::AddExtrude3DObjectPoint(float, float, float)
+chart::opengl3D::OpenGL3DRenderer::AddPolygon3DObjectNormalPoint(float, float, 
float)
+chart::opengl3D::OpenGL3DRenderer::AddPolygon3DObjectPoint(float, float, float)
+chart::opengl3D::OpenGL3DRenderer::AddShape3DExtrudeObject(int, int, float, 
float, float)
+chart::opengl3D::OpenGL3DRenderer::AddShapePolygon3DObject(int, bool, int, 
long, int)
+chart::opengl3D::OpenGL3DRenderer::CreateActualRoundedCube(float, int, int, 
float, float, float)
+chart::opengl3D::OpenGL3DRenderer::EndAddExtrude3DObjectPoint()
+chart::opengl3D::OpenGL3DRenderer::EndAddPolygon3DObjectNormalPoint()
+chart::opengl3D::OpenGL3DRenderer::EndAddPolygon3DObjectPoint()
+chart::opengl3D::OpenGL3DRenderer::EndAddShape3DExtrudeObject()
+chart::opengl3D::OpenGL3DRenderer::EndAddShapePolygon3DObject()
+chart::opengl3D::OpenGL3DRenderer::GetTime()
+chart::opengl3D::OpenGL3DRenderer::LoadShaders()
+chart::opengl3D::OpenGL3DRenderer::OpenGL3DRenderer()
+chart::opengl3D::OpenGL3DRenderer::ProcessPickingBox()
+chart::opengl3D::OpenGL3DRenderer::ProcessUnrenderedShape()
+chart::opengl3D::OpenGL3DRenderer::RenderClickPos(Point)
+chart::opengl3D::OpenGL3DRenderer::RenderFPS(float)
+chart::opengl3D::OpenGL3DRenderer::Set3DSenceInfo(glm::detail::tvec3float, 
glm::detail::tmat4x4float, bool, int)
+chart::opengl3D::OpenGL3DRenderer::SetClickPos(Point)
+chart::opengl3D::OpenGL3DRenderer::SetFPS(float)
+chart::opengl3D::OpenGL3DRenderer::SetLightInfo(bool, int, 
glm::detail::tvec4float)
+chart::opengl3D::OpenGL3DRenderer::init()
 chart::opengl3D::Rectangle::Rectangle(unsigned int)
 chart::opengl3D::Text::Text(unsigned int)
 
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptrcomphelper::ConfigurationChanges
 const, rtl::OUString const) const
@@ -220,6 +244,7 @@ connectivity::sdbcx::OGroup::OGroup(bool)
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const, bool)
 oglcanvas::CanvasHelper::flush() const
 oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const, 
com::sun::star::rendering::RenderState const, 
com::sun::star::uno::Referencecom::sun::star::rendering::XGraphicDevice 
const) const
+oox::drawingml::CustomShapeProvider::createParameterPair(oox::drawingml::CustomShapeProvider::ParameterPairData
 const*)
 
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
 const)
 sc::CLBuildKernelThread::CLBuildKernelThread()
 sc::CLBuildKernelThread::consume()
___
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' - sw/inc sw/source

2014-04-30 Thread Luboš Luňák
 sw/inc/docary.hxx|9 +
 sw/inc/editsh.hxx|2 +
 sw/source/core/doc/docredln.cxx  |   66 +++
 sw/source/core/edit/edredln.cxx  |   18 ++
 sw/source/ui/uiview/view2.cxx|   31 +++---
 sw/source/ui/uiview/viewstat.cxx |   37 +++--
 6 files changed, 115 insertions(+), 48 deletions(-)

New commits:
commit 68dfe73d209091455c79e1f746ca84cf8743629d
Author: Luboš Luňák l.lu...@collabora.com
Date:   Mon Apr 28 18:03:49 2014 +0200

allow accepting/rejecting changes in a selection (bnc#874790)

More convenient than handling them one by one.

(cherry picked from commit 160e93607f6c2c3981823b30ee981ca23d4e1a0d)
(cherry picked from commit 4a60f9387ddd832f7c164102b76351e5e520d920)
(cherry picked from commit 94fc0b4752599601ddf9ff3c9b49da15cffb4882)
(cherry picked from commit d46e7dabd3090697c46e24a350cc75f35c28a8f7)

Change-Id: Iee02d12d595ee41cff7a31e2bda61425c9f53d6d
Reviewed-on: https://gerrit.libreoffice.org/9198
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4525763..0f69048 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -175,6 +175,15 @@ public:
 sal_uInt16 FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
 sal_uInt16 nLookahead = 20 ) const;
 
+/**
+ Find the redline at the given position.
+
+ @param tableIndex position in SwRedlineTbl to start searching at, will be 
updated with the index of the returned
+   redline (or the next redline after the given position 
if not found)
+ @param next true: redline starts at position and ends after, false: 
redline starts before position and ends at or after
+*/
+const SwRedline* FindAtPosition( const SwPosition startPosition, 
sal_uInt16 tableIndex, bool next = true ) const;
+
 using _SwRedlineTbl::size;
 using _SwRedlineTbl::operator[];
 using _SwRedlineTbl::empty;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 9991fd0..159a9da 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -894,6 +894,8 @@ public:
 const SwRedline GetRedline( sal_uInt16 nPos ) const;
 sal_Bool AcceptRedline( sal_uInt16 nPos );
 sal_Bool RejectRedline( sal_uInt16 nPos );
+bool AcceptRedlinesInSelection();
+bool RejectRedlinesInSelection();
 
 
 /** Search Redline for this Data and @return position in array.
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ee4db26..a6e6367 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1914,35 +1914,6 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl rArr, 
sal_uInt16 rPos,
 return bRet;
 }
 
-static const SwRedline* lcl_FindCurrRedline( const SwPosition rSttPos,
-sal_uInt16 rPos,
-bool bNext = true )
-{
-const SwRedline* pFnd = 0;
-const SwRedlineTbl rArr = 
rSttPos.nNode.GetNode().GetDoc()-GetRedlineTbl();
-for( ; rPos  rArr.size() ; ++rPos )
-{
-const SwRedline* pTmp = rArr[ rPos ];
-if( pTmp-HasMark()  pTmp-IsVisible() )
-{
-const SwPosition* pRStt = pTmp-Start(),
-  * pREnd = pRStt == pTmp-GetPoint() ? pTmp-GetMark()
-  : pTmp-GetPoint();
-if( bNext ? *pRStt = rSttPos : *pRStt  rSttPos )
-{
-if( bNext ? *pREnd  rSttPos : *pREnd = rSttPos )
-{
-pFnd = pTmp;
-break;
-}
-}
-else
-break;
-}
-}
-return pFnd;
-}
-
 static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
 SwRedlineTbl rArr, sal_Bool bCallDelete,
 const SwPaM rPam)
@@ -1953,7 +1924,7 @@ static int lcl_AcceptRejectRedl( Fn_AcceptReject 
fn_AcceptReject,
 const SwPosition* pStt = rPam.Start(),
 * pEnd = pStt == rPam.GetPoint() ? rPam.GetMark()
  : rPam.GetPoint();
-const SwRedline* pFnd = lcl_FindCurrRedline( *pStt, n, true );
+const SwRedline* pFnd = rArr.FindAtPosition( *pStt, n, true );
 if( pFnd  // Is new a part of it?
 ( *pFnd-Start() != *pStt || *pFnd-End()  *pEnd ))
 {
@@ -2257,7 +2228,7 @@ const SwRedline* SwDoc::SelNextRedline( SwPaM rPam ) 
const
 // If the starting positon points to the last valid ContentNode,
 // we take the next Redline in any case.
 sal_uInt16 n = 0;
-const SwRedline* pFnd = lcl_FindCurrRedline( rSttPos, n, true );
+const SwRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, true );
 if( pFnd )
 {
 

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

2014-04-30 Thread Luboš Luňák
 configure.ac  |   45 -
 vcl/CustomTarget_kde4_moc.mk  |3 
 vcl/unx/kde4/KDE4FilePicker.cxx   |   21 +---
 vcl/unx/kde4/KDESalInstance.cxx   |2 
 vcl/unx/kde4/KDEXLib.cxx  |   21 ++--
 vcl/unx/kde4/KDEXLib.hxx  |4 
 vcl/unx/kde4/VCLKDEApplication.cxx|   44 
 vcl/unx/kde4/VCLKDEApplication.hxx|2 
 vcl/unx/kde4/tst_exclude_posted_events.hxx|   72 ++
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx |  130 --
 10 files changed, 231 insertions(+), 113 deletions(-)

New commits:
commit 80f113efa6f60c6b3aad33128921792451f114ce
Author: Luboš Luňák l.lu...@collabora.com
Date:   Fri Mar 28 15:09:13 2014 +0100

fix KFileDialog crashes (fdo#69002)

Requires Qt patches (or otherwise LO generic file dialog is used).
Squashed from several master patches.

(cherry picked from commit 2cd8a1e0f1e81efd15979953d7f274ab8a6806d6)
(cherry picked from commit 474ad6b0e2fb18370be9d228456a2abbfc15bad2)
(cherry picked from commit e809aa1e916e0f6d1a849d0374f59ef9619b1db7)
(cherry picked from commit 65a3622148ea67744c9c1fc18c2b8d48e5f1c79f)
(cherry picked from commit 508337db0c53caa5fb43ef26f781df159497a482)
(cherry picked from commit 9aa32a34c7c7a2ee4da5f01983a0ed224c38c875)
(cherry picked from commit 145f2e970f46a3a3e5456b122d71f17c3abe878f)
(cherry picked from commit f09d4bc2853be2fa3faa0502b8efe94ad9719731)

Change-Id: I6dba5da0170fb94bab928f71efc7dc8c03cc70d9
Reviewed-on: https://gerrit.libreoffice.org/9206
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/configure.ac b/configure.ac
index 5751f85..98e2a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11240,6 +11240,8 @@ int main(int argc, char **argv) {
 AC_DEFINE(KDE_HAVE_GLIB,1)
 KDE_GLIB_CFLAGS=$(printf '%s' $KDE_GLIB_CFLAGS | sed -e 
s/-I/${ISYSTEM?}/g)
 
+qt4_fix_warning=
+
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
@@ -11266,12 +11268,53 @@ int main(int argc, char *argv[])
 AC_MSG_RESULT([yes])
 ],[
 AC_MSG_RESULT([no])
-AC_MSG_WARN([native KDE4 file pickers will be disabled at 
runtime - fix your Qt4 library!])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at 
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at 
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning   
https://bugreports.qt-project.org/browse/QTBUG-37380 (needed)
 ])
 
 # Remove meta object data
 rm -f ${TSTBASE}.*
 
+AC_MSG_CHECKING([whether Qt avoids QClipboard recursion caused by 
posted events])
+
+# Prepare meta object data
+TSTBASE=tst_exclude_posted_events
+TSTMOC=${SRC_ROOT}/vcl/unx/kde4/${TSTBASE}
+ln -fs ${TSTMOC}.hxx
+$MOC4 ${TSTBASE}.hxx -o ${TSTBASE}.moc
+
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include tst_exclude_posted_events.moc
+
+int main(int argc, char *argv[])
+{
+QCoreApplication app(argc, argv);
+exit(tst_excludePostedEvents());
+return 0;
+}
+]])],[
+AC_MSG_RESULT([yes])
+],[
+AC_MSG_RESULT([no])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at 
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at 
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning   
https://bugreports.qt-project.org/browse/QTBUG-34614 (needed)
+])
+
+# Remove meta object data
+rm -f ${TSTBASE}.*
+
+if test -n $qt4_fix_warning; then
+add_warning   
https://bugreports.qt-project.org/browse/QTBUG-38585 (recommended)
+fi
+
 LIBS=$save_LIBS
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 9e41754..16d1561 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -12,7 +12,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
 $(call gb_CustomTarget_get_target,vcl/unx/kde4) : \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDE4FilePicker.moc \
-   $(call 
gb_CustomTarget_get_workdir,vcl/unx/kde4)/tst_exclude_socket_notifiers.moc
+   $(call 

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

2014-04-30 Thread László Németh
 external/hunspell/UnpackedTarball_hunspell.mk|1 
 external/hunspell/hunspell-fdo48017-wfopen.patch |  110 +++
 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   13 +-
 3 files changed, 118 insertions(+), 6 deletions(-)

New commits:
commit 59906c3d54e6541185f4bf85b1d1c70530198059
Author: László Németh nem...@numbertext.org
Date:   Fri Apr 25 12:09:52 2014 +0200

fdo#48017 fix WIN32 long path name support of spelling dictionaries

+ try including windows.h for MultiByteToWideChar

(cherry picked from commit 187765b8a45761e14d18da58463dbc0f5bd825e9)

+ error C2059: syntax error : ´)´

(cherry picked from commit 445d62565d662a7119a0c49e8e8de68ee244dc74)

Change-Id: I1ccaae9dba4f82cd50531890e159519a765a0fff
Reviewed-on: https://gerrit.libreoffice.org/9182
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/external/hunspell/UnpackedTarball_hunspell.mk 
b/external/hunspell/UnpackedTarball_hunspell.mk
index 8c23f03..730a6ce 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
external/hunspell/hunspell-1.3.2-compound.patch \
external/hunspell/hunspell.rhbz918938.patch \
external/hunspell/hunspell-wundef.patch.1 \
+   external/hunspell/hunspell-fdo48017-wfopen.patch \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/external/hunspell/hunspell-fdo48017-wfopen.patch 
b/external/hunspell/hunspell-fdo48017-wfopen.patch
new file mode 100644
index 000..47b803b
--- /dev/null
+++ b/external/hunspell/hunspell-fdo48017-wfopen.patch
@@ -0,0 +1,110 @@
+diff -ru hunspell/src/hunspell/csutil.cxx 
build/hunspell/src/hunspell/csutil.cxx
+--- hunspell/src/hunspell/csutil.cxx   2011-02-02 11:35:43.0 +0100
 build/hunspell/src/hunspell/csutil.cxx 2014-04-24 19:42:01.373285409 
+0200
+@@ -17,6 +17,11 @@
+   unsigned short clower;
+ };
+ 
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ #ifdef OPENOFFICEORG
+ #  include unicode/uchar.h
+ #else
+@@ -46,6 +50,21 @@
+ static struct unicode_info2 * utf_tbl = NULL;
+ static int utf_tbl_count = 0; // utf_tbl can be used by multiple Hunspell 
instances
+ 
++FILE * myfopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
++int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
++wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
++
+ /* only UTF-16 (BMP) implementation */
+ char * u16_u8(char * dest, int size, const w_char * src, int srclen) {
+ signed char * u8 = (signed char *)dest;
+diff -ru hunspell/src/hunspell/csutil.hxx 
build/hunspell/src/hunspell/csutil.hxx
+--- hunspell/src/hunspell/csutil.hxx   2010-09-06 09:58:53.0 +0200
 build/hunspell/src/hunspell/csutil.hxx 2014-04-24 19:42:01.373285409 
+0200
+@@ -52,6 +52,9 @@
+ #define FORBIDDENWORD  65510
+ #define ONLYUPCASEFLAG 65511
+ 
++// fopen or optional _wfopen to fix long pathname problem of WIN32
++LIBHUNSPELL_DLL_EXPORTED FILE * myfopen(const char * path, const char * mode);
++
+ // convert UTF-16 characters to UTF-8
+ LIBHUNSPELL_DLL_EXPORTED char * u16_u8(char * dest, int size, const w_char * 
src, int srclen);
+ 
+diff -ru hunspell/src/hunspell/dictmgr.cxx 
build/hunspell/src/hunspell/dictmgr.cxx
+--- hunspell/src/hunspell/dictmgr.cxx  2010-06-02 21:33:59.0 +0200
 build/hunspell/src/hunspell/dictmgr.cxx2014-04-24 19:42:01.381285408 
+0200
+@@ -5,6 +5,7 @@
+ #include stdio.h
+ 
+ #include dictmgr.hxx
++#include csutil.hxx
+ 
+ DictMgr::DictMgr(const char * dictpath, const char * etype) : numdict(0)
+ {
+@@ -57,7 +58,7 @@
+ 
+ // open the dictionary list file
+ FILE * dictlst;
+-dictlst = fopen(dictpath,r);
++dictlst = myfopen(dictpath,r);
+ if (!dictlst) {
+   return 1;
+ }
+diff -ru hunspell/src/hunspell/filemgr.cxx 
build/hunspell/src/hunspell/filemgr.cxx
+--- hunspell/src/hunspell/filemgr.cxx  2010-04-14 11:42:03.0 +0200
 build/hunspell/src/hunspell/filemgr.cxx2014-04-25 00:44:05.049789586 
+0200
+@@ -6,6 +6,7 @@
+ #include stdio.h
+ 
+ #include filemgr.hxx
++#include csutil.hxx
+ 
+ int FileMgr::fail(const char * err, const char * par) {
+ fprintf(stderr, err, par);
+@@ -15,7 +16,7 @@
+ FileMgr::FileMgr(const char * file, const char * key) {
+ linenum = 0;
+ hin = NULL;
+-fin = fopen(file, r);
++fin = myfopen(file, r);
+ if (!fin) {
+ // check hzipped file
+ char * st = (char *) malloc(strlen(file) + 

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

2014-04-30 Thread Noel Grandin
 sw/source/core/layout/calcmove.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 82e8c6a6990571a558e13ebff85edb3b5d511866
Author: Noel Grandin n...@peralex.com
Date:   Wed Apr 30 11:07:50 2014 +0200

-Werror=parentheses

introduced in commit 6aa35db39311dcd7965c9c9c21fcf4143a1f9b43
sw: sal_Bool-bool

Change-Id: I7edaf2dcebf75c1f13360ae66a1f0497449d5834

diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 5bb985f..109f77d 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1317,7 +1317,8 @@ void SwCntntFrm::MakeAll()
 }
 if ( !mbValidSize )
 {
-mbValidSize = bFormatted = sal_True;
+mbValidSize = true;
+bFormatted = sal_True;
 ++nFormatCount;
 if( nFormatCount  STOP_FLY_FORMAT )
 SetFlyLock( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Tor Lillqvist
 sw/source/core/layout/calcmove.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c276830bd7d7e405b3a1cf54f2181784bf137883
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 12:26:18 2014 +0300

One more -Werror=parentheses

Change-Id: I21ebdcade15d7b66c2ed79584f5999f0421a049d

diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 109f77d..348789a 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1377,7 +1377,8 @@ void SwCntntFrm::MakeAll()
 }
 if( GetFollow() )
 Prepare( PREP_WIDOWS_ORPHANS, 0, false );
-mbValidSize = bFormatted = sal_True;
+mbValidSize = true;
+bFormatted = sal_True;
 Format();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Vort
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f945d6dc7480465ba9fce93351b1d3cc6b665e3
Author: Vort vv...@yandex.ru
Date:   Tue Apr 29 15:19:00 2014 +0300

fdo#78075 PDF Import: Use absolute positions in svg:d parameter

Change-Id: I55ddf92c43f849524be72bd10b3beb41e728f951
Reviewed-on: https://gerrit.libreoffice.org/9199
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx 
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 237baff..acf9ff7 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -349,7 +349,7 @@ void DrawXmlEmitter::visit( PolyPolyElement elem, const 
std::list Element* ::
 aBuf.append( ' ' );
 aBuf.append( convPx2mmPrec2(elem.h)*100.0 );
 aProps[ svg:viewBox ] = aBuf.makeStringAndClear();
-aProps[ svg:d ]   = basegfx::tools::exportToSvgD( elem.PolyPoly, 
true, true, false );
+aProps[ svg:d ]   = basegfx::tools::exportToSvgD( elem.PolyPoly, 
false, true, false );
 
 m_rEmitContext.rEmitter.beginTag( draw:path, aProps );
 m_rEmitContext.rEmitter.endTag( draw:path );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac vcl/CustomTarget_kde4_moc.mk vcl/unx

2014-04-30 Thread Luboš Luňák
 configure.ac  |   45 -
 vcl/CustomTarget_kde4_moc.mk  |3 
 vcl/unx/kde4/KDE4FilePicker.cxx   |   21 +---
 vcl/unx/kde4/KDESalInstance.cxx   |2 
 vcl/unx/kde4/KDEXLib.cxx  |   21 ++--
 vcl/unx/kde4/KDEXLib.hxx  |4 
 vcl/unx/kde4/VCLKDEApplication.cxx|   44 
 vcl/unx/kde4/VCLKDEApplication.hxx|2 
 vcl/unx/kde4/tst_exclude_posted_events.hxx|   72 ++
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx |  130 --
 10 files changed, 231 insertions(+), 113 deletions(-)

New commits:
commit c6b6fff63d9ce900bed5eda550ea1af9d854bc8d
Author: Luboš Luňák l.lu...@collabora.com
Date:   Fri Mar 28 15:09:13 2014 +0100

fix KFileDialog crashes (fdo#69002)

Requires Qt patches (or otherwise LO generic file dialog is used).
Squashed from several master patches.

(cherry picked from commit 2cd8a1e0f1e81efd15979953d7f274ab8a6806d6)
(cherry picked from commit 474ad6b0e2fb18370be9d228456a2abbfc15bad2)
(cherry picked from commit e809aa1e916e0f6d1a849d0374f59ef9619b1db7)
(cherry picked from commit 65a3622148ea67744c9c1fc18c2b8d48e5f1c79f)
(cherry picked from commit 508337db0c53caa5fb43ef26f781df159497a482)
(cherry picked from commit 9aa32a34c7c7a2ee4da5f01983a0ed224c38c875)
(cherry picked from commit 145f2e970f46a3a3e5456b122d71f17c3abe878f)
(cherry picked from commit f09d4bc2853be2fa3faa0502b8efe94ad9719731)

Change-Id: I6dba5da0170fb94bab928f71efc7dc8c03cc70d9
Reviewed-on: https://gerrit.libreoffice.org/9206
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/configure.ac b/configure.ac
index a6d36c5..bc268e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11283,6 +11283,8 @@ int main(int argc, char **argv) {
 AC_DEFINE(KDE_HAVE_GLIB,1)
 KDE_GLIB_CFLAGS=$(printf '%s' $KDE_GLIB_CFLAGS | sed -e 
s/-I/${ISYSTEM?}/g)
 
+qt4_fix_warning=
+
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
@@ -11309,12 +11311,53 @@ int main(int argc, char *argv[])
 AC_MSG_RESULT([yes])
 ],[
 AC_MSG_RESULT([no])
-AC_MSG_WARN([native KDE4 file pickers will be disabled at 
runtime - fix your Qt4 library!])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at 
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at 
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning   
https://bugreports.qt-project.org/browse/QTBUG-37380 (needed)
 ])
 
 # Remove meta object data
 rm -f ${TSTBASE}.*
 
+AC_MSG_CHECKING([whether Qt avoids QClipboard recursion caused by 
posted events])
+
+# Prepare meta object data
+TSTBASE=tst_exclude_posted_events
+TSTMOC=${SRC_ROOT}/vcl/unx/kde4/${TSTBASE}
+ln -fs ${TSTMOC}.hxx
+$MOC4 ${TSTBASE}.hxx -o ${TSTBASE}.moc
+
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include tst_exclude_posted_events.moc
+
+int main(int argc, char *argv[])
+{
+QCoreApplication app(argc, argv);
+exit(tst_excludePostedEvents());
+return 0;
+}
+]])],[
+AC_MSG_RESULT([yes])
+],[
+AC_MSG_RESULT([no])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at 
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at 
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning   
https://bugreports.qt-project.org/browse/QTBUG-34614 (needed)
+])
+
+# Remove meta object data
+rm -f ${TSTBASE}.*
+
+if test -n $qt4_fix_warning; then
+add_warning   
https://bugreports.qt-project.org/browse/QTBUG-38585 (recommended)
+fi
+
 LIBS=$save_LIBS
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 9e41754..16d1561 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -12,7 +12,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
 $(call gb_CustomTarget_get_target,vcl/unx/kde4) : \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDE4FilePicker.moc \
-   $(call 
gb_CustomTarget_get_workdir,vcl/unx/kde4)/tst_exclude_socket_notifiers.moc
+   $(call 

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

2014-04-30 Thread Tor Lillqvist
 sw/source/core/uibase/uiview/view.cxx |6 +++---
 sw/source/core/uibase/uiview/view0.cxx|   10 --
 sw/source/core/uibase/uiview/view1.cxx|2 +-
 sw/source/core/uibase/uiview/viewport.cxx |4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 24be5b2728ba7a5c0ebcc53a37bc46b05e889133
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 12:50:01 2014 +0300

WaE: suggest parentheses around assignment used as truth value

While at it, change the lovely bDocSzUpdated global variable into a bool.

Change-Id: I6e60e1516e9345076ea08b5aa7029d10d324cb28

diff --git a/sw/source/core/uibase/uiview/view.cxx 
b/sw/source/core/uibase/uiview/view.cxx
index a343c71..705514f 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -117,9 +117,9 @@ extern bool bNoInterrupt;   // in mainwn.cxx
 #define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT|   \
   SFX_VIEW_HAS_PRINTOPTIONS)
 
-// Statics
+// Statics. OMG.
 
-int bDocSzUpdated = 1;
+bool bDocSzUpdated = true;
 
 SvxSearchItem*  SwView::m_pSrchItem   = 0;
 
@@ -736,7 +736,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh 
)
 m_bVerbsActive = m_bDrawRotate = m_bInOuterResizePixel = 
m_bInInnerResizePixel =
 m_bPasteState = m_bPasteSpecialState = m_bMakeSelectionVisible = false;
 
-m_bShowAtResize = m_bDrawSelMode = bDocSzUpdated = sal_True;
+m_bShowAtResize = m_bDrawSelMode = bDocSzUpdated = true;
 
 _CreateScrollbar( true );
 _CreateScrollbar( false );
diff --git a/sw/source/core/uibase/uiview/view0.cxx 
b/sw/source/core/uibase/uiview/view0.cxx
index e18be9a..8c1c950 100644
--- a/sw/source/core/uibase/uiview/view0.cxx
+++ b/sw/source/core/uibase/uiview/view0.cxx
@@ -506,7 +506,10 @@ void SwView::ExecViewOptions(SfxRequest rReq)
 
 case SID_AUTOSPELL_CHECK:
 if( STATE_TOGGLE == eState )
-bFlag = bSet = !pOpt-IsOnlineSpell();
+{
+bFlag = !pOpt-IsOnlineSpell();
+bSet = bFlag;
+}
 
 pOpt-SetOnlineSpell(bSet);
 {
@@ -538,7 +541,10 @@ void SwView::ExecViewOptions(SfxRequest rReq)
 
 case FN_SHADOWCURSOR:
 if( STATE_TOGGLE == eState )
-bFlag = bSet = !pOpt-IsShadowCursor();
+{
+bFlag = !pOpt-IsShadowCursor();
+bSet = bFlag;
+}
 
 pOpt-SetShadowCursor(bSet);
 break;
diff --git a/sw/source/core/uibase/uiview/view1.cxx 
b/sw/source/core/uibase/uiview/view1.cxx
index de2db60..0a56ee6 100644
--- a/sw/source/core/uibase/uiview/view1.cxx
+++ b/sw/source/core/uibase/uiview/view1.cxx
@@ -38,7 +38,7 @@
 #include sfx2/request.hxx
 #include sfx2/viewfrm.hxx
 
-extern int bDocSzUpdated;
+extern bool bDocSzUpdated;
 
 void SwView::Activate(bool bMDIActivate)
 {
diff --git a/sw/source/core/uibase/uiview/viewport.cxx 
b/sw/source/core/uibase/uiview/viewport.cxx
index 574c402..7c119bf 100644
--- a/sw/source/core/uibase/uiview/viewport.cxx
+++ b/sw/source/core/uibase/uiview/viewport.cxx
@@ -166,13 +166,13 @@ Point SwView::AlignToPixel(const Point rPt) const
 void SwView::DocSzChgd(const Size rSz)
 {
 
-extern int bDocSzUpdated;
+extern bool bDocSzUpdated;
 
 m_aDocSz = rSz;
 
 if( !m_pWrtShell || m_aVisArea.IsEmpty() )  // no shell - no change
 {
-bDocSzUpdated = sal_False;
+bDocSzUpdated = false;
 return;
 }
 
___
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/source vcl/source

2014-04-30 Thread Andrzej Hunt
 framework/source/uielement/toolbarmanager.cxx |3 ++-
 vcl/source/window/toolbox2.cxx|   23 +--
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 90f3269f1fbbb0ccc65f5ee40ceda671d7061473
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Sat Apr 26 08:23:10 2014 +0100

Toolbar overflow/context menu: keep ordering and don't discard separator.

Previously the overflow/context menu should have had a separator shown
between the overflow items and the hidden items, however these were
inadvertently removed by ImplClearPopupMenu which filters the items
before the menu is displayed.

The previous ordering of items was also the REVERSE of the ordering in
the toolbar -- the overflow menu is a logical extension of the toolbar
hence items should be in the same order as they were in the toolbar.

(cherry picked from commit 3dc6808532d86c4b00a6cb81e0adb74878c13fdd)

Conflicts:
vcl/source/window/toolbox2.cxx

Change-Id: I8444f4814fea64be1d8f8790445ad6aa01532e70
Reviewed-on: https://gerrit.libreoffice.org/9171
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 288f20d..4137de3 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1610,7 +1610,8 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox 
*pToolBar )
 sal_uInt16 i;
 for( i=0; ipMenu-GetItemCount(); )
 {
-if( pMenu-GetItemId( i )  TOOLBOX_MENUITEM_START )
+if( pMenu-GetItemId( i )  TOOLBOX_MENUITEM_START
+ pMenu-GetItemId( i ) != 0 ) // Don't remove separators (Id == 
0)
 pMenu-RemoveItem( i );
 else
 i++;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index bf7c05f..608b27c 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -2119,39 +2119,42 @@ void ToolBox::UpdateCustomMenu()
 i++;
 }
 
-// add menu items, starting from the end and inserting at pos 0
+// add menu items: first the overflow items, then hidden items, both in the
+// order they would usually appear in the toolbar. Separators that would be
+// in the toolbar are ignored as they would introduce too much clutter,
+// instead we have a single separator to help distinguish between overflow
+// and hidden items.
 if ( !mpData-m_aItems.empty() )
 {
 // nStartPos will hold the number of clipped items appended from first 
loop
-sal_uInt16 nSepPos = 0;
-for ( std::vector ImplToolItem ::reverse_iterator 
it(mpData-m_aItems.rbegin());
-it != mpData-m_aItems.rend(); ++it)
+for ( std::vector ImplToolItem ::iterator 
it(mpData-m_aItems.begin());
+it != mpData-m_aItems.end(); ++it)
 {
 if( it-IsClipped() )
 {
 sal_uInt16 id = it-mnId + TOOLBOX_MENUITEM_START;
-pMenu-InsertItem( id, it-maText, it-maImage, 0, OString(), 
0 );
+pMenu-InsertItem( id, it-maText, it-maImage, 0, OString());
 pMenu-EnableItem( id, it-mbEnabled );
 pMenu-CheckItem ( id, it-meState == STATE_CHECK );
-nSepPos++;
 }
 }
 
 // add a separator below the inserted clipped-items
-pMenu-InsertSeparator( OString(), nSepPos );
+pMenu-InsertSeparator();
 
 // now append the items that are explicitly disabled
-for ( std::vector ImplToolItem ::reverse_iterator 
it(mpData-m_aItems.rbegin());
-it != mpData-m_aItems.rend(); ++it)
+for ( std::vector ImplToolItem ::iterator 
it(mpData-m_aItems.begin());
+it != mpData-m_aItems.end(); ++it)
 {
 if( it-IsItemHidden() )
 {
 sal_uInt16 id = it-mnId + TOOLBOX_MENUITEM_START;
-pMenu-InsertItem( id, it-maText, it-maImage, 0, OString(), 
nSepPos+1 );
+pMenu-InsertItem( id, it-maText, it-maImage, 0, OString() );
 pMenu-EnableItem( id, it-mbEnabled );
 pMenu-CheckItem( id, it-meState == STATE_CHECK );
 }
 }
+
 }
 }
 
___
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 svtools/source

2014-04-30 Thread Andrzej Hunt
 sfx2/source/inet/inettbc.cxx   |2 +-
 svtools/source/control/inettbc.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 74b45188b71a9fe22bb8997e3a23cc9a4b43d3c8
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Sat Apr 19 11:42:47 2014 +0100

fdo#72006 Populate Load URL dropdown from picklist.

f7feb4227d83f4f095597a44826277aaae2bc0df stopped any newly opened documents
from being added to the History list (and instead adds them to the 
picklist),
since the history list is not used anywhere else, and since the picklist 
performs
an equivalent function, it makes most sense just to use the picklist to 
populate
the list of URLs.

Change-Id: I5a06e7fefe3dc1fbe266f3191de4fbac03601858
Reviewed-on: https://gerrit.libreoffice.org/9104
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
(cherry picked from commit b8315b1c2f43ab44651e5089a63fb63e23a1ea73)
Reviewed-on: https://gerrit.libreoffice.org/9172
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 2f56911..297b4d2 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -219,7 +219,7 @@ void SfxURLToolBoxControl_Impl::StateChanged
 SvtURLBox* pURLBox = GetURLBox();
 pURLBox-Clear();
 
-::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue   lList = 
SvtHistoryOptions().GetList(eHISTORY);
+::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue   lList = 
SvtHistoryOptions().GetList(ePICKLIST);
 for (sal_Int32 i=0; ilList.getLength(); ++i)
 {
 ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  lProps = lList[i];
diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index 4cbe2a6..d526e77 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -153,7 +153,7 @@ SvtMatchContext_Impl::~SvtMatchContext_Impl()
 void SvtMatchContext_Impl::FillPicklist(std::vectorOUString rPickList)
 {
 // Einlesung der Historypickliste
-Sequence Sequence PropertyValue   seqPicklist = 
SvtHistoryOptions().GetList( eHISTORY );
+Sequence Sequence PropertyValue   seqPicklist = 
SvtHistoryOptions().GetList( ePICKLIST );
 sal_uInt32 nCount = seqPicklist.getLength();
 
 for( sal_uInt32 nItem=0; nItem  nCount; nItem++ )
@@ -948,7 +948,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
 if ( !bHistoryDisabled )
 {
 // read history pick list
-Sequence Sequence PropertyValue   seqPicklist = 
SvtHistoryOptions().GetList( eHISTORY );
+Sequence Sequence PropertyValue   seqPicklist = 
SvtHistoryOptions().GetList( ePICKLIST );
 sal_uInt32 nCount = seqPicklist.getLength();
 INetURLObject aCurObj;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Tor Lillqvist
 ucb/source/ucp/file/filglob.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e889874bf89c2e11a3c07b052cea6f0988a5a671
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 12:56:32 2014 +0300

WaE: 'bRemovable' may be used uninitialized in this function

Change-Id: I924c3d8ad246774fbf35e427565025aeb89155d7

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 5111594..c0bd6f9 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -62,7 +62,7 @@ namespace {
 {
 OUString aResourceName;
 OUString aResourceType;
-bool  bRemovable;
+bool bRemovable = false;
 bool bResourceName = false;
 bool bResourceType = false;
 bool bRemoveProperty = false;
___
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

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Depends on||78108

--- Comment #130 from Cor Nouws c...@nouenoff.nl ---
adding Bug 78108 - EDITING: Instability when pasting calc data that includes a
formula into writer (As calc8 object)

-- 
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: 15 commits - cui/source include/canvas include/svx sc/source sdext/source sd/source sfx2/source svx/source sw/source

2014-04-30 Thread Caolán McNamara
 cui/source/customize/cfg.cxx|3 +++
 include/canvas/base/canvasbase.hxx  |2 +-
 include/canvas/base/integerbitmapbase.hxx   |8 
 include/svx/unoshape.hxx|6 +++---
 sc/source/ui/view/cellsh2.cxx   |2 +-
 sd/source/ui/dlg/custsdlg.cxx   |2 +-
 sdext/source/pdfimport/tree/genericelements.hxx |   11 +--
 sfx2/source/view/viewprn.cxx|4 
 svx/source/unodraw/shapeimpl.hxx|2 +-
 svx/source/unodraw/tableshape.cxx   |2 +-
 svx/source/unodraw/unoshap3.cxx |6 +++---
 sw/source/core/uibase/inc/glossary.hxx  |1 -
 12 files changed, 31 insertions(+), 18 deletions(-)

New commits:
commit 225cc70f398963f39dfe7d986d61462e07417a8a
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 29 21:25:07 2014 +0100

coverity#704598 Dereference after null check

Change-Id: I37bb96ae15c2e96ed4592f1a2a13d4f932be0d2b

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8135610..c9a485b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -266,6 +266,9 @@ generateCustomName(
 name = prefix + OUString::number( suffix );
 }
 
+if (!entries)
+return name;
+
 // now check is there is an already existing entry with this name
 SvxEntries::const_iterator iter = entries-begin();
 
commit 7210621e0367f2bcac8509c7701ebd272ad5ee3c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 29 21:22:44 2014 +0100

coverity#704714 Dereference after null check

Change-Id: Ib15d4f52ed57dae053d3b21b476b4e595145e38b

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 42b6316..097fa19 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -1166,7 +1166,7 @@ void ScCellShell::GetDBState( SfxItemSet rSet )
 
 case SID_DEFINE_DBNAME:
 {
-if ( pDocSh  pDocSh-IsDocShared() )
+if ( pDocSh-IsDocShared() )
 {
 rSet.DisableItem( nWhich );
 }
commit fd223840fe9c6e72965a45f74cf4d046a7891152
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 29 21:20:50 2014 +0100

coverity#704742 Dereference after null check

Change-Id: Ieb6d49041d3b540caacfb469291636213a465e62

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index cf6ee4a..3b53661 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -98,7 +98,7 @@ void SdCustomShowDlg::CheckState()
 m_pCbxUseCustomShow-Enable( bEnable );
 m_pBtnStartShow-Enable( true );
 
-if( bEnable )
+if (bEnable  pCustomShowList)
 pCustomShowList-Seek( nPos );
 }
 
commit 04503ecdbeccd6e46dc8f716a996d6d894bc1825
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 29 21:19:27 2014 +0100

coverity#704797 Dereference after null check

Change-Id: I4faf814dff06a2a5627af1c74ff46d2eb11bc62b

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 72555b1..8007221 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -448,6 +448,10 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute)
 _pOptions = ( (SfxPrinter*)_pSetupParent-GetPrinter() 
)-GetOptions().Clone();
 }
 
+assert(_pOptions);
+if (!_pOptions)
+return 0;
+
 // Create Dialog
 SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( 
static_castWindow*(_pSetupParent),
  _pViewSh, 
_pOptions );
commit 03bc0110e2926c7246e113ae5d45e14f26c4fe73
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 29 21:14:47 2014 +0100

coverity#1210085 Uncaught exception

Change-Id: Id73c7c0fcea319ddcb08ae95d28fb776e9bc05f3

diff --git a/include/canvas/base/integerbitmapbase.hxx 
b/include/canvas/base/integerbitmapbase.hxx
index d0a6500..0acd079 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -42,7 +42,7 @@ namespace canvas
 public:
 // XIntegerBitmap
 virtual ::com::sun::star::uno::Sequence sal_Int8  SAL_CALL getData( 
::com::sun::star::rendering::IntegerBitmapLayout bitmapLayout,
-  
const ::com::sun::star::geometry::IntegerRectangle2D rect ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::rendering::VolatileContentDestroyedException, 
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+  
const ::com::sun::star::geometry::IntegerRectangle2D rect ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 78108, which changed state.

Bug 78108 Summary: EDITING: Instability when pasting calc data that includes a 
formula into writer (As calc8 object)
https://bugs.freedesktop.org/show_bug.cgi?id=78108

   What|Removed |Added

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

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


[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Depends on||77806

--- Comment #131 from Cor Nouws c...@nouenoff.nl ---
adding Bug 77806 - copy cells from calc and paste in writer makes libreoffice
crash

-- 
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 'distro/collabora/cp-4.2' - bridges/source

2014-04-30 Thread Tor Lillqvist
 bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 77cfb8478c8e8058bb43e92fa18c47411e11b2cf
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 14:11:19 2014 +0300

Fix compilation error against OS X SDK 10.9

Despite what the comment says, it seems that the declarations *must*
match the ones in the SDK's cxxabi.h. (Why do we need our own
declarations at all then? I am not entirely sure.)

Change-Id: I32c2bed69816dc5fd0a20afe04c5a9045ee70dc1

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index c8535d6..a10e461 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -137,10 +137,17 @@ namespace CPPU_CURRENT_NAMESPACE
 // complain about redeclarations of these somewhat implicitly declared
 // functions):
 #if __GNUC__ == 4  __GNUC_MINOR__ = 6
+
+#if defined __clang__  MACOSX_SDK_VERSION = 1090
+#define CXA_THROW_TINFO_TYPE std::type_info *
+#else
+#define CXA_THROW_TINFO_TYPE void *
+#endif
+
 extern C void *__cxa_allocate_exception(
 std::size_t thrown_size ) throw();
 extern C void __cxa_throw (
-void *thrown_exception, void *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
+void *thrown_exception, CXA_THROW_TINFO_TYPE tinfo, void (*dest) (void *) 
) __attribute__((noreturn));
 #endif
 
 // -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


How to build an old version of LibO

2014-04-30 Thread Laurent BP
Hi,

I've trouble with git. I'd like to build a version of LibO 4-2 (~ October
2013). 
I switched to my local branch of libreoffice-4-2 (git checkout
libreoffice-4-2) then launched gitk, selected the commit where I want to
come back, right clicked  Reinit libreoffice-4-2 branch to this state,
selected hard reinitialisation. Then I made a make but the build version
is a fresh 4.3 master :(
make distclean and restart the process did not change anything.
Where did I make a mistake?

Thanks for your help.



-
LibreOffice 4.1.1.2
--
View this message in context: 
http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986.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


Re: How to build an old version of LibO

2014-04-30 Thread Bjoern Michaelsen
Hi Laurent,

On Wed, Apr 30, 2014 at 04:51:21AM -0700, Laurent BP wrote:
 I switched to my local branch of libreoffice-4-2 (git checkout
 libreoffice-4-2) then launched gitk, selected the commit where I want to
 come back, right clicked  Reinit libreoffice-4-2 branch to this state,
 selected hard reinitialisation. Then I made a make but the build version
 is a fresh 4.3 master :(

What do:

 git log -1

and:

 git status

return?

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


[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - ucb/Library_ucpdav1.mk

2014-04-30 Thread Tor Lillqvist
 ucb/Library_ucpdav1.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b918a7fc0d1042d2e93e9c0ac2e865da1a71d739
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 15:02:57 2014 +0300

apr needs libiconv at least on OS X

Change-Id: I8c5be8b8a72b0529b974f2618cad323601854720

diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 51225d2..4322dfc 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -62,6 +62,7 @@ else # WITH_WEBDAV == serf
 $(eval $(call gb_Library_use_externals,ucpdav1,\
boost_headers \
apr \
+   $(if $(filter $(OS),MACOSX),iconv) \
openssl \
serf \
zlib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: How to build an old version of LibO

2014-04-30 Thread Laurent BP
Thanks for your reply.

Bjoern Michaelsen wrote
 What do:
 
 git log -1

It returns the commit where I wanted to return.


Bjoern Michaelsen wrote
 and:
 
 git status

# Sur la branche libreoffice-4-2
# Votre branche est en retard sur 'origin/libreoffice-4-2' de 4607 commits,
et peut être mise à jour en avance rapide.
#   (utilisez git pull pour mettre à jour votre branche locale)
#
# Fichiers non suivis:
#   (utilisez git add fichier... pour inclure dans ce qui sera validé)
#
#   external/tarballs/
#   ios/lo.xcconfig
#
# L'énumération des fichiers non suivis a duré 3.46 secondes. 'status -uno'
# peut l'accélerer, mais vous devez alors faire attention à ne pas
# oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help
status').
aucune modification ajoutée à la validation mais des fichiers non suivis
sont présents (utilisez git add pour les suivre)

However About box when I launch libo returns
Version: 4.3.0.0.alpha1+
Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa

Laurent BP



-
LibreOffice 4.1.1.2
--
View this message in context: 
http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4106990.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


Re: How to build an old version of LibO

2014-04-30 Thread Christian Lohmaier
Hi Laurent, *,

On Wed, Apr 30, 2014 at 1:51 PM, Laurent BP jumbo4...@yahoo.fr wrote:

 I've trouble with git. I'd like to build a version of LibO 4-2 (~ October
 2013).
 I switched to my local branch of libreoffice-4-2 (git checkout
 libreoffice-4-2) then launched gitk, selected the commit where I want to
 come back, right clicked  Reinit libreoffice-4-2 branch to this state,
 selected hard reinitialisation.

Hmm. I wouldn't do that (as I don't know what that would do), instead I'd do a

git checkout -b myoldlibreofficebranch whatevergitcommityoupicked

That should do the trick.

  Then I made a make but the build version
 is a fresh 4.3 master :(
 make distclean and restart the process did not change anything.
 Where did I make a mistake?

No idea what gitk does when using those commands, so best is to look
what your git thinks it is working with (like Björn mentioned).

btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-)

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


Re: How to build an old version of LibO

2014-04-30 Thread Christian Lohmaier
Hi Laurent,

2014-04-30 14:15 GMT+02:00 Laurent BP jumbo4...@yahoo.fr:
 Bjoern Michaelsen wrote
 What do:

 git log -1

 It returns the commit where I wanted to return.

and that would be what commit?

 [...]
 However About box when I launch libo returns
 Version: 4.3.0.0.alpha1+
 Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa

That commit's configure.ac shows 4.3.0.0.alpha1+ version - so that
then is expected.
The commit wasn't selected from 4-2 branch

Looking at that commit's date (4 days ago) also confirms this.
http://cgit.freedesktop.org/libreoffice/core/commit/?h=c6c286f14468d341f5fd88edc39a37175a1b6caa
is from end of april 2014, not from october 2013.

So remember that LO just passes control to running instance, so when
you have 4.3 alpha+ running, and then launch 4.2 dev, it will still
just reuse 4.3

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


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e6/2c0f54ef18a5a79b76e934834b148523c69847

2014-04-30 Thread Caolán McNamara
 e6/2c0f54ef18a5a79b76e934834b148523c69847 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 199b6a143b7298bdd0d4ea01745f79723d0e8027
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 13:36:36 2014 +0100

Notes added by 'git notes add'

diff --git a/e6/2c0f54ef18a5a79b76e934834b148523c69847 
b/e6/2c0f54ef18a5a79b76e934834b148523c69847
new file mode 100644
index 000..db2e10f
--- /dev/null
+++ b/e6/2c0f54ef18a5a79b76e934834b148523c69847
@@ -0,0 +1 @@
+merged as: 4d878a080907211f827bdf42184e98075a4ad0f5
___
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' - a6/efc99d19d533fcf53106b6667bafba4d364370

2014-04-30 Thread Caolán McNamara
 a6/efc99d19d533fcf53106b6667bafba4d364370 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 40b8723c427fb48bda8a891a364df4d3d49742a2
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 13:37:04 2014 +0100

Notes added by 'git notes add'

diff --git a/a6/efc99d19d533fcf53106b6667bafba4d364370 
b/a6/efc99d19d533fcf53106b6667bafba4d364370
new file mode 100644
index 000..5a94378
--- /dev/null
+++ b/a6/efc99d19d533fcf53106b6667bafba4d364370
@@ -0,0 +1 @@
+merged as: 0a1d822372927e3252f40b7a16590716ccc2eedd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: readlicense_oo/license UnoControls/source

2014-04-30 Thread Pedro Giffuni
 UnoControls/source/base/basecontainercontrol.cxx |2 +-
 readlicense_oo/license/NOTICE|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4d878a080907211f827bdf42184e98075a4ad0f5
Author: Pedro Giffuni p...@apache.org
Date:   Tue Apr 29 19:30:16 2014 +

Many spelling fixes: some more files.

Attempt to clean up most but certainly not all the spelling
mistakes that found home in OpenOffice through decades.

(cherry picked from commit e62c0f54ef18a5a79b76e934834b148523c69847)

Conflicts:
LICENSE
NOTICE_category_b
UnoControls/source/base/basecontainercontrol.cxx
UnoControls/source/base/registercontrols.cxx
UnoControls/source/controls/OConnectionPointContainerHelper.cxx
UnoControls/source/controls/progressbar.cxx
UnoControls/source/controls/progressmonitor.cxx
UnoControls/source/controls/statusindicator.cxx
UnoControls/source/inc/framecontrol.hxx

Change-Id: I882a1d640d931b4e89b2d19f3585fd35fdd320ca

diff --git a/UnoControls/source/base/basecontainercontrol.cxx 
b/UnoControls/source/base/basecontainercontrol.cxx
index 7608ad2..2c58848 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -454,7 +454,7 @@ void BaseContainerControl::impl_cleanMemory ()
 // Delete all items.
 for ( nCount = 0; nCount  nMaxCount; ++nCount )
 {
-// Delete everytime first element of list!
+// Delete every time first element of list!
 // We count from 0 to MAX, where MAX=count of items BEFORE we delete 
some elements!
 // If we use GetObject ( nCount ) ... it can be, that we have an 
index greater then count of current elements!
 
diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE
index def4f27..fd63ab4 100644
--- a/readlicense_oo/license/NOTICE
+++ b/readlicense_oo/license/NOTICE
@@ -27,7 +27,7 @@ Apache projects:
 - Apache Portable Runtime Utility Library
 - Apache Commons - used by MediaWiki Publisher extension
 - Apache Jakarta HttpClient - used by MediaWiki Publisher extension
-- Apache Tomcat - used by MediaWiki Piblisher extension
+- Apache Tomcat - used by MediaWiki Publisher extension
 
 The notices from these projects are following:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: ImageMagick convert -- a required bundle to handle EPS on Windows and OSX?

2014-04-30 Thread Christian Lohmaier
Hi Stuart, *,

On Tue, Apr 29, 2014 at 3:38 PM, V Stuart Foote vstuart.fo...@utsa.edu wrote:

 Not sure I would characterize EPS as simply a niche use.

 EPS, still much more so than SVG, is the preferred format for preparation of
 vector based technical images, graphs and charts for academic and scientific
 publication.

So this is perfect example of niche use.
I dare to say that it is not for the merits of eps format, but rather
due to the fact that this is one of the few/only formats that
latex/TeX can digest without any trouble.

(And for actual publication you supply the text and the graphics
separately anyway, as the layouting will be done by the magazine)

 When you consider that  Windows continues to hold  the high
 percentage of user seats it does---poor support for EPS makes LibreOffice a
 poor choice for such work, compounded further by continued lack of support
 of TeX based renderings that alienates an entire class of academic users.

If students are told to use TeX, they don't have a choice but to use
TeX anyway. Even if LO supported it, you'd still need to hand in your
paper created using TeX. And again: this is niche in my eyes.

And even more so as you also correctly stated:
a) on one hand the conversions using those are inferior to the
conversion using dedicated tools
b) for most users it will only be a bitmap representation, not a vector format.

The user is much better off converting EPS to a more suitable format
prior to using it with LibreOffice.

 Notification that the three EPS helper programs are not bundled with
 LibreOffice and that some mix of them is required, with some clear guidance
 as to best practices seems reasonable until such time as native EPS handling
 can be implemented.

I don't think so. LibreOffice doesn't understand EPS. It cannot embed
it as EPS as is in PDF (you need to print to real postscript, that's
the only part where the eps is actually used).
In all other cases a bitmap representation is used (as ~nobody will
have ps2edit installed). And it is a convenience that LibreOffice
hooks into those external programs to create one if there is none
embedded in the EPS.

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


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

2014-04-30 Thread Miklos Vajna
 sw/qa/core/exportdata/html/pass/cp168.odt |binary
 sw/qa/core/filters-test.cxx   |8 
 sw/source/filter/writer/wrt_fn.cxx|3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 1de73df9cb3fdda3732c5270864bc30e38e63c2f
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 30 14:40:16 2014 +0200

cp#168 testcase

Change-Id: I0dbbfd9c82600fbc5c98c5107639e1714b220c71

diff --git a/sw/qa/core/exportdata/html/fail/.gitignore 
b/sw/qa/core/exportdata/html/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/exportdata/html/indeterminate/.gitignore 
b/sw/qa/core/exportdata/html/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/exportdata/html/pass/cp168.odt 
b/sw/qa/core/exportdata/html/pass/cp168.odt
new file mode 100644
index 000..8ae4ad5
Binary files /dev/null and b/sw/qa/core/exportdata/html/pass/cp168.odt 
differ
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 3cbad56..8548616 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -180,6 +180,14 @@ void SwFiltersTest::testCVEs()
 0,
 0,
 /*bExport=*/true);
+
+testDir(HTML,
+getURLFromSrc(/sw/qa/core/exportdata/html/),
+OUString(sHTML),
+0,
+0,
+0,
+/*bExport=*/true);
 }
 
 void SwFiltersTest::setUp()
commit 78eadd2f122e072f217137199430f113f41b450a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 30 11:28:40 2014 +0200

cp#168 sw HTML export: fix crash when trying to export new 
FillAttributes

Change-Id: I588b8f7d953fe6a3e04ad48074e5f3f554449a79

diff --git a/sw/source/filter/writer/wrt_fn.cxx 
b/sw/source/filter/writer/wrt_fn.cxx
index 2948160..07dca7f 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -60,7 +60,8 @@ Writer Out_SfxItemSet( const SwAttrFnTab pTab, Writer rWrt,
 SfxItemIter aIter( *pSet );
 pItem = aIter.GetCurItem();
 do {
-if( 0 != ( pOut = pTab[ pItem-Which() - RES_CHRATR_BEGIN] ))
+// pTab only covers POOLATTR_BEGIN..POOLATTR_END.
+if( pItem-Which() = POOLATTR_END  0 != ( pOut = pTab[ 
pItem-Which() - RES_CHRATR_BEGIN] ))
 (*pOut)( rWrt, *pItem );
 } while( !aIter.IsAtEnd()  0 != ( pItem = aIter.NextItem() ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Zolnai Tamás
 sd/source/ui/func/fuinsert.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1f2894314328724b1654ee9990406460e4461ffd
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Wed Apr 30 14:10:35 2014 +0200

3D model insertion: here we need MM100

Change-Id: Iaa99e50589e08e8d82d860b6c61e6cbf0fd19b0a

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 4748442..a8c5eac 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -795,9 +795,14 @@ void FuInsert3DModel::DoExecute( SfxRequest )
 mpWindow-EnterWait();
 
 Point aPos;
-Size aSize(480,360);
 sal_Int8 nAction = DND_ACTION_COPY;
 
+Size aSize(480,360);
+if( mpWindow )
+aSize = mpWindow-PixelToLogic( aSize, MAP_100TH_MM );
+else
+aSize = Application::GetDefaultDevice()-PixelToLogic( aSize, 
MAP_100TH_MM );
+
 if( mpWindow )
 {
 aPos = mpWindow-PixelToLogic( Rectangle( aPos, 
mpWindow-GetOutputSizePixel() ).Center() );
@@ -805,6 +810,7 @@ void FuInsert3DModel::DoExecute( SfxRequest )
 aPos.Y() -= aSize.Height()  1;
 }
 
+
 mpView-Insert3DModelURL( sURL, nAction, aPos, aSize, false ) ;
 
 if( mpWindow )
___
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-4' - instsetoo_native/CustomTarget_setup.mk

2014-04-30 Thread Bjoern Michaelsen
 instsetoo_native/CustomTarget_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0c38c8505a523f3bde3ee4fca3e513cdd6044d5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Apr 4 18:17:57 2014 +0200

set OOo reference version to 4.1 for incompatible MessageBox changes

This commit:

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

make LibreOffice 4.2 (and AOO 4.1) widely incompatible to previous
versions. We should thus update the reference version to 4.1 as that is
the version we are least incompatible with. Extension developers are
encouraged to use LibreOffice-minimal-version instead anyway, instead of
the obsolete OOo versioning. see:

 https://wiki.documentfoundation.org/Development/Extension_Development
 
https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=commitdiff;h=61f9ca7b18de1adc58cf5d7cb295ba81eb3e5d92;hp=20b8edc74b846db6d143a9e327fb7f7eb2c1fb77

Change-Id: I8275a8244d642100d7b3bc17aa0b12ae7d63e583
Reviewed-on: https://gerrit.libreoffice.org/8852
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
(cherry picked from commit ab67b79c7469cea7de82b6eb6ca1f690063c069c)
Reviewed-on: https://gerrit.libreoffice.org/9210
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 81d48b6..3b73589 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -164,7 +164,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 echo 
'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update'
 \
 echo 
'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \
 echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \
-echo 'ReferenceOOoMajorMinor=3.4' \
+echo 'ReferenceOOoMajorMinor=4.1' \
 echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
 echo 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
 echo 'UpdateUserAgent=PRODUCT ($${buildid}; $${_OS}; 
$${_ARCH}; BundledLanguages=$${AllLanguages})' \
___
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-4' - desktop/source

2014-04-30 Thread Bjoern Michaelsen
 desktop/source/deployment/misc/dp_dependencies.cxx |   15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit fb36190cd34683270b0eae345401ebaf8cf30e24
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Apr 4 18:47:28 2014 +0200

ignore legacy OpenOffice.org-*-version, when a LibreOffice-*-version is 
given

Change-Id: Ie5b6ffee07b6e5ebf922bad1b4a268ff636412c9
Reviewed-on: https://gerrit.libreoffice.org/8853
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
(cherry picked from commit 42905aecfcdee9eb2c184bceeec4f8688056cd73)
Reviewed-on: https://gerrit.libreoffice.org/9209
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx 
b/desktop/source/deployment/misc/dp_dependencies.cxx
index 817c9b4..696d3a7 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -103,18 +103,29 @@ check(dp_misc::DescriptionInfoset const  infoset) {
 css::uno::Sequence css::uno::Reference css::xml::dom::XElement  
 unsatisfied(n);
 sal_Int32 unsat = 0;
+// check first if minimalVersionLibreOffice is specified -- in that case 
ignore the legacy OOo dependencies
+bool bIgnoreOoo = false;
+for (sal_Int32 i = 0; i  n; ++i) {
+css::uno::Reference css::xml::dom::XElement  e(
+deps-item(i), css::uno::UNO_QUERY_THROW);
+if ( e-getNamespaceURI() == namespaceLibreOffice  e-getTagName() 
== minimalVersionLibreOffice)
+{
+bIgnoreOoo = true;
+break;
+}
+}
 for (sal_Int32 i = 0; i  n; ++i) {
 css::uno::Reference css::xml::dom::XElement  e(
 deps-item(i), css::uno::UNO_QUERY_THROW);
 bool sat = false;
 if ( e-getNamespaceURI() == namespaceOpenOfficeOrg  e-getTagName() 
== minimalVersionOpenOfficeOrg )
 {
-sat = satisfiesMinimalVersion(
+sat = bIgnoreOoo || satisfiesMinimalVersion(
 getReferenceOpenOfficeOrgMajorMinor(),
 e-getAttribute(value));
 } else if ( e-getNamespaceURI() == namespaceOpenOfficeOrg  
e-getTagName() == maximalVersionOpenOfficeOrg )
 {
-sat = satisfiesMaximalVersion(
+sat = bIgnoreOoo || satisfiesMaximalVersion(
 getReferenceOpenOfficeOrgMajorMinor(),
 e-getAttribute(value));
 } else if (e-getNamespaceURI() == namespaceLibreOffice  
e-getTagName() == minimalVersionLibreOffice )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: 10 commits - include/svx include/unotools sc/source svx/source sw/source unotools/source xmlreader/source

2014-04-30 Thread Caolán McNamara
 include/svx/svdpoev.hxx  |6 +++---
 include/unotools/ucbhelper.hxx   |2 +-
 sc/source/ui/view/tabvwsh2.cxx   |6 ++
 svx/source/svdraw/svddrgmt.cxx   |6 +++---
 svx/source/svdraw/svdpoev.cxx|   16 +++-
 sw/source/core/uibase/shells/annotsh.cxx |4 ++--
 sw/source/ui/fldui/fldfunc.cxx   |2 +-
 sw/source/ui/frmdlg/frmpage.cxx  |1 +
 sw/source/ui/frmdlg/wrap.cxx |6 +-
 unotools/source/ucbhelper/ucbhelper.cxx  |   22 ++
 xmlreader/source/xmlreader.cxx   |5 +++--
 11 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 9b79e515e73b93601a7771ce6366c4312c07b25a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 12:35:34 2014 +0100

coverity#738904 Uninitialized scalar field

Change-Id: I6b6955036d2bb98b19eafdb273df886708ec6ab3

diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index ab4ea04..400b500 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -40,6 +40,7 @@ using namespace ::com::sun::star;
 SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet rCoreSet)
 : SwFldPage(pParent, FldFuncPage,
 modules/swriter/ui/fldfuncpage.ui, rCoreSet)
+, nOldFormat(0)
 , bDropDownLBChanged(false)
 {
 get(m_pTypeLB, type);
@@ -86,7 +87,6 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const 
SfxItemSet rCoreSet)
 
 m_pCond1ED-ShowBrackets(false);
 m_pCond2ED-ShowBrackets(false);
-
 }
 
 SwFldFuncPage::~SwFldFuncPage()
commit 4c9879922d0c77ecc79e6e321ecf9df9e7511218
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 12:34:43 2014 +0100

coverity#738907 Uninitialized scalar field

Change-Id: I2c82911f47aa6c0fff489e5a4cfd4d171981c722

diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 03d6384..cdf91ac 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -64,14 +64,18 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet rSet, 
SwWrtShell* pSh, bool bD
 
 SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet rSet)
 : SfxTabPage(pParent, WrapPage , modules/swriter/ui/wrappage.ui, rSet)
+, nOldLeftMargin(0)
+, nOldRightMargin(0)
+, nOldUpperMargin(0)
+, nOldLowerMargin(0)
 , nAnchorId(FLY_AT_PARA)
 , nHtmlMode(0)
 , pWrtSh(0)
 , bFormat(false)
 , bNew(true)
 , bHtmlMode(false)
+, bDrawMode(false)
 , bContourImage(false)
-
 {
 get(m_pNoWrapRB, none);
 get(m_pWrapLeftRB, before);
commit 9ea63828211294bfdea4fda340466ddb5d0c48b3
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 12:32:22 2014 +0100

coverity#738906 Uninitialized scalar field

Change-Id: I9fabb1236011bc04238af0e6952d3ff0f07c9463

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 2775966..8242c6d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2351,6 +2351,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const 
SfxItemSet rSet)
 : SfxTabPage(pParent, PicturePage,
 modules/swriter/ui/picturepage.ui, rSet)
 , pGrfDlg(0)
+, bHtmlMode(false)
 {
 get(m_pMirror, flipframe);
 get(m_pMirrorVertBox, vert);
commit ca03d495a0d8847366ab041ca8a3ac8f6de93c4e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 12:30:34 2014 +0100

coverity#708727 Uninitialized pointer field

Change-Id: I816f7e239f83c35666101aac057912dd7e65ecff

diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 81e7a38..0d49c42 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -70,8 +70,9 @@ XmlReader::XmlReader(char const *sStr, size_t nLength)
 
 XmlReader::XmlReader(OUString const  fileUrl)
 SAL_THROW((
-css::container::NoSuchElementException, css::uno::RuntimeException)):
-fileUrl_(fileUrl)
+css::container::NoSuchElementException, css::uno::RuntimeException))
+: fileUrl_(fileUrl)
+, fileHandle_(0)
 {
 oslFileError e = osl_openFile(
 fileUrl_.pData, fileHandle_, osl_File_OpenFlag_Read);
commit ac7f1147b7d2c9ddb2b2cf12ef0ea9f45c315e8a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 12:24:40 2014 +0100

coverity#705024 Dereference after null check

Change-Id: Ida523e52df6ec2c5e62e9a63cd1857650f84234b

diff --git a/sw/source/core/uibase/shells/annotsh.cxx 
b/sw/source/core/uibase/shells/annotsh.cxx
index f8524be..32b0e77 100644
--- a/sw/source/core/uibase/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
@@ -1529,7 +1529,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet rSet)
 {
 case SID_UNDO:
 {
-sal_uInt16 nCount = pUndoManager-GetUndoActionCount();
+sal_uInt16 nCount = pUndoManager ? 

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

2014-04-30 Thread Kohei Yoshida
 include/svtools/treelist.hxx |4 
 sc/inc/column.hxx|5 -
 sc/source/core/data/column3.cxx  |7 +--
 sc/source/core/data/table3.cxx   |9 +++--
 sc/source/ui/cctrl/checklistmenu.cxx |   32 +---
 sc/source/ui/inc/checklistmenu.hxx   |4 ++--
 svtools/source/contnr/treelist.cxx   |   11 ++-
 7 files changed, 57 insertions(+), 15 deletions(-)

New commits:
commit 5e1fdc8cdf3bd35cee2e7c193827f5f5a1c534ac
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Apr 29 15:32:18 2014 -0400

fdo#75058: Optimize autofilter item filling for non-tree items.

(cherry picked from commit 878a5dabff4669fb606a461e11eaf286d0c8b07f)
(cherry picked from commit 0b03f7ed575838f90e6b1ebec3538a3a214f81fb)

Conflicts:
sc/source/ui/cctrl/checklistmenu.cxx
sc/source/ui/inc/checklistmenu.hxx

Change-Id: I1b3ae601726401a0e70fb1a05b9a90c43773794c
Reviewed-on: https://gerrit.libreoffice.org/9211
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 4d0264f..b39dd88 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -75,6 +75,8 @@ class SVT_DLLPUBLIC SvTreeList
 
 sal_BoolbAbsPositionsValid;
 
+bool mbEnableInvalidate;
+
 SvTreeListEntry*FirstVisible() const { return First(); }
 SvTreeListEntry*NextVisible( const SvListView*,SvTreeListEntry* 
pEntry, sal_uInt16* pDepth=0 ) const;
 SvTreeListEntry*PrevVisible( const SvListView*,SvTreeListEntry* 
pEntry, sal_uInt16* pDepth=0 ) const;
@@ -146,6 +148,8 @@ public:
 sal_uLong nPos=0
 );
 
+void EnableInvalidate( bool bEnable );
+
 // Notify all Listeners
 voidInvalidateEntry( SvTreeListEntry* );
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 092ec06..53ca5cc 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -452,7 +452,10 @@ public:
 /// Including current, may return -1
 SCsROW  GetNextUnprotected( SCROW nRow, bool bUp ) const;
 
-void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, 
std::vectorScTypedStrData rStrings, bool rHasDates);
+void GetFilterEntries(
+sc::ColumnBlockConstPosition rBlockPos, SCROW nStartRow, SCROW 
nEndRow,
+std::vectorScTypedStrData rStrings, bool rHasDates );
+
 bool GetDataEntries( SCROW nRow, std::setScTypedStrData rStrings, bool 
bLimit ) const;
 
 void UpdateInsertTabAbs(SCTAB nNewPos);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 8dcf20e..ef726d1 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2055,10 +2055,13 @@ public:
 
 }
 
-void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, 
std::vectorScTypedStrData rStrings, bool rHasDates)
+void ScColumn::GetFilterEntries(
+sc::ColumnBlockConstPosition rBlockPos, SCROW nStartRow, SCROW nEndRow,
+std::vectorScTypedStrData rStrings, bool rHasDates )
 {
 FilterEntriesHandler aFunc(*this, rStrings);
-sc::ParseAllNonEmpty(maCells.begin(), maCells, nStartRow, nEndRow, aFunc);
+rBlockPos.miCellPos =
+sc::ParseAllNonEmpty(rBlockPos.miCellPos, maCells, nStartRow, nEndRow, 
aFunc);
 rHasDates = aFunc.hasDates();
 }
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 429cd52..1765f25 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2556,12 +2556,17 @@ bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW 
nStartRow, SCCOL /* nEndCol *
 
 void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, 
std::vectorScTypedStrData rStrings, bool rHasDates)
 {
-aCol[nCol].GetFilterEntries( nRow1, nRow2, rStrings, rHasDates );
+sc::ColumnBlockConstPosition aBlockPos;
+aCol[nCol].InitBlockPosition(aBlockPos);
+aCol[nCol].GetFilterEntries(aBlockPos, nRow1, nRow2, rStrings, rHasDates);
 }
 
 void ScTable::GetFilteredFilterEntries(
 SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam rParam, 
std::vectorScTypedStrData rStrings, bool rHasDates)
 {
+sc::ColumnBlockConstPosition aBlockPos;
+aCol[nCol].InitBlockPosition(aBlockPos);
+
 // remove the entry for this column from the query parameter
 ScQueryParam aParam( rParam );
 aParam.RemoveEntryByField(nCol);
@@ -2573,7 +2578,7 @@ void ScTable::GetFilteredFilterEntries(
 if (ValidQuery(j, aParam))
 {
 bool bThisHasDates = false;
-aCol[nCol].GetFilterEntries( j, j, rStrings, bThisHasDates );
+aCol[nCol].GetFilterEntries(aBlockPos, j, j, rStrings, 
bThisHasDates);
 bHasDates |= bThisHasDates;
 }
 }
diff --git 

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

2014-04-30 Thread Jacobo Aragunde Pérez
 oox/source/drawingml/effectpropertiescontext.cxx |   38 
 oox/source/export/drawingml.cxx  |  100 +--
 sw/inc/hints.hxx |2 
 sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx  |   41 
 sw/source/core/attr/hints.cxx|7 
 sw/source/core/text/txtfrm.cxx   |   22 +-
 sw/source/core/txtnode/thints.cxx|   20 +-
 8 files changed, 207 insertions(+), 23 deletions(-)

New commits:
commit ae4e79e7728b39bdb98f023d950dbbfa7c4c38d4
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Wed Apr 30 12:14:02 2014 +0200

oox: Code protection against empty effects

This is an extra check against clumsy programmers like me to prevent
generating incorrect documents.

Change-Id: I22261e3b6123a9a44461683519e33224f08adb5a

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a1f00fd..1fde44a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2251,20 +2251,23 @@ void DrawingML::WriteShapeEffects( Reference 
XPropertySet  rXPropSet )
 }
 }
 
-mpFS-startElementNS(XML_a, XML_effectLst, FSEND);
-sax_fastparser::XFastAttributeListRef xAttrList( aOuterShdwAttrList );
-mpFS-startElement( nEffectToken, xAttrList );
-
-if( bContainsColor )
+if( nEffectToken  0 )
 {
-if( sSchemeClr.isEmpty() )
-WriteColor( nRgbClr, nAlpha );
-else
-WriteColor( sSchemeClr, aTransformations );
-}
+mpFS-startElementNS(XML_a, XML_effectLst, FSEND);
+sax_fastparser::XFastAttributeListRef xAttrList( aOuterShdwAttrList );
+mpFS-startElement( nEffectToken, xAttrList );
 
-mpFS-endElement( nEffectToken );
-mpFS-endElementNS(XML_a, XML_effectLst);
+if( bContainsColor )
+{
+if( sSchemeClr.isEmpty() )
+WriteColor( nRgbClr, nAlpha );
+else
+WriteColor( sSchemeClr, aTransformations );
+}
+
+mpFS-endElement( nEffectToken );
+mpFS-endElementNS(XML_a, XML_effectLst);
+}
 }
 
 }
commit 2310af236659f4fdd4c26b1e277e568d04a20687
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Wed Apr 30 11:18:49 2014 +0200

ooxml: Preserve blur effect on shapes.

Reused the code for other effects just adding the new attribute
grow.

I didn't add a unit test for this effect because I found no way to
apply it to an object in Word, but it's technically part of the
standard.

Change-Id: I391aff17f59d49d6bf339a71481dcdb51c537c9e

diff --git a/oox/source/drawingml/effectpropertiescontext.cxx 
b/oox/source/drawingml/effectpropertiescontext.cxx
index 6699678..2493ec9 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -80,6 +80,9 @@ void EffectPropertiesContext::saveUnsupportedAttribs( const 
AttributeList rAttr
 if( rAttribs.hasAttribute( XML_stPos ) )
 mrEffectProperties.appendUnsupportedEffectAttrib( stPos,
   makeAny( 
rAttribs.getInteger( XML_stPos, 0 ) ) );
+if( rAttribs.hasAttribute( XML_grow ) )
+mrEffectProperties.appendUnsupportedEffectAttrib( grow,
+  makeAny( 
rAttribs.getInteger( XML_grow, 0 ) ) );
 }
 
 ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 
nElement, const AttributeList rAttribs )
@@ -109,6 +112,7 @@ ContextHandlerRef EffectPropertiesContext::onCreateContext( 
sal_Int32 nElement,
 case A_TOKEN( glow ):
 case A_TOKEN( softEdge ):
 case A_TOKEN( reflection ):
+case A_TOKEN( blur ):
 {
 if( nElement == A_TOKEN( glow ) )
 mrEffectProperties.msUnsupportedEffectName = glow;
@@ -116,6 +120,8 @@ ContextHandlerRef EffectPropertiesContext::onCreateContext( 
sal_Int32 nElement,
 mrEffectProperties.msUnsupportedEffectName = softEdge;
 else if( nElement == A_TOKEN( reflection ) )
 mrEffectProperties.msUnsupportedEffectName = reflection;
+else if( nElement == A_TOKEN( blur ) )
+mrEffectProperties.msUnsupportedEffectName = blur;
 saveUnsupportedAttribs( rAttribs );
 return new ColorContext( *this, 
mrEffectProperties.maShadow.moShadowColor );
 }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8cf14e3..a1f00fd 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2102,7 +2102,7 @@ void DrawingML::WriteShapeEffects( Reference 
XPropertySet  rXPropSet )
 {
 if( aEffectProps[i].Name == outerShdw || 

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

2014-04-30 Thread Tomaž Vajngerl
 vcl/source/outdev/bitmap.cxx |   72 ++-
 1 file changed, 37 insertions(+), 35 deletions(-)

New commits:
commit ebe854c9d967ed1ec4eee40db984717c2275f722
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Apr 30 16:56:08 2014 +0200

vcl: clean-up DrawDeviceBitmap method

Change-Id: I392993ca1d6a62778105026b724c26578b4e1fec

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 4fabf50..c80ee4b 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -488,13 +488,13 @@ BitmapEx OutputDevice::GetBitmapEx( const Point rSrcPt, 
const Size rSize ) con
 
 void OutputDevice::DrawDeviceBitmap( const Point rDestPt, const Size 
rDestSize,
  const Point rSrcPtPixel, const Size 
rSrcSizePixel,
- BitmapEx rBmpEx )
+ BitmapEx rBitmapEx )
 {
-if(rBmpEx.IsAlpha())
+if (rBitmapEx.IsAlpha())
 {
 Size aDestSizePixel(LogicToPixel(rDestSize));
 
-BitmapEx aScaledBitmapEx(rBmpEx);
+BitmapEx aScaledBitmapEx(rBitmapEx);
 Point aSrcPtPixel(rSrcPtPixel);
 Size aSrcSizePixel(rSrcSizePixel);
 
@@ -515,10 +515,8 @@ void OutputDevice::DrawDeviceBitmap( const Point rDestPt, 
const Size rDestSize
 aSrcPtPixel.Y() = rSrcPtPixel.Y() * fScaleY;
 }
 DrawDeviceAlphaBitmap(aScaledBitmapEx.GetBitmap(), 
aScaledBitmapEx.GetAlpha(), rDestPt, rDestSize, aSrcPtPixel, aSrcSizePixel);
-return;
 }
-
-if( !( !rBmpEx ) )
+else if (!!rBitmapEx)
 {
 SalTwoRect aPosAry;
 
@@ -531,23 +529,23 @@ void OutputDevice::DrawDeviceBitmap( const Point 
rDestPt, const Size rDestSize
 aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() );
 aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( 
rDestSize.Height() );
 
-const sal_uLong nMirrFlags = AdjustTwoRect( aPosAry, 
rBmpEx.GetSizePixel() );
+const sal_uLong nMirrFlags = AdjustTwoRect(aPosAry, 
rBitmapEx.GetSizePixel());
 
-if( aPosAry.mnSrcWidth  aPosAry.mnSrcHeight  aPosAry.mnDestWidth 
 aPosAry.mnDestHeight )
+if (aPosAry.mnSrcWidth  aPosAry.mnSrcHeight  aPosAry.mnDestWidth 
 aPosAry.mnDestHeight)
 {
 
-if( nMirrFlags )
-rBmpEx.Mirror( nMirrFlags );
+if (nMirrFlags)
+rBitmapEx.Mirror(nMirrFlags);
 
-const SalBitmap* pSalSrcBmp = 
rBmpEx.ImplGetBitmapImpBitmap()-ImplGetSalBitmap();
-const ImpBitmap* pMaskBmp = rBmpEx.ImplGetMaskImpBitmap();
+const SalBitmap* pSalSrcBmp = 
rBitmapEx.ImplGetBitmapImpBitmap()-ImplGetSalBitmap();
+const ImpBitmap* pMaskBmp = rBitmapEx.ImplGetMaskImpBitmap();
 
-if ( pMaskBmp )
+if (pMaskBmp)
 {
 SalBitmap* pSalAlphaBmp = pMaskBmp-ImplGetSalBitmap();
 bool bTryDirectPaint(pSalSrcBmp  pSalAlphaBmp);
 
-if(bTryDirectPaint)
+if (bTryDirectPaint)
 {
 // only paint direct when no scaling and no MapMode, else 
the
 // more expensive conversions may be done for short-time 
Bitmap/BitmapEx
@@ -558,7 +556,7 @@ void OutputDevice::DrawDeviceBitmap( const Point rDestPt, 
const Size rDestSize
 }
 }
 
-if(bTryDirectPaint  mpGraphics-DrawAlphaBitmap(aPosAry, 
*pSalSrcBmp, *pSalAlphaBmp, this))
+if (bTryDirectPaint  mpGraphics-DrawAlphaBitmap(aPosAry, 
*pSalSrcBmp, *pSalAlphaBmp, this))
 {
 // tried to paint as alpha directly. If tis worked, we are 
done (except
 // alpha, see below)
@@ -593,21 +591,21 @@ void OutputDevice::DrawDeviceBitmap( const Point 
rDestPt, const Size rDestSize
 // const double nScaleY( aPosAry.mnDestHeight / 
aPosAry.mnSrcHeight );
 
 // for now, only identity scales allowed
-if( !aClipRegionBounds.IsEmpty() 
+if (!aClipRegionBounds.IsEmpty() 
 aPosAry.mnDestWidth == aPosAry.mnSrcWidth 
-aPosAry.mnDestHeight == aPosAry.mnSrcHeight )
+aPosAry.mnDestHeight == aPosAry.mnSrcHeight)
 {
 // now intersect dest rect with clip region
-aClipRegionBounds.Intersection( Rectangle( 
aPosAry.mnDestX,
-   
aPosAry.mnDestY,
-   
aPosAry.mnDestX + aPosAry.mnDestWidth - 1,
-   
aPosAry.mnDestY + aPosAry.mnDestHeight - 1 ) );
+
aClipRegionBounds.Intersection(Rectangle(aPosAry.mnDestX,
+   

Re: Tinderbox failure, Linux-rpm_deb-x86@45-TDF-dbg, MASTER, last success: 2014-04-18 07:36:50

2014-04-30 Thread Miklos Vajna
Hi,

On Tue, Apr 29, 2014 at 12:08:23PM -0400, Kohei Yoshida 
kohei.yosh...@collabora.com wrote:
 FWIW I cannot reproduce this on my machine even using a dbgutil build.
 Can anyone else reproduce this?

Not me. I guess this is specific to the CentOS 5 build environment, used
for TDF builds.

Christian, if this intention is to provide debug symbols, I can imagine
that it's better to use just --enable-debug and not --enable-dbgutil
here. How an --enable-dbgutil build fails on an old system may not be
that interesting. ;-)

Miklos


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


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

2014-04-30 Thread Takeshi Abe
 sc/source/core/data/documen4.cxx |   24 +---
 sc/source/core/tool/addincol.cxx |   25 ++---
 sc/source/core/tool/appoptio.cxx |7 +++
 sc/source/core/tool/consoli.cxx  |   12 +---
 sc/source/core/tool/detfunc.cxx  |   13 +++--
 5 files changed, 34 insertions(+), 47 deletions(-)

New commits:
commit ecec7cea259e7310cb6da33bea797c98a635a2b3
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu May 1 00:51:44 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: Id6590e6c1d3ec1640ebf55d348670953450dd419

diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 88af3ce..a156c3b 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -1186,9 +1186,9 @@ void ScDocument::CompareDocument( ScDocument rOtherDoc )
 aProText.makeStringAndClear(), 
3*nThisEndRow );  // 2x FindOrder, 1x hier
 long nProgressStart = 2*nThisEndRow;// start 
fuer hier
 
-SCCOLROW* pTempRows = new SCCOLROW[nThisEndRow+1];
-SCCOLROW* pOtherRows = new SCCOLROW[nThisEndRow+1];
-SCCOLROW* pOtherCols = new SCCOLROW[nThisEndCol+1];
+boost::scoped_arraySCCOLROW pTempRows(new 
SCCOLROW[nThisEndRow+1]);
+boost::scoped_arraySCCOLROW pOtherRows(new 
SCCOLROW[nThisEndRow+1]);
+boost::scoped_arraySCCOLROW pOtherCols(new 
SCCOLROW[nThisEndCol+1]);
 
 //  eingefuegte/geloeschte Spalten/Zeilen finden:
 //  Zwei Versuche:
@@ -1199,14 +1199,14 @@ void ScDocument::CompareDocument( ScDocument rOtherDoc 
)
 //! Spalten vergleichen zweimal mit unterschiedlichem nMinGood ???
 
 // 1
-FindOrder( pTempRows, nThisEndRow, nOtherEndRow, false,
+FindOrder( pTempRows.get(), nThisEndRow, nOtherEndRow, false,
 rOtherDoc, nThisTab, nOtherTab, nEndCol, NULL, 
aProgress, 0 );
 // 2
-FindOrder( pOtherCols, nThisEndCol, nOtherEndCol, true,
+FindOrder( pOtherCols.get(), nThisEndCol, nOtherEndCol, true,
 rOtherDoc, nThisTab, nOtherTab, nEndRow, NULL, NULL, 0 
);
-FindOrder( pOtherRows, nThisEndRow, nOtherEndRow, false,
+FindOrder( pOtherRows.get(), nThisEndRow, nOtherEndRow, false,
 rOtherDoc, nThisTab, nOtherTab, nThisEndCol,
-pOtherCols, aProgress, nThisEndRow );
+   pOtherCols.get(), aProgress, nThisEndRow );
 
 sal_uLong nMatch1 = 0;  // pTempRows, keine Spalten
 for (nThisRow = 0; nThisRow=nThisEndRow; nThisRow++)
@@ -1220,7 +1220,7 @@ void ScDocument::CompareDocument( ScDocument rOtherDoc )
 if (ValidRow(pOtherRows[nThisRow]))
 nMatch2 += SC_DOCCOMP_MAXDIFF -
RowDifferences( nThisRow, nThisTab, rOtherDoc, 
pOtherRows[nThisRow],
-nOtherTab, nThisEndCol, 
pOtherCols );
+   nOtherTab, nThisEndCol, 
pOtherCols.get() );
 
 if ( nMatch1 = nMatch2 )   // ohne Spalten ?
 {
@@ -1229,9 +1229,7 @@ void ScDocument::CompareDocument( ScDocument rOtherDoc )
 pOtherCols[nThisCol] = nThisCol;
 
 //  Zeilenarrays vertauschen (geloescht werden sowieso beide)
-SCCOLROW* pSwap = pTempRows;
-pTempRows = pOtherRows;
-pOtherRows = pSwap;
+pTempRows.swap(pOtherRows);
 }
 else
 {
@@ -1351,10 +1349,6 @@ void ScDocument::CompareDocument( ScDocument rOtherDoc )
 }
 aProgress.SetStateOnPercent(nProgressStart+nThisRow);
 }
-
-delete[] pOtherCols;
-delete[] pOtherRows;
-delete[] pTempRows;
 }
 }
 }
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 77f6795..50cf247 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -52,6 +52,7 @@
 #include funcdesc.hxx
 #include svl/sharedstring.hxx
 #include formulaopt.hxx
+#include boost/scoped_array.hpp
 
 using namespace com::sun::star;
 
@@ -489,7 +490,7 @@ void ScUnoAddInCollection::ReadConfiguration()
 
 // get argument info
 
-ScAddInArgDesc* pVisibleArgs = NULL;
+boost::scoped_arrayScAddInArgDesc pVisibleArgs;
 long nVisibleCount = 0;
 long nCallerPos = SC_CALLERPOS_NONE;
 
@@ -532,7 +533,7 @@ void ScUnoAddInCollection::ReadConfiguration()
 aDesc.bOptional = false;
 
 nVisibleCount = nArgumentCount;
-pVisibleArgs = new ScAddInArgDesc[nVisibleCount];
+

Re: opinion on SimpleProgramDebugger as a LibO debug tool

2014-04-30 Thread Miklos Vajna
Hi,

On Thu, Apr 24, 2014 at 01:44:10PM +0200, Tommy ba...@quipo.it wrote:
 I'll try to be clearer: is this SimpleProgramDebugger a Windows
 alternative to Valgrind or other Linux tools that people use to do
 profiling, backtraces etc. etc. ?

From the http://www.nirsoft.net/utils/simple_program_debugger.html
description, it seems (to me) that it's more similar to process monitor
(and Linux's strace tool) that monitors syscalls. This is useful
sometimes, but in most cases it's not what we're searching for.

 I have no experience at all with Linux and I don't have enough spare
 time to learn it, so I wonder if this Windows tool may be used by
 Windows users like me to obtain the same results as Linux users do
 with Valgrind.
 
 if yes,  will the developers be able to interpret
 SimpleProgramDebugger's output like they already do with Valgrind?

To me, the most useful input from users to a step by step description of
the problem, so that I can reproduce myself. On Windows, this means
then I can debug the problem myself using Visual Studio's debugger. I
didn't have to deal with Windows-specific memory corruption issues yet,
though previously it was reported that DrMemory
(http://www.drmemory.org/) does a pretty good job at it.

Best,

Miklos


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


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 11/a1ff6144521aeabb0c6db25c89a2ac31bedee0

2014-04-30 Thread Caolán McNamara
 11/a1ff6144521aeabb0c6db25c89a2ac31bedee0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a06fe3f157d26d4df8924d9c55ceb7632be7074c
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 17:11:59 2014 +0100

Notes added by 'git notes add'

diff --git a/11/a1ff6144521aeabb0c6db25c89a2ac31bedee0 
b/11/a1ff6144521aeabb0c6db25c89a2ac31bedee0
new file mode 100644
index 000..52c2253
--- /dev/null
+++ b/11/a1ff6144521aeabb0c6db25c89a2ac31bedee0
@@ -0,0 +1 @@
+merged as: 19c4d8d2fbe424aaa54f098bcc6ba8c9aeb1e403
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Eike Rathke
 i18npool/source/collator/collator_unicode.cxx |   98 --
 i18npool/source/collator/gencoll_rule.cxx |2 
 2 files changed, 94 insertions(+), 6 deletions(-)

New commits:
commit a3c627fe38236e82bc6008075d862b3cbfbd9ce3
Author: Eike Rathke er...@redhat.com
Date:   Wed Apr 30 17:51:05 2014 +0100

resolve crashes with ICU 53.1 in locales with collator data, fdo#77071

ICU 53.1 changed API behavior:

https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RuleBasedCollator.html#a2f4c7eeaf020ad68e3bd9722dd272357
isn't correct anymore:

length: size of the image. If negative, the API will try to figure out the
length of the image

NO, IT WILL NOT! It bails out with an error instead.
Introduced a function to obtain the length for each collator data.

base:  collator, usually root. The base is required to be present through 
the
   lifetime of the collator. Currently it cannot be NULL.

   NOT usually root! There's a check now that bails out if
   if(base-tailoring != CollationRoot::getRoot(errorCode))
   So using an instance created with icu::Locale::getRoot()

Change-Id: Ia9c4e27d5ef4f8083bbe57e4e2f4b3ff63bb42ed

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 425b84a..a0851d7 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -121,6 +121,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString 
rAlgorithm, const lang::
 }
 if (!collator  
OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) = 0) {
 const sal_uInt8* (*func)() = NULL;
+size_t (*funclen)() = NULL;
 
 #ifndef DISABLE_DYNLOADING
 OUStringBuffer aBuf;
@@ -133,11 +134,21 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString 
rAlgorithm, const lang::
 
aBuf.appendAscii(get_).append(rLocale.Language).appendAscii(_);
 if ( rLocale.Language == zh ) {
 OUString func_base = aBuf.makeStringAndClear();
+OUString funclen_base = func_base + _length;
 if (OUString(TW HK MO).indexOf(rLocale.Country) = 0)
-func=(const sal_uInt8* (*)()) 
osl_getFunctionSymbol(hModule,
+{
+func = (const sal_uInt8* (*)()) 
osl_getFunctionSymbol(hModule,
 OUString(func_base + TW_ + 
rAlgorithm).pData);
+funclen = (size_t (*)()) osl_getFunctionSymbol(hModule,
+OUString(funclen_base + TW_ + 
rAlgorithm).pData);
+}
 if (!func)
-func=(const sal_uInt8* (*)()) 
osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData);
+{
+func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(
+hModule, OUString(func_base + 
rAlgorithm).pData);
+funclen = (size_t (*)()) osl_getFunctionSymbol(
+hModule, OUString(funclen_base + 
rAlgorithm).pData);
+}
 } else {
 if ( rLocale.Language == ja ) {
 // replace algorithm name to implementation name.
@@ -150,7 +161,10 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString 
rAlgorithm, const lang::
 } else {
 aBuf.append(rAlgorithm);
 }
-func=(const sal_uInt8* (*)()) 
osl_getFunctionSymbol(hModule, aBuf.makeStringAndClear().pData);
+OUString func_base = aBuf.makeStringAndClear();
+OUString funclen_base = func_base + _length;
+func = (const sal_uInt8* (*)()) 
osl_getFunctionSymbol(hModule, func_base.pData);
+funclen = (size_t (*)()) osl_getFunctionSymbol(hModule, 
funclen_base.pData);
 }
 }
 #else
@@ -159,87 +173,159 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString 
rAlgorithm, const lang::
 #if WITH_LOCALE_ALL || WITH_LOCALE_ca
 } else if ( rLocale.Language == ca ) {
 if ( rAlgorithm == charset )
+{
 func = get_collator_data_ca_charset;
+funclen = get_collator_data_ca_charset_length;
+}
 #endif
 #if WITH_LOCALE_ALL || WITH_LOCALE_dz
 } else if ( rLocale.Language == dz || rLocale.Language == bo ) 
{
 // 'bo' Tibetan uses the same collation rules as 'dz' Dzongkha
 if ( rAlgorithm == charset )
+{
 func = get_collator_data_dz_charset;
+funclen = get_collator_data_dz_charset_length;
+

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

2014-04-30 Thread Kohei Yoshida
 sc/source/ui/cctrl/checklistmenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c726b88461f679237349003e6b5256b5bf3f2b9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Apr 30 13:16:17 2014 -0400

Build fix.

Change-Id: I8685c2e3a6993f3924fe8e7caf75318c8ebc566d

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 88ad240..3082fef 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1532,7 +1532,7 @@ void ScCheckListMenuWindow::initMembers()
 else
 {
 SvTreeListEntry* pEntry = maChecks.InsertEntry(
-maMembers[i].maName, NULL, false, TREELIST_APPEND, NULL,
+maMembers[i].maName, NULL, false, LISTBOX_APPEND, NULL,
 SvLBoxButtonKind_enabledCheckbox);
 
 maChecks.SetCheckButtonState(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Eike Rathke
 i18npool/source/collator/collator_unicode.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit dc7ba1af236ec28d399eff833d56608fde9fb70d
Author: Eike Rathke er...@redhat.com
Date:   Wed Apr 30 19:54:04 2014 +0100

make DISABLE_DYNLOADING on Android happy, fdo#77071 related

Change-Id: Id257bd38bbfab0a433b404116e2d7e9b430c3c6f

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index a0851d7..2960f03 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -85,6 +85,27 @@ const sal_uInt8* get_collator_data_zh_radical();
 const sal_uInt8* get_collator_data_zh_stroke();
 const sal_uInt8* get_collator_data_zh_zhuyin();
 
+size_t get_collator_data_ca_charset_length();
+size_t get_collator_data_dz_charset_length();
+size_t get_collator_data_hu_charset_length();
+size_t get_collator_data_ja_charset_length();
+size_t get_collator_data_ja_phonetic_alphanumeric_first_length();
+size_t get_collator_data_ja_phonetic_alphanumeric_last_length();
+size_t get_collator_data_ko_charset_length();
+size_t get_collator_data_ku_alphanumeric_length();
+size_t get_collator_data_ln_charset_length();
+size_t get_collator_data_my_dictionary_length();
+size_t get_collator_data_ne_charset_length();
+size_t get_collator_data_sid_charset_length();
+size_t get_collator_data_zh_TW_charset_length();
+size_t get_collator_data_zh_TW_radical_length();
+size_t get_collator_data_zh_TW_stroke_length();
+size_t get_collator_data_zh_charset_length();
+size_t get_collator_data_zh_pinyin_length();
+size_t get_collator_data_zh_radical_length();
+size_t get_collator_data_zh_stroke_length();
+size_t get_collator_data_zh_zhuyin_length();
+
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 34467, which changed state.

Bug 34467 Summary: FORMATTING Fit to Frame for text boxes is broken
https://bugs.freedesktop.org/show_bug.cgi?id=34467

   What|Removed |Added

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

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


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c3/f20ae9a447f50517fe545a53de91d412c3337c

2014-04-30 Thread Caolán McNamara
 c3/f20ae9a447f50517fe545a53de91d412c3337c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 21434bc0a46740224cd8a14241830d2c51be30ee
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 20:43:50 2014 +0100

Notes added by 'git notes add'

diff --git a/c3/f20ae9a447f50517fe545a53de91d412c3337c 
b/c3/f20ae9a447f50517fe545a53de91d412c3337c
new file mode 100644
index 000..0c8c109
--- /dev/null
+++ b/c3/f20ae9a447f50517fe545a53de91d412c3337c
@@ -0,0 +1 @@
+merged as: f2023b24fff8705f18cada2b5303d9db1793bb8d
___
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-4' - translations

2014-04-30 Thread Christian Lohmaier
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 859b464efcd0fa90b660b4fcbbc27fd3ed66ce19
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Apr 30 20:27:21 2014 +0200

Updated core
Project: translations  7c22345159b7efb1ccf9da11393880089f45afd9

diff --git a/translations b/translations
index 0f2b2fa..7c223451 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0f2b2fa37079cca17ca4d19ff8fa81233c2c950a
+Subproject commit 7c22345159b7efb1ccf9da11393880089f45afd9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Caolán McNamara
 chart2/source/controller/dialogs/tp_AxisPositions.cxx |2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx  |   12 ++-
 cui/source/customize/cfg.cxx  |2 
 cui/source/tabpages/autocdlg.cxx  |4 +
 cui/source/tabpages/connect.cxx   |   13 +---
 cui/source/tabpages/grfpage.cxx   |3 
 cui/source/tabpages/measure.cxx   |1 
 cui/source/tabpages/transfrm.cxx  |   57 +++---
 sw/qa/core/uwriter.cxx|5 +
 sw/source/core/text/txtfly.cxx|   24 ---
 sw/source/ui/misc/insfnote.cxx|   11 +--
 11 files changed, 74 insertions(+), 60 deletions(-)

New commits:
commit d1ffea3a272d61f1343047e86b4eeabe032aa352
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 20:59:54 2014 +0100

coverity#738909 Uninitialized scalar field

Change-Id: I332d57bd7a82a734e509afe24c0c716ce8a4e455

diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index de9b9bf..cacc4eb 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -167,11 +167,12 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
 return 0;
 }
 
-SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell rShell, bool 
bEd) :
-SvxStandardDialog(pParent, InsertFootnoteDialog, 
modules/swriter/ui/insertfootnote.ui),
-rSh(rShell),
-bExtCharAvailable(false),
-bEdit(bEd)
+SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell rShell, bool 
bEd)
+: SvxStandardDialog(pParent, InsertFootnoteDialog, 
modules/swriter/ui/insertfootnote.ui)
+, rSh(rShell)
+, eCharSet(RTL_TEXTENCODING_DONTKNOW)
+, bExtCharAvailable(false)
+, bEdit(bEd)
 {
 get(m_pNumberFrame, numberingframe);
 get(m_pNumberAutoBtn, automatic);
commit 858292697c3624556922852d88623aaf72e0fccd
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 20:57:23 2014 +0100

coverity#708465 Uninitialized scalar field

Change-Id: I56bc0398a6c61c128a3fc07ab7761bd3bc70250d

diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index d4cd734..fb122fd 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -310,15 +310,21 @@ const SwRect SwContourCache::ContourRect( const SwFmt* 
pFmt,
 return aRet;
 }
 
-SwTxtFly::SwTxtFly() :
-pPage(0),
-mpCurrAnchoredObj(0),
-pCurrFrm(0),
-pMaster(0),
-mpAnchoredObjList(0),
-nMinBottom(0),
-nNextTop(0),
-nIndex(0)
+SwTxtFly::SwTxtFly()
+: pPage(0)
+, mpCurrAnchoredObj(0)
+, pCurrFrm(0)
+, pMaster(0)
+, mpAnchoredObjList(0)
+, nMinBottom(0)
+, nNextTop(0)
+, nIndex(0)
+, bOn(false)
+, bTopRule(false)
+, mbIgnoreCurrentFrame(false)
+, mbIgnoreContour(false)
+, mbIgnoreObjsInHeaderFooter(false)
+
 {
 }
 
commit 3124c258716a6483000d9e217b0e300326683cfe
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 20:56:50 2014 +0100

coverity#738881 Uninitialized pointer field

Change-Id: Iecf88297963bd4bf0a5f69f7090ed0bbeb393c89

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index f17ffca..bd6e000 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -62,6 +62,11 @@ using namespace ::com::sun::star;
 class SwDocTest : public test::BootstrapFixture
 {
 public:
+SwDocTest()
+: m_pDoc(NULL)
+{
+}
+
 virtual void setUp() SAL_OVERRIDE;
 virtual void tearDown() SAL_OVERRIDE;
 
commit 503f6b4878562fbd629742ee98d374c2b6f6979b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 30 20:53:58 2014 +0100

coverity#738609 Uninitialized pointer field

Change-Id: I63718d125c166b31a5980b34d4070e6fd8e89f50

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index ee299bc..eef82e8 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -613,19 +613,19 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT  
)
 |*  Dialog for changing position and size of graphic objects
 |*
 \/
-
-SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const 
SfxItemSet rInAttrs  ) :
-SvxTabPage  ( pParent
- ,PositionAndSize
- ,cui/ui/possizetabpage.ui
- , rInAttrs ),
-
-mrOutAttrs   ( rInAttrs ),
-mnProtectSizeState( TRISTATE_FALSE ),
-mbPageDisabled   ( false ),
-mbProtectDisabled( false ),
-mbSizeDisabled( false ),
-mbAdjustDisabled( true )
+SvxPositionSizeTabPage::SvxPositionSizeTabPage(Window* pParent, const 
SfxItemSet rInAttrs)
+: SvxTabPage(pParent,PositionAndSize,cui/ui/possizetabpage.ui, 
rInAttrs)
+, mrOutAttrs(rInAttrs)
+, mpView(NULL)
+, 

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.4.2'

2014-04-30 Thread Christian Lohmaier
Tag 'libreoffice-4.2.4.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-04-30 21:00 +0200

Tag libreoffice-4.2.4.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTYVZRAAoJEPQ0oe+v7q6jmGcP/jfX2rYnc1IrcS7SqbsGFp0N
XH8cHdygQZlqrzIxx2dAJqyqcejKgtnPEMjh9vsa5Edgb7oPehgkISPLVG+8XOgp
yoUQqmAIWXlg4fDfpqXUG/dus1KUShdBtB+k/jaSYPYhe81Nod3zLCXUdC2F2eLj
YuBNqiNOBuMxikWwSVXFy59pXkaVt8ju91/GFMKKj+RRFReFzLPtrlBtNDRrxYgZ
hv44HfYpV6yJsyAOkcKBUKP+sG1LCtNlG4JqCooXXnSo0em7VBlZf9HuvJRcNobi
qggvbMlApoW4fGBGtw/XTBfQpy2sCnExT/kqbtL/EO7CdTPvkaMN1StNzaDm1bby
CLWMVMC8BbkK+IppjM0AMN4DIBdzyI+DPd4OBIki6G/r/UYklwERHnvz6WBM7TGX
AB4O0iB24iVa9YUzESmU1KzO8qbvJXWzf8NzPqFX1c4510XE6Oup1xtShfJoEZOK
YvNswpwcqvoIhQtX61zDO8wTB+iRKsJEiBL3D9fnw8qii4Zh2uD92lUzBxO9fkpt
Ha/HKWPrj89KqbesWI3atERWoWYClZyXzGxw5Tjy1zo+bJC46Ddp9VNYNPs85Ei0
HJ7h6Gdh22SLmopOzv2r/kQ3YtMKA4fbv0sNA48sfi7YTJCMlN1KDCKBliush4Pv
hD5FVm4CogIcIr/HQqc7
=txIO
-END PGP SIGNATURE-

Changes since cp-4.2-1-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.4.2'

2014-04-30 Thread Christian Lohmaier
Tag 'libreoffice-4.2.4.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-04-30 21:00 +0200

Tag libreoffice-4.2.4.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTYVZMAAoJEPQ0oe+v7q6jKToP/3UE9sG2U1a6UVxka9uVeTFB
1mLaU5XR9ob3iYPjKWwnjnXh+0CE+xUdVPyZ2yfUF1kuYxwm/PTGA75EFLVh/hqc
t7E8WDeAnhuJA5KM5l2+VtdO6OK6Y2ZF1iX74L6h6rqtYD4shz9Nm3uQjhwjUjIp
q6vVA4BG9uQwGUB7hYaCgZhak7pUFlbPxooT4Z7lVNInpPh0KdT3pDYj3vM3hexd
LXFDjPJhThMhuw0KhvxAQlwhJ3wYeCEgBt2ag0MtvBOSveLxtlRs9vBMblSrvztc
99AzIMrglE7v53NtMEbB2ZTLQYwv+aH2/X9rJVQGJXuguV4pTawxpvWFbOM6h+qb
lCLYGpjTp+oqgHOG7Q7XaV2Duf27AJOKQZbpGi2RLGHVCUD+J+BIwiy93wo0msyK
kcfVyhtuVpAcnLbtpnDtPxOtsQEWdfTW3Kxl1EQhWrhkNngqdeuu5CmNglGnFQ5Q
wHlbCRQWGFZXCaiLLbXj9DvVpif46ham4zsuiwSva/dUTvNXGnzmkbMqlA5outxR
S3fh1CjgssLOOvl7H0BSp8uPFzmdwnLxvjQcBrnwH2w31qLerz3ZRKc1M9MQcxci
Q0PTKcHbOaOdezmQkWNeMq7G/IWkppiFLdScWXvzhFMs4HWcqoxlrzSzhQMAsEmB
E13MVw0F5Bo6wu6+x+hw
=7Pnt
-END PGP SIGNATURE-

Changes since cp-4.2-1-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.4.2'

2014-04-30 Thread Christian Lohmaier
Tag 'libreoffice-4.2.4.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-04-30 21:00 +0200

Tag libreoffice-4.2.4.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTYVZDAAoJEPQ0oe+v7q6jvwcQAMdXK/0hYG+mjptxP3SG75Le
Z7IFYvDcuuvBs3Gk3J/CKN4ozO3Tc5V23XavRgV1htZRRRCTfEJzk/zDJ08rAIoY
V+q+w+pwZyTUh84zrYWauz1+stMZ8/LHhzNhd6G8HKhBkBWG4cOChnE9GRcHGxys
Zdda+yYhAYlelL2HjGGN6CnOUwaFaDxJlgvN5OUMxHtJZSyiXph0/En6yrhoE9Ey
W2p+qEToRi8Pqq7c5pmRavo7Wk4oOj0sMJiaKXtWSdUcif+oIkVOUxaQEolOmJ7E
9+YKAPHM6EZz/8m78RPa0dJ8ys0CA0HFYw90SzOKMcMtuwftTIU9XhZ0RvT0vlV8
oDxfdfFIwJTmDuwYir885P46+xCu5EwlxKKnkTKu71HW2EkPvlPEW+rZhj8lEOj3
YOsxpXgz02Igx2DfdXmO/ZCQpSSImpbiBt3bx9wf/aZ8WYVI/V5cRDd6+T8o8EU+
AmO3wdDOvbfyirHwrqHLiqsZzXEQ/9kWWupanSfcvFQKhtzbsS4cuCipNe4FnRMe
E+OrZL/xobKAfKSTzPQEZntKt5Om362in7RlNQjNqOq+W6aq9SDBPb5X/fMN5zPm
qFb1WlSOyE/7OLrfDjH5cGK/ce/QktT5pVDpqJYfDwT0u524YhhfeDvc5sjpZLPA
Mej9RwstE7np7y0GXkPy
=dnSi
-END PGP SIGNATURE-

Changes since cp-4.2-1-1:
---
 0 files changed
---
___
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.4.2'

2014-04-30 Thread Christian Lohmaier
Tag 'libreoffice-4.2.4.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-04-30 21:00 +0200

Tag libreoffice-4.2.4.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJTYVZbAAoJEPQ0oe+v7q6j75cP/ipCpICm7YQfMh62sSw6+6s7
ZbFr0jarMlu198zulbn13gZ4WWLwbrsoChigp68nOpa2C9L3XJeSrINvXoKeOrV8
EHa0TAKNEfaBXQwBzEJntFraRDQF5odO4poNQ/anyxMkNtfyo9wJW4B4m/zDuWx0
FkzyLjGfR85Vtq4ey2hNHQF2DHNXsq7xhzyOKglJOugGbOD1owITj2pTsNHFGMZ9
rj1fV3PrvdHx/ylUL0O847Dpvy4e/1ktsqm7fCQCkmx6z3MGYXI8zMwUqdMh56Ne
1+9PPtcEfMQeOTXPw/vZD/ojBS/70LUmjmNaii6NNC57mnIxOEXoORZfeHJ9nqM8
WkB+E7JhYJuUaFUPS+g7OSw0qTRdbahX8n8r6w//m9X/d1v+nCcZyO4l0JKS6HrO
Zv4ffbHVnLnE9NqZjkytuh1vf6tpDzq0Nwx7sGvd/edWDQgq0vv+0S1ivl4uslrQ
DdamzcvZ/iSURP65jZTWnRh04RB2QtbOlJ/ojxOt0bdDbnDSFAM9PM2XTI4uwYal
88nslMmHobr3RCSTGIbfKBxnBq0oLdveLGTkgVVkhvhbIBpATQiGwO079NJrh5bw
J6q17PqScuE1KenBEs0hfvfXJ3p9F6PU3c2msr+0+ihoJBLgBnBH8MDVZJrup6tV
dE7GHLbI7j6Q4aKzdfJy
=ZF//
-END PGP SIGNATURE-

Changes since cp-4.2-branch-point-237:
---
 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-4' - configure.ac

2014-04-30 Thread Christian Lohmaier
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82aa06f8895e5110a4c450a48380a178a817ca1b
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Apr 30 22:01:17 2014 +0200

bump product version to 4.2.4.2.0+

Change-Id: If434c3f5461782c1b984d816f6cd9716e18a427c

diff --git a/configure.ac b/configure.ac
index a34d066..f06b4cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.4.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.4.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
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/source

2014-04-30 Thread Tomaž Vajngerl
 vcl/source/gdi/outdev2.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 10fef58379630c9d8e8ba76258baee917959e7c5
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Apr 30 16:46:40 2014 +0200

fdo#77126 BitmapEx.Scale already takes care of mirroring

Change-Id: I320a5ec1da62cc1a8b3cb227298ecaf99f305a6f

Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 8ec9c21..48ec303 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1010,12 +1010,16 @@ void OutputDevice::ImplDrawBitmapEx( const Point 
rDestPt, const Size rDestSize
 // we have beautiful scaling algorithms, let's use them
 if (aDestSizePixel != rSrcSizePixel  rSrcSizePixel.Width() != 0  
rSrcSizePixel.Height() != 0)
 {
-double fScaleX = double(aDestSizePixel.Width()) / 
rSrcSizePixel.Width();
-double fScaleY = double(aDestSizePixel.Height()) / 
rSrcSizePixel.Height();
+double fScaleX = std::abs(aDestSizePixel.Width()  / 
double(rSrcSizePixel.Width()));
+double fScaleY = std::abs(aDestSizePixel.Height() / 
double(rSrcSizePixel.Height()));
 
 aScaledBitmapEx.Scale(fScaleX, fScaleY);
 
-aSrcSizePixel = aDestSizePixel;
+// Negative size values are used for mirroring, but Scale already 
takes
+// care of mirroring so convert all negative values to positive.
+aSrcSizePixel = Size(std::abs(aDestSizePixel.Width()),
+ std::abs(aDestSizePixel.Height()));
+
 aSrcPtPixel.X() = rSrcPtPixel.X() * fScaleX;
 aSrcPtPixel.Y() = rSrcPtPixel.Y() * fScaleY;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


About Svgreader

2014-04-30 Thread julien2412
Hello,

Reading bugtrackers about SVG, I noticed there were 2 locations with
svgreader:
- filter/source/svg/svgreader.cxx
- svgio/source/svgreader (there's also svgio/source/svguno)

There's no README for svgio/ and the README of filter isn't detailed.

Someone to explain (perhaps update/add README)? Above all, what part is used
to read svg?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-Svgreader-tp4107050.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: 2 commits - offapi/com oox/source svtools/source writerfilter/source

2014-04-30 Thread Luboš Luňák
 offapi/com/sun/star/graphic/XGraphicTransformer.idl |   10 +++
 oox/source/drawingml/fillproperties.cxx |   27 +---
 svtools/source/graphic/transformer.cxx  |   17 
 svtools/source/graphic/transformer.hxx  |5 +++
 writerfilter/source/dmapper/GraphicImport.cxx   |4 ++
 5 files changed, 60 insertions(+), 3 deletions(-)

New commits:
commit 893fe88469dec5b727d96f8ea1b4edb9e88288a7
Author: Luboš Luňák l.lu...@collabora.com
Date:   Wed Apr 30 22:19:08 2014 +0200

handle brightness+contrast from msoffice (bnc#875713)

This is the same like 1139d618b8bc6ab823a96184bd0f0257980aad24, for docx.

Change-Id: I1ef4e18444e8c60e9ae8f67249bcef1053f0d62d

diff --git a/offapi/com/sun/star/graphic/XGraphicTransformer.idl 
b/offapi/com/sun/star/graphic/XGraphicTransformer.idl
index d1a6ddf..dbd9c8d 100644
--- a/offapi/com/sun/star/graphic/XGraphicTransformer.idl
+++ b/offapi/com/sun/star/graphic/XGraphicTransformer.idl
@@ -51,6 +51,16 @@ interface XGraphicTransformer : 
::com::sun::star::uno::XInterface
 com::sun::star::graphic::XGraphic applyDuotone( [ in ] 
com::sun::star::graphic::XGraphic In,
 [ in ] long ColorOne, [ in ] long ColorTwo )
 raises( ::com::sun::star::lang::IllegalArgumentException );
+
+/** changes brightness/contrast
+
+@param mso whether to use MSOffice brightness/contrast formula
+@returns
+The modified graphic
+*/
+com::sun::star::graphic::XGraphic applyBrightnessContrast( [ in ] 
com::sun::star::graphic::XGraphic In,
+[ in ] long brightness, [ in ] long contrast, [ in ] boolean mso )
+raises( ::com::sun::star::lang::IllegalArgumentException );
 };
 
 } ; } ; } ; } ;
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 4eedd35..6ae078a 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -92,6 +92,18 @@ Reference XGraphic  lclCheckAndApplyChangeColorTransform( 
const BlipFillProper
 return xGraphic;
 }
 
+Reference XGraphic  applyBrightnessContrast( Reference XGraphic  xGraphic, 
sal_Int32 brightness, sal_Int32 contrast )
+{
+try
+{
+Reference XGraphicTransformer  xTransformer( xGraphic, 
UNO_QUERY_THROW );
+xGraphic = xTransformer-applyBrightnessContrast( xGraphic, 
brightness, contrast, true );
+}
+catch( Exception )
+{
+}
+return xGraphic;
+}
 
 
 BitmapMode lclGetBitmapMode( sal_Int32 nToken )
@@ -519,12 +531,23 @@ void FillProperties::pushToPropMap( ShapePropertyMap 
rPropMap,
 
 void GraphicProperties::pushToPropMap( PropertyMap rPropMap, const 
GraphicHelper rGraphicHelper, sal_Int32 nPhClr ) const
 {
+sal_Int16 nBrightness = getLimitedValue sal_Int16, sal_Int32 ( 
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
+sal_Int16 nContrast = getLimitedValue sal_Int16, sal_Int32 ( 
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
 if( maBlipProps.mxGraphic.is() )
 {
 // created transformed graphic
 Reference XGraphic  xGraphic = lclCheckAndApplyDuotoneTransform( 
maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, nPhClr );
 xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps, 
xGraphic, rGraphicHelper, nPhClr );
-
+// MSO uses a different algorithm for contrast+brightness, LO applies 
contrast before brightness,
+// while MSO apparently applies half of brightness before contrast and 
half after. So if only
+// contrast or brightness need to be altered, the result is the same, 
but if both are involved,
+// there's no way to map that, so just force a conversion of the image.
+if( nBrightness != 0  nContrast != 0 )
+{
+xGraphic = applyBrightnessContrast( xGraphic, nBrightness, 
nContrast );
+nBrightness = 0;
+nContrast = 0;
+}
 rPropMap.setProperty(PROP_Graphic, xGraphic);
 
 // do we still need to set GraphicURL as well? (TODO)
@@ -563,10 +586,8 @@ void GraphicProperties::pushToPropMap( PropertyMap 
rPropMap, const GraphicHelpe
 rPropMap.setProperty(PROP_GraphicColorMode, eColorMode);
 
 // brightness and contrast
-sal_Int16 nBrightness = getLimitedValue sal_Int16, sal_Int32 ( 
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
 if( nBrightness != 0 )
 rPropMap.setProperty(PROP_AdjustLuminance, nBrightness);
-sal_Int16 nContrast = getLimitedValue sal_Int16, sal_Int32 ( 
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
 if( nContrast != 0 )
 rPropMap.setProperty(PROP_AdjustContrast, nContrast);
 
diff --git a/svtools/source/graphic/transformer.cxx 
b/svtools/source/graphic/transformer.cxx
index f7012ac..945d78b 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ 

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

2014-04-30 Thread Luboš Luňák
 sw/qa/extras/ooxmlimport/data/msobrightnesscontrast.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   19 +
 sw/qa/extras/ww8import/data/msobrightnesscontrast.doc|binary
 sw/qa/extras/ww8import/ww8import.cxx |   21 +++
 4 files changed, 40 insertions(+)

New commits:
commit 2dda1cd4d1927790d546dbaf1893279d18515bae
Author: Luboš Luňák l.lu...@collabora.com
Date:   Wed Apr 30 23:40:54 2014 +0200

tests for msoffice brightness+contrast

For commits 1139d618b8bc6ab823a96184bd0f0257980aad24 and
893fe88469dec5b727d96f8ea1b4edb9e88288a7 .

Change-Id: Ia59ec5c4226944280c4b585c87179d28303bda4b

diff --git a/sw/qa/extras/ooxmlimport/data/msobrightnesscontrast.docx 
b/sw/qa/extras/ooxmlimport/data/msobrightnesscontrast.docx
new file mode 100644
index 000..132f235
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/msobrightnesscontrast.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f85da0d..a533e16 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2089,6 +2089,25 @@ DECLARE_OOXMLIMPORT_TEST(testGridBefore, 
gridbefore.docx)
 CPPUNIT_ASSERT( leftA3.toInt32()  leftB2.toInt32());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testMsoBrightnessContrast, 
msobrightnesscontrast.docx)
+{
+uno::Referencetext::XTextDocument textDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Referencedrawing::XShape image(getShape(1), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet imageProperties(image, uno::UNO_QUERY);
+uno::Referencegraphic::XGraphic graphic;
+imageProperties-getPropertyValue( Graphic ) = graphic;
+uno::Referenceawt::XBitmap bitmap(graphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(58), bitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(320), bitmap-getSize().Height );
+const uno::Sequence sal_Int8  data = bitmap-getDIB(); // as .bmp data
+CPPUNIT_ASSERT_EQUAL( sal_Int32(56374), data.getLength());
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6e0])); // -50 = 206 pixel value
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6e1]));
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6e2]));
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6e3]));
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6e4]));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ww8import/data/msobrightnesscontrast.doc 
b/sw/qa/extras/ww8import/data/msobrightnesscontrast.doc
new file mode 100644
index 000..675d6d3
Binary files /dev/null and 
b/sw/qa/extras/ww8import/data/msobrightnesscontrast.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 972b06b..04db612 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -10,6 +10,8 @@
 
 #if !defined(MACOSX)  !defined(WNT)
 
+#include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/graphic/XGraphic.hpp
 #include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/TableBorder.hpp
 #include com/sun/star/table/TableBorder2.hpp
@@ -375,6 +377,25 @@ DECLARE_WW8IMPORT_TEST(testBorderColours, 
bordercolours.doc)
 #endif
 }
 
+DECLARE_WW8IMPORT_TEST(testMsoBrightnessContrast, msobrightnesscontrast.doc)
+{
+uno::Referencetext::XTextDocument textDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Referencedrawing::XShape image(getShape(1), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet imageProperties(image, uno::UNO_QUERY);
+uno::Referencegraphic::XGraphic graphic;
+imageProperties-getPropertyValue( Graphic ) = graphic;
+uno::Referenceawt::XBitmap bitmap(graphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(58), bitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(320), bitmap-getSize().Height );
+const uno::Sequence sal_Int8  data = bitmap-getDIB(); // as .bmp data
+CPPUNIT_ASSERT_EQUAL( sal_Int32(20278), data.getLength());
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6b0])); // -50 = 206 pixel value
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6b1]));
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6b2]));
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6b3]));
+CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6b4]));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-04-30 Thread Luboš Luňák
 sw/source/ui/chrdlg/drpcps.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1b2261cef7c9996af60f8902e9c0db4bbf896ac
Author: Luboš Luňák l.lu...@collabora.com
Date:   Thu May 1 00:34:22 2014 +0200

break infinite loop

endOfScript() can return -1 , which will never be = maText.getLength(),
and nothing will update once nChg is that way. It originally worked
when nChg was unsigned, but 44fbecbfe297cefcc844ca2071fbf01dd4c3
changed that and missed it (no wonder, given even the explicit cast,
which was stupid, so possibly there is a problem elsewhere, but this
way it at least doesn't lock up).

Change-Id: Ia5138ba36916bd0bfb8f07854580c39d2622f201

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 2b83a83..5edfda1 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -428,7 +428,7 @@ void SwDropCapsPict::CheckScript( void )
 {
 nChg = xBreak-endOfScript( maText, nChg, nScript );
 maScriptChanges.push_back( _ScriptInfo(0, nScript, nChg) );
-if( nChg = maText.getLength() )
+if( nChg = maText.getLength() || nChg  0 )
 break;
 nScript = xBreak-getScriptType( maText, nChg );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 34467, which changed state.

Bug 34467 Summary: FORMATTING Fit to Frame for text boxes is broken
https://bugs.freedesktop.org/show_bug.cgi?id=34467

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---

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


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

2014-04-30 Thread Chris Sherlock
 include/vcl/window.hxx |  210 -
 vcl/Library_vcl.mk |  152 +--
 2 files changed, 216 insertions(+), 146 deletions(-)

New commits:
commit 03e771f268895a3c79138dd52556d51baaad86e0
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu May 1 03:08:03 2014 +1000

VCL: Rearrange function locations and accessibility in window.hxx

A whole bunch of functions in include/vcl/window.hxx should be private,
a number should be protected. Change this now and fix some formatting
whilst I'm about it.

Change-Id: I8bae0112dcecffb7c703fe35e8db6676c1b5f584

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index fb148d9..001dfd5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -373,92 +373,176 @@ private:
 friend const char* ImplDbgCheckWindow( const void* pObj );
 #endif
 friend Window* ImplFindWindow( const SalFrame* pFrame, Point rSalFramePos 
);
+
 public:
-SAL_DLLPRIVATE voidImplInit( Window* pParent, WinBits 
nStyle, SystemParentData* pSystemParentData );
-SAL_DLLPRIVATE WinBits ImplInitRes( const ResId rResId );
-SAL_DLLPRIVATE WindowResHeader ImplLoadResHeader( const ResId rResId 
);
-SAL_DLLPRIVATE voidImplLoadRes( const ResId rResId );
+
+DECL_DLLPRIVATE_LINK(  ImplHandlePaintHdl, void* );
+DECL_DLLPRIVATE_LINK(  ImplGenerateMouseMoveHdl, void* );
+DECL_DLLPRIVATE_LINK(  ImplTrackTimerHdl, Timer* );
+DECL_DLLPRIVATE_LINK(  ImplAsyncFocusHdl, void* );
+DECL_DLLPRIVATE_LINK(  ImplHandleResizeTimerHdl, void* );
+DECL_DLLPRIVATE_LINK(  ImplHideOwnerDrawWindowsHdl, void* );
+
+
+SAL_DLLPRIVATE static void  ImplInitAppFontData( Window* pWindow );
+
+SAL_DLLPRIVATE Window*  ImplGetFrameWindow() const;
+SalFrame*   ImplGetFrame() const;
+SAL_DLLPRIVATE ImplFrameData*   ImplGetFrameData();
+
+SAL_DLLPRIVATE Window*  ImplGetWindow();
+SAL_DLLPRIVATE ImplWinData* ImplGetWinData() const;
+SAL_DLLPRIVATE Window*  ImplGetClientWindow() const;
+SAL_DLLPRIVATE Window*  ImplGetDlgWindow( sal_uInt16 n, 
sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0x, sal_uInt16* 
pIndex = NULL );
+SAL_DLLPRIVATE Window*  ImplGetParent() const;
+SAL_DLLPRIVATE Window*  ImplFindWindow( const Point rFramePos 
);
+
+SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const 
Region* pRegion, sal_uInt16 nFlags );
+SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( 
const Region rRegion );
+
+SAL_DLLPRIVATE bool ImplSetClipFlag( bool 
bSysObjOnlySmaller = false );
+
+SAL_DLLPRIVATE bool ImplIsWindowOrChild( const Window* 
pWindow, bool bSystemWindow = false ) const;
+SAL_DLLPRIVATE bool ImplIsChild( const Window* pWindow, 
bool bSystemWindow = false ) const;
+SAL_DLLPRIVATE bool ImplIsFloatingWindow() const;
+SAL_DLLPRIVATE bool ImplIsPushButton() const;
+SAL_DLLPRIVATE bool ImplIsSplitter() const;
+SAL_DLLPRIVATE bool ImplIsDockingWindow() const;
+SAL_DLLPRIVATE bool ImplIsOverlapWindow() const;
+
+SAL_DLLPRIVATE void ImplIsInTaskPaneList( bool 
mbIsInTaskList );
+
+SAL_DLLPRIVATE WindowImpl*  ImplGetWindowImpl() const { return 
mpWindowImpl; }
+
+SAL_DLLPRIVATE PointImplFrameToOutput( const Point rPos );
+
+SAL_DLLPRIVATE void ImplGrabFocus( sal_uInt16 nFlags );
+SAL_DLLPRIVATE void ImplGrabFocusToDocument( sal_uInt16 
nFlags );
+SAL_DLLPRIVATE void ImplInvertFocus( const Rectangle 
rRect );
+
+SAL_DLLPRIVATE PointerStyle ImplGetMousePointer() const;
+SAL_DLLPRIVATE void ImplCallMouseMove( sal_uInt16 
nMouseCode, bool bModChanged = false );
+SAL_DLLPRIVATE void ImplGenerateMouseMove();
+
+SAL_DLLPRIVATE void 
ImplNotifyKeyMouseCommandEventListeners( NotifyEvent rNEvt );
+SAL_DLLPRIVATE void ImplNotifyIconifiedState( bool 
bIconified );
+
+SAL_DLLPRIVATE void ImplUpdateAll( bool bOverlapWindows = 
true );
+
+SAL_DLLPRIVATE void ImplDeleteOverlapBackground();
+
+SAL_DLLPRIVATE void ImplControlFocus( sal_uInt16 nFlags = 
0 );
+
+SAL_DLLPRIVATE void ImplMirrorFramePos( Point pt ) const;
+
+SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, 
long nWidth, long nHeight, sal_uInt16 nFlags );
+
+SAL_DLLPRIVATE void ImplAddDel( ImplDelData* pDel );
+SAL_DLLPRIVATE void ImplRemoveDel( 

Re: About Svgreader

2014-04-30 Thread Christina Roßmanith
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Am 30.04.2014 22:22, schrieb julien2412:
 Hello,
 
 Reading bugtrackers about SVG, I noticed there were 2 locations
 with svgreader: - filter/source/svg/svgreader.cxx
This is used for File-Open and then choosing the svg file.
 - svgio/source/svgreader (there's also svgio/source/svguno)
This is used for Insert-Picture-From File.

And that is the reason why some bugs appear only with opening or
inserting a svg graphic.

Christina

 
 There's no README for svgio/ and the README of filter isn't
 detailed.
 
 Someone to explain (perhaps update/add README)? Above all, what
 part is used to read svg?
 
 Julien
 
 
 
 -- View this message in context:
 http://nabble.documentfoundation.org/About-Svgreader-tp4107050.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
 

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJTYY02AAoJEN/hiApPuw9S3XcH/3J27/t4/kzQt5Advv6wHTwZ
nsH3tA/Qz6LBK+nMRv7MyfwH4UPuzNPE4DBs+03MMU7pqDSiA6WO42IVVyvGgeys
vwkwhKPaC0lo0HIF7ELgGb0z8e9T9K+XOrI7E9j2EkX5/f2WtTxWjzu6Tu5GuM5f
/l2E4eH/qFFf0w5eavLfUry16OcgYx7oPcjXfScSUoshoQwVOwg3cuAju6yc9O7k
AbG1hee6CHprm7QAZ/oA6lI4EvZNnYzwYalSwIpwLqRBwKCzv0DwRzosj+WuoQQL
8/LA3TKmD/iwIFkr8W46qipZQhjTZsbQW2b0vobZ3XNgRdUMeWuZ6r7ZTTMz8qc=
=Thmb
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: 16 commits - chart2/qa chart2/source qadevOOo/objdsc sc/qa sc/source sfx2/source test/source xmloff/source

2014-04-30 Thread Markus Mohrhard
 chart2/qa/extras/chart2import.cxx   |   27 +
 chart2/qa/extras/data/ods/error_bar_properties.ods  |binary
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx   |2 
 chart2/source/tools/ErrorBar.cxx|2 
 chart2/source/view/inc/GL3DRenderer.hxx |   23 -
 chart2/source/view/main/GL3DRenderer.cxx|  183 +---
 qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv |1 
 sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv  |3 
 sc/qa/unit/data/xlsx/new_cond_format_test.xlsx  |binary
 sc/qa/unit/subsequent_export-test.cxx   |   17 -
 sc/qa/unit/ucalc.cxx|   38 ++
 sc/qa/unit/ucalc.hxx|2 
 sc/source/filter/excel/xecontent.cxx|4 
 sfx2/source/doc/SfxDocumentMetaData.cxx |2 
 test/source/bootstrapfixture.cxx|2 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx   |   15 
 16 files changed, 199 insertions(+), 122 deletions(-)

New commits:
commit 37555c895319cef08e652dfe259ec50696def779
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu May 1 00:26:03 2014 +0200

remove unused code

actually I don't want to see the BMP code ever again!!

Change-Id: Ia5be607399238e7e71399d109b2cfbfa889e29d1

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index b25f4a3..e89ff49 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1314,22 +1314,7 @@ int OpenGL3DRenderer::ProcessExtrude3DPickingBox()
 //read pixel to get the index
 Point select = Point(m_aMPos.X(), m_aMPos.Y());
 sal_uInt8 selectColor[4] = {0};
-#if 0
-int picWidth = m_iWidth - select.X();
-int picHeight = m_iHeight - select.Y();
-picWidth = (picWidth - 1)  ~3;
-picHeight = (picHeight - 1)  ~3;
-sal_uInt8 *outBuf = (sal_uInt8 *)malloc(picWidth * picHeight * 3 + 
BMP_HEADER_LEN);
-CreateBMPHeader(outBuf, picWidth, picHeight);
-cout  picWidth =   picWidth  , picHeight =   picHeight  endl;
-glReadPixels(select.X(), select.Y(), picWidth, picHeight, GL_RGB, 
GL_UNSIGNED_BYTE, outBuf + BMP_HEADER_LEN);
-char fileName[256] = {0};
-sprintf(fileName, D:\\boundbox.bmp);
-FILE *pfile = fopen(fileName,wb);
-fwrite(outBuf, picWidth * picHeight * 3 + BMP_HEADER_LEN, 1, pfile);
-fclose(pfile);
-cout  select.x =   select.X()  , select.y =   select.Y()  , 
width =   m_iWidth  , height =   m_iHeight  endl;
-#endif
+
 glReadPixels(select.X(), select.Y(), 1, 1, GL_RGB, GL_UNSIGNED_BYTE, 
selectColor);
 int selectID = GetIndexByColor(selectColor[0], selectColor[1], 
selectColor[2]);
 //printf(selectColor[0] = %d, selectColor[1] = %d, selectColor[2] = %d, 
selectID = %d\n, selectColor[0], selectColor[1], selectColor[2], selectID);
commit 1e1c793ab4db7221d4c7591ddba8b998fdeade7c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu May 1 00:24:26 2014 +0200

some small clean-up in new OGL 3D renderer

Change-Id: I0415aac374fa9c09c0556147cf07b31d13af46e1

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index e3a1c10..b25f4a3 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -89,7 +89,6 @@ OpenGL3DRenderer::OpenGL3DRenderer():
 }
 
 m_uiSelectFrameCounter = 0;
-
 }
 
 void OpenGL3DRenderer::LoadShaders()
@@ -134,7 +133,6 @@ void OpenGL3DRenderer::init()
 
 
 m_3DProjection = glm::perspective(30.0f, (float)m_iWidth / 
(float)m_iHeight, 0.01f, 2000.0f);
-
 }
 
 int OpenGL3DRenderer::AddVertexData(GLuint vertexBuf)
@@ -167,14 +165,18 @@ int OpenGL3DRenderer::AddIndexData(GLuint indexBuf)
 bool OpenGL3DRenderer::GetSimilarVertexIndex(PackedVertex  packed,
 std::mapPackedVertex,unsigned short  VertexToOutIndex,
 unsigned short  result
-){
-std::mapPackedVertex,unsigned short::iterator it = 
VertexToOutIndex.find(packed);
-if ( it == VertexToOutIndex.end() ){
-return false;
-}else{
-result = it-second;
-return true;
-}
+)
+{
+std::mapPackedVertex,unsigned short::iterator it = 
VertexToOutIndex.find(packed);
+if ( it == VertexToOutIndex.end() )
+{
+return false;
+}
+else
+{
+result = it-second;
+return true;
+}
 }
 
 void OpenGL3DRenderer::SetVertex(PackedVertex packed,
@@ -783,16 +785,16 @@ void OpenGL3DRenderer::EndAddShapePolygon3DObject()
 }
 
 void OpenGL3DRenderer::AddPolygon3DObjectNormalPoint(float x, float y, float z)
- {
+{
 if (m_Polygon3DInfo.fillStyle)
 {
 if (!m_Polygon3DInfo.normals)
 {
 m_Polygon3DInfo.normals = new 

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

2014-04-30 Thread Markus Mohrhard
 chart2/source/view/inc/GL3DRenderer.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a1196aae48162a456c7c56bf703a89972ade9b2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu May 1 03:32:54 2014 +0200

fix build error

Change-Id: Ia94ccbb5aefca48c1108dc029c5dcdd5161e947b

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx 
b/chart2/source/view/inc/GL3DRenderer.hxx
index 7af602f..09c904b 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -188,7 +188,7 @@ private:
 int RenderExtrudeFlatSurface(const Extrude3DInfo extrude3D, int surIndex);
 int ProcessUnrenderedShape();
 glm::vec4 GetColorByIndex(int index);
-int GetIndexByColor(int r, int g, int b);
+sal_uInt32 GetIndexByColor(sal_uInt32 r, sal_uInt32 g, sal_uInt32 b);
 int ProcessPickingBox();
 int ProcessExtrude3DPickingBox();
 void RenderCoordinateAxis();
___
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

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Depends on||76710

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

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=65675

--- Comment #132 from Joel Madero jmadero@gmail.com ---
Added bug 76710 - complete loss of conditional formatting if you delete a
sheet. Simple steps to reproduce, reproduced on 4.2.2.3 and master built last
week. Reporter says works fine in 4.1

-- 
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: 2 commits - sc/inc sc/qa sc/source

2014-04-30 Thread Kohei Yoshida
 sc/inc/address.hxx  |   13 --
 sc/inc/column.hxx   |   20 
 sc/inc/refhint.hxx  |   20 
 sc/inc/table.hxx|1 
 sc/inc/tokenarray.hxx   |   20 
 sc/inc/types.hxx|   15 +++
 sc/qa/unit/helper/qahelper.hxx  |   37 
 sc/qa/unit/ucalc.cxx|   74 
 sc/qa/unit/ucalc.hxx|2 
 sc/qa/unit/ucalc_pivottable.cxx |   33 ---
 sc/source/core/data/column.cxx  |   60 -
 sc/source/core/data/column4.cxx |  129 +
 sc/source/core/data/formulacell.cxx |   24 -
 sc/source/core/data/table3.cxx  |   95 -
 sc/source/core/tool/refhint.cxx |   25 +
 sc/source/core/tool/token.cxx   |  160 +---
 16 files changed, 581 insertions(+), 147 deletions(-)

New commits:
commit 3c4fb52d8fc89fe43983991ed2339295b2e0ef8c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu May 1 01:15:02 2014 -0400

fdo#78079: Re-work sort by column to get it to do the right thing.

Also fixed reference update problem.

Change-Id: I06e6115ef969a011fdd5c92d5eb1927fb7ae789b

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index e8f4c93..f856f3d 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -26,6 +26,7 @@
 
 #include limits
 #include scdllapi.h
+#include types.hxx
 #include formula/grammar.hxx
 
 #include com/sun/star/uno/Sequence.hxx
@@ -38,18 +39,6 @@ namespace com { namespace sun { namespace star {
 
 class ScDocument;
 
-// The typedefs
-typedef sal_Int32 SCROW;
-typedef sal_Int16 SCCOL;
-typedef sal_Int16 SCTAB;
-typedef sal_Int32 SCCOLROW; /// a type capable of holding either SCCOL or 
SCROW
-
-// temporarily signed typedefs
-typedef sal_Int32 SCsROW;
-typedef sal_Int16 SCsCOL;
-typedef sal_Int16 SCsTAB;
-typedef sal_Int32 SCsCOLROW;
-
 /** size_t typedef to be able to find places where code was changed from USHORT
 to size_t and is used to read/write from/to streams. */
 typedef size_t SCSIZE;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0e13ec9..526c8e3 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -186,7 +186,7 @@ public:
 
 voidDelete( SCROW nRow );
 voidFreeAll();
-voidSwapCell( SCROW nRow, ScColumn rCol);
+void Swap( ScColumn rOther, SCROW nRow1, SCROW nRow2, bool bPattern );
 
 boolHasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
 boolHasAttribSelection( const ScMarkData rMark, sal_uInt16 nMask ) 
const;
@@ -480,6 +480,7 @@ public:
 void BroadcastRecalcOnRefMove();
 void BroadcastRefMoved( const sc::RefMovedHint rHint );
 void TransferListeners( ScColumn rDestCol, SCROW nRow1, SCROW nRow2, 
SCROW nRowDelta );
+void CollectListeners( std::vectorSvtListener* rListeners, SCROW nRow1, 
SCROW nRow2 );
 
 void CompileDBFormula( sc::CompileFormulaContext rCxt );
 void CompileDBFormula( sc::CompileFormulaContext rCxt, bool 
bCreateFormulaString );
@@ -576,6 +577,23 @@ public:
  */
 void RegroupFormulaCells();
 
+/**
+ * Reset column position of formula cells within specified row range.
+ * Reference positions are also adjusted to reflect the new position so
+ * that the formula cells still reference the same cells or ranges after
+ * the the position change.  The position of a formula cell before the
+ * call is interpreted as the old position of that cell.
+ *
+ * Caller needs to ensure that no formula groups cross the top and bottom
+ * row boundaries.
+ *
+ * @param nRow1 top row boundary
+ * @param nRow2 bottom row boundary
+ */
+void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 );
+
+void SplitFormulaGroupByRelativeRef( const ScRange rBoundRange );
+
 void TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues rDest 
);
 void TransferCellValuesFrom( SCROW nRow, sc::CellValues rSrc );
 void CopyCellValuesFrom( SCROW nRow, const sc::CellValues rSrc );
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index b9ddf04..9ded863 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -18,7 +18,7 @@ namespace sc {
 class RefHint : public SfxSimpleHint
 {
 public:
-enum Type { Moved };
+enum Type { Moved, ColumnReordered };
 
 private:
 Type meType;
@@ -55,6 +55,24 @@ public:
 const ScAddress getDelta() const;
 };
 
+class RefColReorderHint : public RefHint
+{
+const sc::ColReorderMapType mrColMap;
+SCTAB mnTab;
+SCROW mnRow1;
+SCROW mnRow2;
+
+public:
+RefColReorderHint( const sc::ColReorderMapType rColMap, SCTAB nTab, SCROW 
nRow1, SCROW nRow2 );
+virtual ~RefColReorderHint();
+
+const sc::ColReorderMapType getColMap() const;
+
+SCTAB getTab() const;
+SCROW getStartRow() const;
+SCROW getEndRow() const;
+};
+
 }
 
 #endif
diff --git 

Re: [Libreoffice-qa] What should I do with a bug, where I got a file to test and can confirm it, but are not allowed to attach the file to the bug?

2014-04-30 Thread Florian Reisinger
Hi,

Did you ask him to create a test  document himself?
You were unable to reproduce it without the test doc?
Does it work with plain (or close to) documents and with a reduced number?
If you could not reproduce it without and he does not provide a testcase, it 
might be a bit sharp, but invalid might still be the right. Leaving that aside, 
if it works with the limited set, please attach it and set out to new.
.. Just my thoughts, but you asked for those.
Sorry for TOFU
-- 
Liebe Grüße, / Yours,
Florian Reisinger

On 30. April 2014 08:41:09 MESZ, Jochen Schiffers oo...@jochenschiffers.de 
wrote:
Hi Thomas,

what do you mean: share the documents on our cloud and set a link to
the 
folder?
Or do I misunterstand yor question?

reg

Jochen


Am 29.04.2014 18:59, schrieb Thomas Hackert:
 Hello @ll,
 I stumbled upon bug #77330
 (https://bugs.freedesktop.org/show_bug.cgi?id=77330), when doing a
 little bit QA last weekend. After I added comment #1
 (https://bugs.freedesktop.org/show_bug.cgi?id=77330#c1) and set the
 status to NEEDINFO, the reporter sent me a private mail with an
 attached zipped file, containing the master document and its
 subdocuments. He asked me not to attach it to the bug. Now I am not
 sure, what I should do with this bug ... :( I had searched at
 https://wiki.documentfoundation.org/FindTheExpert to find out, if I
 could find a dev, to whom I could send this zipped files, but I am
 not sure, if this is right way. As I can partly confirm this bug, I
 have added my comment to the bug
 (https://bugs.freedesktop.org/show_bug.cgi?id=77330#c2). And now? As
 I am not a dev, I will not be able to fix it ... :( The master
 document in question depends on 100 ODT files with pictures and the
 like, so it would be hard to create one master document with that
 amount of ODTs (or better say: I would not have the time for it the
 next months) ... :(

 Thanks for any insights
 Thomas.


___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings:
http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems?
http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more:
http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] What should I do with a bug, where I got a file to test and can confirm it, but are not allowed to attach the file to the bug?

2014-04-30 Thread Thomas Hackert
Hello Christian, *,
On Mi, 30. Apr 2014 13:38 Christian Lohmaier wrote:
 On Tue, Apr 29, 2014 at 6:59 PM, Thomas Hackert
 thack...@nexgo.de wrote:
 I stumbled upon bug #77330
 (https://bugs.freedesktop.org/show_bug.cgi?id=77330),

 I had searched at
 https://wiki.documentfoundation.org/FindTheExpert to find out, if
 I could find a dev, to whom I could send this zipped files,
 
 This is more or less the only way in such a case, when the sample
 should not be made public for whatever reason.

but then, who is working in the area of master documents? I found 
only Writer (and therefore Michael S.) ... :(

 but I am
 not sure, if this is right way. As I can partly confirm this bug,
 I have added my comment to the bug
 (https://bugs.freedesktop.org/show_bug.cgi?id=77330#c2).
 
 That comment is written in a rather unclear fashion. It misses
 what a) actually refers to. From context one can guess that those
 are the versions that you can reproduce with.

I confirm, I should have written this in a more understandable 
manner, sorry ... :( Yes, that were the versions, with which I could 
reproduce the bug.

 And also still unclear what discus is, as in the crippled
 screenshot I cannot see anything that resembles a disc/round
 object/discus.

I am still not sure, how I should name it, as this discus (as Ton 
has named it) stretches over several sides, so if I look at it, it 
seems to form a disc (like the outer part of an CD). And circle does 
not seem to fit here as well ... :(

 While you speculate earlier that it is the white bar with the
 black outline, you write ... does not show the discus (or maybe
 better disc?) - I neither see something that looks like a floppy
 disk or harddrive, nor anything round. So what is the bug about? I
 assume the white bar.

Well, there are also Compact Disk ... ;) I have looked for a better 
word, but alas was not able to find one ... :( As written above, 
this white (pitch or graduated?) circle on the screenshot spans over 
the following sides, so it seems to form a whole circle. But if you 
use either a larger display and a smaller zoom factor than 50 or 
100%, this effect does not show (that is, what Ton told me). I 
cannot confirm it, as I have only my 10 netbook here ... :(

 And now? As
 I am not a dev, I will not be able to fix it ... :( The master
 document in question depends on 100 ODT files with pictures and
 the like, so it would be hard to create one master document with
 that amount of ODTs (or better say: I would not have the time for
 it the next months) ... :(
 
 The crux is not to create a new set of documents, but to trim down
 the existing ones to show the problem.

O.K.

 i.e. first replace all documents with a single one (i.e. copy one
 document and name it like the others) - this is easily done, but
 of course doesn't guarantee that the problem still shows.

It depends, how you do define easily done ... ;) They are named 
something like U1.E1.001.odt up to U8.E1.001.odt (not to forget 
a copyright and a copyright file for something else) ... :( I would 
not know an easy way to do this ... :(

 But if it does still show, then that does already help a lot.

Hm. Maybe I will have the time the next days, but I cannot give such 
undertaking, sorry ... :(
Thanks for your answer
Thomas.

-- 
To every Ph.D. there is an equal and opposite Ph.D.
-- B. Duggan

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] What should I do with a bug, where I got a file to test and can confirm it, but are not allowed to attach the file to the bug?

2014-04-30 Thread Thomas Hackert
Hello Jochen, *,
On Mi, 30. Apr 2014 08:41 Jochen Schiffers wrote:
 what do you mean: share the documents on our cloud and set a link
 to the folder?
 Or do I misunterstand yor question?

yes. I am not allowed to give it to the public (= attach to a bug). 
So I think, to put it in the cloud is not a good idea ... :(
Have a nice evening
Thomas
Fullquote removed

-- 
Yow!  Is my fallout shelter termite proof?

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] What should I do with a bug, where I got a file to test and can confirm it, but are not allowed to attach the file to the bug?

2014-04-30 Thread Christian Lohmaier
Hi Thomas, *,

On Wed, Apr 30, 2014 at 6:51 PM, Thomas Hackert thack...@nexgo.de wrote:
 Hello Christian, *,
 On Mi, 30. Apr 2014 13:38 Christian Lohmaier wrote:

 but then, who is working in the area of master documents? I found
 only Writer (and therefore Michael S.) ... :(

Oh, to be clear: Just randomly mailing documents to people is not the
way to go. Instead up show up on the #libreoffice-dev channel and ping
the candidates and ask whether it is OK to mail them the
documents/whether they know a better contact.

 [...]
 I confirm, I should have written this in a more understandable
 manner, sorry ... :( Yes, that were the versions, with which I could
 reproduce the bug.

Yeah, those could have also benefitted from some linebreaks for easier
quick parsing :-P

 And also still unclear what discus is, as in the crippled
 screenshot I cannot see anything that resembles a disc/round
 object/discus.

 I am still not sure, how I should name it, as this discus (as Ton
 has named it) stretches over several sides, so if I look at it, it
 seems to form a disc (like the outer part of an CD). And circle does
 not seem to fit here as well ... :(

 While you speculate earlier that it is the white bar with the
 black outline, you write ... does not show the discus (or maybe
 better disc?) - I neither see something that looks like a floppy
 disk or harddrive, nor anything round. So what is the bug about? I
 assume the white bar.

 Well, there are also Compact Disk ... ;)

That would be included in round - I didn't expect it to have such a
large radius that it appears as a bar on first look in that
screenshot. But from your description now it is clear that it is a
donut shape, or in technical terms an annulus (Kreisring), or as it
is called in LO's drawing shapes: Ring :-)
http://en.wikipedia.org/wiki/Annulus_(mathematics)

 i.e. first replace all documents with a single one (i.e. copy one
 document and name it like the others) - this is easily done, but
 of course doesn't guarantee that the problem still shows.

 It depends, how you do define easily done ... ;) They are named
 something like U1.E1.001.odt up to U8.E1.001.odt (not to forget
 a copyright and a copyright file for something else) ... :( I would
 not know an easy way to do this ... :(

for file in *.odt; do cp -f my-one-sample.odt $i; done

i.e. for each file U1 whatever, it copies (and overwrites, that's
what the -f switch does) a single document, in this case
my-one-sample.odt. over the file.

→ all files will be like my-one-sample.odt

but it might just be a drawing shape.

for file in *.odt; do zipgrep  'draw:type=ring' $file /dev/null
 echo Ringshape in file $file; done

Then examine the file in LibreOffice.
If that doesn't match anything, try to search for more draw shapes
(draw:custom-shape)

ciao
Christian
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 47458] [Task] EPS graphics not displayed properly

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=47458

V Stuart Foote vstuart.fo...@utsa.edu changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Whiteboard||target:4.2.5 target:4.3.0
 Resolution|--- |FIXED
 CC||vstuart.fo...@utsa.edu

--- Comment #29 from V Stuart Foote vstuart.fo...@utsa.edu ---
On Windows 7 sp1, 64-bit
Version: 4.3.0.0.alpha1+
Build ID: 0b03f7ed575838f90e6b1ebec3538a3a214f81fb
TinderBox: Win-x86@39, Branch:master, Time: 2014-04-30_01:30:46

Setting resolved fixed with Caolan's commits on master:

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

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

However, pstoedit (for vector formatted previews), GhostScript, and ImageMagick
must be correctly configured and available on system path.

Would help if someone with one or all of the helper apps on OS X can confirm
fix is valid.

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


[Libreoffice-bugs] [Bug 64161] PDF: EPS images don't get exported when writing a PDF file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64161

--- Comment #27 from V Stuart Foote vstuart.fo...@utsa.edu ---
Confirming fixed on Windows 7 sp1, 64-bit
Version: 4.3.0.0.alpha1+
Build ID: 0b03f7ed575838f90e6b1ebec3538a3a214f81fb
TinderBox: Win-x86@39, Branch:master, Time: 2014-04-30_01:30:46

with Caolan's commits on master. However, pstoedit (for vector formatted
previews), GhostScript, and ImageMagick must be correctly configured and
available on system path.

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


[Libreoffice-bugs] [Bug 64161] PDF: EPS images don't get exported when writing a PDF file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64161

--- Comment #28 from V Stuart Foote vstuart.fo...@utsa.edu ---
Created attachment 98208
  -- https://bugs.freedesktop.org/attachment.cgi?id=98208action=edit
Export to PDF of test ODP impress with inserted EPS and EMF

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


[Libreoffice-bugs] [Bug 78068] Calling Format Paragraph dialog freeze

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78068

--- Comment #5 from Julien Nabet serval2...@yahoo.fr ---
Created attachment 98209
  -- https://bugs.freedesktop.org/attachment.cgi?id=98209action=edit
1 bt at random

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


[Libreoffice-bugs] [Bug 64161] PDF: EPS images don't get exported when writing a PDF file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64161

--- Comment #29 from V Stuart Foote vstuart.fo...@utsa.edu ---
Created attachment 98210
  -- https://bugs.freedesktop.org/attachment.cgi?id=98210action=edit
test ODP impress with inserted EPS and EMF

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


[Libreoffice-bugs] [Bug 77071] LibreOffice fails to build with ICU 53

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=77071

--- Comment #13 from Thierry Vignaud thierry.vign...@gmail.com ---
This fails with:
Rule parsering error
/home/iurt/rpmbuild/BUILD/libreoffice-4.2.4.1/i18npool/CustomTarget_collator.mk:46:
recipe for target
'/home/iurt/rpmbuild/BUILD/libreoffice-4.2.4.1/workdir/CustomTarget/i18npool/collator/collator_zh_TW_charset.cxx'
failed

(http://pkgsubmit.mageia.org/uploads/failure/cauldron/core/release/20140430053205.tv.valstar.17697/log/libreoffice-4.2.4.1-3.mga5/build.0.20140430053412.log)

Using
http://svnweb.mageia.org/packages/cauldron/libreoffice/current/SOURCES/icu-53.patch?view=markup

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


[Libreoffice-bugs] [Bug 78068] Calling Format Paragraph dialog freeze

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78068

--- Comment #6 from Julien Nabet serval2...@yahoo.fr ---
I noticed that I can get the paragraph dialog normally when there's no text at
all.

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


[Libreoffice-bugs] [Bug 78104] New: FORMATTING: Preview of tabels

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78104

  Priority: medium
Bug ID: 78104
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FORMATTING: Preview of tabels
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: hugo.golddol...@gmx.de
  Hardware: Other
Whiteboard: BSA PossibleRegression
Status: UNCONFIRMED
   Version: 4.2.3.3 release
 Component: Writer
   Product: LibreOffice

Problem description: 

Steps to reproduce:
1. when I create spredsheets in writer, the preview shows all lines, wether I
conseal it or not.

Current behavior: consealed lines appear.

Expected behavior: consealed lines do not appear.


Operating System: Windows 7
Version: 4.2.3.3 release
Last worked in: 4.2.2.1 release

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


[Libreoffice-bugs] [Bug 78062] EDITING: HANG on Undo (like a crash, but LO stays in memory)

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78062

--- Comment #3 from Anton Derbenev antic...@mobilmir.ru ---
Ok, I agree, I hasted.
4.2.5.0.0+ really unfreezes after awhile (about 60 seconds for me).

4.2.4.1 still does not in several minutes.

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


[Libreoffice-bugs] [Bug 64161] PDF: EPS images don't get exported when writing a PDF file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64161

--- Comment #30 from V Stuart Foote vstuart.fo...@utsa.edu ---
Created attachment 98213
  -- https://bugs.freedesktop.org/attachment.cgi?id=98213action=edit
rif on attachement 98174, parsed through Inkscape

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


[Libreoffice-bugs] [Bug 78070] error after copy paste and saving a .doc file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78070

--- Comment #6 from Cornelius Arendt cornelius.are...@t-online.de ---
Created attachment 98215
  -- https://bugs.freedesktop.org/attachment.cgi?id=98215action=edit
example for a doc-file that can not be saved

Whatever i change in this file can not be saved without the former mentioned
error message.

NetzspeicherCorny is a NAS.
--
Fehler beim Speichern des Dokumentes The problem 2:
Allgemeiner Ein-/Ausgabefehler beim Zugriff auf
/home/corny/NetzspeicherCorny/Finanzielles/Steuer/2013/The problem 2.doc.


I was convinced, that the problem occured even if I saved the file in other
places (e.g. local machine). But now i can not reproduce the error when saving
on local machine, but it always occures when saving to my NAS.
May the NAS itself be the problem?
If so, i have to apologize! You are definately not my personal hardware error
team. I promise to systematically test any possible reason before i consume
your time again.

Now I will check, if possible, if the error is on the NAS.
The NAS runs on a debian linux (as far as i know).
Perhaps there is a selftest-function.

This case is closed, there is evidence, that LibreOffice is not the source of
the problem.

P.S.
I use ubuntu since 09.04 and i was always pleased with it. This is great
Software. Before LibreOffice occured, i used openoffice even on the Windows
machines (from the children and the neighbours). Today its all LibreOffice.
You all do a very good work. Thanks a lot fos this.

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


[Libreoffice-bugs] [Bug 64161] PDF: EPS images don't get exported when writing a PDF file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64161

--- Comment #32 from V Stuart Foote vstuart.fo...@utsa.edu ---
Created attachment 98217
  -- https://bugs.freedesktop.org/attachment.cgi?id=98217action=edit
PDF export from draw rendering of EPS and EMF as fixed

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


[Libreoffice-bugs] [Bug 64161] PDF: EPS images don't get exported when writing a PDF file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64161

--- Comment #31 from V Stuart Foote vstuart.fo...@utsa.edu ---
Created attachment 98216
  -- https://bugs.freedesktop.org/attachment.cgi?id=98216action=edit
draw rendering of EPS and EMF as fixed

A Draw rif on @etiffany test document, top is default LODev 430alpha1+ raster
preview of provided EPS. Middle is that same EPS parsed through Inkscape as EMF
(note vector preview), bottom is the same EPS parsed with Inskscape back to
cleaner EPS retains color but is also a raster preview.

All three render as vector based in PDF, to follow. So issue is resolved, but
quality of preview handling of EPS may depend on structure of the EPS. Works
well on Windows if flushing through Inkscape.

Need to verify that all is good with OS X.

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


[Libreoffice-bugs] [Bug 69385] SLIDESHOW: Graphics in Presentation do not show in Slide Show

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=69385

--- Comment #8 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org ---
Created attachment 98219
  -- https://bugs.freedesktop.org/attachment.cgi?id=98219action=edit
PDF export after the fix for bug 62038

Works as expected with the fix for bug 62038, both in slideshow mode and PDF
export. Tested with LO 4.2.5.0.0+ under Ubuntu 14.04 x86-64

Best regards. JBF

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


[Libreoffice-bugs] [Bug 76324] CALC becomes very slow with 5000+ comments

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=76324

--- Comment #6 from a07cd040897db54e1...@spambog.com ---
(In reply to comment #5)

  - copy and paste cells with comments is very slow
 
 It works quite snappy.  Copy and paste works quick, moving of cells etc also
 works fine.

Did you test with the attached document? If you have only one cell with one
comment this one is indeed processed quickly. But if you have many *other*
cells with comments copy/paste of this one cell is slow.

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


[Libreoffice-bugs] [Bug 78070] error after copy paste and saving a .doc file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78070

Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 Ever confirmed|0   |1

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


[Libreoffice-bugs] [Bug 78070] error after copy paste and saving a .doc file

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78070

--- Comment #7 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org ---
Did you try to save your file without space in its name? For example
The_problem_2.doc instead of The problem 2.doc ?

Best regards. JBF

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


[Libreoffice-bugs] [Bug 78105] New: FILEOPEN: WPD image loads with incorrect coloring and position

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78105

  Priority: medium
Bug ID: 78105
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILEOPEN: WPD image loads with incorrect coloring and
position
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: philip...@hotmail.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 3.6.4.3 release
 Component: Writer
   Product: LibreOffice

Created attachment 98221
  -- https://bugs.freedesktop.org/attachment.cgi?id=98221action=edit
created .wpd file

Well i created the attached file in WordPerfect x7 to test its compatibility in
LibO and noticed that the coloring of the image is incorrect as well as its
positioning. It was tested in 3.6 - 4.3.

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


[Libreoffice-bugs] [Bug 78105] FILEOPEN: WPD image loads with incorrect coloring and position

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=78105

--- Comment #1 from Jay philip...@hotmail.com ---
Created attachment 98222
  -- https://bugs.freedesktop.org/attachment.cgi?id=98222action=edit
pdf output from wordperfect

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


[Libreoffice-bugs] [Bug 77071] LibreOffice fails to build with ICU 53

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=77071

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|target:4.3.0|target:4.3.0 target:4.2.5

--- Comment #14 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Eike Rathke committed a patch related to this issue.
It has been pushed to libreoffice-4-2:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=32a9c19bf79b99ae3b6cdae7ccc07499094a5603h=libreoffice-4-2

adapt i18npool to ICU 53, fdo#77071


It will be available in LibreOffice 4.2.5.

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

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


[Libreoffice-bugs] [Bug 69002] FILEOPEN: File Browser Crash: QWidget::repaint: Recursive repaint detected

2014-04-30 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=69002

--- Comment #29 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Luboš Luňak committed a patch related to this issue.
It has been pushed to libreoffice-4-2:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=80f113efa6f60c6b3aad33128921792451f114ceh=libreoffice-4-2

fix KFileDialog crashes (fdo#69002)


It will be available in LibreOffice 4.2.5.

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

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


  1   2   3   4   >