date:20140606

Hi Matus,

On Thu, Jun 05, 2014 at 09:11:31PM +0200, Matúš Kukan 
matus.ku...@collabora.com wrote:
 and found one huge performance regression (21 - 102 bn pseudo cycles),
 for a .doc document [2] between commits
 947feaa896168430c78dd08dabee1447133f2740..8dd624128bf12e013c17b3b24c0b24135296bb8e
 so I suspect it has something to do with SwTextBoxHelper.
 Callgrind data:
 http://dev-builds.libreoffice.org/callgrind_report/traces/onload-012_fdo
 %2338513.doc-convert.log.gz

Hmm, quite possible, though I don't understand the trace. If I open it
with kcachegrind, it says that 77% of the time is spent in
SwXMLWriter::Write(), while the commandline is:

/home/buildslave/build/instdir/program/soffice.bin --splash-pipe=0 --headless 
--convert-to doc --outdir tmp 
/home/buildslave/source/test-files/loperf/012_fdo#38513.doc

I.e. we read from a .doc file, and save it as a .doc file. Do you have
an idea why the ODF export is invoked here? I'll try to run cachegrind
here locally to see if I can reproduce the same trace or not.

Thanks,

Miklos


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

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

2014-06-06 Thread Tobias Lippert

 sw/inc/ToxTextGenerator.hxx |   37 ++
 sw/source/core/tox/ToxTextGenerator.cxx |   84 +---
 2 files changed, 115 insertions(+), 6 deletions(-)

New commits:
commit 9088a4c2d18f59c22fceb81829441b704603415d
Author: Tobias Lippert d...@fastmail.fm
Date:   Fri Jun 6 00:04:24 2014 +0200

fdo#30732 Retain selected character attributes for table of contents

The text and selected attributes are copied from the source text node
and added to the target node at the corresponding positions.

Conflicts:
sw/inc/ToxTextGenerator.hxx
sw/source/core/tox/ToxTextGenerator.cxx

Change-Id: Ifa329bfcb2b9691120513236909bcadaf1127b5e
Reviewed-on: https://gerrit.libreoffice.org/9610
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index d83736b..8536114 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -20,14 +20,20 @@
 #ifndef SW_TOXTEXTGENERATOR_HXX_
 #define SW_TOXTEXTGENERATOR_HXX_
 
+#include rtl/ustring.hxx
 #include sal/types.h
 #include swdllapi.h
 #include boost/shared_ptr.hpp
 #include vector
 
+class SfxItemSet;
+class SwAttrPool;
+class SwFmtAutoFmt;
 class SwDoc;
 class SwForm;
 class SwPageDesc;
+class SwTxtAttr;
+class SwTxtNode;
 struct SwTOXSortTabBase;
 
 namespace sw {
@@ -54,6 +60,37 @@ public:
 private:
 const SwForm mToxForm;
 boost::shared_ptrToxLinkProcessor mLinkProcessor;
+
+/** A handled text token.
+ * It contains the information which should be added to the target text 
node.
+ */
+struct HandledTextToken {
+OUString text;
+std::vectorSwFmtAutoFmt* autoFormats;
+std::vectorsal_Int32 startPositions;
+std::vectorsal_Int32 endPositions;
+};
+/** Append text (and selected attributes) to a target node.
+ *
+ * Will take the text of @p source, and return the text and the attributes 
which should be added to the
+ * target text node. @see CollectAttributesForTox() for the criteria of 
the attributes which are taken.
+ */
+static HandledTextToken
+HandleTextToken(const SwTOXSortTabBase source, SwAttrPool attrPool);
+
+/** Applies the result of a handled text token to a target node. */
+static void
+ApplyHandledTextToken(const HandledTextToken htt, SwTxtNode targetNode);
+
+/** Collect the attributes of a hint that shall be copied over to the TOX.
+ *
+ * Some text attributes are used in the TOX entries. This method defines 
which attributes are used.
+ *
+ * @param hint The hint from which the attributes are taken
+ * @param pool The attribute pool for the new items
+ */
+static boost::shared_ptrSfxItemSet
+CollectAttributesForTox(const SwTxtAttr hint, SwAttrPool pool);
 };
 
 }
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx 
b/sw/source/core/tox/ToxTextGenerator.cxx
index 86e8777..721df78 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -29,16 +29,23 @@
 #include pagedesc.hxx
 #include tox.hxx
 #include txmsrt.hxx
+#include fmtautofmt.hxx
 #include fmtfsize.hxx
 #include fmtpdsc.hxx
 #include DocumentSettingManager.hxx
 #include SwStyleNameMapper.hxx
+#include swatrset.hxx
 #include ToxWhitespaceStripper.hxx
 #include ToxLinkProcessor.hxx
+#include txatbase.hxx
 
 #include editeng/tstpitem.hxx
 #include editeng/lrspitem.hxx
 #include rtl/ustring.hxx
+#include svl/itemiter.hxx
+
+#include boost/foreach.hpp
+#include boost/make_shared.hpp
 
 /// Generate String according to the Form and remove the
 /// special characters 0-31 and 255.
@@ -107,12 +114,10 @@ void ToxTextGenerator::GenerateText(SwDoc* pDoc, const 
std::vectorSwTOXSortTabB
 rTxt += lcl_GetNumString( rBase, aToken.nChapterFormat == 
CF_NUMBER, static_castsal_uInt8(aToken.nOutlineLevel - 1) ) ;
 break;
 
-case TOKEN_ENTRY_TEXT:
-{
-SwIndex aIdx( pTOXNd, 
std::min(pTOXNd-GetTxt().getLength(),rTxt.getLength()) );
-ToxWhitespaceStripper stripper(rBase.GetTxt().sText);
-pTOXNd-InsertText(stripper.GetStrippedString(), aIdx);
-}
+case TOKEN_ENTRY_TEXT: {
+HandledTextToken htt = HandleTextToken(rBase, 
pDoc-GetAttrPool());
+ApplyHandledTextToken(htt, *pTOXNd);
+}
 break;
 
 case TOKEN_ENTRY:
@@ -308,6 +313,73 @@ void ToxTextGenerator::GenerateText(SwDoc* pDoc, const 
std::vectorSwTOXSortTabB
 mLinkProcessor-InsertLinkAttributes(*pTOXNd);
 }
 
+/*static*/ boost::shared_ptrSfxItemSet
+ToxTextGenerator::CollectAttributesForTox(const SwTxtAttr hint, SwAttrPool 
pool)
+{
+boost::shared_ptrSfxItemSet retval = 
boost::make_sharedSfxItemSet(pool);
+if (hint.Which() != RES_TXTATR_AUTOFMT) {

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

2014-06-06 Thread bugzilla-daemon

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

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

   What|Removed |Added

 Whiteboard|EasyHack|EasyHack
   |DifficultyInteresting   |DifficultyInteresting
   |SkillCpp|SkillCpp target:4.4.0

--- Comment #27 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Tobias Lippert committed a patch related to this issue.
It has been pushed to master:

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

fdo#30732 Retain selected character attributes for table of contents



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

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

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

 sw/inc/ToxLinkProcessor.hxx |7 ---
 sw/source/core/tox/ToxLinkProcessor.cxx |1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2ac07bb5bfd9a5d7bc591b9bb39c45cab99f304b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 5 20:53:56 2014 +0100

missing mode-lines, stray semi-colons

Change-Id: I89fc2b0385cebbf5c629e67fa89ba1dd30486f35

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 4200a1f..dcf1002 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -26,8 +26,8 @@ namespace sw {
  */
 class SW_DLLPUBLIC ToxLinkProcessor {
 public:
-ToxLinkProcessor() {;}
-virtual ~ToxLinkProcessor() {;}
+ToxLinkProcessor() {}
+virtual ~ToxLinkProcessor() {}
 
 void
 StartNewLink(sal_Int32 startPosition, const OUString characterStyle);
@@ -56,7 +56,6 @@ private:
 struct StartedLink {
 StartedLink(sal_Int32 startPosition, const OUString characterStyle) :
 mStartPosition(startPosition), mCharacterStyle(characterStyle) 
{
-;
 }
 sal_Int32 mStartPosition;
 OUString mCharacterStyle;
@@ -84,3 +83,5 @@ private:
 }
 
 #endif /* SW_TOXLINKPROCESSOR_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx 
b/sw/source/core/tox/ToxLinkProcessor.cxx
index 23ab44a..181757c 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -68,3 +68,4 @@ ToxLinkProcessor::InsertLinkAttributes(SwTxtNode node)
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-06 Thread Tobias Lippert

 sw/CppunitTest_sw_tox.mk|1 
 sw/inc/ToxTextGenerator.hxx |   28 +++
 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |   99 
 sw/source/core/inc/txmsrt.hxx   |2 
 sw/source/core/tox/ToxTextGenerator.cxx |   74 
 5 files changed, 172 insertions(+), 32 deletions(-)

New commits:
commit 26259e0cca3bc4d8f45337b0cafea2eed8eb32f9
Author: Tobias Lippert d...@fastmail.fm
Date:   Sun Jun 1 14:22:48 2014 +0200

Unittest generation of page number placeholders in table of contents

Conflicts:
sw/inc/ToxTextGenerator.hxx
sw/source/core/tox/ToxTextGenerator.cxx

Change-Id: I15c963b6e1a8823a1fdafd2c123d18ba3dc9f134
Reviewed-on: https://gerrit.libreoffice.org/9611
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk
index 7911de3..e45f597 100644
--- a/sw/CppunitTest_sw_tox.mk
+++ b/sw/CppunitTest_sw_tox.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_tox_test))
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_tox_test, \
sw/qa/cppunit/tox/test_ToxWhitespaceStripper \
sw/qa/cppunit/tox/test_ToxLinkProcessor \
+   sw/qa/cppunit/tox/test_ToxTextGenerator \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_tox_test, \
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 8536114..ba79177 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -23,6 +23,7 @@
 #include rtl/ustring.hxx
 #include sal/types.h
 #include swdllapi.h
+
 #include boost/shared_ptr.hpp
 #include vector
 
@@ -35,6 +36,7 @@ class SwPageDesc;
 class SwTxtAttr;
 class SwTxtNode;
 struct SwTOXSortTabBase;
+class ToxTextGeneratorTest;
 
 namespace sw {
 
@@ -82,6 +84,19 @@ private:
 static void
 ApplyHandledTextToken(const HandledTextToken htt, SwTxtNode targetNode);
 
+/** Handle a page number token.
+ *
+ * Will return a string of @p numberOfToxSources concatenated '@' signs, 
separated by commas, and
+ * finished by a '~'.
+ * (The '@' sign is the magic character C_NUM_REPL, the '~' sign is the 
magic character C_END_PAGE_NUM.
+ *
+ * @internal
+ * The count of similar entries, i.e., nodes in aTOXSources of 
SwTOXSortTabBase gives the PagerNumber
+ * pattern.
+ */
+static OUString
+ConstructPageNumberPlaceholder(size_t numberOfToxSources);
+
 /** Collect the attributes of a hint that shall be copied over to the TOX.
  *
  * Some text attributes are used in the TOX entries. This method defines 
which attributes are used.
@@ -91,6 +106,19 @@ private:
  */
 static boost::shared_ptrSfxItemSet
 CollectAttributesForTox(const SwTxtAttr hint, SwAttrPool pool);
+
+/** This method will call GetNumStringOfFirstNode() of the first node in 
the provided SwTOXSortTabBase.
+ *
+ * The parameters @p bUsePrefix and @p nLevel are passed to 
SwTxtNode::GetNumString()
+ *
+ * @internal
+ * The method is only called if several preconditions for @p rBase are 
true. Check the implementation
+ * for details.
+ */
+static OUString
+GetNumStringOfFirstNode(const SwTOXSortTabBase rBase, bool bUsePrefix, 
sal_uInt8 nLevel);
+
+friend class ::ToxTextGeneratorTest;
 };
 
 }
diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
new file mode 100644
index 000..41f4bd0
--- /dev/null
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include rtl/ustring.hxx
+#include tox.hxx
+#include txmsrt.hxx
+#include ToxTextGenerator.hxx
+
+#include cppunit/TestAssert.h
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+
+using sw::ToxTextGenerator;
+
+class ToxTextGeneratorTest : public CppUnit::TestFixture {
+public:
+void EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems();
+void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem();
+void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem();
+void EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet();
+
+CPPUNIT_TEST_SUITE(ToxTextGeneratorTest);
+CPPUNIT_TEST(EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems);
+CPPUNIT_TEST(OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem);
+CPPUNIT_TEST(TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem);
+CPPUNIT_TEST(EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet);
+CPPUNIT_TEST_SUITE_END();
+

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

2014-06-06 Thread Dinesh Patil

 oox/source/export/drawingml.cxx |5 +
 sw/qa/extras/ooxmlexport/data/fdo79256.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |   14 ++
 3 files changed, 19 insertions(+)

New commits:
commit 80ef7a645a8118976a4366135faa41bceda423be
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date:   Thu May 29 15:26:46 2014 +0530

fdo#79256 Line Style with Long Dashes and dots is getting corrupt after RT

Description:
In RT file the dash length (d) is going out of range,
as after RT the dashing scheme changes to custom dash
which was causing the corruption. Changed code at export,
which will divide the DashLen, DotLen and Distance by
base line width.

Reviewed on:
https://gerrit.libreoffice.org/9559

Change-Id: I0e644b5a2b692a9e717026a14d1f0058199f53b1

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6703669..42d007a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -628,6 +628,11 @@ void DrawingML::WriteOutline( Reference XPropertySet  
rXPropSet )
 // line style is a dash and it was not set by the shape style
 // TODO: the XML_d and XML_sp values seem insane
 mpFS-startElementNS( XML_a, XML_custDash, FSEND );
+
+aLineDash.DotLen = aLineDash.DotLen / nLineWidth;
+aLineDash.DashLen = aLineDash.DashLen / nLineWidth;
+aLineDash.Distance = aLineDash.Distance / nLineWidth;
+
 int i;
 for( i = 0; i  aLineDash.Dots; i ++ )
 mpFS-singleElementNS( XML_a, XML_ds,
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79256.docx 
b/sw/qa/extras/ooxmlexport/data/fdo79256.docx
new file mode 100644
index 000..2358abb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79256.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index ad5b49b..0eccae3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1628,6 +1628,20 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78957, fdo78957.docx)
 CPPUNIT_ASSERT(cy = 0 );
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo79256, fdo79256.docx)
+{
+/* Corruption issue containing Line Style with Long Dashes and Dots
+ * After RT checking the Dash Length value. Dash Length value should not 
be greater than 2147483.
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+const sal_Int32 maxLimit = 2147483;
+sal_Int32 d = 
getXPath(pXmlDoc,/w:document/w:body/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:ln[1]/a:custDash[1]/a:ds[1],d).toInt32();
+CPPUNIT_ASSERT(d = maxLimit );
+}
+
 #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: 2 commits - include/oox oox/source sd/qa

 include/oox/drawingml/shape.hxx |4 
 include/oox/drawingml/textliststyle.hxx |3 
 include/oox/ppt/pptshapegroupcontext.hxx|3 
 oox/source/drawingml/diagram/diagram.cxx|   39 ++--
 oox/source/drawingml/diagram/diagramfragmenthandler.cxx |   49 ++---
 oox/source/drawingml/textliststyle.cxx  |   28 +++
 oox/source/ppt/pptshapegroupcontext.cxx |   13 +
 sd/qa/unit/data/pptx/bnc870233_1.pptx   |binary
 sd/qa/unit/data/pptx/bnc870233_2.pptx   |binary
 sd/qa/unit/import-tests.cxx |  141 
 10 files changed, 239 insertions(+), 41 deletions(-)

New commits:
commit 639571d52b1b7e4cf912803642ca245c5dd86839
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 10:16:39 2014 +0200

2nd part of bnc#870233: import font color from color fragment for SmartArts

SmartArt import ignores some fragments during import if
drawing fragment exists, which seems to be not complete.
In this case font style is blank (white) in data (and drawing)
fragment and the real value is defined in the ignored color fragment.

So first make color fragment parsing work, then apply font
color of node0 style on nodes of the SmartArt.

Actually, it's a workaround, because node0 style label
is hardcoded, for a proper solution layout fragment should
be parsed too to get the right style label, but
it interferes with the drawing fragment by now.

Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index fcb4999..f8e1b7c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -176,6 +176,9 @@ public:
 const ::std::vectorOUString
 getExtDrawings() { return maExtDrawings; }
 voidaddExtDrawingRelId( const OUString rRelId ) { 
maExtDrawings.push_back( rRelId ); }
+// Set font color only for extdrawings.
+voidsetFontRefColorForNodes(const Color rColor) { 
maFontRefColorForNodes = rColor; }
+const ColorgetFontRefColorForNodes() const { return 
maFontRefColorForNodes; }
 voidsetLockedCanvas(bool bLockedCanvas);
 boolgetLockedCanvas();
 voidsetWps(bool bWps);
@@ -267,6 +270,7 @@ protected:
 com::sun::star::awt::Size   maSize;
 com::sun::star::awt::Point  maPosition;
 ::std::vectorOUStringmaExtDrawings;
+Color   maFontRefColorForNodes;
 
 private:
 enum FrameType
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index f4e1d7a..847d9b6 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
 #include oox/drawingml/shapegroupcontext.hxx
+#include oox/drawingml/color.hxx
 #include oox/ppt/slidepersist.hxx
 
 namespace oox { namespace ppt {
@@ -30,7 +31,9 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+
 voidimportExtDrawings();
+voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 70d938a..a4ad279 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -320,7 +320,6 @@ void Diagram::build(  )
 #endif
 }
 
-
 void Diagram::addTo( const ShapePtr  pParentShape )
 {
 // collect data, init maps
@@ -432,7 +431,7 @@ void loadDiagram( ShapePtr pShape,
 }
 
 // extLst is present, lets bet on that and ignore the rest of the data 
from here
-if( !pData-getExtDrawings().size() )
+if( pData-getExtDrawings().empty() )
 {
 // layout
 if( !rLayoutPath.isEmpty() )
@@ -459,25 +458,33 @@ void loadDiagram( ShapePtr pShape,
 pDiagram,
 xRefQStyle);
 }
-
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler  xRefColorStyle(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
-
-importFragment(rFilter,
-loadFragment(rFilter,xRefColorStyle),
-OOXColor,
-pDiagram,
-xRefColorStyle);
-}
 } else {
 // We still want to add the XDocuments to the DiagramDomMap
 DiagramDomMap rMainDomMap = pDiagram-getDomMap();

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

 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |1 +
 sw/source/core/tox/ToxTextGenerator.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68e18231b94f6db7999ff58f9b7edd9ae8164fb7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 09:30:57 2014 +0100

tweak to get building universally

Change-Id: I5760dc1fccb7ad726663727b9404e014da519755

diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index 41f4bd0..12dea3d 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -25,6 +25,7 @@ public:
 void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem();
 void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem();
 void EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet();
+void EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty();
 
 CPPUNIT_TEST_SUITE(ToxTextGeneratorTest);
 CPPUNIT_TEST(EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems);
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx 
b/sw/source/core/tox/ToxTextGenerator.cxx
index 10a3e2f..1360f6d 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -311,7 +311,7 @@ void ToxTextGenerator::GenerateText(SwDoc* pDoc, const 
std::vectorSwTOXSortTabB
 /*static*/ boost::shared_ptrSfxItemSet
 ToxTextGenerator::CollectAttributesForTox(const SwTxtAttr hint, SwAttrPool 
pool)
 {
-boost::shared_ptrSfxItemSet retval = 
boost::make_sharedSfxItemSet(pool);
+boost::shared_ptrSfxItemSet retval(new SfxItemSet(pool));
 if (hint.Which() != RES_TXTATR_AUTOFMT) {
 return retval;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 dev/null  |binary
 sc/qa/unit/data/ods/opencl/financial/XIRR.ods |binary
 sc/qa/unit/opencl-test.cxx|   27 --
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit a6a51ef9dd991e11c90317f4d6c29dfb310e1a17
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Mar 17 18:19:07 2014 -0400

fdo#76140: Reimplement XIRR OpenCL test.

1) Use ods format and store the expected formula results as numeric cells,
   to avoid having to load the same file twice (which is slower).

2) Use rtl::math::approxEqual to evaluate two numbers that may be subject
   to numerical instability especially when the expected values are very
   small.

Change-Id: Ie08e91f797065f4593f996df3541da84019cc53c
(cherry picked from commit ca25cdcb398f200ce5d53286eea02d49d8d1c5f4)
Signed-off-by: Michael Meeks michael.me...@collabora.com

diff --git a/sc/qa/unit/data/ods/opencl/financial/XIRR.ods 
b/sc/qa/unit/data/ods/opencl/financial/XIRR.ods
new file mode 100644
index 000..a9d2476
Binary files /dev/null and b/sc/qa/unit/data/ods/opencl/financial/XIRR.ods 
differ
diff --git a/sc/qa/unit/data/xls/opencl/financial/XIRR.xls 
b/sc/qa/unit/data/xls/opencl/financial/XIRR.xls
deleted file mode 100644
index b9a87ef..000
Binary files a/sc/qa/unit/data/xls/opencl/financial/XIRR.xls and /dev/null 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 843c9a9..9def7e8 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -3405,28 +3405,27 @@ void ScOpenclTest:: testFinancialXirrFormula()
 {
 if (!detectOpenCLDevice())
 return;
-ScDocShellRef xDocSh = loadDoc(opencl/financial/XIRR., XLS);
+
+ScDocShellRef xDocSh = loadDoc(opencl/financial/XIRR., ODS);
+CPPUNIT_ASSERT(xDocSh.Is());
 ScDocument *pDoc = xDocSh-GetDocument();
-CPPUNIT_ASSERT(pDoc);
 enableOpenCL();
 pDoc-CalcAll();
-ScDocShellRef xDocShRes = loadDoc(opencl/financial/XIRR., XLS);
-ScDocument *pDocRes = xDocShRes-GetDocument();
-CPPUNIT_ASSERT(pDocRes);
-for (SCROW i = 0; i = 9; ++i)
+
+for (SCROW i = 1; i = 10; ++i)
 {
-double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
-double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+double fFormula  = pDoc-GetValue(ScAddress(2, i, 0));
+double fExpected = pDoc-GetValue(ScAddress(3, i, 0));
+CPPUNIT_ASSERT(rtl::math::approxEqual(fExpected, fFormula));
 }
-for (SCROW i = 18; i = 26; ++i)
+for (SCROW i = 18; i = 27; ++i)
 {
-double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
-double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+double fFormula = pDoc-GetValue(ScAddress(2, i, 0));
+double fExpected = pDoc-GetValue(ScAddress(3, i, 0));
+CPPUNIT_ASSERT(rtl::math::approxEqual(fExpected, fFormula));
 }
+
 xDocSh-DoClose();
-xDocShRes-DoClose();
 }
 //[AMLOEXT-139]
 void ScOpenclTest::testStatisticalFormulaChiSqDist()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/oox/drawingml/shape.hxx |4 
 include/oox/drawingml/textliststyle.hxx |3 
 include/oox/ppt/pptshapegroupcontext.hxx|3 
 oox/source/drawingml/diagram/diagram.cxx|   39 ++--
 oox/source/drawingml/diagram/diagramfragmenthandler.cxx |   49 ++---
 oox/source/drawingml/textliststyle.cxx  |   28 +++
 oox/source/ppt/pptshapegroupcontext.cxx |   13 +
 sd/qa/unit/data/pptx/bnc870233_1.pptx   |binary
 sd/qa/unit/data/pptx/bnc870233_2.pptx   |binary
 sd/qa/unit/import-tests.cxx |  141 
 10 files changed, 239 insertions(+), 41 deletions(-)

New commits:
commit b54d8d2410617eec56507ba9419abbf2f356c7ff
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 10:16:39 2014 +0200

2nd part of bnc#870233: import font color from color fragment for SmartArts

SmartArt import ignores some fragments during import if
drawing fragment exists, which seems to be not complete.
In this case font style is blank (white) in data (and drawing)
fragment and the real value is defined in the ignored color fragment.

So first make color fragment parsing work, then apply font
color of node0 style on nodes of the SmartArt.

Actually, it's a workaround, because node0 style label
is hardcoded, for a proper solution layout fragment should
be parsed too to get the right style label, but
it interferes with the drawing fragment by now.

Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8
(cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839)

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index fcb4999..f8e1b7c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -176,6 +176,9 @@ public:
 const ::std::vectorOUString
 getExtDrawings() { return maExtDrawings; }
 voidaddExtDrawingRelId( const OUString rRelId ) { 
maExtDrawings.push_back( rRelId ); }
+// Set font color only for extdrawings.
+voidsetFontRefColorForNodes(const Color rColor) { 
maFontRefColorForNodes = rColor; }
+const ColorgetFontRefColorForNodes() const { return 
maFontRefColorForNodes; }
 voidsetLockedCanvas(bool bLockedCanvas);
 boolgetLockedCanvas();
 voidsetWps(bool bWps);
@@ -267,6 +270,7 @@ protected:
 com::sun::star::awt::Size   maSize;
 com::sun::star::awt::Point  maPosition;
 ::std::vectorOUStringmaExtDrawings;
+Color   maFontRefColorForNodes;
 
 private:
 enum FrameType
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index f4e1d7a..847d9b6 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
 #include oox/drawingml/shapegroupcontext.hxx
+#include oox/drawingml/color.hxx
 #include oox/ppt/slidepersist.hxx
 
 namespace oox { namespace ppt {
@@ -30,7 +31,9 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+
 voidimportExtDrawings();
+voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 70d938a..a4ad279 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -320,7 +320,6 @@ void Diagram::build(  )
 #endif
 }
 
-
 void Diagram::addTo( const ShapePtr  pParentShape )
 {
 // collect data, init maps
@@ -432,7 +431,7 @@ void loadDiagram( ShapePtr pShape,
 }
 
 // extLst is present, lets bet on that and ignore the rest of the data 
from here
-if( !pData-getExtDrawings().size() )
+if( pData-getExtDrawings().empty() )
 {
 // layout
 if( !rLayoutPath.isEmpty() )
@@ -459,25 +458,33 @@ void loadDiagram( ShapePtr pShape,
 pDiagram,
 xRefQStyle);
 }
-
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler  xRefColorStyle(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
-
-importFragment(rFilter,
-loadFragment(rFilter,xRefColorStyle),
-OOXColor,
-pDiagram,
-xRefColorStyle);
-}
 } else {
 // We still want to add the XDocuments to the

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

 sd/source/ui/unoidl/SdUnoDrawView.cxx |2 +-
 vcl/source/fontsubset/sft.cxx |   23 ---
 2 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit b4a0104849eeecb7779fda41116c92c362759882
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 09:42:34 2014 +0100

pass sfntLen to DumpSfnts etc so sfntP reads can be checked

Change-Id: I5d8092eceb31ba251e75fe2c51b87890b8adcbf2

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index c40d75c..8b00a30 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2026,7 +2026,7 @@ int  CreateTTFromTTGlyphs(TrueTypeFont  *ttf,
 #endif
 
 #ifndef NO_TYPE42
-static GlyphOffsets *GlyphOffsetsNew(sal_uInt8 *sfntP)
+static GlyphOffsets *GlyphOffsetsNew(sal_uInt8 *sfntP, sal_uInt32 sfntLen)
 {
 GlyphOffsets* res = (GlyphOffsets*)smalloc(sizeof(GlyphOffsets));
 sal_uInt8 *loca = NULL;
@@ -2035,9 +2035,18 @@ static GlyphOffsets *GlyphOffsetsNew(sal_uInt8 *sfntP)
 sal_Int16 indexToLocFormat = 0;
 
 for (i = 0; i  numTables; i++) {
-sal_uInt32 tag = GetUInt32(sfntP + 12, 16 * i, 1);
-sal_uInt32 off = GetUInt32(sfntP + 12, 16 * i + 8, 1);
-sal_uInt32 len = GetUInt32(sfntP + 12, 16 * i + 12, 1);
+sal_uInt32 nLargestFixedOffsetPos = 12 + 16 * i + 12;
+sal_uInt32 nMinSize = nLargestFixedOffsetPos + sizeof(sal_uInt32);
+if (nMinSize  sfntLen)
+{
+SAL_WARN( vcl.fonts, GlyphOffsetsNew claimed to have 
+ numTablestables, but only space for   i);
+break;
+}
+
+sal_uInt32 tag = GetUInt32(sfntP, 12 + 16 * i, 1);
+sal_uInt32 off = GetUInt32(sfntP, 12 + 16 * i + 8, 1);
+sal_uInt32 len = GetUInt32(sfntP, nLargestFixedOffsetPos, 1);
 
 if (tag == T_loca) {
 loca = sfntP + off;
@@ -2069,11 +2078,11 @@ static void GlyphOffsetsDispose(GlyphOffsets *_this)
 }
 }
 
-static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP)
+static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, sal_uInt32 sfntLen)
 {
 HexFmt *h = HexFmtNew(outf);
 sal_uInt16 i, numTables = GetUInt16(sfntP, 4, 1);
-GlyphOffsets *go = GlyphOffsetsNew(sfntP);
+GlyphOffsets *go = GlyphOffsetsNew(sfntP, sfntLen);
 sal_uInt8 pad[] = {0,0,0,0}; /* zeroes 
  */
 
 assert(numTables = 9); /* Type42 has 9 
required tables */
@@ -2207,7 +2216,7 @@ int  CreateT42FromTTGlyphs(TrueTypeFont  *ttf,
 }
 fprintf(outf, /XUID [103 0 1 16#%08X %d 16#%08X 16#%08X] def\n, 
(unsigned int)rtl_crc32(0, ttf-ptr, ttf-fsize), (unsigned int)nGlyphs, 
(unsigned int)rtl_crc32(0, glyphArray, nGlyphs * 2), (unsigned int)rtl_crc32(0, 
encoding, nGlyphs));
 
-DumpSfnts(outf, sfntP);
+DumpSfnts(outf, sfntP, sfntLen);
 
 /* dump charstrings */
 fprintf(outf, /CharStrings %d dict dup begin\n, nGlyphs);
commit 9b237f9d84e65b16502f2af0dab78801168cd262
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 09:17:11 2014 +0100

coverity#705224 Missing break in switch, surely unintentional

Change-Id: I9ebeb373f5ab15220e3d9a4bb57db88d7a8f2714

diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx 
b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 9a4c554e..4367365 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -381,7 +381,7 @@ void SdUnoDrawView::setFastPropertyValue (
 rValue = bValue;
 setLayerMode( bValue );
 }
-
+break;
 case DrawController::PROPERTY_ACTIVE_LAYER:
 {
 Referencedrawing::XLayer xLayer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Access2Base - New release

2014-06-06 Thread Noel Power

On 28/05/14 12:11, Lionel Elie Mamane wrote:
On Mon, May 19, 2014 at 04:33:03PM +0200, Michael Stahl wrote:
On 19/05/14 15:59, Lionel Elie Mamane wrote:
[...]
addition, but not replacement, especially not potentially
partial replacement. with a bundled extension it would work to
replace it, because there LO knows the boundaries of what is being
replaced and can disable the whole bundled extension;
I don't buy that it does that.
huh? extensions are built on top of and using the stable (well as stable
as libreoffice ever is) api, if you allow 'other' extensions to change
the 'core' api (with no way of knowing that the base system has been
changed) then well good luck with stability
If (bundled, or system-installed)
extension Foo ships Basic libraries Quux and Frobotz, and then
the user installs extension Bar that ships Basic library Quux, but
not Frobotz, then IMO the result is:

1) Basic library Quux from Foo is disabled.
2) Basic library Frobotz from Foo stays enabled.
3) Basic library Quux from Bar is enabled.
you are just stating how you want it to work, it's not a justification

but when replacing something that's built-in you can't assume that
it was ever designed to be replaced,
It's FLOSS, it can always be replaced by a binary-compatible fork of
it: a bug fixed, a feature added in a compatible way, a version that
logs what the user does, a version that bills printed pages to the
appropriate customer (by hooking into the printing function), ...
I don't even understand the argument, but... hey if you are saying that
someone can build various libraries and components and shove them into a
libreoffice installation then sure, they could do it, they are free to
do it but would you actually provide support for them to do that

you can end up with a mixture of built-in files and extension files
loaded that doesn't work.
Yes.

if you want to bundle something that can be replaced by the user, do
it as a bundled extension.
How about we put an exception in the code that only Basic (and
Dialog?) libraries, or maybe only access2base, can be overridden by an
extension? I don't think we ship any actual feature as Basic code -
only examples (I'm less sure about Dialog libraries), so it will not
hurt.
why should there be an exception for Basic, there is no possibly
justification for that, oh, hang on I think I can hear it coming, well
we don't really ship anything in terms of api with Basic at the moment,
so... it won't break anything But it does, there are at least library
functions and wizards, but... in anycase the principle is the same. It
all boils down to the fact that if you want to provide updated and
incompatible api then you don't do that in the release branches, that's
what master is for, if you want something (e.g. access2base) to act like
and extension (that provides a different update strategy) then just make
it an extension

And here, the boundaries are very clear, known by the code and
handled well by the code: one Basic library.

I mean add to the code a case like this:

|| sOriginalUrl.match($(INST)/share/basic)

|| sOriginalUrl.match($(INST)/share/basic/Access2Base)

Or should it be something like

||
sOriginalUrl.match(vnd.sun.star.expand:$BRAND_BASE_DIR/share/basic/Access2Base)
or
||
sOriginalUrl.match(vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/Access2Base)

It avoids us demoting Access2Base to a bundled extension.
yeah, my feeling here is avoiding this perceived 'demotion' of
Access2Base is what this debate is about and not a genuine technical
need or bug. I hope I am wrong. Truth is though bundled or not,
users won't care or notice. Surely the fact that it is supported, it is
isn't it? (otherwise what's the point??) is IMHO the important point or
issue for users. That would be what discriminates it from other bundled
extensions (I bet many users expect are all bundled extensions are
supported regardless)

On Mon, May 19, 2014 at 04:39:36PM +0100, Noel Power wrote:
On 19/05/14 14:59, Lionel Elie Mamane wrote:
On Mon, May 19, 2014 at 11:06:46AM +0100, Noel Power wrote:
[...]
Access2Base is considered a part of the core isn't it? it isn't
shipped as an extention, it is shipped as part of the product, (...)
Access2Base is either part of the product or it's not.
I don't think this was a very conscious decision. Access2Base started
its life as an extension that got integrated into LibreOffice, but is
still available as an extension for other branches / forks of the
code. It got shipped as part of the product since that was easier to
set up and LibreOffice was (my perception) moving away from bundled
extensions anyway.
IMHO moving away == moving functionality into the core = stable api
with the same rules as the rest of the code
I tend to agree as to what we ship, but not as to what the user is
allowed to override; if (s)he wants to have an updated API by
explicitly installing an

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

 vcl/source/fontsubset/sft.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 623b4e3e10ed8afe8807f2599e03f748c0d392d2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:00:21 2014 +0100

improve this sanity check

Change-Id: If202723412b2bf7acf7dcd2709886f89df9d7940

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 8b00a30..2fdd6ea 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1226,16 +1226,19 @@ static void FindCmap(TrueTypeFont *ttf)
 sal_uInt32 ThreeSix   = 0;  /* MS Johab */
 
 for (i = 0; i  ncmaps; i++) {
-sal_uInt32 offset;
-sal_uInt16 pID, eID;
-
 /* sanity check, cmap entry must lie within table */
-if( i*8+4  table_size )
+sal_uInt32 nLargestFixedOffsetPos = 8 + i * 8;
+sal_uInt32 nMinSize = nLargestFixedOffsetPos + sizeof(sal_uInt32);
+if (nMinSize  table_size)
+{
+SAL_WARN( vcl.fonts, Font   
OUString::createFromAscii(ttf-fname)   claimed to have 
+ ncmaps   cmaps, but only space for   i);
 break;
+}
 
-pID = GetUInt16(table, 4 + i * 8, 1);
-eID = GetUInt16(table, 6 + i * 8, 1);
-offset = GetUInt32(table, 8 + i * 8, 1);
+sal_uInt16 pID = GetUInt16(table, 4 + i * 8, 1);
+sal_uInt16 eID = GetUInt16(table, 6 + i * 8, 1);
+sal_uInt32 offset = GetUInt32(table, nLargestFixedOffsetPos, 1);
 
  /* sanity check, cmap must lie within file */
 if( (table - ttf-ptr) + offset  (sal_uInt32)ttf-fsize )
___
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' - 2 commits - include/oox oox/source sd/qa

 include/oox/drawingml/shape.hxx |4 
 include/oox/drawingml/textliststyle.hxx |3 
 include/oox/ppt/pptshapegroupcontext.hxx|3 
 oox/source/drawingml/diagram/diagram.cxx|   39 ++--
 oox/source/drawingml/diagram/diagramfragmenthandler.cxx |   49 ++---
 oox/source/drawingml/textliststyle.cxx  |   28 +++
 oox/source/ppt/pptshapegroupcontext.cxx |   13 +
 sd/qa/unit/data/pptx/bnc870233_1.pptx   |binary
 sd/qa/unit/data/pptx/bnc870233_2.pptx   |binary
 sd/qa/unit/import-tests.cxx |  143 
 10 files changed, 241 insertions(+), 41 deletions(-)

New commits:
commit 5e35382c435d2bfaacae35fb6f99be04bbbc1577
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 10:16:39 2014 +0200

2nd part of bnc#870233: import font color from color fragment for SmartArts

SmartArt import ignores some fragments during import if
drawing fragment exists, which seems to be not complete.
In this case font style is blank (white) in data (and drawing)
fragment and the real value is defined in the ignored color fragment.

So first make color fragment parsing work, then apply font
color of node0 style on nodes of the SmartArt.

Actually, it's a workaround, because node0 style label
is hardcoded, for a proper solution layout fragment should
be parsed too to get the right style label, but
it interferes with the drawing fragment by now.

(cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839)

Conflicts:
oox/source/drawingml/diagram/diagram.cxx
oox/source/drawingml/diagram/diagramfragmenthandler.cxx

Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 9c8faa9c..dd0daa9 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -171,6 +171,9 @@ public:
 const ::std::vectorOUString
 getExtDrawings() { return maExtDrawings; }
 voidaddExtDrawingRelId( const OUString rRelId ) { 
maExtDrawings.push_back( rRelId ); }
+// Set font color only for extdrawings.
+voidsetFontRefColorForNodes(const Color rColor) { 
maFontRefColorForNodes = rColor; }
+const ColorgetFontRefColorForNodes() const { return 
maFontRefColorForNodes; }
 voidsetLockedCanvas(bool bLockedCanvas);
 boolgetLockedCanvas();
 const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue 
@@ -246,6 +249,7 @@ protected:
 com::sun::star::awt::Size   maSize;
 com::sun::star::awt::Point  maPosition;
 ::std::vectorOUStringmaExtDrawings;
+Color   maFontRefColorForNodes;
 
 private:
 enum FrameType
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index f4e1d7a..847d9b6 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
 #include oox/drawingml/shapegroupcontext.hxx
+#include oox/drawingml/color.hxx
 #include oox/ppt/slidepersist.hxx
 
 namespace oox { namespace ppt {
@@ -30,7 +31,9 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+
 voidimportExtDrawings();
+voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 93f5850..5cc8fe0 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -320,7 +320,6 @@ void Diagram::build(  )
 #endif
 }
 
-
 void Diagram::addTo( const ShapePtr  pParentShape )
 {
 // collect data, init maps
@@ -417,7 +416,7 @@ void loadDiagram( ShapePtr pShape,
 }
 
 // extLst is present, lets bet on that and ignore the rest of the data 
from here
-if( !pData-getExtDrawings().size() )
+if( pData-getExtDrawings().empty() )
 {
 // layout
 if( !rLayoutPath.isEmpty() )
@@ -444,25 +443,33 @@ void loadDiagram( ShapePtr pShape,
 pDiagram,
 xRefQStyle);
 }
-
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler  xRefColorStyle(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
-
-importFragment(rFilter,
-loadFragment(rFilter,xRefColorStyle),
-

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

 sd/qa/unit/import-tests.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e990e4d145f16c0c7e4e9e12c4882ddde63a3d5a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:06:00 2014 +0100

c++03 vs c++11 enum namespacing

Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index ce0d9d1..0b032c1 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -794,12 +794,12 @@ void SdFiltersTest::testBnc870233_1()
 const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
 if( pWeight )
 {
-CPPUNIT_ASSERT_EQUAL( FontWeight::WEIGHT_BOLD, 
pWeight-GetWeight());
+CPPUNIT_ASSERT_EQUAL( WEIGHT_BOLD, pWeight-GetWeight());
 }
 const SvxPostureItem *pPosture = dynamic_castconst SvxPostureItem 
*((*it).pAttr);
 if( pPosture )
 {
-CPPUNIT_ASSERT_EQUAL( FontItalic::ITALIC_NONE, 
pPosture-GetPosture());
+CPPUNIT_ASSERT_EQUAL( ITALIC_NONE, pPosture-GetPosture());
 }
 }
 }
@@ -821,12 +821,12 @@ void SdFiltersTest::testBnc870233_1()
 const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
 if( pWeight )
 {
-CPPUNIT_ASSERT_EQUAL( FontWeight::WEIGHT_NORMAL, 
pWeight-GetWeight());
+CPPUNIT_ASSERT_EQUAL( WEIGHT_NORMAL, pWeight-GetWeight());
 }
 const SvxPostureItem *pPosture = dynamic_castconst SvxPostureItem 
*((*it).pAttr);
 if( pPosture )
 {
-CPPUNIT_ASSERT_EQUAL( FontItalic::ITALIC_NORMAL, 
pPosture-GetPosture());
+CPPUNIT_ASSERT_EQUAL( ITALIC_NORMAL, pPosture-GetPosture());
 }
 }
 }
___
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' - 2 commits - config_host.mk.in configure.ac sysui/desktop

 config_host.mk.in  |1 +
 configure.ac   |   12 ++--
 sysui/desktop/macosx/Info.plist.in |4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 69df853a45f2f01162fe59a64eb6c90629ae9350
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 11:00:15 2014 +0300

Use MACOSX_APP_NAME

Change-Id: Id46f2f83ca01a786b93ecce4aa41dea41c45e718

diff --git a/sysui/desktop/macosx/Info.plist.in 
b/sysui/desktop/macosx/Info.plist.in
index 16f9eae..b0b1984 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1401,7 +1401,7 @@
keyCFBundleExecutable/key
stringsoffice/string
keyCFBundleGetInfoString/key
-   string@PRODUCTNAME@ 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@/string
+   string@MACOSX_APP_NAME@ 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@/string
keyCFBundleIconFile/key
stringmain.icns/string
keyCFBundleShortVersionString/key
@@ -1411,7 +1411,7 @@
keyCFBundleInfoDictionaryVersion/key
string6.0/string
keyCFBundleName/key
-   string@PRODUCTNAME@/string
+   string@MACOSX_APP_NAME@/string
keyCFBundlePackageType/key
stringAPPL/string
keyCFBundleSignature/key
commit 64c0e50af3eaa531d3f0edba4f3c068904910c2c
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 10:49:22 2014 +0300

Add --with-macosx-app-name configure option that propagates to 
MACOSX_APP_NAME

Change-Id: I5997669d9e990c302871e08a336a4d8365d5aa13

diff --git a/config_host.mk.in b/config_host.mk.in
index fd4c560..3febd13 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -356,6 +356,7 @@ export LIBXSLT_MAJOR=@LIBXSLT_MAJOR@
 export LINK_X64_BINARY=@LINK_X64_BINARY@
 @x_Cygwin@ export LS=@WIN_LS@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
+export MACOSX_APP_NAME=@MACOSX_APP_NAME@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
 export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
diff --git a/configure.ac b/configure.ac
index 0ec4aee..736c7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1237,6 +1237,11 @@ AC_ARG_WITH(macosx-bundle-identifier,
  org.libreoffice.script (script, huh?).]),
 ,with_macosx_bundle_identifier=org.libreoffice.script)
 
+AC_ARG_WITH(macosx-app-name,
+AS_HELP_STRING([--with-macosx-app-name='My Own Office Suite'],
+[Define the OS X app name. Default is AC_PACKAGE_NAME.]),
+,with_macosx_app_name=$PRODUCTNAME)
+
 AC_ARG_ENABLE(libc++,
 AS_HELP_STRING([--enable-libc++],
 [Use the libc++ C++ library instead of GNU libstdc++ on OS X. Only 
effective
@@ -2890,10 +2895,12 @@ if test $_os = Darwin; then
 fi
 
 AC_MSG_CHECKING([what OS X app bundle identifier to use])
-
 MACOSX_BUNDLE_IDENTIFIER=$with_macosx_bundle_identifier
-
 AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER])
+
+AC_MSG_CHECKING([what OS X app name to use])
+MACOSX_APP_NAME=$with_macosx_app_name
+AC_MSG_RESULT([$MACOSX_APP_NAME])
 fi
 AC_SUBST(MACOSX_SDK_PATH)
 AC_SUBST(MACOSX_SDK_VERSION)
@@ -2905,6 +2912,7 @@ AC_SUBST(LIBTOOL) # Note that the OS X libtool command is 
unrelated to GNU libto
 AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
+AC_SUBST(MACOSX_APP_NAME)
 
 dnl ===
 dnl Check iOS SDK and compiler
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/fontsubset/sft.cxx |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 44f422048754c5fe3540750eec996c8a63bf6da4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:07:11 2014 +0100

use sfntLen in DumpSfnts to do some sanity checking

Change-Id: Ic3b196f925a1699f02ad9a5c1183ea767e3e91cf

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 2fdd6ea..e2c136b 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2091,7 +2091,6 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, 
sal_uInt32 sfntLen)
 assert(numTables = 9); /* Type42 has 9 
required tables */
 
 sal_uInt32* offs = (sal_uInt32*)scalloc(numTables, sizeof(sal_uInt32));
-//sal_uInt32* lens = (sal_uInt32*)scalloc(numTables, sizeof(sal_uInt32));
 
 fputs(/sfnts [, outf);
 HexFmtOpenString(h);
@@ -2099,9 +2098,18 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, 
sal_uInt32 sfntLen)
 HexFmtBlockWrite(h, sfntP+12, 16 * numTables);  /* stream out the 
Table Directory */
 
 for (i=0; inumTables; i++) {
-sal_uInt32 tag = GetUInt32(sfntP + 12, 16 * i, 1);
-sal_uInt32 off = GetUInt32(sfntP + 12, 16 * i + 8, 1);
-sal_uInt32 len = GetUInt32(sfntP + 12, 16 * i + 12, 1);
+sal_uInt32 nLargestFixedOffsetPos = 12 + 16 * i + 12;
+sal_uInt32 nMinSize = nLargestFixedOffsetPos + sizeof(sal_uInt32);
+if (nMinSize  sfntLen)
+{
+SAL_WARN( vcl.fonts, DumpSfnts claimed to have 
+ numTablestables, but only space for   i);
+break;
+}
+
+sal_uInt32 tag = GetUInt32(sfntP, 12 + 16 * i, 1);
+sal_uInt32 off = GetUInt32(sfntP, 12 + 16 * i + 8, 1);
+sal_uInt32 len = GetUInt32(sfntP, 12 + 16 * i + 12, 1);
 
 if (tag != T_glyf) {
 HexFmtBlockWrite(h, sfntP + off, len);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/o3tl include/tools sw/source tools/Library_tl.mk tools/qa tools/source

 include/o3tl/heap_ptr.hxx  |   72 ++---
 include/tools/urlobj.hxx   |5 ++
 sw/source/filter/html/htmlgrin.cxx |   20 
 tools/Library_tl.mk|1 
 tools/qa/cppunit/test_urlobj.cxx   |   90 +
 tools/source/fsys/urlobj.cxx   |   60 
 6 files changed, 203 insertions(+), 45 deletions(-)

New commits:
commit 805b57cd5b34454589ad6ce11c16507695fd3ff3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 11:12:42 2014 +0200

Various INetURLObject::getData() fixes

Change-Id: I5eafd6250bbde7227dcc0447a4280b7741c320de

diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 5cc1d1b..6cfca96 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -12,6 +12,7 @@
 #include sal/types.h
 #include cppunit/TestFixture.h
 #include cppunit/extensions/HelperMacros.h
+#include tools/stream.hxx
 #include tools/urlobj.hxx
 
 #define OUSTR_TO_STDSTR( oustr ) std::string( OUStringToOString( oustr, 
RTL_TEXTENCODING_ASCII_US ).getStr() )
@@ -243,6 +244,94 @@ namespace tools_urlobj
 }
 }
 
+void urlobjTest_data() {
+INetURLObject url;
+SvMemoryStream * strm;
+unsigned char const * buf;
+
+url = INetURLObject(data:);
+//TODO: CPPUNIT_ASSERT(url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm == 0);
+
+url = INetURLObject(data:,);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm != 0);
+CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm-GetSize());
+delete strm;
+
+url = INetURLObject(data:,,%C3%A4%90);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm != 0);
+CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(4), strm-GetSize());
+buf = static_castunsigned char const *(strm-GetData());
+CPPUNIT_ASSERT_EQUAL(0x2C, int(buf[0]));
+CPPUNIT_ASSERT_EQUAL(0xC3, int(buf[1]));
+CPPUNIT_ASSERT_EQUAL(0xA4, int(buf[2]));
+CPPUNIT_ASSERT_EQUAL(0x90, int(buf[3]));
+delete strm;
+
+url = INetURLObject(data:base64,);
+//TODO: CPPUNIT_ASSERT(url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm == 0);
+
+url = INetURLObject(data:;base64,);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm != 0);
+CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm-GetSize());
+delete strm;
+
+url = INetURLObject(data:;bAsE64,);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm != 0);
+CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm-GetSize());
+delete strm;
+
+url = INetURLObject(data:;base64,YWJjCg==);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm != 0);
+CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(4), strm-GetSize());
+buf = static_castunsigned char const *(strm-GetData());
+CPPUNIT_ASSERT_EQUAL(0x61, int(buf[0]));
+CPPUNIT_ASSERT_EQUAL(0x62, int(buf[1]));
+CPPUNIT_ASSERT_EQUAL(0x63, int(buf[2]));
+CPPUNIT_ASSERT_EQUAL(0x0A, int(buf[3]));
+delete strm;
+
+url = INetURLObject(data:;base64,YWJjCg=);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm == 0);
+
+url = INetURLObject(data:;base64,YWJ$Cg==);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm == 0);
+
+url = INetURLObject(data:text/plain;param=%22;base64,%22,YQ==);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm != 0);
+CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(4), strm-GetSize());
+buf = static_castunsigned char const *(strm-GetData());
+CPPUNIT_ASSERT_EQUAL(0x59, int(buf[0]));
+CPPUNIT_ASSERT_EQUAL(0x51, int(buf[1]));
+CPPUNIT_ASSERT_EQUAL(0x3D, int(buf[2]));
+CPPUNIT_ASSERT_EQUAL(0x3D, int(buf[3]));
+delete strm;
+
+url = INetURLObject(http://example.com;);
+CPPUNIT_ASSERT(!url.HasError());
+strm = url.getData();
+CPPUNIT_ASSERT(strm == 0);
+}
+
 // Change the following lines only, if you add, remove or rename
 // member functions of the current class,
 // because these macros are need by auto register mechanism.
@@ -256,6 +345,7 @@ namespace tools_urlobj
 CPPUNIT_TEST(

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

 vcl/source/fontsubset/sft.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 8c94cd4451923a0607ea618123d99393fe5902f6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:15:11 2014 +0100

coverity#1213364 Untrusted pointer write

Change-Id: I63c670e6f2196f8e8743923b0a0bf676fb476ed7

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index e2c136b..267afd4 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -441,7 +441,8 @@ static int GetSimpleTTOutline(TrueTypeFont *ttf, sal_uInt32 
glyphID, ControlPoin
 
 sal_uInt16 instLen = GetUInt16(ptr, 10 + numberOfContours*2, 1);
 const sal_uInt8* p = ptr + 10 + 2 * numberOfContours + 2 + instLen;
-ControlPoint* pa = (ControlPoint*)calloc(lastPoint+1, 
sizeof(ControlPoint));
+sal_uInt16 palen = lastPoint+1;
+ControlPoint* pa = (ControlPoint*)calloc(palen, sizeof(ControlPoint));
 
 i = 0;
 while (i = lastPoint) {
@@ -491,7 +492,13 @@ static int GetSimpleTTOutline(TrueTypeFont *ttf, 
sal_uInt32 glyphID, ControlPoin
 }
 
 for (i=0; inumberOfContours; i++) {
-pa[GetUInt16(ptr, 10 + i * 2, 1)].flags |= 0x8000;  /*- set 
the end contour flag */
+sal_uInt16 offset = GetUInt16(ptr, 10 + i * 2, 1);
+SAL_WARN_IF(offset = palen, vcl.fonts, Font   
OUString::createFromAscii(ttf-fname) 
+ contour   i   claimed an illegal offset of 
+ offset   but max offset is   palen-1);
+if (offset = palen)
+continue;
+pa[offset].flags |= 0x8000;  /*- set the end contour flag */
 }
 
 *pointArray = pa;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |   16 ++--
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 4ee265eeaeb268504233d6c130b5944ca8d8887e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:32:40 2014 +0100

loplugin:saloverride + loplugin:unreffun

Change-Id: If7d24294e0b62b47c5cbe9271dff948a70cb477a

diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index 12dea3d..c2e1dcb 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -25,7 +25,6 @@ public:
 void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem();
 void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem();
 void EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet();
-void EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty();
 
 CPPUNIT_TEST_SUITE(ToxTextGeneratorTest);
 CPPUNIT_TEST(EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems);
@@ -40,10 +39,10 @@ struct MockedSortTab : public SwTOXSortTabBase {
 MockedSortTab()
 : SwTOXSortTabBase(TOX_SORT_INDEX,0,0,0) {;}
 
-/*virtual*/ TextAndReading GetText_Impl() const {
+virtual TextAndReading GetText_Impl() const SAL_OVERRIDE {
 return TextAndReading();
 }
-/*virtual*/ sal_uInt16  GetLevel()  const {
+virtual sal_uInt16  GetLevel() const SAL_OVERRIDE {
 return 0;
 }
 };
@@ -83,17 +82,6 @@ 
ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet()
 CPPUNIT_ASSERT_EQUAL(expected, actual);
 }
 
-void
-ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
-{
-MockedSortTab sortTab;
-sortTab.pTxtMark = reinterpret_castSwTxtTOXMark*(1);
-
-OUString expected();
-OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, 
false, 0);
-CPPUNIT_ASSERT_EQUAL(expected, actual);
-}
-
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(ToxTextGeneratorTest);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sd/qa/unit/import-tests.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c2434cf6fd771251713709c79364533284ace95c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:06:00 2014 +0100

c++03 vs c++11 enum namespacing

Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67
(cherry picked from commit e990e4d145f16c0c7e4e9e12c4882ddde63a3d5a)

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index ce0d9d1..0b032c1 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -794,12 +794,12 @@ void SdFiltersTest::testBnc870233_1()
 const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
 if( pWeight )
 {
-CPPUNIT_ASSERT_EQUAL( FontWeight::WEIGHT_BOLD, 
pWeight-GetWeight());
+CPPUNIT_ASSERT_EQUAL( WEIGHT_BOLD, pWeight-GetWeight());
 }
 const SvxPostureItem *pPosture = dynamic_castconst SvxPostureItem 
*((*it).pAttr);
 if( pPosture )
 {
-CPPUNIT_ASSERT_EQUAL( FontItalic::ITALIC_NONE, 
pPosture-GetPosture());
+CPPUNIT_ASSERT_EQUAL( ITALIC_NONE, pPosture-GetPosture());
 }
 }
 }
@@ -821,12 +821,12 @@ void SdFiltersTest::testBnc870233_1()
 const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
 if( pWeight )
 {
-CPPUNIT_ASSERT_EQUAL( FontWeight::WEIGHT_NORMAL, 
pWeight-GetWeight());
+CPPUNIT_ASSERT_EQUAL( WEIGHT_NORMAL, pWeight-GetWeight());
 }
 const SvxPostureItem *pPosture = dynamic_castconst SvxPostureItem 
*((*it).pAttr);
 if( pPosture )
 {
-CPPUNIT_ASSERT_EQUAL( FontItalic::ITALIC_NORMAL, 
pPosture-GetPosture());
+CPPUNIT_ASSERT_EQUAL( ITALIC_NORMAL, pPosture-GetPosture());
 }
 }
 }
___
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' - sd/qa

 sd/qa/unit/import-tests.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e197043cf1c792fb5311d6597a18ee84b289985b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:06:00 2014 +0100

c++03 vs c++11 enum namespacing

Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67
(cherry picked from commit e990e4d145f16c0c7e4e9e12c4882ddde63a3d5a)

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index bdc2ffa..4f68104 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -458,12 +458,12 @@ void SdFiltersTest::testBnc870233_1()
 const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
 if( pWeight )
 {
-CPPUNIT_ASSERT_EQUAL( FontWeight::WEIGHT_BOLD, 
pWeight-GetWeight());
+CPPUNIT_ASSERT_EQUAL( WEIGHT_BOLD, pWeight-GetWeight());
 }
 const SvxPostureItem *pPosture = dynamic_castconst SvxPostureItem 
*((*it).pAttr);
 if( pPosture )
 {
-CPPUNIT_ASSERT_EQUAL( FontItalic::ITALIC_NONE, 
pPosture-GetPosture());
+CPPUNIT_ASSERT_EQUAL( ITALIC_NONE, pPosture-GetPosture());
 }
 }
 }
@@ -485,12 +485,12 @@ void SdFiltersTest::testBnc870233_1()
 const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
 if( pWeight )
 {
-CPPUNIT_ASSERT_EQUAL( FontWeight::WEIGHT_NORMAL, 
pWeight-GetWeight());
+CPPUNIT_ASSERT_EQUAL( WEIGHT_NORMAL, pWeight-GetWeight());
 }
 const SvxPostureItem *pPosture = dynamic_castconst SvxPostureItem 
*((*it).pAttr);
 if( pPosture )
 {
-CPPUNIT_ASSERT_EQUAL( FontItalic::ITALIC_NORMAL, 
pPosture-GetPosture());
+CPPUNIT_ASSERT_EQUAL( ITALIC_NORMAL, pPosture-GetPosture());
 }
 }
 }
___
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' - include/oox oox/source sd/qa

 include/oox/drawingml/shape.hxx |4 
 include/oox/ppt/pptshapegroupcontext.hxx|3 
 oox/source/drawingml/diagram/diagram.cxx|   39 +
 oox/source/drawingml/diagram/diagramfragmenthandler.cxx |   49 +--
 oox/source/ppt/pptshapegroupcontext.cxx |   13 +++
 sd/qa/unit/data/pptx/bnc870233_2.pptx   |binary
 sd/qa/unit/import-tests.cxx |   68 
 7 files changed, 135 insertions(+), 41 deletions(-)

New commits:
commit bef657e6e2a545eea54d3288a2cd7df9c1a126fa
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 10:16:39 2014 +0200

2nd part of bnc#870233: import font color from color fragment for SmartArts

SmartArt import ignores some fragments during import if
drawing fragment exists, which seems to be not complete.
In this case font style is blank (white) in data (and drawing)
fragment and the real value is defined in the ignored color fragment.

So first make color fragment parsing work, then apply font
color of node0 style on nodes of the SmartArt.

Actually, it's a workaround, because node0 style label
is hardcoded, for a proper solution layout fragment should
be parsed too to get the right style label, but
it interferes with the drawing fragment by now.

(cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839)

Conflicts:
oox/source/drawingml/diagram/diagram.cxx
oox/source/drawingml/diagram/diagramfragmenthandler.cxx

Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8
Reviewed-on: https://gerrit.libreoffice.org/9662
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 9c8faa9c..dd0daa9 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -171,6 +171,9 @@ public:
 const ::std::vectorOUString
 getExtDrawings() { return maExtDrawings; }
 voidaddExtDrawingRelId( const OUString rRelId ) { 
maExtDrawings.push_back( rRelId ); }
+// Set font color only for extdrawings.
+voidsetFontRefColorForNodes(const Color rColor) { 
maFontRefColorForNodes = rColor; }
+const ColorgetFontRefColorForNodes() const { return 
maFontRefColorForNodes; }
 voidsetLockedCanvas(bool bLockedCanvas);
 boolgetLockedCanvas();
 const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue 
@@ -246,6 +249,7 @@ protected:
 com::sun::star::awt::Size   maSize;
 com::sun::star::awt::Point  maPosition;
 ::std::vectorOUStringmaExtDrawings;
+Color   maFontRefColorForNodes;
 
 private:
 enum FrameType
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index f4e1d7a..847d9b6 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
 #include oox/drawingml/shapegroupcontext.hxx
+#include oox/drawingml/color.hxx
 #include oox/ppt/slidepersist.hxx
 
 namespace oox { namespace ppt {
@@ -30,7 +31,9 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+
 voidimportExtDrawings();
+voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 93f5850..5cc8fe0 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -320,7 +320,6 @@ void Diagram::build(  )
 #endif
 }
 
-
 void Diagram::addTo( const ShapePtr  pParentShape )
 {
 // collect data, init maps
@@ -417,7 +416,7 @@ void loadDiagram( ShapePtr pShape,
 }
 
 // extLst is present, lets bet on that and ignore the rest of the data 
from here
-if( !pData-getExtDrawings().size() )
+if( pData-getExtDrawings().empty() )
 {
 // layout
 if( !rLayoutPath.isEmpty() )
@@ -444,25 +443,33 @@ void loadDiagram( ShapePtr pShape,
 pDiagram,
 xRefQStyle);
 }
-
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler  xRefColorStyle(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram-getColors() ));
-
-importFragment(rFilter,
-loadFragment(rFilter,xRefColorStyle),
-OOXColor,
-

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

 include/oox/drawingml/textliststyle.hxx |3 +
 oox/source/drawingml/textliststyle.cxx  |   28 +++
 sd/qa/unit/data/pptx/bnc870233_1.pptx   |binary
 sd/qa/unit/import-tests.cxx |   76 
 4 files changed, 107 insertions(+)

New commits:
commit 0d2ff84ef183262ad826a7d4a161aa317ccfa847
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 11:40:38 2014 +0200

1st part of bnc#870233: wrong list style in shapes

Text list styles were copied, without proper
copy constructor and operator. It lad to mix
up list styles and so text font.

(cherry picked from commit 31650d5b4255c484faec11d570cb98a80f0120cc)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Iee7a6c0c1f74322fd7b80e41a262849f948e463a
Reviewed-on: https://gerrit.libreoffice.org/9661
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/include/oox/drawingml/textliststyle.hxx 
b/include/oox/drawingml/textliststyle.hxx
index 09d341e..d73734f 100644
--- a/include/oox/drawingml/textliststyle.hxx
+++ b/include/oox/drawingml/textliststyle.hxx
@@ -34,6 +34,9 @@ public:
 TextListStyle();
 ~TextListStyle();
 
+TextListStyle(const TextListStyle rStyle);
+TextListStyle operator=(const TextListStyle rStyle);
+
 void apply( const TextListStyle rTextListStyle );
 
 const TextParagraphPropertiesVector getListStyle() const { return 
maListStyle; };
diff --git a/oox/source/drawingml/textliststyle.cxx 
b/oox/source/drawingml/textliststyle.cxx
index 466edf2..3a92b12 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -34,6 +34,34 @@ TextListStyle::~TextListStyle()
 {
 }
 
+TextListStyle::TextListStyle(const TextListStyle rStyle)
+{
+assert(rStyle.maListStyle.size() == 9);
+assert(rStyle.maAggregationListStyle.size() == 9);
+for ( size_t i = 0; i  9; i++ )
+{
+maListStyle.push_back( TextParagraphPropertiesPtr( new 
TextParagraphProperties(*rStyle.maListStyle[i]) ) );
+maAggregationListStyle.push_back( TextParagraphPropertiesPtr( new 
TextParagraphProperties(*rStyle.maAggregationListStyle[i]) ) );
+}
+}
+
+TextListStyle TextListStyle::operator=(const TextListStyle rStyle)
+{
+if(this != rStyle)
+{
+assert(rStyle.maListStyle.size() == 9);
+assert(rStyle.maAggregationListStyle.size() == 9);
+assert(maListStyle.size() == 9);
+assert(maAggregationListStyle.size() == 9);
+for ( size_t i = 0; i  9; i++ )
+{
+*maListStyle[i] = *rStyle.maListStyle[i];
+*maAggregationListStyle[i] = *rStyle.maAggregationListStyle[i];
+}
+}
+return *this;
+}
+
 void applyStyleList( const TextParagraphPropertiesVector rSourceListStyle, 
TextParagraphPropertiesVector rDestListStyle )
 {
 TextParagraphPropertiesVector::const_iterator aSourceListStyleIter( 
rSourceListStyle.begin() );
diff --git a/sd/qa/unit/data/pptx/bnc870233_1.pptx 
b/sd/qa/unit/data/pptx/bnc870233_1.pptx
new file mode 100644
index 000..0659e30
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc870233_1.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 8e81c7d..cf72ab7 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -15,6 +15,10 @@
 #include editeng/ulspitem.hxx
 #include editeng/fhgtitem.hxx
 #include editeng/escapementitem.hxx
+#include editeng/colritem.hxx
+#include editeng/wghtitem.hxx
+#include editeng/postitem.hxx
+
 
 #include svx/svdotext.hxx
 #include svx/svdoashp.hxx
@@ -55,6 +59,7 @@ public:
 void testN828390();
 void testFdo71961();
 void testBnc870237();
+void testBnc870233_1();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
 CPPUNIT_TEST(testDocumentLayout);
@@ -67,6 +72,7 @@ public:
 CPPUNIT_TEST(testN828390);
 CPPUNIT_TEST(testFdo71961);
 CPPUNIT_TEST(testBnc870237);
+CPPUNIT_TEST(testBnc870233_1);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -422,6 +428,76 @@ void SdFiltersTest::testBnc870237()
 xDocShRef-DoClose();
 }
 
+void SdFiltersTest::testBnc870233_1()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/bnc870233_1.pptx));
+xDocShRef = saveAndReload( xDocShRef, PPTX );
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage (1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+
+// The problem was all shapes had the same font (the last parsed font 
attribues overwrote all previous ones)
+
+// First shape has red, bold font
+{
+const SdrTextObj *pObj = dynamic_castSdrTextObj *( pPage-GetObj( 0 
) );
+CPPUNIT_ASSERT_MESSAGE( no object, pObj != NULL);
+const EditTextObject aEdit = 
pObj-GetOutlinerParaObject()-GetTextObject();
+

[Libreoffice-commits] core.git: 12 commits - sc/source sd/source sfx2/source svx/source sw/qa sw/source

 sc/source/ui/app/inputwin.cxx|   13 ++---
 sc/source/ui/docshell/macromgr.cxx   |6 --
 sd/source/ui/view/frmview.cxx|3 ++-
 sfx2/source/appl/workwin.cxx |2 +-
 svx/source/fmcomp/gridcell.cxx   |   10 +++---
 sw/qa/extras/inc/swmodeltestbase.hxx |1 +
 sw/source/core/doc/textboxhelper.cxx |2 +-
 sw/source/core/frmedt/fefly1.cxx |4 ++--
 sw/source/core/unocore/unocoll.cxx   |5 +++--
 sw/source/uibase/dochdl/swdtflvr.cxx |7 ---
 sw/source/uibase/utlui/glbltree.cxx  |9 ++---
 11 files changed, 33 insertions(+), 29 deletions(-)

New commits:
commit 4da7559ab335d342ebc5b5f06539b5fc4ea4a3cb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 11:08:49 2014 +0100

coverity#1219787 Explicit null dereferenced

Change-Id: Idb13242d25583b1c323b5a20ecc10f10b8b82465

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index e2b7d12..0741dd8 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -153,7 +153,7 @@ uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, 
sal_Int32 nIndex, std::list
 ++nCount;
 }
 assert(pRet);
-return uno::makeAny(uno::Referencedrawing::XShape(pRet-getUnoShape(), 
uno::UNO_QUERY));
+return pRet ? 
uno::makeAny(uno::Referencedrawing::XShape(pRet-getUnoShape(), 
uno::UNO_QUERY)) : uno::Any();
 }
 
 SwFrmFmt* SwTextBoxHelper::findTextBox(SwFrmFmt* pShape)
commit e9585fc11bb39edc1f02b20b482c39ba8013f381
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 11:06:28 2014 +0100

coverity#1219791 Uncaught exception

Change-Id: I018e8bc7f514b0d720bea19aa854aa776be366be

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index cccb2c3..084d486 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -604,12 +604,13 @@ uno::Reference uno::XInterface
SwXServiceProvider::MakeInstance(sal_uInt16
 if ( pDoc )
 {
 uno::Any aGlobs;
-if ( 
!pDoc-GetDocShell()-GetBasicManager()-GetGlobalUNOConstant( VBAGlobals, 
aGlobs ) )
+BasicManager *pBasicMan = 
pDoc-GetDocShell()-GetBasicManager();
+if (pBasicMan  
!pBasicMan-GetGlobalUNOConstant(VBAGlobals, aGlobs))
 {
 uno::Sequence uno::Any  aArgs(1);
 aArgs[ 0 ] = pDoc-GetDocShell()-GetModel();
 aGlobs = 
::comphelper::getProcessServiceFactory()-createInstanceWithArguments( 
ooo.vba.word.Globals, aArgs );
-
pDoc-GetDocShell()-GetBasicManager()-SetGlobalUNOConstant( VBAGlobals, 
aGlobs );
+pBasicMan-SetGlobalUNOConstant( VBAGlobals, aGlobs );
 }
 aGlobs = xRet;
 }
commit 92781adcdc57ac9df58f6c499d7fb337364cf8af
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 11:02:13 2014 +0100

coverity#1158094 Unchecked dynamic_cast

Change-Id: Ieac19e8dbb8328791d0c7110e9c787ec7c3bd448

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4168322..79d55a5 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1067,18 +1067,14 @@ void 
DbLimitedLengthField::implAdjustGenericFieldSetting( const Reference XProp
 }
 }
 
-
 void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
 {
-dynamic_cast Edit* ( m_pWindow )-SetMaxTextLen( _nMaxLen );
-if ( m_pPainter )
-dynamic_cast Edit* ( m_pPainter )-SetMaxTextLen( _nMaxLen );
+dynamic_castEdit(*m_pWindow).SetMaxTextLen(_nMaxLen);
+if (m_pPainter)
+dynamic_castEdit(*m_pPainter).SetMaxTextLen(_nMaxLen);
 }
 
-
 //= DbTextField
-
-
 DbTextField::DbTextField(DbGridColumn _rColumn)
 :DbLimitedLengthField(_rColumn)
 ,m_pEdit( NULL )
commit b487a48294dad588e16443d195e4526e10eaf022
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 11:00:18 2014 +0100

coverity#1078570 Unchecked dynamic_cast

Change-Id: I9cfdcad1c5e36b9cc6b44dcd3a25018bda6281ce

diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 3ca656c..25c329f 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1940,7 +1940,7 @@ void SwFEShell::SetObjTitle( const OUString rTitle )
 SwFrmFmt* pFmt = FindFrmFmt( pObj );
 if ( pFmt-Which() == RES_FLYFRMFMT )
 {
-GetDoc()-SetFlyFrmTitle( *(dynamic_castSwFlyFrmFmt*(pFmt)),
+GetDoc()-SetFlyFrmTitle( dynamic_castSwFlyFrmFmt(*pFmt),
   rTitle );
 }
 else
commit bde63c71fcf593ad5830f15ba0a913c5910972a6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 10:57:23 2014 +0100

coverity#735905 Unchecked

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

2014-06-06 Thread Andrzej Hunt

 framework/source/uielement/toolbarmanager.cxx |   16 ++--
 vcl/source/window/toolbox2.cxx|8 +++-
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit f8187a37122c7847fe80d2ba687b67e36ba60d4a
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Sun Jun 1 08:40:43 2014 +0100

fdo79368 Don't process overflow menu items twice.

We reuse the toolbox overflow menu for toolbarmanagers context
menu -- toolbarmanager previously added its menu listener to the
toolboxes menu permanently, meaning that it would try to handle
overflow menu items (in addition to the context menu items which
it should handle), instead we should only add the listener when
we are actually using the menu as a context menu.

Perhaps it would be better in the long run to actually use fully separate
menus instead, and ask toolbox to specifically add its items to that
rather than trying to hack the context menu on top of the overflow menu?

Change-Id: Iecface2c6eae9ab79dbcdb25ffdbaf446e2885ea
(cherry picked from commit 1ae89d189200c1e351a396a3f02612b84a69985f)
Reviewed-on: https://gerrit.libreoffice.org/9603
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Andras Timar andras.ti...@collabora.com

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 4137de3..98e0446 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -233,8 +233,6 @@ ToolBarManager::ToolBarManager( const Reference 
XComponentContext  rxContext,
 m_pToolBar-SetCommandHdl( LINK( this, ToolBarManager, Command ) );
 m_pToolBar-SetMenuType( nMenuType );
 m_pToolBar-SetMenuButtonHdl( LINK( this, ToolBarManager, MenuButton ) );
-m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager, 
MenuSelect ) );
-m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager, 
MenuDeactivate ) );
 
 // set name for testtool, the useful part is after the last '/'
 sal_Int32 idx = rResourceName.lastIndexOf('/');
@@ -1795,10 +1793,24 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, 
pCmdEvt )
 ::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
 if (pMenu)
 {
+// We only want to handle events for the context menu, but not events
+// on the toolbars overflow menu, hence we should only receive events
+// from the toolbox menu when we are actually showing it as our context
+// menu (the same menu retrieved with  GetMenu() is reused for both the
+// overflow and context menus). If we set these Hdls permanently rather
+// than just when the context menu is showing, then events are 
duplicated
+// when the menu is being used as an overflow menu.
+m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager, 
MenuSelect ) );
+m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager, 
MenuDeactivate ) );
+
 // make sure all disabled entries will be shown
 pMenu-SetMenuFlags( pMenu-GetMenuFlags() | 
MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
 ::Point aPoint( pCmdEvt-GetMousePosPixel() );
 pMenu-Execute( m_pToolBar, aPoint );
+
+// Unlink our listeners again -- see above for why.
+m_pToolBar-GetMenu()-SetSelectHdl( Link() );
+m_pToolBar-GetMenu()-SetDeactivateHdl( Link() );
 }
 
 return 0;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 608b27c..2fc6b4b 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -2184,7 +2184,13 @@ void ToolBox::ImplExecuteCustomMenu()
 // call button handler to allow for menu customization
 mpData-maMenuButtonHdl.Call( this );
 
-// register handler
+// We specifically only register this event listener when executing our
+// overflow menu (and remove it directly afterwards), as the same menu
+// is reused for both the overflow menu (as managed here in ToolBox),
+// but also by ToolBarManager for its context menu. If we leave event
+// listeners alive beyond when the menu is showing in the desired mode
+// then duplicate events can happen as the context menu duplicates
+// items from the overflow menu, which both listeners would then act 
on.
 GetMenu()-AddEventListener( LINK( this, ToolBox, 
ImplCustomMenuListener ) );
 
 // make sure all disabled entries will be shown
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LIbreOffice 4.3.0 Beta2 available

2014-06-06 Thread Christian Lohmaier

Dear Community,

The Document Foundation is pleased to announce the second Beta
release of LibreOffice 4.3.0. The upcoming 4.3.0 will be the eighth
major release of LibreOffice, coming with a bunch of new features
beside the usual bugfixes.

The Beta2 can be installed alongside the stable version, so feel free
to give it a try. Beta2 is not ready for production yet, and while
Beta1 did mark feature freeze, final UI and string freeze is yet to come,
and translations are not complete.

A work-in-progress list of new features in LibreOffice 4.3 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/4.3

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

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

Developers and QA might also be interested in the symbol server for
windows debug information (see the release notes linked below for
details)

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

  https://bugs.freedesktop.org

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

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

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

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.3.0 Beta2 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.3.0/Beta2

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

On behalf of the Community,

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

Re: Sort and copy results

On Fri, 2014-06-06 at 07:50 +0200, Winfried Donkers wrote:
 Hi Kohei,
 
   Yes. I'm almost certain that some enterprise users actually use this 
   feature.
 
  I'd like to know they still exist though, rather than speculating that they 
  still do.
 
 I hate to disappoint you, but the company I work with does.

Good.  Now I have someone real I can ask.

Can I ask in what use case this feature is used?  Why does your use case
require that copying and sorting have to be done in one step, rather
than in two separate steps?

 And I would think that LibreOffice would aim to comply fully with ODF, even 
 if that aim is never 100% reachable.
 (Making some features less prominent (as in hiding deep in the menu) because 
 they are rarely used and have an awkward UI is fine for me.)

Now, it's important to point out that ODF specifies the content of a
document, not the features of an application that produces it.  It's
easy to be ODF complient without implementing this specific
feature (by handling it during load and save).  Let's not confuse this
point.

Kohei


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

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

2014-06-06 Thread Eike Rathke

 svl/source/numbers/zforfind.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit a6992cd0d7c085ba05877e6f68ac0650dd09010f
Author: Eike Rathke er...@redhat.com
Date:   Fri Jun 6 13:31:03 2014 +0200

resolved fdo#79719 recognize ##-MMM-## as date even if ambiguous

Force ##-MMM-## to be ##-MMM- if the first number is a day value.

Note that the previous implementation of
(bDay1  bDay2  ((bYear1  !bYear2) || (!bYear1  bYear2)))
never matched anyway as the detection of bDay1 and bDay2 were changed to
only yield true if bYear1==false or bYear2==false.

Change-Id: If6bb6d3e1757015552eaa81c1f58d53c0794846e

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index cca342f..d63fd56 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1140,14 +1140,9 @@ bool ImpSvNumberInputScan::MayBeMonthDate()
 }
 else if (bDay1  bDay2)
 {
-if (bYear1  !bYear2)
-{
-nMayBeMonthDate = 3;// yy-month-dd
-}
-else if (!bYear1  bYear2)
-{
-nMayBeMonthDate = 2;// dd-month-yy
-}
+// Ambiguous ##-MMM-## date, but some big vendor's database
+// reports write this crap, assume this always to be
+nMayBeMonthDate = 2;// dd-month-yy
 }
 }
 }
___
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' - solenv/bin

 solenv/bin/macosx-codesign-app-bundle |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 31684bb7feae39ea6f936e4f3286da53ae13b94c
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 14:38:59 2014 +0300

Use MACOSX_APP_NAME instead of the build-time app bundle name

Change-Id: I447cf96778e56cbc89c7aa7eb066df0bc52b1755

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index 532ce5e..d21031a 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -88,8 +88,7 @@ if test $ENABLE_MACOSX_SANDBOX = TRUE; then
 entitlements=--entitlements $BUILDDIR/lo.xcent
 fi
 
-id=`basename $APP_BUNDLE`
-id=`echo $id | tr ' ' '-'`
+id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
 codesign --force --verbose --identifier=${MACOSX_BUNDLE_IDENTIFIER}.$id 
--resource-rules $SRCDIR/setup_native/source/mac/CodesignRules.plist --sign 
$MACOSX_CODESIGNING_IDENTITY $entitlements $APP_BUNDLE
 
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-06 Thread Eike Rathke

 svl/source/numbers/zforfind.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 2f268cc14b3e3eab16b6bacf546431122acfdb7a
Author: Eike Rathke er...@redhat.com
Date:   Fri Jun 6 13:31:03 2014 +0200

resolved fdo#79719 recognize ##-MMM-## as date even if ambiguous

Force ##-MMM-## to be ##-MMM- if the first number is a day value.

Note that the previous implementation of
(bDay1  bDay2  ((bYear1  !bYear2) || (!bYear1  bYear2)))
never matched anyway as the detection of bDay1 and bDay2 were changed to
only yield true if bYear1==false or bYear2==false.

Change-Id: If6bb6d3e1757015552eaa81c1f58d53c0794846e
(cherry picked from commit a6992cd0d7c085ba05877e6f68ac0650dd09010f)

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index cca342f..d63fd56 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1140,14 +1140,9 @@ bool ImpSvNumberInputScan::MayBeMonthDate()
 }
 else if (bDay1  bDay2)
 {
-if (bYear1  !bYear2)
-{
-nMayBeMonthDate = 3;// yy-month-dd
-}
-else if (!bYear1  bYear2)
-{
-nMayBeMonthDate = 2;// dd-month-yy
-}
+// Ambiguous ##-MMM-## date, but some big vendor's database
+// reports write this crap, assume this always to be
+nMayBeMonthDate = 2;// dd-month-yy
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Sort and copy results

2014-06-06 Thread Winfried Donkers

Hi Kohei,


 Good.  Now I have someone real I can ask.

 Can I ask in what use case this feature is used?  Why does your use case 
 require that copying and sorting have to be done in one step, rather than in 
 two separate steps?

Well, we're talking of a company, I don't use it personally. 
Often a one step action is preferred over a more than one step action. (If it 
were te be removed, I would get a question to write a macro to combine the 
steps to one action (press a toolbar button which invokes the macro). That 
could be a solution for our specific company.)
And often the argument is that they were used to do it in a certain way with 
Excel; this argument is _not_ a strong one for me.

  And I would think that LibreOffice would aim to comply fully with ODF, even 
  if that aim is never 100% reachable.
  (Making some features less prominent (as in hiding deep in the menu) 
  because they are rarely used and have an awkward UI is fine for me.)

 Now, it's important to point out that ODF specifies the content of a 
 document, not the features of an application that produces it.  It's easy to 
 be ODF complient without implementing this specific feature (by handling it 
 during load and save).  Let's not confuse this point.

Clear.

Winfried


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

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

2014-06-06 Thread Jacobo Aragunde Pérez

 sw/qa/extras/ooxmlexport/data/theme-preservation.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   10 +--
 sw/source/filter/ww8/docxattributeoutput.cxx  |   58 +-
 sw/source/filter/ww8/docxattributeoutput.hxx  |1 
 4 files changed, 52 insertions(+), 17 deletions(-)

New commits:
commit 1534c3363336003c4f84cfec1bf988fef6663f8a
Author: Jacobo Aragunde PÃ©rez jaragu...@igalia.com
Date:   Fri Jun 6 13:43:06 2014 +0200

fdo#79558: Do not overwrite w:shd value

When a w:shd has some pattern with two colors, LO blends both to
render the paragraph background. We must compare that blended color
with the paragraph color on export to know if the user has edited it
or not. We were using the w:fill attribute to compare, but that was
incorrect.

Modified an existing unit test to check this behaviour. The unit test
had to be retouched because Word remove some redundant information
from the original .docx file when I saved it again with some
background changes.

Change-Id: Ia2f1ddc4afd2637e1d87b6eccd441c26853045c4

diff --git a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx 
b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx
index 1c94b47..2de4374 100644
Binary files a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx and 
b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4c6dcda..596c292 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1930,9 +1930,7 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, 
theme-preservation.docx)
 // check theme font color value has been preserved
 assertXPath(pXmlDocument, 
/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color, themeColor, accent3);
 OUString sThemeShade = getXPath(pXmlDocument, 
/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color, themeShade);
-CPPUNIT_ASSERT_EQUAL(sThemeShade.toInt32(16), sal_Int32(0xbf));
-assertXPath(pXmlDocument, 
/w:document/w:body/w:p[7]/w:r[1]/w:rPr/w:color, themeColor, accent1);
-assertXPath(pXmlDocument, 
/w:document/w:body/w:p[7]/w:r[1]/w:rPr/w:color, themeTint, 99);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xbf), sThemeShade.toInt32(16));
 
 // check the themeFontLang values in settings file
 xmlDocPtr pXmlSettings = parseExport(word/settings.xml);
@@ -1956,8 +1954,12 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, 
theme-preservation.docx)
 CPPUNIT_ASSERT_EQUAL(OUString(Trebuchet MS),
  getPropertyOUString(getParagraph(5, Major theme 
font), CharFontName));
 
-// check the paragraph background theme color has been preserved
+// check the paragraph background pattern has been preserved including 
theme colors
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, val, 
thinHorzStripe);
 assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeFill, text2);
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeFillTint, 33);
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeColor, accent1);
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeShade, 80);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTableThemePreservation, 
table-theme-preservation.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f357a6f..d3cfad8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6867,14 +6867,13 @@ void DocxAttributeOutput::FormatBackground( const 
SvxBrushItem rBrush )
 }
 else if ( !m_rExport.bOutPageDescs )
 {
-if( !m_pBackgroundAttrList )
-m_pBackgroundAttrList = m_pSerializer-createAttrList();
-
 // compare fill color with the original fill color
 OString sOriginalFill = rtl::OUStringToOString(
-m_pBackgroundAttrList-getOptionalValue( FSNS( XML_w, XML_fill 
) ), RTL_TEXTENCODING_UTF8 );
-if( sOriginalFill.isEmpty() )
+m_sOriginalBackgroundColor, RTL_TEXTENCODING_UTF8 );
+
+if( !m_pBackgroundAttrList )
 {
+m_pBackgroundAttrList = m_pSerializer-createAttrList();
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_fill ), 
sColor.getStr() );
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_val ), clear );
 }
@@ -6886,6 +6885,7 @@ void DocxAttributeOutput::FormatBackground( const 
SvxBrushItem rBrush )
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_fill ), 
sColor.getStr() );
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_val ), clear );
 }
+m_sOriginalBackgroundColor = ;
 }
 }
 
@@ -7272,7 +7272,7 @@ void DocxAttributeOutput::ParaGrabBag(const 
SfxGrabBagItem rItem)
 {

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

2014-06-06 Thread Jacobo Aragunde Pérez

 sw/qa/extras/ooxmlexport/data/theme-preservation.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   10 +--
 sw/source/filter/ww8/docxattributeoutput.cxx  |   58 +-
 sw/source/filter/ww8/docxattributeoutput.hxx  |1 
 4 files changed, 52 insertions(+), 17 deletions(-)

New commits:
commit 5a09788e3507b0c5cb53e4d489e3a15e57c57f05
Author: Jacobo Aragunde PÃ©rez jaragu...@igalia.com
Date:   Fri Jun 6 13:43:06 2014 +0200

fdo#79558: Do not overwrite w:shd value

When a w:shd has some pattern with two colors, LO blends both to
render the paragraph background. We must compare that blended color
with the paragraph color on export to know if the user has edited it
or not. We were using the w:fill attribute to compare, but that was
incorrect.

Modified an existing unit test to check this behaviour. The unit test
had to be retouched because Word remove some redundant information
from the original .docx file when I saved it again with some
background changes.

(cherry-picked from commit 1534c3363336003c4f84cfec1bf988fef6663f8a)

Change-Id: Ia2f1ddc4afd2637e1d87b6eccd441c26853045c4

diff --git a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx 
b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx
index 1c94b47..2de4374 100644
Binary files a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx and 
b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ff3e138..fd98235 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1928,9 +1928,7 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, 
theme-preservation.docx)
 // check theme font color value has been preserved
 assertXPath(pXmlDocument, 
/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color, themeColor, accent3);
 OUString sThemeShade = getXPath(pXmlDocument, 
/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color, themeShade);
-CPPUNIT_ASSERT_EQUAL(sThemeShade.toInt32(16), sal_Int32(0xbf));
-assertXPath(pXmlDocument, 
/w:document/w:body/w:p[7]/w:r[1]/w:rPr/w:color, themeColor, accent1);
-assertXPath(pXmlDocument, 
/w:document/w:body/w:p[7]/w:r[1]/w:rPr/w:color, themeTint, 99);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xbf), sThemeShade.toInt32(16));
 
 // check the themeFontLang values in settings file
 xmlDocPtr pXmlSettings = parseExport(word/settings.xml);
@@ -1954,8 +1952,12 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, 
theme-preservation.docx)
 CPPUNIT_ASSERT_EQUAL(OUString(Trebuchet MS),
  getPropertyOUString(getParagraph(5, Major theme 
font), CharFontName));
 
-// check the paragraph background theme color has been preserved
+// check the paragraph background pattern has been preserved including 
theme colors
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, val, 
thinHorzStripe);
 assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeFill, text2);
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeFillTint, 33);
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeColor, accent1);
+assertXPath(pXmlDocument, /w:document/w:body/w:p[6]/w:pPr/w:shd, 
themeShade, 80);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTableThemePreservation, 
table-theme-preservation.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5bfce12..f16fdf6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6784,14 +6784,13 @@ void DocxAttributeOutput::FormatBackground( const 
SvxBrushItem rBrush )
 }
 else if ( !m_rExport.bOutPageDescs )
 {
-if( !m_pBackgroundAttrList )
-m_pBackgroundAttrList = m_pSerializer-createAttrList();
-
 // compare fill color with the original fill color
 OString sOriginalFill = rtl::OUStringToOString(
-m_pBackgroundAttrList-getOptionalValue( FSNS( XML_w, XML_fill 
) ), RTL_TEXTENCODING_UTF8 );
-if( sOriginalFill.isEmpty() )
+m_sOriginalBackgroundColor, RTL_TEXTENCODING_UTF8 );
+
+if( !m_pBackgroundAttrList )
 {
+m_pBackgroundAttrList = m_pSerializer-createAttrList();
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_fill ), 
sColor.getStr() );
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_val ), clear );
 }
@@ -6803,6 +6802,7 @@ void DocxAttributeOutput::FormatBackground( const 
SvxBrushItem rBrush )
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_fill ), 
sColor.getStr() );
 m_pBackgroundAttrList-add( FSNS( XML_w, XML_val ), clear );
 }
+m_sOriginalBackgroundColor = ;
 }
 }
 
@@ -7189,7 +7189,7 @@ void

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

2014-06-06 Thread Tobias Lippert

 sw/inc/ToxTextGenerator.hxx |   26 +
 sw/inc/chpfld.hxx   |4 
 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |   92 +++
 sw/source/core/tox/ToxTextGenerator.cxx |  129 ++--
 4 files changed, 204 insertions(+), 47 deletions(-)

New commits:
commit 0a1b1511faaa3302429d93ccdad3eb41dc8f36cb
Author: Tobias Lippert d...@fastmail.fm
Date:   Sun Jun 1 14:24:51 2014 +0200

Unittest generation of text for chapter entries in the TOC

Conflicts:
sw/inc/ToxTextGenerator.hxx
sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
sw/source/core/tox/ToxTextGenerator.cxx

Change-Id: I343958f85fb6718215a0caa456a825d72f168a57
Reviewed-on: https://gerrit.libreoffice.org/9612
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index ba79177..fa52fba 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -30,8 +30,13 @@
 class SfxItemSet;
 class SwAttrPool;
 class SwFmtAutoFmt;
+class SwChapterField;
+class SwChapterFieldType;
+class SwCntntFrm;
+class SwCntntNode;
 class SwDoc;
 class SwForm;
+class SwFormToken;
 class SwPageDesc;
 class SwTxtAttr;
 class SwTxtNode;
@@ -47,7 +52,7 @@ class SW_DLLPUBLIC ToxTextGenerator
 public:
 ToxTextGenerator(const SwForm toxForm);
 
-~ToxTextGenerator();
+virtual ~ToxTextGenerator();
 
 /** Generate the text for an entry of a table of X (X is, e.g., content).
  *
@@ -118,6 +123,25 @@ private:
 static OUString
 GetNumStringOfFirstNode(const SwTOXSortTabBase rBase, bool bUsePrefix, 
sal_uInt8 nLevel);
 
+/** Handle a chapter token.
+ */
+OUString
+HandleChapterToken(const SwTOXSortTabBase rBase, const SwFormToken 
aToken, SwDoc* pDoc) const;
+
+/** Generate the text for a chapter token.
+ */
+OUString
+GenerateTextForChapterToken(const SwFormToken chapterToken, const 
SwCntntFrm* contentFrame,
+const SwCntntNode *contentNode) const;
+
+/** Obtain a ChapterField to use for the text generation.
+ * @internal
+ * This method is overridden in the unittests. Do not override it yourself.
+ */
+virtual SwChapterField
+ObtainChapterField(SwChapterFieldType* chapterFieldType, const 
SwFormToken* chapterToken,
+const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) 
const;
+
 friend class ::ToxTextGeneratorTest;
 };
 
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 452c42c..dc59de1 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -24,6 +24,7 @@
 class SwFrm;
 class SwCntntNode;
 class SwTxtNode;
+class ToxTextGeneratorTest;
 
 enum SwChapterFormat
 {
@@ -36,7 +37,7 @@ enum SwChapterFormat
 CF_END
 };
 
-class SwChapterFieldType : public SwFieldType
+class SW_DLLPUBLIC SwChapterFieldType : public SwFieldType
 {
 public:
 SwChapterFieldType();
@@ -48,6 +49,7 @@ public:
 class SW_DLLPUBLIC SwChapterField : public SwField
 {
 friend class SwChapterFieldType;
+friend class ToxTextGeneratorTest; // the unittest needs to mock the 
chapter fields.
 sal_uInt8 nLevel;
 OUString sTitle;
 OUString sNumber;
diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index c2e1dcb..7ef8506 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -8,6 +8,7 @@
  */
 
 #include rtl/ustring.hxx
+#include chpfld.hxx
 #include tox.hxx
 #include txmsrt.hxx
 #include ToxTextGenerator.hxx
@@ -25,12 +26,18 @@ public:
 void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem();
 void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem();
 void EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet();
+void EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty();
+void ChapterNumberWithoutTextIsGeneratedForNoprepstTitle();
+void ChapterNumberWithTitleIsGeneratedForNumberNoPrepst();
 
 CPPUNIT_TEST_SUITE(ToxTextGeneratorTest);
 CPPUNIT_TEST(EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems);
 CPPUNIT_TEST(OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem);
 CPPUNIT_TEST(TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem);
 CPPUNIT_TEST(EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet);
+CPPUNIT_TEST(EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty);
+CPPUNIT_TEST(ChapterNumberWithoutTextIsGeneratedForNoprepstTitle);
+CPPUNIT_TEST(ChapterNumberWithTitleIsGeneratedForNumberNoPrepst);
 CPPUNIT_TEST_SUITE_END();
 
 };
@@ -82,6 +89,91 @@ 
ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet()
 CPPUNIT_ASSERT_EQUAL(expected, actual);
 }
 
+void
+ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
+{
+MockedSortTab sortTab;
+sortTab.pTxtMark = reinterpret_castSwTxtTOXMark*(1);

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

 include/oox/export/drawingml.hxx |4 
 oox/source/export/shapes.cxx |   15 +
 sw/inc/textboxhelper.hxx |6 
 sw/source/core/doc/textboxhelper.cxx |   10 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   11 +
 sw/source/filter/ww8/docxattributeoutput.hxx |2 
 sw/source/filter/ww8/docxsdrexport.cxx   |  228 +--
 sw/source/filter/ww8/docxsdrexport.hxx   |2 
 8 files changed, 166 insertions(+), 112 deletions(-)

New commits:
commit 049f30c37f6c5bbc1f4dfd1f33005b9623f74f0a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 14:16:47 2014 +0200

DOCX drawingML export: avoid duplicated wps:spPr for textboxes

It's valid to have multiple ones from these, but the first one was
generated from the shape, the second from the textbox. Given that we use
the textbox only as a container, don't write its properties, it's not
necessary and may cause problems.

Change-Id: Id1f8bb92c587fe8c1437e412b41510803595dd80

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index ae6445e..5aaeb2e 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1188,6 +1188,23 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* 
pParentFrame, int nAnchorId, bo
 // to lots of contents, this size contains the real size.
 const Size aSize = pParentFrame-GetSize();
 
+uno::Reference drawing::XShape  xShape;
+const SdrObject* pSdrObj = rFrmFmt.FindRealSdrObject();
+if (pSdrObj)
+xShape = uno::Reference drawing::XShape 
(const_castSdrObject*(pSdrObj)-getUnoShape(), uno::UNO_QUERY);
+uno::Reference beans::XPropertySet  xPropertySet(xShape, uno::UNO_QUERY);
+uno::Reference beans::XPropertySetInfo  xPropSetInfo;
+if (xPropertySet.is())
+xPropSetInfo = xPropertySet-getPropertySetInfo();
+
+m_pImpl-m_pBodyPrAttrList = pFS-createAttrList();
+{
+drawing::TextVerticalAdjust eAdjust = drawing::TextVerticalAdjust_TOP;
+if (xPropSetInfo.is()  
xPropSetInfo-hasPropertyByName(TextVerticalAdjust))
+xPropertySet-getPropertyValue(TextVerticalAdjust) = eAdjust;
+m_pImpl-m_pBodyPrAttrList-add(XML_anchor, 
oox::drawingml::GetTextVerticalAdjust(eAdjust));
+}
+
 if (!bTextBoxOnly)
 {
 startDMLAnchorInline(rFrmFmt, aSize);
@@ -1205,94 +1222,79 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* 
pParentFrame, int nAnchorId, bo
 XML_uri, 
http://schemas.microsoft.com/office/word/2010/wordprocessingShape;,
 FSEND);
 pFS-startElementNS(XML_wps, XML_wsp, FSEND);
-}
-pFS-singleElementNS(XML_wps, XML_cNvSpPr,
- XML_txBox, 1,
- FSEND);
+pFS-singleElementNS(XML_wps, XML_cNvSpPr,
+ XML_txBox, 1,
+ FSEND);
 
-uno::Any aRotation ;
-uno::Reference drawing::XShape  xShape;
-const SdrObject* pSdrObj = rFrmFmt.FindRealSdrObject();
-if (pSdrObj)
-xShape = uno::Reference drawing::XShape 
(const_castSdrObject*(pSdrObj)-getUnoShape(), uno::UNO_QUERY);
-uno::Reference beans::XPropertySet  xPropertySet(xShape, uno::UNO_QUERY);
-uno::Reference beans::XPropertySetInfo  xPropSetInfo;
-if (xPropertySet.is())
-xPropSetInfo = xPropertySet-getPropertySetInfo();
-sal_Int32 nRotation = 0;
-if (xPropSetInfo.is()  
xPropSetInfo-hasPropertyByName(FrameInteropGrabBag))
-{
-uno::Sequence beans::PropertyValue  propList;
-xPropertySet-getPropertyValue(FrameInteropGrabBag) = propList;
-for (sal_Int32 nProp=0; nProp  propList.getLength(); ++nProp)
+uno::Any aRotation ;
+sal_Int32 nRotation = 0;
+if (xPropSetInfo.is()  
xPropSetInfo-hasPropertyByName(FrameInteropGrabBag))
 {
-OUString propName = propList[nProp].Name;
-if (propName == mso-rotation-angle)
+uno::Sequence beans::PropertyValue  propList;
+xPropertySet-getPropertyValue(FrameInteropGrabBag) = propList;
+for (sal_Int32 nProp=0; nProp  propList.getLength(); ++nProp)
 {
-aRotation = propList[nProp].Value ;
-break;
+OUString propName = propList[nProp].Name;
+if (propName == mso-rotation-angle)
+{
+aRotation = propList[nProp].Value ;
+break;
+}
 }
 }
-}
-aRotation = nRotation ;
-OString sRotation(OString::number(nRotation));
-// Shape properties
-pFS-startElementNS(XML_wps, XML_spPr, FSEND);
-if (nRotation)
-{
-pFS-startElementNS(XML_a, XML_xfrm,
-XML_rot, sRotation.getStr(),
-FSEND);
-}
-else
-{
-

Re: minutes of ESC call ...

2014-06-06 Thread Norbert Thiebaud

On Thu, Jun 5, 2014 at 8:20 AM, Michael Meeks
michael.me...@collabora.com wrote:
 + need to get bugzilla migration bits under gerrit so we can get 
 patches.
 + QA team eager to help out.

It is already. I have added a bugzilla repo under gerrit to track
upstream with prod/test/dev branches.
I need to update the salt script to pull from that repo rather than
use the upstream tar.gz.

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

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

 sw/inc/ToxTextGenerator.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbb44f9d9b6a1f658b722eb4fc99dc42d1739edc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 14:35:15 2014 +0200

-Werror,-Wmismatched-tags

Change-Id: I2c6dd21595815c4f382bed2bfb66551929630372

diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index fa52fba..25e4957 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -36,7 +36,7 @@ class SwCntntFrm;
 class SwCntntNode;
 class SwDoc;
 class SwForm;
-class SwFormToken;
+struct SwFormToken;
 class SwPageDesc;
 class SwTxtAttr;
 class SwTxtNode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk

2014-06-06 Thread sk94

 sc/AllLangResTarget_sc.mk |1 
 sc/UIConfig_scalc.mk  |1 
 sc/source/ui/condformat/condformatmgr.cxx |   73 ++---
 sc/source/ui/inc/condformatmgr.hrc|   18 ---
 sc/source/ui/inc/condformatmgr.hxx|   37 ++-
 sc/source/ui/src/condformatmgr.src|   67 
 sc/uiconfig/scalc/ui/condformatmanager.ui |  157 ++
 7 files changed, 201 insertions(+), 153 deletions(-)

New commits:
commit c45c6e4116b30a90dd69c7d9dda1eac6c0597c7f
Author: sk94 eszka...@gmail.com
Date:   Fri Jun 6 00:27:57 2014 +0200

RID_SCDLG_COND_FORMAT_MANAGER conversion to .ui

Change-Id: If3e0ac5afd73ed31f8c21ab68d0c3c765cb447f4
Reviewed-on: https://gerrit.libreoffice.org/9660
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 3a17858..4f8a080 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/src/scstring.src \
 sc/source/ui/src/filter.src \
 sc/source/ui/src/condformatdlg.src \
-sc/source/ui/src/condformatmgr.src \
 sc/source/ui/cctrl/checklistmenu.src \
 sc/source/ui/navipi/navipi.src \
 sc/source/ui/styleui/scstyles.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 15d515c..ab736b8 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/chardialog \
sc/uiconfig/scalc/ui/colorrowdialog \
sc/uiconfig/scalc/ui/colwidthdialog \
+   sc/uiconfig/scalc/ui/condformatmanager \
sc/uiconfig/scalc/ui/conditionalformatdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \
diff --git a/sc/source/ui/condformat/condformatmgr.cxx 
b/sc/source/ui/condformat/condformatmgr.cxx
index 83185cd..6a9ea44 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -8,7 +8,6 @@
  */
 
 #include condformatmgr.hxx
-#include condformatmgr.hrc
 #include scresid.hxx
 #include globstr.hrc
 #include condformatdlg.hxx
@@ -20,7 +19,7 @@
 
 
 ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent, 
ScDocument* pDoc, ScConditionalFormatList* pFormatList):
-SvTabListBox(pParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP),
+SvTabListBox(pParent, WB_BORDER | WB_HSCROLL | WB_SORT | WB_CLIPCHILDREN | 
WB_TABSTOP),
 maHeaderBar( pParent, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
 mpDoc(pDoc),
 mpFormatList(pFormatList)
@@ -74,6 +73,14 @@ void ScCondFormatManagerWindow::Init()
 SetUpdateMode(true);
 }
 
+void ScCondFormatManagerWindow::ChangeSize(Size aSize)
+{
+maHeaderBar.SetSizePixel( Size( aSize.Width(), 16 ) );
+Size aHeadSize( maHeaderBar.GetSizePixel() );
+SetSizePixel( Size( aSize.Width(), aSize.Height() - aHeadSize.Height() ) );
+HeaderEndDragHdl(NULL);
+}
+
 void ScCondFormatManagerWindow::DeleteSelection()
 {
 if(GetSelectionCount())
@@ -123,52 +130,37 @@ IMPL_LINK_NOARG(ScCondFormatManagerWindow, 
HeaderEndDragHdl)
 return 0;
 }
 
-ScCondFormatManagerCtrl::ScCondFormatManagerCtrl(Window* pParent, ScDocument* 
pDoc, ScConditionalFormatList* pFormatList):
-Control(pParent, ScResId(CTRL_TABLE)),
-maWdManager(this, pDoc, pFormatList)
-{
-}
-
-ScConditionalFormat* ScCondFormatManagerCtrl::GetSelection()
-{
-return maWdManager.GetSelection();
-}
-
-void ScCondFormatManagerCtrl::DeleteSelection()
-{
-maWdManager.DeleteSelection();
-}
-
-void ScCondFormatManagerCtrl::Update()
-{
-maWdManager.Update();
-}
-
 ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* 
pDoc, const ScConditionalFormatList* pFormatList, const ScAddress rPos):
-ModalDialog(pParent, ScResId(RID_SCDLG_COND_FORMAT_MANAGER)),
-maBtnAdd(this, ScResId(BTN_ADD)),
-maBtnRemove(this, ScResId(BTN_REMOVE)),
-maBtnEdit(this, ScResId(BTN_EDIT)),
-maBtnOk(this, ScResId(BTN_OK)),
-maBtnCancel(this, ScResId(BTN_CANCEL)),
-maFlLine(this, ScResId(FL_LINE)),
+ModalDialog(pParent, CondFormatManager, 
modules/scalc/ui/condformatmanager.ui),
 mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : 
NULL),
-maCtrlManager(this, pDoc, mpFormatList),
 mpDoc(pDoc),
 maPos(rPos),
 mbModified(false)
 {
-FreeResource();
+get(m_pGrid, dialog-vbox1);
+get(m_pContainer, CONTAINER);
+m_pContainer-SetSizePixel(Size(300, 100));
+m_pCtrlManager = new ScCondFormatManagerWindow(m_pContainer, mpDoc, 
mpFormatList);
+get(m_pBtnAdd, ADD);
+get(m_pBtnRemove, REMOVE);
+get(m_pBtnEdit, EDIT);
+
+m_pBtnRemove-SetClickHdl(LINK(this, ScCondFormatManagerDlg, 
RemoveBtnHdl));
+m_pBtnEdit-SetClickHdl(LINK(this,

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

 sc/source/ui/condformat/condformatmgr.cxx |   91 ++
 sc/source/ui/inc/condformatmgr.hxx|   16 +
 sc/uiconfig/scalc/ui/condformatmanager.ui |   34 +--
 3 files changed, 55 insertions(+), 86 deletions(-)

New commits:
commit 5918209d281927b714850157b2d1415fa8765c6f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 12:28:42 2014 +0100

Resolves: fdo#73675 tweak conversion to use SvSimpleTable

Change-Id: Ibfa5c806581c450a0b0407cb07751e06dd3a787e

diff --git a/sc/source/ui/condformat/condformatmgr.cxx 
b/sc/source/ui/condformat/condformatmgr.cxx
index 6a9ea44..5e0b3e8 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -18,36 +18,22 @@
 #define ITEMID_CONDITION 2
 
 
-ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent, 
ScDocument* pDoc, ScConditionalFormatList* pFormatList):
-SvTabListBox(pParent, WB_BORDER | WB_HSCROLL | WB_SORT | WB_CLIPCHILDREN | 
WB_TABSTOP),
-maHeaderBar( pParent, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
-mpDoc(pDoc),
-mpFormatList(pFormatList)
+ScCondFormatManagerWindow::ScCondFormatManagerWindow(SvSimpleTableContainer 
rParent,
+ScDocument* pDoc, ScConditionalFormatList* pFormatList)
+: SvSimpleTable(rParent, WB_HSCROLL | WB_SORT | WB_TABSTOP)
+, mpDoc(pDoc)
+, mpFormatList(pFormatList)
 {
-Size aBoxSize( pParent-GetOutputSizePixel() );
-
-maHeaderBar.SetPosSizePixel( Point(0, 0), Size( aBoxSize.Width(), 16 ) );
-
 OUString aConditionStr(ScGlobal::GetRscString(STR_HEADER_COND));
 OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE));
 
-long nTabSize = aBoxSize.Width()/2;
-maHeaderBar.InsertItem( ITEMID_RANGE, aRangeStr, nTabSize, HIB_LEFT| 
HIB_VCENTER );
-maHeaderBar.InsertItem( ITEMID_CONDITION, aConditionStr, nTabSize, 
HIB_LEFT| HIB_VCENTER );
-
-static long nTabs[] = {2, 0, nTabSize };
-Size aHeadSize( maHeaderBar.GetSizePixel() );
-
-//pParent-SetFocusControl( this );
-SetPosSizePixel( Point( 0, aHeadSize.Height() ), Size( aBoxSize.Width(), 
aBoxSize.Height() - aHeadSize.Height() ) );
-SetTabs( nTabs[0], MAP_PIXEL );
-
-maHeaderBar.SetEndDragHdl( LINK(this, ScCondFormatManagerWindow, 
HeaderEndDragHdl ) );
-HeaderEndDragHdl(NULL);
+OUStringBuffer sHeader;
+sHeader.append(aRangeStr).append(\t).append(aConditionStr);
+InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT 
| HIB_VCENTER);
+setColSizes();
 
 Init();
 Show();
-maHeaderBar.Show();
 SetSelectionMode(MULTIPLE_SELECTION);
 }
 
@@ -70,15 +56,18 @@ void ScCondFormatManagerWindow::Init()
 SvTreeListEntry* pEntry = InsertEntryToColumn( 
createEntryString(*itr), TREELIST_APPEND, 0x );
 
maMapLBoxEntryToCondIndex.insert(std::pairSvTreeListEntry*,sal_Int32(pEntry,itr-GetKey()));
 }
+
 SetUpdateMode(true);
+
+if (mpFormatList-size())
+SelectRow(0);
 }
 
-void ScCondFormatManagerWindow::ChangeSize(Size aSize)
+void ScCondFormatManagerWindow::Resize()
 {
-maHeaderBar.SetSizePixel( Size( aSize.Width(), 16 ) );
-Size aHeadSize( maHeaderBar.GetSizePixel() );
-SetSizePixel( Size( aSize.Width(), aSize.Height() - aHeadSize.Height() ) );
-HeaderEndDragHdl(NULL);
+SvSimpleTable::Resize();
+if (GetParentDialog()-isCalculatingInitialLayoutSize())
+setColSizes();
 }
 
 void ScCondFormatManagerWindow::DeleteSelection()
@@ -111,23 +100,14 @@ void ScCondFormatManagerWindow::Update()
 Init();
 }
 
-IMPL_LINK_NOARG(ScCondFormatManagerWindow, HeaderEndDragHdl)
+void ScCondFormatManagerWindow::setColSizes()
 {
-long aTableSize = maHeaderBar.GetSizePixel().Width();
-long aItemRangeSize = maHeaderBar.GetItemSize(ITEMID_RANGE);
-
-//calculate column size based on user input and minimum size
-long aItemCondSize = aTableSize - aItemRangeSize;
-
-Size aSz;
-aSz.Width() = aItemRangeSize;
-SetTab( ITEMID_RANGE, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), 
MAP_APPFONT );
-maHeaderBar.SetItemSize(ITEMID_RANGE, aItemRangeSize);
-aSz.Width() += aItemCondSize;
-SetTab( ITEMID_CONDITION, PixelToLogic( aSz, MapMode(MAP_APPFONT) 
).Width(), MAP_APPFONT );
-maHeaderBar.SetItemSize(ITEMID_CONDITION, aItemCondSize);
-
-return 0;
+HeaderBar rBar = GetTheHeaderBar();
+if (rBar.GetItemCount()  2)
+return;
+long aStaticTabs[]= { 2, 0, 0 };
+aStaticTabs[2] = rBar.GetSizePixel().Width() / 2;
+SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
 }
 
 ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* 
pDoc, const ScConditionalFormatList* pFormatList, const ScAddress rPos):
@@ -137,13 +117,14 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* 
pParent, ScDocument* pDoc
 maPos(rPos),
 mbModified(false)
 {
-get(m_pGrid, dialog-vbox1);
-get(m_pContainer, CONTAINER);
-

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

 helpcontent2|2 +-
 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3c0ba9c3206670169d6a7b48713c8db5ca10e34
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 13:40:26 2014 +0100

Updated core
Project: help  a87da6b2546423f1727b2d857dcfe78aa6bf53af

diff --git a/helpcontent2 b/helpcontent2
index 2a0b474..a87da6b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2a0b4747b5a83386f1b9c3935d5eb484429c6050
+Subproject commit a87da6b2546423f1727b2d857dcfe78aa6bf53af
commit d4259530a627733f1034dbd4cf15b6f1142121c9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 14:40:23 2014 +0200

loplugin:saloverride

Change-Id: I67ce0ceea8ee022493311d58acd0211897208631

diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index 7ef8506..0d7d75d 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -113,7 +113,7 @@ public:
 private:
 SwChapterField
 ObtainChapterField(SwChapterFieldType* chapterFieldType, const 
SwFormToken* chapterToken,
-const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) 
const {
+const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) 
const SAL_OVERRIDE {
 // get rid of 'unused-parameters' warnings
 
(void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
 return mChapterField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit a87da6b2546423f1727b2d857dcfe78aa6bf53af
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 13:40:26 2014 +0100

update help ids for manage conditional formatting .ui conversion

Change-Id: I75b6c19274a865366f30de6e795f036d44a072ea

diff --git a/source/text/scalc/01/0512.xhp 
b/source/text/scalc/01/0512.xhp
index 2babbfa..9296881 100644
--- a/source/text/scalc/01/0512.xhp
+++ b/source/text/scalc/01/0512.xhp
@@ -125,7 +125,7 @@ Apply a color scale to a range consist of displaying a 
bicolor or tricolor gradi
 /listitem
 /list
 
-bookmark xml-lang=en-US 
branch=hid/sc:ModalDialog:RID_SCDLG_COND_FORMAT_MANAGER id=bm_id3152598 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/condformatdialog/CondFormatDialog 
id=bm_id3152598 localize=false/
 paragraph xml-lang=en-US id=hd_id3153384 role=heading level=2Manage 
Conditional Formatting/paragraph
 paragraph xml-lang=en-US id=par_id3155906 role=paragraphThis dialog 
allows you to see all the conditional formatting defined in the 
spreadsheet./paragraph
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/condformat/condformatmgr.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 3b8ce44eba33b04773efe4806583a746233a25c9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 14:42:26 2014 +0200

-Werror,-Wunused-macros

Change-Id: If8685cf1cfcfb25fd611e385d0b32d0b7963cd21

diff --git a/sc/source/ui/condformat/condformatmgr.cxx 
b/sc/source/ui/condformat/condformatmgr.cxx
index 5e0b3e8..053fd9c 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -14,10 +14,6 @@
 #include vcl/msgbox.hxx
 #include document.hxx
 
-#define ITEMID_RANGE 1
-#define ITEMID_CONDITION 2
-
-
 ScCondFormatManagerWindow::ScCondFormatManagerWindow(SvSimpleTableContainer 
rParent,
 ScDocument* pDoc, ScConditionalFormatList* pFormatList)
 : SvSimpleTable(rParent, WB_HSCROLL | WB_SORT | WB_TABSTOP)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/docxattributeoutput.cxx |4 
 sw/source/filter/ww8/docxsdrexport.cxx   |   11 ++-
 sw/source/filter/ww8/docxsdrexport.hxx   |2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 96965fb39d6d376e91030a01c11f16f9428ddf2e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 14:46:21 2014 +0200

DOCX drawingML export: don't export textboxes of shapes twice

We already had code, so that in case a shape has a textbox, then we
wrote the textbox contents as the shape text, but textboxes were still
exported independently as well.

Build a list of textboxes at the start of the export, and ignore
anything that's on that list during export. In the future, if both RTF
and DOC will support textboxes, then this can be moved to
MSWordExportBase.

Change-Id: I9370b2bbda515ef605281ad398a358b2f24d8f0e

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 41630d4..34b0c06 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4415,6 +4415,10 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Po
 break;
 case sw::Frame::eTxtBox:
 {
+// If this is a TextBox of a shape, then ignore: it's handled 
in WriteTextBox().
+if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrmFmt()))
+break;
+
 // The frame output is postponed to the end of the anchor 
paragraph
 bool bDuplicate = false;
 const OUString rName = rFrame.GetFrmFmt().GetName();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 5aaeb2e..b86fc6e 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -29,6 +29,7 @@
 
 #include frmatr.hxx
 #include frmfmt.hxx
+#include textboxhelper.hxx
 #include fmtanchr.hxx
 #include fmtornt.hxx
 #include fmtsrnd.hxx
@@ -155,6 +156,8 @@ struct DocxSdrExport::Impl
 sal_Int32 m_nId ;
 sal_Int32 m_nSeq ;
 bool m_bDMLAndVMLDrawingOpen;
+/// List of TextBoxes in this document: they are exported as part of their 
shape, never alone.
+std::listSwFrmFmt* m_aTextBoxes;
 
 Impl(DocxSdrExport rSdrExport, DocxExport rExport, 
sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML)
 : m_rSdrExport(rSdrExport),
@@ -176,7 +179,8 @@ struct DocxSdrExport::Impl
   m_pDashLineStyleAttr(0),
   m_nId(0),
   m_nSeq(0),
-  m_bDMLAndVMLDrawingOpen(false)
+  m_bDMLAndVMLDrawingOpen(false),
+  m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.pDoc))
 {
 }
 
@@ -1522,4 +1526,9 @@ bool DocxSdrExport::checkFrameBtlr(SwNode* pStartNode, 
sax_fastparser::FastAttri
 return false;
 }
 
+bool DocxSdrExport::isTextBox(const SwFrmFmt rFrmFmt)
+{
+return std::find(m_pImpl-m_aTextBoxes.begin(), 
m_pImpl-m_aTextBoxes.end(), rFrmFmt) != m_pImpl-m_aTextBoxes.end();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx 
b/sw/source/filter/ww8/docxsdrexport.hxx
index c05979f..5cda344 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -97,6 +97,8 @@ public:
 void writeVMLTextFrame(sw::Frame* pParentFrame);
 /// Undo the text direction mangling done by the frame btLr handler in 
writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup()
 bool checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* 
pTextboxAttrList = 0);
+/// Is this a standalone TextFrame, or used as a TextBox of a shape?
+bool isTextBox(const SwFrmFmt rFrmFmt);
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 starmath/source/mathtype.cxx |2 +-
 vcl/generic/fontmanager/parseAFM.cxx |   28 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c50c800f9c183f12aa75d64a386c3b9f20731d70
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 14:04:19 2014 +0100

coverity#708822 Unused pointer value

Change-Id: I6ccd4c2ab97237806652059d6ae2cd23a6dc1625

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index fb2ca532..a46bef3 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2295,7 +2295,7 @@ void MathType::HandleSubSupScript(SmNode *pNode,int 
nLevel)
 if (pNode-GetSubNode(RSUB+1))
 nVariation=2;
 }
-else if (NULL != (pTemp = pNode-GetSubNode(RSUB+1)))
+else if (NULL != pNode-GetSubNode(RSUB+1))
 nVariation=1;
 
 if (nVariation!=0xff)
commit 4d33acbfbda4d72a8c4ded4ac9df6f1aee667424
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 14:03:38 2014 +0100

coverity#708896 Unused pointer value

Change-Id: I8cb1d720a8fb22ba2153c5f556e4bd538f5ea8af

diff --git a/vcl/generic/fontmanager/parseAFM.cxx 
b/vcl/generic/fontmanager/parseAFM.cxx
index a7199bcb..4e34697 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -497,7 +497,7 @@ static int parseGlobals( FileInputStream* fp, 
GlobalFontInfo* gfi )
 break;
 case EM:
 // skip one token
-keyword = token(fp,tokenlen);
+token(fp,tokenlen);
 break;
 case STARTDIRECTION:
 if ((keyword = token(fp,tokenlen)) != NULL)
@@ -506,22 +506,22 @@ static int parseGlobals( FileInputStream* fp, 
GlobalFontInfo* gfi )
 case ENDDIRECTION:
 break; /* ignore this for now */
 case MAPPINGSCHEME:
-keyword = token(fp,tokenlen);
+token(fp,tokenlen);
 break; /* ignore this for now */
 case CHARACTERS:
-keyword = token(fp,tokenlen);
+token(fp,tokenlen);
 break; /* ignore this for now */
 case ISBASEFONT:
-keyword = token(fp,tokenlen);
+token(fp,tokenlen);
 break; /* ignore this for now */
 case CHARACTERSET:
-keyword=token(fp,tokenlen); //ignore
+token(fp,tokenlen); //ignore
 break;
 case STDHW:
-keyword=token(fp,tokenlen); //ignore
+token(fp,tokenlen); //ignore
 break;
 case STDVW:
-keyword=token(fp,tokenlen); //ignore
+token(fp,tokenlen); //ignore
 break;
 case CHARWIDTH:
 if ((keyword = token(fp,tokenlen)) != NULL)
@@ -529,7 +529,7 @@ static int parseGlobals( FileInputStream* fp, 
GlobalFontInfo* gfi )
 if (direction == 0)
 gfi-charwidth = atoi(keyword);
 }
-keyword = token(fp,tokenlen);
+token(fp,tokenlen);
 /* ignore y-width for now */
 break;
 case METRICSSETS:
commit 4c4901893f2f734385411a76fa33d82a98ff714a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 14:02:38 2014 +0100

coverity#708898 Unused pointer value

Change-Id: Ida87450bda99260d9e153bb9e48d8867f53d42ca

diff --git a/vcl/generic/fontmanager/parseAFM.cxx 
b/vcl/generic/fontmanager/parseAFM.cxx
index bbb8c2e..a7199bcb 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -611,7 +611,7 @@ static int parseCharWidths( FileInputStream* fp, int* cwi)
 break;
 case XYWIDTH:
 /* PROBLEM: Should be no Y-WIDTH when doing quick  
dirty */
-keyword = token(fp,tokenlen); keyword = 
token(fp,tokenlen); /* eat values */
+token(fp,tokenlen); keyword = token(fp,tokenlen); /* eat 
values */
 error = parseError;
 break;
 case CODEHEX:
@@ -634,14 +634,14 @@ static int parseCharWidths( FileInputStream* fp, int* cwi)
 error = normalEOF;
 break;
 case CHARNAME:  /* eat values (so doesn't cause parseError) */
-keyword = token(fp,tokenlen);
+token(fp,tokenlen);
 break;
 case CHARBBOX:
-keyword = token(fp,tokenlen); keyword = token(fp,tokenlen);
-keyword = token(fp,tokenlen); keyword =

[Libreoffice-commits] core.git: lotuswordpro/Library_lwpft.mk lotuswordpro/source

 lotuswordpro/Library_lwpft.mk|1 +
 lotuswordpro/source/filter/lwpcharacterstyle.cxx |2 +-
 lotuswordpro/source/filter/lwpdrawobj.cxx|6 +++---
 lotuswordpro/source/filter/lwpdrawobj.hxx|6 +-
 lotuswordpro/source/filter/lwpfont.cxx   |   18 +-
 lotuswordpro/source/filter/lwpfont.hxx   |   14 +++---
 lotuswordpro/source/filter/lwpframelayout.cxx|4 ++--
 lotuswordpro/source/filter/lwpfrib.cxx   |6 +++---
 lotuswordpro/source/filter/lwpfrib.hxx   |2 +-
 lotuswordpro/source/filter/lwplayout.cxx |5 ++---
 lotuswordpro/source/filter/lwplayout.hxx |   10 +++---
 lotuswordpro/source/filter/lwpparastyle.cxx  |2 +-
 lotuswordpro/source/filter/lwptablelayout.cxx|4 ++--
 lotuswordpro/source/filter/xfilter/xfcellstyle.cxx   |9 -
 lotuswordpro/source/filter/xfilter/xfcellstyle.hxx   |6 +-
 lotuswordpro/source/filter/xfilter/xffont.hxx|8 +++-
 lotuswordpro/source/filter/xfilter/xffontfactory.cxx |   12 +++-
 lotuswordpro/source/filter/xfilter/xffontfactory.hxx |   10 +++---
 lotuswordpro/source/filter/xfilter/xfparastyle.cxx   |   16 ++--
 lotuswordpro/source/filter/xfilter/xfparastyle.hxx   |   10 +++---
 lotuswordpro/source/filter/xfilter/xfstylecont.cxx   |   16 ++--
 lotuswordpro/source/filter/xfilter/xftextstyle.cxx   |   11 +--
 lotuswordpro/source/filter/xfilter/xftextstyle.hxx   |   10 +++---
 23 files changed, 101 insertions(+), 87 deletions(-)

New commits:
commit fa49b57806e1215f156a525cf9123078a32841cb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 15:19:50 2014 +0200

Fix memory leaks, by refcounting XFFont

Change-Id: Iecfddf21f19313f46ee2544fad9c4df1e399e0f5

diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 8cc8b96..1ed0483 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\
 cppu \
 cppuhelper \
 sal \
+salhelper \
i18nlangtag \
 sfx \
 sot \
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx 
b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 5c4de3f..1cb925b 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -181,7 +181,7 @@ void LwpTextStyle::RegisterStyle()
 
 //Create font
 LwpFontManager* pFontMgr = m_pFoundry-GetFontManger();
-XFFont* pFont = pFontMgr-CreateFont(m_nFinalFontID);
+rtl::ReferenceXFFont pFont = pFontMgr-CreateFont(m_nFinalFontID);
 pStyle-SetFont(pFont);
 
 //Set other properties if needed
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index d3ac87d..6ef548b 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -972,7 +972,7 @@ LwpDrawTextBox::~LwpDrawTextBox()
 }
 }
 
-void LwpDrawTextBox::SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec)
+void LwpDrawTextBox::SetFontStyle(rtl::ReferenceXFFont const  pFont, 
SdwTextBoxRecord* pRec)
 {
 // color
 XFColor aXFColor(pRec-aTextColor.nR, pRec-aTextColor.nG,
@@ -1065,7 +1065,7 @@ OUString LwpDrawTextBox::RegisterStyle()
 
 // font style
 // the pFont need to be deleted myself?
-XFFont* pFont = new XFFont();
+rtl::ReferenceXFFont pFont = new XFFont();
 
 rtl_TextEncoding aEncoding =  RTL_TEXTENCODING_MS_1252;
 OUString aFontName = OUString((sal_Char*)m_aTextRec.tmpTextFaceName,
@@ -1257,7 +1257,7 @@ OUString LwpDrawTextArt::RegisterStyle()
 
 // font style
 // the pFont need to be deleted myself?
-XFFont* pFont = new XFFont();
+rtl::ReferenceXFFont pFont = new XFFont();
 
 rtl_TextEncoding aEncoding =  RTL_TEXTENCODING_MS_1252;
 OUString aFontName = OUString((sal_Char*)m_aTextArtRec.tmpTextFaceName,
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx 
b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 33dad65..457a1fb 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -62,6 +62,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDRAWOBJ_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDRAWOBJ_HXX
 
+#include sal/config.h
+
+#include rtl/ref.hxx
+
 #include lwpsdwdrawheader.hxx
 
 class SvStream;
@@ -303,7 +307,7 @@ private:
 public:
 LwpDrawTextBox(SvStream* pStream);
 virtual ~LwpDrawTextBox();
-static void SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec);
+static void SetFontStyle(rtl::ReferenceXFFont const  pFont, 
SdwTextBoxRecord* pRec);
 
 protected:
 virtual void Read() SAL_OVERRIDE;
diff --git a/lotuswordpro/source/filter/lwpfont.cxx 
b/lotuswordpro/source/filter/lwpfont.cxx
index

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

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 735cd3407856e0a6572eb6bbd402187dda2cdff4
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 15:18:47 2014 +0200

CppunitTest_sw_ooxmlexport: port testTextFrameBorders to textboxes

Change-Id: I4d7a6a13a721282450a1c217defb84f386535a74

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 082310f..13790cc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -537,8 +537,8 @@ DECLARE_OOXMLEXPORT_TEST(testTextFrameBorders, 
textframe-borders.docx)
 
 DECLARE_OOXMLEXPORT_TEST(testTextframeGradient, textframe-gradient.docx)
 {
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
 
 uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
commit 020035a0e0f8a36c298bb1c674f61fb9191bc41d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 15:13:40 2014 +0200

CppunitTest_sw_ooxmlexport: port testTextFrames to textboxes

Change-Id: Id52ab22e2981ebda3960acabe473fadfafc67e72

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 596c292..082310f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -513,8 +513,8 @@ DECLARE_OOXMLEXPORT_TEST(test1Table1Page, 
1-table-1-page.docx)
 DECLARE_OOXMLEXPORT_TEST(testTextFrames, textframes.odt)
 {
 // The frames were simply missing, so let's check if all 3 frames were 
imported back.
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xIndexAccess-getCount());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp RepositoryExternal.mk sccomp/source

 RepositoryExternal.mk |1 +
 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/werror-undef.patch.0  |   11 +++
 sccomp/source/solver/CoinMPSolver.cxx |   11 ++-
 4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 67b4b34cce4abf745b24c858d533a25c291b5093
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 14:32:09 2014 +0100

coverity#1202902 Uncaught CoinError exception

Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 640452d..443ea6f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2217,6 +2217,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 endif
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/src \
+   -I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinUtils/src \
$$(INCLUDE) \
 )
 
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 831f65f..d2d9f0c 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
+   external/coinmp/werror-undef.patch.0 \
external/coinmp/windows.build.patch.1 \
 ))
 
diff --git a/external/coinmp/werror-undef.patch.0 
b/external/coinmp/werror-undef.patch.0
new file mode 100644
index 000..a9b80f2
--- /dev/null
+++ b/external/coinmp/werror-undef.patch.0
@@ -0,0 +1,11 @@
+--- CoinUtils/src/config_coinutils_default.h   2014-06-06 14:28:06.872113540 
+0100
 CoinUtils/src/config_coinutils_default.h   2014-06-06 14:28:29.400294129 
+0100
+@@ -26,7 +26,7 @@
+   all of this inside the guard for MSC_VER = 1200. If you're reading this
+   and have been developing in MSVS long enough to know, fix it.  -- lh, 
100915 --
+ */
+-#if _MSC_VER = 1200
++#if defined _MSC_VER  _MSC_VER = 1200
+ # include BaseTsd.h
+ # define COIN_INT64_T INT64
+ # define COIN_UINT64_T UINT64
diff --git a/sccomp/source/solver/CoinMPSolver.cxx 
b/sccomp/source/solver/CoinMPSolver.cxx
index f1ee10b..7a016b1 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -18,6 +18,7 @@
  */
 
 #include CoinMP.h
+#include CoinError.hpp
 
 #include SolverComponent.hxx
 #include solver.hrc
@@ -313,7 +314,15 @@ void SAL_CALL CoinMPSolver::solve() 
throw(uno::RuntimeException, std::exception)
 // solve model
 
 nResult = CoinCheckProblem( hProb );
-nResult = CoinOptimizeProblem( hProb, 0 );
+
+try
+{
+nResult = CoinOptimizeProblem( hProb, 0 );
+}
+catch (const CoinError e)
+{
+throw std::runtime_error(e.message());
+}
 
 mbSuccess = ( nResult == SOLV_CALL_SUCCESS );
 if ( mbSuccess )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

re: NPAPI-based features in LO

2014-06-06 Thread Bryan Quigley

Hi there,

I pushed that gerrit request..
https://gerrit.libreoffice.org/#/c/9644/.  Most things have already
been mentioned, but...

regarding (2) the problem is that users could have created documents
that contain embedded plug-ins

Which AFAICT is also broken, tried this on Ubuntu 14.04 and WinXP.
Example file: https://issues.apache.org/ooo/attachment.cgi?id=81036

 do browsers nowadays sand-box plug-ins appropriately?  can the LO plug-in 
 even be sand-boxed?
I believe the major ones get sandboxed (or maybe just Flash) and
google's move to PPAPI allows for better sandboxing.  I don't believe
either are relevant for LibreOffice though.  As mentioned earlier,
plugins in general are on the way out.

I don't think it makes sense to invest in NPAPI while the browser
vendors are trying to kill it themselves.

Just to clarify my commit message in regards to the needed
GUI/ActiveX changes.  We still have an ActiveX browser (or more?)
plugin that I also haven't been able to get to work.  I was going to
wait on removing the plugin hooks from the GUI until we decide if we
want to drop that too.  Seems consistent to remove them all at the
same time... (any Win devs interested in doing that?)

Thanks!
Bryan

P.S. At one point could you load a webpage with an embedded
LibreOffice doc in it, that has an embedded Flash swf in it?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-06-06 Thread bugzilla-daemon

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

--- Comment #153 from Francisco franciscoadriansanc...@gmail.com ---
Nominate bug 61805

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

[Libreoffice-commits] core.git: Branch 'feature/template_manager_improvements' - sfx2/source

2014-06-06 Thread Efe Gürkan YALAMAN

 sfx2/source/dialog/backingwindow.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit f14c4f76c29500d9340ae9b7ffbb31a03ea40cf8
Author: Efe GÃ¼rkan YALAMAN efeyala...@gmail.com
Date:   Fri Jun 6 17:30:13 2014 +0300

selection function moved

The localview is not causing crash now.

Change-Id: Iea2fe607555d2d3c955f8f198240a2b2d1e26788

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 3ed3420..b170b60 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -73,12 +73,28 @@ const int nButtonsFontSize = 15;
 const Color aButtonsBackground(114, 168, 84); // TDF green
 const Color aButtonsText(COL_WHITE);
 
+/***
+ *
+ * Order items in ascending order (useful for the selection sets and move/copy 
operations since the associated ids
+ * change when processed by the SfxDocumentTemplates class so we want to 
process to ones with higher id first)
+ *
+ ***/
+
+static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const 
ThumbnailViewItem *pItem2)
+{
+return pItem1-mnId  pItem2-mnId;
+}
+
+
 BackingWindow::BackingWindow( Window* i_pParent ) :
 Window( i_pParent ),
 mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ),
 mbInitControls( false ),
 mnHideExternalLinks( 0 ),
-mpAccExec( NULL )
+mpAccExec( NULL ),
+maSelTemplates(cmpSelectionItems),
+maSelFolders(cmpSelectionItems)
+
 {
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), 
sfx/ui/startcenter.ui, StartCenter );
 
___
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-06-06 Thread bugzilla-daemon

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

--- Comment #154 from Francisco franciscoadriansanc...@gmail.com ---
Nominate also bug 73984, which is a similar yet different bug.

-- 
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' - 7d/cef20c6ec732ad36a88d89a4cc1a7606939d9d

2014-06-06 Thread Michael Stahl

 7d/cef20c6ec732ad36a88d89a4cc1a7606939d9d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fc029f9617ef03a07093c1480c60bdc445c87a22
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jun 6 16:34:11 2014 +0200

Notes added by 'git notes add'

diff --git a/7d/cef20c6ec732ad36a88d89a4cc1a7606939d9d 
b/7d/cef20c6ec732ad36a88d89a4cc1a7606939d9d
new file mode 100644
index 000..cb9a4af
--- /dev/null
+++ b/7d/cef20c6ec732ad36a88d89a4cc1a7606939d9d
@@ -0,0 +1 @@
+prefer: 2d9d20edc999ef2c2ad2ee628a6a5f27efb801d8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configure.ac |   19 +++
 1 file changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 9b57a0aeb841506cff387eece9015505086e353c
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 17:39:04 2014 +0300

PackageMaker does not exist any more

Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401

diff --git a/configure.ac b/configure.ac
index 7dab4cc..7995588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1461,7 +1461,7 @@ AC_ARG_WITH(package-format,
 [Specify package format(s) for LibreOffice installation sets. The
  implicit --without-package-format leads to no installation sets being
  generated. Possible values: aix, archive, bsd, deb, dmg,
- installed, msi, native, osx, pkg, portable, and rpm.
+ installed, msi, native, pkg, portable, and rpm.
  Example: --with-package-format='deb rpm']),
 ,)
 
@@ -4526,14 +4526,13 @@ AC_MSG_CHECKING([which package format to use])
 if test -n $with_package_format -a $with_package_format != no; then
 for i in $with_package_format; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg 
| installed | msi)
+aix | bsd | deb | pkg | rpm | native | portable | archive | dmg | 
installed | msi)
 ;;
 *)
 AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 deb - Debian software distribution
-osx - MacOS X software distribution
 pkg - Solaris software distribution
 rpm - RedHat software distribution
 native - Native software distribution for the platform
@@ -7343,18 +7342,6 @@ if test $enable_epm = yes; then
 AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
 fi
 fi
-if echo $PKGFORMAT | $EGREP osx 21 /dev/null; then
-if test $_os = Darwin; then
-AC_MSG_CHECKING([for PackageMaker availability])
-if ! test -x 
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; 
then
-AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
-else
-AC_MSG_RESULT([ok])
-fi
-else
-AC_MSG_ERROR([PackageMaker needed to build OSX packages and you 
are not on OSX...])
-fi
-fi
 if echo $PKGFORMAT | $EGREP rpm 21 /dev/null || \
echo $PKGFORMAT | $EGREP pkg 21 /dev/null; then
 if test $with_epm = no -a $_os != Darwin; then
@@ -7393,7 +7380,7 @@ if test $enable_epm = yes; then
 else
 for i in $PKGFORMAT; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | native | portable)
+aix | bsd | deb | pkg | rpm | native | portable)
 AC_MSG_ERROR(
 [--with-package-format='$PKGFORMAT' requires --enable-epm])
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/oox/drawingml/graphicshapecontext.hxx |2 +
 include/oox/ppt/pptshapegroupcontext.hxx  |3 --
 oox/source/drawingml/graphicshapecontext.cxx  |   14 +--
 oox/source/ppt/pptshapegroupcontext.cxx   |7 -
 sd/qa/unit/data/pptx/bnc880763.pptx   |binary
 sd/qa/unit/data/xml/n819614_0.xml |   16 ++---
 sd/qa/unit/import-tests.cxx   |   32 +++---
 7 files changed, 52 insertions(+), 22 deletions(-)

New commits:
commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 15:57:43 2014 +0200

bnc#880763: PPTX import: wrong z-order becuause of wrong import order

importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.

Plus fix up import tests.

Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae

diff --git a/include/oox/drawingml/graphicshapecontext.hxx 
b/include/oox/drawingml/graphicshapecontext.hxx
index 72881fe..fe4b216 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -44,9 +44,11 @@ public:
 GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper rParent, 
ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart );
 
 virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 
Element, const ::oox::AttributeList rAttribs ) SAL_OVERRIDE;
+virtual void onEndElement() SAL_OVERRIDE;
 
 private:
 boolmbEmbedShapesInChart;
+::oox::core::ContextHandler2Helper* mpParent;
 };
 
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index 847d9b6..5cae54d 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -32,7 +32,6 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
 
-voidimportExtDrawings();
 voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
@@ -46,7 +45,7 @@ public:
 virtual ::oox::core::ContextHandlerRef
 onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList 
rAttribs ) SAL_OVERRIDE;
 
-virtual void onEndElement() SAL_OVERRIDE;
+void importExtDrawings();
 
 protected:
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index ebd2028..db04d5c 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -36,6 +36,7 @@
 #include oox/drawingml/transform2dcontext.hxx
 #include oox/helper/binaryinputstream.hxx
 #include oox/helper/binaryoutputstream.hxx
+#include oox/ppt/pptshapegroupcontext.hxx
 #include comphelper/processfactory.hxx
 
 using namespace ::com::sun::star;
@@ -103,7 +104,8 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32 aElementToken,
 
 GraphicalObjectFrameContext::GraphicalObjectFrameContext( 
ContextHandler2Helper rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, 
bool bEmbedShapesInChart ) :
 ShapeContext( rParent, pMasterShapePtr, pShapePtr ),
-mbEmbedShapesInChart( bEmbedShapesInChart )
+mbEmbedShapesInChart( bEmbedShapesInChart ),
+mpParent(rParent)
 {
 }
 
@@ -146,7 +148,15 @@ ContextHandlerRef 
GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
 return ShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-
+void GraphicalObjectFrameContext::onEndElement()
+{
+if( getCurrentElement() == PPT_TOKEN( graphicFrame )  mpParent )
+{
+oox::ppt::PPTShapeGroupContext* pParent = 
dynamic_castoox::ppt::PPTShapeGroupContext*(mpParent);
+if( pParent )
+pParent-importExtDrawings();
+}
+}
 
 OleObjectGraphicDataContext::OleObjectGraphicDataContext( 
ContextHandler2Helper rParent, ShapePtr xShape ) :
 ShapeContext( rParent, ShapePtr(), xShape ),
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0fd517f..9bf3d2b 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -109,8 +109,6 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( 
sal_Int32 aElementToken
 return new PPTGraphicShapeContext( *this, mpSlidePersistPtr, 
mpGroupShapePtr,  oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, 
com.sun.star.drawing.GraphicObjectShape ) ) );
 case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
 {
-if( pGraphicShape )
-importExtDrawings();
 pGraphicShape = oox::drawingml::ShapePtr( new PPTShape( 
meShapeLocation,

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

 sw/inc/ToxTabStopTokenHandler.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81ec888f2503ce29a26d32248b70aded0301d987
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 16:56:25 2014 +0200

-Werror,-Wmismatched-tags

Change-Id: Iac83316d69e85f2da3de32d8023c228f678c8f08

diff --git a/sw/inc/ToxTabStopTokenHandler.hxx 
b/sw/inc/ToxTabStopTokenHandler.hxx
index 696a4cb..8830de9 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -16,7 +16,7 @@
 
 #include editeng/tstpitem.hxx
 
-class SwFormToken;
+struct SwFormToken;
 class SwPageDesc;
 class SwRootFrm;
 class SwTxtNode;
___
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' - 3 commits - configure.ac

 configure.ac |   23 ---
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit d65532e92e209d486cffe260adc849ae96683e6a
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 17:39:04 2014 +0300

PackageMaker does not exist any more

Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401

diff --git a/configure.ac b/configure.ac
index 899dc91..e1b1ea6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1419,7 +1419,7 @@ AC_ARG_WITH(package-format,
 [Specify package format(s) for LibreOffice installation sets. The
  implicit --without-package-format leads to no installation sets being
  generated. Possible values: aix, archive, bsd, deb, dmg,
- installed, msi, native, osx, pkg, portable, and rpm.
+ installed, msi, native, pkg, portable, and rpm.
  Example: --with-package-format='deb rpm']),
 ,)
 
@@ -4402,14 +4402,13 @@ AC_MSG_CHECKING([which package format to use])
 if test -n $with_package_format -a $with_package_format != no; then
 for i in $with_package_format; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg 
| installed | msi)
+aix | bsd | deb | pkg | rpm | native | portable | archive | dmg | 
installed | msi)
 ;;
 *)
 AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 deb - Debian software distribution
-osx - MacOS X software distribution
 pkg - Solaris software distribution
 rpm - RedHat software distribution
 native - Native software distribution for the platform
@@ -7376,18 +7375,6 @@ if test $enable_epm = yes; then
 AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
 fi
 fi
-if echo $PKGFORMAT | $EGREP osx 21 /dev/null; then
-if test $_os = Darwin; then
-AC_MSG_CHECKING([for PackageMaker availability])
-if ! test -x 
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; 
then
-AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
-else
-AC_MSG_RESULT([ok])
-fi
-else
-AC_MSG_ERROR([PackageMaker needed to build OSX packages and you 
are not on OSX...])
-fi
-fi
 if echo $PKGFORMAT | $EGREP rpm 21 /dev/null || \
echo $PKGFORMAT | $EGREP pkg 21 /dev/null; then
 if test $with_epm = no -a $_os != Darwin; then
@@ -7426,7 +7413,7 @@ if test $enable_epm = yes; then
 else
 for i in $PKGFORMAT; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | native | portable)
+aix | bsd | deb | pkg | rpm | native | portable)
 AC_MSG_ERROR(
 [--with-package-format='$PKGFORMAT' requires --enable-epm])
 ;;
commit 7bafca39603f7af4c364b7ec780b7b513ae9caf9
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Feb 20 11:18:56 2014 +0200

Don't bother mentioning the Tru64 'setld' package format

Change-Id: I2a9707c70637fe5bae5d16fd45e9603318d5d82f

diff --git a/configure.ac b/configure.ac
index d5f2ff0..899dc91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1419,7 +1419,7 @@ AC_ARG_WITH(package-format,
 [Specify package format(s) for LibreOffice installation sets. The
  implicit --without-package-format leads to no installation sets being
  generated. Possible values: aix, archive, bsd, deb, dmg,
- installed, msi, native, osx, pkg, portable, rpm, and setld.
+ installed, msi, native, osx, pkg, portable, and rpm.
  Example: --with-package-format='deb rpm']),
 ,)
 
@@ -4402,7 +4402,7 @@ AC_MSG_CHECKING([which package format to use])
 if test -n $with_package_format -a $with_package_format != no; then
 for i in $with_package_format; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | setld | native | portable | 
archive | dmg | installed | msi)
+aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg 
| installed | msi)
 ;;
 *)
 AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
@@ -4412,7 +4412,6 @@ deb - Debian software distribution
 osx - MacOS X software distribution
 pkg - Solaris software distribution
 rpm - RedHat software distribution
-setld - Tru64 (setld) software distribution
 native - Native software distribution for the platform
 portable - Portable software distribution
 
@@ -7427,7 +7426,7 @@ if test $enable_epm = yes; then
 else
 for i in $PKGFORMAT; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | setld | native | portable)
+aix | bsd | deb | osx | pkg | rpm | native | portable)
 AC_MSG_ERROR(
 [--with-package-format='$PKGFORMAT' requires --enable-epm])
 ;;
commit 371355406ad14145dbea3b0670db3706e9977b02
Author: Tor Lillqvist

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

 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b6bfcaa054dd760bf49e47a3f5bcb36ab7fc0588
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 6 16:58:22 2014 +0200

loplugin:saloverride

Change-Id: I5ee17a1e5ea28e6ecf371bea30b36923586f41cc

diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index f3732ab..c37c24b 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -107,7 +107,7 @@ class MockedToxTabStopTokenHandler : public 
ToxTabStopTokenHandler {
 public:
 virtual HandledTabStopToken
 HandleTabStopToken(const SwFormToken aToken, const SwTxtNode targetNode,
-const SwRootFrm *currentLayout) const {
+const SwRootFrm *currentLayout) const SAL_OVERRIDE {
 (void)(aToken); (void)(targetNode); (void)(currentLayout); // avoid 
unused warnings.
 return HandledTabStopToken();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 oox/source/shape/WpsContext.cxx  |8 +---
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   22 +-
 2 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 28e9b5bc01ee25d8f456cf7acb1d618a5c0a8db8
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 16:32:01 2014 +0200

oox: support non-TextFrame shapes in WpsContext::onCreateContext

Change-Id: I692fa22132cd3a722b58de22e3dbb759ff888e5d

diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index ed2b1de..90628b2 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -75,8 +75,9 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 
 uno::Referencelang::XServiceInfo xServiceInfo(mxShape, 
uno::UNO_QUERY);
 uno::Referencebeans::XPropertySet xPropertySet(mxShape, 
uno::UNO_QUERY);
-if (xServiceInfo.is()  
xServiceInfo-supportsService(com.sun.star.text.TextFrame))
+if (xServiceInfo.is())
 {
+bool bTextFrame = 
xServiceInfo-supportsService(com.sun.star.text.TextFrame);
 // Handle inset attributes for Writer textframes.
 sal_Int32 aInsets[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns 
};
 boost::optionalsal_Int32 oInsets[4];
@@ -87,9 +88,10 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 oInsets[i] = 
oox::drawingml::GetCoordinate(oValue.get());
 }
 OUString aProps[] = { OUString(LeftBorderDistance), 
OUString(TopBorderDistance), OUString(RightBorderDistance), 
OUString(BottomBorderDistance) };
-for (size_t i = 0; i  SAL_N_ELEMENTS(aProps); ++i)
+OUString aShapeProps[] = { OUString(TextLeftDistance), 
OUString(TextUpperDistance), OUString(TextRightDistance), 
OUString(TextLowerDistance) };
+for (size_t i = 0; i  SAL_N_ELEMENTS(bTextFrame ? aProps : 
aShapeProps); ++i)
 if (oInsets[i])
-xPropertySet-setPropertyValue(aProps[i], 
uno::makeAny(*oInsets[i]));
+xPropertySet-setPropertyValue((bTextFrame ? aProps : 
aShapeProps)[i], uno::makeAny(*oInsets[i]));
 }
 
 // Handle text vertical adjustment inside a text frame
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 13790cc..c4de6d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -605,11 +605,23 @@ DECLARE_OOXMLEXPORT_TEST(testFdo48557, fdo48557.odt)
 // Inner margins of the textframe wasn't exported.
 uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
LeftBorderDistance));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
RightBorderDistance));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
TopBorderDistance));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
BottomBorderDistance));
+if (xIndexAccess-getCount()  0)
+{
+// TODO TextBox: remove this when TextBox is enabled by default
+uno::Referencebeans::XPropertySet 
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
LeftBorderDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
RightBorderDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
TopBorderDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
BottomBorderDistance));
+}
+else
+{
+uno::Referencebeans::XPropertySet xFrame(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
TextLeftDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
TextRightDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
TextUpperDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, 
TextLowerDistance));
+}
 }
 
 DECLARE_OOXMLEXPORT_TEST(testI120928, i120928.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c4ac853409afcb451bed0d044d36131a08e8e403
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Jun 6 11:23:02 2014 -0400

fdo#78860: Swap the logic here: Disable - Enable.

Because the UNO property logic had been swapped earlier.

Change-Id: I35af3e8cee3c4cbc8da43d7bc478f506048887b0

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index fe3fbb3..7f4f4c1 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -525,7 +525,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
 bool bShapeContext = m_pChartController  
m_pChartController-isShapeContext();
 
-bool bDisableDataTableDialog = false;
+bool bEnableDataTableDialog = false;
 if ( m_xController.is() )
 {
 Reference beans::XPropertySet  xProps( m_xController-getModel(), 
uno::UNO_QUERY );
@@ -533,7 +533,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 {
 try
 {
-xProps-getPropertyValue(  EnableDataTableDialog ) = 
bDisableDataTableDialog;
+xProps-getPropertyValue(EnableDataTableDialog) = 
bEnableDataTableDialog;
 }
 catch( const uno::Exception e )
 {
@@ -613,7 +613,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
 // depending on own data
 m_aCommandAvailability[ .uno:DataRanges ] = bIsWritable  
bModelStateIsValid  (! m_apModelState-bHasOwnData);
-m_aCommandAvailability[ .uno:DiagramData ] = bIsWritable  
bModelStateIsValid   m_apModelState-bHasOwnData  !bDisableDataTableDialog;
+m_aCommandAvailability[ .uno:DiagramData ] = bIsWritable  
bModelStateIsValid   m_apModelState-bHasOwnData  bEnableDataTableDialog;
 
 // titles
 m_aCommandAvailability[ .uno:MainTitle ] = bIsWritable  
bModelStateIsValid  m_apModelState-bHasMainTitle;
@@ -649,9 +649,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
 // series arrangement
 m_aCommandAvailability[ .uno:Forward ] = ( bShapeContext ? 
isShapeControllerCommandAvailable( .uno:Forward ) :
-( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesForward  !bDisableDataTableDialog ) );
+( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesForward  bEnableDataTableDialog ) );
 m_aCommandAvailability[ .uno:Backward ] = ( bShapeContext ? 
isShapeControllerCommandAvailable( .uno:Backward ) :
-( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesBackward  !bDisableDataTableDialog ) );
+( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesBackward  bEnableDataTableDialog ) );
 
 m_aCommandAvailability[ .uno:InsertDataLabels ] = bIsWritable;
 m_aCommandAvailability[ .uno:InsertDataLabel ] = bIsWritable;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3b61e6ceca567ea94a0ec35e49f49addd216358b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Jun 6 11:23:02 2014 -0400

fdo#78860: Swap the logic here: Disable - Enable.

Because the UNO property logic had been swapped earlier.

Change-Id: I35af3e8cee3c4cbc8da43d7bc478f506048887b0
(cherry picked from commit c4ac853409afcb451bed0d044d36131a08e8e403)

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index fe3fbb3..7f4f4c1 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -525,7 +525,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
 bool bShapeContext = m_pChartController  
m_pChartController-isShapeContext();
 
-bool bDisableDataTableDialog = false;
+bool bEnableDataTableDialog = false;
 if ( m_xController.is() )
 {
 Reference beans::XPropertySet  xProps( m_xController-getModel(), 
uno::UNO_QUERY );
@@ -533,7 +533,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 {
 try
 {
-xProps-getPropertyValue(  EnableDataTableDialog ) = 
bDisableDataTableDialog;
+xProps-getPropertyValue(EnableDataTableDialog) = 
bEnableDataTableDialog;
 }
 catch( const uno::Exception e )
 {
@@ -613,7 +613,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
 // depending on own data
 m_aCommandAvailability[ .uno:DataRanges ] = bIsWritable  
bModelStateIsValid  (! m_apModelState-bHasOwnData);
-m_aCommandAvailability[ .uno:DiagramData ] = bIsWritable  
bModelStateIsValid   m_apModelState-bHasOwnData  !bDisableDataTableDialog;
+m_aCommandAvailability[ .uno:DiagramData ] = bIsWritable  
bModelStateIsValid   m_apModelState-bHasOwnData  bEnableDataTableDialog;
 
 // titles
 m_aCommandAvailability[ .uno:MainTitle ] = bIsWritable  
bModelStateIsValid  m_apModelState-bHasMainTitle;
@@ -649,9 +649,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
 // series arrangement
 m_aCommandAvailability[ .uno:Forward ] = ( bShapeContext ? 
isShapeControllerCommandAvailable( .uno:Forward ) :
-( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesForward  !bDisableDataTableDialog ) );
+( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesForward  bEnableDataTableDialog ) );
 m_aCommandAvailability[ .uno:Backward ] = ( bShapeContext ? 
isShapeControllerCommandAvailable( .uno:Backward ) :
-( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesBackward  !bDisableDataTableDialog ) );
+( bIsWritable  bControllerStateIsValid  
m_apControllerState-bMayMoveSeriesBackward  bEnableDataTableDialog ) );
 
 m_aCommandAvailability[ .uno:InsertDataLabels ] = bIsWritable;
 m_aCommandAvailability[ .uno:InsertDataLabel ] = bIsWritable;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 016e1f888946b829563efd1e771d88b23c1730bf
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 17:23:55 2014 +0200

CppunitTest_sw_ooxmlexport: port testFdo66688 to textboxes

Change-Id: Iada46e037844b010959b153b5e895fd2be021d68

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c4de6d1..f094099 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -843,10 +843,8 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66688, fdo66688.docx)
 {
 // The problem was that TextFrame imported and exported the wrong value 
for transparency
 // (was stored as 'FillTransparence' instead of 'BackColorTransparency'
-uno::Referencetext::XTextFramesSupplier xFramesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess 
xIndexAccess(xFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 80 ), getProperty sal_Int32 ( xFrame, 
BackColorTransparency ) );
+uno::Referencebeans::XPropertySet xFrame(getShape(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 80 ), getProperty sal_Int32 ( xFrame, 
FillTransparence ) );
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo66773, fdo66773.docx)
___
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' - b1/27235917610b9c68e19df29bb39af496906569

 b1/27235917610b9c68e19df29bb39af496906569 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0262cae50fca43208a3f7fa4f4fbea828f8671cf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 16:40:55 2014 +0100

Notes added by 'git notes add'

diff --git a/b1/27235917610b9c68e19df29bb39af496906569 
b/b1/27235917610b9c68e19df29bb39af496906569
new file mode 100644
index 000..6e5a47a
--- /dev/null
+++ b/b1/27235917610b9c68e19df29bb39af496906569
@@ -0,0 +1 @@
+merged as: adb1bb21f804c62004f31ad5473d4cf447436b9b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-06 Thread Oliver-Rainer Wittmann

 vcl/win/source/gdi/salbmp.cxx |   38 +++---
 1 file changed, 23 insertions(+), 15 deletions(-)

New commits:
commit adb1bb21f804c62004f31ad5473d4cf447436b9b
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Jun 6 12:07:49 2014 +

Resolves: #i125000# check last status of newly created...

Gdiplus::Bitmap instance before using it.

(cherry picked from commit b127235917610b9c68e19df29bb39af496906569)

Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067

diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 30606d8..445839e 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -317,24 +317,32 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
 
 if(pRetval)
 {
-sal_uInt8* pSrcRGB(pRGB-mpBits);
-const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
-const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
-const Gdiplus::Rect aAllRect(0, 0, nW, nH);
-Gdiplus::BitmapData aGdiPlusBitmapData;
-pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
-
-// copy data to Gdiplus::Bitmap; format is BGR here in both cases, 
so memcpy is possible
-for(sal_uInt32 y(0); y  nH; y++)
+if ( pRetval-GetLastStatus() == Gdiplus::Ok )
 {
-const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
-sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 
+ (nYInsert * aGdiPlusBitmapData.Stride);
+sal_uInt8* pSrcRGB(pRGB-mpBits);
+const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
+const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
+const Gdiplus::Rect aAllRect(0, 0, nW, nH);
+Gdiplus::BitmapData aGdiPlusBitmapData;
+pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
+
+// copy data to Gdiplus::Bitmap; format is BGR here in both 
cases, so memcpy is possible
+for(sal_uInt32 y(0); y  nH; y++)
+{
+const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
+sal_uInt8* targetPixels = 
(sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride);
 
-memcpy(targetPixels, pSrcRGB, nW * 3);
-pSrcRGB += nW * 3 + nExtraRGB;
-}
+memcpy(targetPixels, pSrcRGB, nW * 3);
+pSrcRGB += nW * 3 + nExtraRGB;
+}
 
-pRetval-UnlockBits(aGdiPlusBitmapData);
+pRetval-UnlockBits(aGdiPlusBitmapData);
+}
+else
+{
+delete pRetval;
+pRetval = NULL;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-06 Thread Oliver-Rainer Wittmann

 vcl/win/source/gdi/salbmp.cxx |   38 +++---
 1 file changed, 23 insertions(+), 15 deletions(-)

New commits:
commit e0c9b690074cd476b03169397cbf1969f2239c1e
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Jun 6 12:07:49 2014 +

Resolves: #i125000# check last status of newly created...

Gdiplus::Bitmap instance before using it.

(cherry picked from commit b127235917610b9c68e19df29bb39af496906569)

Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067
(cherry picked from commit adb1bb21f804c62004f31ad5473d4cf447436b9b)

diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 30606d8..445839e 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -317,24 +317,32 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
 
 if(pRetval)
 {
-sal_uInt8* pSrcRGB(pRGB-mpBits);
-const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
-const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
-const Gdiplus::Rect aAllRect(0, 0, nW, nH);
-Gdiplus::BitmapData aGdiPlusBitmapData;
-pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
-
-// copy data to Gdiplus::Bitmap; format is BGR here in both cases, 
so memcpy is possible
-for(sal_uInt32 y(0); y  nH; y++)
+if ( pRetval-GetLastStatus() == Gdiplus::Ok )
 {
-const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
-sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 
+ (nYInsert * aGdiPlusBitmapData.Stride);
+sal_uInt8* pSrcRGB(pRGB-mpBits);
+const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
+const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
+const Gdiplus::Rect aAllRect(0, 0, nW, nH);
+Gdiplus::BitmapData aGdiPlusBitmapData;
+pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
+
+// copy data to Gdiplus::Bitmap; format is BGR here in both 
cases, so memcpy is possible
+for(sal_uInt32 y(0); y  nH; y++)
+{
+const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
+sal_uInt8* targetPixels = 
(sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride);
 
-memcpy(targetPixels, pSrcRGB, nW * 3);
-pSrcRGB += nW * 3 + nExtraRGB;
-}
+memcpy(targetPixels, pSrcRGB, nW * 3);
+pSrcRGB += nW * 3 + nExtraRGB;
+}
 
-pRetval-UnlockBits(aGdiPlusBitmapData);
+pRetval-UnlockBits(aGdiPlusBitmapData);
+}
+else
+{
+delete pRetval;
+pRetval = NULL;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-06 Thread Noel Grandin

 include/svl/lstner.hxx   |4 ++--
 svl/source/notify/lstner.cxx |   20 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit a10a621b48a30904b970ce01cc0bf2aa15cea9cb
Author: Noel Grandin n...@peralex.com
Date:   Thu May 29 07:54:23 2014 +0200

simplify SfxListener::EndListening and StartListening

No-one is using the return values, so we can simplify the methods

Change-Id: Icc2dbfb797bcd82afcbf42ed3bdc20b0426ccba1
Reviewed-on: https://gerrit.libreoffice.org/9542
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index 9cc7533..8bf93b9 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -47,8 +47,8 @@ public:
 SfxListener( const SfxListener rCopy );
 virtual ~SfxListener();
 
-boolStartListening( SfxBroadcaster rBroadcaster, bool 
bPreventDups = false );
-boolEndListening( SfxBroadcaster rBroadcaster, bool 
bAllDups = false );
+voidStartListening( SfxBroadcaster rBroadcaster, bool 
bPreventDups = false );
+voidEndListening( SfxBroadcaster rBroadcaster, bool 
bAllDups = false );
 voidEndListeningAll();
 boolIsListening( SfxBroadcaster rBroadcaster ) const;
 
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 606b9a6..331f600 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -65,7 +65,7 @@ void SfxListener::RemoveBroadcaster_Impl( SfxBroadcaster 
rBroadcaster )
 
 // registers a specific SfxBroadcaster
 
-bool SfxListener::StartListening( SfxBroadcaster rBroadcaster, bool 
bPreventDups )
+void SfxListener::StartListening( SfxBroadcaster rBroadcaster, bool 
bPreventDups )
 {
 if ( !bPreventDups || !IsListening( rBroadcaster ) )
 {
@@ -73,27 +73,25 @@ bool SfxListener::StartListening( SfxBroadcaster 
rBroadcaster, bool bPreventDup
 aBCs.push_back( rBroadcaster );
 
 DBG_ASSERT( IsListening(rBroadcaster), StartListening failed );
-return true;
 }
-
-return false;
 }
 
 
 // unregisters a specific SfxBroadcaster
 
-bool SfxListener::EndListening( SfxBroadcaster rBroadcaster, bool bAllDups )
+void SfxListener::EndListening( SfxBroadcaster rBroadcaster, bool bAllDups )
 {
-if ( !IsListening( rBroadcaster ) )
-return false;
-
 do
 {
+SfxBroadcasterArr_Impl::iterator it = std::find( aBCs.begin(), 
aBCs.end(), rBroadcaster );
+if ( it == aBCs.end() )
+{
+break;
+}
 rBroadcaster.RemoveListener(*this);
-aBCs.erase( std::find( aBCs.begin(), aBCs.end(), rBroadcaster ) );
+aBCs.erase( it );
 }
-while ( bAllDups  IsListening( rBroadcaster ) );
-return true;
+while ( bAllDups );
 }
 
 
___
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' - include/oox oox/source sd/qa

 include/oox/drawingml/graphicshapecontext.hxx |2 +
 include/oox/ppt/pptshapegroupcontext.hxx  |3 --
 oox/source/drawingml/graphicshapecontext.cxx  |   14 +++--
 oox/source/ppt/pptshapegroupcontext.cxx   |7 --
 sd/qa/unit/data/pptx/bnc880763.pptx   |binary
 sd/qa/unit/data/xml/n819614_0.xml |   18 
 sd/qa/unit/import-tests.cxx   |   28 +-
 7 files changed, 51 insertions(+), 21 deletions(-)

New commits:
commit 5b6d26becca7f7a03bbc615265c5426deb28244f
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 17:53:38 2014 +0200

bnc#880763: PPTX import: wrong z-order becuause of wrong import order

importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.

Plus fix up import tests.

(cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48)

Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae

diff --git a/include/oox/drawingml/graphicshapecontext.hxx 
b/include/oox/drawingml/graphicshapecontext.hxx
index 322f08e..a228f86 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -44,9 +44,11 @@ public:
 GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper rParent, 
ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart );
 
 virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 
Element, const ::oox::AttributeList rAttribs ) SAL_OVERRIDE;
+virtual void onEndElement() SAL_OVERRIDE;
 
 private:
 boolmbEmbedShapesInChart;
+::oox::core::ContextHandler2Helper* mpParent;
 };
 
 // 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index 847d9b6..5cae54d 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -32,7 +32,6 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
 
-voidimportExtDrawings();
 voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
@@ -46,7 +45,7 @@ public:
 virtual ::oox::core::ContextHandlerRef
 onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList 
rAttribs ) SAL_OVERRIDE;
 
-virtual void onEndElement() SAL_OVERRIDE;
+void importExtDrawings();
 
 protected:
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index e0818ac..cd4e75d 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -36,6 +36,7 @@
 #include oox/drawingml/transform2dcontext.hxx
 #include oox/helper/binaryinputstream.hxx
 #include oox/helper/binaryoutputstream.hxx
+#include oox/ppt/pptshapegroupcontext.hxx
 #include comphelper/processfactory.hxx
 
 using namespace ::com::sun::star;
@@ -103,7 +104,8 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32 aElementToken,
 
 GraphicalObjectFrameContext::GraphicalObjectFrameContext( 
ContextHandler2Helper rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, 
bool bEmbedShapesInChart ) :
 ShapeContext( rParent, pMasterShapePtr, pShapePtr ),
-mbEmbedShapesInChart( bEmbedShapesInChart )
+mbEmbedShapesInChart( bEmbedShapesInChart ),
+mpParent(rParent)
 {
 }
 
@@ -146,7 +148,15 @@ ContextHandlerRef 
GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
 return ShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-// 
+void GraphicalObjectFrameContext::onEndElement()
+{
+if( getCurrentElement() == PPT_TOKEN( graphicFrame )  mpParent )
+{
+oox::ppt::PPTShapeGroupContext* pParent = 
dynamic_castoox::ppt::PPTShapeGroupContext*(mpParent);
+if( pParent )
+pParent-importExtDrawings();
+}
+}
 
 OleObjectGraphicDataContext::OleObjectGraphicDataContext( 
ContextHandler2Helper rParent, ShapePtr xShape ) :
 ShapeContext( rParent, ShapePtr(), xShape ),
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0fd517f..9bf3d2b 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -109,8 +109,6 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( 
sal_Int32 aElementToken
 return new PPTGraphicShapeContext( *this, mpSlidePersistPtr, 
mpGroupShapePtr,  oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, 
com.sun.star.drawing.GraphicObjectShape ) ) );
 case PPT_TOKEN(

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

2014-06-06 Thread Michael Stahl

 sw/inc/ndgrf.hxx |8 +++---
 sw/source/core/doc/doc.cxx   |2 -
 sw/source/core/graphic/ndgrf.cxx |   51 +--
 3 files changed, 37 insertions(+), 24 deletions(-)

New commits:
commit 26f76e859761b5fa39196edff454644d7fb36a02
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jun 6 17:37:04 2014 +0200

revert sw part of don't swap in all images when loading files

Half of commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333 is obsoleted
by orw's fix for i#124999; not sure about the other half.

Change-Id: I337a4bbf79912c02be7c7c56c5705253b3d7b125

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index ed025f5..329df90 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -345,9 +345,6 @@ SwGrfNode::~SwGrfNode()
 /// allow reaction on change of content of GraphicObject
 void SwGrfNode::onGraphicChanged()
 {
-if (GetGrfObj().IsSwappedOut()) // don't force swap-in for this
-return;
-
 // try to access SwFlyFrmFmt; since title/desc/name are set there, there 
is no
 // use to continue if it is not yet set. If not yet set, call 
onGraphicChanged()
 // when it is set.
commit b181a3cdf8fc0206c4c71fa7d29d3a04b0caa46b
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Jun 6 12:14:07 2014 +

i#124999: - call SwGrfNode::onGraphicChanged() only when Graphic

instance has been set, too

- SwGrfNode::onGraphicChanged() - assure that graphic is swapped
  out in case its swap in has been triggered by this method.

(cherry-picked from commit 4dbdc0ce931d7686583a49e68f8df09827357beb)

Change-Id: I3e6aa68d9507095925dec37075abcdf9da58c804

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 4d97b6a..d4cd0fb 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -117,6 +117,10 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
 ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage  
_GetDocSubstorageOrRoot(
 const OUString aStgName ) 
const;
 
+/// allow reaction on change of content of GraphicObject, so always call
+/// when GraphicObject content changes
+void onGraphicChanged();
+
 public:
 virtual ~SwGrfNode();
 const Graphic  GetGrf() const  { return 
maGrfObj.GetGraphic(); }
@@ -132,10 +136,6 @@ public:
 void StartGraphicAnimation(OutputDevice* pOut, const Point rPt, const 
Size rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, sal_uLong 
nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { 
maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, 
pFirstFrameOutDev); }
 void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) 
{ maGrfObj.StopAnimation(pOut, nExtraData); }
 
-/// allow reaction on change of content of GraphicObject, so always call
-/// when GraphicObject content changes
-void onGraphicChanged();
-
 virtual Size GetTwipSize() const SAL_OVERRIDE;
 void SetTwipSize( const Size rSz );
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 01e9478..39a2849 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -578,7 +578,6 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM rRg,
 mpDfltGrfFmtColl );
 SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
 pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-pSwGrfNode-onGraphicChanged();
 return pSwFlyFrmFmt;
 }
 
@@ -594,7 +593,6 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM rRg, const 
GraphicObject rGrfObj,
 rGrfObj, mpDfltGrfFmtColl );
 SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
 pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-pSwGrfNode-onGraphicChanged();
 return pSwFlyFrmFmt;
 }
 
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 00e383d..ed025f5 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -219,7 +219,6 @@ bool SwGrfNode::ReRead(
 SwMsgPoolItem aMsgHint( RES_GRF_REREAD_AND_INCACHE );
 ModifyNotification( aMsgHint, aMsgHint );
 }
-// #i59688# - do not load linked graphic, if it isn't a new 
linked graphic.
 else if ( bNewGrf )
 {
 //TODO refLink-setInputStream(getInputStream());
@@ -284,12 +283,10 @@ bool SwGrfNode::ReRead(
 }
 else
 {
-// reset data of the old graphic so that the correct 
placeholder is
-// shown in case the new link could not be loaded
-Graphic aGrf; aGrf.SetDefaultType();
+Graphic aGrf;
+aGrf.SetDefaultType();

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4d/bdc0ce931d7686583a49e68f8df09827357beb

2014-06-06 Thread Michael Stahl

 4d/bdc0ce931d7686583a49e68f8df09827357beb |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 91375bc99f59492403dd5e711cd5d5cec647b1f2
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jun 6 17:54:19 2014 +0200

Notes added by 'git notes add'

diff --git a/4d/bdc0ce931d7686583a49e68f8df09827357beb 
b/4d/bdc0ce931d7686583a49e68f8df09827357beb
new file mode 100644
index 000..6a2ae26
--- /dev/null
+++ b/4d/bdc0ce931d7686583a49e68f8df09827357beb
@@ -0,0 +1 @@
+merged as: b181a3cdf8fc0206c4c71fa7d29d3a04b0caa46b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/oox/drawingml/graphicshapecontext.hxx |2 +
 include/oox/ppt/pptshapegroupcontext.hxx  |3 --
 oox/source/drawingml/graphicshapecontext.cxx  |   14 +--
 oox/source/ppt/pptshapegroupcontext.cxx   |7 -
 sd/qa/unit/data/pptx/bnc880763.pptx   |binary
 sd/qa/unit/data/xml/n819614_0.xml |   16 ++---
 sd/qa/unit/import-tests.cxx   |   32 +++---
 7 files changed, 52 insertions(+), 22 deletions(-)

New commits:
commit 7c7c7dc785750769d661df1dc36201b9f5566ea1
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 15:57:43 2014 +0200

bnc#880763: PPTX import: wrong z-order becuause of wrong import order

importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.

Plus fix up import tests.

Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae
(cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48)

diff --git a/include/oox/drawingml/graphicshapecontext.hxx 
b/include/oox/drawingml/graphicshapecontext.hxx
index 72881fe..fe4b216 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -44,9 +44,11 @@ public:
 GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper rParent, 
ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart );
 
 virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 
Element, const ::oox::AttributeList rAttribs ) SAL_OVERRIDE;
+virtual void onEndElement() SAL_OVERRIDE;
 
 private:
 boolmbEmbedShapesInChart;
+::oox::core::ContextHandler2Helper* mpParent;
 };
 
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index 847d9b6..5cae54d 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -32,7 +32,6 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
 
-voidimportExtDrawings();
 voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
@@ -46,7 +45,7 @@ public:
 virtual ::oox::core::ContextHandlerRef
 onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList 
rAttribs ) SAL_OVERRIDE;
 
-virtual void onEndElement() SAL_OVERRIDE;
+void importExtDrawings();
 
 protected:
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index ebd2028..db04d5c 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -36,6 +36,7 @@
 #include oox/drawingml/transform2dcontext.hxx
 #include oox/helper/binaryinputstream.hxx
 #include oox/helper/binaryoutputstream.hxx
+#include oox/ppt/pptshapegroupcontext.hxx
 #include comphelper/processfactory.hxx
 
 using namespace ::com::sun::star;
@@ -103,7 +104,8 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32 aElementToken,
 
 GraphicalObjectFrameContext::GraphicalObjectFrameContext( 
ContextHandler2Helper rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, 
bool bEmbedShapesInChart ) :
 ShapeContext( rParent, pMasterShapePtr, pShapePtr ),
-mbEmbedShapesInChart( bEmbedShapesInChart )
+mbEmbedShapesInChart( bEmbedShapesInChart ),
+mpParent(rParent)
 {
 }
 
@@ -146,7 +148,15 @@ ContextHandlerRef 
GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
 return ShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-
+void GraphicalObjectFrameContext::onEndElement()
+{
+if( getCurrentElement() == PPT_TOKEN( graphicFrame )  mpParent )
+{
+oox::ppt::PPTShapeGroupContext* pParent = 
dynamic_castoox::ppt::PPTShapeGroupContext*(mpParent);
+if( pParent )
+pParent-importExtDrawings();
+}
+}
 
 OleObjectGraphicDataContext::OleObjectGraphicDataContext( 
ContextHandler2Helper rParent, ShapePtr xShape ) :
 ShapeContext( rParent, ShapePtr(), xShape ),
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0fd517f..9bf3d2b 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -109,8 +109,6 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( 
sal_Int32 aElementToken
 return new PPTGraphicShapeContext( *this, mpSlidePersistPtr, 
mpGroupShapePtr,  oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, 
com.sun.star.drawing.GraphicObjectShape ) ) );
 case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
 {
-if( pGraphicShape )
-importExtDrawings();
 pGraphicShape =

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

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ab695374e92bdca1301543cdb105a6f3a3c446b
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 6 17:48:25 2014 +0200

CppunitTest_sw_ooxmlexport: port testFdo58577 to textboxes

Change-Id: Ic309c7f2a3df46a4813646902a595408f4751fcd

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f094099..27abde4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -865,8 +865,8 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66773, fdo66773.docx)
 DECLARE_OOXMLEXPORT_TEST(testFdo58577, fdo58577.odt)
 {
 // The second frame was simply missing, so let's check if both frames were 
imported back.
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOficce

2014-06-06 Thread Otilio Zea Espinoza

Buen Día me gustaría participar en la comunidad libreoffice, si pudiese
hacerme llegar los requerimientos para poder ser miembro.

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

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

 sd/qa/unit/HtmlExportTest.cxx |5 
 sd/source/filter/html/htmlex.cxx  |   39 --
 sd/source/filter/html/htmlex.hxx  |4 +++
 sfx2/source/bastyp/frmhtmlw.cxx   |2 -
 sw/source/filter/html/htmlatr.cxx |4 +--
 5 files changed, 45 insertions(+), 9 deletions(-)

New commits:
commit b00d84975ebbc254821e8fa64173cf7c7f2c6a01
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 16:00:16 2014 +0200

sd html: Provide some minimal reasonable defaults.

Change-Id: I72b02f7d87cf6075d318c1cc0d7288e27bbe1b9c

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b275206..8768186 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -372,6 +372,8 @@ HtmlExport::HtmlExport(
 mbSlideSound(true),
 mbHiddenSlides(true),
 mbUserAttr(false),
+maTextColor(COL_BLACK),
+maBackColor(COL_WHITE),
 mbDocColors(false),
 maHTMLExtension(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)),
 maIndexUrl(index),
commit 2f5415349138f21cc288758964ecb9e76bbacdee
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 15:46:51 2014 +0200

sd html: Unit test for the metadata export.

Change-Id: I1e38e28b57e816a0829d1a56f2ffcb32d8f93718

diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 388417f..388dfef 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -42,6 +42,11 @@ public:
 assertXPath(htmlDoc, /html/body/table/tr, 5);
 assertXPath(htmlDoc, /html/body/ul, 1);
 assertXPath(htmlDoc, /html/body/ul/li, 2);
+
+assertXPath(htmlDoc, /html/head/meta[1], content, text/html; 
charset=utf-8);
+assertXPath(htmlDoc, /html/head/meta[2], name, generator);
+assertXPath(htmlDoc, /html/head/meta[3], name, created);
+assertXPath(htmlDoc, /html/head/meta[3], content, 
20140409;170541987922038);
 }
 
 CPPUNIT_TEST_SUITE(SdHTMLFilterTest);
commit db9f42f0c044a6a6ca9e57bef57507ab05d4e79e
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 15:46:16 2014 +0200

html export: Close the meta tags.

Change-Id: Icca58dd1531f2442fe5878ed9524a3611c0601ea

diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 1ef646d..93567e2 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -76,7 +76,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream rStrm,
 sOut.append(\ ).append(OOO_STRING_SVTOOLS_HTML_O_content).append(=\);
 rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
-HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars 
).WriteCharPtr( \ );
+HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars 
).WriteCharPtr( \/ );
 }
 
 void SfxFrameHTMLWriter::Out_DocInfo( SvStream rStrm, const OUString 
rBaseURL,
commit 1380f5d5425b0860ed7aa9d1a876fed76449ffbd
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 15:29:28 2014 +0200

sd html: Implement export of metadata in the single document case.

Change-Id: Icf99c9bcea187e2a3127b97050d6ddb072540b0d

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index cdb18b2..b275206 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include htmlex.hxx
+#include com/sun/star/document/XDocumentPropertiesSupplier.hpp
 #include com/sun/star/document/XExporter.hpp
 #include com/sun/star/document/XFilter.hpp
 #include com/sun/star/drawing/GraphicExportFilter.hpp
@@ -32,6 +32,11 @@
 #include unotools/ucbstreamhelper.hxx
 #include unotools/localfilehelper.hxx
 #include com/sun/star/frame/XStorable.hpp
+#include sfx2/app.hxx
+#include sfx2/dispatch.hxx
+#include sfx2/docfile.hxx
+#include sfx2/fcontnr.hxx
+#include sfx2/frmhtmlw.hxx
 #include sfx2/progress.hxx
 #include vcl/wrkwin.hxx
 #include svl/aeitem.hxx
@@ -40,13 +45,11 @@
 #include svtools/imapcirc.hxx
 #include svtools/imappoly.hxx
 #include vcl/msgbox.hxx
-#include sfx2/app.hxx
 #include editeng/outlobj.hxx
 #include editeng/editobj.hxx
 #include svx/svdopath.hxx
 #include svx/xoutbmp.hxx
 #include svtools/htmlout.hxx
-#include sfx2/docfile.hxx
 #include vcl/cvtgrf.hxx
 #include svtools/colorcfg.hxx
 #include vcl/graphicfilter.hxx
@@ -57,8 +60,6 @@
 #include editeng/postitem.hxx
 #include editeng/crossedoutitem.hxx
 #include editeng/flditem.hxx
-#include sfx2/dispatch.hxx
-#include sfx2/fcontnr.hxx
 #include svl/style.hxx
 #include editeng/frmdiritem.hxx
 #include svx/svdoutl.hxx
@@ -648,7 +649,8 @@ void HtmlExport::ExportSingleDocument()
 InitProgress(mnSdPageCount);
 
 OUStringBuffer aStr(maHTMLHeader);
-aStr.append(CreateMetaCharset());
+aStr.append(DocumentMetadata());
+aStr.append(\r\n);
 aStr.append(/head\r\n);

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

 sd/qa/unit/HtmlExportTest.cxx|5 +
 sd/source/filter/html/htmlex.cxx |   39 +--
 sd/source/filter/html/htmlex.hxx |4 
 sfx2/source/bastyp/frmhtmlw.cxx  |2 +-
 4 files changed, 43 insertions(+), 7 deletions(-)

New commits:
commit 4034a82d4515369d698c6c7e66d6d527412f81b9
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 16:00:16 2014 +0200

sd html: Provide some minimal reasonable defaults.

Change-Id: I72b02f7d87cf6075d318c1cc0d7288e27bbe1b9c

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b275206..8768186 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -372,6 +372,8 @@ HtmlExport::HtmlExport(
 mbSlideSound(true),
 mbHiddenSlides(true),
 mbUserAttr(false),
+maTextColor(COL_BLACK),
+maBackColor(COL_WHITE),
 mbDocColors(false),
 maHTMLExtension(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)),
 maIndexUrl(index),
commit e80d3eb182c9adefb48ad72d2c28e758c27e65ab
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 15:46:51 2014 +0200

sd html: Unit test for the metadata export.

Change-Id: I1e38e28b57e816a0829d1a56f2ffcb32d8f93718

diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 388417f..388dfef 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -42,6 +42,11 @@ public:
 assertXPath(htmlDoc, /html/body/table/tr, 5);
 assertXPath(htmlDoc, /html/body/ul, 1);
 assertXPath(htmlDoc, /html/body/ul/li, 2);
+
+assertXPath(htmlDoc, /html/head/meta[1], content, text/html; 
charset=utf-8);
+assertXPath(htmlDoc, /html/head/meta[2], name, generator);
+assertXPath(htmlDoc, /html/head/meta[3], name, created);
+assertXPath(htmlDoc, /html/head/meta[3], content, 
20140409;170541987922038);
 }
 
 CPPUNIT_TEST_SUITE(SdHTMLFilterTest);
commit bb35a9f34cf56752fb9b762bcdd2aa72535d96f7
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 15:46:16 2014 +0200

html export: Close the meta tags.

Change-Id: Icca58dd1531f2442fe5878ed9524a3611c0601ea

diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 1ef646d..93567e2 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -76,7 +76,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream rStrm,
 sOut.append(\ ).append(OOO_STRING_SVTOOLS_HTML_O_content).append(=\);
 rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
-HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars 
).WriteCharPtr( \ );
+HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars 
).WriteCharPtr( \/ );
 }
 
 void SfxFrameHTMLWriter::Out_DocInfo( SvStream rStrm, const OUString 
rBaseURL,
commit cf3af57cfe5631afd1473dc530f4fbe6e41f24e4
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 15:29:28 2014 +0200

sd html: Implement export of metadata in the single document case.

Change-Id: Icf99c9bcea187e2a3127b97050d6ddb072540b0d

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index cdb18b2..b275206 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include htmlex.hxx
+#include com/sun/star/document/XDocumentPropertiesSupplier.hpp
 #include com/sun/star/document/XExporter.hpp
 #include com/sun/star/document/XFilter.hpp
 #include com/sun/star/drawing/GraphicExportFilter.hpp
@@ -32,6 +32,11 @@
 #include unotools/ucbstreamhelper.hxx
 #include unotools/localfilehelper.hxx
 #include com/sun/star/frame/XStorable.hpp
+#include sfx2/app.hxx
+#include sfx2/dispatch.hxx
+#include sfx2/docfile.hxx
+#include sfx2/fcontnr.hxx
+#include sfx2/frmhtmlw.hxx
 #include sfx2/progress.hxx
 #include vcl/wrkwin.hxx
 #include svl/aeitem.hxx
@@ -40,13 +45,11 @@
 #include svtools/imapcirc.hxx
 #include svtools/imappoly.hxx
 #include vcl/msgbox.hxx
-#include sfx2/app.hxx
 #include editeng/outlobj.hxx
 #include editeng/editobj.hxx
 #include svx/svdopath.hxx
 #include svx/xoutbmp.hxx
 #include svtools/htmlout.hxx
-#include sfx2/docfile.hxx
 #include vcl/cvtgrf.hxx
 #include svtools/colorcfg.hxx
 #include vcl/graphicfilter.hxx
@@ -57,8 +60,6 @@
 #include editeng/postitem.hxx
 #include editeng/crossedoutitem.hxx
 #include editeng/flditem.hxx
-#include sfx2/dispatch.hxx
-#include sfx2/fcontnr.hxx
 #include svl/style.hxx
 #include editeng/frmdiritem.hxx
 #include svx/svdoutl.hxx
@@ -648,7 +649,8 @@ void HtmlExport::ExportSingleDocument()
 InitProgress(mnSdPageCount);
 
 OUStringBuffer aStr(maHTMLHeader);
-aStr.append(CreateMetaCharset());
+aStr.append(DocumentMetadata());
+aStr.append(\r\n);
 aStr.append(/head\r\n);
 aStr.append(CreateBodyTag());
 
@@

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

 external/openssl/CVE-2010-5298.patch|   21 +
 external/openssl/CVE-2013-4353.patch|   21 +
 external/openssl/CVE-2013-6449.patch|  111 
 external/openssl/CVE-2013-6450.patch|   85 +
 external/openssl/CVE-2014-0195.patch|   36 +
 external/openssl/CVE-2014-0198.patch|   33 
 external/openssl/CVE-2014-0221.patch|   34 
 external/openssl/CVE-2014-0224.patch|   88 ++
 external/openssl/CVE-2014-3470.patch|   26 ++
 external/openssl/UnpackedTarball_openssl.mk |9 ++
 10 files changed, 464 insertions(+)

New commits:
commit 25b34416cb1d5aa5b3bea66cfdab2a5addb43789
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 12:46:05 2014 +0100

various recent openssl CVEs

Change-Id: Ib8989682690a73e5d09fb06617ad9d0938d76ccc
Reviewed-on: https://gerrit.libreoffice.org/9666
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/external/openssl/CVE-2010-5298.patch 
b/external/openssl/CVE-2010-5298.patch
new file mode 100644
index 000..55251b3
--- /dev/null
+++ b/external/openssl/CVE-2010-5298.patch
@@ -0,0 +1,21 @@
+From: Ben Laurie b...@links.org
+Date: Wed, 23 Apr 2014 06:24:03 + (+0100)
+Subject: Fix use after free.
+X-Git-Url: 
https://git.openssl.org/gitweb/b/?p=openssl.git;a=commitdiff_plain;h=94d1f4b
+
+Fix use after free.
+---
+
+diff --git a/a/ssl/s3_pkt.c b/b/ssl/s3_pkt.c
+index b9e45c7..d601a18 100644
+--- a/a/ssl/s3_pkt.c
 b/b/ssl/s3_pkt.c
+@@ -1334,7 +1334,7 @@ start:
+   {
+   s-rstate=SSL_ST_READ_HEADER;
+   rr-off=0;
+-  if (s-mode  SSL_MODE_RELEASE_BUFFERS)
++  if (s-mode  SSL_MODE_RELEASE_BUFFERS  
s-s3-rbuf.left == 0)
+   ssl3_release_read_buffer(s);
+   }
+   }
diff --git a/external/openssl/CVE-2013-4353.patch 
b/external/openssl/CVE-2013-4353.patch
new file mode 100644
index 000..be7cf4c
--- /dev/null
+++ b/external/openssl/CVE-2013-4353.patch
@@ -0,0 +1,21 @@
+Fix for TLS record tampering bug. A carefully crafted invalid 
+handshake could crash OpenSSL with a NULL pointer exception.
+Thanks to Anton Johansson for reporting this issues.
+(CVE-2013-4353)
+diff --git a/a/ssl/s3_both.c b/b/ssl/s3_both.c
+index 1e5dcab..53b9390 100644
+--- a/a/ssl/s3_both.c
 b/b/ssl/s3_both.c
+@@ -210,7 +210,11 @@ static void ssl3_take_mac(SSL *s)
+   {
+   const char *sender;
+   int slen;
+-
++  /* If no new cipher setup return immediately: other functions will
++   * set the appropriate error.
++   */
++  if (s-s3-tmp.new_cipher == NULL)
++  return;
+   if (s-state  SSL_ST_CONNECT)
+   {
+   sender=s-method-ssl3_enc-server_finished_label;
diff --git a/external/openssl/CVE-2013-6449.patch 
b/external/openssl/CVE-2013-6449.patch
new file mode 100644
index 000..3da0646
--- /dev/null
+++ b/external/openssl/CVE-2013-6449.patch
@@ -0,0 +1,111 @@
+Use version in SSL_METHOD not SSL structure.
+
+When deciding whether to use TLS 1.2 PRF and record hash algorithms
+use the version number in the corresponding SSL_METHOD structure
+instead of the SSL structure. The SSL structure version is sometimes
+inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already.
+(CVE-2013-6449)
+
+Also preventively check EVP errors for handshake digests.
+
+diff --git a/a/ssl/s3_lib.c b/b/ssl/s3_lib.c
+index bf832bb..c4ef273 100644
+--- a/a/ssl/s3_lib.c
 b/b/ssl/s3_lib.c
+@@ -4286,7 +4286,7 @@ need to go to SSL_ST_ACCEPT.
+ long ssl_get_algorithm2(SSL *s)
+   {
+   long alg2 = s-s3-tmp.new_cipher-algorithm2;
+-  if (TLS1_get_version(s) = TLS1_2_VERSION 
++  if (s-method-version == TLS1_2_VERSION 
+   alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF))
+   return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256;
+   return alg2;
+diff --git a/a/ssl/s3_both.c b/b/ssl/s3_both.c
+index ead01c8..1e5dcab 100644
+--- a/a/ssl/s3_both.c
 b/b/ssl/s3_both.c
+@@ -161,6 +161,8 @@ int ssl3_send_finished(SSL *s, int a, int b, const char 
*sender, int slen)
+ 
+   i=s-method-ssl3_enc-final_finish_mac(s,
+   sender,slen,s-s3-tmp.finish_md);
++  if (i == 0)
++  return 0;
+   s-s3-tmp.finish_md_len = i;
+   memcpy(p, s-s3-tmp.finish_md, i);
+   p+=i;
+diff --git a/a/ssl/s3_pkt.c b/b/ssl/s3_pkt.c
+index 804291e..c4bc4e7 100644
+--- a/a/ssl/s3_pkt.c
 b/b/ssl/s3_pkt.c
+@@ -335,7 +335,7 @@ fprintf(stderr, Record type=%d, Length=%d\n, rr-type, 
rr-length);
+   if (version != s-version)
+   {
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - config_host.mk.in configure.ac Makefile.in

 Makefile.in   |9 +
 config_host.mk.in |1 +
 configure.ac  |   38 +-
 3 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit aa23371ba3d257fb590aae9e0ebee35d7da80c97
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 18:51:48 2014 +0300

Add --enable-macosx-package-signing

Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99

diff --git a/Makefile.in b/Makefile.in
index 206f5ed..4dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -296,6 +296,15 @@ endif
 endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
 
+mac-app-store-package: test-install
+ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+   mv $(TESTINSTALLDIR)/$(PRODUCTNAME).app $(MACOSX_APP_NAME).app
+   productbuild --component $(MACOSX_APP_NAME).app /Applications --sign 
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo $(MACOSX_APP_NAME) | tr ' ' 
'-').pkg
+else
+   @echo You did not provide an installer signing identity with 
--enable-macosx-package-signing
+   @exit 1
+endif
+
 distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
diff --git a/config_host.mk.in b/config_host.mk.in
index 3febd13..b80310b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -359,6 +359,7 @@ export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
 export MACOSX_APP_NAME=@MACOSX_APP_NAME@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@
 export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
 export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
 export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
diff --git a/configure.ac b/configure.ac
index e1b1ea6..9e86dc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1211,12 +1211,19 @@ AC_ARG_ENABLE(silent-msi,
 ,)
 
 AC_ARG_ENABLE(macosx-code-signing,
-AS_HELP_STRING([--enable-macosx-code-signing=identity],
+AS_HELP_STRING([--enable-macosx-code-signing=identity],
 [Sign executables, dylibs, frameworks and the app bundle. If you
  don't provide an identity the first suitable certificate
  in your keychain is used.]),
 ,)
 
+AC_ARG_ENABLE(macosx-package-signing,
+AS_HELP_STRING([--enable-macosx-package-signing=identity],
+[Create a .pkg suitable for uploading to the Mac App Store and sign
+ it. If you don't provide an identity the first suitable certificate
+ in your keychain is used.]),
+,)
+
 AC_ARG_ENABLE(macosx-sandbox,
 AS_HELP_STRING([--enable-macosx-sandbox],
 [Make the app bundle run in a sandbox. Requires code signing.
@@ -2880,6 +2887,34 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([no])
 fi
 
+AC_MSG_CHECKING([whether to create a Mac App Store package])
+
+if test -n $enable_macosx_package_signing -a -z 
$MACOSX_CODESIGNING_IDENTITY; then
+AC_MSG_ERROR([You forgot --enable-macosx-code-signing])
+elif test $enable_macosx_package_signing = yes; then
+# By default use the first suitable certificate.
+# It should be a 3rd Party Mac Developer Installer one
+
+identity=`security find-identity -v 2/dev/null | grep '3rd Party Mac 
Developer Installer:' | awk '{print $2}' |head -1`
+if test -n $identity; then
+MACOSX_PACKAGE_SIGNING_IDENTITY=$identity
+pretty_name=`security find-identity -v | grep 
$MACOSX_PACKAGE_SIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
+AC_MSG_RESULT([yes, using the identity 
$MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name])
+else
+AC_MSG_ERROR([Could not find any suitable '3rd Party Mac Developer 
Installer' certificate])
+fi
+elif test -n $enable_macosx_package_signing; then
+MACOSX_PACKAGE_SIGNING_IDENTITY=$enable_macosx_package_signing
+pretty_name=`security find-identity -v | grep 
$MACOSX_PACKAGE_SIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
+AC_MSG_RESULT([yes, using the identity 
$MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name])
+else
+AC_MSG_RESULT([no])
+fi
+
+if test -n $MACOSX_CODESIGNING_IDENTITY -a -n 
$MACOSX_PACKAGE_SIGNING_IDENTITY -a $MACOSX_CODESIGNING_IDENTITY = 
$MACOSX_PACKAGE_SIGNING_IDENTITY; then
+AC_MSG_ERROR([You should not use the same identity for code and 
package signing])
+fi
+
 AC_MSG_CHECKING([whether to sandbox the application])
 
 if test -z $MACOSX_CODESIGNING_IDENTITY -a $enable_macosx_sandbox = 
yes; then
@@ -2910,6 +2945,7 @@ AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
 AC_SUBST(INSTALL_NAME_TOOL)
 AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU 
libtool
 AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
+AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)

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

2014-06-06 Thread Jacobo Aragunde Pérez

 sw/source/core/fields/authfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ed60a973753d143158c5b17c781bac07bfc3827
Author: Jacobo Aragunde PÃ©rez jaragu...@igalia.com
Date:   Fri Jun 6 20:15:43 2014 +0200

fdo#76281: Fix wrong square brackets in exported citations

There was a pair of unbalanced ifs in the code to write the opening
and the closing bracket, they should have the same condition.

Change-Id: I9b3e64486d1b87a8df65d351f01eb4cc9a8b8c44

diff --git a/sw/source/core/fields/authfld.cxx 
b/sw/source/core/fields/authfld.cxx
index 62e05ac..4cfaf6a 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -564,7 +564,7 @@ OUString 
SwAuthorityField::ConditionalExpand(ToxAuthorityField eField) const
 if(pEntry)
 sRet += pEntry-GetAuthorField(AUTH_FIELD_IDENTIFIER);
 }
-if(pAuthType-GetSuffix())
+if(pAuthType-GetSuffix()  eField != AUTH_FIELD_TITLE)
 sRet += OUString(pAuthType-GetSuffix());
 return sRet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - include/vcl vcl/source

2014-06-06 Thread matteocam

 include/vcl/outdev.hxx |2 +-
 vcl/source/outdev/text.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d84dba8b01c1f240f22b774c951ebf206d5a3ac9
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 6 15:14:52 2014 -0400

More debugging; fixed Font::IsTransparent

Change-Id: Idcb54408dd3cf6561b78eb28fdb409d2e31df541

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3c3be7c..24277ff 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1042,7 +1042,7 @@ public:
 voidSetTextFillColor();
 voidSetTextFillColor( const Color rColor );
 Color   GetTextFillColor() const;
-boolIsTextFillColor() const {  return return 
!maFont.IsTransparent(); }
+boolIsTextFillColor() const { return 
!maFont.IsTransparent(); }
 
 voidSetTextLineColor();
 voidSetTextLineColor( const Color rColor );
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index fb2a89d..7a587a6 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -966,11 +966,11 @@ void OutputDevice::DrawTextArray( const Point rStartPt, 
const OUString rStr,
   const sal_Int32* pDXAry,
   sal_Int32 nIndex, sal_Int32 nLen )
 {
-fprintf(stderr, TextFillColor printing %c is (%d, %d, %d)\n,
+if ( maFont.IsTransparent() )
+fprintf(stderr, [Actually transparent font] Real color = %x\n, 
maFont.GetFillColor().GetColor() );
+fprintf(stderr, TextFillColor printing %c is %x\n,
 (char) rStr.toChar(),
-GetTextFillColor().GetRed(),
-GetTextFillColor().GetGreen(),
-GetTextFillColor().GetBlue());
+GetTextFillColor().GetColor());
 
 if(nLen == 0x0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source

2014-06-06 Thread matteocam

 editeng/source/editeng/editattr.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d4c1c038dbc554dcce9c081e736a72359e80d33f
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 6 15:21:16 2014 -0400

Set transparency besides color for text with fill (i.e. underlined text)

Change-Id: I88a90facac656f846a88315951b4769f502662a0

diff --git a/editeng/source/editeng/editattr.cxx 
b/editeng/source/editeng/editattr.cxx
index 7d60300..c867da4 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -134,6 +134,7 @@ void EditCharAttribUnderline::SetFont( SvxFont rFont, 
OutputDevice* pOutDev )
 
 /* FIXME(matteocam) */
 rFont.SetFillColor(aColor); // XXX: alone it works but it set it white 
(vcl causing troubes?)
+rFont.SetTransparent(false); // XXX: will this be enough?
 //if (pOutDev)
 //pOutDev-SetTextFillColor(aColor); // this doesn't work either
 // end FIXME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sd/qa/unit/HtmlExportTest.cxx   |2 +-
 sfx2/source/bastyp/frmhtmlw.cxx |   23 ---
 2 files changed, 9 insertions(+), 16 deletions(-)

New commits:
commit f7d51f43deda5e28df63f1b8e168e84838d0d0b4
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 21:52:48 2014 +0200

html export: More standard time specification in meta/.

Change-Id: I1a62d12531029cc36fb8aeabecb9d92a8af837f7

diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 388dfef..6064b28 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -46,7 +46,7 @@ public:
 assertXPath(htmlDoc, /html/head/meta[1], content, text/html; 
charset=utf-8);
 assertXPath(htmlDoc, /html/head/meta[2], name, generator);
 assertXPath(htmlDoc, /html/head/meta[3], name, created);
-assertXPath(htmlDoc, /html/head/meta[3], content, 
20140409;170541987922038);
+assertXPath(htmlDoc, /html/head/meta[3], content, 
2014-04-09T17:05:41.987922038);
 }
 
 CPPUNIT_TEST_SUITE(SdHTMLFilterTest);
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 93567e2..5d4f1ad 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -44,9 +44,7 @@
 
 #include rtl/bootstrap.hxx
 #include rtl/strbuf.hxx
-
-
-
+#include sax/tools/converter.hxx
 
 using namespace ::com::sun::star;
 
@@ -164,12 +162,10 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream rStrm, 
const OUString rBaseURL,
 
 // created
 ::util::DateTime uDT = i_xDocProps-getCreationDate();
-Date aD(uDT.Day, uDT.Month, uDT.Year);
-Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds);
-OUString sOut = OUString::number(aD.GetDate());
-sOut += ;;
-sOut += OUString::number(aT.GetTime());
-OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, 
false,
+OUStringBuffer aBuffer;
+::sax::Converter::convertTimeOrDateTime(aBuffer, uDT, 0);
+
+OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, 
aBuffer.makeStringAndClear(), false,
  eDestEnc, pNonConvertableChars );
 
 // changedby
@@ -180,12 +176,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream rStrm, 
const OUString rBaseURL,
 
 // changed
 uDT = i_xDocProps-getModificationDate();
-Date aD2(uDT.Day, uDT.Month, uDT.Year);
-Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds);
-sOut = OUString::number(aD2.GetDate());
-sOut += ;;
-sOut += OUString::number(aT2.GetTime());
-OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, 
false,
+::sax::Converter::convertTimeOrDateTime(aBuffer, uDT, 0);
+
+OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, 
aBuffer.makeStringAndClear(), false,
  eDestEnc, pNonConvertableChars );
 
 // Subject
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sd/qa/unit/HtmlExportTest.cxx   |2 +-
 sfx2/source/bastyp/frmhtmlw.cxx |   23 ---
 2 files changed, 9 insertions(+), 16 deletions(-)

New commits:
commit c45565b4f46ff9c5ebb4bbf5dfe09d0d77ceeec6
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Jun 6 21:52:48 2014 +0200

html export: More standard time specification in meta/.

Change-Id: I1a62d12531029cc36fb8aeabecb9d92a8af837f7

diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 388dfef..6064b28 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -46,7 +46,7 @@ public:
 assertXPath(htmlDoc, /html/head/meta[1], content, text/html; 
charset=utf-8);
 assertXPath(htmlDoc, /html/head/meta[2], name, generator);
 assertXPath(htmlDoc, /html/head/meta[3], name, created);
-assertXPath(htmlDoc, /html/head/meta[3], content, 
20140409;170541987922038);
+assertXPath(htmlDoc, /html/head/meta[3], content, 
2014-04-09T17:05:41.987922038);
 }
 
 CPPUNIT_TEST_SUITE(SdHTMLFilterTest);
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 93567e2..5d4f1ad 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -44,9 +44,7 @@
 
 #include rtl/bootstrap.hxx
 #include rtl/strbuf.hxx
-
-
-
+#include sax/tools/converter.hxx
 
 using namespace ::com::sun::star;
 
@@ -164,12 +162,10 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream rStrm, 
const OUString rBaseURL,
 
 // created
 ::util::DateTime uDT = i_xDocProps-getCreationDate();
-Date aD(uDT.Day, uDT.Month, uDT.Year);
-Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds);
-OUString sOut = OUString::number(aD.GetDate());
-sOut += ;;
-sOut += OUString::number(aT.GetTime());
-OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, 
false,
+OUStringBuffer aBuffer;
+::sax::Converter::convertTimeOrDateTime(aBuffer, uDT, 0);
+
+OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, 
aBuffer.makeStringAndClear(), false,
  eDestEnc, pNonConvertableChars );
 
 // changedby
@@ -180,12 +176,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream rStrm, 
const OUString rBaseURL,
 
 // changed
 uDT = i_xDocProps-getModificationDate();
-Date aD2(uDT.Day, uDT.Month, uDT.Year);
-Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds);
-sOut = OUString::number(aD2.GetDate());
-sOut += ;;
-sOut += OUString::number(aT2.GetTime());
-OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, 
false,
+::sax::Converter::convertTimeOrDateTime(aBuffer, uDT, 0);
+
+OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, 
aBuffer.makeStringAndClear(), false,
  eDestEnc, pNonConvertableChars );
 
 // Subject
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 lotuswordpro/source/filter/xfilter/xfcellstyle.cxx   |2 +-
 lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx |2 +-
 lotuswordpro/source/filter/xfilter/xftextstyle.cxx   |2 +-
 sc/source/filter/xml/xmlexprt.cxx|2 +-
 sc/source/ui/dbgui/filtdlg.cxx   |2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx   |   10 ++
 sw/source/core/table/swtable.cxx |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|2 ++
 8 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit cae83eb8b6906bba4abf9b625b84364e5f6e36ca
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 21:27:52 2014 +0100

commit id with ccc in it breaks regression test

Change-Id: I1a222fdd5e837a4d0071f8b4d03b80c1d104f235

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3b7cfcf..11fa7df 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -229,6 +229,16 @@ void SwUiWriterTest::testExportRTF()
 aWrt.Write(xWrt);
 
 OString aData(static_castconst sal_Char*(aStream.GetBuffer()), 
aStream.GetSize());
+
+//Amusingly eventually there was a commit id with ccc in it, and so the 
rtf contained
+//{\*\generator LibreOfficeDev/4.4.0.0.alpha0$Linux_X86_64 
LibreOffice_project/f70664ccc6837f2cc21a29bb4f44e41e100efe6b}
+//so the test fell over. so strip the generator tag
+sal_Int32 nGeneratorStart = aData.indexOf({\\*\\generator );
+CPPUNIT_ASSERT(nGeneratorStart != -1);
+sal_Int32 nGeneratorEnd = aData.indexOf('}', nGeneratorStart + 1);
+CPPUNIT_ASSERT(nGeneratorEnd != -1);
+aData = aData.replaceAt(nGeneratorStart, nGeneratorEnd-nGeneratorStart+1, 
);
+
 CPPUNIT_ASSERT(aData.startsWith({\\rtf1));
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf(aaa));
 CPPUNIT_ASSERT(aData.indexOf(bbb) != -1);
commit 483626d8372309d1562a74ce659288f0905b4198
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 21:04:06 2014 +0100

coverity#1209548 Unchecked dynamic_cast

Change-Id: I0adb2380d6804fef43812be3b9a6f32706fd7a4a

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0312a43..772043e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -289,6 +289,8 @@ void DomainMapper_Impl::RemoveDummyParaForTableInSection()
 SetIsDummyParaAddedForTableInSection(false);
 PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_SECTION);
 SectionPropertyMap* pSectionContext = dynamic_cast SectionPropertyMap* ( 
pContext.get() );
+if (!pSectionContext)
+return;
 uno::Reference text::XTextCursor  xCursor = 
GetTopTextAppend()-createTextCursorByRange(pSectionContext-GetStartingRange());
 
 uno::Referencecontainer::XEnumerationAccess xEnumerationAccess(xCursor, 
uno::UNO_QUERY);
commit 8a0230e78ce2a752749b62f0761849a72b367551
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 21:00:01 2014 +0100

coverity#735444 Logically dead code

Change-Id: I32b6475812be6dfd9912f7fc6646b349cdbfbbe1

diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx 
b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index cf4f6cc..644a322 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -84,7 +84,7 @@ boolXFTextStyle::Equal(IXFStyle *pStyle)
 return false;
 }
 
-XFTextStyle *pOther = (XFTextStyle*)pStyle;
+XFTextStyle *pOther = dynamic_castXFTextStyle*(pStyle);
 if( !pOther )
 {
 return false;
commit 6d462764cff1e41114599c51eea7fa6e53489e59
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 20:59:20 2014 +0100

coverity#735442 Logically dead code

Change-Id: I8e182a18e70f230e67f2f452bbfca442e5585212

diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx 
b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index fd97d5c..7a96d6f 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -79,7 +79,7 @@ bool XFNumberStyle::Equal(IXFStyle *pStyle)
 {
 if( !pStyle || pStyle-GetStyleFamily() != enumXFStyleNumber )
 return false;
-XFNumberStyle *pOther = (XFNumberStyle*)pStyle;
+XFNumberStyle *pOther = dynamic_castXFNumberStyle*(pStyle);
 if( !pOther )
 return false;
 
commit 9656d6c488a0df551a3c9aab4fea23a3b23a97c0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 20:58:31 2014 +0100

coverity#735441 Logically dead code

Change-Id: I790904fb030d2bfc96cd967b2b4b449e62f8c536

diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx 
b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index 42bf245..b0d4881 100644
---

EditEng - Switch from edit to non-edit mode - Code references?

2014-06-06 Thread Matteo Campanelli

Hi all,
I'm working on drawing arbitrary text fill colors in Draw and currently my
code
- draws correctly (or almost correctly) a fill color when in EDIT mode;
- draws something unexpected in NON-EDIT mode-

I am trying to debug what happens when the switching between EDIT and
NON-EDIT occurs (e.g. which functions take care of setting the state of
OutputDevice and so on from EditEng).
Does anyone know any point I should be looking at?
Or does anyone have any suggestion on how to proceed for debugging?

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

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

2014-06-06 Thread Thomas Arnhold

 sc/source/filter/inc/rtfparse.hxx  |9 -
 sc/source/filter/rtf/rtfparse.cxx  |3 ---
 sc/source/ui/dbgui/consdlg.cxx |2 --
 sc/source/ui/dbgui/pfiltdlg.cxx|2 --
 sc/source/ui/inc/areasdlg.hxx  |4 +---
 sc/source/ui/inc/consdlg.hxx   |3 ---
 sc/source/ui/inc/crnrdlg.hxx   |3 ---
 sc/source/ui/inc/filldlg.hxx   |3 ---
 sc/source/ui/inc/instbdlg.hxx  |2 --
 sc/source/ui/inc/pfiltdlg.hxx  |2 --
 sc/source/ui/inc/solvrdlg.hxx  |3 ---
 sc/source/ui/inc/tphf.hxx  |3 ---
 sc/source/ui/inc/tpusrlst.hxx  |3 ---
 sc/source/ui/miscdlgs/crnrdlg.cxx  |3 ---
 sc/source/ui/miscdlgs/filldlg.cxx  |7 ---
 sc/source/ui/miscdlgs/instbdlg.cxx |5 -
 sc/source/ui/miscdlgs/solvrdlg.cxx |3 ---
 sc/source/ui/optdlg/tpusrlst.cxx   |4 
 sc/source/ui/pagedlg/areasdlg.cxx  |3 ---
 sc/source/ui/pagedlg/tphf.cxx  |6 --
 store/workben/t_store.cxx  |1 -
 sw/source/core/inc/layact.hxx  |   10 --
 sw/source/core/layout/layact.cxx   |1 -
 23 files changed, 1 insertion(+), 84 deletions(-)

New commits:
commit 4c3b36073ae542fc5a8ccffa685a4105525b3394
Author: Thomas Arnhold tho...@arnhold.org
Date:   Tue Jun 3 22:45:34 2014 +0200

Bin ugly (ab)use of preprocessor in headers (final part)

Finish the work of ec8617568ff091026b2f17cce3b547b1633fa6c4

Only one is left: SC_PROGRESS_CXX

Change-Id: Ifdc07ec377d7a84e92bc4b0a66ab82b1fc93f76a
Reviewed-on: https://gerrit.libreoffice.org/9636
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/sc/source/filter/inc/rtfparse.hxx 
b/sc/source/filter/inc/rtfparse.hxx
index 7da0872..644a331 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -22,7 +22,6 @@
 
 #include eeparser.hxx
 
-#ifdef SC_RTFPARSE_CXX
 #include boost/ptr_container/ptr_vector.hpp
 #include o3tl/sorted_vector.hxx
 
@@ -44,14 +43,6 @@ struct ScRTFCellDefault
 
 class ScRTFColTwips : public o3tl::sorted_vectorsal_uLong {};
 
-#else   // SC_RTFPARSE_CXX
-
-struct ScRTFCellDefault;
-class ScRTFColTwips;
-
-#endif  // SC_RTFPARSE_CXX
-
-
 class EditEngine;
 
 class ScRTFParser : public ScEEParser
diff --git a/sc/source/filter/rtf/rtfparse.cxx 
b/sc/source/filter/rtf/rtfparse.cxx
index 3449bb1..f8df028 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -19,15 +19,12 @@
 
 #include scitems.hxx
 #include editeng/eeitem.hxx
-
-
 #include editeng/editeng.hxx
 #include editeng/fhgtitem.hxx
 #include editeng/svxrtf.hxx
 #include vcl/outdev.hxx
 #include svtools/rtftoken.h
 
-#define SC_RTFPARSE_CXX
 #include rtfparse.hxx
 #include global.hxx
 #include document.hxx
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 0f8e328..3bd36c3 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -31,9 +31,7 @@
 #include globstr.hrc
 #include sc.hrc
 
-#define _CONSDLG_CXX
 #include consdlg.hxx
-#undef _CONSDLG_CXX
 #include vcl/msgbox.hxx
 
 #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute()
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 2d68f0b..2133fc0 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -36,9 +36,7 @@
 #include filter.hrc
 #include globstr.hrc
 
-#define _PFILTDLG_CXX
 #include pfiltdlg.hxx
-#undef _PFILTDLG_CXX
 #include svl/zforlist.hxx
 #include svl/sharedstringpool.hxx
 
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 2800ac4..d7c6789 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -22,6 +22,7 @@
 
 #include address.hxx
 
+#include svl/stritem.hxx
 #include vcl/lstbox.hxx
 #include vcl/fixed.hxx
 #include anyrefdg.hxx
@@ -67,8 +68,6 @@ private:
 ScViewData* pViewData;
 SCTAB   nCurTab;
 
-#ifdef _AREASDLG_CXX
-private:
 void Impl_Reset();
 bool Impl_CheckRefStrings();
 void Impl_FillLists();
@@ -79,7 +78,6 @@ private:
 DECL_LINK( Impl_ModifyHdl,  formula::RefEdit*  );
 DECL_LINK( Impl_BtnHdl, PushButton* );
 DECL_LINK( Impl_GetFocusHdl,Control*);
-#endif
 };
 
 #endif
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index b7ff60d..30ce8f6 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -87,8 +87,6 @@ private:
 formula::RefEdit*   pRefInputEdit;
 boolbDlgLostFocus;
 
-#ifdef _CONSDLG_CXX
-private:
 void Init   ();
 void FillAreaLists  ();
 bool VerifyEdit ( formula::RefEdit* pEd );
@@ -101,7 +99,6 @@ private:
 
 ScSubTotalFunc  LbPosToFunc( sal_uInt16 nPos );
 sal_uInt16  FuncToLbPos( ScSubTotalFunc eFunc );
-#endif // _CONSDLG_CXX
 };
 
 #endif //

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

 postprocess/qa/services.cxx |   19 +--
 1 file changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 044be7107a97169e80360c79a9d07bec263ac818
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Jun 7 04:34:10 2014 +0200

Revert Make sure to dispose services supporting the XComponent protocol

This reverts commit 4cacc6080e61374fd573fffb3bc2a54968c1b61a.

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 2d29e91..c9d30f4 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -9,10 +9,7 @@
 
 #include sal/config.h
 
-#include vector
-
 #include com/sun/star/container/XHierarchicalNameAccess.hpp
-#include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/reflection/XServiceConstructorDescription.hpp
 #include com/sun/star/reflection/XServiceTypeDescription2.hpp
 #include test/bootstrapfixture.hxx
@@ -40,7 +37,6 @@ void ServicesTest::test()
 
/singletons/com.sun.star.reflection.theTypeDescriptionManager),
 UNO_QUERY_THROW );
 SequenceOUString s = 
m_xContext-getServiceManager()-getAvailableServiceNames();
-std::vector css::uno::Referencecss::lang::XComponent  comps;
 for (sal_Int32 i = 0; i  s.getLength(); i++)
 {
 if (!xTypeManager-hasByHierarchicalName(s[i]))
@@ -58,13 +54,12 @@ void ServicesTest::test()
 Sequence Reference XServiceConstructorDescription   xseq = 
xDesc-getConstructors();
 for (sal_Int32 c = 0; c  xseq.getLength(); c++)
 if (!xseq[c]-getParameters().hasElements())
-{
-Reference XInterface  instance;
 try
 {
 OString message = OUStringToOString(s[i], 
RTL_TEXTENCODING_UTF8);
 bool bDefConstructor = xseq[c]-isDefaultConstructor();
 Reference css::lang::XMultiComponentFactory  
serviceManager = m_xContext-getServiceManager();
+Reference XInterface  instance;
 
 if( bDefConstructor )
 instance = 
serviceManager-createInstanceWithContext(s[i], m_xContext);
@@ -80,18 +75,6 @@ void ServicesTest::test()
 OUStringToOString(s[i] + :  + e.Message, 
RTL_TEXTENCODING_UTF8);
 CPPUNIT_FAIL(exc.getStr());
 }
-css::uno::Referencecss::lang::XComponent comp(
-instance, css::uno::UNO_QUERY);
-if (comp.is()) {
-comps.push_back(comp);
-}
-}
-}
-for (std::vector css::uno::Referencecss::lang::XComponent ::iterator i(
- comps.begin());
- i != comps.end(); ++i)
-{
-(*i)-dispose();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

windows tinderboxes experiencing deadlocks

Hey,

if you have a windows tinderbox running please have a look if it is running
correctly right now. Looks like at least @38, @39, @42 and @51 experience a
deadlock in a test. I reverted the commit introducing the deadlock for now
so we have working Windows boxes again.

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

[Libreoffice-commits] core.git: 6 commits - chart2/Library_chartcore.mk chart2/source include/vcl oox/source sc/source vcl/source

 chart2/Library_chartcore.mk |1 
 chart2/source/inc/ChartDebugTrace.hxx   |   63 
 chart2/source/model/main/ChartModel_Persistence.cxx |6 -
 chart2/source/model/template/ChartTypeTemplate.cxx  |   10 ---
 chart2/source/tools/ChartDebugTrace.cxx |   61 ---
 include/vcl/metric.hxx  |4 -
 oox/source/drawingml/shape.cxx  |3 
 sc/source/core/data/column.cxx  |4 -
 sc/source/filter/oox/workbookhelper.cxx |2 
 vcl/source/window/openglwin.cxx |1 
 10 files changed, 8 insertions(+), 147 deletions(-)

New commits:
commit 9ea3e3a2fbe9c200a2b7fe11e48765d1d8389eb3
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Jun 7 04:46:39 2014 +0200

column storage might be changed, related lp#990868

Change-Id: Ibd196484c8c5199e7398726a250082c266a89229

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7d6ebb1..f0dc03a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1709,7 +1709,6 @@ void ScColumn::CopyUpdated( const ScColumn rPosCol, 
ScColumn rDestCol ) const
 void ScColumn::CopyScenarioFrom( const ScColumn rSrcCol )
 {
 //  This is the scenario table, the data is copied into it
-sc::CopyToDocContext aCxt(*pDocument);
 ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
 SCROW nStart = -1, nEnd = -1;
 const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1718,6 +1717,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn rSrcCol )
 if ( ((ScMergeFlagAttr)pPattern-GetItem( ATTR_MERGE_FLAG 
)).IsScenario() )
 {
 DeleteArea( nStart, nEnd, IDF_CONTENTS );
+sc::CopyToDocContext aCxt(*pDocument);
 ((ScColumn)rSrcCol).
 CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, *this);
 
@@ -1741,7 +1741,6 @@ void ScColumn::CopyScenarioFrom( const ScColumn rSrcCol )
 void ScColumn::CopyScenarioTo( ScColumn rDestCol ) const
 {
 //  This is the scenario table, the data is copied to the other
-sc::CopyToDocContext aCxt(*rDestCol.pDocument);
 ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
 SCROW nStart = -1, nEnd = -1;
 const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1750,6 +1749,7 @@ void ScColumn::CopyScenarioTo( ScColumn rDestCol ) const
 if ( ((ScMergeFlagAttr)pPattern-GetItem( ATTR_MERGE_FLAG 
)).IsScenario() )
 {
 rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS );
+sc::CopyToDocContext aCxt(*rDestCol.pDocument);
 CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, rDestCol);
 
 //  UpdateUsed not needed, is already done in TestCopyScenario 
(obsolete comment ?)
commit 86f8772131a0588f3bfa4f09cc03746a2afe8cc8
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Jun 7 03:56:56 2014 +0200

don't try to import invalid document, fdo#79135

Change-Id: I3b601d629550078a8fa353bf838619f8d7b34718

diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 4648c25..f59c478 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -433,6 +433,8 @@ ScRangeData* WorkbookGlobals::createLocalNamedRangeObject(
 {
 ScDocument rDoc =  getScDocument();
 ScRangeName* pNames = rDoc.GetRangeName( nTab );
+if(!pNames)
+throw RuntimeException(invalid sheet index used);
 // find an unused name
 orName = findUnusedName( pNames, orName );
 // create the named range
commit 127b11cbf944d51640c45801693b93ab3b18b14b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Jun 7 03:43:47 2014 +0200

make sure all objects exist, related fdo#75692

fdo75692-2.xlsx and fdo#75692-3.xlsx crash.

Change-Id: I56353e7da1850a49e18d3a570641843600d34b1c

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8c97b87..0737830 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1249,7 +1249,8 @@ void Shape::finalizeXShape( XmlFilterBase rFilter, const 
Reference XShapes 
 {
 Reference chart2::data::XDataReceiver  xDataRec( 
xChartDoc, UNO_QUERY );
 Reference chart2::data::XDataSource  xData( 
xDataRec-getUsedData(), UNO_QUERY );
-if( xData-getDataSequences().getLength() = 0 || 
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
+if( xData-getDataSequences().getLength() = 0 || 
!xData-getDataSequences()[0]-getValues().is() ||
+
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
 {

[Libreoffice-commits] dev-tools.git: 2 commits - test-bugzilla-files/test-bugzilla-files.py

 test-bugzilla-files/test-bugzilla-files.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c2c4005af9c9488097530e2b72cbe9a949a47ca7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Jun 7 04:58:57 2014 +0200

set the correct component for math

This will fix the missing export to .odf (Open Document Formula)

diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index bcdb504..2bd907e 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -566,7 +566,7 @@ validDrawFileExtensions = [ .odg, .fodg, .otg, 
.sxd, .std, .vsd, .v
 validBaseFileExtensions = [ .odb ]
 validMathFileExtensions = [ .odf, .otf, .sxm, .mml, .smf, .smf5 ]
 validOtherFileExtensions = [ .pdf ]
-validFileExtensions = dict([(calc, validCalcFileExtensions), (writer, 
validWriterFileExtensions), (impress, validImpressFileExtensions), (draw, 
validDrawFileExtensions), (base, validBaseFileExtensions), (Math, 
validMathFileExtensions), (other, validOtherFileExtensions) ])
+validFileExtensions = dict([(calc, validCalcFileExtensions), (writer, 
validWriterFileExtensions), (impress, validImpressFileExtensions), (draw, 
validDrawFileExtensions), (base, validBaseFileExtensions), (math, 
validMathFileExtensions), (other, validOtherFileExtensions) ])
 
 def runLoadFileTests(opts, dirs):
 startTime = datetime.datetime.now()
commit fe420f18bfb02e5079e2c17ea997dd1c32eb04b1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Jun 7 04:58:08 2014 +0200

add pdf crast tests

diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index f21ce38..bcdb504 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -565,7 +565,8 @@ validImpressFileExtensions = [ .ppt, .pptx, .odp, 
.fodp, .otp, .sxi,
 validDrawFileExtensions = [ .odg, .fodg, .otg, .sxd, .std, .vsd, 
.vdx, .pub, .cdr, .sda5, .sdd_d ]
 validBaseFileExtensions = [ .odb ]
 validMathFileExtensions = [ .odf, .otf, .sxm, .mml, .smf, .smf5 ]
-validFileExtensions = dict([(calc, validCalcFileExtensions), (writer, 
validWriterFileExtensions), (impress, validImpressFileExtensions), (draw, 
validDrawFileExtensions), (base, validBaseFileExtensions), (Math, 
validMathFileExtensions) ])
+validOtherFileExtensions = [ .pdf ]
+validFileExtensions = dict([(calc, validCalcFileExtensions), (writer, 
validWriterFileExtensions), (impress, validImpressFileExtensions), (draw, 
validDrawFileExtensions), (base, validBaseFileExtensions), (Math, 
validMathFileExtensions), (other, validOtherFileExtensions) ])
 
 def runLoadFileTests(opts, dirs):
 startTime = datetime.datetime.now()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 10 commits - chart2/source formula/source include/vcl sc/source vcl/source

 chart2/source/view/charttypes/GL3DBarChart.cxx |   14 --
 chart2/source/view/inc/GL3DBarChart.hxx|2 ++
 chart2/source/view/inc/GL3DRenderer.hxx|1 -
 chart2/source/view/main/GL3DRenderer.cxx   |   19 +++
 formula/source/ui/dlg/funcpage.cxx |   11 ---
 include/vcl/opengl/OpenGLContext.hxx   |6 --
 include/vcl/openglwin.hxx  |2 ++
 sc/source/filter/oox/workbookhelper.cxx|2 ++
 vcl/source/opengl/OpenGLContext.cxx|7 +++
 vcl/source/opengl/OpenGLHelper.cxx |6 +++---
 vcl/source/window/openglwin.cxx|2 ++
 11 files changed, 57 insertions(+), 15 deletions(-)

New commits:
commit 1ccbf70397adf07f1fe55f61c05ce1a741305cfc
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Jun 7 03:56:56 2014 +0200

don't try to import invalid document, fdo#79135

Change-Id: I3b601d629550078a8fa353bf838619f8d7b34718

diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 910d758..c3556c1 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -433,6 +433,8 @@ ScRangeData* WorkbookGlobals::createLocalNamedRangeObject(
 {
 ScDocument rDoc =  getScDocument();
 ScRangeName* pNames = rDoc.GetRangeName( nTab );
+if(!pNames)
+throw RuntimeException(invalid sheet index used);
 // find an unused name
 orName = findUnusedName( pNames, orName );
 // create the named range
commit 71697a721075a9bb34ac4308c5524c4df93ab98c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 23 03:01:35 2014 +0200

the variable is only available on linux

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index cba0b52..974f913 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -21,7 +21,7 @@ using namespace com::sun::star;
 
 GLWindow::~GLWindow()
 {
-#if defined( UNX )
+#if defined( UNX )  !defined MACOSX  !defined IOS  !defined ANDROID
 XFree(vi);
 #endif
 }
commit c9943f1d0d94b1138da78a17080213956e2fc248
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 23 02:24:56 2014 +0200

whitespace clean-up

Change-Id: I10bdfc3356bda66fefa59fa2c9f63f9231d8728e

diff --git a/formula/source/ui/dlg/funcpage.cxx 
b/formula/source/ui/dlg/funcpage.cxx
index dd21c15..252e461 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -57,10 +57,6 @@ bool FormulaListBox::PreNotify( NotifyEvent rNEvt )
 return nResult;
 }
 
-
-
-
-
 inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos )
 {
 // Category 0 == LRU, otherwise Categories == LbPos-1
@@ -70,8 +66,6 @@ inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos )
 return nLbPos;
 }
 
-
-
 FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
 TabPage(pParent,ModuleRes(RID_FORMULATAB_FUNCTION)),
 aFtCategory ( this, ModuleRes( FT_CATEGORY ) ),
@@ -108,7 +102,7 @@ void FuncPage::impl_addFunctions(const IFunctionCategory* 
_pCategory)
 TFunctionDesc pDesc(_pCategory-getFunction(i));
 aLbFunction.SetEntryData(
 aLbFunction.InsertEntry(pDesc-getFunctionName() ),(void*)pDesc );
-} // for(sal_uInt32 i = 0 ; i  nCount; ++i)
+}
 }
 
 void FuncPage::UpdateFunctionList()
@@ -194,10 +188,12 @@ void FuncPage::SetCategory(sal_Int32 nCat)
 aLbCategory.SelectEntryPos(nCat);
 UpdateFunctionList();
 }
+
 sal_Int32 FuncPage::GetFuncPos(const IFunctionDescription* _pDesc)
 {
 return aLbFunction.GetEntryPos(_pDesc);
 }
+
 void FuncPage::SetFunction(sal_Int32 nFunc)
 {
 aLbFunction.SelectEntryPos(nFunc);
@@ -227,6 +223,7 @@ OUString FuncPage::GetSelFunctionName() const
 {
 return aLbFunction.GetSelectEntry();
 }
+
 const IFunctionDescription* FuncPage::GetFuncDesc( sal_Int32 nPos ) const
 {
 // not pretty, but hopefully rare
commit 160f171417540ec5ee80630c7cc488c260206e33
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 23 02:13:28 2014 +0200

we only support GLX 1.3+

Change-Id: I2447498cf92da91a7fb2d67ee041d603ae16fe25

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index bceb8ff..608c9cb 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -96,7 +96,7 @@ struct GLWindow
 Display*   dpy;
 int screen;
 XLIB_Window win;
-#if defined( GLX_VERSION_1_3 )  defined( GLX_EXT_texture_from_pixmap )
+#if defined( GLX_EXT_texture_from_pixmap )
 GLXFBConfigfbc;
 #endif
 XVisualInfo*   vi;
@@ -123,7 +123,7 @@ struct GLWindow
 dpy(NULL),
 screen(0),
 win(0),
-#if defined( GLX_VERSION_1_3 )  defined( GLX_EXT_texture_from_pixmap )

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

 oox/source/drawingml/shape.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bd096081eb56a70cd6f65e5c957fa73cd5193f1d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sat Jun 7 03:43:47 2014 +0200

make sure all objects exist, related fdo#75692

fdo75692-2.xlsx and fdo#75692-3.xlsx crash.

Change-Id: I56353e7da1850a49e18d3a570641843600d34b1c

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8c97b87..0737830 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1249,7 +1249,8 @@ void Shape::finalizeXShape( XmlFilterBase rFilter, const 
Reference XShapes 
 {
 Reference chart2::data::XDataReceiver  xDataRec( 
xChartDoc, UNO_QUERY );
 Reference chart2::data::XDataSource  xData( 
xDataRec-getUsedData(), UNO_QUERY );
-if( xData-getDataSequences().getLength() = 0 || 
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
+if( xData-getDataSequences().getLength() = 0 || 
!xData-getDataSequences()[0]-getValues().is() ||
+
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
 {
 rFilter.useInternalChartDataTable( true );
 rFilter.getChartConverter()-convertFromModel( 
rFilter, aModel, xChartDoc, xExternalPage, mxShape-getPosition(), 
mxShape-getSize() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/window/openglwin.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit baf7b38e387b857c46dbe3d01cde166a7381bf63
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Jun 7 07:14:39 2014 +0200

fix Werror

diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index e0c2c59..28414ae 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -71,7 +71,6 @@ void OpenGLWindow::MouseButtonUp( const MouseEvent rMEvt )
 Point aPoint = rMEvt.GetPosPixel();
 if(aPoint == maStartPoint)
 {
-Color aColor = GetPixel(aPoint);
 mpRenderer-clickedAt(aPoint, rMEvt.GetButtons());
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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