diff options
Diffstat (limited to 'sd/source/filter')
-rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 40 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 22 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 28 | ||||
-rw-r--r-- | sd/source/filter/html/HtmlOptionsDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/html/htmlex.cxx | 54 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 4 |
6 files changed, 76 insertions, 76 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 1e65805ed606..f9b6694ed709 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -170,12 +170,12 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl { case 5 : { - if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "downward" ) ) ) + if ( rPresetSubType == "downward" ) { nPresetSubType = 5; bTranslated = sal_True; } - else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "across" ) ) ) + else if ( rPresetSubType == "across" ) { nPresetSubType = 10; bTranslated = sal_True; @@ -184,7 +184,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl break; case 17 : { - if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "across" ) ) ) + if ( rPresetSubType == "across" ) { nPresetSubType = 10; bTranslated = sal_True; @@ -193,22 +193,22 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl break; case 18 : { - if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "right-to-top" ) ) ) + if ( rPresetSubType == "right-to-top" ) { nPresetSubType = 3; bTranslated = sal_True; } - else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "right-to-bottom" ) ) ) + else if ( rPresetSubType == "right-to-bottom" ) { nPresetSubType = 6; bTranslated = sal_True; } - else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "left-to-top" ) ) ) + else if ( rPresetSubType == "left-to-top" ) { nPresetSubType = 9; bTranslated = sal_True; } - else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "left-to-bottom" ) ) ) + else if ( rPresetSubType == "left-to-bottom" ) { nPresetSubType = 12; bTranslated = sal_True; @@ -394,7 +394,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode while( nLength-- ) { - if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) ) + if ( p->Name == "master-element" ) { p->Value >>= xMaster; break; @@ -783,7 +783,7 @@ sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNod sal_Int32 nLength = aUserData.getLength(); while( nLength-- ) { - if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) ) + if ( p->Name == "node-type" ) { if ( p->Value >>= nType ) return sal_True; @@ -896,23 +896,23 @@ void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, co sal_Int32 nLength = rUserData.getLength(); while( nLength-- ) { - if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) ) + if ( p->Name == "node-type" ) { pAny[ DFF_ANIM_NODE_TYPE ] = &(p->Value); } - else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) ) + else if ( p->Name == "preset-class" ) { pAny[ DFF_ANIM_PRESET_CLASS ] = &(p->Value); } - else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) ) + else if ( p->Name == "preset-id" ) { pAny[ DFF_ANIM_PRESET_ID ] = &(p->Value); } - else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-sub-type" ) ) ) + else if ( p->Name == "preset-sub-type" ) { pAny[ DFF_ANIM_PRESET_SUB_TYPE ] = &(p->Value); } - else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) ) + else if ( p->Name == "master-element" ) { pAny[ DFF_ANIM_AFTEREFFECT ] = &(p->Value);; } @@ -1467,7 +1467,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) ); } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillStyle" ) ) ) + else if ( rAttributeName == "FillStyle" ) { ::com::sun::star::drawing::FillStyle eFillStyle; if ( rSourceValue >>= eFillStyle ) @@ -1478,7 +1478,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "solid" ) ); } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LineStyle" ) ) ) + else if ( rAttributeName == "LineStyle" ) { ::com::sun::star::drawing::LineStyle eLineStyle; if ( rSourceValue >>= eLineStyle ) @@ -1489,7 +1489,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharWeight" ) ) ) + else if ( rAttributeName == "CharWeight" ) { float fFontWeight = 0.0; if ( rSourceValue >>= fFontWeight ) @@ -1500,7 +1500,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharUnderline" ) ) ) + else if ( rAttributeName == "CharUnderline" ) { sal_Int16 nFontUnderline = 0; if ( rSourceValue >>= nFontUnderline ) @@ -1511,7 +1511,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharPosture" ) ) ) + else if ( rAttributeName == "CharPosture" ) { ::com::sun::star::awt::FontSlant eFontSlant; if ( rSourceValue >>= eFontSlant ) @@ -1522,7 +1522,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); // ? } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Visibility" ) ) ) + else if ( rAttributeName == "Visibility" ) { sal_Bool bVisible = sal_True; if ( rSourceValue >>= bVisible ) diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 11679669c7fe..8118a70ff662 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -247,43 +247,43 @@ ShapeExport& PowerPointShapeExport::WriteTextShape( Reference< XShape > xShape ) DBG(printf( "shape(text): %s\n", USS(sShapeType) )); - if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TextShape" ) ) ) + if ( sShapeType == "com.sun.star.drawing.TextShape" ) { ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.DateTimeShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.DateTimeShape" ) { if( !WritePlaceholder( xShape, DateAndTime, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.FooterShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.FooterShape" ) { if( !WritePlaceholder( xShape, Footer, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.HeaderShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.HeaderShape" ) { if( !WritePlaceholder( xShape, Header, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.NotesShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.NotesShape" ) { if( mePageType == NOTICE && mrExport.GetPresObj() ) WritePlaceholderShape( xShape, Notes ); else ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.OutlinerShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.OutlinerShape" ) { if( !WritePlaceholder( xShape, Outliner, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.SlideNumberShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.SlideNumberShape" ) { if( !WritePlaceholder( xShape, SlideNumber, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.TitleTextShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.TitleTextShape" ) { if( !WritePlaceholder( xShape, Title, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); @@ -298,18 +298,18 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShap DBG(printf( "shape(unknown): %s\n", USS(sShapeType) )); - if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.GroupShape" ) ) ) + if ( sShapeType == "com.sun.star.drawing.GroupShape" ) { Reference< XIndexAccess > rXIndexAccess( xShape, UNO_QUERY ); mrExport.EnterGroup( rXIndexAccess ); DBG(printf( "enter group\n" )); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.PageShape" ) ) ) + else if ( sShapeType == "com.sun.star.drawing.PageShape" ) { WritePageShape( xShape, mePageType, mrExport.GetPresObj() ); } - else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.SubtitleShape" ) ) ) + else if ( sShapeType == "com.sun.star.presentation.SubtitleShape" ) { if( !WritePlaceholder( xShape, Subtitle, mbMaster ) ) ShapeExport::WriteTextShape( xShape ); diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index e53b0c2230a9..ad0d11a8b881 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -825,17 +825,17 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 if ( pValue ) { ::rtl::OUString aPropName( pPropValue[ i ].Name ); - if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NumberingType" ) ) ) + if ( aPropName == "NumberingType" ) nNumberingType = *( (sal_Int16*)pValue ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Adjust" ) ) ) + else if ( aPropName == "Adjust" ) nHorzAdjust = *( (sal_Int16*)pValue ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletChar" ) ) ) + else if ( aPropName == "BulletChar" ) { String aString( *( (String*)pValue ) ); if ( aString.Len() ) cBulletId = aString.GetChar( 0 ); } - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletFont" ) ) ) + else if ( aPropName == "BulletFont" ) { aFontDesc = *( (::com::sun::star::awt::FontDescriptor*)pValue ); @@ -843,13 +843,13 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 // instead of a Unicode encoding the encoding RTL_TEXTENCODING_SYMBOL was used. // Because there might exist a lot of damaged documemts I added this two lines // which fixes the bullet problem for the export. - if ( aFontDesc.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ) ) + if ( aFontDesc.Name == "StarSymbol" ) aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252; } - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicURL" ) ) ) + else if ( aPropName == "GraphicURL" ) aGraphicURL = ( *(::rtl::OUString*)pValue ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicSize" ) ) ) + else if ( aPropName == "GraphicSize" ) { if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (::com::sun::star::awt::Size*)0) ) { @@ -860,28 +860,28 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 aBuGraSize.nB = aSize.Height; } } - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartWith" ) ) ) + else if ( aPropName == "StartWith" ) nStartWith = *( (sal_Int16*)pValue ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ) ) ) + else if ( aPropName == "LeftMargin" ) nTextOfs = nTextOfs + static_cast< sal_Int16 >( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstLineOffset" ) ) ) + else if ( aPropName == "FirstLineOffset" ) nBulletOfs += (sal_Int16)( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletColor" ) ) ) + else if ( aPropName == "BulletColor" ) { sal_uInt32 nSOColor = *( (sal_uInt32*)pValue ); nBulletColor = nSOColor & 0xff00ff00; // green and hibyte nBulletColor |= (sal_uInt8)( nSOColor ) << 16; // red nBulletColor |= (sal_uInt8)( nSOColor >> 16 ) | 0xfe000000; // blue } - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletRelSize" ) ) ) + else if ( aPropName == "BulletRelSize" ) { nBulletRealSize = *( (sal_Int16*)pValue ); nParaFlags |= 0x40; nBulletFlags |= 8; } - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Prefix" ) ) ) + else if ( aPropName == "Prefix" ) sPrefix = ( *(::rtl::OUString*)pValue ); - else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Suffix" ) ) ) + else if ( aPropName == "Suffix" ) sSuffix = ( *(::rtl::OUString*)pValue ); #ifdef DBG_UTIL else if ( ! ( diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 2d55e3e061a1..52f6c126b86c 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -196,7 +196,7 @@ Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues() sal_Int32 i, nCount; for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) ) + if ( maMediaDescriptor[ i ].Name == "FilterData" ) break; } if ( i == nCount ) @@ -218,7 +218,7 @@ void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & a sal_Int32 i, nCount; for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) ) + if ( maMediaDescriptor[ i ].Name == "FilterData" ) { maMediaDescriptor[ i ].Value >>= maFilterDataSequence; break; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index f2d46ba9f9d3..4d6d3720e29f 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -462,24 +462,24 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams OUString aStr; while( nArgs-- ) { - if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PublishMode" ) ) ) + if ( pParams->Name == "PublishMode" ) { sal_Int32 temp = 0; pParams->Value >>= temp; meMode = (HtmlPublishMode)temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IndexURL" ) ) ) + else if ( pParams->Name == "IndexURL" ) { pParams->Value >>= aStr; maIndexUrl = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Format" ) ) ) + else if ( pParams->Name == "Format" ) { sal_Int32 temp = 0; pParams->Value >>= temp; meFormat = (PublishingFormat)temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Compression" ) ) ) + else if ( pParams->Name == "Compression" ) { pParams->Value >>= aStr; String aTmp( aStr ); @@ -491,19 +491,19 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams mnCompression = (sal_Int16)aTmp.ToInt32(); } } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) ) + else if ( pParams->Name == "Width" ) { sal_Int32 temp = 0; pParams->Value >>= temp; mnWidthPixel = (sal_uInt16)temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseButtonSet" ) ) ) + else if ( pParams->Name == "UseButtonSet" ) { sal_Int32 temp = 0; pParams->Value >>= temp; mnButtonThema = (sal_Int16)temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsExportNotes" ) ) ) + else if ( pParams->Name == "IsExportNotes" ) { if( mbImpress ) { @@ -512,118 +512,118 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams mbNotes = temp; } } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsExportContentsPage" ) ) ) + else if ( pParams->Name == "IsExportContentsPage" ) { sal_Bool temp = sal_False; pParams->Value >>= temp; mbContentsPage = temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Author" ) ) ) + else if ( pParams->Name == "Author" ) { pParams->Value >>= aStr; maAuthor = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EMail" ) ) ) + else if ( pParams->Name == "EMail" ) { pParams->Value >>= aStr; maEMail = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HomepageURL" ) ) ) + else if ( pParams->Name == "HomepageURL" ) { pParams->Value >>= aStr; maHomePage = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserText" ) ) ) + else if ( pParams->Name == "UserText" ) { pParams->Value >>= aStr; maInfo = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EnableDownload" ) ) ) + else if ( pParams->Name == "EnableDownload" ) { sal_Bool temp = sal_False; pParams->Value >>= temp; mbDownload = temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SlideSound" ) ) ) + else if ( pParams->Name == "SlideSound" ) { sal_Bool temp = sal_True; pParams->Value >>= temp; mbSlideSound = temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HiddenSlides" ) ) ) + else if ( pParams->Name == "HiddenSlides" ) { sal_Bool temp = sal_True; pParams->Value >>= temp; mbHiddenSlides = temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BackColor" ) ) ) + else if ( pParams->Name == "BackColor" ) { sal_Int32 temp = 0; pParams->Value >>= temp; maBackColor = temp; mbUserAttr = true; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TextColor" ) ) ) + else if ( pParams->Name == "TextColor" ) { sal_Int32 temp = 0; pParams->Value >>= temp; maTextColor = temp; mbUserAttr = true; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LinkColor" ) ) ) + else if ( pParams->Name == "LinkColor" ) { sal_Int32 temp = 0; pParams->Value >>= temp; maLinkColor = temp; mbUserAttr = true; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VLinkColor" ) ) ) + else if ( pParams->Name == "VLinkColor" ) { sal_Int32 temp = 0; pParams->Value >>= temp; maVLinkColor = temp; mbUserAttr = true; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ALinkColor" ) ) ) + else if ( pParams->Name == "ALinkColor" ) { sal_Int32 temp = 0; pParams->Value >>= temp; maALinkColor = temp; mbUserAttr = true; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsUseDocumentColors" ) ) ) + else if ( pParams->Name == "IsUseDocumentColors" ) { sal_Bool temp = sal_False; pParams->Value >>= temp; mbDocColors = temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "KioskSlideDuration" ) ) ) + else if ( pParams->Name == "KioskSlideDuration" ) { sal_Int32 temp = sal_False; pParams->Value >>= temp; mnSlideDuration = temp; mbAutoSlide = true; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "KioskEndless" ) ) ) + else if ( pParams->Name == "KioskEndless" ) { sal_Bool temp = sal_False; pParams->Value >>= temp; mbEndless = temp; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WebCastCGIURL" ) ) ) + else if ( pParams->Name == "WebCastCGIURL" ) { pParams->Value >>= aStr; maCGIPath = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WebCastTargetURL" ) ) ) + else if ( pParams->Name == "WebCastTargetURL" ) { pParams->Value >>= aStr; maURLPath = aStr; } - else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WebCastScriptLanguage" ) ) ) + else if ( pParams->Name == "WebCastScriptLanguage" ) { pParams->Value >>= aStr; - if( aStr.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "asp" ) ) ) + if ( aStr == "asp" ) { meScript = SCRIPT_ASP; } diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3af544eb88ff..e5e1f1d57ead 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -616,7 +616,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe sal_Int32 nLength = aUserData.getLength(); while( nLength-- ) { - if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) ) + if ( p->Name == "node-type" ) { sal_Int16 nNodeType = 0; p->Value >>= nNodeType; @@ -2222,7 +2222,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen { case 0: // event case 1: // call - if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "onstopaudio" ) ) ) + if ( aParam == "onstopaudio" ) { nCommand = EffectCommands::STOPAUDIO; } |