[PATCH]bnc#753458: in Impress starts presentation mode
Hi all, Here I attached a small patch fixing this bug: https://bugzilla.novell.com/show_bug.cgi?id=753458 It will be great if someone review it for me, thanks! 0001-bnc-753458-changing-the-keyboard-of-the-Slide-Show-b.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - chart2/source
chart2/source/view/main/ChartView.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 709ac6b205e0d51d2183ac7c6ebf12cd5557225a Author: Felix Zhang Date: Tue Sep 4 14:40:43 2012 +0800 bnc#759197: adjust chart layout distance Change-Id: Ifae4faeb234630dcce79851a0ad8bb0c6960f9f7 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 82ca2d9..001d008 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2020,7 +2020,7 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes( double lcl_getPageLayoutDistancePercentage() { -return 0.02; +return 0.006; } bool getAvailablePosAndSizeForDiagram( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/textparagraphproperties.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 24aeeb016323821b7eba6ab78a4dcf5e7ebb157a Author: Felix Zhang Date: Thu Mar 28 21:00:11 2013 +0800 bnc#793414: Fixed the left margin of bullet Change-Id: I4726ab00a6e2700407ffcf5258d3736ed0161514 diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index b39ffb6..4598c62 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" @@ -416,6 +417,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { if ( noParaLeftMargin ) { +aPropSet.setProperty( PROP_ParaLeftMargin, static_cast< sal_Int32 >(0)); rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( *noParaLeftMargin ); noParaLeftMargin = boost::none; } @@ -423,7 +425,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { // Force Paragraph property as zero - impress seems to use the value from previous // (non) bullet line if not set to zero explicitly :( -aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32>(0) ); +aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32 >(0) ); rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( *noFirstLineIndentation ); noFirstLineIndentation = boost::none; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/textparagraphproperties.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5c5f3782d8e324fb19c52df9781be1386d2b8407 Author: Felix Zhang Date: Thu Mar 28 21:00:11 2013 +0800 bnc#793414: Fixed the left margin of bullet Change-Id: I4726ab00a6e2700407ffcf5258d3736ed0161514 diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index edf13fb..7889da2 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" @@ -418,6 +419,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { if ( noParaLeftMargin ) { +aPropSet.setProperty( PROP_ParaLeftMargin, static_cast< sal_Int32 >(0)); rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( *noParaLeftMargin ); noParaLeftMargin = boost::none; } @@ -425,7 +427,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { // Force Paragraph property as zero - impress seems to use the value from previous // (non) bullet line if not set to zero explicitly :( -aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32>(0) ); +aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32 >(0) ); rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( *noFirstLineIndentation ); noFirstLineIndentation = boost::none; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/filter sd/source
include/filter/msfilter/svdfppt.hxx |2 - sd/source/filter/ppt/pptin.cxx | 42 ++-- 2 files changed, 36 insertions(+), 8 deletions(-) New commits: commit 95bb951826c7fbaafb055008416f4f1d5cfc95dc Author: Felix Zhang Date: Fri May 10 18:10:46 2013 +0530 bnc#758621: show preset texts in slide placeholder diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 2fbf096..f21323c 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1200,7 +1200,7 @@ struct ImplPPTTextObj explicit ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; }; -class PPTTextObj +class MSFILTER_DLLPUBLIC PPTTextObj { ImplPPTTextObj* mpImplTextObj; voidImplClear(); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 30e90f2..6b43d07 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2322,6 +2322,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) ) { +sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId; sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId; sal_uInt16 i = 0; if ( eAktPageKind == PPT_SLIDEPAGE ) @@ -2332,7 +2333,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; } } -if ( i < 8 ) +if ( i < 8 || nPlacementId == 0x ) { PresObjKind ePresObjKind = PRESOBJ_NONE; sal_BoolbEmptyPresObj = sal_True; @@ -2340,18 +2341,40 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { if ( pTextObj->Count() ) -bEmptyPresObj = sal_False; +if ( pTextObj->Count() > 1 || pTextObj->First()->GetTextSize() ) +bEmptyPresObj = sal_False; switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : bVertical = sal_True; // PASSTHROUGH !!! -case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; +case PPT_PLACEHOLDER_TITLE : +case PPT_PLACEHOLDER_CENTEREDTITLE : +{ +ePresObjKind = PRESOBJ_TITLE; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} case PPT_PLACEHOLDER_VERTICALTEXTBODY : bVertical = sal_True; // PASSTHROUGH !!! -case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; -case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; -case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT;break; // PRESOBJ_OUTLINE +case PPT_PLACEHOLDER_BODY : +{ +ePresObjKind = PRESOBJ_OUTLINE; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} +case PPT_PLACEHOLDER_SUBTITLE : +{ +ePresObjKind = PRESOBJ_TEXT; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} +case PPT_PLACEHOLDER_OBJECT : +{ +ePresObjKind = PRESOBJ_OBJECT; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} default : { @@ -2360,7 +2383,6 @@ Sdr
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - filter/inc sd/source
filter/inc/filter/msfilter/svdfppt.hxx |2 - sd/source/filter/ppt/pptin.cxx | 42 +++-- 2 files changed, 36 insertions(+), 8 deletions(-) New commits: commit 27a5c5c0c776d62cc219c2505e2df88ee1905a84 Author: Felix Zhang Date: Fri May 10 18:13:45 2013 +0530 bnc#758621: show preset texts in slide placeholder. diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 79272f5..e6a845b 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -1191,7 +1191,7 @@ struct ImplPPTTextObj explicit ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; }; -class PPTTextObj +class MSFILTER_DLLPUBLIC PPTTextObj { ImplPPTTextObj* mpImplTextObj; voidImplClear(); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 8fa0545..37c2304 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2311,6 +2311,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) ) { +sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId; sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId; sal_uInt16 i = 0; if ( eAktPageKind == PPT_SLIDEPAGE ) @@ -2321,7 +2322,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; } } -if ( i < 8 ) +if ( i < 8 || nPlacementId == 0x ) { PresObjKind ePresObjKind = PRESOBJ_NONE; sal_BoolbEmptyPresObj = sal_True; @@ -2329,18 +2330,40 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { if ( pTextObj->Count() ) -bEmptyPresObj = sal_False; +if ( pTextObj->Count() > 1 || pTextObj->First()->GetTextSize() ) +bEmptyPresObj = sal_False; switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : bVertical = sal_True; // PASSTHROUGH !!! -case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; +case PPT_PLACEHOLDER_TITLE : +case PPT_PLACEHOLDER_CENTEREDTITLE : +{ +ePresObjKind = PRESOBJ_TITLE; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} case PPT_PLACEHOLDER_VERTICALTEXTBODY : bVertical = sal_True; // PASSTHROUGH !!! -case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; -case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; -case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT;break; // PRESOBJ_OUTLINE +case PPT_PLACEHOLDER_BODY : +{ +ePresObjKind = PRESOBJ_OUTLINE; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} +case PPT_PLACEHOLDER_SUBTITLE : +{ +ePresObjKind = PRESOBJ_TEXT; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} +case PPT_PLACEHOLDER_OBJECT : +{ +ePresObjKind = PRESOBJ_OBJECT; +aPresentationText = pPage->GetPresObjText( ePresObjKind ); +break; +} default : { @@ -2349,7 +2
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source
oox/source/drawingml/textparagraphproperties.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 97e888fc212276de19ec8158a5e778f942c6b7d1 Author: Felix Zhang Date: Thu Apr 18 18:20:18 2013 +0800 bnc#793414: Fix the mis-displayed bullet char The bullet char is mistakenly set to Level 0 without setting the correct NumberingLevel Change-Id: Ie72abac83f91e9a047578d0e8334d98a358e2aee diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 3a0d67e..fdf78ee 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -389,6 +389,7 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps moParaLeftMargin = rSourceProps.moParaLeftMargin; if ( rSourceProps.moFirstLineIndentation ) moFirstLineIndentation = rSourceProps.moFirstLineIndentation; +mnLevel = rSourceProps.mnLevel; } void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, commit 22c511b1fcf7a4178e23c136be3d30a7734d855d Author: Felix Zhang Date: Thu Mar 28 21:00:11 2013 +0800 bnc#793414: Fixed the left margin of bullet Change-Id: I4726ab00a6e2700407ffcf5258d3736ed0161514 diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 87091c1..3a0d67e 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" @@ -427,6 +428,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { if ( noParaLeftMargin ) { +aPropSet.setProperty( PROP_ParaLeftMargin, static_cast< sal_Int32 >(0)); rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( *noParaLeftMargin ); noParaLeftMargin = boost::none; } @@ -434,7 +436,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { // Force Paragraph property as zero - impress seems to use the value from previous // (non) bullet line if not set to zero explicitly :( -aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32>(0) ); +aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32 >(0) ); rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( *noFirstLineIndentation ); noFirstLineIndentation = boost::none; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-18'
Tag 'suse-3.6-18' created by Andras Timar at 2013-04-22 18:42 -0700 suse-3.6-18 Changes since suse-3.6-17-15: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/textparagraphproperties.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 78a20557601d9ca7b446df0cffa72398576741ed Author: Felix Zhang Date: Thu Apr 25 19:22:29 2013 +0530 bnc#793414: Bullet points are not indented correctly. diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 4598c62..585695d 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -378,6 +378,8 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps moParaLeftMargin = rSourceProps.moParaLeftMargin; if ( rSourceProps.moFirstLineIndentation ) moFirstLineIndentation = rSourceProps.moFirstLineIndentation; +if( rSourceProps.mnLevel ) +mnLevel = rSourceProps.mnLevel; } void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/textparagraphproperties.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e01435a0c1910caf86712ab71f7b714f6ed9c782 Author: Felix Zhang Date: Thu Apr 25 19:22:29 2013 +0530 bnc#793414: Bullet points are not indented correctly. diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 7889da2..94ad04f 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -380,6 +380,8 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps moParaLeftMargin = rSourceProps.moParaLeftMargin; if ( rSourceProps.moFirstLineIndentation ) moFirstLineIndentation = rSourceProps.moFirstLineIndentation; +if( rSourceProps.mnLevel ) +mnLevel = rSourceProps.mnLevel; } void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shape.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67 Author: Felix Zhang Date: Mon Jul 1 17:04:12 2013 +0800 bnc#593612: workaround for grpFill Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 1a1a1e1..64a7ab5 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -534,9 +534,8 @@ Reference< XShape > Shape::createAndInsert( // group fill inherits from parent if ( getFillProperties().moFillType.has() && getFillProperties().moFillType.get() == XML_grpFill ) -aFillProperties.assignUsed( rShapeOrParentShapeFillProps ); -else -aFillProperties.assignUsed( getFillProperties() ); +getFillProperties().assignUsed( rShapeOrParentShapeFillProps ); +aFillProperties.assignUsed( getFillProperties() ); aEffectProperties.assignUsed ( getEffectProperties() ); ShapePropertyMap aShapeProps( rFilterBase.getModelObjectHelper() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/shape.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 774a45341b7b69d6c1ce508e55c23d78efa43871 Author: Felix Zhang Date: Mon Jul 1 17:04:12 2013 +0800 bnc#593612: workaround for grpFill Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc (cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67) Signed-off-by: Thorsten Behrens diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 6c30d12..dc2a7db 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -524,9 +524,8 @@ Reference< XShape > Shape::createAndInsert( // group fill inherits from parent if ( getFillProperties().moFillType.has() && getFillProperties().moFillType.get() == XML_grpFill ) -aFillProperties.assignUsed( rShapeOrParentShapeFillProps ); -else -aFillProperties.assignUsed( getFillProperties() ); +getFillProperties().assignUsed( rShapeOrParentShapeFillProps ); +aFillProperties.assignUsed( getFillProperties() ); aEffectProperties.assignUsed ( getEffectProperties() ); ShapePropertyMap aShapeProps( rFilterBase.getModelObjectHelper() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source
oox/source/drawingml/shape.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit cce481aa3184e3b00f7cc6f0a6d2a496ab19a6fd Author: Felix Zhang Date: Mon Jul 1 17:04:12 2013 +0800 bnc#593612: workaround for grpFill Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc (cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67) Signed-off-by: Thorsten Behrens diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0d3a286..9715973 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -533,9 +533,8 @@ Reference< XShape > Shape::createAndInsert( // group fill inherits from parent if ( getFillProperties().moFillType.has() && getFillProperties().moFillType.get() == XML_grpFill ) -aFillProperties.assignUsed( rShapeOrParentShapeFillProps ); -else -aFillProperties.assignUsed( getFillProperties() ); +getFillProperties().assignUsed( rShapeOrParentShapeFillProps ); +aFillProperties.assignUsed( getFillProperties() ); aEffectProperties.assignUsed ( getEffectProperties() ); ShapePropertyMap aShapeProps( rFilterBase.getModelObjectHelper() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - oox/source sd/qa
oox/source/drawingml/textparagraph.cxx |3 - sd/qa/unit/data/n593612.pptx |binary sd/qa/unit/data/xml/n593612_0.xml | 67 + sd/qa/unit/import-tests.cxx|1 4 files changed, 69 insertions(+), 2 deletions(-) New commits: commit 422ce23ea6cb7ddad6db97d752ffe5fdf6ce0d3a Author: Felix Zhang Date: Fri Jun 21 10:00:19 2013 +0200 bnc#593612: font size: Unit test. Change-Id: I3cda692b93f0e08c3e666e03b04966abaca00057 diff --git a/sd/qa/unit/data/n593612.pptx b/sd/qa/unit/data/n593612.pptx new file mode 100644 index 000..2ba3eeb Binary files /dev/null and b/sd/qa/unit/data/n593612.pptx differ diff --git a/sd/qa/unit/data/xml/n593612_0.xml b/sd/qa/unit/data/xml/n593612_0.xml new file mode 100644 index 000..1fa2c64 --- /dev/null +++ b/sd/qa/unit/data/xml/n593612_0.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 0957c02..bebda14 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -68,6 +68,7 @@ void SdFiltersTest::testDocumentLayout() // FIXME re-enable again when a better fix is found { "n819614.pptx", "xml/n819614_" }, { "n820786.pptx", "xml/n820786_" }, { "n762695.pptx", "xml/n762695_" }, +{ "n593612.pptx", "xml/n593612_" }, }; for ( int i = 0; i < static_cast< int >( SAL_N_ELEMENTS( aFilesToCompare ) ); ++i ) commit 9fac61d21c886c3793b14628eb1de59d88bf45f8 Author: Felix Zhang Date: Fri Jun 21 09:55:07 2013 +0200 bnc#593612: font size: override para prop with run prop Change-Id: I4d0899c8f722150176cb3479bdb3b4a81c1b3eb8 diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index c4e82b3..7bb719a 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -103,19 +103,18 @@ void TextParagraph::insertAt( PropertyMap aioBulletList; Reference< XPropertySet > xProps( xAt, UNO_QUERY); -float fCharacterSize = nCharHeight > 0 ? GetFontHeight( nCharHeight ) : 18; if ( pTextParagraphStyle.get() ) { TextParagraphProperties aParaProp; aParaProp.apply( *pTextParagraphStyle ); aParaProp.apply( maProperties ); -fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize ); // bullets have same color as following texts by default if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() ); +float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 18 ); aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - chart2/source
chart2/source/view/main/ChartView.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99d9f949ee052cb83195edd414a2aa9b8c5a9b0e Author: Felix Zhang Date: Tue Sep 4 14:40:43 2012 +0800 bnc#759197: adjust chart layout distance Change-Id: Ifae4faeb234630dcce79851a0ad8bb0c6960f9f7 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index e5ae969..670c6f9 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2011,7 +2011,7 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes( double lcl_getPageLayoutDistancePercentage() { -return 0.02; +return 0.006; } bool getAvailablePosAndSizeForDiagram( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/81/581/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits