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

[Michael Stahl]

 filter/source/graphicfilter/idxf/dxf2mtf.cxx  |   56 ++
 filter/source/graphicfilter/idxf/dxf2mtf.hxx  |2 
 filter/source/graphicfilter/idxf/dxfblkrd.cxx |   16 +++
 filter/source/graphicfilter/idxf/dxfblkrd.hxx |8 +--
 filter/source/graphicfilter/idxf/dxfentrd.cxx |   56 +++---
 filter/source/graphicfilter/idxf/dxfentrd.hxx |   28 ++---
 filter/source/graphicfilter/idxf/dxfreprd.cxx |4 -
 filter/source/graphicfilter/idxf/dxftblrd.cxx |   44 ++--
 filter/source/graphicfilter/idxf/dxftblrd.hxx |   22 +-
 9 files changed, 110 insertions(+), 126 deletions(-)

New commits:
commit ac48e8c589233962bc68644b30bb184c3b0ee321
Author: Michael Stahl mst...@redhat.com
Date:   Sat Oct 5 23:12:40 2013 +0200

fdo#64400: DXF import filter: fix OUString handling

The DXF import filter stores all strings read from the file in
char[DXF_MAX_STRING_LEN+1] arrays, and then calls OUString constructor
with that which then asserts because the string is actually shorter than
the size of the array... avoid that by converting from char* to OString.

Actually this also fixes the actual bug: the weird lines in the exported
PDF were tiny Text elements from the document, repeated.

(cherry picked from commit 96852a89da058084b2acf5ff706d9679b127b29a)

Conflicts:
filter/source/graphicfilter/idxf/dxf2mtf.cxx
filter/source/graphicfilter/idxf/dxfblkrd.hxx
filter/source/graphicfilter/idxf/dxfentrd.hxx
filter/source/graphicfilter/idxf/dxftblrd.hxx

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

diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx 
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index c22e0a4..e4e9f17 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -52,9 +52,10 @@ long DXF2GDIMetaFile::GetEntityColor(const DXFBasicEntity  
rE)
 
 nColor=rE.nColor;
 if (nColor==256) {
-if (rE.sLayer[0]=='0'  rE.sLayer[1]==0) nColor=nParentLayerColor;
-else {
-pLayer=pDXF-aTables.SearchLayer(rE.sLayer);
+if (rE.m_sLayer.getLength()  2) {
+nColor=nParentLayerColor;
+} else {
+pLayer=pDXF-aTables.SearchLayer(rE.m_sLayer);
 if (pLayer!=NULL) nColor=pLayer-nColor;
 else nColor=nParentLayerColor;
 }
@@ -63,12 +64,12 @@ long DXF2GDIMetaFile::GetEntityColor(const DXFBasicEntity  
rE)
 return nColor;
 }
 
-DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
+DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(OString const rLineType)
 {
 const DXFLType * pLT;
 DXFLineInfo aDXFLineInfo;
 
-pLT=pDXF-aTables.SearchLType(sLineType);
+pLT = pDXF-aTables.SearchLType(rLineType);
 if (pLT==NULL || pLT-nDashCount == 0) {
 aDXFLineInfo.eStyle = LINE_SOLID;
 }
@@ -125,18 +126,23 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const 
DXFBasicEntity  rE)
 aDXFLineInfo.fDotLen = 0;
 aDXFLineInfo.fDistance = 0;
 
-if (strcmp(rE.sLineType,BYLAYER)==0) {
-if (rE.sLayer[0]=='0'  rE.sLayer[1]==0) 
aDXFLineInfo=aParentLayerDXFLineInfo;
-else {
-pLayer=pDXF-aTables.SearchLayer(rE.sLayer);
-if (pLayer!=NULL) 
aDXFLineInfo=LTypeToDXFLineInfo(pLayer-sLineType);
+if (rE.m_sLineType == BYLAYER) {
+if (rE.m_sLayer.getLength()  2) {
+aDXFLineInfo=aParentLayerDXFLineInfo;
+} else {
+pLayer=pDXF-aTables.SearchLayer(rE.m_sLayer);
+if (pLayer!=NULL) {
+aDXFLineInfo = LTypeToDXFLineInfo(pLayer-m_sLineType);
+}
 else aDXFLineInfo=aParentLayerDXFLineInfo;
 }
 }
-else if (strcmp(rE.sLineType,BYBLOCK)==0) {
+else if (rE.m_sLineType == BYBLOCK) {
 aDXFLineInfo=aBlockDXFLineInfo;
 }
-else aDXFLineInfo=LTypeToDXFLineInfo(rE.sLineType);
+else {
+aDXFLineInfo = LTypeToDXFLineInfo(rE.m_sLineType);
+}
 return aDXFLineInfo;
 }
 
@@ -415,7 +421,6 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity  
rE, const DXFTransfor
 double fA;
 sal_uInt16 nHeight;
 short nAng;
-rtl::OString aStr( rE.sText );
 DXFTransform aT( 
DXFTransform(rE.fXScale,rE.fHeight,1.0,rE.fRotAngle,rE.aP0), rTransform );
 aT.TransDir(DXFVector(0,1,0),aV);
 nHeight=(sal_uInt16)(aV.Abs()+0.5);
@@ -424,7 +429,8 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity  
rE, const DXFTransfor
 aT.TransDir(DXFVector(1,0,0),aV);
 if ( SetFontAttribute( rE,nAng, nHeight, aV. Abs() ) )
 {
-rtl::OUString aUString(rtl::OStringToOUString(aStr, 
pDXF-getTextEncoding()));
+rtl::OUString const aUString(
+  

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

[Caolán McNamara]

 filter/source/msfilter/msvbahelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5c24f1bfdb98d19f2233d6296a80a68a533c820
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 9 16:39:28 2013 +0100

CID#736174 yikes, sizeof(char[]) includes 0, so 4 not 3

Change-Id: Ia54ecab9e08485ebffe98dc064f328360c17a120
(cherry picked from commit 8254648828e4f4d65a0516e160e5732f3d85765a)
Reviewed-on: https://gerrit.libreoffice.org/6174
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index cdfa730..d52a775 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -621,7 +621,7 @@ bool getModifier( char c, sal_uInt16 mod )
 static const char modifiers[] = +^%;
 static const sal_uInt16 KEY_MODS[] = {KEY_SHIFT, KEY_MOD1, KEY_MOD2};
 
-for ( unsigned int i=0; iSAL_N_ELEMENTS(modifiers); ++i )
+for ( unsigned int i=0; iSAL_N_ELEMENTS(KEY_MODS); ++i )
 {
 if ( c == modifiers[i] )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 69480705d9785296888a5543781d963bdab39a1c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 22 15:06:10 2013 +0100

Resolves: fdo#68275 Grayscale TIFF is imported as white

this reverts 6c719c1585eb1a2dbab86cc73ff871da41765981 n#615223 local nbyte1
should have been class-level nByte1 which was to fix the use seen
in valgrind og the uninitialized nByte1

So additionally remove the use of the uninit nByte1 entirely

Change-Id: I5b3f4fa00d74e545f207a11a5e90935f14a23a8e
(cherry picked from commit 98a61a2ae109f3d72940274ceafcf3e84d79aa0b)
Reviewed-on: https://gerrit.libreoffice.org/5585
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 961acdd..21d7b3b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -63,7 +63,6 @@ private:
 sal_uInt16  nDataType;
 // Daten, die aus dem TIFF-Tags entnommen werden:
 sal_BoolbByteSwap;  // sal_True if bits 
0..7 - 7..0 should get converted ( FILLORDER = 2 );
-sal_uInt8   nByte1; // 'I', if the format 
is LittleEndian
 
 sal_uLong   nNewSubFile;//
 sal_uLong   nSubFile;   //
@@ -125,12 +124,7 @@ private:
 bool HasAlphaChannel() const;
 public:
 
-TIFFReader()
-: pAlphaMask(0)
-, pMaskAcc(0)
-, nByte1(0)
-{
-}
+TIFFReader() : pAlphaMask(0), pMaskAcc(0) {}
 ~TIFFReader()
 {
 delete pAlphaMask;
@@ -1020,8 +1014,6 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 sal_uLong nMinMax = ( ( 1  8 /*nDstBitsPerPixel*/ ) - 1 ) / ( 
nMaxSampleValue - nMinSampleValue );
 sal_uInt8*  pt = pMap[ 0 ];
-if ( nByte1 == 'I' )
-pt++;
 for ( nx = 0; nx  nImageWidth; nx++, pt += 2 )
 {
 pAcc-SetPixel( nY, nx, (sal_uInt8)( ( (sal_uLong)*pt - 
nMinSampleValue ) * nMinMax ) );
@@ -1088,17 +1080,17 @@ void TIFFReader::MakePalCol( void )
 
 void TIFFReader::ReadHeader()
 {
-sal_uInt8 nbyte2(0);
-sal_uInt16 nushort(0);
+sal_uInt8 nbyte1, nbyte2;
+sal_uInt16 nushort;
 
-*pTIFF  nByte1;
-if ( nByte1 == 'I' )
+*pTIFF  nbyte1;
+if ( nbyte1 == 'I' )
 pTIFF-SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 else
 pTIFF-SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
 
 *pTIFF  nbyte2  nushort;
-if ( nByte1 != nbyte2 || ( nByte1 != 'I'  nByte1 != 'M' ) || nushort != 
0x002a )
+if ( nbyte1 != nbyte2 || ( nbyte1 != 'I'  nbyte1 != 'M' ) || nushort != 
0x002a )
 bStatus = sal_False;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 filter/source/config/fragments/filters/Rich_Text_Format.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3f0fd9dc42cc5767ba5512581203df5406f45a8
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Jul 21 00:40:54 2013 +0200

fdo#66274: Saving document as RTF result in text 'Use Rich Text Format 
Format'

Change-Id: Id617816c8530b7536238b5aa4a471c57a2a0b82e
Reviewed-on: https://gerrit.libreoffice.org/4999
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-on: https://gerrit.libreoffice.org/5037

diff --git a/filter/source/config/fragments/filters/Rich_Text_Format.xcu 
b/filter/source/config/fragments/filters/Rich_Text_Format.xcu
index 4bb6a82..602ca42 100644
--- a/filter/source/config/fragments/filters/Rich_Text_Format.xcu
+++ b/filter/source/config/fragments/filters/Rich_Text_Format.xcu
@@ -21,7 +21,7 @@
 prop 
oor:name=FilterServicevaluecom.sun.star.comp.Writer.RtfFilter/value/prop
 prop oor:name=UserDatavalueRTF/value/prop
 prop oor:name=UIName
-value xml:lang=x-defaultRich Text Format/value
+value xml:lang=x-defaultRich Text/value
 /prop
 prop oor:name=FileFormatVersionvalue0/value/prop
 prop oor:name=Typevaluewriter_Rich_Text_Format/value/prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 filter/source/svg/svgwriter.cxx |   12 +++-
 filter/source/svg/svgwriter.hxx |2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit b2d1cd9873995b93577273ad8b3fb7fd4230ced9
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Mar 25 20:44:59 2013 +

fdo#42939 - write svg line widths for META_POLYLINE_ACTION.

Change-Id: Ib282a3db6ecb5c7d1d4117e1bb48920ee7b2f562
Reviewed-on: https://gerrit.libreoffice.org/3606
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..ae2372c 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2186,7 +2186,16 @@ void SVGActionWriter::ImplWriteEllipse( const Point 
rCenter, long nRadX, long n
 }
 }
 
-// 
-
+void SVGActionWriter::ImplAddLineAttr( const LineInfo rAttrs,
+   sal_Bool bApplyMapping )
+{
+if ( !rAttrs.IsDefault() )
+{
+sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() ) 
: rAttrs.GetWidth();
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
+   OUString::valueOf( nStrokeWidth ) );
+}
+}
 
 void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon rPolyPoly, 
sal_Bool bLineOnly,
 sal_Bool bApplyMapping )
@@ -3172,6 +3181,7 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile rMtf,
 if( rPoly.GetSize() )
 {
 mpContext-AddPaintAttr( mpVDev-GetLineColor(), 
Color( COL_TRANSPARENT ) );
+ImplAddLineAttr( pA-GetLineInfo() );
 ImplWritePolyPolygon( rPoly, sal_True );
 }
 }
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ebffda9..0e2d7a5 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -364,6 +364,8 @@ private:
 voidImplWriteEllipse( const Point rCenter, long 
nRadX, long nRadY,
   sal_Bool bApplyMapping = 
sal_True );
 voidImplWritePattern( const PolyPolygon rPolyPoly, 
const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
+voidImplAddLineAttr( const LineInfo rAttrs,
+ sal_Bool bApplyMapping = sal_True 
);
 voidImplWritePolyPolygon( const PolyPolygon 
rPolyPoly, sal_Bool bLineOnly,
   sal_Bool bApplyMapping = 
sal_True );
 voidImplWriteShape( const SVGShapeDescriptor rShape, 
sal_Bool bApplyMapping = sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 filter/source/svg/svgwriter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f98d8baa449d922e4cc5bcee97c9ee1733b0f65d
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Mar 27 19:33:56 2013 +

fdo#62834 - svg export: close stray trailing tspans if we have them.

Change-Id: Ifc539e3229edd14b7291ee66bf3523cbdbedf2ef
Reviewed-on: https://gerrit.libreoffice.org/3607
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ae2372c..b8fc596 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3904,6 +3904,7 @@ void SVGActionWriter::WriteMetaFile( const Point 
rPos100thmm,
 mapCurShape.reset();
 
 ImplWriteActions( rMtf, nWriteFlags, pElementId, pXShape, 
pTextEmbeddedBitmapMtf );
+maTextWriter.endTextParagraph();
 
 // draw open shape that doesn't have a border
 if( mapCurShape.get() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andre Fischer]

 filter/source/msfilter/svdfppt.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0bd9229fdeb4bcf3023bef65257ff8317590455a
Author: Andre Fischer a...@apache.org
Date:   Thu Jun 7 10:42:10 2012 +

i#119478# Fixed application of transparency to table cells.

Patch by: Lei Debin

Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
(cherry picked from commit 87354e7fc1f63480bdef092047f912682bc7ac58)
Reviewed-on: https://gerrit.libreoffice.org/2725
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index b44fe62..306309d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7329,12 +7329,8 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference XCell  xCell )
 if ( eFillStyle != XFILL_NONE )
 {
 sal_Int16 nFillTransparence( ( (const 
XFillTransparenceItem)pObj-GetMergedItem( XATTR_FILLTRANSPARENCE ) 
).GetValue() );
-if ( nFillTransparence != 100 )
-{
-nFillTransparence *= 100;
-static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
-xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
-}
+static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
+xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
 }
 }
 catch( const Exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jürgen Schmidt]

 filter/source/msfilter/escherex.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit bdfab9e9f362512f42b040469633851ba4cfa255
Author: Jürgen Schmidt j...@apache.org
Date:   Fri Jun 8 15:08:31 2012 +

i#119870: Line transparency value is lost after saving as another ppt by AOO

fix: export linetransparency attribute

Patch By: Lei Debin
Found By: phoenix wanglf
Review By: jsc

Change-Id: I56a589036d1e4e2399f5a1a94283ebd4ce2126f0
(cherry picked from commit b82ed78c88b368747be8baccda76733a3bdfe591)
Reviewed-on: https://gerrit.libreoffice.org/2727
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 69b7b4c..f38aeec 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -978,6 +978,15 @@ void EscherPropertyContainer::CreateLineProperties(
 }
 AddOpt( ESCHER_Prop_lineJoinStyle, eLineJoin );
 
+if ( EscherPropertyValueHelper::GetPropertyValue(
+aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( 
LineTransparence ) ), sal_True ) )
+{
+sal_Int16 nTransparency = 0;
+if ( aAny = nTransparency )
+AddOpt( ESCHER_Prop_lineOpacity, ( ( 100 - nTransparency )  16 ) 
/ 100 );
+}
+
+
 if ( bEdge == sal_False )
 {
 AddOpt( ESCHER_Prop_fFillOK, 0x1001 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Herbert Dürr]

 filter/source/msfilter/msdffimp.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5043707fef2f6961487f37099bfa5ec0549685ba
Author: Herbert Dürr h...@apache.org
Date:   Wed Jun 6 11:58:45 2012 +

Resolves: #i119513# fix loading of CMYK JPEG in PPT import

Patch By: Lei Debin
Found By: bjduj...@gmail.com
Extended for better Debug Info by: Herbert Duerr

Conflicts:
filter/source/msfilter/msdffimp.cxx

(cherry picked from commit 393ca6dde9de8f66ed55dc5d0a7885ad06f22301)

Conflicts:
filter/source/msfilter/msdffimp.cxx

Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1
Reviewed-on: https://gerrit.libreoffice.org/2584
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 204ff4e..3813112 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6113,6 +6113,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 break;
 case 0x46A :// One byte tag then JPEG (= JFIF) data
 case 0x6E0 :// One byte tag then PNG data
+case 0x6E2 :// One byte tag then JPEG in CMYK color 
space
 case 0x7A8 :
 nSkip += 1; // One byte tag then DIB data
 break;
@@ -6147,6 +6148,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 case 0x542 : aFileName.Append( String( 
RTL_CONSTASCII_USTRINGPARAM( .pct ) ) ); break;
 case 0x46a : aFileName.Append( String( 
RTL_CONSTASCII_USTRINGPARAM( .jpg ) ) ); break;
 case 0x6e0 : aFileName.Append( String( 
RTL_CONSTASCII_USTRINGPARAM( .png ) ) ); break;
+case 0x6e2 : aFileName.Append( String( 
RTL_CONSTASCII_USTRINGPARAM( .jpg ) ) ); break;
 case 0x7a8 : aFileName.Append( String( 
RTL_CONSTASCII_USTRINGPARAM( .bmp ) ) ); break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 filter/source/svg/svgreader.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6c7378cbde5de3895d648b8aa89a6947b8831880
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 13 15:42:37 2013 +0100

filter: svg: optimizeGradientStops: fix STL assertion

Check that there is actually more than one element in maStops before
tweaking its first 2 elements (can be reproduced with fdo#60471 Tux.svg)

Change-Id: I7e6ffdf510bb590a9ea9e3782b30247b8fb46ed5
(cherry picked from commit 2f4bd9d44f8bc9e50cd4b1205fa53e0a15ce0954)
Reviewed-on: https://gerrit.libreoffice.org/2139
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index c76f117..4d064c7 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -377,7 +377,7 @@ struct AnnotatingVisitor
 bool hasGradientOpacity( const Gradient rGradient )
 {
 return
-!rGradient.maStops.empty() 
+(rGradient.maStops.size()  1) 
 (maGradientStopVector[
  rGradient.maStops[0]].maStopColor.a != 1.0 ||
  maGradientStopVector[
@@ -417,6 +417,10 @@ struct AnnotatingVisitor
 }
 
 rGradient.maStops = aNewStops;
+if (rGradient.maStops.size()  2)
+{
+return; // can't optimize further...
+}
 
 // axial gradient, maybe?
 if( rGradient.meType == Gradient::LINEAR 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 filter/source/msfilter/dffpropset.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8ca739d7b9acbc2fc9eff401ca850027f6e52b66
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 11 23:36:42 2013 +0100

fdo#60703: MSDraw filter: fix import of flags

DffPropSet::IsHardAttribute needs to handle flag properties specially
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)

Change-Id: If5c6b9cfac58a787527cd132f7fc80d392b8e677
(cherry picked from commit 658c35878c14044029ca7f708fbde32b98cb226a)
Reviewed-on: https://gerrit.libreoffice.org/2114
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/filter/source/msfilter/dffpropset.cxx 
b/filter/source/msfilter/dffpropset.cxx
index 495bf4ca..f8aff17 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1269,7 +1269,8 @@ sal_Bool DffPropSet::IsHardAttribute( sal_uInt32 nId ) 
const
 sal_Bool bRetValue = sal_True;
 nId = 0x3ff;
 if ( ( nId  0x3f ) = 48 ) // is this a flag id
-bRetValue = ( mpPropSetEntries[ nId ].nComplexIndexOrFlagsHAttr  ( 1 
 ( 0xf - ( nId  0xf ) ) ) ) != 0;
+bRetValue = (mpPropSetEntries[nId | 0x3f].nComplexIndexOrFlagsHAttr
+ (1  (0xf - (nId  0xf != 0;
 else
 bRetValue = ( mpPropSetEntries[ nId ].aFlags.bSoftAttr == 0 );
 return bRetValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 filter/source/pdf/impdialog.cxx |1 +
 sfx2/inc/sfx2/passwd.hxx|3 +++
 sfx2/source/dialog/passwd.cxx   |5 +
 3 files changed, 9 insertions(+)

New commits:
commit f26d3e43e8ead5c978a7efd1c7a84c8cd0a2758b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jan 31 10:06:07 2013 -0500

bnc#437516: Hide minimum password info in the password dialog.

When launching it from the Security tab of the PDF Options dialog
during PDF export.

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

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 870209f..1304c5e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1288,6 +1288,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
 {
 SfxPasswordDialog aPwdDialog( this, msUserPwdTitle );
 aPwdDialog.SetMinLen( 0 );
+aPwdDialog.ShowMinLengthText(false);
 aPwdDialog.ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 | 
SHOWEXTRAS_CONFIRM2 );
 aPwdDialog.SetText( maStrSetPwd );
 aPwdDialog.SetGroup2Text( msOwnerPwdTitle );
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 856916a..1f10c74 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -112,6 +112,9 @@ public:
 {
 mbAsciiOnly = i_bAsciiOnly;
 }
+
+void ShowMinLengthText(bool bShow);
+
 virtual short Execute();
 };
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 39b4096..40d6d08 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -148,6 +148,11 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
 EditModifyHdl( NULL );
 }
 
+void SfxPasswordDialog::ShowMinLengthText(bool bShow)
+{
+mpMinLengthFT-Show(bShow);
+}
+
 // ---
 
 short SfxPasswordDialog::Execute()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits