mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More RTL_CONSTASCII_USTRINGPARAM removals

Browse Source
This commit is contained in:
Olivier Hallot
2012-04-13 14:40:10 -03:00
parent 96f9300af6
commit 0b1a0cf3c8
6 changed files with 37 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sd/source/ui/presenter/PresenterCanvas.cxx
View File

@@ -63,7 +63,7 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException) ::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException)
{ {
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterCanvasFactory")); return OUString("com.sun.star.comp.Draw.PresenterCanvasFactory");
} }
@@ -72,8 +72,7 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
Sequence<rtl::OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void) Sequence<rtl::OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
throw (RuntimeException) throw (RuntimeException)
{ {
static const ::rtl::OUString sServiceName( static const ::rtl::OUString sServiceName("com.sun.star.rendering.Canvas");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.Canvas")));
return Sequence<rtl::OUString>(&sServiceName, 1); return Sequence<rtl::OUString>(&sServiceName, 1);
} }
@@ -231,24 +230,21 @@ void SAL_CALL PresenterCanvas::initialize (
if ( ! (rArguments[2] >>= mxSharedWindow)) if ( ! (rArguments[2] >>= mxSharedWindow))
{ {
throw lang::IllegalArgumentException( throw lang::IllegalArgumentException("PresenterCanvas: invalid shared window",
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared window")),
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
1); 1);
} }
if ( ! (rArguments[3] >>= mxSharedCanvas)) if ( ! (rArguments[3] >>= mxSharedCanvas))
{ {
throw lang::IllegalArgumentException( throw lang::IllegalArgumentException("PresenterCanvas: invalid shared canvas",
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared canvas")),
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
2); 2);
} }
if ( ! (rArguments[4] >>= mxWindow)) if ( ! (rArguments[4] >>= mxWindow))
{ {
throw lang::IllegalArgumentException( throw lang::IllegalArgumentException("PresenterCanvas: invalid window",
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid window")),
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
3); 3);
} }
@@ -268,8 +264,7 @@ void SAL_CALL PresenterCanvas::initialize (
} }
else else
{ {
throw RuntimeException( throw RuntimeException("PresenterCanvas: invalid number of arguments",
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid number of arguments")),
static_cast<XWeak*>(this)); static_cast<XWeak*>(this));
} }
} }
@@ -1060,9 +1055,7 @@ void PresenterCanvas::ThrowIfDisposed (void)
{ {
if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is()) if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is())
{ {
throw lang::DisposedException ( throw lang::DisposedException ("PresenterCanvas object has already been disposed",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterCanvas object has already been disposed")),
static_cast<uno::XWeak*>(this)); static_cast<uno::XWeak*>(this));
} }
} }
@@ -1215,9 +1208,7 @@ void PresenterCustomSprite::ThrowIfDisposed (void)
{ {
if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is()) if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is())
{ {
throw lang::DisposedException ( throw lang::DisposedException ("PresenterCustomSprite object has already been disposed",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterCustomSprite object has already been disposed")),
static_cast<uno::XWeak*>(this)); static_cast<uno::XWeak*>(this));
} }
} }

10
sd/source/ui/presenter/PresenterHelper.cxx
View File

@@ -60,7 +60,7 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
::rtl::OUString PresenterHelperService_getImplementationName (void) ::rtl::OUString PresenterHelperService_getImplementationName (void)
throw(RuntimeException) throw(RuntimeException)
{ {
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")); return OUString("com.sun.star.comp.Draw.PresenterHelper");
} }
@@ -69,8 +69,7 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
Sequence<rtl::OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void) Sequence<rtl::OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
throw (RuntimeException) throw (RuntimeException)
{ {
static const ::rtl::OUString sServiceName( static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterHelper");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterHelper")));
return Sequence<rtl::OUString>(&sServiceName, 1); return Sequence<rtl::OUString>(&sServiceName, 1);
} }
@@ -175,8 +174,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas (
|| ! rxSharedWindow.is() || ! rxSharedWindow.is()
|| ! rxWindow.is()) || ! rxWindow.is())
{ {
throw RuntimeException( throw RuntimeException("illegal argument",
OUString(RTL_CONSTASCII_USTRINGPARAM("illegal argument")),
Reference<XInterface>(static_cast<XWeak*>(this))); Reference<XInterface>(static_cast<XWeak*>(this)));
} }
@@ -222,7 +220,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
xFactory->createInstanceWithArguments( xFactory->createInstanceWithArguments(
!rsOptionalCanvasServiceName.isEmpty() !rsOptionalCanvasServiceName.isEmpty()
? rsOptionalCanvasServiceName ? rsOptionalCanvasServiceName
: OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")), : OUString("com.sun.star.rendering.VCLCanvas"),
aArg), aArg),
UNO_QUERY); UNO_QUERY);
} }

9
sd/source/ui/presenter/PresenterPreviewCache.cxx
View File

@@ -98,7 +98,7 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException) ::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException)
{ {
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPreviewCache")); return OUString("com.sun.star.comp.Draw.PresenterPreviewCache");
} }
@@ -107,8 +107,7 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
Sequence<rtl::OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void) Sequence<rtl::OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
throw (RuntimeException) throw (RuntimeException)
{ {
static const ::rtl::OUString sServiceName( static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")));
return Sequence<rtl::OUString>(&sServiceName, 1); return Sequence<rtl::OUString>(&sServiceName, 1);
} }
@@ -273,9 +272,7 @@ void PresenterPreviewCache::ThrowIfDisposed (void)
{ {
if (rBHelper.bDisposed || rBHelper.bInDispose) if (rBHelper.bDisposed || rBHelper.bInDispose)
{ {
throw lang::DisposedException ( throw lang::DisposedException ("PresenterPreviewCache object has already been disposed",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterPreviewCache object has already been disposed")),
static_cast<uno::XWeak*>(this)); static_cast<uno::XWeak*>(this));
} }
} }

30
sd/source/ui/presenter/PresenterTextView.cxx
View File

@@ -72,7 +72,7 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException) ::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException)
{ {
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterTextView")); return OUString("com.sun.star.comp.Draw.PresenterTextView");
} }
@@ -81,8 +81,7 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
Sequence<rtl::OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void) Sequence<rtl::OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
throw (RuntimeException) throw (RuntimeException)
{ {
static const ::rtl::OUString sServiceName( static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterTextView");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterTextView")));
return Sequence<rtl::OUString>(&sServiceName, 1); return Sequence<rtl::OUString>(&sServiceName, 1);
} }
@@ -191,8 +190,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
} }
else else
{ {
throw RuntimeException( throw RuntimeException("PresenterTextView: invalid number of arguments",
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterTextView: invalid number of arguments")),
static_cast<XWeak*>(this)); static_cast<XWeak*>(this));
} }
} }
@@ -289,9 +287,7 @@ void PresenterTextView::ThrowIfDisposed (void)
|| PresenterTextViewInterfaceBase::rBHelper.bInDispose || PresenterTextViewInterfaceBase::rBHelper.bInDispose
|| mpImplementation.get()==NULL) || mpImplementation.get()==NULL)
{ {
throw lang::DisposedException ( throw lang::DisposedException ("PresenterTextView object has already been disposed",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterTextView object has already been disposed")),
static_cast<uno::XWeak*>(this)); static_cast<uno::XWeak*>(this));
} }
} }
@@ -302,15 +298,15 @@ void PresenterTextView::ThrowIfDisposed (void)
//===== PresenterTextView::Implementation ===================================== //===== PresenterTextView::Implementation =====================================
PresenterTextView::Implementation::Implementation (void) PresenterTextView::Implementation::Implementation (void)
: msTextPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Text"))), : msTextPropertyName("Text"),
msBitmapPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap"))), msBitmapPropertyName("Bitmap"),
msSizePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))), msSizePropertyName("Size"),
msBackgroundColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"))), msBackgroundColorPropertyName("BackgroundColor"),
msTextColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"))), msTextColorPropertyName("TextColor"),
msFontDescriptorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("FontDescriptor"))), msFontDescriptorPropertyName("FontDescriptor"),
msTopPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Top"))), msTopPropertyName("Top"),
msTopRelativePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeTop"))), msTopRelativePropertyName("RelativeTop"),
msTotalHeightPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TotalHeight"))), msTotalHeightPropertyName("TotalHeight"),
mxBitmap(), mxBitmap(),
mpCanvas(), mpCanvas(),
mpOutputDevice(new VirtualDevice(*Application::GetDefaultDevice(), 0, 0)), mpOutputDevice(new VirtualDevice(*Application::GetDefaultDevice(), 0, 0)),

18
sd/source/ui/presenter/SlideRenderer.cxx
View File

@@ -53,7 +53,7 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException) ::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException)
{ {
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideRenderer")); return OUString("com.sun.star.comp.Draw.SlideRenderer");
} }
@@ -62,8 +62,7 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void) Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
throw (RuntimeException) throw (RuntimeException)
{ {
static const ::rtl::OUString sServiceName( static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideRenderer");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")));
return Sequence<rtl::OUString>(&sServiceName, 1); return Sequence<rtl::OUString>(&sServiceName, 1);
} }
@@ -105,8 +104,7 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
if (rArguments.getLength() != 0) if (rArguments.getLength() != 0)
{ {
throw RuntimeException( throw RuntimeException("SlideRenderer: invalid number of arguments",
OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer: invalid number of arguments")),
static_cast<XWeak*>(this)); static_cast<XWeak*>(this));
} }
} }
@@ -191,16 +189,14 @@ BitmapEx SlideRenderer::CreatePreview (
{ {
const SdPage* pPage = SdPage::getImplementation(rxSlide); const SdPage* pPage = SdPage::getImplementation(rxSlide);
if (pPage == NULL) if (pPage == NULL)
throw lang::IllegalArgumentException( throw lang::IllegalArgumentException("SlideRenderer::createPreview() called with invalid slide",
OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid slide")),
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
0); 0);
// Determine the size of the current slide and its aspect ratio. // Determine the size of the current slide and its aspect ratio.
Size aPageSize = pPage->GetSize(); Size aPageSize = pPage->GetSize();
if (aPageSize.Height() <= 0) if (aPageSize.Height() <= 0)
throw lang::IllegalArgumentException( throw lang::IllegalArgumentException("SlideRenderer::createPreview() called with invalid size",
OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid size")),
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
1); 1);
@@ -250,9 +246,7 @@ void SlideRenderer::ThrowIfDisposed (void)
{ {
if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose) if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose)
{ {
throw lang::DisposedException ( throw lang::DisposedException ("SlideRenderer object has already been disposed",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"SlideRenderer object has already been disposed")),
static_cast<uno::XWeak*>(this)); static_cast<uno::XWeak*>(this));
} }
} }

6
sd/source/ui/slideshow/slideshowimpl.cxx
View File

@@ -551,9 +551,9 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
#endif #endif
, mnEntryCounter(0) , mnEntryCounter(0)
, mnLastSlideNumber(-1) , mnLastSlideNumber(-1)
, msOnClick( "OnClick") , msOnClick( "OnClick" )
, msBookmark( "Bookmark") , msBookmark( "Bookmark" )
, msVerb( "Verb") , msVerb( "Verb" )
, mnEndShowEvent(0) , mnEndShowEvent(0)
, mnContextMenuEvent(0) , mnContextMenuEvent(0)
, mnUpdateEvent(0) , mnUpdateEvent(0)