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

n744512: Fixed formatting of tables.

Browse Source 
otherStyle needs to be used to format tables.
removed wrong defaultStyling.
added using masterslide style info correctly.
This commit is contained in:
Muthu Subramanian
2012-02-10 14:52:05 +05:30
parent 1ae7ac2a03
commit b93463bcfe
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
oox/source/ppt/pptshape.cxx
View File

@@ -308,9 +308,22 @@ void PPTShape::addShape(
if ( !sServiceName.isEmpty() ) if ( !sServiceName.isEmpty() )
{ {
// use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation
if ( !aMasterTextListStyle.get() ) if ( !aMasterTextListStyle.get() )
aMasterTextListStyle = ( mnSubType && rSlidePersist.getMasterPersist().get() ) ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle(); {
bool isOther = !getTextBody().get();
TextListStylePtr aSlideStyle = isOther ? rSlidePersist.getOtherTextStyle() : rSlidePersist.getDefaultTextStyle();
// Combine from MasterSlide details as well.
if( rSlidePersist.getMasterPersist().get() )
{
aMasterTextListStyle = isOther ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getMasterPersist()->getDefaultTextStyle();
if( aSlideStyle.get() )
aMasterTextListStyle->apply( *aSlideStyle.get() );
}
else
{
aMasterTextListStyle = aSlideStyle;
}
}
if( aMasterTextListStyle.get() && getTextBody().get() ) { if( aMasterTextListStyle.get() && getTextBody().get() ) {
TextListStylePtr aCombinedTextListStyle (new TextListStyle()); TextListStylePtr aCombinedTextListStyle (new TextListStyle());

2
oox/source/ppt/slidepersist.cxx
View File

@@ -71,8 +71,8 @@ SlidePersist::SlidePersist( XmlFilterBase& rFilter, sal_Bool bMaster, sal_Bool b
maTitleTextStylePtr->apply( *pDefaultTextStyle.get() ); maTitleTextStylePtr->apply( *pDefaultTextStyle.get() );
maBodyTextStylePtr->apply( *pDefaultTextStyle.get() ); maBodyTextStylePtr->apply( *pDefaultTextStyle.get() );
maNotesTextStylePtr->apply( *pDefaultTextStyle.get() ); maNotesTextStylePtr->apply( *pDefaultTextStyle.get() );
*/
maOtherTextStylePtr->apply( *pDefaultTextStyle.get() ); maOtherTextStylePtr->apply( *pDefaultTextStyle.get() );
*/
} }
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
mxDebugPage = mxPage; mxDebugPage = mxPage;