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)
{
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)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.Canvas")));
static const ::rtl::OUString sServiceName("com.sun.star.rendering.Canvas");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -231,24 +230,21 @@ void SAL_CALL PresenterCanvas::initialize (
if ( ! (rArguments[2] >>= mxSharedWindow))
{
throw lang::IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared window")),
throw lang::IllegalArgumentException("PresenterCanvas: invalid shared window",
static_cast<XWeak*>(this),
1);
}
if ( ! (rArguments[3] >>= mxSharedCanvas))
{
throw lang::IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared canvas")),
throw lang::IllegalArgumentException("PresenterCanvas: invalid shared canvas",
static_cast<XWeak*>(this),
2);
}
if ( ! (rArguments[4] >>= mxWindow))
{
throw lang::IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid window")),
throw lang::IllegalArgumentException("PresenterCanvas: invalid window",
static_cast<XWeak*>(this),
3);
}
@@ -268,8 +264,7 @@ void SAL_CALL PresenterCanvas::initialize (
}
else
{
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid number of arguments")),
throw RuntimeException("PresenterCanvas: invalid number of arguments",
static_cast<XWeak*>(this));
}
}
@@ -1060,9 +1055,7 @@ void PresenterCanvas::ThrowIfDisposed (void)
{
if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is())
{
throw lang::DisposedException (
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterCanvas object has already been disposed")),
throw lang::DisposedException ("PresenterCanvas object has already been disposed",
static_cast<uno::XWeak*>(this));
}
}
@@ -1215,9 +1208,7 @@ void PresenterCustomSprite::ThrowIfDisposed (void)
{
if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is())
{
throw lang::DisposedException (
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterCustomSprite object has already been disposed")),
throw lang::DisposedException ("PresenterCustomSprite object has already been disposed",
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)
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)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterHelper")));
static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterHelper");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -175,8 +174,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas (
|| ! rxSharedWindow.is()
|| ! rxWindow.is())
{
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM("illegal argument")),
throw RuntimeException("illegal argument",
Reference<XInterface>(static_cast<XWeak*>(this)));
}
@@ -222,7 +220,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
xFactory->createInstanceWithArguments(
!rsOptionalCanvasServiceName.isEmpty()
? rsOptionalCanvasServiceName
: OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
: OUString("com.sun.star.rendering.VCLCanvas"),
aArg),
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)
{
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)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")));
static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -273,9 +272,7 @@ void PresenterPreviewCache::ThrowIfDisposed (void)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
throw lang::DisposedException (
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterPreviewCache object has already been disposed")),
throw lang::DisposedException ("PresenterPreviewCache object has already been disposed",
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)
{
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)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterTextView")));
static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterTextView");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -191,8 +190,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
}
else
{
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterTextView: invalid number of arguments")),
throw RuntimeException("PresenterTextView: invalid number of arguments",
static_cast<XWeak*>(this));
}
}
@@ -289,9 +287,7 @@ void PresenterTextView::ThrowIfDisposed (void)
|| PresenterTextViewInterfaceBase::rBHelper.bInDispose
|| mpImplementation.get()==NULL)
{
throw lang::DisposedException (
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"PresenterTextView object has already been disposed")),
throw lang::DisposedException ("PresenterTextView object has already been disposed",
static_cast<uno::XWeak*>(this));
}
}
@@ -302,15 +298,15 @@ void PresenterTextView::ThrowIfDisposed (void)
//===== PresenterTextView::Implementation =====================================
PresenterTextView::Implementation::Implementation (void)
: msTextPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Text"))),
msBitmapPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap"))),
msSizePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))),
msBackgroundColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"))),
msTextColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"))),
msFontDescriptorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("FontDescriptor"))),
msTopPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Top"))),
msTopRelativePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeTop"))),
msTotalHeightPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TotalHeight"))),
: msTextPropertyName("Text"),
msBitmapPropertyName("Bitmap"),
msSizePropertyName("Size"),
msBackgroundColorPropertyName("BackgroundColor"),
msTextColorPropertyName("TextColor"),
msFontDescriptorPropertyName("FontDescriptor"),
msTopPropertyName("Top"),
msTopRelativePropertyName("RelativeTop"),
msTotalHeightPropertyName("TotalHeight"),
mxBitmap(),
mpCanvas(),
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)
{
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)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")));
static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideRenderer");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -105,8 +104,7 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
if (rArguments.getLength() != 0)
{
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer: invalid number of arguments")),
throw RuntimeException("SlideRenderer: invalid number of arguments",
static_cast<XWeak*>(this));
}
}
@@ -191,16 +189,14 @@ BitmapEx SlideRenderer::CreatePreview (
{
const SdPage* pPage = SdPage::getImplementation(rxSlide);
if (pPage == NULL)
throw lang::IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid slide")),
throw lang::IllegalArgumentException("SlideRenderer::createPreview() called with invalid slide",
static_cast<XWeak*>(this),
0);
// Determine the size of the current slide and its aspect ratio.
Size aPageSize = pPage->GetSize();
if (aPageSize.Height() <= 0)
throw lang::IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid size")),
throw lang::IllegalArgumentException("SlideRenderer::createPreview() called with invalid size",
static_cast<XWeak*>(this),
1);
@@ -250,9 +246,7 @@ void SlideRenderer::ThrowIfDisposed (void)
{
if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose)
{
throw lang::DisposedException (
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"SlideRenderer object has already been disposed")),
throw lang::DisposedException ("SlideRenderer object has already been disposed",
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
, mnEntryCounter(0)
, mnLastSlideNumber(-1)
, msOnClick( "OnClick")
, msBookmark( "Bookmark")
, msVerb( "Verb")
, msOnClick( "OnClick" )
, msBookmark( "Bookmark" )
, msVerb( "Verb" )
, mnEndShowEvent(0)
, mnContextMenuEvent(0)
, mnUpdateEvent(0)