diff options
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/graphicfilter/icgm/actimpr.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 7 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 | ||||
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 4 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 8 |
5 files changed, 11 insertions, 12 deletions
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index a2d844fb3723..88702b5acfb9 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -358,7 +358,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty nFontType = pFontEntry->nFontType; aFontDescriptor.Name = OUString::createFromAscii( reinterpret_cast<char*>(pFontEntry->pFontName) ); } - aFontDescriptor.Height = ( sal_Int16 )( ( mpCGM->pElement->nCharacterHeight * 1.50 ) ); + aFontDescriptor.Height = sal_Int16( mpCGM->pElement->nCharacterHeight * 1.50 ); if ( nFontType & 1 ) aFontDescriptor.Slant = awt::FontSlant_ITALIC; if ( nFontType & 2 ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 148a8977959c..6cce2634a9d3 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6193,10 +6193,9 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, && ( ( eShapeType == mso_sptTextSimple ) || ( eShapeType == mso_sptTextBox ) - || ( ( ( eShapeType == mso_sptRectangle ) - || ( eShapeType == mso_sptRoundRectangle ) - ) - ) ) ) + || ( eShapeType == mso_sptRectangle ) + || ( eShapeType == mso_sptRoundRectangle ) + ) ) { aInfo.bReplaceByFly = true; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 53511043376d..b2a7b7b27bfb 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -808,7 +808,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi { // try to load some ppt text PPTTextObj aTextObj( rSt, static_cast<SdrPowerPointImport&>(*this), rPersistEntry, &rObjData ); - if ( ( aTextObj.Count() || aTextObj.GetOEPlaceHolderAtom() ) ) + if ( aTextObj.Count() || aTextObj.GetOEPlaceHolderAtom() ) { bool bVerticalText = false; // and if the text object is not empty, it must be applied to pRet, the object we diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 75fe00dce7f6..a4d3fe17c06e 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1994,11 +1994,11 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPag if( nType == MetaActionType::COMMENT ) { const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); - if( ( pA->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_BEGIN") ) ) + if( pA->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_BEGIN") ) { bIsTextShapeStarted = true; } - else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) ) + else if( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) { bIsTextShapeStarted = false; } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index a9b9dbbc5e87..b5795870d8ad 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3345,7 +3345,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } else if( !mrExport.IsUsePositionedCharacters() && ( nWriteFlags & SVGWRITER_WRITE_TEXT ) ) { - if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_BEGIN" ) ) ) + if( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_BEGIN" ) ) { if( pxShape ) { @@ -3380,11 +3380,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } } } - else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) ) + else if( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) { maTextWriter.endTextShape(); } - else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOP" ) ) ) + else if( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOP" ) ) { const MetaAction* pNextAction = rMtf.GetAction( nCurAction + 1 ); if( !( ( pNextAction->GetType() == MetaActionType::COMMENT ) && @@ -3417,7 +3417,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } } - else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOL" ) ) ) + else if( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_EOL" ) ) { const MetaAction* pNextAction = rMtf.GetAction( nCurAction + 1 ); if( !( ( pNextAction->GetType() == MetaActionType::COMMENT ) && |