LibreOffice Gerrit News for core on 2014-03-18

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ Hopefully fix Windows HiDPI toolbar layout bug
  in https://gerrit.libreoffice.org/8637 from Keith Curtis
  about module vcl
+ RID_SVXDLG_MULTIPATH dialog converted
  in https://gerrit.libreoffice.org/8614 from Szymon Kłos
  about module cui
+ fdo#75280 Started cleaning up of sal_uIntPtr usage.
  in https://gerrit.libreoffice.org/8631 from V V
  about module basic, include
+ Git: ignore autogen, doxygen and gdb config files
  in https://gerrit.libreoffice.org/8437 from Jan-Marek Glogowski
  about module build
 End of freshness 

+ fdo#56284 : /home/michael/.config does not exist Running instdir/program/
  in https://gerrit.libreoffice.org/8630 from Michaël Lefèvre
  about module sal
+ fdo#72775 : LibreOffice hang while opening some documents
  in https://gerrit.libreoffice.org/8632 from Tushar Bende
  about module sw, writerfilter
+ fdo#76074: Fix for LO crash on save
  in https://gerrit.libreoffice.org/8584 from Rohit Deshmukh
  about module sw
+ Replace UTF-8 no-break space to ASCII space
  in https://gerrit.libreoffice.org/8628 from Isamu Mogi
  about module include
+ fdo#76249 DOCX export DML Drawing as lockedCanvas if it's inside DMLTextF
  in https://gerrit.libreoffice.org/8618 from Vinaya Mandke
  about module oox, sw
+ fdo#76248: Fix for file corruption which contains Polyline shape.
  in https://gerrit.libreoffice.org/8623 from Rohit Deshmukh
  about module sw
+ Handle altname in docx's fonttable.xml
  in https://gerrit.libreoffice.org/8616 from Chris Sherlock
  about module writerfilter
+ fdo#74702 Moved ImplReleaseGraphics into correct classes
  in https://gerrit.libreoffice.org/8548 from Chris Sherlock
  about module include, vcl
+ fdo#74702 Moved CopyArea() Window specific function
  in https://gerrit.libreoffice.org/8605 from Chris Sherlock
  about module include, vcl
+ Cleanup vcl/inc/unx/salgdi.h
  in https://gerrit.libreoffice.org/8601 from Chris Sherlock
  about module vcl
+ fdo#74702 ImplPrintMask() implemented in Printer
  in https://gerrit.libreoffice.org/8593 from Chris Sherlock
  about module include, vcl
+ fdo#74702 DrawOutDev() and CopyArea() functions now noops in Printer
  in https://gerrit.libreoffice.org/8592 from Chris Sherlock
  about module include, vcl
+ fdo#74702 Move BitmapEx drawing code to seperate functions
  in https://gerrit.libreoffice.org/8588 from Chris Sherlock
  about module include, vcl
+ fdo#74702 Move gradient steps logic into OutputDevice or Printer classes
  in https://gerrit.libreoffice.org/8586 from Chris Sherlock
  about module include, vcl


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

+ fdo#76108 : The RT file is getting corrupted.
  in https://gerrit.libreoffice.org/8603 from Sourav Mahajan
+ FDO#76107 : RT file gets corrupted for files having paragraph/page commen
  in https://gerrit.libreoffice.org/8602 from Umesh Kadam
+ fdo#76109: LO Crashes while opening the docx file containing three fields
  in https://gerrit.libreoffice.org/8589 from Dinesh Patil
+ fdo#47355: partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22
  in https://gerrit.libreoffice.org/8606 from Björn Michaelsen
+ fdo#76122: File Corruption-doc contains nested alternateContents.
  in https://gerrit.libreoffice.org/8575 from Yogesh Bharate
+ fdo#76098 ContentType for .xlsm external data file  is wrong
  in https://gerrit.libreoffice.org/8572 from Ravindra Vidhate
+ fdo#75604: File Corruption - Issue related to the nested AlternateContent
  in https://gerrit.libreoffice.org/8555 from Yogesh Bharate
+ FDO#76013 : If original file has image whose link is broken RT gets corru
  in https://gerrit.libreoffice.org/8549 from Umesh Kadam
+ fdo#67808 Fix Outline Font Effect support with CoreText
  in https://gerrit.libreoffice.org/8599 from Norbert Thiebaud


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

+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn


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

+ WIP: Converting ExtensionUpdate dialog for new format
  in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ sal: use posix_memalign only if it's available
  in https://gerrit.libreoffice.org/8405 from Douglas Mencken
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in https://gerrit.libreoffice.org/8160 from Andras Timar
+ fd0#74150:Numbered list getting display after RT -table-within-table-1.do
  in h

[GSoc 14] On "Improve Text Boxes in Draw" - towards a more specific description and starting directions

[Matteo Campanelli]

Hi all,
I'm Matteo, I'm planning to apply for GSoC and I'm wondering if anyone
could answer a few questions on the GSoC idea proposal in the subject
([1]
).
Some specific tasks that would be involved in this project are not totally
clear to me yet.
Simply enough, the general problem seems to be that of enhancing text
frames in Draw.
Quoting from the official description, some missing features of text frames
are:
(my personal comments and questions right indented below each item)

- *"text background color":*

It seems to me that it is possible to specify a text box background in
color in Draw. Are we then referring to background color of the text only?
Would that be, in other words, some colored rectangle around only part of
the text in the box (a bit like text background color in Writer)?

- *"flow of contents from one frame to another":*

I am not sure I know what we are talking about here, but I would imagine it
as "The text in a frame may (dynamically) constitute part of the text in
another frame".
Let me illustrate this: Alice has two text frames, named respectively TF1
and TF2. The text in TF1 may look like:
"""
Lorem ipsum...
As illustrated in the box above:
[TF2.text]
Ut enim ad minim...
"""
Here, the macro TF2.text would expand to whatever text is contained in the
other frame.
Is this in any way close to what the project description is talking about?
Is there already something like this in Draw or LO in general, i..e ways.
to reference other objects' properties explicitly?

- *"hyphenation":*

About this point, I wanted to ask a more technical and at the same time
general type of question:
from the documentation on the class ImpEditEngine
([2])
I see that there are getters and setters for "hyphenators" and a method
called ImpBreakLine. This suggests to me that ImpEditEngine may be involved
directly in how or whether hyphenation is done in text frames.
How does this class actually works?
What are its responsibilities (since it seems to deal with a LOT of stuff)?
Could anyone exemplify or point how this class affects hyphenation in, say,
Writer or any other parts of LO? (or alternatively could anyone redirect me
to some semi-digestible snippets of code in LOI see  where this magic
happens?)


- *"support of style":*

I see that Draw already has a "Style and Formatting" dialog offering
several options. What would be the specific enhancements for this point?


I had a hard time finding which source files in sd/ are strictly related to
text frames, could anyone please give me a direction for that?
(textapi.{hxx,cxx} by any chance?)

I'm still a little bit confused on the specific scope/aim of the items
above, does anyone have an opinion on how much/which parts of this project
idea would be sensible to incorporate in a concrete proposal for the summer?

Thank you for your time.
Best,
Matteo

References:
[1] Original GSoC idea description
(link
)
[2] Reference documentation for ImpEditEngine
(link
)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Takeshi Abe]

 vcl/source/gdi/cvtsvm.cxx   |   15 --
 vcl/source/gdi/dibtools.cxx |   63 ++--
 2 files changed, 33 insertions(+), 45 deletions(-)

New commits:
commit bb17844099ba98a77c8e5d7a25c0c416a4b0641e
Author: Takeshi Abe 
Date:   Tue Mar 18 11:41:20 2014 +0900

Avoid possible resource leaks by boost::scoped_array

Change-Id: I54a175ce1e4cb624d94770ee849d97675987e7b2

diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index d547cc1..598d800 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -30,6 +30,7 @@
 #include 
 
 #include 
+#include 
 
 // Inlines
 void ImplReadRect( SvStream& rIStm, Rectangle& rRect )
@@ -851,7 +852,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 
 case( GDI_TEXTARRAY_ACTION ):
 {
-sal_Int32*  pDXAry = NULL;
 sal_Int32   nIndex, nLen, nAryLen;
 
 ReadPair( rIStm, aPt ).ReadInt32( nIndex ).ReadInt32( nLen 
).ReadInt32( nTmp ).ReadInt32( nAryLen );
@@ -864,11 +864,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 
 OUString aStr(OStringToOUString(aByteStr, 
eActualCharSet));
 
+boost::scoped_array pDXAry;
 if (nAryLen > 0)
 {
 sal_Int32 nStrLen( aStr.getLength() );
 
-pDXAry = new sal_Int32[ std::max( nAryLen, nStrLen 
) ];
+pDXAry.reset(new sal_Int32[ std::max( nAryLen, 
nStrLen ) ]);
 
 for (sal_Int32 j = 0; j < nAryLen; ++j)
 rIStm.ReadInt32( nTmp ), pDXAry[ j ] = nTmp;
@@ -878,9 +879,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 {
 if( nAryLen+1 == nStrLen )
 {
-sal_Int32* pTmpAry = new 
sal_Int32[nStrLen];
+boost::scoped_array pTmpAry(new 
sal_Int32[nStrLen]);
 
-aFontVDev.GetTextArray( aStr, pTmpAry, 
nIndex, nLen );
+aFontVDev.GetTextArray( aStr, 
pTmpAry.get(), nIndex, nLen );
 
 // now, the difference between the
 // last and the second last DX array
@@ -893,8 +894,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 pDXAry[ nStrLen-1 ] = pDXAry[ 
nStrLen-2 ] + pTmpAry[ nStrLen-1 ] - pTmpAry[ nStrLen-2 ];
 else
 pDXAry[ nStrLen-1 ] = pTmpAry[ 
nStrLen-1 ]; // len=1: 0th position taken to be 0
-
-delete[] pTmpAry;
 }
 #ifdef DBG_UTIL
 else
@@ -904,9 +903,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 }
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
-rMtf.AddAction( new MetaTextArrayAction( aPt, aStr, 
pDXAry, nIndex, nLen ) );
-
-delete[] pDXAry;
+rMtf.AddAction( new MetaTextArrayAction( aPt, aStr, 
pDXAry.get(), nIndex, nLen ) );
 }
 rIStm.Seek( nActBegin + nActionSize );
 }
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 9802557..7d5d670 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 // - Defines -
 
@@ -260,10 +260,10 @@ bool ImplReadDIBPalette( SvStream& rIStm, 
BitmapWriteAccess& rAcc, bool bQuad )
 const sal_uLong nPalSize = nColors * ( bQuad ? 4UL : 3UL );
 BitmapColor aPalColor;
 
-sal_uInt8* pEntries = new sal_uInt8[ nPalSize ];
-rIStm.Read( pEntries, nPalSize );
+boost::scoped_array pEntries(new sal_uInt8[ nPalSize ]);
+rIStm.Read( pEntries.get(), nPalSize );
 
-sal_uInt8* pTmpEntry = pEntries;
+sal_uInt8* pTmpEntry = pEntries.get();
 for( sal_uInt16 i = 0; i < nColors; i++ )
 {
 aPalColor.SetBlue( *pTmpEntry++ );
@@ -276,8 +276,6 @@ bool ImplReadDIBPalette( SvStream& rIStm, 
BitmapWriteAccess& rAcc, bool bQuad )
 rAcc.SetPaletteColor( i, aPalColor );
 }
 
-delete[] pEntries;
-
 return( rIStm.GetError() == 0UL );
 }
 
@@ -447,7 +445,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, 
BitmapWriteAccess& r
 {
 const long nWidth(rHeader.nWidth);
 const long nHeig

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

[Kohei Yoshida]

 editeng/source/items/borderline.cxx |5 -
 include/editeng/borderline.hxx  |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 87efec9cc27b18aa09e50c289b503ba1127eb0b8
Author: Kohei Yoshida 
Date:   Mon Mar 17 21:00:26 2014 -0400

Make this non-inline.

Change-Id: I2002f7278b63b7678a5274e4213ab9dfb50e525e

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index d3eef13..d58f8c3 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -618,7 +618,10 @@ Color SvxBorderLine::GetColorGap( ) const
 return aResult;
 }
 
-
+void SvxBorderLine::SetWidth( long nWidth )
+{
+m_nWidth = nWidth;
+}
 
 OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
   SfxMapUnit eDestUnit,
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 3465a02..c080a94 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -86,7 +86,7 @@ namespace editeng {
 boolHasGapColor() const { return m_pColorGapFn != NULL; }
 Color   GetColorGap() const;
 
-voidSetWidth( long nWidth = 0 ) { m_nWidth = nWidth; }
+void SetWidth( long nWidth = 0 );
 /** Guess the style and width from the three lines widths values.
 
 When the value of nStyle is SvxBorderLine::DOUBLE, the style set 
will be guessed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sw/source/core/layout/paintfrm.cxx |   63 +++--
 1 file changed, 27 insertions(+), 36 deletions(-)

New commits:
commit d2eb2c5a02718b83475bc718e117eb6255cbac98
Author: Kohei Yoshida 
Date:   Mon Mar 17 19:41:07 2014 -0400

fdo#76195: Set the border type to NONE to ensure it won't be drawn.

We can no longer rely on the width being zero for no border condition.

Change-Id: I02c5c825661b4a0aa4190306e8276bdfd8bff944

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 41aadc1..57d662d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -108,13 +108,6 @@ using ::drawinglayer::primitive2d::BorderLinePrimitive2D;
 using ::std::pair;
 using ::std::make_pair;
 
-//subsidiary lines enabled?
-#define IS_SUBS_TABLE \
-(pGlobalShell->GetViewOptions()->IsTable() && \
-!pGlobalShell->GetViewOptions()->IsPagePreview()&&\
-!pGlobalShell->GetViewOptions()->IsReadonly()&&\
-!pGlobalShell->GetViewOptions()->IsFormView() &&\
- SwViewOption::IsTableBoundaries())
 //other subsidiary lines enabled?
 #define IS_SUBS (!pGlobalShell->GetViewOptions()->IsPagePreview() && \
 !pGlobalShell->GetViewOptions()->IsReadonly() && \
@@ -260,6 +253,27 @@ static sal_Bool bTableHack = sal_False;
 //To optimize the expensive RetouchColor determination
 Color aGlobalRetoucheColor;
 
+namespace {
+
+bool isTableBoundariesEnabled()
+{
+if (!pGlobalShell->GetViewOptions()->IsTable())
+return false;
+
+if (pGlobalShell->GetViewOptions()->IsPagePreview())
+return false;
+
+if (pGlobalShell->GetViewOptions()->IsReadonly())
+return false;
+
+if (pGlobalShell->GetViewOptions()->IsFormView())
+return false;
+
+return SwViewOption::IsTableBoundaries();
+}
+
+}
+
 // Set borders alignment statics.
 // adjustment for 'small' twip-to-pixel relations:
 // For 'small' twip-to-pixel relations (less then 2:1)
@@ -2540,8 +2554,10 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) const
 const Color* pTmpColor = 0;
 if (0 == aStyles[ 0 ].GetWidth())
 {
-if (IS_SUBS_TABLE && pGlobalShell->GetWin())
+if (isTableBoundariesEnabled() && pGlobalShell->GetWin())
 aStyles[ 0 ].Set( rCol, rCol, rCol, false, 1, 0, 0 );
+else
+aStyles[0].SetType(table::BorderLineStyle::NONE);
 }
 else
 pTmpColor = pHCColor;
@@ -4242,12 +4258,8 @@ void SwTabFrm::Paint(SwRect const& rRect, SwPrintData 
const*const) const
 PaintShadow( rRect, aRect, rAttrs );
 }
 
-if (pViewOption->IsTableBoundaries())
-{
-// fdo#75118 Paint border lines only when it's enabled.
-SwTabFrmPainter aHelper(*this);
-aHelper.PaintLines(*pGlobalShell->GetOut(), rRect);
-}
+SwTabFrmPainter aHelper(*this);
+aHelper.PaintLines(*pGlobalShell->GetOut(), rRect);
 }
 
 SwLayoutFrm::Paint( rRect );
@@ -6482,7 +6494,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const 
SwPageFrm *pPage,
 /// Refreshes all subsidiary lines of a page.
 void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const
 {
-if ( IS_SUBS || IS_SUBS_TABLE || IS_SUBS_SECTION || IS_SUBS_FLYS )
+if ( IS_SUBS || isTableBoundariesEnabled() || IS_SUBS_SECTION || 
IS_SUBS_FLYS )
 {
 SwRect aRect( rRect );
 if ( aRect.HasArea() )
commit 1c6fb266567c8e397e3c65663b21f0fa50696aa5
Author: Kohei Yoshida 
Date:   Mon Mar 17 19:11:35 2014 -0400

fdo#75260: These old hacks no longer make sense.

The clip region in fact cuts off the lower part of the bottom border, both
on screen and when printing / exporting to PDF.

Change-Id: Id350531f09b3ded66fd05ea7ebeefe8771260b62

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 120634e..41aadc1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2420,9 +2420,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) const
 // #i16816# tagged pdf support
 SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, rDev );
 
-const SwFrm* pTmpFrm = &mrTabFrm;
-const bool bVert = pTmpFrm->IsVertical();
-
 SwLineEntryMapConstIter aIter = maHoriLines.begin();
 bool bHori = true;
 
@@ -2440,17 +2437,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) const
 rDev.SetDrawMode( 0 );
 }
 
-// set clip region:
-rDev.Push( PUSH_CLIPREGION );
-Size aSize( rRect.SSize() );
-// Hack! Necessary, because the layout is not pixel aligned!
-aSize.Width() += nPixelSzW; aSize.Height() += nPixelSzH;
-rDev.SetClipRegion(Region(Rectangle(rRect.Pos(), aSize)));
-
-// The 

[Libreoffice-commits] core.git: chart2/source drawinglayer/Library_drawinglayer.mk drawinglayer/source include/drawinglayer include/svx svx/Library_svxcore.mk svx/source

[Zolnai Tamás]

 chart2/source/view/main/OpenglShapeFactory.cxx |2 
 drawinglayer/Library_drawinglayer.mk   |3 
 drawinglayer/source/primitive2d/openglprimitive2d.cxx  |   38 

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |6 +
 drawinglayer/source/processor2d/vclprocessor2d.cxx |   10 ++
 drawinglayer/source/processor2d/vclprocessor2d.hxx |3 
 include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx |1 
 include/drawinglayer/primitive2d/openglprimitive2d.hxx |   42 
+
 include/svx/sdr/contact/viewcontactofopengl.hxx|   35 
+++
 include/svx/svdobj.hxx |1 
 include/svx/svdoopengl.hxx |   27 
++
 include/svx/unoshape.hxx   |7 +
 svx/Library_svxcore.mk |1 
 svx/source/sdr/contact/viewcontactofopengl.cxx |   44 
++
 svx/source/svdraw/svdobj.cxx   |2 
 svx/source/unodraw/unomod.cxx  |4 
 svx/source/unodraw/unopage.cxx |3 
 svx/source/unodraw/unoprov.cxx |1 
 18 files changed, 227 insertions(+), 3 deletions(-)

New commits:
commit 374efa7253703b054e4603c66aeba862e4e98574
Author: Zolnai Tamás 
Date:   Mon Mar 17 22:03:14 2014 +0100

Skeleton of drawinglayer object called OpenGLObject

- Shape name: com.sun.star.drawing.OpenGLObject
- Drawinglayer object: SdrOpenGLObject
- Uno object: SvxOpenGLObject
- View contact: ViewContactOfOpenGL
- Primitive: OpenGLPrimitive2D

Change-Id: I7fc0829d58cb4a8432d0e3007c90223707e5dd84

diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx 
b/chart2/source/view/main/OpenglShapeFactory.cxx
index ecc30f4..ce8db18 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -122,7 +122,7 @@ uno::Reference< drawing::XShapes > 
OpenglShapeFactory::getOrCreateChartRootShape
 SAL_WARN("chart2.opengl", "getOrCreateChartRootShape");
 
 uno::Reference< drawing::XShape > xTarget 
(m_xShapeFactory->createInstance(
-"com.sun.star.drawing.GraphicObjectShape" ), uno::UNO_QUERY );
+"com.sun.star.drawing.OpenGLObject" ), uno::UNO_QUERY );
 dummy::DummyChart *pChart = new dummy::DummyChart(xTarget);
 SvxDummyShapeContainer* pContainer = new 
SvxDummyShapeContainer(pChart);
 pContainer->setSize(awt::Size(0,0));
diff --git a/drawinglayer/Library_drawinglayer.mk 
b/drawinglayer/Library_drawinglayer.mk
index 21242a6..a4ef767 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
 tk \
 tl \
 vcl \
-   $(gb_UWINAPI) \
+$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
 drawinglayer/source/primitive2d/metafileprimitive2d \
 drawinglayer/source/primitive2d/modifiedcolorprimitive2d \
 drawinglayer/source/primitive2d/objectinfoprimitive2d \
+drawinglayer/source/primitive2d/openglprimitive2d \
 drawinglayer/source/primitive2d/pagepreviewprimitive2d \
drawinglayer/source/primitive2d/patternfillprimitive2d \
 drawinglayer/source/primitive2d/pointarrayprimitive2d \
diff --git a/drawinglayer/source/primitive2d/openglprimitive2d.cxx 
b/drawinglayer/source/primitive2d/openglprimitive2d.cxx
new file mode 100644
index 000..48724df
--- /dev/null
+++ b/drawinglayer/source/primitive2d/openglprimitive2d.cxx
@@ -0,0 +1,38 @@
+/* -*- 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 
+#include 
+
+
+namespace drawinglayer
+{
+namespace primitive2d
+{
+
+OpenGLPrimitive2D::OpenGLPrimitive2D(const Point& rPos)
+: m_aPos(rPos)
+{
+}
+
+bool OpenGLPrimitive2D::operator==( const BasePrimitive2D& rPrimitive 
) const
+{
+if(BasePrimitive2D::operator==(rPrimitive))
+{
+const OpenGLPrimitive2D& rCompare = static_cast< const 
OpenGLPrimitive2D& >(rPrimitive);
+return m_aPos == rCompare.getPos();
+}
+return false;
+}
+
+ImplPrimitive2DIDBlock(OpenGLPrimitive2D, 
PRIMITIVE2D_ID_OPENGLPRIMITIVE2D)
+  

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

[Kohei Yoshida]

 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 ca25cdcb398f200ce5d53286eea02d49d8d1c5f4
Author: Kohei Yoshida 
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

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] mso-dumper.git: msodumper/xlsrecord.py msodumper/xlsstream.py

[Eike Rathke]

 msodumper/xlsrecord.py |   51 -
 msodumper/xlsstream.py |   21 ++--
 2 files changed, 69 insertions(+), 3 deletions(-)

New commits:
commit f0e8c8fea614960d28cc2e52fd32d02dbdebd01f
Author: Eike Rathke 
Date:   Mon Mar 17 23:06:02 2014 +0100

added some record IDs and implemented FeatureData for 0x0868 FEAT

FEAT actually is a collection of records of which FEATHDR specifies the
common data, for example enhanced protection. FEAT contains sequences of
ranges the feature is applied to.

Also, FEAT was wrongly named RANGEPROTECTION (probably from the OOo
documentation).

Added names of IDs in the range 0x086? to 0x088?

See
http://msdn.microsoft.com/en-us/library/dd945945.aspx
http://msdn.microsoft.com/en-us/library/dd907085.aspx
http://msdn.microsoft.com/en-us/library/dd911261.aspx

diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py
index 9a51fc7..b3cbece 100644
--- a/msodumper/xlsrecord.py
+++ b/msodumper/xlsrecord.py
@@ -2636,6 +2636,8 @@ class FeatureHeader(BaseRecordHandler):
 featureTypeText = 'unknown'
 if featureTypeId == 2:
 featureTypeText = 'enhanced protection'
+elif featureTypeId == 3:
+featureTypeText = 'ignored formula errors'
 elif featureTypeId == 4:
 featureTypeText = 'smart tag'
 featureHdr = self.readUnsignedInt(1) # must be 1
@@ -2649,7 +2651,7 @@ class FeatureHeader(BaseRecordHandler):
 self.appendLine("size of header data: %d (%s)"%(sizeHdrData, 
sizeHdrDataText))
 
 if featureTypeId == 2 and sizeHdrData == -1:
-# enhanced protection optionsss
+# enhanced protection options
 flags = self.readUnsignedInt(4)
 self.appendLine("enhanced protection flag: 0x%8.8X"%flags)
 
@@ -2686,6 +2688,53 @@ class FeatureHeader(BaseRecordHandler):
 
 return
 
+class FeatureData(BaseRecordHandler):
+
+def parseBytes (self):
+recordType = self.readUnsignedInt(2)
+frtFlag = self.readUnsignedInt(2) # currently 0
+self.readBytes(8) # reserved (currently all 0)
+featureTypeId = self.readUnsignedInt(2)
+featureTypeText = 'unknown'
+if featureTypeId == 2:
+featureTypeText = 'enhanced protection'
+elif featureTypeId == 3:
+featureTypeText = 'ignored formula errors'
+elif featureTypeId == 4:
+featureTypeText = 'smart tag'
+self.readBytes(1) # reserved1, must be 0
+self.readBytes(4) # reserved2, must be 0
+cref = self.readUnsignedInt(2)
+cbFeatData = self.readUnsignedInt(4)
+cbFeatDataText = 'byte size'
+self.readBytes(2) # reserved3, must be 0
+
+refs = []
+for i in xrange(0, cref):
+refs.append(Ref8U(self))
+
+self.appendLine("record type: 0x%4.4X (must match the 
header)"%recordType)
+self.appendLine("feature type: %d (%s)"%(featureTypeId, 
featureTypeText))
+self.appendLine("size of feature data: %d (%s)"%(cbFeatData, 
cbFeatDataText))
+
+# http://msdn.microsoft.com/en-us/library/dd911261.aspx
+# Documentation isn't very clear on this, for cbFeatData it says must
+# be 0 if 'isf' (featureTypeId) is not ISFFEC2 (type 3) but for rgbFeat
+# (the variable data field) lists structures for each of the possible
+# types. However, so far there was no FeatProtection structure data for
+# ISFPROTECTION encountered.
+
+if featureTypeId == 3 and cbFeatData > 0:
+# ignored formula errors, ISFFEC2, FeatFormulaErr2 structure
+self.readBytes(cbFeatData)
+self.appendLine("FeatFormulaErr2 yet not handled")
+
+for ref in refs:
+self.appendLine("applied to range: (col=%d,row=%d) - 
(col=%d,row=%d)"%
+(ref.col1, ref.row1, ref.col2, ref.row2))
+
+return
+
 class ShrFmla(BaseRecordHandler):
 
 def __parseBytes (self):
diff --git a/msodumper/xlsstream.py b/msodumper/xlsstream.py
index 945c5a8..0f514ee 100644
--- a/msodumper/xlsstream.py
+++ b/msodumper/xlsstream.py
@@ -143,6 +143,7 @@ recData = {
 0x00E1: ["INTERFACEHDR", "Beginning of User Interface Records"],
 0x00E2: ["INTERFACEEND", "End of User Interface Records"],
 0x00E3: ["SXVS", "PivotCache Source Data Type", xlsrecord.SXViewSource],
+0x00E5: ["MERGECELLS", "Merged cells in the document"],
 0x00EA: ["TABIDCONF", "Sheet Tab ID of Conflict History"],
 0x00EB: ["MSODRAWINGGROUP", "Microsoft Office Drawing Group", 
xlsrecord.MSODrawingGroup],
 0x00EC: ["MSODRAWING", "Microsoft Office Drawing", xlsrecord.MSODrawing],
@@ -215,10 +216,26 @@ recData = {
 0x0862: ["SHEETLAYOUT", "Tab Color below Sheet Name"],
 0x0863: ["BOOKEXT", "Extra Book Info"],
 0x0864: ["SXADDL", "Pivot Table Additional Info", xlsrecord.SXAddlInfo],
-0x086

[GSoC] Dialog Widget Conversion

[Szymon Kłos]

Hi all,
My name is Szymon Kłos. I study at the Gdansk University of Technology
and I would like to participate in GSoC 2014. The "Dialog Widget
Conversion" proposal is interesting for me, because I've been learning
GTK.

Instead of bug fixing, I convert my first dialog and I would be grateful
if someone look at my change.

https://gerrit.libreoffice.org/#/c/8614/

Szymon Kłos,
IRC: sk94

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

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

--- Comment #7 from Tor Lillqvist  ---
That is some branch of Clang you have to build yourself, not the Clang in the
Xcode product from Apple.

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

[peilin]

 chart2/source/view/main/DummyXShape.cxx  |   14 --
 chart2/source/view/main/OpenGLRender.cxx |   10 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit c33d96aa8bbe94761b609215951a64e380856cac
Author: peilin 
Date:   Mon Mar 17 10:48:46 2014 +0800

modify SetBackGroundColor to fix background color and gradients issue

Change-Id: Ie2ffa39f6aad8df127e99109618a64fb0d32599e

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index e0b5f21..bdec565 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -720,10 +720,11 @@ void DummyRectangle::render()
 }
 
 bool bFill = true;
+drawing::FillStyle eStyle = drawing::FillStyle_NONE;
 itr = maProperties.find("FillStyle");
 if(itr != maProperties.end())
 {
-drawing::FillStyle eStyle = itr->second.get();
+eStyle = itr->second.get();
 if(eStyle == drawing::FillStyle_NONE)
 {
 bFill = false;
@@ -735,15 +736,8 @@ void DummyRectangle::render()
 {
 uno::Any co =  itr->second;
 sal_Int32 nColorValue = co.get();
-
-itr = maProperties.find("FillTransparence");
-sal_uInt8 nAlpha = 255;
-if(itr != maProperties.end())
-{
-uno::Any al = itr->second;
-nAlpha = 255 - al.get()/100.0*255;
-}
-pChart->m_GLRender.SetBackGroundColor(nColorValue, nColorValue, 
nAlpha);
+//here FillStyle works for background color and gradients
+pChart->m_GLRender.SetBackGroundColor(nColorValue, nColorValue, 
eStyle);
 }
 
 bool bBorder = true;
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 72e0c27..689925a 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1304,7 +1304,7 @@ int OpenGLRender::RenderArea2DShape()
 return 0;
 }
 
-void OpenGLRender::SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, 
sal_uInt8 nAlpha)
+void OpenGLRender::SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, 
sal_uInt8 fillStyle)
 {
 sal_uInt8 r = (color1 & 0x00FF) >> 16;
 sal_uInt8 g = (color1 & 0xFF00) >> 8;
@@ -1313,12 +1313,12 @@ void OpenGLRender::SetBackGroundColor(sal_uInt32 
color1, sal_uInt32 color2, sal_
 m_BackgroundColor[0] = (float)r / 255.0f;
 m_BackgroundColor[1] = (float)g / 255.0f;
 m_BackgroundColor[2] = (float)b / 255.0f;
-m_BackgroundColor[3] = nAlpha / 255.0f;
+m_BackgroundColor[3] = fillStyle ? 1.0 : 0.0;
 
 m_BackgroundColor[4] = (float)r / 255.0f;
 m_BackgroundColor[5] = (float)g / 255.0f;
 m_BackgroundColor[6] = (float)b / 255.0f;
-m_BackgroundColor[7] = nAlpha / 255.0f;
+m_BackgroundColor[7] = fillStyle ? 1.0 : 0.0;
 
 r = (color2 & 0x00FF) >> 16;
 g = (color2 & 0xFF00) >> 8;
@@ -1327,12 +1327,12 @@ void OpenGLRender::SetBackGroundColor(sal_uInt32 
color1, sal_uInt32 color2, sal_
 m_BackgroundColor[8] = (float)r / 255.0f;
 m_BackgroundColor[9] = (float)g / 255.0f;
 m_BackgroundColor[10] = (float)b / 255.0f;
-m_BackgroundColor[11] = nAlpha / 255.0f;
+m_BackgroundColor[11] = fillStyle ? 1.0 : 0.0;
 
 m_BackgroundColor[12] = (float)r / 255.0f;
 m_BackgroundColor[13] = (float)g / 255.0f;
 m_BackgroundColor[14] = (float)b / 255.0f;
-m_BackgroundColor[15] = nAlpha / 255.0f;
+m_BackgroundColor[15] = fillStyle ? 1.0 : 0.0;
 SAL_INFO("chart2.opengl", "color1 = " << color1 << ", color2 = " << 
color2);
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

--- Comment #6 from Markus Mohrhard  ---
According to http://openmp.llvm.org/ it seems to be supported nowadays but in
the end as it is not code it does not matter too much. If a compiler does not
support OpenMP it will just ignore the directives and not generate parallel
code and fall back to the sequential version.

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

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

--- Comment #5 from Tor Lillqvist  ---
And actually I think Clang doesn't support OpenMP when compiling for OS X
either (if at all). But yeah, it shouldn't be hard to check.

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

Re: need CONFIRMATION about images linked to a http location

[Fernand Vanrie]

Thanks,
 found the bug myself now , only when using the option "Use LibreOffice 
Dialogs" the bug is happening , when using System dialogs , the Http 
locations can been used


i fill a issue

Fernand Vanrie schreef op 17/03/2014 17:30:

With 4.2.2.1 windows

Pictures in Writer and Html documents linked to a http location no 
longer opens and can no longer been inserted what makes the use of 
images in a HTML doc imposible


A picture "linked" to "http://pmg.pmgroup.be/enews/idb/grafiek9.jpg"; 
can been opened and viewed in a writer and Html doc until 4.0 but no 
longer since  4.2


you can use the link to test

is it a bug or wanted behaviour ?

Greetz

Fernand




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


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

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

[Jacobo Aragunde Pérez]

 sw/qa/extras/ooxmlexport/data/simple-sdts.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   16 
 sw/source/filter/ww8/docxattributeoutput.cxx   |   31 ++---
 writerfilter/source/dmapper/DomainMapper.cxx   |4 +++
 writerfilter/source/ooxml/model.xml|8 +++---
 5 files changed, 46 insertions(+), 13 deletions(-)

New commits:
commit 6820dec8903b182260340c638c35b5a5ca207a85
Author: Jacobo Aragunde Pérez 
Date:   Mon Mar 17 20:53:35 2014 +0100

ooxml: preserve several simple types of sdt

This patch is to preserve the sdt blocks for several simple sdt types:
equation, picture, citation and group.

This patch reuses the infrastructure created at commit
55211e612d2cbed03dd81c039d07ea4e936c2804 to grab-bag the properties of
the sdt block and write them back on export, with small modifications
in particular related with the fact that these tags don't have
children.

The type of the property tags equation, picture, citation and group
was modified in the ooxml model file to be able to process them. They
were previously empty.

A unit test was added to check the preservation of these fields.
Another had to be modified.

Change-Id: Ica1a340f589f5d6c85c1a35d2a3a4bf930eb2d8a

diff --git a/sw/qa/extras/ooxmlexport/data/simple-sdts.docx 
b/sw/qa/extras/ooxmlexport/data/simple-sdts.docx
new file mode 100644
index 000..294ae79
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/simple-sdts.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ed5eb96..3b0728f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2805,7 +2805,7 @@ DECLARE_OOXMLEXPORT_TEST(testCitation,"FDO74775.docx")
 xmlDocPtr pXmlDoc = parseExport();
 if (!pXmlDoc)
 return;
-xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[1]/w:r[3]/w:instrText");
+xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[3]/w:instrText");
 xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
 OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
 CPPUNIT_ASSERT(contents.match(" CITATION [Kra06]"));
@@ -2862,6 +2862,20 @@ DECLARE_OOXMLEXPORT_TEST(test76108, "test76108.docx")
 assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:fldChar[1]", "fldCharType", "begin");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testSimpleSdts, "simple-sdts.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if (!pXmlDoc)
+   return;
+
+assertXPath(pXmlDoc, "/w:body/w:sdt/w:sdtPr/w:picture", 0);
+assertXPath(pXmlDoc, "/w:body/w:sdt/w:sdtPr/w:group", 0);
+assertXPath(pXmlDoc, "/w:body/w:sdt/w:sdtPr/w:citation", 0);
+
+}
+
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 42ca6bd..f3c97d0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -382,16 +382,23 @@ void DocxAttributeOutput::WriteParagraphSdt()
 
 // output sdt properties
 m_pSerializer->startElementNS( XML_w, XML_sdtPr, FSEND );
-m_pSerializer->startElement( m_nSdtPrToken, FSEND );
 
-uno::Sequence aChildren = 
m_pSdtPrTokenChildren->getFastAttributes();
-for( sal_Int32 i=0; i < aChildren.getLength(); ++i )
-m_pSerializer->singleElement( aChildren[i].Token,
-  FSNS(XML_w, XML_val),
-  rtl::OUStringToOString( 
aChildren[i].Value, RTL_TEXTENCODING_UTF8 ).getStr(),
-  FSEND );
+if( m_pSdtPrTokenChildren )
+{
+m_pSerializer->startElement( m_nSdtPrToken, FSEND );
+
+uno::Sequence aChildren = 
m_pSdtPrTokenChildren->getFastAttributes();
+for( sal_Int32 i=0; i < aChildren.getLength(); ++i )
+m_pSerializer->singleElement( aChildren[i].Token,
+  FSNS(XML_w, XML_val),
+  rtl::OUStringToOString( 
aChildren[i].Value, RTL_TEXTENCODING_UTF8 ).getStr(),
+  FSEND );
+
+m_pSerializer->endElement( m_nSdtPrToken );
+}
+else
+m_pSerializer->singleElement( m_nSdtPrToken, FSEND );
 
-m_pSerializer->endElement( m_nSdtPrToken );
 m_pSerializer->endElementNS( XML_w, XML_sdtPr );
 
 // sdt contents start tag
@@ -6889,6 +6896,14 @@ void DocxAttributeOutput::ParaGrabBag(const 
SfxGrabBagItem& rItem)
 AddToAttrList( m_pSdtPrTokenChildren, FSNS( XML_w, 
XML_docPartUnique ), "" );
 }
 }
+

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

--- Comment #4 from Tor Lillqvist  ---
It is not supported in Clang for iOS, as far as I know.

-- 
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 'aoo/trunk' - instsetoo_native/util solenv/bin

[Raphael Bircher]

 instsetoo_native/util/makefile.mk|7 ---
 instsetoo_native/util/openoffice.lst |   59 ---
 instsetoo_native/util/pack.lst   |1 
 solenv/bin/modules/installer/download.pm |7 ---
 4 files changed, 74 deletions(-)

New commits:
commit 42430a090a66ca04ed507a4ab28b98a4dc7c7747
Author: Raphael Bircher 
Date:   Mon Mar 17 18:28:10 2014 +

Removal of wJRE look at issue #124432

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 2577150..7c8c756 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -78,7 +78,6 @@ help .PHONY :
 @echo "aoo_srcrelease packs the source release package"
 @echo "updatepack"
 @echo "openofficedev  devloper snapshot"
-@echo "openofficewithjre"
 @echo "ooolanguagepack"
 @echo "ooobetalanguagepack"
 @echo "ooodevlanguagepack"
@@ -185,7 +184,6 @@ openoffice:
 openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
 openofficebeta: $(foreach,i,$(alllangiso) openofficebeta_$i)
-openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
 ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
 ooobetalanguagepack : $(foreach,i,$(alllangiso) ooobetalanguagepack_$i)
 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
@@ -223,7 +221,6 @@ $(foreach,i,$(alllangiso) openoffice_$i) : adddeps
 openoffice_$(defaultlangiso).archive : adddeps
 $(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
 $(foreach,i,$(alllangiso) openofficebeta_$i) : adddeps $(BETA_LOGO_SPLASH)
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
 $(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : adddeps
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
@@ -236,7 +233,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
 # where $language ranges over all languages in $(alllangiso) 
 # and $package ranges over all package formats in $(PKGFORMAT)
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) openofficebeta_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
@@ -281,9 +277,6 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) 
openoffice_$L.$P)) .PHO
 $(PRJ)$/util$/update.xml   \
 > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-#openofficewithjre_%{$(PKGFORMAT:^".")} :
-$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) 
openofficewithjre_$L.$P)) .PHONY :
-$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate 
$(MSIOFFICETEMPLATEDIR)
 
 #openofficedev_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficedev_$L.$P)) 
.PHONY :
diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
old mode 100755
new mode 100644
index e2e8401..4ed8f31
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -111,65 +111,6 @@ Apache_OpenOffice
 }
 }
 
-Apache_OpenOffice_wJRE
-{
-Settings
-{
-variables
-{
-FULLPRODUCTNAME Apache OpenOffice
-PRODUCTNAME OpenOffice
-PRODUCTVERSION 4.1.0
-PRODUCTEXTENSION 
-LONG_PRODUCTEXTENSION 
-SHORT_PRODUCTEXTENSION 
-POSTVERSIONEXTENSION
-POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 4
-USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.1.0
-BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
-ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-ADDSYSTEMINTEGRATION 1
-EVAL
-PACKAGEVERSION 4.1.0
-PACKAGEREVISION {milestone}
-LICENSENAME ALv2
-WITHJREPRODUCT 1
-GLOBALFILEGID gid_File_Lib_Vcl
-GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-SPELLCHECKERFILE spellchecker_selection.txt
-OPENSOURCE 1
-SETSTATICPATH 1
-AOODOWNLOADNAME 1
-AOODOWNLOADNAMEPREFIX Apache_OpenOffice_wJRE
-XPDINSTALLER 1
-BETAUPGRADECODE
-STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-CHANGETARGETDIR 1
-USE_FILEVERSION 1
-LIBRARYVERSION 10.0.0
-PATCHCODEFILE ooo_patchcodes.txt
-JAVAPRODUCT 1
-DOWNLOADBANNER ooobanner.bmp
-DOWNLOADBITMAP ooobitmap.bmp
-   

Re: [libreoffice-users] need CONFIRMATION about images linked to a http location

[Fernand Vanrie]

Dries , all,

Thanks, ist a bug , found it  myself now , only when using the option 
"Use LibreOffice Dialogs" the bug is happening , when using System 
dialogs , the Http locations can been used


i fill a issue

Greetz

Fernandnd

Fernand,

I just tried this in 4.2.2.1 as well, and this works just fine: I
created a new file and inserted an image through insert image from
file.

Met vriendelijke groeten, Salutations distinguées, Kind Regards,

DRIES FEYS
CORPORATE SERVICES • Specialist Software Developer

TVH GROUP NV
Brabantstraat 15 • BE-8790 WAREGEM
T +32 56 43 42 11 • F +32 56 43 44 88 • www.tvh.com
Watch our company movies on www.tvh.tv


On 17 March 2014 17:30, Fernand Vanrie  wrote:

With 4.2.2.1 windows

Pictures in Writer and Html documents linked to a http location no longer
opens and can no longer been inserted what makes the use of images in a HTML
doc imposible

A picture "linked" to "http://pmg.pmgroup.be/enews/idb/grafiek9.jpg"; can
been opened and viewed in a writer and Html doc until 4.0 but no longer
since  4.2

you can use the link to test

is it a bug or wanted behaviour ?

Greetz

Fernand



--
To unsubscribe e-mail to: users+unsubscr...@global.libreoffice.org
Problems?
http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://listarchives.libreoffice.org/global/users/
All messages sent to this list will be publicly archived and cannot be
deleted



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

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

--- Comment #3 from Markus Mohrhard  ---
(In reply to comment #2)
> I guess it should be pointed out that the use of OpenMP should be optional,
> or is that obvious?

OpenMP is supported by all our compilers but in general that is not a big
problem as OpenMP contains just some compiler directives that are ignored by
compilers that don't understand them.

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

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

--- Comment #2 from Tor Lillqvist  ---
I guess it should be pointed out that the use of OpenMP should be optional, or
is that obvious?

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

[Bug 76290] use OpenMP for image algorithms

[bugzilla-daemon]

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

Markus Mohrhard  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Whiteboard||EasyHack
   ||DifficultyInteresting
   ||SkillCpp TopicCleanup
 CC||libreoffice@lists.freedeskt
   ||op.org
 Ever confirmed|0   |1

--- Comment #1 from Markus Mohrhard  ---
Making it an Easy Hack.

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

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

[Manas Joshi]

 sc/qa/unit/ucalc.cxx |  193 +--
 1 file changed, 80 insertions(+), 113 deletions(-)

New commits:
commit de226dcfaeedf7f77de4f0242a713bc7e4462a0a
Author: Manas Joshi 
Date:   Mon Mar 17 10:00:47 2014 +

fdo#76181 - cleanup OUString constructors

Change-Id: I0a5fbfc0b33b16e0eba7410957ab83ffbff4e008

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3626502..3fdf42f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -463,10 +463,8 @@ void Test::testPerf()
 
 void Test::testCollator()
 {
-OUString s1("A");
-OUString s2("B");
 CollatorWrapper* p = ScGlobal::GetCollator();
-sal_Int32 nRes = p->compareString(s1, s2);
+sal_Int32 nRes = p->compareString("A", "B");
 CPPUNIT_ASSERT_MESSAGE("these strings are supposed to be different!", nRes 
!= 0);
 }
 
@@ -697,19 +695,16 @@ void Test::testMarkData()
 
 void Test::testInput()
 {
-OUString aTabName("foo");
-CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
-m_pDoc->InsertTab (0, aTabName));
 
-OUString numstr("'10.5");
-OUString str("'apple'");
+CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
+m_pDoc->InsertTab (0, "foo"));
 OUString test;
 
-m_pDoc->SetString(0, 0, 0, numstr);
+m_pDoc->SetString(0, 0, 0, "'10.5");
 test = m_pDoc->GetString(0, 0, 0);
 bool bTest = test == "10.5";
 CPPUNIT_ASSERT_MESSAGE("String number should have the first apostrophe 
stripped.", bTest);
-m_pDoc->SetString(0, 0, 0, str);
+m_pDoc->SetString(0, 0, 0, "'apple'");
 test = m_pDoc->GetString(0, 0, 0);
 bTest = test == "'apple'";
 CPPUNIT_ASSERT_MESSAGE("Text content should have retained the first 
apostrophe.", bTest);
@@ -937,9 +932,8 @@ void Test::testCopyToDocument()
 
 //note on A1
 ScAddress aAdrA1 (0, 0, 0); // numerical cell content
-OUString aHelloA1("Hello world in A1");
 ScPostIt* pNote = m_pDoc->GetOrCreateNote(aAdrA1);
-pNote->SetText(aAdrA1, aHelloA1);
+pNote->SetText(aAdrA1, "Hello world in A1");
 
 // Copy statically to another document.
 
@@ -1639,12 +1633,12 @@ void Test::testCellBroadcaster()
 
 void Test::testFuncParam()
 {
-OUString aTabName("foo");
+
 CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
-m_pDoc->InsertTab (0, aTabName));
+m_pDoc->InsertTab (0, "foo"));
 
 // First, the normal case, with no missing parameters.
-m_pDoc->SetString(0, 0, 0, OUString("=AVERAGE(1;2;3)"));
+m_pDoc->SetString(0, 0, 0, "=AVERAGE(1;2;3)");
 m_pDoc->CalcFormulaTree(false, false);
 double val;
 m_pDoc->GetValue(0, 0, 0, val);
@@ -1652,17 +1646,17 @@ void Test::testFuncParam()
 
 // Now function with missing parameters.  Missing values should be treated
 // as zeros.
-m_pDoc->SetString(0, 0, 0, OUString("=AVERAGE(1;;;)"));
+m_pDoc->SetString(0, 0, 0, "=AVERAGE(1;;;)");
 m_pDoc->CalcFormulaTree(false, false);
 m_pDoc->GetValue(0, 0, 0, val);
 CPPUNIT_ASSERT_MESSAGE("incorrect result", val == 0.25);
 
 // Conversion of string to numeric argument.
-m_pDoc->SetString(0, 0, 0, OUString("=\"\"+3"));// empty string
-m_pDoc->SetString(0, 1, 0, OUString("=\" \"+3"));   // only blank
-m_pDoc->SetString(0, 2, 0, OUString("=\" 4 \"+3")); // number in blanks
-m_pDoc->SetString(0, 3, 0, OUString("=\" x \"+3")); // non-numeric
-m_pDoc->SetString(0, 4, 0, OUString("=\"4.4\"+3")); // locale dependent
+m_pDoc->SetString(0, 0, 0, "=\"\"+3");// empty string
+m_pDoc->SetString(0, 1, 0, "=\" \"+3");   // only blank
+m_pDoc->SetString(0, 2, 0, "=\" 4 \"+3"); // number in blanks
+m_pDoc->SetString(0, 3, 0, "=\" x \"+3"); // non-numeric
+m_pDoc->SetString(0, 4, 0, "=\"4.4\"+3"); // locale dependent
 
 OUString aVal;
 ScCalcConfig aConfig;
@@ -1795,7 +1789,7 @@ void Test::testNamedRange()
 }
 
 // Test usage in formula expression.
-m_pDoc->SetString (1, 0, 0, OUString("=A1/Divisor"));
+m_pDoc->SetString (1, 0, 0, "=A1/Divisor");
 m_pDoc->CalcAll();
 
 double result;
@@ -2015,8 +2009,7 @@ void Test::testMatrix()
 
 pMat->PutBoolean(true, 1, 1);
 pMat->PutDouble(-12.5, 4, 5);
-OUString aStr("Test");
-pMat->PutString(rPool.intern(aStr), 8, 2);
+pMat->PutString(rPool.intern("Test"), 8, 2);
 pMat->PutEmptyPath(8, 11);
 checkMatrixElements(*pMat);
 
@@ -2124,7 +2117,7 @@ void Test::testCellCopy()
 ScAddress aSrc(0,0,0);
 ScAddress aDest(0,1,0);
 OUString aStr("please copy me");
-m_pDoc->SetString(aSrc, aStr);
+m_pDoc->SetString(aSrc, "please copy me");
 CPPUNIT_ASSERT_EQUAL(m_pDoc->GetString(aSrc), aStr);
 // copy to self - why not ?
 m_pDoc->CopyCellToDocument(aSrc,aDest,*m_pDoc);
@@ -2154,9 +2147,8 @@ void Test::testSheetCopy()
 
 // insert a note
 ScAddress aAdrA1 (0,2,0); // empty cell con

[Libreoffice-commits] buildbot.git: 3 commits - loperf/loperf.sh

[Matúš Kukan]

 loperf/loperf.sh |   47 ---
 1 file changed, 32 insertions(+), 15 deletions(-)

New commits:
commit 4604b5f717805bee981149cb2b58c41ecedd6278
Author: Matúš Kukan 
Date:   Mon Mar 17 19:42:48 2014 +0100

loperf: Print smaller numbers into history file.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 4ee5f6d..aefd35d 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -124,7 +124,7 @@ function write_data {
 # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
 CEst=$(expr ${data[0]} + 10 \* $(expr ${data[12]} + ${data[10]}) + 10 \* 
$(expr ${data[3]} + ${data[4]} + ${data[5]}) + 20 \* ${data[13]} + 100 \* 
$(expr ${data[6]} + ${data[7]} + ${data[8]}))
 echo $'\t'$CEst >> "$CSV_FN"
-echo -n ",$CEst" >> "$CSV_HISTORY"
+echo -n ",$(expr ${CEst} / 100)" >> "$CSV_HISTORY"
 }
 
 # Do a clean launch
commit ed5a94f515c9cc021eb7656981c8b406615617dd
Author: Matúš Kukan 
Date:   Mon Mar 17 16:45:11 2014 +0100

loperf: Test plain load of documents separately and then convert them.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 880d5a8..4ee5f6d 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -58,21 +58,29 @@ CSV_HISTORY="logs/history.csv"
 
 mkdir -p logs/callgrind > /dev/null 2>&1
 mkdir -p "$CSV_LOG_DIR" > /dev/null 2>&1
-test -f "$CSV_HISTORY" || echo -e "time,git-commit,offload$(ls $DOCUMENTSDIR/* 
| sed s%$DOCUMENTSDIR/%,%g | tr -d '\n')" > "$CSV_HISTORY"
+test -f "$CSV_HISTORY" || echo 
"time,git-commit,offload-first,offload-second$(ls ${DOCUMENTSDIR}/* | sed 
"s%${DOCUMENTSDIR}/% %g" | while read f; do echo -n ",$f-load,$f-convert"; 
done)" > "$CSV_HISTORY"
 
 function launch {
 
 if test "$1" = "offload"; then
 export OOO_EXIT_POST_STARTUP=1
-valgrind --tool=callgrind --callgrind-out-file="$CG_LOG"-offload.log 
--simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes 
"$OFFICEBIN" --splash-pipe=0 --headless > /dev/null 2>&1
+CG_OUT_FILE="${CG_LOG}-offload-${2}.log"
+valgrind --tool=callgrind --callgrind-out-file="${CG_OUT_FILE}" 
--simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes 
"$OFFICEBIN" --splash-pipe=0 --headless > /dev/null 2>&1
 unset OOO_EXIT_POST_STARTUP
-echo -n "$CG_LOG"-offload.log
 else
-fn=${1#$DOCUMENTSDIR\/}
-ext=${fn##*.}
-valgrind --tool=callgrind 
--callgrind-out-file="$CG_LOG"-onload-"$fn".log --simulate-cache=yes 
--dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" 
--splash-pipe=0 --headless --convert-to "$ext" --outdir tmp "$1" > /dev/null 
2>&1
-echo -n "$CG_LOG"-onload-"$fn".log
+if test "$2" = "load"; then
+export OOO_EXIT_POST_STARTUP=1
+CG_OUT_FILE="${CG_LOG}-onload-${fn}-${2}.log"
+valgrind --tool=callgrind --callgrind-out-file="${CG_OUT_FILE}" 
--simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes 
"$OFFICEBIN" --splash-pipe=0 --headless "$1" > /dev/null 2>&1
+unset OOO_EXIT_POST_STARTUP
+else
+fn=${1#$DOCUMENTSDIR\/}
+ext=${fn##*.}
+CG_OUT_FILE="${CG_LOG}-onload-${fn}-${2}.log"
+valgrind --tool=callgrind --callgrind-out-file="${CG_OUT_FILE}" 
--simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes 
"$OFFICEBIN" --splash-pipe=0 --headless --convert-to "$ext" --outdir tmp "$1" > 
/dev/null 2>&1
+fi
 fi
+echo -n "${CG_OUT_FILE}"
 }
 
 # Mapping the data to array:
@@ -95,7 +103,7 @@ function launch {
 echo -n "$TESTDATE","$LOVERSION" >> "$CSV_HISTORY"
 
 function write_data {
-cur_log=$(launch "$1")
+cur_log=$(launch "${1}" "${2}")
 
 data=($(grep '^summary:' "$cur_log" | sed s/"summary: "//))
 
@@ -105,7 +113,7 @@ function write_data {
 if test "$1" = "offload"; then
 CSV_FN="${CSV_LOG_DIR}/offload-${2}.csv"
 else
-CSV_FN="${CSV_LOG_DIR}/onload-${1#$DOCUMENTSDIR\/}.csv"
+CSV_FN="${CSV_LOG_DIR}/onload-${1#$DOCUMENTSDIR\/}-${2}.csv"
 fi
 
 echo -n "$TESTDATE"$'\t'"$LOVERSION" >> "$CSV_FN"
@@ -129,7 +137,10 @@ $(write_data "offload" "second")
 # Loaded launch one by one
 echo "Start onload pvt..."
 find $DOCUMENTSDIR -type f |  grep -Ev "\/\." | while read f; do
-$(write_data "$f")
+echo "loading ${f}.."
+$(write_data "$f" "load")
+echo "converting ${f}.."
+$(write_data "$f" "convert")
 done
 
 echo "" >> "$CSV_HISTORY"
commit 1ea68a205d904cb8c7a10cbe9dfb18f904dd7fb6
Author: Matúš Kukan 
Date:   Mon Mar 17 16:24:03 2014 +0100

loperf: Remove user directory before first start; and then start again.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index c0a31b2..880d5a8 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -62,7 +62,7 @@ test -f "$CSV_HISTORY" || echo -e 
"time,git-commit,offload$(ls $DOCUMENTSDIR/* |
 
 function launch {
 
-if test "$1" = ""; then
+if test "$1" = "offload

[Libreoffice-commits] core.git: 2 commits - configure.ac framework/source idl/inc idl/source

[Matúš Kukan]

 configure.ac   |2 +-
 framework/source/services/autorecovery.cxx |8 +---
 idl/inc/database.hxx   |2 ++
 idl/source/objects/types.cxx   |   24 ++--
 idl/source/prj/database.cxx|1 +
 5 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 4f4d9c06355b64ae30e0c100be0ca55d01c16885
Author: Matúš Kukan 
Date:   Mon Mar 17 11:36:31 2014 +0100

Avoid duplicate symbols in libmerged for Windows too.

This is working version of fc27a685d466dc380a8b68cd48f47db632ed3693

Change-Id: I48e861b5b7692ea051edf52d7ad9cc54ca989e22

diff --git a/configure.ac b/configure.ac
index cbe3f3b..f372fe03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12461,11 +12461,11 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" 
!= "no"; then
 if test "$enable_mergelibs" = "all"; then
 MERGELIBS="ALL"
 URELIBS="TRUE"
+AC_DEFINE(STATIC_LINKING)
 else
 MERGELIBS="CORE"
 fi
 AC_MSG_RESULT([yes])
-AC_DEFINE(STATIC_LINKING)
 else
 AC_MSG_RESULT([no])
 fi
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 15e87f2..f9abfd2 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -81,6 +81,8 @@ protected:
 aIFaceName = OString();
 }
 public:
+OUString sSlotMapFile;
+
 explicit SvIdlDataBase( const SvCommand& rCmd );
 ~SvIdlDataBase();
 static sal_Bool IsBinaryFormat( SvStream & rInStm );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 1797fa2..265be88 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1398,7 +1398,7 @@ sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
 }
 
 void SvMetaType::WriteSfxItem(
-const OString& rItemName, SvIdlDataBase &, SvStream & rOutStm )
+const OString& rItemName, SvIdlDataBase& rBase, SvStream& rOutStm )
 {
 WriteStars( rOutStm );
 OStringBuffer aVarName(" a");
@@ -1411,14 +1411,34 @@ void SvMetaType::WriteSfxItem(
 OString::number(nAttrCount));
 aTypeName.append(aAttrCount);
 
-rOutStm.WriteCharPtr( "extern " ).WriteCharPtr( aTypeName.getStr() )
+bool bExport = false, bReturn = false;
+// these are exported from sfx library
+if (rItemName == "SfxBoolItem" ||
+rItemName == "SfxStringItem" ||
+rItemName == "SfxUInt16Item" ||
+rItemName == "SfxUInt32Item" ||
+rItemName == "SfxVoidItem")
+{
+bExport = true;
+if (!rBase.sSlotMapFile.endsWith("sfxslots.hxx"))
+bReturn = true;
+}
+
+rOutStm.WriteCharPtr( "extern " );
+if (bExport)
+rOutStm.WriteCharPtr( "SFX2_DLLPUBLIC " );
+rOutStm.WriteCharPtr( aTypeName.getStr() )
.WriteCharPtr( aVarName.getStr() ).WriteChar( ';' ) << endl;
+if (bReturn)
+return;
 
 // write the implementation part
 rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl;
 rOutStm.WriteCharPtr( "#if !defined(_WIN32) && 
((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || 
STATIC_LINKING)" ) << endl;
 rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl;
 rOutStm.WriteCharPtr( "#endif" ) << endl;
+if (bExport)
+rOutStm.WriteCharPtr( "SFX2_DLLPUBLIC " );
 rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() 
)
.WriteCharPtr( " = " ) << endl;
 rOutStm.WriteChar( '{' ) << endl;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 3ac165d..04f351c 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -34,6 +34,7 @@ SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
 , aPersStream( *IDLAPP->pClassMgr, NULL )
 , pIdTable( NULL )
 {
+sSlotMapFile = rCmd.aSlotMapFile;
 }
 
 SvIdlDataBase::~SvIdlDataBase()
commit ef87ff6680f79362a431db6e7ef2f40cfc576219
Author: Matúš Kukan 
Date:   Fri Mar 14 09:42:02 2014 +0100

fdo#51819: autorecovery: fix saving password in protected documents.

Thanks to s...@mailinator.com for the idea.

Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index 980e92b..4ebd694 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3233,9 +3233,11 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
 // if the document was loaded with a password, it should be
 // stored with password
 utl::MediaDescriptor lNewArgs;
-OUString sPassword = 
lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), 
OUString());
-if (!sPassword.isEmpty())
-lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] <<= sPassword;
+css::uno::Sequence< css::beans::NamedValue > aEncryptionData =
+
lOldArgs.getUnpackedValueOrDefault(u

Need suggestion, Regarding fdo#62957 and GSOC..

[Sujay m]

Hi all,
I've introduced myself and shown my interest in the GSOC idea  Follow-me
slideshow..

I have just started my open source development. Its been 2 months with LO,
and have taken up 3 bugs,
fdo#42788,fdo#
64290  and
fdo#62957
..

Well i started with fdo#42788, the change i proposed to the mailing list,
honestly i was a beginner so the change i proposed was very silly, so
didn't submit to the gerrit..
Then, with fdo#64290, i had to do real hardwork, it was a very easy hack in
the end, but since it was my first time with huge source code i took three
weeks to hack it.. I have submitted the patch to gerrit..

Well, the thing is when i got information about GSOC, it occured to me that
it is the perfect program to kick start my open source involvement.. But i
am not sure i will be able to do it because, i have taken 3 weeks to solve
an easy hack..
So, i decided that i will submit a second patch on fdo#62957, based on my
performance in that regard i would take a decision to whether or not
participate in the program (that is if i get mentored)..

Can some body help me with my new hack, providing some code pointers, or
keywords that would help me find it through opengrok. I ve limited time to
apply to GSOC.. I ve done some research myself.. I ve gone through the code
pointer specified in the bug description..And also i found that
NotifyCurrentSlideChange() in SlsCurrentSlideManager.cxx has info about the
new slide.. There is similar property in writer, it resumes from the last
save point.. Code pointer related to it would help a lot..

My proposal for GSOC is ready on Follow-me slideshow though, but am going
to submit in a day, after completing my hack..
I would like to participate and get involved, will i get mentored for it??
Suggestions and guidance are most welcomed.

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

Re: Bad empty file at

[Christian Lohmaier]

Hi Andreas, *,

On Mon, Mar 17, 2014 at 6:37 PM, Andreas Mantke
 wrote:
> Am 16.03.2014 22:38, schrieb Thorsten Behrens:
>> Hi Andi,
>>
>> any chance for a quick fix there?
>
> I have not working in this area on our server.

The ball was played to you since maybe you could generate a suitable
xml from the extensions repository :-)

> But cloph or Alex should
> be in the know.
>
> +1 for Stephans proposal and fix the file on the server.

Putting some file on the server is not a problem. But getting a valid
file is trickier :-)

putting a static xml file into the webroot is not the issue.

I put a minimalist atom-rss with no elements in there...

Not sure whether that is enough to make the check happy or not..

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

Re: Bad empty file at

[Andreas Mantke]

Hi Thorsten, Stephan, *,

Am 16.03.2014 22:38, schrieb Thorsten Behrens:
> Hi Andi,
>
> any chance for a quick fix there?

I have not working in this area on our server. But cloph or Alex should
be in the know.

+1 for Stephans proposal and fix the file on the server.

Regards,
Andreas

>
> Thanks a lot, Thorsten
>
> Stephan Bergmann wrote:
>> (...)
>> "I see three options to fix this:
>>
>> "1  Fix the file at 
>> 
>> to conform to the expected syntax (even if it would not contain any
>> true payload yet, but could do so in the future).  That would fix
>> this issue even for already released versions of LO.
>> (...)
>>
>> "I favour option 1 and will see to get hold of somebody to fix the
>> file at 
>> ."
>>
>> So, who can fix that file (or propose a better fix)?
>>
>> Stephan
>


-- 
Andreas Mantke 
Twitter: @andreaslibo Skype: andreaslibo
The Document Foundation, Kurfürstendamm 188, 10707 Berlin, Germany
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint 




smime.p7s
Description: S/MIME Cryptographic Signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 framework/source/accelerators/acceleratorcache.cxx |   71 ++---
 framework/source/inc/accelerators/acceleratorcache.hxx |3 
 2 files changed, 12 insertions(+), 62 deletions(-)

New commits:
commit c5630fed3b30f6d5fd0b2692cd96e34e419f9a6c
Author: Stephan Bergmann 
Date:   Mon Mar 17 18:28:40 2014 +0100

Use SolarMutexGuard directly

Change-Id: I5286db18d3d273f4678c9f332d5184b46e5bb720

diff --git a/framework/source/accelerators/acceleratorcache.cxx 
b/framework/source/accelerators/acceleratorcache.cxx
index d54cbf9..bdbbdb6 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -20,7 +20,6 @@
 #include 
 
 #include 
-#include 
 
 #include 
 
@@ -33,13 +32,11 @@ namespace framework
 
 
 AcceleratorCache::AcceleratorCache()
-: ThreadHelpBase(&Application::GetSolarMutex())
 {
 }
 
 
 AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
-: ThreadHelpBase(&Application::GetSolarMutex())
 {
 m_lCommand2Keys = rCopy.m_lCommand2Keys;
 m_lKey2Commands = rCopy.m_lKey2Commands;
@@ -55,14 +52,9 @@ AcceleratorCache::~AcceleratorCache()
 
 void AcceleratorCache::takeOver(const AcceleratorCache& rCopy)
 {
-// SAFE -> --
-Guard aWriteLock(m_aLock);
-
+SolarMutexGuard g;
 m_lCommand2Keys = rCopy.m_lCommand2Keys;
 m_lKey2Commands = rCopy.m_lKey2Commands;
-
-aWriteLock.unlock();
-// <- SAFE --
 }
 
 
@@ -75,30 +67,22 @@ AcceleratorCache& AcceleratorCache::operator=(const 
AcceleratorCache& rCopy)
 
 sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const
 {
-// SAFE -> --
-Guard aReadLock(m_aLock);
-
+SolarMutexGuard g;
 return (m_lKey2Commands.find(aKey) != m_lKey2Commands.end());
-// <- SAFE --
 }
 
 
 sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const
 {
-// SAFE -> --
-Guard aReadLock(m_aLock);
-
+SolarMutexGuard g;
 return (m_lCommand2Keys.find(sCommand) != m_lCommand2Keys.end());
-// <- SAFE --
 }
 
 
 AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
 {
+SolarMutexGuard g;
 TKeyList lKeys;
-
-// SAFE -> --
-Guard aReadLock(m_aLock);
 lKeys.reserve(m_lKey2Commands.size());
 
 TKey2Commands::const_iterator pIt;
@@ -110,9 +94,6 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() 
const
 lKeys.push_back(pIt->first);
 }
 
-aReadLock.unlock();
-// <- SAFE --
-
 return lKeys;
 }
 
@@ -120,8 +101,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() 
const
 void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey,
  const OUString&sCommand)
 {
-// SAFE -> --
-Guard aWriteLock(m_aLock);
+SolarMutexGuard g;
 
 // register command for the specified key
 m_lKey2Commands[aKey] = sCommand;
@@ -129,56 +109,34 @@ void AcceleratorCache::setKeyCommandPair(const 
css::awt::KeyEvent& aKey,
 // update optimized structure to bind multiple keys to one command
 TKeyList& rKeyList = m_lCommand2Keys[sCommand];
 rKeyList.push_back(aKey);
-
-aWriteLock.unlock();
-// <- SAFE --
 }
 
 
 AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& 
sCommand) const
 {
-TKeyList lKeys;
-
-// SAFE -> --
-Guard aReadLock(m_aLock);
-
+SolarMutexGuard g;
 TCommand2Keys::const_iterator pCommand = m_lCommand2Keys.find(sCommand);
 if (pCommand == m_lCommand2Keys.end())
 throw css::container::NoSuchElementException(
 OUString(), css::uno::Reference< css::uno::XInterface >());
-lKeys = pCommand->second;
-
-aReadLock.unlock();
-// <- SAFE --
-
-return lKeys;
+return pCommand->second;
 }
 
 
 OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) 
const
 {
-OUString sCommand;
-
-// SAFE -> --
-Guard aReadLock(m_aLock);
-
+SolarMutexGuard g;
 TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey);
 if (pKey == m_lKey2Commands.end())
 throw css::container::NoSuchElementException(
 OUString(), css::uno::Reference< css::uno::XInterface >());
-sCommand = pKey->second;
-
-aReadLock.unlock();
-// <- SAFE --
-
-return sCommand;
+return pKey->second;
 }
 
 
 void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
 {
-// SAFE -> --
-Guard aWriteLock(m_aLock);
+SolarMutexGuard g;
 
 // c

[Libreoffice-commits] website.git: Branch 'tinderbox' - lib/HTMLPopUp

[Christian Lohmaier]

 lib/HTMLPopUp/OverLib.pm |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d01ca0164fc6b4ea4f7e8e29681a0f408e0414b9
Author: Christian Lohmaier 
Date:   Mon Mar 17 18:12:38 2014 +0100

there should always be a branch

diff --git a/lib/HTMLPopUp/OverLib.pm b/lib/HTMLPopUp/OverLib.pm
index c681059..dded379 100644
--- a/lib/HTMLPopUp/OverLib.pm
+++ b/lib/HTMLPopUp/OverLib.pm
@@ -1574,8 +1574,7 @@ sub page_header {
   my (%args) = @_;
   
   my ($label, $branch) = ($args{'title'} =~ /^([^:]*: )(.*)$/);
-  my $heading = $args{'title'};
-  $heading = "$label http://cgit.freedesktop.org/libreoffice/core/log/?h=".lc($branch)."\">$branch"
 unless ($branch =~ /^[A-Z]/);
+  my $heading = "$label http://cgit.freedesktop.org/libreoffice/core/log/?h=".lc($branch)."\">$branch"
 if ($branch);
 
   my ($html_time) = $main::LOCALTIME;
   $html_time =~ s/:[^:]+$//;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'tinderbox' - lib/HTMLPopUp

[Christian Lohmaier]

 lib/HTMLPopUp/OverLib.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 729706837726da83c3050003dc54cfb62fe68fb5
Author: Christian Lohmaier 
Date:   Mon Mar 17 18:05:18 2014 +0100

proper place for lowercasing the branch

diff --git a/lib/HTMLPopUp/OverLib.pm b/lib/HTMLPopUp/OverLib.pm
index bb9ec1f..c681059 100644
--- a/lib/HTMLPopUp/OverLib.pm
+++ b/lib/HTMLPopUp/OverLib.pm
@@ -1573,9 +1573,9 @@ sub page_header {
   my $self = shift @_;
   my (%args) = @_;
   
-  my ($label, $branch) = lc($args{'title'} =~ /^([^:]*: )(.*)$/);
+  my ($label, $branch) = ($args{'title'} =~ /^([^:]*: )(.*)$/);
   my $heading = $args{'title'};
-  $heading = "$label http://cgit.freedesktop.org/libreoffice/core/log/?h=$branch\";>$branch"
 unless ($branch =~ /^[A-Z]/);
+  $heading = "$label http://cgit.freedesktop.org/libreoffice/core/log/?h=".lc($branch)."\">$branch"
 unless ($branch =~ /^[A-Z]/);
 
   my ($html_time) = $main::LOCALTIME;
   $html_time =~ s/:[^:]+$//;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'tinderbox' - lib/HTMLPopUp

[Christian Lohmaier]

 lib/HTMLPopUp/OverLib.pm |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 81ddc7862568f904da06196d613eea0c8665c645
Author: Christian Lohmaier 
Date:   Mon Mar 17 18:01:45 2014 +0100

link to cgit log instead of eis

diff --git a/lib/HTMLPopUp/OverLib.pm b/lib/HTMLPopUp/OverLib.pm
index 42c7d45..bb9ec1f 100644
--- a/lib/HTMLPopUp/OverLib.pm
+++ b/lib/HTMLPopUp/OverLib.pm
@@ -1573,10 +1573,9 @@ sub page_header {
   my $self = shift @_;
   my (%args) = @_;
   
-  my ($label, $cws) = ($args{'title'} =~ /(.*)\W(\w+)\W*$/);
+  my ($label, $branch) = lc($args{'title'} =~ /^([^:]*: )(.*)$/);
   my $heading = $args{'title'};
-  my $codeline = TreeData::get_tree_codeline($cws); 
-  $heading = "$label http://eis.services.openoffice.org/EIS2/cws.ShowCWS?Path=$codeline/$cws\";>$cws"
 unless ($cws =~ /^[A-Z]/);
+  $heading = "$label http://cgit.freedesktop.org/libreoffice/core/log/?h=$branch\";>$branch"
 unless ($branch =~ /^[A-Z]/);
 
   my ($html_time) = $main::LOCALTIME;
   $html_time =~ s/:[^:]+$//;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

need CONFIRMATION about images linked to a http location

[Fernand Vanrie]

With 4.2.2.1 windows

Pictures in Writer and Html documents linked to a http location no 
longer opens and can no longer been inserted what makes the use of 
images in a HTML doc imposible


A picture "linked" to "http://pmg.pmgroup.be/enews/idb/grafiek9.jpg"; can 
been opened and viewed in a writer and Html doc until 4.0 but no longer 
since  4.2


you can use the link to test

is it a bug or wanted behaviour ?

Greetz

Fernand


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

[Libreoffice-commits] core.git: 2 commits - chart2/source dbaccess/source include/framework sfx2/source

[Stephan Bergmann]

 chart2/source/model/main/UndoManager.cxx   |   10 -
 dbaccess/source/ui/misc/dbaundomanager.cxx |   10 -
 include/framework/iguard.hxx   |   54 -
 include/framework/undomanagerhelper.hxx|7 ++-
 sfx2/source/doc/docundomanager.cxx |5 --
 5 files changed, 7 insertions(+), 79 deletions(-)

New commits:
commit d697a059057e27533e760beac3537fbcb5082884
Author: Stephan Bergmann 
Date:   Mon Mar 17 17:25:02 2014 +0100

Remove unused framework::IMutexGuard::reset

Change-Id: If05ef86284c4ed7bf66a6a6de17a4bf8d49e89e1

diff --git a/chart2/source/model/main/UndoManager.cxx 
b/chart2/source/model/main/UndoManager.cxx
index 44ce79e..e352fa2 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -156,7 +156,6 @@ namespace chart
 
 // IMutexGuard
 virtual void clear();
-virtual void reset();
 virtual ::framework::IMutex& getGuardedMutex();
 };
 
@@ -178,11 +177,6 @@ namespace chart
 {
 // nothing to do. This interface implementation is a dummy.
 }
-
-void UndoManagerMethodGuard::reset()
-{
-// nothing to do. This interface implementation is a dummy.
-}
 }
 
 //= UndoManager
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx 
b/dbaccess/source/ui/misc/dbaundomanager.cxx
index e2a24e9..538efbb 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -138,7 +138,6 @@ namespace dbaui
 
 // IMutexGuard
 virtual void clear();
-virtual void reset();
 virtual ::framework::IMutex& getGuardedMutex();
 
 private:
@@ -156,11 +155,6 @@ namespace dbaui
 m_aGuard.clear();
 }
 
-void UndoManagerMethodGuard::reset()
-{
-m_aGuard.reset();
-}
-
 // UndoManager
 UndoManager::UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& 
i_mutex )
 :m_pImpl( new UndoManager_Impl( *this, i_parent, i_mutex ) )
diff --git a/include/framework/undomanagerhelper.hxx 
b/include/framework/undomanagerhelper.hxx
index 77c0983..a82c681 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -48,10 +48,6 @@ namespace framework
 */
 virtual void clear() = 0;
 
-/** attempts to re-establishes the lock, blocking until the attempt is 
successful.
-*/
-virtual void reset() = 0;
-
 /** returns the mutex guarded by the instance.
 
 Even if the guard currently has not a lock on the mutex, this 
method must succeed.
diff --git a/sfx2/source/doc/docundomanager.cxx 
b/sfx2/source/doc/docundomanager.cxx
index 2c57d3e..a915d11 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -202,11 +202,6 @@ namespace sfx2
 {
 }
 
-virtual void reset()
-{
-m_guard.reset();
-}
-
 virtual void clear()
 {
 m_guard.clear();
commit 00550fbd193cb6184075dbe050002f567174e7ec
Author: Stephan Bergmann 
Date:   Mon Mar 17 17:08:22 2014 +0100

Fold framework::IGuard into framework::IMutexGuard

Change-Id: I14a77fc3fbf225862bc01f677d09d5b5a52bb1aa

diff --git a/chart2/source/model/main/UndoManager.cxx 
b/chart2/source/model/main/UndoManager.cxx
index 5916bef..44ce79e 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -155,11 +155,9 @@ namespace chart
 }
 
 // IMutexGuard
-virtual ::framework::IMutex& getGuardedMutex();
-
-// IGuard
 virtual void clear();
 virtual void reset();
+virtual ::framework::IMutex& getGuardedMutex();
 };
 
 class DummyMutex : public ::framework::IMutex
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx 
b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 260c57f..e2a24e9 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -137,11 +137,9 @@ namespace dbaui
 }
 
 // IMutexGuard
-virtual ::framework::IMutex& getGuardedMutex();
-
-// IGuard
 virtual void clear();
 virtual void reset();
+virtual ::framework::IMutex& getGuardedMutex();
 
 private:
 ::osl::ResettableMutexGuard m_aGuard;
diff --git a/include/framework/iguard.hxx b/include/framework/iguard.hxx
deleted file mode 100644
index 46071b4..000
--- a/include/framework/iguard.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at h

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

[Sourav]

 sw/qa/extras/ooxmlexport/data/test76108.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |7 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   15 ---
 3 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit d44abe1724ee5470c88f5fba5c0217fb37e2205c
Author: Sourav 
Date:   Sat Mar 15 12:48:18 2014 +0530

fdo#76108 : The RT file is getting corrupted.

Description:The RT file is getting corrupted.
The  tag is there inside the hyperlink tag 
where as the  is starting before the hyperlink 
tag.This is causing the issue.

The rootcause found is in DocxAttributeOutput::EndRun().
A check is introduced before the code that writes the  after the hyperlink to check if the m_startedHyperlink 
is false.

I have added test case to verify that now the RT file is opening
I also verified this change on a set of 440 real world documents 
(containing many combinations of MS Office features) to make sure there is no 
regression because of this change.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8603

Change-Id: Ibc3ca8edcfb68d52a9394580bac1ce878eda9405

diff --git a/sw/qa/extras/ooxmlexport/data/test76108.docx 
b/sw/qa/extras/ooxmlexport/data/test76108.docx
new file mode 100644
index 000..3476dc5
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/test76108.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index aea7db3..ed5eb96 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2854,6 +2854,13 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, 
"fdo76098.docx")
 
 }
 
+DECLARE_OOXMLEXPORT_TEST(test76108, "test76108.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc) return;
+//docx file after RT is getting corrupted.
+assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:fldChar[1]", "fldCharType", "begin");
+}
 
 #endif
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index eab3f90..42ca6bd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -827,13 +827,14 @@ void DocxAttributeOutput::EndRun()
 m_closeHyperlinkInThisRun = false;
 }
 
-while ( m_Fields.begin() != m_Fields.end() )
-{
-EndField_Impl( m_Fields.front( ) );
-if (m_Fields.front().pField)
-delete m_Fields.front().pField;
-m_Fields.erase( m_Fields.begin( ) );
-}
+if(!m_startedHyperlink)
+while ( m_Fields.begin() != m_Fields.end() )
+{
+EndField_Impl( m_Fields.front( ) );
+if (m_Fields.front().pField)
+delete m_Fields.front().pField;
+m_Fields.erase( m_Fields.begin( ) );
+}
 }
 
 void DocxAttributeOutput::DoWriteBookmarks()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - splitbuild/base.lst splitbuild/bm splitbuild/build.lst splitbuild/calc.lst splitbuild/common.lst splitbuild/content.lst splitbuild/draw.lst splitbu

[Andre Fischer]

 splitbuild/base.lst   |1 -
 splitbuild/bm |4 
 splitbuild/build.lst  |1 -
 splitbuild/calc.lst   |1 -
 splitbuild/common.lst |1 -
 splitbuild/content.lst|1 -
 splitbuild/draw.lst   |1 -
 splitbuild/extensions.lst |1 -
 splitbuild/filter.lst |1 -
 splitbuild/framework.lst  |1 -
 splitbuild/gui.lst|1 -
 splitbuild/prj/build.lst  |1 -
 splitbuild/prj/d.lst  |1 -
 splitbuild/start.lst  |1 -
 splitbuild/uno.lst|1 -
 splitbuild/writer.lst |1 -
 16 files changed, 19 deletions(-)

New commits:
commit 0864fe93d8e146cc2406013a004f6acdf5d2817b
Author: Andre Fischer 
Date:   Mon Mar 17 14:47:09 2014 +

124449: Removed unused module main/splitbuild.

diff --git a/splitbuild/base.lst b/splitbuild/base.lst
deleted file mode 100644
index cda4527..000
--- a/splitbuild/base.lst
+++ /dev/null
@@ -1 +0,0 @@
-reportdesign dbaccess
diff --git a/splitbuild/bm b/splitbuild/bm
deleted file mode 100755
index 16872f1..000
--- a/splitbuild/bm
+++ /dev/null
@@ -1,4 +0,0 @@
-build --genconf --clear
-build --genconf --add `cat $1`
-build --all $2 $3 $4 
-
diff --git a/splitbuild/build.lst b/splitbuild/build.lst
deleted file mode 100644
index e19d9ce..000
--- a/splitbuild/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native
diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst
deleted file mode 100644
index d9e4a9f..000
--- a/splitbuild/calc.lst
+++ /dev/null
@@ -1 +0,0 @@
-chart2 scaddins sccomp sc
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
deleted file mode 100644
index 5367cd5..000
--- a/splitbuild/common.lst
+++ /dev/null
@@ -1 +0,0 @@
-basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv 
eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl 
officecfg oovbaapi package pyuno rsc sax shell sot svl tools transex3 ucb 
ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/content.lst b/splitbuild/content.lst
deleted file mode 100644
index dd8d40c..000
--- a/splitbuild/content.lst
+++ /dev/null
@@ -1 +0,0 @@
-dictionaries extras helpcontent2
diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst
deleted file mode 100644
index 6f83eca..000
--- a/splitbuild/draw.lst
+++ /dev/null
@@ -1 +0,0 @@
-animations sd slideshow
diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst
deleted file mode 100644
index 86fe24b..000
--- a/splitbuild/extensions.lst
+++ /dev/null
@@ -1 +0,0 @@
-migrationanalysis reportbuilder sdext swext
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
deleted file mode 100644
index e69de29..000
diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst
deleted file mode 100644
index 9659e01..000
--- a/splitbuild/filter.lst
+++ /dev/null
@@ -1 +0,0 @@
-filter hwpfilter oox writerfilter writerperfect xmerge
\ No newline at end of file
diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst
deleted file mode 100644
index 30a9d55..000
--- a/splitbuild/framework.lst
+++ /dev/null
@@ -1 +0,0 @@
-automation avmedia basic basctl cui desktop drawinglayer svgio extensions 
forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper
diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst
deleted file mode 100644
index d642843..000
--- a/splitbuild/gui.lst
+++ /dev/null
@@ -1 +0,0 @@
-accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config 
setup_native svtools sysui toolkit UnoControls uui vcl
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
deleted file mode 100644
index 0356e8b..000
--- a/splitbuild/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-spl  splitbuild ::  postprocess NULL
diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst
deleted file mode 100644
index b87dd52..000
--- a/splitbuild/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-#dummy d.lst file
diff --git a/splitbuild/start.lst b/splitbuild/start.lst
deleted file mode 100644
index 3838044..000
--- a/splitbuild/start.lst
+++ /dev/null
@@ -1 +0,0 @@
-soltools
diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst
deleted file mode 100644
index db0ed74..000
--- a/splitbuild/uno.lst
+++ /dev/null
@@ -1 +0,0 @@
-autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools ucpp idlc io 
javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker 
readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 
udkapi udm unodevtools unoil ure xml2cmp
diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst
deleted file mode 100644
index 28bd99c..000
--- a/splitbuild/writer.lst
+++ /dev/null
@@ -1 +0,0 @@
-hwpfilter starmath sw writerfilter writerperfect
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/ma

[Libreoffice-commits] website.git: Branch 'tinderbox' - local_conf/TreeData.pm

[Christian Lohmaier]

 local_conf/TreeData.pm |   40 ++--
 1 file changed, 2 insertions(+), 38 deletions(-)

New commits:
commit 70452abfc998bd4e6a1096d8661c09670494e9df
Author: Christian Lohmaier 
Date:   Mon Mar 17 17:03:41 2014 +0100

remove obsolete trees

diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index 31a03fb..d95ab57 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -237,46 +237,10 @@ $VERSION = '#tinder_version#';
branch => 'libreoffice-4-1',
VCS  => 'GIT',
   },
-'libreoffice-4-0' =>  {
+'libreoffice-4-2' =>  {
root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
module => 'all',
-   branch => 'libreoffice-4-0',
-   VCS  => 'GIT',
-  },
-'libreoffice-3-6' =>  {
-   root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
-   module => 'all',
-   branch => 'libreoffice-3-6',
-   VCS  => 'GIT',
-  },
-'libreoffice-3-5' =>  {
-   root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
-   module => 'all',
-   branch => 'libreoffice-3-5',
-   VCS  => 'GIT',
-  },
-'libreoffice-3-4' =>  {
-   root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
-   module => 'all',
-   branch => 'libreoffice-3-4',
-   VCS  => 'GIT',
-  },
-'feature/gbuild_extensions' =>  {
-   root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
-   module => 'all',
-   branch => 'feature/gbuild_extensions',
-   VCS  => 'GIT',
-  },
-'feature/gbuild_cppuhelper' =>  {
-   root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
-   module => 'all',
-   branch => 'feature/gbuild_cppuhelper',
-   VCS  => 'GIT',
-  },
-'feature/gbuild_java' =>  {
-   root => 
'git://anongit.freedesktop.org/git/libreoffice/core',
-   module => 'all',
-   branch => 'feature/gbuild_java',
+   branch => 'libreoffice-4-2',
VCS  => 'GIT',
   },
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[umeshkadam]

 sw/qa/extras/ooxmlexport/data/paragraphWithComments.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   19 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   20 ++-
 3 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit ac5078a46632ef7efbdce9340c0b023d7f455d14
Author: umeshkadam 
Date:   Thu Mar 13 16:14:36 2014 +0530

FDO#76107 : RT file gets corrupted for files having paragraph/page comments

- In case of multiple paragraph comments/ page comments there used to be a
  mismatch while relating the comment id's in document.xml and comments.xml
- This was happening because the annotation mark id's were getting 
overwritten.
- Fixed this issue and added UT for the same.

Change-Id: Ie0ac6b5c86d143115a79b3fc146f9a4ef5fc
Reviewed-on: https://gerrit.libreoffice.org/8602
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/paragraphWithComments.docx 
b/sw/qa/extras/ooxmlexport/data/paragraphWithComments.docx
new file mode 100644
index 000..84a6f20
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/paragraphWithComments.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f312494..aea7db3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2751,6 +2751,25 @@ DECLARE_OOXMLEXPORT_TEST(testComboBoxControl, 
"combobox-control.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("pepito"), aItems[1]);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testParagraphWithComments, 
"paragraphWithComments.docx")
+{
+/* Comment id's were getting overwritten for annotation mark(s),
+   which was causing a mismatch in the relationship for comment id's
+   in document.xml and comment.xml
+*/
+xmlDocPtr pXmlDoc  = parseExport("word/document.xml");
+xmlDocPtr pXmlComm = parseExport("word/comments.xml");
+if(!pXmlDoc)
+return;
+
+sal_Int32 idInDocXml = 0;
+sal_Int32 idInCommentXml = -1; //intentionally assigning -1 so that it 
differs from idInDocXml
+//and also because getXpath does not assert.
+idInDocXml = 
getXPath(pXmlDoc,"/w:document/w:body/w:p[3]/w:commentRangeEnd[1]","id").toInt32();
+idInCommentXml = 
getXPath(pXmlComm,"/w:comments/w:comment[1]","id").toInt32();
+CPPUNIT_ASSERT_EQUAL( idInDocXml, idInCommentXml );
+}
+
 DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx")
 {
 // fdo#76015 : Document contains oleobject in header xml.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ac4f211..eab3f90 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -884,12 +884,20 @@ void DocxAttributeOutput::DoWriteAnnotationMarks()
 const OString& rName = *it;
 
 // Output the annotation mark
-sal_uInt16 nId = m_nNextAnnotationMarkId++;
-m_rOpenedAnnotationMarksIds[rName] = nId;
-m_pSerializer->singleElementNS( XML_w, XML_commentRangeStart,
-FSNS( XML_w, XML_id ), OString::number( nId ).getStr(  ),
-FSEND );
-m_sLastOpenedAnnotationMark = rName;
+/* Ensure that the existing Annotation Marks are not overwritten
+   as it causes discrepancy when DocxAttributeOutput::PostitField
+   refers to this map & while mapping comment id's in document.xml &
+   comment.xml.
+*/
+if ( m_rOpenedAnnotationMarksIds.end() == 
m_rOpenedAnnotationMarksIds.find( rName ) )
+{
+sal_uInt16 nId = m_nNextAnnotationMarkId++;
+m_rOpenedAnnotationMarksIds[rName] = nId;
+m_pSerializer->singleElementNS( XML_w, XML_commentRangeStart,
+FSNS( XML_w, XML_id ), OString::number( nId ).getStr(  ),
+FSEND );
+m_sLastOpenedAnnotationMark = rName;
+}
 }
 m_rAnnotationMarksStart.clear();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dinesh Patil]

 sw/qa/extras/ooxmlexport/data/99_Fields.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   11 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
 3 files changed, 12 insertions(+)

New commits:
commit 4c1cdd43de6e45726054fffb4b8c80ef9269f24a
Author: Dinesh Patil 
Date:   Fri Mar 14 16:56:17 2014 +0530

fdo#76109: LO Crashes while opening the docx file containing three fields

- DOCX file containing fields BIBLIOGRAPHY on first line, BIDIOUTLINE on
  second line and CITATION on third line is getting crashed while opening 
in LO
- Fixed this issue and added unit test case for the same.

Change-Id: Ia8394a3a26157f88693edcf60b0161947d8a9ac0
Reviewed-on: https://gerrit.libreoffice.org/8589
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/99_Fields.docx 
b/sw/qa/extras/ooxmlexport/data/99_Fields.docx
new file mode 100644
index 000..e0ee431
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/99_Fields.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0bc7d60..f312494 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2719,6 +2719,17 @@ DECLARE_OOXMLEXPORT_TEST(test_OpeningBrace, 
"2120112713_OpenBrace.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/m:oMath[1]/m:d[1]/m:dPr[1]/m:begChr[1]","val","");
 }
 
+DECLARE_OOXMLEXPORT_TEST(test_FieldType, "99_Fields.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// Checking for three field types (BIBLIOGRAPHY, BIDIOUTLINE, CITATION) in 
sequence
+assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[2]/w:r[2]/w:instrText[1]",1);
+assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[5]/w:r[2]/w:instrText[1]",1);
+assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[6]/w:r[2]/w:instrText[1]",1);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testComboBoxControl, "combobox-control.docx")
 {
 // check XML
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2d647fc..a5c954b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3869,6 +3869,7 @@ void DomainMapper_Impl::PopFieldContext()
 {
 m_bStartedTOC = false;
 m_aTextAppendStack.pop();
+m_bTextInserted = false;
 }
 m_bStartTOC = false;
 m_bStartIndex = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit b98457eec040196a9ebb61dc8340e59ee1d6813c
Author: Christian Lohmaier 
Date:   Mon Mar 17 16:47:18 2014 +0100

enable update to 4.2.2

diff --git a/check.php b/check.php
index 48e58a3..a690aba 100644
--- a/check.php
+++ b/check.php
@@ -265,6 +265,10 @@ $build_hash_to_version = array(
 '05dceb5d363845f2cf968344d7adab8dcfb2ba7' => '4.2.0.4', # unscheduled, 
Final
 # 4.2.1
 'd7dbbd7842e6a58b0f521599204e827654e1fb8' => '4.2.1.1', # rc1, was made 
final
+# 4.2.2
+'3be8cda0bddd8e430d8cda1ebfd581265cca5a0' => '4.2.2.1', # rc1, was made 
final
+# 4.2.3
+'3d4fc3d9dbf8f4c0aeb61498a81f91c5b7922f1' => '4.2.3.1',
 );
 
 # Descriptions of the target versions
@@ -281,14 +285,14 @@ $update_map = array(
   'id'  => 'LibreOffice 4.1.5',
   'version' => '4.1.5',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=4.1.5',
+  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-stable/?type=&lang=&version=4.1.5',
   'substitute'  => true ),
 
-'latest' => array('gitid'   => 
'd7dbbd7842e6a58b0f521599204e827654e1fb8',
-  'id'  => 'LibreOffice 4.2.1',
-  'version' => '4.2.1',
+'latest' => array('gitid'   => 
'3be8cda0bddd8e430d8cda1ebfd581265cca5a0',
+  'id'  => 'LibreOffice 4.2.2',
+  'version' => '4.2.2',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=4.2.1',
+  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.2.2',
   'substitute'  => true ),
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[QA] Bug Tracker Feature Request

[Joel Madero]

Hi All,

So we're getting really into the planning stages of our own instance of
bugzilla. That being said we are compiling a list of requests that could
improve how users/devs/and QA interact with it. If you have any ideas
feel free to add:
https://wiki.documentfoundation.org/QA/Projects/Ideas/Self-Hosted_Bugtracker#What_Features_We_Want

The sooner the better so we can prioritize and plan accordingly.


Thanks all!


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

Re: Creating a new dictionary

[Christian Lohmaier]

Hi Jørgen, *,

On Mon, Mar 17, 2014 at 3:46 PM, Jørgen G. Bosoni  wrote:
>
> we would like to create an experimental spell checker (hunspell) for a
> language not yet implemented in LibreOffice.
> Where can we find information about how to proceed?

hunspell's project page at sf.net has some in-depth documentation on
how to create dictionaries.

Basically dictionaries consist of a list of stems with flags, and
corresponding affix rules identified by those flags.

The affix rules alter the stems to match multiple words, the simplest
example would be

"word/s" in the dictionary (i.e. word is the stem, and "s" names an
affix rules),
and the affix rule would say: "append an s to the stem", so both
"word" and "words" would be valid words.

http://sourceforge.net/projects/hunspell/files/Hunspell/Documentation/

> At a later stage we would also like to add hyphenation,

Hyphenation dictionaries use the TeX format, i.e. again stems/patterns
with weights where to break a word (or where it is forbidden)
The files are postprocessed though - see
https://wiki.openoffice.org/wiki/Documentation/SL/Using_TeX_hyphenation_patterns_in_OpenOffice.org
for details.

> thesaurus and

Default is to use the openthesaurus format -
http://www.openthesaurus.de/ /
https://github.com/danielnaber/openthesaurus/ probably is easiest
solution to create and maintain a thesaurus.

> grammar.

There are different options available - one is langaugetool, the other
is lightproof (the default that is used for the english-grammar
checking in LO)
http://cgit.freedesktop.org/libreoffice/lightproof/tree/doc/manual.txt

https://www.languagetool.org/

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 50855, which changed state.

Bug 50855 Summary: VIEWING: Nimbus Sans L missing styles
https://bugs.freedesktop.org/show_bug.cgi?id=50855

   What|Removed |Added

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

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

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

[Markus Mohrhard]

 xmloff/source/chart/PropertyMap.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 14f6e6353cce7a83e9c125252ec67ad54c4f8aac
Author: Markus Mohrhard 
Date:   Mon Mar 17 15:55:34 2014 +0100

part of "fix odf validation errors around new chart regression curves"

need MAP_ENTRY_ODF_EXT_IMPORT definition from
4c7116413af091a30f5fa60c63d29bc694730518

Change-Id: I5bd4340186beca95eb3c615f713056007fcc5ee1
Reviewed-on: https://gerrit.libreoffice.org/8629
Reviewed-by: Michael Stahl 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index 5b9338f..c8153ae 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -88,6 +88,7 @@
 #define MAP_ENTRY( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_010, false }
 #define MAP_ENTRY_ODF12( a, ns, nm, t )  { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012, false }
 #define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+#define MAP_ENTRY_ODF_EXT_IMPORT( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
 #define MAP_CONTEXT( a, ns, nm, t, c )   { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, 
SvtSaveOptions::ODFVER_010, false }
 #define MAP_SPECIAL( a, ns, nm, t, c )   { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | 
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010, false }
 #define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | 
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012, false }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Creating a new dictionary

[Jørgen G . Bosoni]

Hi,

we would like to create an experimental spell checker (hunspell) for a
language not yet implemented in LibreOffice.
Where can we find information about how to proceed?
At a later stage we would also like to add hyphenation, thesaurus and
grammar.

Kind regards,

JørgenGB
Trondheim
Norway
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/do-dhgt-old.rtf |   10 
 sw/qa/extras/rtfimport/data/dprect-anchor.rtf   |4 +++
 sw/qa/extras/rtfimport/data/dptxbx-relation.rtf |5 
 sw/qa/extras/rtfimport/rtfimport.cxx|   29 
 writerfilter/source/dmapper/GraphicHelpers.cxx  |   10 +---
 writerfilter/source/dmapper/GraphicHelpers.hxx  |2 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |   22 --
 writerfilter/source/rtftok/rtfsdrimport.cxx |8 +++---
 writerfilter/source/rtftok/rtfsdrimport.hxx |2 -
 9 files changed, 81 insertions(+), 11 deletions(-)

New commits:
commit e6006b5c91c8f6852a1b8b1b7ed1c5e7b4975a68
Author: Miklos Vajna 
Date:   Fri Mar 14 12:11:13 2014 +0100

RTF import: 3 drawing-object fixes:

This bring back the fdo#fdo42407 bugdoc to the state where it was around
4.0.

- fix dobxpage before dptxbx

The problem was that dobxpage arrived first, set HoriOrientRelation to
FRAME, then dptxbx tried to apply defaults, which overwrote the already
set HoriOrientRelation. Fix this by only applying properties which are
not set yet.

(cherry picked from commit 7c53577f325e5260c538f9ca42cda54ca1a24b7a)

- anchor drawing objects at-character by default

(cherry picked from commit d05b67a7b9448c67c3a923ecb33dac74b52dd192)

- fix ordering of old-style dhght in case of equal values

Commit 1eaab77c718ffa254068ae6032862dfb5a03db67 (fdo#60722 import
RTF_SHPZ, 2013-03-06) changed how we handle z-order, in case two shapes
have the same value. Turns out for drawing-objects the order is the
opposite in this situation.

So fix this by adding a new mode, that keeps the original testcase happy
without breaking older documents.

(cherry picked from commit e4fe3610eb17c441217c80536f0acf4123abd683)

Change-Id: Ib2d284cefc3c0dce40ac2e516ba260d6cd04ce43
Reviewed-on: https://gerrit.libreoffice.org/8621
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/qa/extras/rtfimport/data/do-dhgt-old.rtf 
b/sw/qa/extras/rtfimport/data/do-dhgt-old.rtf
new file mode 100644
index 000..07da38f
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/do-dhgt-old.rtf
@@ -0,0 +1,10 @@
+{\rtf1
+{\colortbl\red255\green255\blue255; \red0\green0\blue0; }
+{\*\do\dobxpage\dobypara\dodhgt8192\dptxbx\dptxbxmar0
+{\dptxbxtext\ltrpar\f4\fs20\cf1\vertalc\qc\ltrch a\par}
+\dpx8594\dpy3486\dpxsize1179\dpysize221\dplinehollow0}
+{\*\do\dobxpage\dobypara\dodhgt8192\dprect\dproundr\dpx9807\dpy3968\dpxsize1644\dpysize566\dplinecor255\dplinecog255\dplinecob255\dpfillbgcr0\dpfillbgcg0\dpfillbgcb0\dpfillpat1\dplinehollow0}
+{\*\do\dobxpage\dobypara\dodhgt8192\dptxbx\dptxbxmar0
+{\dptxbxtext\ltrpar\f2\fs20\cf0\vertalc\i\b\qc\ltrch b\par}
+\dpx9864\dpy4138\dpxsize1530\dpysize226\dplinehollow0}
+}
diff --git a/sw/qa/extras/rtfimport/data/dprect-anchor.rtf 
b/sw/qa/extras/rtfimport/data/dprect-anchor.rtf
new file mode 100644
index 000..ac5675e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/dprect-anchor.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+{\colortbl\red255\green255\blue255; \red0\green0\blue0; }
+{\*\do\dobxpage\dobypara\dodhgt8192\dprect\dproundr\dpx9807\dpy3968\dpxsize1644\dpysize566\dplinecor255\dplinecog255\dplinecob255\dpfillbgcr0\dpfillbgcg0\dpfillbgcb0\dpfillpat1\dplinehollow0}
+}
diff --git a/sw/qa/extras/rtfimport/data/dptxbx-relation.rtf 
b/sw/qa/extras/rtfimport/data/dptxbx-relation.rtf
new file mode 100644
index 000..82f0741
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/dptxbx-relation.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+{\*\do\dobxpage\dobypara\dodhgt8192\dptxbx\dptxbxmar0
+{\dptxbxtext\ltrpar\f4\fs20\cf1\vertalc\qc\ltrch To:\par}
+\dpx941\dpy2114\dpxsize1349\dpysize221\dplinehollow0}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index a8d8fd7..8d24829 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1007,6 +1007,23 @@ DECLARE_RTFIMPORT_TEST(testFdo60722, "fdo60722.rtf")
 CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), getProperty(xShape, 
"LineColor"));
 }
 
+DECLARE_RTFIMPORT_TEST(testDoDhgtOld, "do-dhgt-old.rtf")
+{
+// The file contains 3 shapes which have the same dhgt (z-order).
+// Test that the order is 1) a 2) black rectangle 3) b, and not something 
else
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("a"), xShape->getString());
+
+xShape.set(getShape(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(COL_BLACK, getProperty(xShape, 
"FillColor"));
+
+xShape.set(getShape(3), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("b"), xShape->getString());
+}
+
 DEC

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

[Kohei Yoshida]

 include/svl/listener.hxx|2 
 sc/Library_sc.mk|1 
 sc/inc/brdcst.hxx   |6 -
 sc/inc/cellsuno.hxx |2 
 sc/inc/chartlis.hxx |2 
 sc/inc/column.hxx   |3 
 sc/inc/document.hxx |2 
 sc/inc/formulacell.hxx  |2 
 sc/inc/listenercontext.hxx  |   12 ++
 sc/inc/lookupcache.hxx  |2 
 sc/inc/mtvcellfunc.hxx  |   10 +
 sc/inc/refhint.hxx  |   62 +++
 sc/inc/simplehintids.hxx|   22 
 sc/inc/table.hxx|   10 +
 sc/inc/tokenarray.hxx   |   10 +
 sc/source/core/data/bcaslot.cxx |   49 +
 sc/source/core/data/colorscale.cxx  |4 
 sc/source/core/data/column.cxx  |  168 
 sc/source/core/data/documen7.cxx|   52 +
 sc/source/core/data/formulacell.cxx |   25 
 sc/source/core/data/listenercontext.cxx |   44 +++-
 sc/source/core/data/table2.cxx  |   20 +++
 sc/source/core/inc/bcaslot.hxx  |   14 ++
 sc/source/core/tool/chartlis.cxx|2 
 sc/source/core/tool/lookupcache.cxx |2 
 sc/source/core/tool/refhint.cxx |   36 ++
 sc/source/core/tool/token.cxx   |   39 +++
 sc/source/ui/docshell/servobj.cxx   |2 
 sc/source/ui/inc/servobj.hxx|2 
 sc/source/ui/undo/undoblk.cxx   |   13 ++
 sc/source/ui/unoobj/cellsuno.cxx|2 
 svl/source/notify/broadcast.cxx |2 
 svl/source/notify/listener.cxx  |   10 -
 33 files changed, 577 insertions(+), 57 deletions(-)

New commits:
commit b85f07986dc005ea0a74baa3d14ee0fd1ec99609
Author: Kohei Yoshida 
Date:   Fri Mar 14 23:15:32 2014 -0400

fdo#71491: Adjust reference during undo of drag-n-drop of cell range.

Also with this commit, the signature of SvtListener::Notify() changes,
by dropping the first argument which nobody uses.  This change was necessary
in order to call it directly without needing to pass any broadcaster 
instance.

(cherry picked from commit 88955714d345d8584e86ae34bf5f5d1f3f4af9f7)
(cherry picked from commit 99809b246c5dd2be548668032fac4f3c65fb962a)
(cherry picked from commit 8b368d808e90561a9b34658e6b811a8fad83088f)
(cherry picked from commit 83ee6b640eaf86f9aef6f42a4dd9c8a930cf9135)

Conflicts:
sc/inc/table.hxx
sc/source/core/data/table2.cxx
sc/source/ui/undo/undoblk.cxx
svl/source/notify/broadcast.cxx

Change-Id: I6a1e97f0fb1e070d1d8f7db614690b04c9e8024e
Reviewed-on: https://gerrit.libreoffice.org/8600
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index c871023..1c98458 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -45,7 +45,7 @@ public:
 
 bool HasBroadcaster() const;
 
-virtual voidNotify( SvtBroadcaster& rBC, const SfxHint& rHint );
+virtual void Notify( const SfxHint& rHint );
 };
 
 
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 296761e..b7041b8 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -255,6 +255,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/tool/recursionhelper \
 sc/source/core/tool/refdata \
 sc/source/core/tool/reffind \
+sc/source/core/tool/refhint \
 sc/source/core/tool/refreshtimer \
 sc/source/core/tool/reftokenhelper \
 sc/source/core/tool/refupdat \
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index beef774..b328bec 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -21,16 +21,12 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include 
 #include 
 #include 
-#include 
 
 class SvtBroadcaster;
 
-#define SC_HINT_DATACHANGED SFX_HINT_DATACHANGED
-#define SC_HINT_TABLEOPDIRTYSFX_HINT_USER00
-#define SC_HINT_CALCALL SFX_HINT_USER01
-
 class ScHint : public SfxSimpleHint
 {
 ScAddress   aAddress;
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index e4a245f..f8e6b4d 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -115,7 +115,7 @@ class ScLinkListener : public SvtListener
 public:
 ScLinkListener(const Link& rL) : aLink(rL) {}
 virtual ~ScLinkListener();
-virtual voidNotify( SvtBroadcaster& rBC, const SfxHint& rHint );
+virtual void Notify( const SfxHint& rHint );
 };
 
 typedef ::com::sun::star::uno::Reference<
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 9fa6a1d8..83a1dd5 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -93,7 +93,7 @@ public:
 
 boolIsUno() const   { return (pUnoData != NULL); }
 
-virtual voidNotify( SvtBroadcaster& rBC, const SfxHint& rHint );
+virtual void Notify( const SfxHint& 

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

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dde6049fe4abc03b8f98ffca1a940d6f2f446095
Author: Eike Rathke 
Date:   Mon Mar 17 13:50:20 2014 +0100

justify range to prevent negative tab span and memory alloc, rhbz#1057741

I could not reproduce the crash of that bug (probably having more memory
available), but the backtrace had nTabSpan = -2 implicitly casted to
size_t leading to allocation of a huge amount of memory with
vector::reserve(), which ScRange::Justify() exactly prevents.

Change-Id: Idb79e1be62649922ba793cab01e00011479fade9
(cherry picked from commit a45fde7235f95792bf8e6f6979d0040637c5785d)
Reviewed-on: https://gerrit.libreoffice.org/8624
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index b2a19d9..3c051ac 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2078,6 +2078,7 @@ ScExternalRefCache::TokenArrayRef 
ScExternalRefManager::getDoubleRefTokensFromSr
 }
 
 ScRange aRange(rRange);
+aRange.Justify();
 SCTAB nTabSpan = aRange.aEnd.Tab() - aRange.aStart.Tab();
 
 vector aCacheData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cc605367d4f135adc815582900794f0cfdb88aa7
Author: Eike Rathke 
Date:   Mon Mar 17 13:50:20 2014 +0100

justify range to prevent negative tab span and memory alloc, rhbz#1057741

I could not reproduce the crash of that bug (probably having more memory
available), but the backtrace had nTabSpan = -2 implicitly casted to
size_t leading to allocation of a huge amount of memory with
vector::reserve(), which ScRange::Justify() exactly prevents.

Change-Id: Idb79e1be62649922ba793cab01e00011479fade9
(cherry picked from commit a45fde7235f95792bf8e6f6979d0040637c5785d)
Reviewed-on: https://gerrit.libreoffice.org/8625
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 8b5b40d..3e142eb 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1927,6 +1927,7 @@ ScExternalRefCache::TokenArrayRef 
ScExternalRefManager::getDoubleRefTokensFromSr
 }
 
 ScRange aRange(rRange);
+aRange.Justify();
 SCTAB nTabSpan = aRange.aEnd.Tab() - aRange.aStart.Tab();
 
 vector aCacheData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   16 ++---
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx  |2 
 sw/source/filter/ww8/docxattributeoutput.cxx |   73 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |   29 ++
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 writerfilter/source/dmapper/SdtHelper.cxx|   35 
 writerfilter/source/dmapper/SdtHelper.hxx|8 ++
 writerfilter/source/ooxml/model.xml  |5 +
 10 files changed, 167 insertions(+), 9 deletions(-)

New commits:
commit 55211e612d2cbed03dd81c039d07ea4e936c2804
Author: Jacobo Aragunde Pérez 
Date:   Mon Mar 17 13:44:36 2014 +0100

ooxml: preserve w:sdt blocks containing w:docPartObj properties

The  property inside  blocks determines a block
inside the document that can be dinamically updated and enables Word
2010 to show a hover button to update it. It is used for TOCs,
bibliography, etc. LibreOffice ignored these blocks and removed them
from the document on export.

In this patch, we make the importer save the  tag and
its contents in the paragraph interop grab bag.

On export we read the paragraph grab bag and restore the sdt block
back to the document; we don't know if the paragraph must be enclosed
in a sdt block when we start it, so we used the parser marks to be
able to prepend the start of the block before the paragraph opening
tag.

The grab bag on import is managed by the SdtHelper class. Added a set
of methods for that purpose.

The ooxml model file was modified to assign token ids to the children
of w:docPartObj.

Fixed several unit tests that didn't expect the  tag to be
exported. Also modified testBibliography inside ooxmlexport test
suite to add checks for this patch.

TODO: in the imported documents the sdtContent block may contain
several paragraphs but the exporter code as it is can only wrap one
paragraph. As a result, if the sdt block contained several paragraphs
the second and next paragraphs will be outside the block in the
exported document.

Change-Id: I5333fc5ad91a3c50198a4f7647424a2101268c12

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e31bef9..0bc7d60 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2165,9 +2165,7 @@ 
DECLARE_OOXMLEXPORT_TEST(testPreserveZfield,"preserve_Z_field_TOC.docx")
 if (!pXmlDoc)
 return;
 
-// FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
-// not to insert an empty paragraph before TOC.
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\f \\o \"1-3\" \\h");
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[2]/w:instrText", " TOC \\z 
\\f \\o \"1-3\" \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testPreserveWfieldTOC, "PreserveWfieldTOC.docx")
@@ -2176,7 +2174,7 @@ DECLARE_OOXMLEXPORT_TEST(testPreserveWfieldTOC, 
"PreserveWfieldTOC.docx")
 if (!pXmlDoc)
 return;
 
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\w \\f \\o \"1-3\" 
\\h");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText", " 
TOC \\z \\w \\f \\o \"1-3\" \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFieldFlagB,"TOC_field_b.docx")
@@ -2197,7 +2195,7 @@ DECLARE_OOXMLEXPORT_TEST(testPreserveXfieldTOC, 
"PreserveXfieldTOC.docx")
 if (!pXmlDoc)
 return;
 
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\x \\f \\o \"1-3\" \\h");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText", " 
TOC \\x \\f \\o \"1-3\" \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTrackChangesParagraphProperties, 
"testTrackChangesParagraphProperties.docx")
@@ -2260,7 +2258,7 @@ 
DECLARE_OOXMLEXPORT_TEST(testTOCFlag_u,"testTOCFlag_u.docx")
 
 // FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
 // not to insert an empty paragraph before TOC.
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:instrText", " TOC \\z \\o \"1-9\" \\u \\h");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText", " 
TOC \\z \\o \"1-9\" \\u \\h");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTestTitlePage, "testTitlePage.docx")
@@ -2610,7 +2608,7 @@ DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx")
 if (!pXmlDoc)
 return;
 
-assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:hyperlink/w:r[3]/w:instrText", "PAGEREF 
_Toc355095261 \\h");
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:hyperlink/w:r[3]/w:instrText", "PAGEREF 
_Toc355095261 \\h");
 }
 
 
DECLARE_OOXMLEXPORT_TEST(testAlphabetica

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

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a45fde7235f95792bf8e6f6979d0040637c5785d
Author: Eike Rathke 
Date:   Mon Mar 17 13:50:20 2014 +0100

justify range to prevent negative tab span and memory alloc, rhbz#1057741

I could not reproduce the crash of that bug (probably having more memory
available), but the backtrace had nTabSpan = -2 implicitly casted to
size_t leading to allocation of a huge amount of memory with
vector::reserve(), which ScRange::Justify() exactly prevents.

Change-Id: Idb79e1be62649922ba793cab01e00011479fade9

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 5b63848..76b3949 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2078,6 +2078,7 @@ ScExternalRefCache::TokenArrayRef 
ScExternalRefManager::getDoubleRefTokensFromSr
 }
 
 ScRange aRange(rRange);
+aRange.Justify();
 SCTAB nTabSpan = aRange.aEnd.Tab() - aRange.aStart.Tab();
 
 vector aCacheData;
___
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' - oox/CustomTarget_generated.mk

[Miklos Vajna]

 oox/CustomTarget_generated.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit faafdc50a1e00f083c6e0c924a1200a4e5c91401
Author: Miklos Vajna 
Date:   Mon Mar 17 10:35:14 2014 +0100

oox: try to fix incremental build

The problem was that the input of the generated
vmlexport-shape-types.cxx got changed, but it was only built when
building from scratch. Fix this by depending on the makefile as well.

(cherry picked from commit b916fc4840ba67ef30e45ea735408237a3422b56)
Signed-off-by: Michael Stahl 

Conflicts:
oox/CustomTarget_generated.mk

Change-Id: Ia2d7f059aae2f5819bb8a1329fefa74c56660607

diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 14789d6..ba93b0d 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -17,7 +17,8 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token
 $(oox_MISC)/vmlexport-shape-types.cxx : \

$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \
-   $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
+   $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml \
+   $(SRCDIR)/oox/CustomTarget_generated.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
mkdir -p $(dir $@)
perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 extensions/source/update/check/updatecheck.cxx |8 +--
 extensions/source/update/check/updatecheck.hxx |2 
 extensions/source/update/tools/makefile.mk |   35 
 extensions/source/update/tools/ztool.cxx   |   52 -
 svgio/inc/svgio/svgreader/svgimagenode.hxx |3 -
 5 files changed, 5 insertions(+), 95 deletions(-)

New commits:
commit c80c70c8c306d887ce0b399e9f20b0363e888369
Author: Stephan Bergmann 
Date:   Mon Mar 17 12:41:54 2014 +0100

Remove unused getXLink

Change-Id: I848d8afbec17dd5cfb5063942d1e504aa548c759

diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx 
b/svgio/inc/svgio/svgreader/svgimagenode.hxx
index 2461a22..9dbb624 100644
--- a/svgio/inc/svgio/svgreader/svgimagenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx
@@ -82,9 +82,6 @@ namespace svgio
 /// height content, set if found in current context
 const SvgNumber& getHeight() const { return maHeight; }
 void setHeight(const SvgNumber& rHeight = SvgNumber()) { maHeight 
= rHeight; }
-
-/// XLink access
-const OUString& getXLink() const { return maXLink; }
 };
 } // end of namespace svgreader
 } // end of namespace svgio
commit 549c3b81190d64ec23254f448ebf69520dd76da9
Author: Stephan Bergmann 
Date:   Mon Mar 17 12:41:37 2014 +0100

Remove unused code

Change-Id: I1690f5b88b7bd04d336a45b1d745185285e13070

diff --git a/extensions/source/update/tools/makefile.mk 
b/extensions/source/update/tools/makefile.mk
deleted file mode 100644
index a533673..000
--- a/extensions/source/update/tools/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ..$/..$/..
-PRJNAME = extensions
-TARGET = ztool
-LIBTARGET = NO
-TARGETTYPE = CUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE: settings.mk
-
-OBJFILES = \
-$(OBJ)$/ztool.obj
-
-APP1TARGET = ztool
-APP1OBJS = $(OBJ)$/ztool.obj
-APP1STDLIBS = $(TOOLSLIB)
-
-.INCLUDE: target.mk
diff --git a/extensions/source/update/tools/ztool.cxx 
b/extensions/source/update/tools/ztool.cxx
deleted file mode 100644
index 7009d48..000
--- a/extensions/source/update/tools/ztool.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-
-#include 
-#include 
-
-void show_usage()
-{
-fputs("ztool usage: ztool  \n", stderr);
-}
-
-int SAL_CALL main( int argc, char **argv )
-{
-if ( argc != 3 )
-{
-show_usage();
-return -1;
-}
-OUString aInName = OUString::createFromAscii(argv[1]);
-OUString aOutName = OUString::createFromAscii(argv[2]);
-SvFileStream aInFile( aInName, STREAM_READ );
-SvFileStream aOutFile( aOutName, STREAM_WRITE | STREAM_TRUNC );
-
-ZCodec aCompressor;
-aCompressor.BeginCompression();
-aCompressor.Compress( aInFile, aOutFile );
-aCompressor.EndCompression();
-
-return 0;
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 488817e3c47223ed65c3a22763fca9a435fa2c01
Author: Stephan Bergmann 
Date:   Mon Mar 17 12:41:05 2014 +0100

No need for SAL_CALL here

Change-Id: I283c883bf49e33941de33b9e58d355f683c96ea3

diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 4a86c0f..4b9038f 100644
--- a/extensions/so

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/do-dhgt-old.rtf |   10 
 sw/qa/extras/rtfimport/data/dprect-anchor.rtf   |4 +++
 sw/qa/extras/rtfimport/data/dptxbx-relation.rtf |5 
 sw/qa/extras/rtfimport/rtfimport.cxx|   29 
 writerfilter/source/dmapper/GraphicHelpers.cxx  |   10 +---
 writerfilter/source/dmapper/GraphicHelpers.hxx  |2 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |   22 --
 writerfilter/source/rtftok/rtfsdrimport.cxx |8 +++---
 writerfilter/source/rtftok/rtfsdrimport.hxx |2 -
 9 files changed, 81 insertions(+), 11 deletions(-)

New commits:
commit c2c7a9837cf0cf2c46d06f5c62bf5379d37f2782
Author: Miklos Vajna 
Date:   Fri Mar 14 16:48:17 2014 +0100

RTF import: fix ordering of old-style dhght in case of equal values

Commit 1eaab77c718ffa254068ae6032862dfb5a03db67 (fdo#60722 import
RTF_SHPZ, 2013-03-06) changed how we handle z-order, in case two shapes
have the same value. Turns out for drawing-objects the order is the
opposite in this situation.

So fix this by adding a new mode, that keeps the original testcase happy
without breaking older documents.

(cherry picked from commit e4fe3610eb17c441217c80536f0acf4123abd683)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfsdrimport.cxx
writerfilter/source/rtftok/rtfsdrimport.hxx

Change-Id: Ib2d284cefc3c0dce40ac2e516ba260d6cd04ce43

diff --git a/sw/qa/extras/rtfimport/data/do-dhgt-old.rtf 
b/sw/qa/extras/rtfimport/data/do-dhgt-old.rtf
new file mode 100644
index 000..07da38f
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/do-dhgt-old.rtf
@@ -0,0 +1,10 @@
+{\rtf1
+{\colortbl\red255\green255\blue255; \red0\green0\blue0; }
+{\*\do\dobxpage\dobypara\dodhgt8192\dptxbx\dptxbxmar0
+{\dptxbxtext\ltrpar\f4\fs20\cf1\vertalc\qc\ltrch a\par}
+\dpx8594\dpy3486\dpxsize1179\dpysize221\dplinehollow0}
+{\*\do\dobxpage\dobypara\dodhgt8192\dprect\dproundr\dpx9807\dpy3968\dpxsize1644\dpysize566\dplinecor255\dplinecog255\dplinecob255\dpfillbgcr0\dpfillbgcg0\dpfillbgcb0\dpfillpat1\dplinehollow0}
+{\*\do\dobxpage\dobypara\dodhgt8192\dptxbx\dptxbxmar0
+{\dptxbxtext\ltrpar\f2\fs20\cf0\vertalc\i\b\qc\ltrch b\par}
+\dpx9864\dpy4138\dpxsize1530\dpysize226\dplinehollow0}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index d36fcc7..f33a47d 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1576,8 +1576,6 @@ DECLARE_RTFIMPORT_TEST(testCharColor, "char-color.rtf")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0x365F91), 
getProperty(getParagraph(1), "CharColor"));
 }
 
-#endif
-
 DECLARE_RTFIMPORT_TEST(testDptxbxRelation, "dptxbx-relation.rtf")
 {
 // This was FRAME, not PAGE_FRAME, even if dobxpage is in the document.
@@ -1590,6 +1588,25 @@ DECLARE_RTFIMPORT_TEST(testDprectAnchor, 
"dprect-anchor.rtf")
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getProperty(getShape(1), "AnchorType"));
 }
 
+DECLARE_RTFIMPORT_TEST(testDoDhgtOld, "do-dhgt-old.rtf")
+{
+// The file contains 3 shapes which have the same dhgt (z-order).
+// Test that the order is 1) a 2) black rectangle 3) b, and not something 
else
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("a"), xShape->getString());
+
+xShape.set(getShape(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(COL_BLACK, getProperty(xShape, 
"FillColor"));
+
+xShape.set(getShape(3), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("b"), xShape->getString());
+}
+
+#endif
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 9a259b9..ec3b9c6 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -268,14 +268,18 @@ void GraphicZOrderHelper::addItem( uno::Reference< 
beans::XPropertySet > props,
 // The relativeHeight value in .docx is an arbitrary number, where only the 
relative ordering matters.
 // But in Writer, the z-order is index in 0..(numitems-1) range, so whenever a 
new item needs to be
 // added in the proper z-order, it is necessary to find the proper index.
-sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight )
+sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight, bool 
bOldStyle )
 {
 Items::const_iterator it = items.begin();
 while( it != items.end())
 {
 // std::map is iterated sorted by key
-// if there is an item that has the same z-order, we belong under it
-if( it->fi

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

[Michael Stahl]

 sw/source/ui/uiview/viewport.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 6857a266c5e8037f097ed7e727671f7da543f178
Author: Michael Stahl 
Date:   Fri Mar 14 23:08:11 2014 +0100

fdo#75460: sw: fix AutoScroll

This reverts commit 5141201fba2d080841b81e02be92f4b47aae2684. which
fixed a crash but unfortunately also prevents the
m_pEditWin->HandleScrollCommand from being called, thus disabling
AutoScroll.  Fix the crash in the ugly way by another pWData check.

(regression from 8880c773e779710dc0a08760e92afd709a73ca31)

Change-Id: I958f1403ad23d0c0631eca5dbbef977a9ca1210d
(cherry picked from commit 6795b251e2011cae945c6bb903de8053953b5e30)
Reviewed-on: https://gerrit.libreoffice.org/8596
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 1d4acb3..ac0b21a 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1242,14 +1242,9 @@ void SwView::Move()
 
 sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
 {
-const CommandWheelData* pWData = rCEvt.GetWheelData();
-if (!pWData)
-{
-return sal_False;
-}
-
 sal_Bool bOk = sal_False;
-if( COMMAND_WHEEL_ZOOM == pWData->GetMode() )
+const CommandWheelData* pWData = rCEvt.GetWheelData();
+if (pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode())
 {
 long nFact = m_pWrtShell->GetViewOptions()->GetZoom();
 if( 0L > pWData->GetDelta() )
@@ -1260,7 +1255,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& 
rCEvt )
 SetZoom( SVX_ZOOM_PERCENT, nFact );
 bOk = sal_True;
 }
-else if( COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode() )
+else if (pWData && COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode())
 {
 // mobile touch zoom (pinch) section
 // remember the center location to reach in logic
@@ -1304,13 +1299,13 @@ sal_Bool SwView::HandleWheelCommands( const 
CommandEvent& rCEvt )
 }
 else
 {
-if( pWData->GetMode()==COMMAND_WHEEL_SCROLL )
+if (pWData && pWData->GetMode()==COMMAND_WHEEL_SCROLL)
 {
 // This influences whether quick help is shown
 m_bWheelScrollInProgress=true;
 }
 
-if( (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && 
(((sal_uLong)0x) == pWData->GetScrollLines()) )
+if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && 
(((sal_uLong)0x) == pWData->GetScrollLines()))
 {
 if (pWData->GetDelta()<0)
 PhyPageDown();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[abdulmajeed ahmed]

 sw/source/core/doc/docfmt.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f0dc2d755932b00b83db884334bcd0741056c884
Author: abdulmajeed ahmed 
Date:   Mon Mar 17 13:53:51 2014 +0300

Fix fdo#75936 set limit for decreasing indent

Change-Id: I566f93f7e6f9a5bcff75094b51aaa4ee79e6890e

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d2af898..3227260 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2343,7 +2343,8 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool 
bRight, bool bModulus )
 if( bRight )
 nNext += nDefDist;
 else
-nNext -= nDefDist;
+if(nNext >0) // fdo#75936 set limit for decreasing indent
+nNext -= nDefDist;
 
 aLS.SetTxtLeft( nNext );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 xmloff/source/chart/PropertyMap.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2b54ede7e2c3b4f2c0baeb53bb798f507ba15719
Author: Markus Mohrhard 
Date:   Fri Mar 14 01:13:19 2014 +0100

fix odf validation error

This is the import only change for older release branches.

New elements must not be exported into the chart namespace.

Change-Id: I295d61224e255dff04ea8564b01a5a438876afc1
Reviewed-on: https://gerrit.libreoffice.org/8580
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index 809c043..5b9338f 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -189,6 +189,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
 MAP_SPECIAL_ODF12( "ErrorBarRangeNegative", CHART, XML_ERROR_LOWER_RANGE, 
XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only
 
 // errorbars properties (chart2)
+MAP_ENTRY_ODF_EXT_IMPORT( "Weight", LO_EXT, XML_ERROR_STANDARD_WEIGHT, 
XML_TYPE_DOUBLE),
 MAP_ENTRY_ODF_EXT( "Weight", CHART, XML_ERROR_STANDARD_WEIGHT, 
XML_TYPE_DOUBLE),
 
 // series/data-point properties
___
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' - editeng/source include/editeng oox/source sd/source svx/source

[Muthu Subramanian]

 editeng/source/editeng/editattr.cxx |   17 +++-
 editeng/source/editeng/editattr.hxx |   12 +++
 editeng/source/editeng/editdoc.cxx  |9 
 editeng/source/editeng/editeng.cxx  |2 +
 editeng/source/editeng/eerdll.cxx   |   12 ++-
 editeng/source/uno/unofdesc.cxx |1 
 editeng/source/uno/unotext.cxx  |2 -
 include/editeng/eeitem.hxx  |   17 
 include/editeng/eeitemid.hxx|2 -
 include/editeng/unoprnms.hxx|1 
 include/editeng/unotext.hxx |1 
 oox/source/drawingml/textcharacterpropertiescontext.cxx |2 +
 sd/source/core/drawdoc4.cxx |2 +
 sd/source/core/stlpool.cxx  |5 
 sd/source/ui/view/drtxtob1.cxx  |7 ++
 svx/source/svdraw/svdotextdecomposition.cxx |5 ++--
 svx/source/tbxctrls/tbcontrl.cxx|6 +
 svx/source/unodraw/unoprov.cxx  |1 
 18 files changed, 86 insertions(+), 18 deletions(-)

New commits:
commit d58adfde297a840a65103a87bf09fb64f70803e1
Author: Muthu Subramanian 
Date:   Tue Feb 4 18:24:03 2014 +0530

cp#125: Import casemaps from pptx.

(Ported from: 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec
and 9dbcb79782d6a5b80c21a0c093537d18425b826f)

Change-Id: I211491e06273aedf5c8ddbd0ca3fc35f3d168aaa
Reviewed-on: https://gerrit.libreoffice.org/7848
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/editeng/source/editeng/editattr.cxx 
b/editeng/source/editeng/editattr.cxx
index de847d6..b437e9b 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "editattr.hxx"
 
@@ -185,7 +186,7 @@ void EditCharAttribFontWidth::SetFont( SvxFont& /*rFont*/, 
OutputDevice* )
 EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& 
rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
-DBG_ASSERT( rAttr.Which() == EE_CHAR_STRIKEOUT, "Not a Size attribute!" );
+DBG_ASSERT( rAttr.Which() == EE_CHAR_STRIKEOUT, "Not a Strikeout 
attribute!" );
 }
 
 void EditCharAttribStrikeout::SetFont( SvxFont& rFont, OutputDevice* )
@@ -194,6 +195,20 @@ void EditCharAttribStrikeout::SetFont( SvxFont& rFont, 
OutputDevice* )
 }
 
 // -
+// class EditCharAttribCaseMap
+// -
+EditCharAttribCaseMap::EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, 
sal_uInt16 _nStart, sal_uInt16 _nEnd )
+: EditCharAttrib( rAttr, _nStart, _nEnd )
+{
+DBG_ASSERT( rAttr.Which() == EE_CHAR_CASEMAP, "Not a CaseMap Item!" );
+}
+
+void EditCharAttribCaseMap::SetFont( SvxFont& rFont, OutputDevice* )
+{
+rFont.SetCaseMap( ((const SvxCaseMapItem*)GetItem())->GetCaseMap() );
+}
+
+// -
 // class EditCharAttribColor
 // -
 EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, 
sal_uInt16 _nStart, sal_uInt16 _nEnd )
diff --git a/editeng/source/editeng/editattr.hxx 
b/editeng/source/editeng/editattr.hxx
index 4fb657c..3917427 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -47,6 +47,7 @@ class SvxEmphasisMarkItem;
 class SvxCharReliefItem;
 class SfxVoidItem;
 class OutputDevice;
+class SvxCaseMapItem;
 
 #define CH_FEATURE_OLD  (sal_uInt8) 0xFF
 #define CH_FEATURE  (sal_Unicode)   0x01
@@ -219,6 +220,17 @@ public:
 };
 
 // -
+// class EditCharAttribCaseMap
+// -
+class EditCharAttribCaseMap : public EditCharAttrib
+{
+public:
+EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, sal_uInt16 nStart, 
sal_uInt16 nEnd );
+
+virtual voidSetFont( SvxFont& rFont, OutputDevice* pOutDev );
+};
+
+// -
 // class EditCharAttribUnderline
 // -
 class EditCharAttribUnderline : public EditCharAttrib
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 26c2b24..f02990b 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -21

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

[Muthu Subramanian]

 include/oox/drawingml/shapepropertymap.hxx |3 +++
 oox/source/drawingml/fillproperties.cxx|4 +++-
 oox/source/drawingml/shapepropertymap.cxx  |   16 +++-
 svx/source/xoutdev/xattrbmp.cxx|4 +++-
 4 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 43dae523edd6aede5009d72be73e3627726903f9
Author: Muthu Subramanian 
Date:   Wed Mar 12 16:29:56 2014 +0530

n#821567: Import PPTX background images with table-name.

Ported from 2ec4d410de5bd98527336a9dc49abb76656373df

Change-Id: I19cefa3097d8a7c2da057089efb52ec8fd45b2b0
Reviewed-on: https://gerrit.libreoffice.org/8544
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index 6a6628b..f2dc8ec 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -63,6 +63,7 @@ enum ShapePropertyId
 SHAPEPROP_FillBitmapRectanglePoint,
 SHAPEPROP_FillHatch,
 SHAPEPROP_ShadowXDistance,
+SHAPEPROP_FillBitmapNameFromUrl,
 SHAPEPROP_END
 };
 
@@ -128,6 +129,8 @@ private:
 boolsetGradientTrans( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
 /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. 
*/
 boolsetFillBitmapUrl( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
+/** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName 
*/
+boolsetFillBitmapNameFromUrl( sal_Int32 nPropId, const 
::com::sun::star::uno::Any& rValue );
 
 // not implemented, to prevent implicit conversion from enum to int
 ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId );
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 4e6d8e1..c96c77a 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -421,7 +421,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 
 OUString aGraphicUrl = rGraphicHelper.createGraphicObject( 
xGraphic );
 // push bitmap or named bitmap to property map
-if( !aGraphicUrl.isEmpty() && rPropMap.setProperty( 
SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
+if( !aGraphicUrl.isEmpty() && rPropMap.supportsProperty( 
SHAPEPROP_FillBitmapNameFromUrl ) && rPropMap.setProperty( 
SHAPEPROP_FillBitmapNameFromUrl, aGraphicUrl ) )
+eFillStyle = FillStyle_BITMAP;
+else if( !aGraphicUrl.isEmpty() && rPropMap.setProperty( 
SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
 eFillStyle = FillStyle_BITMAP;
 
 // set other bitmap properties, if bitmap has been 
inserted into the map
diff --git a/oox/source/drawingml/shapepropertymap.cxx 
b/oox/source/drawingml/shapepropertymap.cxx
index ff02dd5..fe985db 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -47,7 +47,8 @@ static const sal_Int32 spnDefaultShapeIds[ SHAPEPROP_END ] =
 PROP_FillBitmapURL, PROP_FillBitmapMode, PROP_FillBitmapSizeX, 
PROP_FillBitmapSizeY,
 PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint,
 PROP_FillHatch,
-PROP_ShadowXDistance
+PROP_ShadowXDistance,
+PROP_FillBitmapName
 };
 
 } // namespace
@@ -108,6 +109,9 @@ bool ShapePropertyMap::setAnyProperty( ShapePropertyId 
ePropId, const Any& rValu
 case SHAPEPROP_FillBitmapUrl:
 return setFillBitmapUrl( nPropId, rValue );
 
+case SHAPEPROP_FillBitmapNameFromUrl:
+return setFillBitmapNameFromUrl( nPropId, rValue );
+
 default:;   // suppress compiler warnings
 }
 
@@ -195,6 +199,16 @@ bool ShapePropertyMap::setFillBitmapUrl( sal_Int32 
nPropId, const Any& rValue )
 return false;
 }
 
+bool ShapePropertyMap::setFillBitmapNameFromUrl( sal_Int32 /*nPropId*/, const 
Any& rValue )
+{
+if( rValue.has< OUString >() )
+{
+OUString aBitmapUrlName = mrModelObjHelper.insertFillBitmapUrl( 
rValue.get< OUString >() );
+return !aBitmapUrlName.isEmpty() && setProperty( PROP_FillBitmapName, 
aBitmapUrlName );
+}
+return false;
+}
+
 // 
 
 } // namespace drawingml
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index f8c53d7..cbd49df 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -513,7 +513,9 @@ bool XFillBitmapItem::PutValue( const 
::com::sun::star::uno::Any& rVal, sal_uInt
 }
 if( bSetURL )
 {
-maGraphicObject  = GraphicObject::CreateGraphicObjectFromURL(aURL);
+GraphicObject aGraphicObject  = 
GraphicObject::CreateGraphicObjectFromURL(aURL)

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 47355, which changed state.

Bug 47355 Summary: EDITING: When shrinking an object anchored as character, 
paragraph below it doesn't update its position
https://bugs.freedesktop.org/show_bug.cgi?id=47355

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

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

[Jan Holesovsky]

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

New commits:
commit d84a8704f699ac1b4fb42dce44a195ba87f6267b
Author: Jan Holesovsky 
Date:   Mon Mar 17 11:24:32 2014 +0100

Fix whitespace.

Change-Id: I3156581bb0cf9c23b8d643d6d0c787feac56d266

diff --git a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
index 1c7761c..b320426 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
@@ -277,13 +277,13 @@ DECLARE_OOXMLEXPORT_TEST(Test_McIgnorable, 
"TextEffects_StylisticSets_CntxtAlts.
 if (!pXmlDocument)
 return;
 
- assertXPath(pXmlDocument, "/w:document", "Ignorable", "w14 wp14");
+assertXPath(pXmlDocument, "/w:document", "Ignorable", "w14 wp14");
 
 xmlDocPtr pXmlStyles = parseExport("word/styles.xml");
 if (!pXmlStyles)
 return;
 
- assertXPath(pXmlStyles, "/w:styles", "Ignorable", "w14");
+assertXPath(pXmlStyles, "/w:styles", "Ignorable", "w14");
 }
 
 DECLARE_OOXMLEXPORT_TEST(Test_CompatSettingsForW14, 
"TextEffects_StylisticSets_CntxtAlts.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/source/core/text/frmform.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit a54da6a84f751250c694120d1a29aaac89cd3af4
Author: Bjoern Michaelsen 
Date:   Sat Mar 15 16:25:41 2014 +0100

fdo#47355: partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22

- that commit claimed to fix i#84870
- however that example document _still_ loops for me on current master
  even with the change
- this caused the fdo#47355 regression in addition
- thus reverting to heal fdo#47355, expecting i#84870 unchanged as broken
  before and in need of a proper fix

Change-Id: I067a8ef222ee2af6cd97579451c40ddba53ca294
Reviewed-on: https://gerrit.libreoffice.org/8606
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 
(cherry picked from commit 72a4987434368bfb0b15f5ebb70a52108d349d5f)
Reviewed-on: https://gerrit.libreoffice.org/8617

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 4291e92..093e40b 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1059,14 +1059,6 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 const SwTwips nDocPrtTop = Frm().Top() + Prt().Top();
 const SwTwips nOldHeight = Prt().SSize().Height();
 SwTwips nChg = rLine.CalcBottomLine() - nDocPrtTop - nOldHeight;
-// --> OD #i84870# - no shrink of text frame, if it only contains one
-// as-character anchored object.
-if ( nChg < 0 &&
- bOnlyContainsAsCharAnchoredObj )
-{
-nChg = 0;
-}
-// <--
 
 // Vertical Formatting:
 // The (rotated) repaint rectangle's x coordinate referes to the frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: "[PATCH] fdo#76181: cleanup constructors in ucalc.cxx"

[Michael Meeks]

Hi Manas,

First - thanks for the patch - the code looks a lot nicer, more
readable and shorter now - which is great.

I removed the trailing whitespace on some lines - the git commit hook
should have complained about that too (can you run './g -z' to install
those hooks (IIRC)).

Will push in a minute after a quick build / test cycle.

Thanks !

Michael.

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

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

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

[Bjoern Michaelsen]

 sw/source/core/text/frmform.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 72a4987434368bfb0b15f5ebb70a52108d349d5f
Author: Bjoern Michaelsen 
Date:   Sat Mar 15 16:25:41 2014 +0100

fdo#47355: partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22

- that commit claimed to fix i#84870
- however that example document _still_ loops for me on current master
  even with the change
- this caused the fdo#47355 regression in addition
- thus reverting to heal fdo#47355, expecting i#84870 unchanged as broken
  before and in need of a proper fix

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

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index e890837..cbabc00 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1099,14 +1099,6 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 const SwTwips nDocPrtTop = Frm().Top() + Prt().Top();
 const SwTwips nOldHeight = Prt().SSize().Height();
 SwTwips nChg = rLine.CalcBottomLine() - nDocPrtTop - nOldHeight;
-// --> OD #i84870# - no shrink of text frame, if it only contains one
-// as-character anchored object.
-if ( nChg < 0 &&
- bOnlyContainsAsCharAnchoredObj )
-{
-nChg = 0;
-}
-// <--
 
 // Vertical Formatting:
 // The (rotated) repaint rectangle's x coordinate referes to the frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/ww8/docxsdrexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5dc13b2d68eb30417f706935016d8bf7182b4aaa
Author: Miklos Vajna 
Date:   Mon Mar 17 10:51:50 2014 +0100

DocxSdrExport: m_pImpl->m_rSdrExport == this

Change-Id: I0c058a1042f5235d19d5ede2426ace8e13d2a853

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index aae6752..bc3e5f0 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -536,7 +536,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* 
pSdrObject, const SwFrmFmt*
 {
 sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
 Size aSize(pSdrObject->GetLogicRect().GetWidth(), 
pSdrObject->GetLogicRect().GetHeight());
-m_pImpl->m_rSdrExport.startDMLAnchorInline(pFrmFmt, aSize);
+startDMLAnchorInline(pFrmFmt, aSize);
 
 sax_fastparser::FastAttributeList* pDocPrAttrList = pFS->createAttrList();
 pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
@@ -590,7 +590,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* 
pSdrObject, const SwFrmFmt*
 pFS->endElementNS(XML_wp14, XML_sizeRelV);
 }
 
-m_pImpl->m_rSdrExport.endDMLAnchorInline(pFrmFmt);
+endDMLAnchorInline(pFrmFmt);
 }
 
 void DocxSdrExport::Impl::textFrameShadow(const SwFrmFmt& rFrmFmt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[YogeshBharate]

 sw/source/filter/ww8/docxattributeoutput.cxx |   20 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +++
 sw/source/filter/ww8/docxsdrexport.cxx   |   14 +++---
 sw/source/filter/ww8/docxsdrexport.hxx   |2 ++
 4 files changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 5291d902b2e8bbf405dc56a03b685bd10cecabf8
Author: YogeshBharate 
Date:   Thu Mar 13 20:39:28 2014 +0530

fdo#76122: File Corruption-doc contains nested alternateContents.

Problem Description:
- After roundtrip, files contains 
  in .
- Due to this document gets corrupted when we open it in MS Office 2010.
- Added unit test.

Change-Id: Ic64b815eda4a42cd59f522ac4570ae145b0b38e1
Reviewed-on: https://gerrit.libreoffice.org/8575
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1b3ec74..968fd55 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -302,6 +302,12 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pSerializer->startElementNS(XML_mc, XML_Choice,
 XML_Requires, "wps",
 FSEND);
+/**
+   This is to avoid AltenateContent within another 
AlternateContent.
+   So when Choice is Open, only write the DML Drawing instead of 
both DML
+   and VML Drawing in another AlternateContent.
+**/
+SetAlternateContentChoiceOpen( true );
 /** FDO#71834 :
We should probably be renaming the function
switchHeaderFooter to something like SaveRetrieveTableReference.
@@ -321,6 +327,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 
 m_rExport.SdrExporter().writeDMLTextFrame(&aFrame, m_anchorId++);
 m_pSerializer->endElementNS(XML_mc, XML_Choice);
+SetAlternateContentChoiceOpen( false );
 
 // Reset table infos, otherwise the depth of the cells will be 
incorrect,
 // in case the text frame had table(s) and we try to export the
@@ -3897,7 +3904,10 @@ void DocxAttributeOutput::WritePostponedDMLDrawing()
  it != m_postponedDMLDrawing->end();
  ++it )
 {
-m_rExport.SdrExporter().writeDMLAndVMLDrawing(it->object, 
*(it->frame), *(it->point), m_anchorId++);
+if ( IsAlternateContentChoiceOpen() )
+m_rExport.SdrExporter().writeDMLDrawing(it->object, (it->frame), 
m_anchorId++);
+else
+m_rExport.SdrExporter().writeDMLAndVMLDrawing(it->object, 
*(it->frame), *(it->point), m_anchorId++);
 }
 delete m_postponedDMLDrawing;
 m_postponedDMLDrawing = NULL;
@@ -3942,7 +3952,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame &rFrame, const Po
 else
 {
 if ( m_postponedDMLDrawing == NULL )
-m_rExport.SdrExporter().writeDMLAndVMLDrawing( 
pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft, m_anchorId++);
+{
+if ( IsAlternateContentChoiceOpen() )
+m_rExport.SdrExporter().writeDMLDrawing( 
pSdrObj, &rFrame.GetFrmFmt(), m_anchorId++);
+else
+m_rExport.SdrExporter().writeDMLAndVMLDrawing( 
pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft, m_anchorId++);
+}
 else
 // we are writing out attributes, but w:drawing 
should not be inside w:rPr, so write it out later
 
m_postponedDMLDrawing->push_back(PostponedDrawing(pSdrObj, 
&(rFrame.GetFrmFmt()), &rNdTopLeft));
@@ -6945,6 +6960,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
&rExport, FSHelperPtr pSeri
   m_pTableWrt( NULL ),
   m_bParagraphOpened( false ),
   m_bIsFirstParagraph( true ),
+  m_bAlternateContentChoiceOpen( false ),
   m_nColBreakStatus( COLBRK_NONE ),
   m_nTextFrameLevel( 0 ),
   m_closeHyperlinkInThisRun( false ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6012f43..042fea6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -756,6 +756,7 @@ private:
 
 bool m_bParagraphOpened;
 bool m_bIsFirstParagraph;
+bool m_bAlternateContentChoiceOpen;
 
 // Remember that a column break has to be opened at the
 // beginning of the next paragraph
@@ -892,6 +893,8 @@ public:
 
 void SetWritingHeaderFooter( bool bWritingHeaderFooter ){   
m_bWritingHeaderFooter = bWritingHeaderFooter;   }
 bool GetWritingHeaderFooter( )  {   return m_bWritingHeaderFooter; 

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

[Michael Stahl]

 include/xmloff/xmlimp.hxx  |7 ++
 sw/qa/extras/odfimport/data/fdo75872_aoo40.odt |binary
 sw/qa/extras/odfimport/data/fdo75872_ooo33.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   20 
 xmloff/source/core/xmlimp.cxx  |   25 ++
 xmloff/source/draw/XMLGraphicsDefaultStyle.cxx |   59 -
 6 files changed, 108 insertions(+), 3 deletions(-)

New commits:
commit bc06737408a840daad981c95799d9da92cf2ef0a
Author: Michael Stahl 
Date:   Wed Mar 12 22:21:16 2014 +0100

fdo#75872: ODF import: fix up graphics defaults stroke/fill colors

These have changed a few times, notably in LO 4.0 with commit
895890563cb0cc5fa872bdfd06918a46cdda172d and AOO 4.0 with commit
c0eb5e7772c848806db8ab461f77f9549c1d8b2b; unfortunately historic OOo and
current AOO do not write the values into ODF files, whereas LO 4.x does
(probably by accident, since 45d3577bc5726eee44f491fd30a7f11dc428431a
by design).

Try to set the defaults depending on the generator; since the defaults
are not specified by ODF they are implementation defined anyway so this
should be OK.

Change-Id: I1270d6e0cdeea5cb493724a0998f661a0cf644f1
(cherry picked from commit 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)
Reviewed-on: https://gerrit.libreoffice.org/8563
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 0fc0d2579f6f3e26cd8b56da730184d6933cc8fe)
Reviewed-on: https://gerrit.libreoffice.org/8570
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-by: Andras Timar 

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 6005677..534158a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -420,9 +420,14 @@ public:
 static const sal_uInt16 OOo_32x = 32;
 static const sal_uInt16 OOo_33x = 33;
 static const sal_uInt16 OOo_34x = 34;
+// for AOO, no release overlaps with OOo, so continue OOo version numbers
+static const sal_uInt16 AOO_40x = 40;
+static const sal_uInt16 AOO_4x = 41;
 static const sal_uInt16 LO_flag = 0x100;
 static const sal_uInt16 LO_3x = 30 | LO_flag;
-static const sal_uInt16 LO_4x = 40 | LO_flag;
+static const sal_uInt16 LO_41x = 41 | LO_flag;
+static const sal_uInt16 LO_42x = 42 | LO_flag;
+static const sal_uInt16 LO_4x = 43 | LO_flag;
 static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
 
 /** depending on whether the generator version indicates LO, compare
diff --git a/sw/qa/extras/odfimport/data/fdo75872_aoo40.odt 
b/sw/qa/extras/odfimport/data/fdo75872_aoo40.odt
new file mode 100644
index 000..549a567
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo75872_aoo40.odt 
differ
diff --git a/sw/qa/extras/odfimport/data/fdo75872_ooo33.odt 
b/sw/qa/extras/odfimport/data/fdo75872_ooo33.odt
new file mode 100644
index 000..4cc3de7
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo75872_ooo33.odt 
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 87e7402..879513b 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -278,6 +278,26 @@ DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape->getPosition().Y); // Was -2371
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo75872_ooo33, "fdo75872_ooo33.odt")
+{
+// graphics default style: line color and fill color changed
+uno::Reference xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_BLACK),
+   getProperty(xShape, "LineColor"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(153, 204, 255)),
+   getProperty(xShape, "FillColor"));
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo75872_aoo40, "fdo75872_aoo40.odt")
+{
+// graphics default style: line color and fill color changed
+uno::Reference xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(128, 128, 128)),
+   getProperty(xShape, "LineColor"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(0xCF, 0xE7, 0xF5)),
+   getProperty(xShape, "FillColor"));
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo55814, "fdo55814.odt")
 {
 uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index c46757f..2127d0e 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -193,7 +193,20 @@ getBuildIdsProperty(uno::Reference 
const& xImportInfo)
 else
 {
 SAL_INFO_IF('4' != loVersion[0], 
"xmloff.core", "unknown LO version: " << loVersion);
-mnGeneratorVersion = SvXMLImport::LO_4x;
+if ('4' == loVersion[0] && 
loVersion.getLength() > 1
+ 

[Libreoffice-commits] core.git: oox/CustomTarget_generated.mk

[Miklos Vajna]

 oox/CustomTarget_generated.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b916fc4840ba67ef30e45ea735408237a3422b56
Author: Miklos Vajna 
Date:   Mon Mar 17 10:35:14 2014 +0100

oox: try to fix incremental build

The problem was that the input of the generated
vmlexport-shape-types.cxx got changed, but it was only built when
building from scratch. Fix this by depending on the makefile as well.

Change-Id: Ia2d7f059aae2f5819bb8a1329fefa74c56660607

diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index d5c058d..efe08ab 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -17,7 +17,8 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token
 $(oox_MISC)/vmlexport-shape-types.cxx : \

$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \

$(SRCDIR)/oox/source/drawingml/customshapes/presetShapeDefinitions.xml \
-   $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
+   $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml \
+   $(SRCDIR)/oox/CustomTarget_generated.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
mkdir -p $(dir $@)
perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
___
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-3' - sw/source

[Andras Timar]

 sw/source/filter/html/htmlcss1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9acee2fe2e7308ea7243b91b630dafbfc2574b7
Author: Andras Timar 
Date:   Sat Mar 15 18:51:49 2014 +0100

fdo#75040 fix application of help's stylesheet

it was regression from 73e3aafa990168aa532fa7b81fc4de8f455b10e1

Change-Id: I059f08b12bb7847472946f3b2a669015ec437be5
(cherry picked from commit 2e3969cb8bb235fed483ce49ddee5ea731376893)
Reviewed-on: https://gerrit.libreoffice.org/8609
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Björn Michaelsen 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index ea8ea42..69eddb7 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -646,7 +646,7 @@ static CSS1SelectorType GetTokenAndClass( const 
CSS1Selector *pSelector,
 }
 }
 
-rToken = rToken.toAsciiUpperCase();
+rToken = rToken.toAsciiLowerCase();
 return eType;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 69079] Creating a new themes in the gallery the files are always created as file "new theme.*" instead of "sdxxx.*" - existing files will be overwritten and leads to data loss.

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

 Resolution|INVALID |FIXED
Version|4.2.3.1 rc  |4.1.0.4 release

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

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

[Kohei Yoshida]

 sc/source/filter/inc/sheetdatacontext.hxx |4 ++--
 sc/source/filter/oox/sheetdatacontext.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 13686e068a057feb395308dfdce6df6717e1e4e6
Author: Kohei Yoshida 
Date:   Thu Mar 13 18:01:21 2014 -0400

fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.

Change-Id: I098d300532bef164bef0d40ebf62a6848bc19cb8
(cherry picked from commit ff56553e34dfed01b9226ce7a516dbeb6da32124)
Reviewed-on: https://gerrit.libreoffice.org/8577
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 
Reviewed-on: https://gerrit.libreoffice.org/8578
Reviewed-by: Norbert Thiebaud 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/filter/inc/sheetdatacontext.hxx 
b/sc/source/filter/inc/sheetdatacontext.hxx
index 3f3e377..880c60e 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -129,8 +129,8 @@ private:
 boolmbHasFormula;   /// True = current cell has 
formula data (OOXML only).
 boolmbValidRange;   /// True = maFmlaData.maFormulaRef 
is valid (OOXML only).
 
-sal_Int32 mnRow;
-sal_Int32 mnCol;
+sal_Int32 mnRow; /// row index (0-based)
+sal_Int32 mnCol; /// column index (0-based)
 };
 
 // 
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index 4bd841d..bbda959 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -279,11 +279,11 @@ ContextHandlerRef 
SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq
 void SheetDataContext::importRow( const AttributeList& rAttribs )
 {
 RowModel aModel;
-sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 );
+sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 ); // 1-based row index
 if(nRow != -1)
 {
 aModel.mnRow = nRow;
-mnRow = nRow;
+mnRow = nRow-1; // to 0-based row index.
 }
 else
 aModel.mnRow = ++mnRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ravindra Vidhate]

 sw/qa/extras/inc/swmodeltestbase.hxx|1 +
 sw/qa/extras/ooxmlexport/data/fdo76098.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   12 
 sw/source/filter/ww8/docxexport.cxx |7 ++-
 4 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit e1b5e32a704a93ceb99b20647ae0bc452866
Author: Ravindra Vidhate 
Date:   Thu Mar 13 15:13:32 2014 +0530

fdo#76098 ContentType for .xlsm external data file  is wrong

1. Open a File which has Pie Chart in LO.
2. The content type of Pie Chart should Macro Enabled.
3. using LO, SAVE this file.
4. Opened the Save file in MS-Office.
5. The file gets corrupted due to the ContentType gets changed.

Conflicts:
sw/qa/extras/inc/swmodeltestbase.hxx
Reviewed on:
https://gerrit.libreoffice.org/8572

Change-Id: I20f92f52cc79df4fc5e10c4e4867e2e704ba3c86

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index d2f3b29..dde4a45 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -552,6 +552,7 @@ protected:
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("rels"), 
BAD_CAST("http://schemas.openxmlformats.org/package/2006/relationships";));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("w14"), 
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordml";));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("m"), 
BAD_CAST("http://schemas.openxmlformats.org/officeDocument/2006/math";));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("ContentType"), 
BAD_CAST("http://schemas.openxmlformats.org/package/2006/content-types";));
 xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
 return pXmlXpathObj->nodesetval;
 }
diff --git a/sw/qa/extras/ooxmlexport/data/fdo76098.docx 
b/sw/qa/extras/ooxmlexport/data/fdo76098.docx
new file mode 100644
index 000..8a616e9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76098.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 772156e..e31bef9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2813,6 +2813,18 @@ DECLARE_OOXMLEXPORT_TEST(testNestedAlternateContent, 
"nestedAlternateContent.doc
 
assertXPath(pXmlDoc,"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wpg:wgp[1]/wps:wsp[2]/wps:txbx[1]/w:txbxContent[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]",0);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, "fdo76098.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc)
+   return;
+
+assertXPath(pXmlDoc, "/ContentType:Types/ContentType:Override[2]", 
"ContentType", "application/vnd.ms-excel.sheet.macroEnabled.12");
+
+}
+
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index a595f7f..50eb592 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1213,10 +1213,15 @@ void DocxExport::WriteEmbeddings()
 OUString embeddingPath = embeddingsList[j].Name;
 uno::Reference embeddingsStream;
 embeddingsList[j].Value >>= embeddingsStream;
+
+OUString contentType = 
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+if (embeddingPath.endsWith(OUString(".xlsm")))
+contentType = "application/vnd.ms-excel.sheet.macroEnabled.12";
+
 if ( embeddingsStream.is() )
 {
 uno::Reference< io::XOutputStream > xOutStream = 
GetFilter().openFragmentStream(embeddingPath,
-
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+contentType);
 try
 {
 sal_Int32 nBufferSize = 512;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 69079] Creating a new themes in the gallery the files are always created as file "new theme.*" instead of "sdxxx.*" - existing files will be overwritten and leads to data loss.

[bugzilla-daemon]

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

--- Comment #14 from Michael Meeks  ---
Right - should be fixed in 4.1.4 and all 4.2.x and master etc. long ago =)
perhaps I screwed something up, wouldn't be the first time of course.

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

[YogeshBharate]

 sw/qa/extras/ooxmlexport/data/nestedAlternateContent.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |9 +
 sw/source/filter/ww8/docxattributeoutput.cxx  |3 +++
 3 files changed, 12 insertions(+)

New commits:
commit 6415f3e7ab6a7728d44dbb49c1486ac9ca649a17
Author: YogeshBharate 
Date:   Wed Mar 12 19:26:00 2014 +0530

fdo#75604: File Corruption - Issue related to the nested AlternateContent.

Problem Description:
- If the document contains, text box & group shape having
  text, after roundtrip file get corrupted.
- Due this the text box exported inside the another group shape.
(i.e nested alternateContent which is not allowed in MS office 2010.)

Implementation:
- Use the variable which avoid the nested alternateContent.
- This keeps the various text frame on same level in different
  run.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8555

Change-Id: Ia18eb2b8cf17a451ebe344a811efae1328134215

diff --git a/sw/qa/extras/ooxmlexport/data/nestedAlternateContent.docx 
b/sw/qa/extras/ooxmlexport/data/nestedAlternateContent.docx
new file mode 100644
index 000..5b6b03c
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/nestedAlternateContent.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2a2f7c8..772156e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2804,6 +2804,15 @@ DECLARE_OOXMLEXPORT_TEST(testFileWithInvalidImageLink, 
"FileWithInvalidImageLink
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/pic:pic[1]/pic:blipFill[1]/a:blip[1]",
 "embed", "");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testNestedAlternateContent, 
"nestedAlternateContent.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+ if (!pXmlDoc)
+return;
+// We check alternateContent  could not contains alternateContent (i.e. 
nested alternateContent)
+
assertXPath(pXmlDoc,"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wpg:wgp[1]/wps:wsp[2]/wps:txbx[1]/w:txbxContent[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]",0);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cfa3b47..1b3ec74 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4069,7 +4069,10 @@ void DocxAttributeOutput::WriteOutliner(const 
OutlinerParaObject& rParaObj)
 aAttrIter.NextPos();
 }
 while( nAktPos < nEnd );
+// Word can't handle nested text boxes, so write them on the same 
level.
+++m_nTextFrameLevel;
 EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t());
+--m_nTextFrameLevel;
 }
 m_pSerializer->endElementNS( XML_w, XML_txbxContent );
 }
___
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 sw/source

[umeshkadam]

 oox/source/export/drawingml.cxx |7 -
 sw/qa/extras/ooxmlexport/data/FileWithInvalidImageLink.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   13 +
 sw/source/filter/ww8/docxattributeoutput.cxx|   16 +---
 4 files changed, 31 insertions(+), 5 deletions(-)

New commits:
commit 881ca9d48fc67665559484901ce6a670dc331ab8
Author: umeshkadam 
Date:   Tue Mar 11 20:42:31 2014 +0530

FDO#76013 : If original file has image whose link is broken RT gets 
corrupted.

- The original file contains an image which has invalid link.
- since the link is invalid the import throws an exception while loading
  the image & the link is lost.
- while exporting the system used to write an empty image for an unhandled
  graphic type, which is incorrect and the RT file would result in corrupt.
- Fixed this issue and added UT.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8549

Change-Id: If884f154d1fba921280d63930e7fccb979ea5608

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index aeeff25..7d8ea84 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -779,7 +779,12 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , 
bool bRelPathToMedia )
 pExtension = ".emf";
 } else {
 OSL_TRACE( "unhandled graphic type" );
-break;
+/*Earlier, even in case of unhandled graphic types we were
+  proceeding to write the image, which would eventually
+  write an empty image with a zero size, and return a valid
+  relationID, which is incorrect.
+  */
+return sRelId;
 }
 
 aData = aStream.GetData();
diff --git a/sw/qa/extras/ooxmlexport/data/FileWithInvalidImageLink.docx 
b/sw/qa/extras/ooxmlexport/data/FileWithInvalidImageLink.docx
new file mode 100644
index 000..6ad5cac
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/FileWithInvalidImageLink.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9a43735..2a2f7c8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2791,6 +2791,19 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76016, "fdo76016.docx")
 assertXPath(pXmlDoc, 
"//a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd[2]", 
"name", "adj2");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFileWithInvalidImageLink, 
"FileWithInvalidImageLink.docx")
+{
+/* In case if the original file has an image whose link is
+   invalid, then the RT file used to result in corruption
+   since the exported image would be an empty image.
+ */
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+  return;
+
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:r[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/pic:pic[1]/pic:blipFill[1]/a:blip[1]",
 "embed", "");
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a380dd0..cfa3b47 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3319,9 +3319,6 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 nImageType = XML_embed;
 }
 
-if ( aRelId.isEmpty() )
-return;
-
 m_rExport.SdrExporter().startDMLAnchorInline(pFrmFmt, rSize);
 
 // picture description (used for pic:cNvPr later too)
@@ -3383,7 +3380,18 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 // the actual picture
 m_pSerializer->startElementNS( XML_pic, XML_blipFill,
 FSEND );
-m_pSerializer->singleElementNS( XML_a, XML_blip,
+
+/* At this point we are certain that, WriteImage returns empty RelId
+   for unhandled graphic type. Therefore we write the picture description
+   and not the relation( coz there ain't any), so that the user knows
+   there is a image/graphic in the doc but it is broken instead of
+   completely discarding it.
+*/
+if ( aRelId.isEmpty() )
+m_pSerializer->singleElementNS( XML_a, XML_blip,
+FSEND );
+else
+m_pSerializer->singleElementNS( XML_a, XML_blip,
 FSNS( XML_r, nImageType ), aRelId.getStr(),
 FSEND );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Buildbot failure for https://gerrit.libreoffice.org/#/c/8548/

[Stephan Bergmann]

On 03/16/2014 10:58 PM, Chris Sherlock wrote:

Does anyone have any ideas why
https://gerrit.libreoffice.org/#/c/8548/ failed only for OS X?

The code around sc/qa/unit/ucalc.cxx isn't OS X specific!


The compiler used on Mac apparently had another idea than the others 
about the implications of an explicit copy constructor, cf. 
 
"Help poor old Mac compiler by making ScClipParam copy ctor non-explicit."


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

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

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 030a9bfd42184c868bcc61b91af58f70b1c02677
Author: Markus Mohrhard 
Date:   Mon Mar 17 09:39:27 2014 +0100

fix another wrong transparency calculation

Change-Id: I963e6c69f34f07f797dd98810195fd58e79e494f

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 9f79dd3..e0b5f21 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -741,7 +741,7 @@ void DummyRectangle::render()
 if(itr != maProperties.end())
 {
 uno::Any al = itr->second;
-nAlpha = al.get();
+nAlpha = 255 - al.get()/100.0*255;
 }
 pChart->m_GLRender.SetBackGroundColor(nColorValue, nColorValue, 
nAlpha);
 }
commit 217731165a0d8ee512919dcb9ecec296c6ee4b4c
Author: Markus Mohrhard 
Date:   Mon Mar 17 09:36:52 2014 +0100

fix rendering of invisible bubble

Change-Id: Iee14035b44ef808cca2ee426684733f20c1771ac

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 72c2139..9f79dd3 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -546,8 +546,11 @@ void DummyCircle::render()
 std::map::const_iterator itr = 
maProperties.find("FillTransparence");
 if(itr != maProperties.end())
 {
-sal_Int32 nTrans = itr->second.get();
+sal_Int32 nTrans = itr->second.get()/100.0*255;
 nAlpha = 255 - static_cast(nTrans & 0xFF);
+
+if(nAlpha == 0)
+return;
 }
 
 itr = maProperties.find("FillColor");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muthu Subramanian]

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

New commits:
commit 2796aa203c563d45b12dd395a963724a1c0e42ed
Author: Muthu Subramanian 
Date:   Mon Mar 17 14:06:34 2014 +0530

n#862510: Adding unit test case for baseline=0

Change-Id: Ia8281ddc31b653ecf47c6bb5030db74de75b2e8d

diff --git a/sd/qa/unit/data/pptx/n862510_1.pptx 
b/sd/qa/unit/data/pptx/n862510_1.pptx
new file mode 100644
index 000..2a16a4b
Binary files /dev/null and b/sd/qa/unit/data/pptx/n862510_1.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index eb3b56d..8ea16b5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -61,6 +61,7 @@ public:
 void testFdo68594();
 void testFdo72998();
 void testStrictOOXML();
+void testN862510_1();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
 CPPUNIT_TEST(testDocumentLayout);
@@ -78,6 +79,7 @@ public:
 CPPUNIT_TEST(testFdo68594);
 CPPUNIT_TEST(testFdo72998);
 CPPUNIT_TEST(testStrictOOXML);
+CPPUNIT_TEST(testN862510_1);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -235,6 +237,31 @@ void SdFiltersTest::testN821567()
 CPPUNIT_ASSERT_MESSAGE("Slide Background is not exported properly", 
!bgImage.isEmpty());
 }
 
+void SdFiltersTest::testN862510_1()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_1.pptx") );
+CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( "in destruction", !xDocShRef->IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+const SdrPage *pPage = pDoc->GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+{
+std::vector rLst;
+SdrObject *pObj = pPage->GetObj( 0 );
+SdrTextObj *pTxtObj = dynamic_cast( pObj );
+CPPUNIT_ASSERT( pTxtObj );
+const EditTextObject& aEdit = 
pTxtObj->GetOutlinerParaObject()->GetTextObject();
+aEdit.GetCharAttribs( 0, rLst );
+for( std::vector::reverse_iterator it = rLst.rbegin(); 
it!=rLst.rend(); ++it)
+{
+const SvxEscapementItem *pFontEscapement = dynamic_cast( (*it).pAttr );
+CPPUNIT_ASSERT_MESSAGE( "Baseline attribute not handled properly", 
!( pFontEscapement && pFontEscapement->GetProp() != 100 ) );
+}
+}
+}
+
 void SdFiltersTest::testN828390()
 {
 bool bPassed = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 69079] Creating a new themes in the gallery the files are always created as file "new theme.*" instead of "sdxxx.*" - existing files will be overwritten and leads to data loss.

[bugzilla-daemon]

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

Peter Mögenburg  changed:

   What|Removed |Added

   Hardware|All |x86 (IA32)
 OS|All |Windows (All)
 Resolution|FIXED   |INVALID
Version|4.1.0.4 release |4.2.3.1 rc

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

Re: query for gsoc

[Cedric Bosdonnat]

Hello Goel,

You will find some help on how to apply here:
https://wiki.documentfoundation.org/Development/GSoc#How_to_apply

First thing, pick a bug in bugzilla or an easyhack in the list, fix it
and submit a patch in gerrit (and get it approved).

Having a patch approved before the end of the application period is
mandatory if you want us to consider your application.

Regards,
--
Cedric

On Sat, 2014-03-15 at 16:59 +0530, Pramiti Goel wrote:
> hi,
> I am Pramiti Goel pursuing Information Technology from India. I am C/C
> ++ programmer and a beginner in open source. Can u tell me Libreoffice
> project and recent bugs to start with and will be suitable for GSOC
> 2014? What idea or bug will make strong recommendation for GSOC 2014. 
>  I have particularly interest in following projects but can suggest
> any other suitable one: Please guide me with should i start and the
> bug list to start with ? any prerequisite knowledge of any other thing
> needed? 
> 
> 
> Refactor god objects
> Connection to SharePoint and/or Microsoft OneDrive
> Document Themes
> Improving Charts
> More and better tests
> Dialog Widget Conversion
> Improved Color selection
> Improve usability of Personas
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

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

[Norbert Thiebaud]

 include/vcl/outdev.hxx |2 -
 vcl/inc/sallayout.hxx  |2 +
 vcl/quartz/ctlayout.cxx|   59 ---
 vcl/source/gdi/outdev3.cxx |   75 +++--
 4 files changed, 102 insertions(+), 36 deletions(-)

New commits:
commit 45b0c12a021fb0eb896faf4f0de9026586407012
Author: Norbert Thiebaud 
Date:   Fri Mar 14 23:18:13 2014 -0500

fdo#67808 Fix Outline Font Effect support with CoreText

We add a new DrawTextSpecial() virtual to SalLayout
that allows to attempt to delegate font effects
to the underlying native graphic system.
The function return false if it was not capable of handling the effect,
true otherwise.
Right now only Outline Font effect on Coretext is actually handled that way.

OutPutDevice is augmented to attempt to delegate the font decoration
work, if the task was not handled properly it fallback on the generic code.

Note: ideally these effects should really be part of the FontSelector
info that is given during layoutting, and the layout should
indicate which of these decorations it was able to manage natively

but that is a much bigger architectural change.. this will do for now.

Change-Id: I5eb1a15e985cc3f234ec3dee899f349f309b42cb
Reviewed-on: https://gerrit.libreoffice.org/8599
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 951a26b..da696af 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -621,7 +621,7 @@ public:
 SAL_DLLPRIVATE void ImplDrawTextBackground( const SalLayout& );
 SAL_DLLPRIVATE void ImplDrawTextLines( SalLayout&, FontStrikeout 
eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bWordLine, 
bool bUnderlineAbove );
 SAL_DLLPRIVATE bool ImplDrawRotateText( SalLayout& );
-SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, bool 
bTextLines );
+SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool 
bTextLines, sal_uInt32 flags = 0 );
 SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& );
 SAL_DLLPRIVATE void ImplDrawText( SalLayout& );
 SAL_DLLPRIVATE RectangleImplGetTextBoundRect( const SalLayout& );
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index b824e74..f3727ba 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -179,6 +179,8 @@ public:
 virtual voidAdjustLayout( ImplLayoutArgs& );// adjusting after 
fallback etc.
 virtual voidInitFont() const {}
 virtual voidDrawText( SalGraphics& ) const = 0;
+virtual boolDrawTextSpecial( SalGraphics& /* rGraphics */, sal_uInt32 
/* flags */ ) const { return false; }
+#define DRAWTEXT_F_OUTLINE ((sal_uInt32)(1<<0))
 
 int GetUnitsPerPixel() const{ return 
mnUnitsPerPixel; }
 int GetOrientation() const  { return 
mnOrientation; }
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index ec75168..b8b1b98 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -31,6 +31,7 @@ public:
 virtual boolLayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
 virtual voidAdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
 virtual voidDrawText( SalGraphics& ) const SAL_OVERRIDE;
+virtual boolDrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags 
) const SAL_OVERRIDE;
 
 virtual int GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& 
rPos, int&,
sal_Int32* pGlyphAdvances, int* 
pCharIndexes,
@@ -48,6 +49,7 @@ public:
 virtual voidSimplify( bool bIsBase ) SAL_OVERRIDE;
 
 private:
+voiddrawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef 
ctline, const CoreTextStyle* const pStyle) const;
 CGPoint GetTextDrawPosition(void) const;
 double  GetWidth(void) const;
 
@@ -244,14 +246,50 @@ CGPoint CTLayout::GetTextDrawPosition(void) const
 return aTextPos;
 }
 
-void CTLayout::DrawText( SalGraphics& rGraphics ) const
+/* use to deal with special font decoration like 'outline' drawing
+ * return true if it was able to handle the drawing
+ * false if not, in which case the caller
+ * is supposed to fallback to 'generic' method
+ */
+bool CTLayout::DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) 
const
 {
 AquaSalGraphics& rAquaGraphics = static_cast(rGraphics);
 
 // short circuit if there is nothing to do
 if( (mnCharCount <= 0) || !rAquaGraphics.CheckContext() )
-return;
+return true;
 
+if (flags & DRAWTEXT_F_OUTLINE)
+{
+CFMutableDictionaryRef styledict = CFDictionaryCreateMutableCopy(
+CFAllocatorGetDefault(),
+CFDictionaryGetCount(mpTextStyle->GetStyleDict()),
+mpTextStyle->GetStyleDict());
+
+int nStroke

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

[Tor Lillqvist]

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7af311d2813139660dd2e55cd34bfbd34b650255
Author: Tor Lillqvist 
Date:   Mon Mar 17 09:31:14 2014 +0200

Add vcl.opengl

Change-Id: I9c809cae0420e73d2e4a447b9d8a3a03e42dc723

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 41ef580..3c5b5df 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -363,6 +363,7 @@ certain functionality.
 @li @c vcl.kde4 - KDE4
 @li @c vcl.layout - Widget layout
 @li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
+@li @c vcl.opengl
 @li @c vcl.osx
 @li @c vcl.osx.print
 @li @c vcl.quartz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/inc/DummyXShape.hxx  |  436 
 chart2/source/view/main/DummyXShape.hxx |  436 
 2 files changed, 436 insertions(+), 436 deletions(-)

New commits:
commit 1eb20c97e4d0f644efcf46aedac619a9765488c3
Author: Markus Mohrhard 
Date:   Mon Mar 17 08:25:35 2014 +0100

move DummyXShape.hxx to the cxx file

Change-Id: Idc99da66de907dd104fc3193087f556418e1ef58

diff --git a/chart2/source/view/inc/DummyXShape.hxx 
b/chart2/source/view/main/DummyXShape.hxx
similarity index 100%
rename from chart2/source/view/inc/DummyXShape.hxx
rename to chart2/source/view/main/DummyXShape.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |1 +
 include/vcl/OpenGLContext.hxx|4 +++-
 vcl/source/opengl/OpenGLContext.cxx  |4 
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 418edcf057a2ea1f99d17ce424293b2acd48a6e9
Author: Markus Mohrhard 
Date:   Mon Mar 17 08:24:14 2014 +0100

fix multisample support in OpenGL

Change-Id: I7e530f5ae8d83d275df554781847b525b38bf4c7

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index ede3353..72e0c27 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -235,6 +235,7 @@ GLfloat texCoords[] = {
 int OpenGLRender::InitOpenGL(GLWindow aWindow)
 {
 glWin = aWindow;
+mbArbMultisampleSupported = glWin.bMultiSampleSupported;
 if(!bGlewInit)
 {
 glewExperimental = GL_TRUE;
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx
index 4067feb..390c3df 100644
--- a/include/vcl/OpenGLContext.hxx
+++ b/include/vcl/OpenGLContext.hxx
@@ -65,6 +65,7 @@ struct GLWindow
 unsigned intWidth;
 unsigned intHeight;
 const GLubyte*  GLExtensions;
+bool bMultiSampleSupported;
 
 bool HasGLExtension( const char* name ) { return gluCheckExtension( (const 
GLubyte*) name, GLExtensions ); }
 
@@ -86,7 +87,8 @@ struct GLWindow
 bpp(0),
 Width(0),
 Height(0),
-GLExtensions(NULL)
+GLExtensions(NULL),
+bMultiSampleSupported(false)
 {
 }
 };
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 66e16a5..5f94c47 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -369,6 +369,7 @@ bool OpenGLContext::init()
 bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix);
 if (bMultiSampleSupport)
 {
+m_aGLWin.bMultiSampleSupported = true;
 }
 else
 {
@@ -568,6 +569,9 @@ bool OpenGLContext::initWindow()
 XFree( pVi );
 }
 
+if(best_num_samp > 0)
+m_aGLWin.bMultiSampleSupported = true;
+
 XVisualInfo* vi = glXGetVisualFromFBConfig( m_aGLWin.dpy, pFBC[best_fbc] );
 if( vi )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-fixes' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-fixes' - include/vcl vcl/source

[Markus Mohrhard]

 include/vcl/OpenGLContext.hxx   |4 ++--
 vcl/source/opengl/OpenGLContext.cxx |   32 +---
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 3bf7d74251956f142bd6c713b91fcf5f4c66c12a
Author: Markus Mohrhard 
Date:   Mon Mar 17 08:11:38 2014 +0100

windows fixes for opengl

Change-Id: I2ee3bcf9f87b46c14af26adb82eabd43d9164adb

diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx
index 43802c9..4067feb 100644
--- a/include/vcl/OpenGLContext.hxx
+++ b/include/vcl/OpenGLContext.hxx
@@ -21,6 +21,8 @@
 #  include "postwin.h"
 #endif
 
+#include 
+
 #if defined( _WIN32 )
 #include 
 #include 
@@ -32,8 +34,6 @@
 #include 
 #endif
 
-#include 
-
 #include 
 #include 
 #include 
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 100484f..66e16a5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -48,7 +48,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 
WPARAM wParam, LPARAM l
 }
 }
 
-int InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATDESCRIPTOR 
inPfd)
+int InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATDESCRIPTOR 
inPfd, GLWindow glWin)
 {
 PIXELFORMATDESCRIPTOR  pfd = inPfd;
 int  pfmt;
@@ -126,11 +126,12 @@ bool WGLisExtensionSupported(const char *extension)
 }
 }
 
-bool InitMultisample(PIXELFORMATDESCRIPTOR pfd)
+bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int& rPixelFormat)
 {
 HWND hWnd = NULL;
+GLWindow glWin;
 //create a temp windwo to check whether support multi-sample, if support, 
get the format
-if (InitTempWindow(&hWnd, m_iWidth, m_iHeight, pfd) < 0)
+if (InitTempWindow(&hWnd, 1, 1, pfd, glWin) < 0)
 {
 SAL_WARN("vcl.opengl", "Can't create temp window to test");
 return false;
@@ -139,7 +140,6 @@ bool InitMultisample(PIXELFORMATDESCRIPTOR pfd)
 // See If The String Exists In WGL!
 if (!WGLisExtensionSupported("WGL_ARB_multisample"))
 {
-mbArbMultisampleSupported = false;
 SAL_WARN("vcl.opengl", "Device doesn't support multi sample");
 return false;
 }
@@ -147,7 +147,6 @@ bool InitMultisample(PIXELFORMATDESCRIPTOR pfd)
 PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB = 
(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
 if (!wglChoosePixelFormatARB)
 {
-mbArbMultisampleSupported = false;
 return false;
 }
 // Get Our Current Device Context
@@ -176,38 +175,42 @@ bool InitMultisample(PIXELFORMATDESCRIPTOR pfd)
 WGL_SAMPLES_ARB,8,
 0,0
 };
+
+bool bArbMultisampleSupported = true;
+
 // First We Check To See If We Can Get A Pixel Format For 4 Samples
 valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1, 
&pixelFormat, &numFormats);
 // If We Returned True, And Our Format Count Is Greater Than 1
 if (valid && numFormats >= 1)
 {
-mbArbMultisampleSupported = true;
-m_iArbMultisampleFormat = pixelFormat;
+bArbMultisampleSupported = true;
+rPixelFormat = pixelFormat;
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(glWin.hRC);
 ReleaseDC(hWnd, glWin.hDC);
 DestroyWindow(hWnd);
-return mbArbMultisampleSupported;
+return bArbMultisampleSupported;
 }
 // Our Pixel Format With 4 Samples Failed, Test For 2 Samples
 iAttributes[19] = 2;
 valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1, 
&pixelFormat, &numFormats);
 if (valid && numFormats >= 1)
 {
-mbArbMultisampleSupported = true;
-m_iArbMultisampleFormat = pixelFormat;
+bArbMultisampleSupported = true;
+rPixelFormat = pixelFormat;
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(glWin.hRC);
 ReleaseDC(hWnd, glWin.hDC);
 DestroyWindow(hWnd);
-return mbArbMultisampleSupported;
+return bArbMultisampleSupported;
 }
 // Return The Valid Format
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(glWin.hRC);
 ReleaseDC(hWnd, glWin.hDC);
 DestroyWindow(hWnd);
-return  mbArbMultisampleSupported;
+
+return  bArbMultisampleSupported;
 }
 #endif
 
@@ -363,10 +366,9 @@ bool OpenGLContext::init()
 
 //  we must check whether can set the MSAA
 int WindowPix;
-rGLRender.InitMultisample(PixelFormatFront);
-if (rGLRender.GetMSAASupport())
+bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix);
+if (bMultiSampleSupport)
 {
-WindowPix = rGLRender.GetMSAAFormat();
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - codemaker/source editeng/source filter/source include/codemaker include/editeng include/filter include/formula include/oox include/osl include/toolkit inclu

[Noel Grandin]

 codemaker/source/codemaker/global.cxx   |6 +++---
 codemaker/source/javamaker/javatype.cxx |   16 
 editeng/source/lookuptree/Trie.cxx  |   18 +-
 editeng/source/outliner/outlobj.cxx |2 +-
 filter/source/flash/swffilter.cxx   |2 +-
 filter/source/graphicfilter/eos2met/eos2met.cxx |4 ++--
 filter/source/msfilter/escherex.cxx |2 +-
 filter/source/msfilter/util.cxx |2 +-
 filter/source/placeware/exporter.cxx|2 +-
 filter/source/svg/svgexport.cxx |2 +-
 filter/source/xmlfilterdetect/filterdetect.cxx  |2 +-
 filter/source/xsltdialog/xmlfilterjar.cxx   |5 ++---
 include/codemaker/global.hxx|6 +++---
 include/editeng/Trie.hxx|4 ++--
 include/editeng/outlobj.hxx |2 +-
 include/filter/msfilter/escherex.hxx|2 +-
 include/filter/msfilter/util.hxx|2 +-
 include/formula/formdata.hxx|2 +-
 include/oox/crypto/DocumentEncryption.hxx   |2 +-
 include/oox/drawingml/color.hxx |4 ++--
 include/oox/drawingml/shape.hxx |2 +-
 include/oox/export/drawingml.hxx|8 
 include/oox/helper/grabbagstack.hxx |   10 +-
 include/oox/ppt/comments.hxx|2 +-
 include/oox/vml/vmlshape.hxx|2 +-
 include/osl/profile.hxx |2 +-
 include/toolkit/controls/eventcontainer.hxx |4 ++--
 include/unotools/compatibility.hxx  |2 +-
 oox/source/crypto/DocumentEncryption.cxx|2 +-
 oox/source/drawingml/color.cxx  |2 +-
 oox/source/drawingml/shape.cxx  |2 +-
 oox/source/export/drawingml.cxx |8 
 oox/source/helper/grabbagstack.cxx  |   10 +-
 oox/source/helper/storagebase.cxx   |3 ++-
 oox/source/ppt/comments.cxx |3 ++-
 sal/qa/osl/file/osl_File.cxx|   18 +-
 sal/qa/osl/module/osl_Module.cxx|8 
 unotools/source/config/compatibility.cxx|6 +++---
 38 files changed, 91 insertions(+), 90 deletions(-)

New commits:
commit c66229bfa4284758b787bf80ddd1b2e3795881df
Author: Noel Grandin 
Date:   Mon Mar 17 08:58:59 2014 +0200

oox: prefer passing OUString by reference

Change-Id: Iace276878e7ae668bba5bb6e36af1e5d5d72d6cb

diff --git a/include/oox/crypto/DocumentEncryption.hxx 
b/include/oox/crypto/DocumentEncryption.hxx
index 4410357..55e3d12 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -41,7 +41,7 @@ public:
 DocumentEncryption(
 com::sun::star::uno::Reference< com::sun::star::io::XStream > 
xDocumentStream,
 oox::ole::OleStorage& rOleStorage,
-OUString aPassword);
+const OUString& aPassword);
 
 bool encrypt();
 
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index 951e52b..e3522e5 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -61,7 +61,7 @@ public:
 /** Sets a scheme color from the a:schemeClr element. */
 voidsetSchemeClr( sal_Int32 nToken );
 /** Sets the scheme name from the a:schemeClr element for interoperability 
purposes */
-voidsetSchemeName( OUString sSchemeName ) { msSchemeName = 
sSchemeName; }
+voidsetSchemeName( const OUString& sSchemeName ) { 
msSchemeName = sSchemeName; }
 /** Sets a system color from the a:sysClr element. */
 voidsetSysClr( sal_Int32 nToken, sal_Int32 nLastRgb );
 /** Sets a palette color index. */
@@ -102,7 +102,7 @@ public:
 /** Translates between color transformation tokens and their names */
 static OUString getColorTransformationName( sal_Int32 nElement );
 /** Translates between color transformation token names and the 
corresponding token */
-static sal_Int32getColorTransformationToken( OUString sName );
+static sal_Int32getColorTransformationToken( const OUString& sName );
 
 private:
 /** Internal helper for getColor(). */
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 911298f..2d0cb45 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -179,7 +179,7 @@ public:
 getDiagramDoms() { return maDiagramDoms; }
 voidsetDiagramDoms(const 
com::sun::star::uno::Sequence& 
rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
 com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< 
com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
-