diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-10-31 17:38:14 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-31 17:38:14 +0000 |
commit | 3f8d06619facff9f9ed56437bda6f8e322a5e5c8 (patch) | |
tree | 264f4556f993d334039505ac958455422025b2c9 | |
parent | 4aa89918486cf51a9ec4e95980292f7b1debb8de (diff) |
Use RTL_CONSTASCII_USTRINGPARAM macro
-rw-r--r-- | sw/source/ui/docvw/AnnotationWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/misc/redlndlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/textfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/swdetect.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/uno/unomod.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/content.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/vba/vbalisthelper.cxx | 56 |
8 files changed, 47 insertions, 47 deletions
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index 9b8957a866..cec2216bd3 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -222,7 +222,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) // insert old, selected text or "..." // TOOD: iterate over all paragraphs, not only first one to find out if it is empty - if (pText->GetTextObject().GetText(0) != String(rtl::OUString::createFromAscii(""))) + if (pText->GetTextObject().GetText(0).Len()) GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject()); else GetOutlinerView()->InsertText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("...")),false); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index cfcccef71d..7ad1e8a40c 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1706,8 +1706,8 @@ void SwFldMgr::SetMacroPath(const String& rPath) Reference< uri::XUriReferenceFactory > xFactory( xSMgr->createInstance( - ::rtl::OUString::createFromAscii( - "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.uri.UriReferenceFactory" )) ), UNO_QUERY ); if ( xFactory.is() ) { @@ -1773,8 +1773,8 @@ Reference<XNumberingTypeInfo> SwFldMgr::GetNumberingInfo() const { Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); Reference < XInterface > xI = xMSF->createInstance( - ::rtl::OUString::createFromAscii( - "com.sun.star.text.DefaultNumberingProvider" )); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.text.DefaultNumberingProvider" ))); Reference<XDefaultNumberingProvider> xDefNum(xI, UNO_QUERY); OSL_ENSURE(xDefNum.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); ((SwFldMgr*)this)->xNumberingInfo = Reference<XNumberingTypeInfo>(xDefNum, UNO_QUERY); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index ad3988b628..3dcffbe90b 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1120,7 +1120,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) /* enable again once we have redline comments in the margin sComment = rRedline.GetComment(); - if ( sComment == String(::rtl::OUString::createFromAscii("")) ) + if ( !sComment.Len() ) GetActiveView()->GetDocShell()->Broadcast(SwRedlineHint(&rRedline,SWREDLINE_INSERTED)); const_cast<SwRedline&>(rRedline).Broadcast(SwRedlineHint(&rRedline,SWREDLINE_FOCUS)); */ diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 22d16b2d43..8de4dc91ed 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -401,7 +401,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if (pRedline) { sComment = pRedline->GetComment(); - if ( sComment == String(rtl::OUString::createFromAscii("")) ) + if ( !sComment.Len() ) GetView().GetDocShell()->Broadcast(SwRedlineHint(pRedline,SWREDLINE_INSERTED)); const_cast<SwRedline*>(pRedline)->Broadcast(SwRedlineHint(pRedline,SWREDLINE_FOCUS,&GetView())); } diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index befb88315e..ab62a5d422 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -466,16 +466,16 @@ UNOSEQUENCE< UNOOUSTRING > SwFilterDetect::impl_getStaticSupportedServiceNames() { UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 3 ); - seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.ExtendedTypeDetection" ); - seqServiceNames.getArray() [1] = UNOOUSTRING::createFromAscii( "com.sun.star.text.FormatDetector" ); - seqServiceNames.getArray() [2] = UNOOUSTRING::createFromAscii( "com.sun.star.text.W4WFormatDetector" ); + seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" )); + seqServiceNames.getArray() [1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.FormatDetector" )); + seqServiceNames.getArray() [2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.W4WFormatDetector" )); return seqServiceNames ; } /* Helper for XServiceInfo */ UNOOUSTRING SwFilterDetect::impl_getStaticImplementationName() { - return UNOOUSTRING::createFromAscii( "com.sun.star.comp.writer.FormatDetector" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.writer.FormatDetector" )); } /* Helper for registry */ diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index c99beb5cf5..70f8b9978f 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -741,8 +741,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c break; default: throw IllegalArgumentException( - ::rtl::OUString::createFromAscii( - "SwXViewSettings: invalid zoom type"), 0, 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "SwXViewSettings: invalid zoom type")), 0, 0); break; } if(eZoom < USHRT_MAX) diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index b7bd2093c3..0099a982c2 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -428,7 +428,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) else // redcomment { SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster()); - if ( pRedline->GetComment() != String(::rtl::OUString::createFromAscii("")) ) + if ( pRedline->GetComment().Len() ) { String sEntry = pRedline->GetComment(); RemoveNewline(sEntry); @@ -780,7 +780,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) else // redcomment { SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster()); - if ( pRedline->GetComment() != String(::rtl::OUString::createFromAscii("")) ) + if ( pRedline->GetComment().Len() ) { String sEntry = pRedline->GetComment(); RemoveNewline(sEntry); @@ -1173,11 +1173,11 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) pSubPop4->InsertItem(601, sPostItHide ); pSubPop4->InsertItem(602, sPostItDelete ); /* - pSubPop4->InsertItem(603,rtl::OUString::createFromAscii("Sort")); + pSubPop4->InsertItem(603,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sort"))); PopupMenu* pMenuSort = new PopupMenu; - pMenuSort->InsertItem(604,rtl::OUString::createFromAscii("By Position")); - pMenuSort->InsertItem(605,rtl::OUString::createFromAscii("By Author")); - pMenuSort->InsertItem(606,rtl::OUString::createFromAscii("By Date")); + pMenuSort->InsertItem(604,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("By Position"))); + pMenuSort->InsertItem(605,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("By Author"))); + pMenuSort->InsertItem(606,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("By Date"))); pSubPop4->SetPopupMenu(603, pMenuSort); */ pPop->InsertItem(4, pType->GetSingleName()); diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index 68c4bf2a6e..ef35be9883 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -82,17 +82,17 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) { case word::WdListGalleryType::wdBulletGallery: { - msStyleName = rtl::OUString::createFromAscii( WORD_BULLET_GALLERY ); + msStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WORD_BULLET_GALLERY )); break; } case word::WdListGalleryType::wdNumberGallery: { - msStyleName = rtl::OUString::createFromAscii( WORD_NUMBER_GALLERY ); + msStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WORD_NUMBER_GALLERY )); break; } case word::WdListGalleryType::wdOutlineNumberGallery: { - msStyleName = rtl::OUString::createFromAscii( WORD_OUTLINE_NUMBER_GALLERY ); + msStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WORD_OUTLINE_NUMBER_GALLERY )); break; } default: @@ -160,9 +160,9 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; rtl::OUString sCharStyleName( RTL_CONSTASCII_USTRINGPARAM("Bullet Symbols") ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_CHAR_STYLE_NAME )), uno::makeAny( sCharStyleName ) ); sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); rtl::OUString aBulletChar; switch( mnTemplateType ) @@ -208,7 +208,7 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_BULLET_CHAR )), uno::makeAny( aBulletChar ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -272,8 +272,8 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_SUFFIX )), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -399,9 +399,9 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PREFIX )), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_SUFFIX )), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -416,12 +416,12 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_SUFFIX )), uno::makeAny( sSuffix ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PARENT_NUMBERING )), uno::makeAny( nParentNumbering ) ); } mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -437,8 +437,8 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_CHAR_STYLE_NAME )), uno::makeAny( sCharStyleName ) ); switch( nLevel ) { case 0: @@ -475,7 +475,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_BULLET_CHAR )), uno::makeAny( aBulletChar ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -505,7 +505,7 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce sPrefix = rtl::OUString(); sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); sal_Int16 nParentNumbering = 0; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PARENT_NUMBERING )), uno::makeAny( nParentNumbering ) ); break; } case 2: @@ -562,9 +562,9 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PREFIX )), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_SUFFIX )), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -578,11 +578,11 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PARENT_NUMBERING )), uno::makeAny( nParentNumbering ) ); } mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -668,9 +668,9 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PREFIX )), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_SUFFIX )), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -684,8 +684,8 @@ void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeExce for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_NUMBERING_TYPE )), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_PREFIX )), uno::makeAny( sPrefix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } |