diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 5 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index a999791a5c5a..26f227e8b9a4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -433,7 +433,10 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) while ( aTextAreaIter != aTextAreaIEnd ) { GetTextAreaOutline( rFWData, pCustomShape, *aTextAreaIter, bSameLetterHeights ); - if ( eFTS == SdrFitToSizeType::AllLines ) + if (eFTS == SdrFitToSizeType::AllLines || + // tdf#97630 interpret PROPORTIONAL same as ALLLINES so we don't + // need another ODF attribute! + eFTS == SdrFitToSizeType::Proportional) { std::vector< FWParagraphData >::iterator aParagraphIter( aTextAreaIter->vParagraphs.begin() ); std::vector< FWParagraphData >::const_iterator aParagraphIEnd( aTextAreaIter->vParagraphs.end() ); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index a148de31cf13..329cd2bcb006 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -73,10 +73,16 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) case SDRTEXTHORZADJUST_RIGHT : nAlignment = 2; break; case SDRTEXTHORZADJUST_BLOCK : { - if ( rTextFitToSizeTypeItem.GetValue() == SdrFitToSizeType::NONE ) + auto const fit(rTextFitToSizeTypeItem.GetValue()); + if (fit == SdrFitToSizeType::NONE) + { nAlignment = 3; - else if ( rTextFitToSizeTypeItem.GetValue() == SdrFitToSizeType::AllLines ) + } + else if (fit == SdrFitToSizeType::AllLines || + fit == SdrFitToSizeType::Proportional) + { nAlignment = 4; + } } } if ( ( nOldAlignment != -1 ) && ( nOldAlignment != nAlignment ) ) |