From 301217d7087280f1ec4053dd873f79922d981dd3 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Fri, 13 Apr 2012 20:46:47 -0300 Subject: More RTL_CONSTASCII_USTRINGPARAM removals --- .../accessibility/AccessibleDocumentViewBase.cxx | 21 +++------ .../accessibility/AccessibleDrawDocumentView.cxx | 24 ++++------ .../ui/accessibility/AccessibleOutlineView.cxx | 2 +- sd/source/ui/accessibility/AccessiblePageShape.cxx | 31 +++++-------- .../AccessiblePresentationGraphicShape.cxx | 16 +++---- .../AccessiblePresentationOLEShape.cxx | 33 ++++++-------- .../accessibility/AccessiblePresentationShape.cxx | 51 +++++++++++----------- .../ui/accessibility/AccessibleScrollPanel.cxx | 2 +- .../accessibility/AccessibleSlideSorterObject.cxx | 11 ++--- .../ui/accessibility/AccessibleSlideSorterView.cxx | 14 +++--- sd/source/ui/accessibility/AccessibleTreeNode.cxx | 11 ++--- sd/source/ui/accessibility/SdShapeTypes.cxx | 28 ++++++------ 12 files changed, 102 insertions(+), 142 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 11e4b909816b..2ca667376951 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -132,7 +132,7 @@ void AccessibleDocumentViewBase::Init (void) uno::Reference xSet (mxController, uno::UNO_QUERY); if (xSet.is()) xSet->addPropertyChangeListener ( - OUString (RTL_CONSTASCII_USTRINGPARAM("")), + "", static_cast(this)); // Register this object as dispose event listener at the controller. @@ -278,10 +278,7 @@ Reference SAL_CALL if (nIndex == 0) return mxAccessibleOLEObject; - throw lang::IndexOutOfBoundsException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("no child with index ") )) - + rtl::OUString::valueOf(nIndex), - NULL); + throw lang::IndexOutOfBoundsException ( "no child with index " + rtl::OUString::valueOf(nIndex), NULL); } @@ -470,7 +467,7 @@ void SAL_CALL AccessibleDocumentViewBase::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleDocumentViewBase")); + return ::rtl::OUString("AccessibleDocumentViewBase"); } @@ -569,9 +566,7 @@ void AccessibleDocumentViewBase::impl_dispose() { uno::Reference xSet (mxController, uno::UNO_QUERY); if (xSet.is()) - xSet->removePropertyChangeListener ( - OUString (RTL_CONSTASCII_USTRINGPARAM("")), - static_cast(this)); + xSet->removePropertyChangeListener ("", static_cast(this)); mxController->removeEventListener ( static_cast(this)); @@ -724,8 +719,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) AccessibleDocumentViewBase::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ( - RTL_CONSTASCII_USTRINGPARAM("AccessibleDocumentViewBase")); + return ::rtl::OUString ("AccessibleDocumentViewBase"); } @@ -746,14 +740,13 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) OUString sFirstService = xInfo->getSupportedServiceNames()[0]; if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" ) { - sDescription = OUString (RTL_CONSTASCII_USTRINGPARAM("Draw Document")); + sDescription = "Draw Document"; } else sDescription = sFirstService; } else - sDescription = OUString ( - RTL_CONSTASCII_USTRINGPARAM("Accessible Draw Document")); + sDescription = "Accessible Draw Document"; return sDescription; } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index b025cedf099c..8def7218c550 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -164,8 +164,7 @@ AccessiblePageShape* AccessibleDrawDocumentView::CreateDrawPageShape (void) uno::Reference xFactory (mxModel, uno::UNO_QUERY); uno::Reference xRectangle; if (xFactory.is()) - xRectangle = uno::Reference(xFactory->createInstance ( - OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape"))), + xRectangle = uno::Reference(xFactory->createInstance ("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); // Set the shape's size and position. @@ -177,19 +176,15 @@ AccessiblePageShape* AccessibleDrawDocumentView::CreateDrawPageShape (void) // Set size and position of the shape to those of the draw // page. - aValue = xSet->getPropertyValue ( - OUString (RTL_CONSTASCII_USTRINGPARAM("BorderLeft"))); + aValue = xSet->getPropertyValue ("BorderLeft"); aValue >>= aPosition.X; - aValue = xSet->getPropertyValue ( - OUString (RTL_CONSTASCII_USTRINGPARAM("BorderTop"))); + aValue = xSet->getPropertyValue ("BorderTop"); aValue >>= aPosition.Y; xRectangle->setPosition (aPosition); - aValue = xSet->getPropertyValue ( - OUString (RTL_CONSTASCII_USTRINGPARAM("Width"))); + aValue = xSet->getPropertyValue ("Width"); aValue >>= aSize.Width; - aValue = xSet->getPropertyValue ( - OUString (RTL_CONSTASCII_USTRINGPARAM("Height"))); + aValue = xSet->getPropertyValue ("Height"); aValue >>= aSize.Height; xRectangle->setSize (aSize); @@ -256,8 +251,7 @@ uno::Reference SAL_CALL } else throw lang::IndexOutOfBoundsException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no accessible child with index ")) - + rtl::OUString::valueOf(nIndex), + "no accessible child with index " + rtl::OUString::valueOf(nIndex), static_cast(this)); } @@ -354,8 +348,7 @@ void SAL_CALL AccessibleDrawDocumentView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "AccessibleDrawDocumentView")); + return ::rtl::OUString("AccessibleDrawDocumentView"); } @@ -373,8 +366,7 @@ void SAL_CALL // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName (RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.drawing.AccessibleDrawDocumentView")); + static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleDrawDocumentView"); aServiceNames[nCount] = sAdditionalServiceName; return aServiceNames; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index d26f1a485ad1..42ac3641cb5b 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -169,7 +169,7 @@ void SAL_CALL AccessibleOutlineView::removeEventListener( const uno::Reference< AccessibleOutlineView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleOutlineView")); + return ::rtl::OUString("AccessibleOutlineView"); } diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 64f7d64f81ad..fca43b92500c 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -99,8 +99,7 @@ uno::Reference SAL_CALL AccessiblePageShape::getAccessibleChild( sal_Int32 ) throw (::com::sun::star::uno::RuntimeException) { - throw lang::IndexOutOfBoundsException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("page shape has no children") ), + throw lang::IndexOutOfBoundsException ("page shape has no children", static_cast(this)); } @@ -125,18 +124,14 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) awt::Point aPosition; awt::Size aSize; - aValue = xSet->getPropertyValue ( - ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("BorderLeft"))); + aValue = xSet->getPropertyValue ("BorderLeft"); aValue >>= aBoundingBox.X; - aValue = xSet->getPropertyValue ( - ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("BorderTop"))); + aValue = xSet->getPropertyValue ("BorderTop"); aValue >>= aBoundingBox.Y; - aValue = xSet->getPropertyValue ( - ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("Width"))); + aValue = xSet->getPropertyValue ("Width"); aValue >>= aBoundingBox.Width; - aValue = xSet->getPropertyValue ( - ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("Height"))); + aValue = xSet->getPropertyValue ("Height"); aValue >>= aBoundingBox.Height; } @@ -193,7 +188,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) if (aSet.is()) { uno::Any aColor; - aColor = aSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor"))); + aColor = aSet->getPropertyValue ("LineColor"); aColor >>= nColor; } } @@ -222,8 +217,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) if (xSet.is()) { uno::Any aBGSet; - aBGSet = xSet->getPropertyValue ( - ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("Background"))); + aBGSet = xSet->getPropertyValue ("Background"); Reference xBGSet (aBGSet, uno::UNO_QUERY); if ( ! xBGSet.is()) { @@ -234,8 +228,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) { xSet = Reference (xTarget->getMasterPage(), uno::UNO_QUERY); - aBGSet = xSet->getPropertyValue ( - ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("Background"))); + aBGSet = xSet->getPropertyValue ("Background"); xBGSet = Reference (aBGSet, uno::UNO_QUERY); } } @@ -244,7 +237,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) if (xBGSet.is()) { uno::Any aColor; - aColor = xBGSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor"))); + aColor = xBGSet->getPropertyValue ("FillColor"); aColor >>= nColor; } else @@ -269,7 +262,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePageShape")); + return ::rtl::OUString("AccessiblePageShape"); } @@ -327,7 +320,7 @@ void AccessiblePageShape::dispose (void) AccessiblePageShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("PageShape")); + return ::rtl::OUString ("PageShape"); } @@ -362,7 +355,7 @@ void AccessiblePageShape::dispose (void) AccessiblePageShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("Page Shape")); + return ::rtl::OUString ("Page Shape"); } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 8703964b2034..0c4987703f94 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -64,7 +64,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) AccessiblePresentationGraphicShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePresentationGraphicShape")); + return ::rtl::OUString("AccessiblePresentationGraphicShape"); } @@ -81,14 +81,13 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) switch (nShapeType) { case PRESENTATION_GRAPHIC_OBJECT: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressGraphicObject")); + sName = "ImpressGraphicObject"; break; default: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleImpressShape")); + sName = "UnknownAccessibleImpressShape"; uno::Reference xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) - sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": ")) - + xDescriptor->getShapeType(); + sName += ": " + xDescriptor->getShapeType(); } return sName; @@ -107,15 +106,14 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) switch (nShapeType) { case PRESENTATION_GRAPHIC_OBJECT: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("PresentationGraphicShape")))); + aDG.Initialize ("PresentationGraphicShape"); break; default: - aDG.Initialize ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation graphic shape"))); + aDG.Initialize ("Unknown accessible presentation graphic shape"); uno::Reference xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) { - aDG.AppendString (::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("service name="))); + aDG.AppendString ("service name="); aDG.AppendString (xDescriptor->getShapeType()); } } diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 79d98e39693a..594d9b27a82b 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -58,7 +58,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) AccessiblePresentationOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePresentationOLEShape")); + return ::rtl::OUString("AccessiblePresentationOLEShape"); } /// Set this object's name if it is different to the current name. @@ -72,21 +72,19 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) switch (nShapeType) { case PRESENTATION_OLE: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressOLE")); + sName = "ImpressOLE"; break; case PRESENTATION_CHART: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressChart")); + sName = "ImpressChart"; break; case PRESENTATION_TABLE: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressTable")); + sName = "ImpressTable"; break; default: - sName = ::rtl::OUString ( - RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleImpressOLEShape")); + sName = "UnknownAccessibleImpressOLEShape"; uno::Reference xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) - sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": ")) - + xDescriptor->getShapeType(); + sName += ": " + xDescriptor->getShapeType(); } return sName; @@ -102,29 +100,26 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) switch (nShapeType) { case PRESENTATION_OLE: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationOLEShape"))); + aDG.Initialize ("PresentationOLEShape"); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM ("CLSID")), - DescriptionGenerator::STRING); + aDG.AddProperty ("CLSID" ,DescriptionGenerator::STRING); break; case PRESENTATION_CHART: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationChartShape"))); + aDG.Initialize ("PresentationChartShape"); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")), - DescriptionGenerator::STRING); + aDG.AddProperty ( "CLSID" , DescriptionGenerator::STRING); break; case PRESENTATION_TABLE: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTableShape"))); + aDG.Initialize ("PresentationTableShape"); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")), - DescriptionGenerator::STRING); + aDG.AddProperty ("CLSID" , DescriptionGenerator::STRING); break; default: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation OLE shape"))); + aDG.Initialize ("Unknown accessible presentation OLE shape"); uno::Reference xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) { - aDG.AppendString (::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("service name="))); + aDG.AppendString ("service name="); aDG.AppendString (xDescriptor->getShapeType()); } } diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 90a00a8a2452..4b16b6918576 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -64,7 +64,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) AccessiblePresentationShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePresentationShape")); + return ::rtl::OUString("AccessiblePresentationShape"); } @@ -81,41 +81,40 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) switch (nShapeType) { case PRESENTATION_TITLE: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressTitle")); + sName = "ImpressTitle"; break; case PRESENTATION_OUTLINER: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressOutliner")); + sName = "ImpressOutliner"; break; case PRESENTATION_SUBTITLE: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressSubtitle")); + sName = "ImpressSubtitle"; break; case PRESENTATION_PAGE: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPage")); + sName = "ImpressPage"; break; case PRESENTATION_NOTES: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressNotes")); + sName = "ImpressNotes"; break; case PRESENTATION_HANDOUT: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHandout")); + sName = "ImpressHandout"; break; case PRESENTATION_HEADER: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHeader")); + sName = "ImpressHeader"; break; case PRESENTATION_FOOTER: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressFooter")); + sName = "ImpressFooter"; break; case PRESENTATION_DATETIME: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressDateAndTime")); + sName = "ImpressDateAndTime"; break; case PRESENTATION_PAGENUMBER: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPageNumber")); + sName = "ImpressPageNumber"; break; default: - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleImpressShape")); + sName = "UnknownAccessibleImpressShape"; uno::Reference xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) - sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": ")) - + xDescriptor->getShapeType(); + sName += ": " + xDescriptor->getShapeType(); } return sName; @@ -134,41 +133,41 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) switch (nShapeType) { case PRESENTATION_TITLE: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTitleShape"))); + aDG.Initialize ("PresentationTitleShape"); break; case PRESENTATION_OUTLINER: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationOutlinerShape"))); + aDG.Initialize ("PresentationOutlinerShape"); break; case PRESENTATION_SUBTITLE: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationSubtitleShape"))); + aDG.Initialize ("PresentationSubtitleShape"); break; case PRESENTATION_PAGE: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageShape"))); + aDG.Initialize ("PresentationPageShape"); break; case PRESENTATION_NOTES: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationNotesShape"))); + aDG.Initialize ("PresentationNotesShape"); break; case PRESENTATION_HANDOUT: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHandoutShape"))); + aDG.Initialize ("PresentationHandoutShape"); break; case PRESENTATION_HEADER: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHeaderShape"))); + aDG.Initialize ("PresentationHeaderShape"); break; case PRESENTATION_FOOTER: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationFooterShape"))); + aDG.Initialize ("PresentationFooterShape"); break; case PRESENTATION_DATETIME: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationDateAndTimeShape"))); + aDG.Initialize ("PresentationDateAndTimeShape"); break; case PRESENTATION_PAGENUMBER: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageNumberShape"))); + aDG.Initialize ("PresentationPageNumberShape"); break; default: - aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation shape"))); + aDG.Initialize ("Unknown accessible presentation shape"); uno::Reference xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) { - aDG.AppendString (::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("service name="))); + aDG.AppendString ("service name="); aDG.AppendString (xDescriptor->getShapeType()); } } diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx index 0090c0a15cbe..d43d8e449304 100644 --- a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx +++ b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx @@ -136,7 +136,7 @@ OUString SAL_CALL AccessibleScrollPanel::getImplementationName (void) throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleScrollPanel")); + return OUString("AccessibleScrollPanel"); } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index f9f7a241d584..17e479ecfec1 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -503,7 +503,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) AccessibleSlideSorterObject::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleSlideSorterObject")); + return OUString("AccessibleSlideSorterObject"); } @@ -535,10 +535,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ThrowIfDisposed (); static const OUString sServiceNames[2] = { - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.accessibility.Accessible")), - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.accessibility.AccessibleContext")) + "com.sun.star.accessibility.Accessible", + "com.sun.star.accessibility.AccessibleContext" }; return uno::Sequence (sServiceNames, 2); } @@ -552,8 +550,7 @@ void AccessibleSlideSorterObject::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { OSL_TRACE ("Calling disposed object. Throwing exception:"); - throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), + throw lang::DisposedException ("object has been already disposed", static_cast(this)); } } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index fca04ea80fa3..31cc1cea2054 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -729,7 +729,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi AccessibleSlideSorterView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleSlideSorterView")); + return OUString("AccessibleSlideSorterView"); } @@ -761,12 +761,9 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ThrowIfDisposed (); static const OUString sServiceNames[3] = { - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.accessibility.Accessible")), - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.accessibility.AccessibleContext")), - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.drawing.AccessibleSlideSorterView")) + "com.sun.star.accessibility.Accessible", + "com.sun.star.accessibility.AccessibleContext", + "com.sun.star.drawing.AccessibleSlideSorterView" }; return uno::Sequence (sServiceNames, 3); } @@ -780,8 +777,7 @@ void AccessibleSlideSorterView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { OSL_TRACE ("Calling disposed object. Throwing exception:"); - throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), + throw lang::DisposedException ("object has been already disposed", static_cast(this)); } } diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index 283189511ff8..871995ecbbc4 100644 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -571,7 +571,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) AccessibleTreeNode::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTreeNode")); + return OUString("AccessibleTreeNode"); } @@ -602,10 +602,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL { ThrowIfDisposed (); static const OUString sServiceNames[2] = { - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.accessibility.Accessible")), - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.accessibility.AccessibleContext")), + "com.sun.star.accessibility.Accessible", + "com.sun.star.accessibility.AccessibleContext", }; return uno::Sequence (sServiceNames, 2); } @@ -619,8 +617,7 @@ void AccessibleTreeNode::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { OSL_TRACE ("Calling disposed object. Throwing exception:"); - throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), + throw lang::DisposedException ("object has been already disposed", static_cast(this)); } } diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index 55d53b466460..5fdc42daeae0 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -76,59 +76,59 @@ void RegisterImpressShapeTypes (void) ShapeTypeDescriptor aSdShapeTypeList[] = { ShapeTypeDescriptor ( PRESENTATION_OUTLINER, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OutlinerShape"))), + "com.sun.star.presentation.OutlinerShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_SUBTITLE, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.SubtitleShape"))), + "com.sun.star.presentation.SubtitleShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_GRAPHIC_OBJECT, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.GraphicObjectShape"))), + "com.sun.star.presentation.GraphicObjectShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_PAGE, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.PageShape"))), + "com.sun.star.presentation.PageShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_OLE, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OLE2Shape"))), + "com.sun.star.presentation.OLE2Shape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_CHART, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.ChartShape"))), + "com.sun.star.presentation.ChartShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_TABLE, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.TableShape"))), + "com.sun.star.presentation.TableShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_NOTES, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.NotesShape"))), + "com.sun.star.presentation.NotesShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_TITLE, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.TitleTextShape")), + "com.sun.star.presentation.TitleTextShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_HANDOUT, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HandoutShape")), + "com.sun.star.presentation.HandoutShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_HEADER, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HeaderShape")), + "com.sun.star.presentation.HeaderShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_FOOTER, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.FooterShape")), + "com.sun.star.presentation.FooterShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_DATETIME, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.DateTimeShape")), + "com.sun.star.presentation.DateTimeShape", CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_PAGENUMBER, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.SlideNumberShape")), + "com.sun.star.presentation.SlideNumberShape", CreateSdAccessibleShape ) }; -- cgit