mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

n#734734: Text rotation fixes.

Browse Source 
PPTX would need rotation of text _inside_ text/object
boundaries, rather than the rotation of the text/object itself.
This commit is contained in:
Muthu Subramanian
2012-01-11 15:24:27 +05:30
parent ee24a236e1
commit 5c4d1b05fa
8 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/source/drawingml/customshapeproperties.cxx
View File

@@ -154,7 +154,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX );
aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY );
aPropertyMap[ PROP_TextRotateAngle ] <<= Any( mnTextRotateAngle );
aPropertyMap[ PROP_TextPreRotateAngle ] <<= Any( mnTextRotateAngle );
Sequence< PropertyValue > aSeq = aPropertyMap.makePropertyValueSequence();
aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );

6
oox/source/drawingml/shapecontext.cxx
View File

@@ -119,6 +119,12 @@ Reference< XFastContextHandler > ShapeContext::createFastChildContext( sal_Int32
xRet = new TextBodyContext( *this, *xTextBody );
break;
}
case XML_txXfrm:
{
AttributeList aAttribs( xAttribs );
mpShapePtr->getTextBody()->getTextProperties().moRotation = aAttribs.getInteger( XML_rot );
break;
}
}
if( !xRet.is() )

6
oox/source/ppt/pptshapecontext.cxx
View File

@@ -218,6 +218,12 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In
xRet = new oox::drawingml::TextBodyContext( *this, *xTextBody );
break;
}
case PPT_TOKEN( txXfrm ):
{
AttributeList aAttribs( xAttribs );
mpShapePtr->getTextBody()->getTextProperties().moRotation = aAttribs.getInteger( XML_rot );
break;
}
}
if( !xRet.is() )

1
oox/source/token/properties.txt
View File

@@ -457,6 +457,7 @@ TextHorizontalAdjust
TextLeftDistance
TextLowerDistance
TextOverlap
TextPreRotateAngle
TextRightDistance
TextRotateAngle
TextRotation

1
oox/source/token/tokens.txt
View File

@@ -5334,6 +5334,7 @@ txOverObj
txPr
txSp
txStyles
txXfrm
txbxContent
txtBox
ty

2
svx/inc/svx/svdoashp.hxx
View File

@@ -149,7 +149,7 @@ public:
void SetMirroredY( const sal_Bool bMirroredY );
double GetObjectRotation() const;
double GetExtraTextRotation() const;
double GetExtraTextRotation( const bool bPreRotation = false ) const;
TYPEINFO();
SdrObjCustomShape();

8
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
View File

@@ -160,6 +160,14 @@ namespace sdr
// #i101684# get the text range unrotated and absolute to the object range
const basegfx::B2DRange aTextRange(getCorrectedTextBoundRect());
// Rotation before scaling
if(!basegfx::fTools::equalZero(GetCustomShapeObj().GetExtraTextRotation(true)))
{
basegfx::B2DVector aTranslation(0.5, 0.5);
aTextBoxMatrix.translate( -aTranslation.getX(), -aTranslation.getY() );
aTextBoxMatrix.rotate((360.0 - GetCustomShapeObj().GetExtraTextRotation(true)) * F_PI180);
aTextBoxMatrix.translate( aTranslation.getX(), aTranslation.getY() );
}
// give text object a size
aTextBoxMatrix.scale(aTextRange.getWidth(), aTextRange.getHeight());

5
svx/source/svdraw/svdoashp.cxx
View File

@@ -537,12 +537,13 @@ double SdrObjCustomShape::GetObjectRotation() const
return fObjectRotation;
}
double SdrObjCustomShape::GetExtraTextRotation() const
double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const
{
const com::sun::star::uno::Any* pAny;
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) );
pAny = rGeometryItem.GetPropertyValueByName( sTextRotateAngle );
const rtl::OUString sTextPreRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextPreRotateAngle" ) );
pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? sTextPreRotateAngle : sTextRotateAngle );
double fExtraTextRotateAngle = 0.0;
if ( pAny )
*pAny >>= fExtraTextRotateAngle;