diff options
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/cgm/sdcgmfilter.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 8 | ||||
| -rw-r--r-- | sd/source/filter/html/buttonset.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/ppt97animations.cxx | 208 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 6 |
13 files changed, 127 insertions, 127 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 0c51d6739187..5fd5caa6882a 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -314,7 +314,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In { // TODO/LATER: Optimize this, don't create a break iterator each time Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() ); - Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY ); + Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY ); DBG_ASSERT( xBI.is(), "sd::CustomAnimationEffect::getNumberOfSubitems(), could not create a 'com.sun.star.i18n.BreakIterator'!" ); if( xBI.is() ) diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 8644c9bf625e..9926b708f0a6 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -275,7 +275,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac // get parser Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( - OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY ); DBG_ASSERT( xParser.is(), "Can't create parser" ); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 2c5ba9cf5258..e425a35fb874 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -955,7 +955,7 @@ void SdStyleSheet::notifyModifyListener() OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException) { - return OUString::createFromAscii( "SdStyleSheet" ); + return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdStyleSheet" ) ); } // -------------------------------------------------------------------- diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index dc03cd6b3829..c6032a7bb16f 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -95,7 +95,7 @@ sal_Bool SdCGMFilter::Import() if( pLibrary && mxModel.is() ) { - ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); + ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ImportCGM" ) ) ) ); ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); UINT32 nRetValue; @@ -139,7 +139,7 @@ sal_Bool SdCGMFilter::Export() if( pLibrary && mxModel.is() ) { - ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ExportCGM" ) ) ); + ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExportCGM" ) ) ) ); if( FncCGMExport ) { diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 0bf0484205a5..5553775dccdf 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -318,12 +318,12 @@ FontCollection::FontCollection() : com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - xInterface = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ); + xInterface = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" ) ) ); if ( xInterface.is() ) xPPTBreakIter = com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > ( xInterface, com::sun::star::uno::UNO_QUERY ); - xInterface = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.ScriptTypeDetector" ) ); + xInterface = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.ScriptTypeDetector" ) ) ); if ( xInterface.is() ) xScriptTypeDetector = com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > ( xInterface, com::sun::star::uno::UNO_QUERY ); diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index a7f7dbbfecff..c097833ec9d1 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -1708,9 +1708,9 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X rtl::OUString aAttributeName( xAnimate->getAttributeName() ); if ( nForceAttributeNames ) { - switch( nForceAttributeNames ) + if( nForceAttributeNames == 1 ) { - case 1 : aAttributeName = rtl::OUString::createFromAscii( "r" ); break; + aAttributeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "r" )); } } sal_Int32 nIndex = 0; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 0a1d1d5f47cc..4ead1cca70f3 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -276,7 +276,7 @@ sal_Bool SdGRFFilter::Export() uno::Reference< lang::XMultiServiceFactory > xSMgr( ::comphelper::getProcessServiceFactory() ); uno::Reference< uno::XInterface > xComponent - ( xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicExportFilter" ) ), + ( xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) ) ), uno::UNO_QUERY ); if ( xComponent.is() ) { @@ -440,7 +440,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su switch( nGraphicType ) { case ::com::sun::star::graphic::GraphicType::VECTOR: - aMimeType = OUString::createFromAscii( "image/x-svm" ); + aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/x-svm" ) ); break; case ::com::sun::star::graphic::GraphicType::PIXEL: @@ -450,14 +450,14 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su if( bAnimated ) { - aMimeType = OUString::createFromAscii( "image/gif" ); + aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" ) ); break; } } // Fallthrough! // case ::com::sun::star::graphic::GraphicType::EMPTY: default: - aMimeType = OUString::createFromAscii( "image/png" ); + aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" ) ); break; } } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index cd47b0e21af7..b7c4577ac187 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -103,7 +103,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi if( xInputStream.is() && xGraphicProvider.is() ) try { Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "InputStream" ); + aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) ); aMediaProperties[0].Value <<= xInputStream; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index f22df66795dd..7e415b5a778a 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -220,10 +220,10 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) if( !bAnimate ) { //the appear effect cannot be animated without text - if( this->GetPresetId().equals( ::rtl::OUString::createFromAscii("ooo-entrance-appear") ) ) + if( this->GetPresetId().equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")) ) ) return; //the random effect may be the appear effect and than has the same problem - if( this->GetPresetId().equals( ::rtl::OUString::createFromAscii("ooo-entrance-random") ) ) + if( this->GetPresetId().equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random")) ) ) { //this case is not 100% correct -> feel free to complete //i consider this case as seldom and not that problematic and a simple correct fix is not in sight @@ -301,11 +301,11 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear"); // --- appear --- + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")); // --- appear --- break; case 0x01: //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random"); // --- random --- + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random")); // --- random --- break; case 0x02: // --- blinds effect --- { @@ -313,13 +313,13 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds"); - m_aSubType = ::rtl::OUString::createFromAscii("horizontal"); // horizontal + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds")); + m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal")); // horizontal break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRIPES; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds"); - m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // vertical + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds")); + m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); // vertical break; } } @@ -330,20 +330,20 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_CHECKERBOARD; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-checkerboard"); - m_aSubType = ::rtl::OUString::createFromAscii("across"); // vertical ??? + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard")); + m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across")); // vertical ??? break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_CHECKERBOARD; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-checkerboard"); - m_aSubType = ::rtl::OUString::createFromAscii("downward"); // horizontal ??? + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard")); + m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("downward")); // horizontal ??? break; } } break; case 0x05: //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-dissolve-in"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-dissolve-in")); break; case 0x08: // --- (hor/ver) lines --- { @@ -351,13 +351,13 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_LINES; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars"); - m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // horizontal ??? + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars")); + m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); // horizontal ??? break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars"); - m_aSubType = rtl::OUString::createFromAscii("horizontal"); // vertical ??? + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal")); // vertical ??? break; } } @@ -368,23 +368,23 @@ void Ppt97Animation::UpdateCacheData() const { case 0x4: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); - m_aSubType = rtl::OUString::createFromAscii("left-to-top"); // to left top + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-top")); // to left top break; case 0x5: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); - m_aSubType = rtl::OUString::createFromAscii("right-to-top"); // to right top + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-top")); // to right top break; case 0x6: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); - m_aSubType = rtl::OUString::createFromAscii("left-to-bottom"); // to left bottom + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-bottom")); // to left bottom break; case 0x7: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); - m_aSubType = rtl::OUString::createFromAscii("right-to-bottom"); // to right bottom + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-bottom")); // to right bottom break; } } @@ -395,23 +395,23 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); - m_aSubType = rtl::OUString::createFromAscii("from-right"); // from right + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); // from right break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom"); // from bottom + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); // from bottom break; case 0x2: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); // from left + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); // from left break; case 0x3: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_TOP; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); - m_aSubType = rtl::OUString::createFromAscii("from-top"); // from top + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); // from top break; } } @@ -422,13 +422,13 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-box"); - m_aSubType = rtl::OUString::createFromAscii("out"); // from center + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out")); // from center break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-box"); - m_aSubType = rtl::OUString::createFromAscii("in"); // to center + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in")); // to center break; } } @@ -439,160 +439,160 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-top"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); break; case 0x2: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-right"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); break; case 0x3: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); break; case 0x4: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERLEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-top-left"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-left")); break; case 0x5: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERRIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-top-right"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-right")); break; case 0x6: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERLEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom-left"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-left")); break; case 0x7: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERRIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom-right"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-right")); break; case 0x8: // -- short text effects -- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); break; case 0x9: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); break; case 0xa: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_RIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-right"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); break; case 0xb: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_TOP; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-top"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); break; case 0xc: // -- slow text effects -- { //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT; //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); } break; case 0xd: { //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP; //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow"); - m_aSubType = rtl::OUString::createFromAscii("from-top"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); } break; case 0xe: { //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT; //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow"); - m_aSubType = rtl::OUString::createFromAscii("from-right"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); } break; case 0xf: { //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM; //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); } break; case 0x10: // --- zoom --- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom"); - m_aSubType = rtl::OUString::createFromAscii("in"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in")); break; case 0x11: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom"); - m_aSubType = rtl::OUString::createFromAscii("in-slightly"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-slightly")); break; case 0x12: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom"); - m_aSubType = rtl::OUString::createFromAscii("out"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out")); break; case 0x13: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom"); - m_aSubType = rtl::OUString::createFromAscii("out-slightly"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-slightly")); break; case 0x14: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom"); - m_aSubType = rtl::OUString::createFromAscii("in-from-screen-center"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-from-screen-center")); break; case 0x15: //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom"); - m_aSubType = rtl::OUString::createFromAscii("out-from-screen-center"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-from-screen-center")); break; case 0x16: // --- stretch --- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRETCH; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy"); - m_aSubType = rtl::OUString::createFromAscii("across"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across")); break; case 0x17: //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_LEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); break; case 0x18: //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_TOP; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy"); - m_aSubType = rtl::OUString::createFromAscii("from-top"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); break; case 0x19: //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_RIGHT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy"); - m_aSubType = rtl::OUString::createFromAscii("from-right"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); break; case 0x1a: //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_BOTTOM; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy"); - m_aSubType = rtl::OUString::createFromAscii("from-bottom"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); break; case 0x1b: // --- rotate --- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_ROTATE; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-swivel"); - m_aSubType = rtl::OUString::createFromAscii("vertical"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-swivel")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); break; case 0x1c: // --- spirale --- //eRetval = ::com::sun::star::presentation::AnimationEffect_SPIRALOUT_LEFT; - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-spiral-in"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-spiral-in")); break; } } @@ -603,30 +603,30 @@ void Ppt97Animation::UpdateCacheData() const { case 0x0: //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); - m_aSubType = rtl::OUString::createFromAscii("horizontal-out"); //horizontal open + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-out")); //horizontal open break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_VERTICAL; // ??? - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); - m_aSubType = rtl::OUString::createFromAscii("horizontal-in"); //horizontal close + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-in")); //horizontal close break; case 0x2: //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_HORIZONTAL; // ??? - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); - m_aSubType = rtl::OUString::createFromAscii("vertical-out"); // vertical open + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-out")); // vertical open break; case 0x3: //eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_HORIZONTAL; // ??? - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); - m_aSubType = rtl::OUString::createFromAscii("vertical-in"); // vertical close + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split")); + m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-in")); // vertical close break; } } break; case 0x0e: // --- blink --- { - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-flash-once"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-flash-once")); switch ( m_aAtom.nFlyDirection ) { case 0x0: //fast @@ -646,7 +646,7 @@ void Ppt97Animation::UpdateCacheData() const break; default: { - m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear"); + m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")); DBG_ERROR("no effect mapped"); } break; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2e0159a1fa13..dc938d4ce1ce 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -389,7 +389,7 @@ sal_Bool ImplSdPPTImport::Import() Dictionary aDict; if ( pSection->GetDictionary( aDict ) ) { - UINT32 nPropId = aDict.GetProperty( rtl::OUString::createFromAscii("_PID_HLINKS" )); + UINT32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" ))); if ( nPropId ) { if ( pSection->GetProperty( nPropId, aPropItem ) ) @@ -773,7 +773,7 @@ sal_Bool ImplSdPPTImport::Import() if ( SeekToAktPage( &aPageHd ) ) { if ( mbTracing ) - mpTracer->AddAttribute( rtl::OUString::createFromAscii( "MasterPage" ), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) ); + mpTracer->AddAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) ); while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) ) { @@ -851,7 +851,7 @@ sal_Bool ImplSdPPTImport::Import() aHd.SeekToEndOfRecord( rStCtrl ); } if ( mbTracing ) - mpTracer->RemoveAttribute( rtl::OUString::createFromAscii( "MasterPage" ) ); + mpTracer->RemoveAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )) ); } rStCtrl.Seek( nFPosMerk ); ImportPageEffect( (SdPage*)pMPage, bNewAnimationsUsed ); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 21a776ef77c1..3023f8b07ba4 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -1446,7 +1446,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< { if( pChildAtom->hasChildAtom( DFF_msofbtAnimCommand ) ) { - const OUString aServiceName( OUString::createFromAscii("com.sun.star.animations.Command") ); + const OUString aServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.Command")) ); Reference< XAnimationNode > xChildNode( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY ); importAnimationNodeContainer( pChildAtom, xChildNode ); Reference< XTimeContainer > xParentContainer( xNode, UNO_QUERY ); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index a36441a0aee4..18c69e690439 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -144,7 +144,7 @@ sal_Bool SdPPTFilter::Export() if( mxModel.is() ) { SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE ); - ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") )); + ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportPPT")) )); /* !!! if ( pViewShell && pViewShell->GetView() ) @@ -190,7 +190,7 @@ void SdPPTFilter::PreSaveBasic() ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); if( pLibrary ) { - SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") )); + SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveVBA")) )); if( pSaveVBA ) { pSaveVBA( (SfxObjectShell&) mrDocShell, pBas ); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 91560d821582..25f59eed1d49 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -232,7 +232,7 @@ sal_Int32 ReadThroughComponent( // get parser Reference< xml::sax::XParser > xParser( rFactory->createInstance( - OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY ); DBG_ASSERT( xParser.is(), "Can't create parser" ); if( !xParser.is() ) @@ -518,7 +518,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) }; uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); - xInfoSet->setPropertyValue( OUString::createFromAscii( "Preview" ), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) ); + xInfoSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Preview" )), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) ); // ---- get BuildId from parent container if available @@ -622,7 +622,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) aName = pDocHierarchItem->GetValue(); } else - aName = ::rtl::OUString::createFromAscii( "dummyObjectName" ); + aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" )); if( aName.getLength() ) { |