diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 14:28:18 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 14:30:05 +0200 |
commit | 8a01ee624318ac08800af89d988971114637a04e (patch) | |
tree | e4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /filter | |
parent | Do not extern these const char[]'s. (diff) | |
download | core-8a01ee624318ac08800af89d988971114637a04e.tar.gz core-8a01ee624318ac08800af89d988971114637a04e.zip |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/filtertracer/filtertracer.cxx | 14 | ||||
-rw-r--r-- | filter/source/flash/swfdialog.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 30 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.cxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 108 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.cxx | 6 | ||||
-rw-r--r-- | filter/source/placeware/filter.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgimport.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 34 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 12 |
13 files changed, 114 insertions, 114 deletions
diff --git a/filter/source/filtertracer/filtertracer.cxx b/filter/source/filtertracer/filtertracer.cxx index cfe6d5dfb5ee..72781252dc6e 100644 --- a/filter/source/filtertracer/filtertracer.cxx +++ b/filter/source/filtertracer/filtertracer.cxx @@ -116,19 +116,19 @@ void SAL_CALL FilterTracer::initialize( const SEQ( NMSP_UNO::Any )& aArguments ) for ( i = 0; i < aParameter.getLength(); i++ ) { const NMSP_BEANS::PropertyValue& rProp = aParameter[ i ]; - if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LogLevel" ) ) ) + if ( rProp.Name == "LogLevel" ) rProp.Value >>= mnLogLevel; - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClassFilter" ) ) ) + else if ( rProp.Name == "ClassFilter" ) rProp.Value >>= msClassFilter; - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MethodFilter" ) ) ) + else if ( rProp.Name == "MethodFilter" ) rProp.Value >>= msMethodFilter; - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MessageFilter" ) ) ) + else if ( rProp.Name == "MessageFilter" ) rProp.Value >>= msMessageFilter; - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) ) + else if ( rProp.Name == "OutputStream" ) rProp.Value >>= mxOutputStream; - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) ) + else if ( rProp.Name == "URL" ) rProp.Value >>= msURL; - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentHandler" ) ) ) + else if ( rProp.Name == "DocumentHandler" ) rProp.Value >>= mxDocumentHandler; } diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 996befa0dd29..be19e1b39f02 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -241,7 +241,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues() for( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) { - if( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) ) + if ( maMediaDescriptor[ i ].Name == "FilterData" ) break; } @@ -263,7 +263,7 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr for( sal_Int32 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 >>= maFilterData; break; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 94cf7dfa8cc1..56a7c2659d71 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -753,33 +753,33 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, /* todo: calculate the best option for ArrowLenght and ArrowWidth */ - if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Arrow concave" ) ) ) + if ( aApiName == "Arrow concave" ) reLineEnd = ESCHER_LineArrowStealthEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Square 45" ) ) ) + else if ( aApiName == "Square 45" ) reLineEnd = ESCHER_LineArrowDiamondEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Small Arrow" ) ) ) + else if ( aApiName == "Small Arrow" ) reLineEnd = ESCHER_LineArrowEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Dimension Lines" ) ) ) + else if ( aApiName == "Dimension Lines" ) { rnArrowLength = 0; rnArrowWidth = 2; reLineEnd = ESCHER_LineArrowOvalEnd; } - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Double Arrow" ) ) ) + else if ( aApiName == "Double Arrow" ) reLineEnd = ESCHER_LineArrowEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rounded short Arrow" ) ) ) + else if ( aApiName == "Rounded short Arrow" ) reLineEnd = ESCHER_LineArrowEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Symmetric Arrow" ) ) ) + else if ( aApiName == "Symmetric Arrow" ) reLineEnd = ESCHER_LineArrowEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Line Arrow" ) ) ) + else if ( aApiName == "Line Arrow" ) reLineEnd = ESCHER_LineArrowOpenEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rounded large Arrow" ) ) ) + else if ( aApiName == "Rounded large Arrow" ) reLineEnd = ESCHER_LineArrowEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Circle" ) ) ) + else if ( aApiName == "Circle" ) reLineEnd = ESCHER_LineArrowOvalEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Square" ) ) ) + else if ( aApiName == "Square" ) reLineEnd = ESCHER_LineArrowDiamondEnd; - else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Arrow" ) ) ) + else if ( aApiName == "Arrow" ) reLineEnd = ESCHER_LineArrowEnd; } else if ( comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 ) @@ -3258,18 +3258,18 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi for ( i = 0; i < nCount; i++ ) { const beans::PropertyValue& rProp = aGeoPropSeq[ i ]; - if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) ) + if ( rProp.Name == "Type" ) { if ( rProp.Value >>= rShapeType ) eShapeType = EnhancedCustomShapeTypeNames::Get( rShapeType ); } - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MirroredX" ) ) ) + else if ( rProp.Name == "MirroredX" ) { sal_Bool bMirroredX = sal_Bool(); if ( ( rProp.Value >>= bMirroredX ) && bMirroredX ) nMirrorFlags |= SHAPEFLAG_FLIPH; } - else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MirroredY" ) ) ) + else if ( rProp.Name == "MirroredY" ) { sal_Bool bMirroredY = sal_Bool(); if ( ( rProp.Value >>= bMirroredY ) && bMirroredY ) diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index a5172936afae..3bf1c3d9c3d8 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -182,7 +182,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() for( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) { - if( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) ) + if ( maMediaDescriptor[ i ].Name == "FilterData" ) break; } @@ -204,7 +204,7 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr for( sal_Int32 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 >>= maFilterData; break; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index b927ae6382b5..b6f628e2e46e 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -184,11 +184,11 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, for( sal_Int32 nData = 0, nDataCount = rRenderOptions.getLength(); nData < nDataCount; ++nData ) { - if( rRenderOptions[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFirstPage" ) ) ) + if ( rRenderOptions[ nData ].Name == "IsFirstPage" ) pFirstPage = &rRenderOptions[ nData ].Value; - else if( rRenderOptions[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsLastPage" ) ) ) + else if ( rRenderOptions[ nData ].Name == "IsLastPage" ) pLastPage = &rRenderOptions[ nData ].Value; - else if( rRenderOptions[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotesPages" ) ) ) + else if ( rRenderOptions[ nData ].Name == "ExportNotesPages" ) rRenderOptions[ nData ].Value >>= bExportNotesPages; } @@ -211,7 +211,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, for( sal_Int32 nProperty = 0, nPropertyCount = aRenderer.getLength(); nProperty < nPropertyCount; ++nProperty ) { - if( aRenderer[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) ) + if ( aRenderer[ nProperty ].Name == "PageSize" ) aRenderer[ nProperty].Value >>= aPageSize; } @@ -361,7 +361,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >& Sequence< beans::PropertyValue > aFilterData; xFilterFactory->getByName( aFilterName ) >>= aFilterData; for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ ) - if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) ) + if ( aFilterData[nInd].Name == "Type" ) aFilterData[nInd].Value >>= aTypeName; if ( !aTypeName.isEmpty() ) @@ -374,7 +374,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >& Sequence< beans::PropertyValue > aTypeData; xTypeDetection->getByName( aTypeName ) >>= aTypeData; for ( sal_Int32 nInd = 0; nInd < aTypeData.getLength(); nInd++ ) - if ( aTypeData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + if ( aTypeData[nInd].Name == "MediaType" ) aTypeData[nInd].Value >>= aDocMimetype; } } @@ -453,107 +453,107 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue for( sal_Int32 nData = 0, nDataCount = rFilterData.getLength(); nData < nDataCount; ++nData ) { - if( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageRange" ) ) ) + if ( rFilterData[ nData ].Name == "PageRange" ) rFilterData[ nData ].Value >>= aPageRange; - else if( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Selection" ) ) ) + else if ( rFilterData[ nData ].Name == "Selection" ) rFilterData[ nData ].Value >>= aSelection; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseLosslessCompression" ) ) ) + else if ( rFilterData[ nData ].Name == "UseLosslessCompression" ) rFilterData[ nData ].Value >>= mbUseLosslessCompression; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Quality" ) ) ) + else if ( rFilterData[ nData ].Name == "Quality" ) rFilterData[ nData ].Value >>= mnQuality; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReduceImageResolution" ) ) ) + else if ( rFilterData[ nData ].Name == "ReduceImageResolution" ) rFilterData[ nData ].Value >>= mbReduceImageResolution; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsSkipEmptyPages" ) ) ) + else if ( rFilterData[ nData ].Name == "IsSkipEmptyPages" ) rFilterData[ nData ].Value >>= mbSkipEmptyPages; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MaxImageResolution" ) ) ) + else if ( rFilterData[ nData ].Name == "MaxImageResolution" ) rFilterData[ nData ].Value >>= mnMaxImageResolution; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseTaggedPDF" ) ) ) + else if ( rFilterData[ nData ].Name == "UseTaggedPDF" ) rFilterData[ nData ].Value >>= mbUseTaggedPDF; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SelectPdfVersion" ) ) ) + else if ( rFilterData[ nData ].Name == "SelectPdfVersion" ) rFilterData[ nData ].Value >>= mnPDFTypeSelection; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotes" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportNotes" ) rFilterData[ nData ].Value >>= mbExportNotes; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotesPages" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportNotesPages" ) rFilterData[ nData ].Value >>= mbExportNotesPages; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbedStandardFonts" ) ) ) + else if ( rFilterData[ nData ].Name == "EmbedStandardFonts" ) rFilterData[ nData ].Value >>= mbEmbedStandardFonts; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseTransitionEffects" ) ) ) + else if ( rFilterData[ nData ].Name == "UseTransitionEffects" ) rFilterData[ nData ].Value >>= mbUseTransitionEffects; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportFormFields" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportFormFields" ) rFilterData[ nData ].Value >>= mbExportFormFields; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FormsType" ) ) ) + else if ( rFilterData[ nData ].Name == "FormsType" ) rFilterData[ nData ].Value >>= mnFormsFormat; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AllowDuplicateFieldNames" ) ) ) + else if ( rFilterData[ nData ].Name == "AllowDuplicateFieldNames" ) rFilterData[ nData ].Value >>= mbAllowDuplicateFieldNames; //viewer properties - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HideViewerToolbar" ) ) ) + else if ( rFilterData[ nData ].Name == "HideViewerToolbar" ) rFilterData[ nData ].Value >>= mbHideViewerToolbar; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HideViewerMenubar" ) ) ) + else if ( rFilterData[ nData ].Name == "HideViewerMenubar" ) rFilterData[ nData ].Value >>= mbHideViewerMenubar; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HideViewerWindowControls" ) ) ) + else if ( rFilterData[ nData ].Name == "HideViewerWindowControls" ) rFilterData[ nData ].Value >>= mbHideViewerWindowControls; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResizeWindowToInitialPage" ) ) ) + else if ( rFilterData[ nData ].Name == "ResizeWindowToInitialPage" ) rFilterData[ nData ].Value >>= mbFitWindow; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CenterWindow" ) ) ) + else if ( rFilterData[ nData ].Name == "CenterWindow" ) rFilterData[ nData ].Value >>= mbCenterWindow; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenInFullScreenMode" ) ) ) + else if ( rFilterData[ nData ].Name == "OpenInFullScreenMode" ) rFilterData[ nData ].Value >>= mbOpenInFullScreenMode; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DisplayPDFDocumentTitle" ) ) ) + else if ( rFilterData[ nData ].Name == "DisplayPDFDocumentTitle" ) rFilterData[ nData ].Value >>= mbDisplayPDFDocumentTitle; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InitialView" ) ) ) + else if ( rFilterData[ nData ].Name == "InitialView" ) rFilterData[ nData ].Value >>= mnPDFDocumentMode; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Magnification" ) ) ) + else if ( rFilterData[ nData ].Name == "Magnification" ) rFilterData[ nData ].Value >>= mnPDFDocumentAction; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Zoom" ) ) ) + else if ( rFilterData[ nData ].Name == "Zoom" ) rFilterData[ nData ].Value >>= mnZoom; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InitialPage" ) ) ) + else if ( rFilterData[ nData ].Name == "InitialPage" ) rFilterData[ nData ].Value >>= mnInitialPage; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageLayout" ) ) ) + else if ( rFilterData[ nData ].Name == "PageLayout" ) rFilterData[ nData ].Value >>= mnPDFPageLayout; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstPageOnLeft" ) ) ) + else if ( rFilterData[ nData ].Name == "FirstPageOnLeft" ) rFilterData[ nData ].Value >>= aContext.FirstPageLeft; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsAddStream" ) ) ) + else if ( rFilterData[ nData ].Name == "IsAddStream" ) rFilterData[ nData ].Value >>= mbAddStream; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Watermark" ) ) ) + else if ( rFilterData[ nData ].Name == "Watermark" ) { maWatermark = rFilterData[ nData ].Value; mbWatermark = sal_True; } //now all the security related properties... - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EncryptFile" ) ) ) + else if ( rFilterData[ nData ].Name == "EncryptFile" ) rFilterData[ nData ].Value >>= mbEncrypt; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentOpenPassword" ) ) ) + else if ( rFilterData[ nData ].Name == "DocumentOpenPassword" ) rFilterData[ nData ].Value >>= aOpenPassword; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RestrictPermissions" ) ) ) + else if ( rFilterData[ nData ].Name == "RestrictPermissions" ) rFilterData[ nData ].Value >>= mbRestrictPermissions; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PermissionPassword" ) ) ) + else if ( rFilterData[ nData ].Name == "PermissionPassword" ) rFilterData[ nData ].Value >>= aPermissionPassword; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreparedPasswords" ) ) ) + else if ( rFilterData[ nData ].Name == "PreparedPasswords" ) rFilterData[ nData ].Value >>= xEnc; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreparedPermissionPassword" ) ) ) + else if ( rFilterData[ nData ].Name == "PreparedPermissionPassword" ) rFilterData[ nData ].Value >>= aPreparedPermissionPassword; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Printing" ) ) ) + else if ( rFilterData[ nData ].Name == "Printing" ) rFilterData[ nData ].Value >>= mnPrintAllowed; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Changes" ) ) ) + else if ( rFilterData[ nData ].Name == "Changes" ) rFilterData[ nData ].Value >>= mnChangesAllowed; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EnableCopyingOfContent" ) ) ) + else if ( rFilterData[ nData ].Name == "EnableCopyingOfContent" ) rFilterData[ nData ].Value >>= mbCanCopyOrExtract; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EnableTextAccessForAccessibilityTools" ) ) ) + else if ( rFilterData[ nData ].Name == "EnableTextAccessForAccessibilityTools" ) rFilterData[ nData ].Value >>= mbCanExtractForAccessibility; //--->i56629 links extra (relative links and other related stuff) - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportLinksRelativeFsys" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportLinksRelativeFsys" ) rFilterData[ nData ].Value >>= mbExportRelativeFsysLinks; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PDFViewSelection" ) ) ) + else if ( rFilterData[ nData ].Name == "PDFViewSelection" ) rFilterData[ nData ].Value >>= mnDefaultLinkAction; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConvertOOoTargetToPDFTarget" ) ) ) + else if ( rFilterData[ nData ].Name == "ConvertOOoTargetToPDFTarget" ) rFilterData[ nData ].Value >>= mbConvertOOoTargetToPDFTarget; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportBookmarksToPDFDestination" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportBookmarksToPDFDestination" ) rFilterData[ nData ].Value >>= mbExportBmkToDest; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportBookmarks" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportBookmarks" ) rFilterData[ nData ].Value >>= mbExportBookmarks; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportHiddenSlides" ) ) ) + else if ( rFilterData[ nData ].Name == "ExportHiddenSlides" ) rFilterData[ nData ].Value >>= mbExportHiddenSlides; - else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenBookmarkLevels" ) ) ) + else if ( rFilterData[ nData ].Name == "OpenBookmarkLevels" ) rFilterData[ nData ].Value >>= mnOpenBookmarkLevels; } aContext.URL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index a42633c608c5..58b9afa66960 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -63,11 +63,11 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) for ( sal_Int32 i = 0 ; ( i < nLength ) && !xOStm.is(); ++i) { - if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) ) + if ( pValue[ i ].Name == "OutputStream" ) pValue[ i ].Value >>= xOStm; - else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) ) + else if ( pValue[ i ].Name == "FilterData" ) pValue[ i ].Value >>= aFilterData; - else if ( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) ) + else if ( pValue[ i ].Name == "StatusIndicator" ) pValue[ i ].Value >>= xStatusIndicator; else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) ) pValue[i].Value >>= xIH; diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index bba8fd690018..8e207dc6b2c1 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -109,7 +109,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se { pValue[i].Value >>= xInteractionHandler; } - else if ( pValue[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "StatusIndicator" ) ) ) + else if ( pValue[i].Name == "StatusIndicator" ) { pValue[i].Value >>= xStatusIndicator; } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index df104a4cfb17..f2e0fc7159a3 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -459,9 +459,9 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) for ( sal_Int32 i = 0 ; i < nLength; ++i) { - if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) ) + if ( pValue[ i ].Name == "OutputStream" ) pValue[ i ].Value >>= xOStm; - else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) ) + else if ( pValue[ i ].Name == "FileName" ) { ::rtl::OUString aFileName; diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index a77e9b3fbfb6..ed8e0883c3a8 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -170,7 +170,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto for ( sal_Int32 i = 0 ; i < nLength; ++i) { - if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PagePos" ) ) ) + if ( pValue[ i ].Name == "PagePos" ) { pValue[ i ].Value >>= nPageToExport; } @@ -273,7 +273,7 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip const sal_Int32 nAttribs = io_rDescriptor.getLength(); for( sal_Int32 i = 0; i < nAttribs; i++ ) { - if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) ) + if ( pAttribs[i].Name == "InputStream" ) pAttribs[i].Value >>= xInput; } diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index de2a762aad4e..a0582ce18cce 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -61,11 +61,11 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) const beans::PropertyValue* pAttribs = rDescriptor.getConstArray(); for ( sal_Int32 i=0 ; i<nLength; ++i, ++pAttribs ) { - if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) ) + if ( pAttribs->Name == "InputStream" ) { pAttribs->Value >>= xInputStream; } - else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) ) + else if ( pAttribs->Name == "StatusIndicator" ) pAttribs->Value >>= xStatus; } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 0bc05d6b7a2f..d17b0b8b6e4c 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -413,7 +413,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn for( nValue = 0; nValue < nValueCount; nValue++, pValues++ ) { - if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) ) + if ( pValues->Name == "UIName" ) { OUString aInterfaceName; pValues->Value >>= aInterfaceName; @@ -745,7 +745,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi for( nIndex = 0; nIndex < nCount; nIndex++ ) { OUString aName( aSequence[nIndex].Name ); - if( aSequence[nIndex].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Types" ) ) ) + if ( aSequence[nIndex].Name == "Types" ) { Sequence< OUString > aTypes; if( aSequence[nIndex].Value >>= aTypes ) @@ -859,7 +859,7 @@ void XMLFilterSettingsDialog::onDelete() for( nValue = 0; (nValue < nValueCount) && !bTypeStillUsed; nValue++, pValues++ ) { - if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) ) + if ( pValues->Name == "Type" ) { OUString aType; pValues->Value >>= aType; @@ -1113,39 +1113,39 @@ void XMLFilterSettingsDialog::initFilterList() for( nValue = 0; nValue < nValueCount; nValue++, pValues++ ) { - if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) ) + if ( pValues->Name == "Type" ) { pValues->Value >>= pTempFilter->maType; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) ) + else if ( pValues->Name == "UIName" ) { pValues->Value >>= pTempFilter->maInterfaceName; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) ) + else if ( pValues->Name == "DocumentService" ) { pValues->Value >>= pTempFilter->maDocumentService; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterService" ) ) ) + else if ( pValues->Name == "FilterService" ) { pValues->Value >>= aFilterService; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Flags" ) ) ) + else if ( pValues->Name == "Flags" ) { pValues->Value >>= pTempFilter->maFlags; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) ) + else if ( pValues->Name == "UserData" ) { pValues->Value >>= aUserData; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileFormatVersion" ) ) ) + else if ( pValues->Name == "FileFormatVersion" ) { pValues->Value >>= pTempFilter->maFileFormatVersion; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TemplateName" ) ) ) + else if ( pValues->Name == "TemplateName" ) { pValues->Value >>= pTempFilter->maImportTemplate; } - else if(pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Finalized" ) )) + else if ( pValues->Name == "Finalized" ) { pValues->Value >>= pTempFilter->mbReadonly; } @@ -1192,12 +1192,12 @@ void XMLFilterSettingsDialog::initFilterList() for( nValue2 = 0; nValue2 < nValueCount2; nValue2++, pValues2++ ) { /* - if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + if ( pValues2->Name == "MediaType" ) { pValues2->Value >>= pTempFilter->maDocType; } else */ - if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClipboardFormat" ) ) ) + if ( pValues2->Name == "ClipboardFormat" ) { OUString aDocType; pValues2->Value >>= aDocType; @@ -1207,7 +1207,7 @@ void XMLFilterSettingsDialog::initFilterList() pTempFilter->maDocType = aDocType; } - else if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Extensions" ) ) ) + else if ( pValues2->Name == "Extensions" ) { Sequence< OUString > aExtensions; if( pValues2->Value >>= aExtensions ) @@ -1225,11 +1225,11 @@ void XMLFilterSettingsDialog::initFilterList() } } } - else if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentIconID" ) ) ) + else if ( pValues2->Name == "DocumentIconID" ) { pValues2->Value >>= pTempFilter->mnDocumentIconID; } - else if(pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Finalized" ) )) + else if ( pValues2->Name == "Finalized" ) { // both the filter and the type may be finalized sal_Bool bTemp = sal_False; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index f45d8da4b7da..eb7d7508390d 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -199,7 +199,7 @@ bool XMLFilterTabDialog::onOk() for( nValue = 0; (nValue < nValueCount) && (nErrorId == 0); nValue++, pValues++ ) { - if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) ) + if ( pValues->Name == "UIName" ) { OUString aInterfaceName; pValues->Value >>= aInterfaceName; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 40606d776cd0..a42a21805ee2 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -122,7 +122,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString if( xInfo->supportsService( rServiceName ) ) { // special case for impress documents which supports same service as draw documents - if( rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) + if ( rServiceName == "com.sun.star.drawing.DrawingDocument" ) { // so if we want a draw we need to check if its not an impress if( !xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument") ) ) ) @@ -353,22 +353,22 @@ void XMLFilterTestDialog::onExportBrowse() for( sal_Int32 nValue = 0; (nValue < aValues.getLength()) && (nFound != 15); nValue++, pValues++ ) { - if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) ) + if ( pValues->Name == "Type" ) { pValues->Value >>= aType; nFound |= 1; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) ) + else if ( pValues->Name == "DocumentService" ) { pValues->Value >>= aService; nFound |= 2; } - else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Flags" ) ) ) + else if ( pValues->Name == "Flags" ) { pValues->Value >>= nFlags; nFound |= 4; } - if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) ) + if ( pValues->Name == "UIName" ) { pValues->Value >>= aInterfaceName; nFound |= 8; @@ -392,7 +392,7 @@ void XMLFilterTestDialog::onExportBrowse() OUString aExtension; for( nValue = 0; nValue < aValues2.getLength(); nValue++, pValues2++ ) { - if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Extensions" ) ) ) + if ( pValues2->Name == "Extensions" ) { Sequence< OUString > aExtensions; if( pValues2->Value >>= aExtensions ) |