diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-12 10:04:33 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-12 10:10:19 -0300 |
commit | 674ed53bc00fbbbfec5661cbafcaa79669927cb8 (patch) | |
tree | d5b20687ddbc8fa587665c49f3da680228e9ba25 | |
parent | 139b5e76721c685abdbb51a317c3804ffd9cafcb (diff) |
More RTL_CONSTASCII_USTRINGPARAM removals
module sd/../ui
6 files changed, 18 insertions, 30 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index fdd01a47552e..8c518576d224 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -488,10 +488,8 @@ void SAL_CALL Listener::propertyChange ( { ThrowIfDisposed(); - static const ::rtl::OUString sCurrentPagePropertyName ( - RTL_CONSTASCII_USTRINGPARAM("CurrentPage")); - static const ::rtl::OUString sEditModePropertyName ( - RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")); + static const ::rtl::OUString sCurrentPagePropertyName ("CurrentPage"); + static const ::rtl::OUString sEditModePropertyName ("IsMasterPageMode"); if (rEvent.PropertyName.equals(sCurrentPagePropertyName)) { @@ -501,8 +499,7 @@ void SAL_CALL Listener::propertyChange ( { try { - Any aPageNumber = xPageSet->getPropertyValue ( - String(RTL_CONSTASCII_USTRINGPARAM("Number"))); + Any aPageNumber = xPageSet->getPropertyValue ("Number"); sal_Int32 nCurrentPage = 0; aPageNumber >>= nCurrentPage; // The selection is already set but we call SelectPage() @@ -592,8 +589,7 @@ void Listener::UpdateEditMode (void) { try { - Any aValue (xSet->getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")))); + Any aValue (xSet->getPropertyValue( "IsMasterPageMode" )); aValue >>= bIsMasterPageMode; } catch (beans::UnknownPropertyException&) @@ -693,9 +689,7 @@ void Listener::ThrowIfDisposed (void) { if (rBHelper.bDisposed || rBHelper.bInDispose) { - throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "SlideSorterController object has already been disposed")), + throw lang::DisposedException ("SlideSorterController object has already been disposed", static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index fc5eec6eb80b..dcdad2b5d7b0 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -828,11 +828,11 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) SdPage* pFirstPage = NULL; sal_uInt16 nFirstPage; sal_uInt16 nSelectedPages = (sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); - String aPageStr; + rtl::OUString aPageStr; String aLayoutStr; if (nSelectedPages > 0) - aPageStr = String(SdResId(STR_SD_PAGE)); + aPageStr = rtl::OUString(ResId::toString(SdResId(STR_SD_PAGE))); if (nSelectedPages == 1) { @@ -846,11 +846,10 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) nFirstPage = pPage->GetPageNum()/2; pFirstPage = pPage; - aPageStr += sal_Unicode(' '); - aPageStr += String::CreateFromInt32( nFirstPage + 1 ); - aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " )); - aPageStr += String::CreateFromInt32( - mrSlideSorter.GetModel().GetPageCount()); + aPageStr += " "; + aPageStr += rtl::OUString::valueOf( nFirstPage + 1 ); + aPageStr += " / " ; + aPageStr += rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount()); aLayoutStr = pFirstPage->GetLayoutName(); aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) ); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index a82c289792b0..de0ddf51d57a 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -248,7 +248,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli { try { - const Any aNumber (xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number")))); + const Any aNumber (xSet->getPropertyValue("Number")); sal_Int16 nNumber (-1); aNumber >>= nNumber; nNumber -= 1; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 80952ad5b820..1f37dbf5c8c1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -79,7 +79,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( ::rtl::OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideSorter")); + return OUString("com.sun.star.comp.Draw.SlideSorter"); } @@ -88,8 +88,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( Sequence<rtl::OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideSorter"))); + static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideSorter"); return Sequence<rtl::OUString>(&sServiceName, 1); } @@ -174,8 +173,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) } else { - throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorterService: invalid number of arguments")), + throw RuntimeException("SlideSorterService: invalid number of arguments", static_cast<drawing::XDrawView*>(this)); } } @@ -632,9 +630,7 @@ void SlideSorterService::ThrowIfDisposed (void) { if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) { - throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "SlideSorterService object has already been disposed")), + throw lang::DisposedException ("SlideSorterService object has already been disposed", static_cast<drawing::XDrawView*>(this)); } } diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index fc4d05bbccc1..919f8122cc0a 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -1174,7 +1174,7 @@ void StartShowButton::ProcessClick (const model::SharedPageDescriptor& rpDescrip if (xPresentation.is()) { Sequence<PropertyValue> aProperties (1); - aProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPage")); + aProperties[0].Name = ::rtl::OUString("FirstPage"); const ::rtl::OUString sName (rpDescriptor->GetPage()->GetName()); aProperties[0].Value = Any(sName); diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 8ff3414ceb92..1e285469a81c 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -66,8 +66,7 @@ FontProvider& FontProvider::Instance (void) // We throw an exception when for some strange reason no instance of // this class exists. if (mpInstance == NULL) - throw ::com::sun::star::uno::RuntimeException(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues")), + throw ::com::sun::star::uno::RuntimeException("com.sun.star.document.IndexedPropertyValues", NULL); return *mpInstance; |