[Libreoffice-commits] .: svx/source
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 22
1 file changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 866daf4f21662fa5852f5eccb04929c6c4fd7e0a
Author: Felix Zhang
Date: Tue May 29 18:15:52 2012 +0800
bnc#741480: adjusted display of Bracket/BracePair in ppt
Change-Id: Ia4bbce74e2c1a5f46e0b1a73940aeb2ce8fc6ab9
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 4bc2cd3..87e7e91 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -3472,12 +3472,18 @@ static const SvxMSDffVertPair mso_sptBracketPairVert[]
=// adj value 0 -> 10
{ 0 MSO_I, 0 }, { 0, 1 MSO_I }, // left top alignment
{ 0, 2 MSO_I }, { 0 MSO_I, 21600 }, // left bottom "
{ 3 MSO_I, 21600 }, { 21600, 2 MSO_I }, // right bottom "
-{ 21600, 1 MSO_I }, { 3 MSO_I, 0 } // right top"
+{ 21600, 1 MSO_I }, { 3 MSO_I, 0 }, // right top"
+{ 0 MSO_I, 0 }, { 0, 1 MSO_I }, // filling area
+{ 0, 2 MSO_I }, { 0 MSO_I, 21600 },
+{ 3 MSO_I, 21600 }, { 21600, 2 MSO_I },
+{ 21600, 1 MSO_I }, { 3 MSO_I, 0 }
};
static const sal_uInt16 mso_sptBracketPairSegm[] =
{
-0x4000, 0xa701, 0x0001, 0xa801, 0x8000,
-0x4000, 0xa701, 0x0001, 0xa801, 0x8000
+0x4000, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+0x4000, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+0x4000, 0xa701, 0x0001, 0xa801, 0x0001, // filling area
+0xa701, 0x0001, 0xa801, 0x6000, 0xab00, 0x8000
};
static const SvxMSDffCalculationData mso_sptBracketPairCalc[] =
{
@@ -3551,12 +3557,18 @@ static const SvxMSDffVertPair mso_sptBracePairVert[] =
// adj value 0 -> 5400
{ 4 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 6 MSO_I }, { 0 ,10800 },
// left bracket
{ 0 MSO_I, 7 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 4 MSO_I, 21600 },
{ 8 MSO_I, 21600 }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 7 MSO_I }, { 21600,
10800 }, // right bracket
+{ 3 MSO_I, 6 MSO_I }, { 3 MSO_I, 1 MSO_I }, { 8 MSO_I, 0 },
+{ 4 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 6 MSO_I }, { 0 ,10800 },
// filling area
+{ 0 MSO_I, 7 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 4 MSO_I, 21600 },
+{ 8 MSO_I, 21600 }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 7 MSO_I }, { 21600,
10800 },
{ 3 MSO_I, 6 MSO_I }, { 3 MSO_I, 1 MSO_I }, { 8 MSO_I, 0 }
};
static const sal_uInt16 mso_sptBracePairSegm[] =
{
-0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x8000,
-0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x8000
+0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x0001,
// filling area
+0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x6000, 0xab00, 0x8000
};
static const SvxMSDffCalculationData mso_sptBracePairCalc[] =
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/filter/eppt/pptx-epptooxml.cxx | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 3228062c517d886a78572d7162bc661fb41e9a32
Author: Radek Doulik
Date: Wed Aug 15 13:54:46 2012 +0200
avoid writing empty p:childTnLst elements, fixes rest of fdo#41992
Change-Id: Idc09103bb8e4dbd580b5ae53f7929b4700f2c818
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 2b83a7b..dff7be2 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1123,16 +1123,17 @@ void
PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
if( xEnumeration.is() ) {
DBG(printf ("-\n"));
-pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
+if( xEnumeration->hasMoreElements() ) {
+pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
-while( xEnumeration->hasMoreElements() ) {
-Reference< XAnimationNode > xChildNode( xEnumeration->nextElement(),
UNO_QUERY );
-if( xChildNode.is() )
-WriteAnimationNode( pFS, xChildNode, nType ==
EffectNodeType::MAIN_SEQUENCE );
-}
-
-pFS->endElementNS( XML_p, XML_childTnLst );
+while( xEnumeration->hasMoreElements() ) {
+Reference< XAnimationNode > xChildNode(
xEnumeration->nextElement(), UNO_QUERY );
+if( xChildNode.is() )
+WriteAnimationNode( pFS, xChildNode, nType ==
EffectNodeType::MAIN_SEQUENCE );
+}
+pFS->endElementNS( XML_p, XML_childTnLst );
+}
DBG(printf ("-\n"));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/export/shapes.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de77d83c15be81a194cb98f6470e52369ad578f6 Author: Radek Doulik Date: Wed Aug 15 13:39:16 2012 +0200 use a namespace for xfrm transformation element, fixes part of fdo#41992 Change-Id: I3872028e4204ae5f72942b7345bf881ef3a96752 diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 7a401b6..f465044 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -948,7 +948,7 @@ ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape ) // visual shape properties pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); -WriteTransformation( aRect, mnXmlNamespace, bFlipH, bFlipV ); +WriteTransformation( aRect, XML_a, bFlipH, bFlipV ); // TODO: write adjustments (ppt export doesn't work well there either) WritePresetShape( sGeometry ); Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/export/shapes.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 57e8f53e4f6ecfbedef4d2922935a7f7b2f467b3 Author: Radek Doulik Date: Wed Aug 15 13:33:21 2012 +0200 call WriteTransformation with namespace id, fixes part of fdo#41992 Change-Id: Ifb4a78bfc3c47788503da5b7d74f356343a7cbf8 diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index e84e5aa..7a401b6 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -948,7 +948,7 @@ ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape ) // visual shape properties pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); -WriteTransformation( aRect, bFlipH, bFlipV ); +WriteTransformation( aRect, mnXmlNamespace, bFlipH, bFlipV ); // TODO: write adjustments (ppt export doesn't work well there either) WritePresetShape( sGeometry ); Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppcanvas/source svx/source
cppcanvas/source/mtfrenderer/implrenderer.cxx |2 +-
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit c3f9eb1c81319dd4a6138a1a2b4fc21bafd942cb
Author: Radek Doulik
Date: Wed Aug 15 09:46:56 2012 +0200
make fontwork custom shapes as one path object created from polypolygon
- which contains outlines of all characters instead of creating group
of path objects
- now the stretched bitmap fill works correctly - stretching over whole
text instead of only 1st character
- fixes part of n#759172
Change-Id: I65211e336aadb8909b5d4a3dcb3647f44be22595
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 2f6833f..da43944 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -788,9 +788,9 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon&
aOutlines2d, FWData& rFW
SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const
SdrObject* pCustomShape )
{
SdrObject* pRet = NULL;
+basegfx::B2DPolyPolygon aPolyPoly;
if ( !rFWData.vTextAreas.empty() )
{
-pRet = new SdrObjGroup();
std::vector< FWTextArea >::const_iterator aTextAreaIter =
rFWData.vTextAreas.begin();
std::vector< FWTextArea >::const_iterator aTextAreaIEnd =
rFWData.vTextAreas.end();
while ( aTextAreaIter != aTextAreaIEnd )
@@ -807,8 +807,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const
FWData& rFWData, const Sd
std::vector< PolyPolygon >::const_iterator aOutlineIEnd =
aCharacterIter->vOutlines.end();
while( aOutlineIter != aOutlineIEnd )
{
-SdrObject* pPathObj = new SdrPathObj( OBJ_POLY,
aOutlineIter->getB2DPolyPolygon() );
-((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject(
pPathObj );
+aPolyPoly.append( aOutlineIter->getB2DPolyPolygon() );
++aOutlineIter;
}
++aCharacterIter;
@@ -818,6 +817,8 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const
FWData& rFWData, const Sd
++aTextAreaIter;
}
+pRet = new SdrPathObj( OBJ_POLY, aPolyPoly );
+
Point aP( pCustomShape->GetSnapRect().Center() );
Size aS( pCustomShape->GetLogicRect().GetSize() );
aP.X() -= aS.Width() / 2;
commit 2af61dad1bb90b70d3a21d0850965f9a014c5ecc
Author: Radek Doulik
Date: Wed Aug 15 09:45:35 2012 +0200
display hexadecimal and decimal record numbers
Change-Id: If8720ad99d2c4c6fa4927771027123a559895bb6
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 74f47ee..b257dd6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1324,7 +1324,7 @@ namespace cppcanvas
// - SetFont to process font metric specific actions
pCurrAct->Execute( &rVDev );
-EMFP_DEBUG(printf("MTF\trecord type: %x\n",
pCurrAct->GetType()));
+EMFP_DEBUG(printf("MTF\trecord type: 0x%x (%d)\n",
pCurrAct->GetType(), pCurrAct->GetType()));
switch( pCurrAct->GetType() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/draw/shapeexport4.cxx | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 6928759a89fdc29391e85cf31f48ef6ac5ee6fa1
Author: Radek Doulik
Date: Thu Jul 19 16:06:52 2012 +0200
odf: export old path without unsupported commands in draw namespace as well
- to preserve at least some data for older versions of Libre Office
Change-Id: I2a33706c2a2344e45b57a00469a7387072f8602b
diff --git a/xmloff/source/draw/shapeexport4.cxx
b/xmloff/source/draw/shapeexport4.cxx
index 43e75f9..28bfd29 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -323,13 +323,14 @@ void ImpExportHandles( SvXMLExport& rExport, const
uno::Sequence< beans::Propert
}
void ImpExportEnhancedPath( SvXMLExport& rExport,
-const uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rCoordinates,
-const uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments )
+const uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rCoordinates,
+const uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments,
+bool bExtended = false )
{
rtl::OUString aStr;
rtl::OUStringBuffer aStrBuffer;
-sal_uInt16 aNamespace = XML_NAMESPACE_DRAW;
+bool bNeedExtended = false;
sal_Int32 i, j, k, l;
@@ -415,8 +416,15 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO :
aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break;
case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO :
-aStrBuffer.append( (sal_Unicode)'G' ); nParameter = 2;
aNamespace = XML_NAMESPACE_DRAW_EXT; break;
-
+if ( bExtended ) {
+aStrBuffer.append( (sal_Unicode)'G' );
+nParameter = 2;
+} else {
+aStrBuffer.setLength( aStrBuffer.getLength() - 1);
+bNeedExtended = true;
+i += 2;
+}
+break;
default : // ups, seems to be something wrong
{
aSegment.Count = 1;
@@ -445,7 +453,9 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
}
}
aStr = aStrBuffer.makeStringAndClear();
-rExport.AddAttribute( aNamespace, XML_ENHANCED_PATH, aStr );
+rExport.AddAttribute( bExtended ? XML_NAMESPACE_DRAW_EXT :
XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr );
+if ( !bExtended && bNeedExtended )
+ImpExportEnhancedPath( rExport, rCoordinates, rSegments, true );
}
void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference<
beans::XPropertySet >& xPropSet )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppcanvas/source xmloff/source
cppcanvas/source/inc/implrenderer.hxx|2 -
cppcanvas/source/mtfrenderer/emfplus.cxx | 54 ++-
xmloff/source/core/xmlexp.cxx|3 +
xmloff/source/draw/sdxmlexp.cxx |5 --
xmloff/source/draw/shapeexport4.cxx |5 ++
xmloff/source/draw/ximpcustomshape.cxx |7
6 files changed, 53 insertions(+), 23 deletions(-)
New commits:
commit d8720d4e390143279ccae8eed05decf54240e8fa
Author: Radek Doulik
Date: Thu Jul 19 11:06:50 2012 +0200
odf: export arcangleto commands in enhanced path (use drawooo namespace)
Change-Id: I43a2c08ee8dfc0abe4d05579b837b5be0944c0fe
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 82c414e..cbf9ef3 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -375,7 +375,8 @@ void SvXMLExport::_InitCtor()
GetXMLToken(XML_NP_TABLE_EXT), GetXMLToken(XML_N_TABLE_EXT),
XML_NAMESPACE_TABLE_EXT);
mpNamespaceMap->Add(
GetXMLToken(XML_NP_CALC_EXT), GetXMLToken(XML_N_CALC_EXT),
XML_NAMESPACE_CALC_EXT);
-
+mpNamespaceMap->Add(
+GetXMLToken(XML_NP_DRAW_EXT), GetXMLToken(XML_N_DRAW_EXT),
XML_NAMESPACE_DRAW_EXT);
}
}
if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ce4d418..8927e92 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -641,11 +641,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const
Reference< lang::XComponent
GetXMLToken(XML_NP_OFFICE_EXT),
GetXMLToken(XML_N_OFFICE_EXT),
XML_NAMESPACE_OFFICE_EXT);
-
-_GetNamespaceMap().Add(
-GetXMLToken(XML_NP_DRAW_EXT),
-GetXMLToken(XML_N_DRAW_EXT),
-XML_NAMESPACE_DRAW_EXT);
}
GetShapeExport()->enableLayerExport();
diff --git a/xmloff/source/draw/shapeexport4.cxx
b/xmloff/source/draw/shapeexport4.cxx
index aa4701d..43e75f9 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -329,6 +329,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
rtl::OUString aStr;
rtl::OUStringBuffer aStrBuffer;
+sal_uInt16 aNamespace = XML_NAMESPACE_DRAW;
sal_Int32 i, j, k, l;
@@ -413,6 +414,8 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
aStrBuffer.append( (sal_Unicode)'Y' ); nParameter = 1; break;
case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO :
aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break;
+case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO :
+aStrBuffer.append( (sal_Unicode)'G' ); nParameter = 2;
aNamespace = XML_NAMESPACE_DRAW_EXT; break;
default : // ups, seems to be something wrong
{
@@ -442,7 +445,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
}
}
aStr = aStrBuffer.makeStringAndClear();
-rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr );
+rExport.AddAttribute( aNamespace, XML_ENHANCED_PATH, aStr );
}
void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference<
beans::XPropertySet >& xPropSet )
diff --git a/xmloff/source/draw/ximpcustomshape.cxx
b/xmloff/source/draw/ximpcustomshape.cxx
index 0736fe3..f8966a1 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -667,6 +667,13 @@ void GetEnhancedPath( std::vector<
com::sun::star::beans::PropertyValue >& rDest
nIndex++;
}
break;
+case 'G' :
+{
+nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO;
+nParametersNeeded = 2;
+nIndex++;
+}
+break;
case 'W' :
{
nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO;
commit cf08e8a2ee18c3d1b26647489d16443b8cf617ad
Author: Radek Doulik
Date: Tue Jul 17 16:15:50 2012 +0200
emf+: added implementation of DrawImage record
Change-Id: I6c86c2eaca1586d915b648292373da4378c755ba
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 9b737d8..a0f59f4 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -211,7 +211,7 @@ static float GetSwapFloat( SvStream& rSt )
typedef ::std::vector< MtfAction > ActionVector;
/* EMF+ */
-void ReadRectangle (SvStream& s, float& x, float& y, float &width,
float& height, sal_uInt32 flags = 0);
+void ReadRectangle (SvStream& s, float& x, float& y, float &width,
float& heigh
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/ppt/pptshape.hxx |6 +++---
oox/source/ppt/pptshape.cxx | 43 ---
2 files changed, 39 insertions(+), 10 deletions(-)
New commits:
commit fa0e9cf0d13b9b426dd9a3636a0866d0fb220c51
Author: Radek Doulik
Date: Mon Jul 2 18:24:04 2012 +0200
use master's shape position/size for layout shapes when needed (n#760997)
Change-Id: I2a9d4f6b134817bda84645df3ab6fa217186e1d2
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx
index e171f24..d0b31a6 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/oox/inc/oox/ppt/pptshape.hxx
@@ -50,7 +50,7 @@ public:
// addShape is creating and inserting the corresponding XShape.
void addShape(
oox::core::XmlFilterBase& rFilterBase,
-const SlidePersist& rPersist,
+SlidePersist& rPersist,
const oox::drawingml::Theme* pTheme,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
@@ -65,8 +65,8 @@ public:
void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; };
void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) {
mpPlaceholder = pPlaceholder; }
-static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32
nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes );
-static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32
nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes );
+static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32
nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes, bool
bMasterOnly = false );
+static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32
nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly =
false );
static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const
SlidePersist& rSlidePersist, sal_Int32 nSubType );
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 2f2e330..1456fbb 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -119,7 +119,7 @@ oox::drawingml::TextListStylePtr
PPTShape::getSubTypeTextListStyle( const SlideP
void PPTShape::addShape(
oox::core::XmlFilterBase& rFilterBase,
-const SlidePersist& rSlidePersist,
+SlidePersist& rSlidePersist,
const oox::drawingml::Theme* pTheme,
const Reference< XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
@@ -261,6 +261,31 @@ void PPTShape::addShape(
OSL_TRACE("shape service: %s",
rtl::OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8 ).getStr());
+if( mnSubType && getSubTypeIndex().has() && meShapeLocation ==
Layout ) {
+oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(),
rSlidePersist.getShapes()->getChildren(), true );
+if (!pPlaceholder.get())
+pPlaceholder = PPTShape::findPlaceholder( mnSubType,
rSlidePersist.getShapes()->getChildren(), true );
+
+if (pPlaceholder.get()) {
+if( maSize.Width == 0 || maSize.Height == 0 ) {
+awt::Size aSize = maSize;
+if( maSize.Width == 0 )
+aSize.Width = pPlaceholder->getSize().Width;
+if( maSize.Height == 0 )
+aSize.Height = pPlaceholder->getSize().Height;
+setSize( aSize );
+if ( maPosition.X == 0 || maPosition.Y == 0 ) {
+awt::Point aPosition = maPosition;
+if( maPosition.X == 0 )
+aPosition.X = pPlaceholder->getPosition().X;
+if( maPosition.Y == 0 )
+aPosition.Y = pPlaceholder->getPosition().Y;
+setPosition( aPosition );
+}
+}
+}
+}
+
// use placeholder index if possible
if( mnSubType && getSubTypeIndex().has() &&
rSlidePersist.getMasterPersist().get() ) {
oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(),
rSlidePersist.getMasterPersist()->getShapes()->getChildren() );
@@ -379,19 +404,21 @@ void PPTShape::applyShapeReference( const
oox::drawingml::Shape& rReferencedShap
Shape::applyShapeReference( rReferencedShape, bUseText );
}
-oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32
nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
+oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32
nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes, bool
bMasterOnly )
{
oox::dra
[Libreoffice-commits] .: sd/source
sd/source/ui/view/Outliner.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ca644612762921e772ca95d5e8737325d9f343d2
Author: Radek Doulik
Date: Tue Jun 26 12:25:03 2012 +0200
remember spell check/find&replace start position only 1st time
- use mnStartPageIndex as indicator, -1 means it wasn't set yet
otherwise it is set. reset it to -1 at the end of spell check
and find&replace
Change-Id: Ic45106b019d3c1a0232fe3d766aab07bbcd24d2c
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e7100e7..43aa502 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -381,6 +381,7 @@ void Outliner::EndSpelling (void)
mpWeakViewShell.reset();
mpView = NULL;
mpWindow = NULL;
+mnStartPageIndex = (sal_uInt16) -1;
}
@@ -531,8 +532,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem*
pSearchItem)
// restore start position if nothing was found
if(!mbStringFound)
RestoreStartPosition ();
-else
-mnStartPageIndex = (sal_uInt16)-1;
+mnStartPageIndex = (sal_uInt16)-1;
}
}
else
@@ -657,6 +657,7 @@ bool Outliner::SearchAndReplaceAll (void)
}
RestoreStartPosition ();
+mnStartPageIndex = (sal_uInt16)-1;
return true;
}
@@ -870,6 +871,9 @@ void Outliner::RememberStartPosition (void)
return;
}
+if ( mnStartPageIndex != (sal_uInt16) -1 )
+return;
+
if (pViewShell->ISA(DrawViewShell))
{
::boost::shared_ptr pDrawViewShell (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/export/drawingml.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 7279610bbd403fbbb12a894d334a6ec4ba259600 Author: Radek Doulik Date: Thu Jun 21 12:02:57 2012 +0200 make sure we don't export shapes with negative size (fixes n#760997) Change-Id: Id77cbfaa287d15c4af9a91976f3b091e68229223 diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index f2c28e9..b6e67c8 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -635,6 +635,11 @@ void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32 awt::Point aPos = rXShape->getPosition(); awt::Size aSize = rXShape->getSize(); +if ( aSize.Width < 0 ) +aSize.Width = 1000; +if ( aSize.Height < 0 ) +aSize.Height = 1000; + WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, nRotation ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/pptrecord.py src/pptstream.py
src/pptrecord.py | 69 +++
src/pptstream.py |2 -
2 files changed, 70 insertions(+), 1 deletion(-)
New commits:
commit edeef1674366947637cd4960a4e44229ab2e6971
Author: Radek Doulik
Date: Tue Jun 19 16:01:24 2012 +0200
dump SlideAtom record
diff --git a/src/pptrecord.py b/src/pptrecord.py
index bdfbbd3..ae7bad7 100644
--- a/src/pptrecord.py
+++ b/src/pptrecord.py
@@ -416,6 +416,28 @@ class SlideInfo(BaseRecordHandler):
self.appendLine("speed: %d"%self.readUnsignedInt(1))
# ---
+# special record handler: slide atom
+
+class SlideAtom(BaseRecordHandler):
+"""Slide atom."""
+
+def parseBytes (self):
+geom=self.readUnsignedInt(4)
+self.appendLine("geom: %s %4.4Xh (%d)"%(slideLayoutTypes[geom], geom,
geom))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("placeholder type:
%s"%(placeholderEnum[self.readUnsignedInt(1)]))
+self.appendLine("masterIdRef: %d"%(self.readUnsignedInt(4)))
+self.appendLine("notesIdRef: %d"%(self.readUnsignedInt(4)))
+self.appendLine("slideflags: %2.2Xh"%(self.readUnsignedInt(2)))
+self.appendLine("unused: %2.2Xh (must be
ignored)"%(self.readUnsignedInt(2)))
+
+# ---
# special record handler: slide persist atom
class SlidePersistAtom(BaseRecordHandler):
@@ -1652,3 +1674,50 @@ textHeader = {
7: ["body in two-column slide"],
8: ["body in four-column slide"]
}
+
+slideLayoutTypes = {
+0: ["SL_TitleSlide"],
+1: ["SL_TitleBody"],
+2: ["SL_MasterTitle"],
+7: ["SL_TitleOnly"],
+8: ["SL_TwoColumns"],
+9: ["SL_TwoRows"],
+10: ["SL_ColumnTwoRows"],
+11: ["SL_TwoRowsColumn"],
+13: ["SL_TwoColumnsRow"],
+14: ["SL_FourObjects"],
+15: ["SL_BigObject"],
+16: ["SL_Blank"],
+17: ["SL_VerticalTitleBody"],
+18: ["SL_VerticalTwoRows"]
+}
+
+placeholderEnum = {
+0: ["PT_None"],
+1: ["PT_MasterTitle"],
+2: ["PT_MasterBody"],
+3: ["PT_MasterCenterTitle"],
+4: ["PT_MasterSubtitle"],
+5: ["PT_MasterNotesSlideImage"],
+6: ["PT_MasterNotesBody"],
+7: ["PT_MasterDate"],
+8: ["PT_MasterSlideNumber"],
+9: ["PT_MasterFooter"],
+10: ["PT_MasterHeader"],
+11: ["PT_NotesSlideImage"],
+12: ["PT_NotesBody"],
+13: ["PT_Title"],
+14: ["PT_Body"],
+15: ["PT_CenterTitle"],
+16: ["PT_SubTitle"],
+17: ["PT_VerticalTitle"],
+18: ["PT_VerticalBody"],
+19: ["PT_Object"],
+20: ["PT_Graph"],
+21: ["PT_Table"],
+22: ["PT_ClipArt"],
+23: ["PT_OrgChart"],
+24: ["PT_Media"],
+25: ["PT_VerticalObject"],
+26: ["PT_Picture"]
+}
diff --git a/src/pptstream.py b/src/pptstream.py
index 13f9ecb..cd89824 100644
--- a/src/pptstream.py
+++ b/src/pptstream.py
@@ -214,7 +214,7 @@ recData = {
1004: ["DFF_PST_SlideBase"],
1005: ["DFF_PST_SlideBaseAtom"],
1006: ["DFF_PST_Slide"],
- 1007: ["DFF_PST_SlideAtom"],
+ 1007: ["DFF_PST_SlideAtom", pptrecord.SlideAtom],
1008: ["DFF_PST_Notes"],
1009: ["DFF_PST_NotesAtom"],
1010: ["DFF_PST_Environment"],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source
sd/source/ui/animations/CustomAnimationPane.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e1f01a686a227bc5aaa8115e70a669d27ddcc52 Author: Felix Zhang Date: Sat Apr 28 17:14:55 2012 +0800 n753458: changing the keyboard of the Slide Show button - to avoid C-w shortcut to run slideshow, which colides with more common fshortcut to close window diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src index 267fe12..c4661e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.src +++ b/sd/source/ui/animations/CustomAnimationPane.src @@ -206,7 +206,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT ( 80 , 14 ) ; TabStop = TRUE; -Text [ en-US ] = "Slide Sho~w"; +Text [ en-US ] = "S~lide Show"; }; FixedLine FL_SEPERATOR2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/animations/CustomAnimationPane.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 50e0fe3f47354138242442e4b48551d43decbfcb Author: Felix Zhang Date: Sat Apr 28 17:14:55 2012 +0800 n753458: changing the keyboard of the Slide Show button - to avoid C-w shortcut to run slideshow, which colides with more common fshortcut to close window diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src index 267fe12..c4661e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.src +++ b/sd/source/ui/animations/CustomAnimationPane.src @@ -206,7 +206,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT ( 80 , 14 ) ; TabStop = TRUE; -Text [ en-US ] = "Slide Sho~w"; +Text [ en-US ] = "S~lide Show"; }; FixedLine FL_SEPERATOR2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/drawingml/shape.hxx|1 +
oox/inc/oox/drawingml/textbody.hxx |1 +
oox/source/drawingml/shape.cxx |5 +++--
oox/source/drawingml/textbody.cxx | 15 +++
oox/source/ppt/pptshape.cxx|2 +-
5 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 038564c910e43f569b7c6abebffe2ad6ec9a1822
Author: Radek Doulik
Date: Wed May 23 17:05:36 2012 +0200
do not insert empty texbodies for empty placeholder shapes
- the original problem can be reproduced by creating new empty
presentation in powerpoint.
after it is loaded in impress, it was completely blank, without
placeholder shape
texts (Click to add title, Click to add text)
Change-Id: I541554e273372ad09cca2fb91e27a17eb1f3a00e
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index f2553fb..09ea502 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -189,6 +189,7 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle* pShapeRect,
sal_Bool bClearText,
+sal_Bool bDoNotInsertEmptyTextBody,
basegfx::B2DHomMatrix& aTransformation );
voidaddChildren(
diff --git a/oox/inc/oox/drawingml/textbody.hxx
b/oox/inc/oox/drawingml/textbody.hxx
index aa2fdcd..7fad554 100644
--- a/oox/inc/oox/drawingml/textbody.hxx
+++ b/oox/inc/oox/drawingml/textbody.hxx
@@ -68,6 +68,7 @@ public:
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextCursor > & xAt,
const TextCharacterProperties&
rTextStyleProperties,
const TextListStylePtr& pMasterTextListStyle )
const;
+bool isEmpty();
protected:
TextParagraphVector maParagraphs;
TextBodyProperties maTextProperties;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 9bdb962..be58314 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -212,7 +212,7 @@ void Shape::addShape(
if( !sServiceName.isEmpty() )
{
basegfx::B2DHomMatrix aMatrix( aTransformation );
-Reference< XShape > xShape( createAndInsert( rFilterBase,
sServiceName, pTheme, rxShapes, pShapeRect, sal_False, aMatrix ) );
+Reference< XShape > xShape( createAndInsert( rFilterBase,
sServiceName, pTheme, rxShapes, pShapeRect, sal_False, sal_False, aMatrix ) );
if( pShapeMap && !msId.isEmpty() )
{
@@ -327,6 +327,7 @@ Reference< XShape > Shape::createAndInsert(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& rxShapes,
const awt::Rectangle* /* pShapeRect */,
sal_Bool bClearText,
+sal_Bool bDoNotInsertEmptyTextBody,
basegfx::B2DHomMatrix& aParentTransformation )
{
bool bIsEmbMedia = false;
@@ -567,7 +568,7 @@ Reference< XShape > Shape::createAndInsert(
getTextBody()->getTextProperties().pushVertSimulation();
// in some cases, we don't have any text body.
-if( getTextBody() )
+if( getTextBody() && ( !bDoNotInsertEmptyTextBody ||
!mpTextBody->isEmpty() ) )
{
Reference < XText > xText( mxShape, UNO_QUERY );
if ( xText.is() ) // not every shape is supporting an XText
interface (e.g. GroupShape)
diff --git a/oox/source/drawingml/textbody.cxx
b/oox/source/drawingml/textbody.cxx
index 43ef012..5080f0f 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -77,6 +77,21 @@ void TextBody::insertAt(
(*aIt)->insertAt( rFilterBase, xText, xAt, rTextStyleProperties,
aCombinedTextStyle, aIt == aBeg );
}
+bool TextBody::isEmpty()
+{
+if ( maParagraphs.size() <= 0 )
+return true;
+if ( maParagraphs.size() > 1 )
+return false;
+
+const TextRunVector aRuns = maParagraphs[0]->getRuns();
+if ( aRuns.size() <= 0 )
+return true;
+if ( aRuns.size() > 1 )
+return false;
+
+return aRuns[0]->getText().getLength() <= 0;
+}
} }
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index d7fba77..9fa052c 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -338,7 +338,7 @@ void PPTShape::addShape(
} else
setMasterTextListStyle( aMasterTextListStyle );
-Reference< XShape > xShape( createAndInsert( rFilterBase,
sServiceName, pTheme, rxShapes, pShapeRect, bClearText, aTransformation ) );
+Reference< XShape > xShape( createAndInsert( rFilterBase,
sServiceName, pTheme, rxShapes, pShapeRect, bClearText, mpPlaceholder.get() !=
NULL, aTransformation ) );
if ( !rSlideP
[Libreoffice-commits] .: autogen.sh
autogen.sh |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit cbe733f19aef7546fd8b78a9ef92e6c8d0867f59
Author: Ruslan Kabatsayev
Date: Fri May 11 22:20:18 2012 +0400
autogen.sh: append aclocal arguments to ACLOCAL_FLAGS unconditionally
Change-Id: I2254628edfe213c3424dce2bc5d9f164752e913c
diff --git a/autogen.sh b/autogen.sh
index 6f99712..67d462c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -144,11 +144,8 @@ $ENV{PWD} = $cwd_str;
my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
-if ($aclocal_flags eq "")
-{
-$aclocal_flags = "-I ./m4";
-$aclocal_flags .= " -I ./m4/mac" if ($system eq 'Darwin');
-}
+$aclocal_flags .= " -I ./m4";
+$aclocal_flags .= " -I ./m4/mac" if ($system eq 'Darwin');
$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq
'Darwin'));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/msfilter/svdfppt.cxx | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit ea923cd424f6426d69a7fb375f5ac9e19ec2246a
Author: Radek Doulik
Date: Thu May 10 16:21:45 2012 +0200
use com::sun::star::table::BorderLine2 instead of older BorderLine
(n#758914)
- older BorderLine doesn't seem to work in case InnerLineWidth and
OuterLineWidth are set to equal positive value and distance is set to 0
(possible regression)
- using the newer API solves the problem for us
Change-Id: I69f10a0e947352d20b78dbdc39b7c9af95f8603b
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index d61ab39..0501d4a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -120,7 +120,8 @@
#include
#include "com/sun/star/awt/Gradient.hpp"
#include
-#include
+#include
+#include
#include
#include
#include
@@ -7305,7 +7306,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine,
Reference< XTable >& xTabl
{
SfxItemSet aSet( pLine->GetMergedItemSet() );
XLineStyle eLineStyle(((XLineStyleItem&)pLine->GetMergedItem(
XATTR_LINESTYLE )).GetValue());
-com::sun::star::table::BorderLine aBorderLine;
+com::sun::star::table::BorderLine2 aBorderLine;
switch( eLineStyle )
{
case XLINE_DASH :
@@ -7313,16 +7314,14 @@ void ApplyCellLineAttributes( const SdrObject* pLine,
Reference< XTable >& xTabl
{
Color aLineColor( ((XLineColorItem&)pLine->GetMergedItem(
XATTR_LINECOLOR )).GetColorValue() );
aBorderLine.Color = aLineColor.GetColor();
-aBorderLine.OuterLineWidth = static_cast< sal_Int16 >(
((const XLineWidthItem&)(pLine->GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4
);
-aBorderLine.InnerLineWidth = static_cast< sal_Int16 >(
((const XLineWidthItem&)(pLine->GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4
);
-aBorderLine.LineDistance = 0;
+aBorderLine.LineWidth = static_cast< sal_Int16 >( ((const
XLineWidthItem&)(pLine->GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 );
+aBorderLine.LineStyle = eLineStyle == XLINE_SOLID ?
table::BorderLineStyle::SOLID : table::BorderLineStyle::DASHED;
}
break;
case XLINE_NONE :
{
-aBorderLine.OuterLineWidth = 0;
-aBorderLine.InnerLineWidth = 0;
-aBorderLine.LineDistance = 0;
+aBorderLine.LineWidth = 0;
+aBorderLine.LineStyle = table::BorderLineStyle::NONE;
}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/core/stlsheet.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 57e21cb5e7b20a0c886475eb49e5d17f8dae527d Author: Radek Doulik Date: Fri May 4 15:25:02 2012 +0200 removed unwanted/bad cast, fixes n#759178 Change-Id: I37d19086435a39c7090008158397e6e7fddee5ba diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 05058e2..08fe4dc 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -615,7 +615,7 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingIte const SvxLRSpaceItem& rLRItem = (const SvxLRSpaceItem&)pCurSet->Get(EE_PARA_LRSPACE); double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight; SvxLRSpaceItem aNewLRItem(rLRItem); -aNewLRItem.SetTxtLeft((sal_uInt16)(fIndentFraction * nNewHeight)); +aNewLRItem.SetTxtLeft(fIndentFraction * nNewHeight); double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight; aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight)); rSet.Put(aNewLRItem); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/drawingml/shape.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c41e9c7c0a7a986c8ad87a4b8033843803792506
Author: Radek Doulik
Date: Wed Apr 25 19:52:13 2012 +0200
fix few issues after SAL_INFO conversion
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 51803a6..ad5dd59 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -561,7 +561,7 @@ Reference< XShape > Shape::createAndInsert(
mpCustomShapePropertiesPtr->setTextRotateAngle(
-nTextRotateAngle / 6 );
}
-SAL_INFO("oox", "==cscode== shape name: " << msName);
+SAL_INFO("oox", "==cscode== shape name: '" << msName << "'");
mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet,
mxShape );
}
else if( getTextBody() )
@@ -615,7 +615,7 @@ void Shape::moveAllToPosition( const Point &rPoint )
void Shape::setMasterTextListStyle( const TextListStylePtr&
pMasterTextListStyle )
{
-SAL_INFO("oox", "set master text list style to shape id: %s" << msId);
+SAL_INFO("oox", "set master text list style to shape id: " << msId);
mpMasterTextListStyle = pMasterTextListStyle;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] Photos from the conference
On Wed, 2011-10-19 at 21:23 +0200, Radek Doulík wrote: > Hi all, > > I have put my photos from the LibOCon on the web. These are from Tuesday > and Wednesday. I will add more of them later. > > http://naplatno.cz/libocon2011-days-1-2/ Photos from Thursday are here: http://naplatno.cz/libocon2011-day-3/ Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Photos from the conference
Hi all, I have put my photos from the LibOCon on the web. These are from Tuesday and Wednesday. I will add more of them later. http://naplatno.cz/libocon2011-days-1-2/ Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] oox/source/drawingml/customshapepresets.cxx - generated code ...
Hi Michael, On Thu, 2011-10-06 at 14:57 +0100, Michael Meeks wrote: > How hard would it be to make the auto-generation part of the build, and > to remove the generated cxx ? it not possible as the cxx code is generated by impress itself, running debug build. If I change it to run the perl scripts at build time, we will need a log file containing all the code in the git, and the log file is even bigger. What would help is to rewrite the debug dumper in the customshapeproperties.cxx to generate some simpler (ie. no UNO API involved) structures and add few methods generating UNO properties from them at runtime. I plan to do that, but later in the game, when I fix the remaining issues - or at least the worst of them. It's in the master only now, so hopefully not a big deal until we will get close to the next release. OTOH, it is quite isolated part, so if there's someone who volunteer to improve the generation meanwhile, I can point to the important pieces to change. It will mostly mean changing the dumper code to more specialized one - aware of possible structure of the properties - and generating simple structures containing the data. Plus adding the code for loading the simple data and outputting UNO data at runtime. Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] oox/source/drawingml/customshapepresets.cxx is just (Offensive Word Found In Message) too much for gcc
On Thu, 2011-10-06 at 07:36 -0500, Norbert Thiebaud wrote: > 2011/10/6 Radek Doulík : > > On Thu, 2011-10-06 at 06:30 -0500, Norbert Thiebaud wrote: > >> 2011/10/6 Norbert Thiebaud : > >> > 2011/10/6 Norbert Thiebaud : > >> >> 2011/10/6 Radek Doulík : > >> >>> > >> >>> OTOH, we would need first to see how much would -O0 save for the whole > >> >>> build. > >> >> > >> >> I'll give it a shot... > >> > > >> > Not that I expect it to make a big difference... since most of the > >> > compiles are ccached... > >> > >> As I suspected. changing to -O0 yield no significant difference on a > >> 'cache hot' tinderbox. > >> > >> But on Windows that may be worth it, since it does not use ccache. > > > > OK, I have meanwhile split the big .cxx file into 6 smaller ones and > > pushed. Largest file has around 750k, so hopefully it should not choke > > tinderboxes anymore. > > well they seems to go in a loop, most likely due to a bug in gbuild > that send the make in a endless look when one try to compile a file > that does not exist... > are you sure of commit > d05649c43b41c20a15677982e0942be8ac796753 ? Sorry, should be fixed now. (the .mk file, not the gbuild) Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] oox/source/drawingml/customshapepresets.cxx is just (Offensive Word Found In Message) too much for gcc
On Thu, 2011-10-06 at 06:30 -0500, Norbert Thiebaud wrote: > 2011/10/6 Norbert Thiebaud : > > 2011/10/6 Norbert Thiebaud : > >> 2011/10/6 Radek Doulík : > >>> > >>> OTOH, we would need first to see how much would -O0 save for the whole > >>> build. > >> > >> I'll give it a shot... > > > > Not that I expect it to make a big difference... since most of the > > compiles are ccached... > > As I suspected. changing to -O0 yield no significant difference on a > 'cache hot' tinderbox. > > But on Windows that may be worth it, since it does not use ccache. OK, I have meanwhile split the big .cxx file into 6 smaller ones and pushed. Largest file has around 750k, so hopefully it should not choke tinderboxes anymore. Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] oox/source/drawingml/customshapepresets.cxx is just (Offensive Word Found In Message) too much for gcc
On Thu, 2011-10-06 at 04:13 -0500, Norbert Thiebaud wrote: > > One thing I noticed. It might be useful to run tinderboxes without gcc > > optimization (ie. with -O0). It makes huge difference in compile time - > > more than 10 times faster on my system and could make the tinderbox > > turnaround much faster. > > Yes, but the generated daily build would be less usefull that way and > possibly hide optimisation-induced bug until the last minute. I thought the point of tinderboxes was to check quickly whether the tree is buildable and report failure if not. I would consider differences between whether an optimized or a non-optimized compilation would complete to be compiler bug and ignore these. IMO, I would prefer quicker turnarounds. Even more when the turnaround can be in order of 10 hours. OTOH, we would need first to see how much would -O0 save for the whole build. Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] oox/source/drawingml/customshapepresets.cxx is just (Offensive Word Found In Message) too much for gcc
Hi, I would also vote for not reverting stuff (at least not before we try fix it first), when only some of the tinderboxes fail due low system resources. I will try to split the offending source file to few smaller files, similar to what we do for some non-generated CXX sources, and push again. One thing I noticed. It might be useful to run tinderboxes without gcc optimization (ie. with -O0). It makes huge difference in compile time - more than 10 times faster on my system and could make the tinderbox turnaround much faster. customshapepreset.cxx compiled with -O2 real4m22.910s user4m13.794s sys 0m9.996s customshapepreset.cxx compiled with -O0 real0m25.427s user0m25.242s sys 0m1.035s Cheers Radek On Thu, 2011-10-06 at 11:18 +0300, Tor Lillqvist wrote: > The only solutions I see are: > > 1) Either we should get some really really bad-ass Windows tinderbox, > *and* make it use ccache (i.e. investigate whether kendy's port of an > old ccache version really works correctly, or re-port a current ccache > to support MSVC). > > 2) Or, we should have our developers mainly work on the "difficult" > platforms, i.e. Windows, and to some extent MacOSX, so that they > notice themselves when code they are writing will cause problems on > these platforms. Only people mainly doing distro packaging would > continue to work on Linux. Obviously "we" (for some value of "us") > can't enforce that on volunteers, only bosses can on their paid > developers ;) > > 3) Or, we should jump to 4.0 directly, and support only > cross-compilation to Windows. (Yes, that means a lot of work needs to > be done to avoid too many regressions in the form of missing > features.) > > Obviously I am not really expecting you to take alternative 2 seriously. > > --tml -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] EMF+ / Win32 ...
On Thu, 2011-08-18 at 13:04 +0100, Michael Meeks wrote: > Hi Radek, > > What was our EMF+ story in the end ? did this stay disabled or did it > get resurrected for Win32 and elsewhere ? :-) It is still disabled on win32, should work on unx AFAIK. Cheers Radek > Thanks, > > Michael. > > Forwarded Message > From: Jesús Corrius > To: michael.me...@novell.com > Cc: Tor Lillqvist , libreoffice-dev > > Subject: Re: [Libreoffice] REVIEW: EMF+ disable on Win32 ... > Date: Sat, 12 Feb 2011 21:56:34 +0100 > > >>Jesus - it'd be wonderful if you could do a test of that (?) > >> otherwise, > >> other reviews appreciated. > > I have tested the patch using the following up-to-date build of the > master branch with the patch applied: > > http://dl.dropbox.com/u/193133/LibO_3.3.0rc4_Win_x86_install_en-US.exe > > And it works fine for me. So it's a +1 for me. > > (btw, there's a crash when you play with the fonts menu a bit) > > -- > Jesús Corrius > Document Foundation founding member > Mobile: +34 661 11 38 26 > Skype: jcorrius | Twitter: @jcorrius > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] pptx import - hyperlink decoration
Hi all, I am looking for 1 review to include the patch in 3-4 branch. It fixes problem with hyperlinks decoration in imported pptx documents. http://cgit.freedesktop.org/libreoffice/filters/commit/?id=bfa1f314e328e1363798880c431916f91f541d9c commit bfa1f314e328e1363798880c431916f91f541d9c Author: Radek Doulik Date: Mon May 30 13:39:11 2011 +0200 set link text properties - hlink color from color scheme (if not overriden by text character properties) - single underline ( ditto ) Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] regression in cairo canvas setColor
Hi all, I am looking for 1 review to include the patch in 3-4 branch. It fixes problem with transparency in cairo canvas. Fixes fdo#33591 and fdo#35681 The fix is here http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=ac4419bd8a262c6248f06d2124ada924e9b92e99 commit ac4419bd8a262c6248f06d2124ada924e9b92e99 Author: Radek Doulik Date: Tue Jul 12 13:35:43 2011 +0200 fix set color regression in cairo canvas - the cairo_set_source_rgba should be called with non-alpha-pre-multiplied color values - fixes fdo#33591 and fdo#35681 Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fix for ppt export fdo#32709 (and possibly more issues)
Hi all, I am looking for 1 review to include the patch in 3-4 branch. It fixes ppt export and possibly more areas where the code use SvGlobalName class and < operator. It is regression in "#i101100# strict-alias clean" changes. The original code (before strict alias clean) was using beginning of pImp->szData in comparison -else if( *(USHORT *)&pImp->szData[ 4 ] == *(USHORT *)&rObj.pImp->szData[ 4 ] ) -return *(UINT32 *)pImp->szData < *(UINT32 *)rObj.pImp->szData; The fix is here http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=345dc7961bc142f167a1b8e5f43f4439e8234f06 commit 345dc7961bc142f167a1b8e5f43f4439e8234f06 Author: Radek Doulik Date: Mon Jul 11 20:36:47 2011 +0200 fix regression in SvGlobalName::operator < - it was comparing wrong parts and ommiting part of ID's, resulting in wrong results and thus ::std::map didn't work well with default less compare function of it's keys - fixes fdo#32709 Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fix for screen resizing problems
On Tue, 2011-06-28 at 17:03 +0100, Caolán McNamara wrote: > On Tue, 2011-06-28 at 15:40 +0200, Radek Doulík wrote: > > Hi all, > > > > I have prepared a fix for impress slideshow problem when screen is > > resized (for example by xrandr). The slideshow wasn't resizing > > correctly. I am looking for 2 reviews (I already have one from Lubos) to > > include it in 3-4-1 branch. > > > > It involves these 3 commits: > > > > http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=865e186b92605ad02981fb605aa4e7f27489d4cd > > These are always nightmarish and some window manager or other does > something odd. Do compiz, metacity and kwin all continue to work > correctly with and without multihead ? Don't have the environment here to test all the cases. Tested it with single head and metacity. Lubos tested it with KDE, so I guess kwin. Please test it in your environment if it is different. The logic of the change seems right to me - why to set the minimal size of fullscreen window to size of screen, when we know that the screen size is variable and can be changed. The other, not so nice, option would be to reset minimal sizes to all fullscreen windows on screen size change. Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fix for screen resizing problems
On Tue, 2011-06-28 at 16:13 +0200, Jan Holesovsky wrote: > Hi Radek, > > On 2011-06-28 at 15:40 +0200, Radek Doulík wrote: > > > I have prepared a fix for impress slideshow problem when screen is > > resized (for example by xrandr). The slideshow wasn't resizing > > correctly. I am looking for 2 reviews (I already have one from Lubos) to > > include it in 3-4-1 branch. > > > > It involves these 3 commits: > > > > http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=99222151485297266936bb3a8a8cd4162cb25f70 > > http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=865e186b92605ad02981fb605aa4e7f27489d4cd > > http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=eb1f0c94dfab3aa8afebda8e4a18664e5ac08fa5 > > It's too late for 3.4.1, but if you have go-ahead from Lubos, please > push with his sign-off to the libreoffice-3-4 branch; that one needs > only one sign-off, and will be a base for the 3.4.2 :-) OK, pushed already to 3.4. How do I do the sign-off? Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fix for screen resizing problems
Hi all, I have prepared a fix for impress slideshow problem when screen is resized (for example by xrandr). The slideshow wasn't resizing correctly. I am looking for 2 reviews (I already have one from Lubos) to include it in 3-4-1 branch. It involves these 3 commits: http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=99222151485297266936bb3a8a8cd4162cb25f70 http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=865e186b92605ad02981fb605aa4e7f27489d4cd http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=eb1f0c94dfab3aa8afebda8e4a18664e5ac08fa5 Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] impress: after adding a new animation, scroll down to it in the list.
Hi Luke,
> @@ -542,6 +543,7 @@ void
> CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool
> bSelect
> {
> append( pEffect );
> select( pEffect );
> +MakeVisible( Last() );
we don't need to call it here ^^^, as select( pEffect ); on the previous
line recursively calls this function again and it is made visible from
the loop above already. So it should be enough to add it to the loop.
I have updated your patch and pushed it.
Cheers
Radek
> }
> }
On Sun, 2011-06-26 at 22:27 +1200, Luke Symes wrote:
> Hi Radek,
>
> On Sat, Jun 25, 2011 at 3:35 AM, Radek Doulik wrote:
>
> At least I am not reaching the part you modified when adding
> custom
> animation thru custom animation pane (using the add button and
> custom
> animation dialog). If we move it to the loop, it will be
> reached always
> when selecting an entry - the select method is called
> recursively when
> adding new pEntry in:
>
>if( !pEntry && bSelect )
>{
>append( pEffect );
>select( pEffect );
>}
>
> I wonder how do you reach that part of code?
>
>
> Hmm. I think the code is incorrect here. That last if statement should
> really only be used if the effect wasn't in the list & needs to be
> added. But when I added the MakeVisible in the if statement, it made
> new animations be scrolled to, and I was doing it via add->custom
> animation dialog too. What do you think of my attached patch? Once we
> have found the given entry, we should select it and then we are done,
> aren't we?
>
>
> Kind regards,
>
>
> Luke.
--
Radek Doulík
Novell, Inc.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED:master] Fix for Bug 37484 - On any animation change, current position in list is lost
Hi Luke, thanks for the fix! Pushed. Cheers Radek On Sun, 2011-06-26 at 22:23 +1200, Luke Symes wrote: > Hi Radek, > > On Sat, Jun 25, 2011 at 3:47 AM, Radek Doulik wrote: > I run into a crash on startup in that part. I quickly fixed > it, but it > might be better if you check that it plays nicely with your > new code. Or > maybe make the ScrollToAbsPos not crash when called with > unexpected > values, -1 for example. > > > Thanks for fixing this! You're right, I didn't test loading a blank > presentation... Your quick fix fits well with the rest of the code; > nFirstVis will never be -1 if there are entries in the > CustomAnimationList. I was sad that ScrollToAbsPos failed; it turns > out that it's due to there being no entries in the list (I had added a > check for negative scroll position values which would try to go to > scroll to the first entry). I have attached a patch for ScrollToAbsPos > that will check if there are entries in the list first, and if not > just return. Could you please review/commit this? > > > Kind regards, > > > Luke. -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] pptx export on 3-4[-0] branches
Hi, I would like to push fixes for pptx export for 3-4 and 3-4-0 branches. The pptx export is currently broken as the export component is not instantiated. I am looking for 3 reviews. It has 5 parts, 3 of them are cherry-picks from master and 2 additional are necessary because build system changed in master, so the fixes are different. Cheers Radek http://cgit.freedesktop.org/libreoffice/impress/commit/?id=36a2e16e11f1f77847349ae2ec89ef61f2159343 http://cgit.freedesktop.org/libreoffice/filters/commit/?id=58cf0ba94346fe0762de0b9890dbc3c8a75ea1b3 http://cgit.freedesktop.org/libreoffice/filters/commit/?id=c4da44b1b637f731af0085aa07389f66c33890c1 commit bb34d3274709a5b0c66f366c6c1d2cbc2b2c2684 Author: Radek Doulik Date: Thu May 19 15:25:16 2011 +0200 fix sdfilt component generation diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 8eda79e..1d25951 100755 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -297,5 +297,5 @@ $(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(MISC)/sdfilt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ sdfilt.component $(XSLTPROC) --nonet --stringparam uri \ -'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ +'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt sdfilt.component commit 1da375908436dffca50421280ef5004cfeb4474e Author: Radek Doulik Date: Thu May 19 14:52:29 2011 +0200 add sdfilt component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1a60d20..82ff84d 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -152,6 +152,7 @@ my_components = \ sdbc2 \ sdbt \ sdd \ +sdfilt \ simplecanvas \ slideshow \ $(SM_COMPONENTS)\ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fix for bullets saving to odp and possibly more issues
Hi, please review my patch for fdo#37017. It sets version info so that we don't hit workarounds for versions <= 3.4.x. I would like to put on 3-4 branch. Cheers Radek commit ab328ba55be3b7249d1a55a939182ffd2034c3aa Author: Radek Doulik Date: Wed May 11 17:48:21 2011 +0200 change the version info so that we are not identified at runtime as 3.0.x - fixes https://bugs.freedesktop.org/show_bug.cgi?id=37017 diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index e33ce16..dfd0189 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ -RSCVERSION=300 -RSCREVISION=300m103(Build:1) +RSCVERSION=340 +RSCREVISION=340m1(Build:1) BUILD=1 -LAST_MINOR=m103 -SOURCEVERSION=DEV300 +LAST_MINOR=m1 +SOURCEVERSION=OOO340 -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Export of docs with images/charts into xlsx (possibly pptx)
Hi Bubli,
thanks for the patch! I didn't realize that the code is also used by
other parts of OOXML export and that it will fire exception in the case
the property is missing for calc and writer objects.
The patch looks good, but I think you should keep the test whether >>=
operator succeeded. Like:
if (xPropSet->getPropertyValue( S( "IsEmptyPresentationObject"
) ) >>= bIsEmptyPresObj) {
DBG(printf("empty presentation object %d, props:\n",
bIsEmptyPresObj));
if( bIsEmptyPresObj )
return sal_True;
}
and similar for the other test.
Cheers
Radek
On Wed, 2011-05-04 at 08:42 +0200, Katarina Machalkova wrote:
> Hey there,
>
> can some1 please review the attached patch for 3.4? Export of xlsx docs
> containing images or charts (GraphicObjectShape) fails with generic "cannot
> write" error (there is no particular bug id. associated with the issue so far
> ... but I didn't search fdo bugzilla so well)
>
> The problematic code is introduced by commit b49d4405f4a8919. I haven't even
> remote clue what is it supposed (not) to be doing, more specifically why an
> attempt to retrieve value of non-existing property
> ('Is[Empty]PresentationObject') throws an exception and/or why the object in
> question doesn't have the mentioned property. There is handful of places
> where
> property value is being retrieved without prior checking all over the code.
>
> Anyway, the patch seems to do the job (the spreadsheet with imgs is saved as
> xlsx) and moreover, a similar trick is used in xmloff module
> (source/draw/shapeexport2.cxx, XMLShapeExport::ImpExportPresentationAttribute
> method)
> Thx
>
> B.
> _______
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
--
Radek Doulík
Novell, Inc.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] impress tasks pane fix (fdo#34718) - 3.3.2 blocker
Hi all, I have the fix for fdo#34718 ready. I am looking for 3 reviews. http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=1f4078d8be0755ea33ec36edacdf805e1ce24270 fix for 3.3.2 blocker fdo#34718 - change the type of nDrawerHeight to long - before it became big positive long in the called Point::Move function, moving the drawer under the visible area. so it was basically signed/unsigned problem in the layouter Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] another cairo canvas regression
Hi all, I have fixed another regression in cairo canvas, same area as yesterday. The edge count was miscalculated as "# of edges" in polygon equals to "# of points" minus 1 and not to number of points. I would like to push it to libreoffice-3-3 branch - 1 review wanted. http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=abb5233c0b9b584407b4696f5db2c330ca45b632 Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] cairo canvas regression
Hi all, I have fixed regression in cairo canvas, where points outside valid range were accessed while rendering closed polygons. I would like to push it to libreoffice-3-3 branch - 1 review wanted. http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=a898a8cb077c05b1085da8254e66f61aa265b7dc Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] disable EMF+ in 3-3-1 on all platforms
Hi,
please review this patch for inclusion in 3-3-1. Because the previous
fix seemed too risky, we will disable the EMF+ altogether for this
release.
Cheers
Radek
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx
b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index 1dd5c64..4bb7643 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -344,12 +344,8 @@ BOOL EnhWMFReader::ReadEnhWMF()
sal_Bool bFlag, bStatus = ReadHeader();
sal_BoolbHaveDC = false;
-#ifdef UNX
-static sal_Bool bEnableEMFPlus = ( getenv( "EMF_PLUS_DISABLE" ) == NULL );
-#else
-// TODO: make it possible to disable emf+ on windows
+// disable EMF+ temporarily on all platforms
static sal_Bool bEnableEMFPlus = sal_False;
-#endif
while( bStatus && nRecordCount-- )
{
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fix for EMF+ on 3-3 and 3-3-1
On Tue, 2011-02-15 at 08:31 -0700, Tor Lillqvist wrote: > > Do I take it that these two then fix win32 ? > > These are the same two diffs I tested on Friday (I think it was), > aren't they? They did not help. Of course, it might be that my quick > testing was flawed in some way. Yup, I think on win32 we might still miss some code related to mtf renderer, specialized BitmapEx constructor or something. These patches fix it on other platforms though, where EMF+ rendering was/is broken. Cheers Radek -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fix for EMF+ on 3-3 and 3-3-1
On Tue, 2011-02-15 at 15:21 +, Michael Meeks wrote: > Hi Radek, > > You missed the patch disabling EMF+ rendering for Win32. I hope not. My patches fix it on all the platforms where EMF+ is enabled. EMF+ was broken on unx for quite some time, basically when impress started using drawing layer to render them. Didn't you push the win32 disable patch? > On Tue, 2011-02-15 at 15:44 +0100, Radek Doulík wrote: > > http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=229df81b920ddee5a1b057af75db7b293f88e3bd > > http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=2d3672612fb4f4d47116578fd5d1e7fdf44df709 > > Do I take it that these two then fix win32 ? either way IMHO it is a > tad late for this now; can we punt that to 3.3.2 - or is there some > crippling problem I'm not aware of ? :-) [ it'd be nice to have a bug# > or description for what these two fix ]. They fix https://bugzilla.novell.com/show_bug.cgi?id=650049 Cheers Radek > Thanks, > > Michael. > -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fix for EMF+ on 3-3 and 3-3-1
On Tue, 2011-02-15 at 12:30 +0100, Radek Doulík wrote: > Hi, > > I would like to have EMF+ support fixed in 3.3. The following two > commits are needed to fix it on > > libreoffice-3-3 (1 review needed) > libreoffice-3-3-1 (3 reviews needed) > > branches. > > http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=7de8695f19626c764a4b43cfb30179525d9a5956 > http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=229df81b920ddee5a1b057af75db7b293f88e3bd http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=2d3672612fb4f4d47116578fd5d1e7fdf44df709 one more commit needed, which fixes problem with static variable. (thanks Thorsten) Cheers Radek > Cheers > Radek > -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fix for EMF+ on 3-3 and 3-3-1
Hi, I would like to have EMF+ support fixed in 3.3. The following two commits are needed to fix it on libreoffice-3-3 (1 review needed) libreoffice-3-3-1 (3 reviews needed) branches. http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=7de8695f19626c764a4b43cfb30179525d9a5956 http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=229df81b920ddee5a1b057af75db7b293f88e3bd Cheers Radek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] Fixes for i116318 and i116371
On Tue, 2011-01-18 at 10:01 +0100, Radek Doulik wrote: > Hi Thorsten, > > the patch looks OK and safe to me. I mean both of them. R. > Cheers > Radek > > On Mon, 2011-01-17 at 15:45 +0100, Thorsten Behrens wrote: > > Hi, > > > > would you please review attached patches for 3-3-0 - they're > > extracted from OOo's calc65 CWS, which'll go into RC10. > > > > Both are tested & work fine for me - they're safe in a sense that > > they'll definitely not make matters worse. ;) > > > > Cheers, > > > > -- Thorsten > > ___ > > LibreOffice mailing list > > LibreOffice@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Radek Doulík Novell, Inc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] patch review for commit 67be5829944758dec070710521cd86ae49e00aa9
Hi Thorsten,
would you please review my patch in vcl/source/canvastools? I would like
to push it to 3-3 branch.
Cheers
Radek
commit 67be5829944758dec070710521cd86ae49e00aa9
Author: Radek Doulik
Date: Thu Dec 2 15:23:17 2010 +0100
fix invalid read in doubleSequenceToColor, fixes crash in n#654065
diff --git a/vcl/source/helper/canvastools.cxx
b/vcl/source/helper/canvastools.cxx
index 9f701c5..d57c9f4 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -820,13 +820,13 @@ namespace vcl
const uno::Sequence< double > rColor,
const uno::Reference< rendering::XColorSpace >& xColorSpace )
{
-const rendering::ARGBColor& rARGBColor(
+const rendering::ARGBColor aARGBColor(
xColorSpace->convertToARGB(rColor)[0]);
-return Color( 255-toByteColor(rARGBColor.Alpha),
- toByteColor(rARGBColor.Red),
- toByteColor(rARGBColor.Green),
- toByteColor(rARGBColor.Blue) );
+return Color( 255-toByteColor(aARGBColor.Alpha),
+ toByteColor(aARGBColor.Red),
+ toByteColor(aARGBColor.Green),
+ toByteColor(aARGBColor.Blue) );
}
//---
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
