diff options
9 files changed, 41 insertions, 53 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 6f27b177d1c3..9a8ed5dd8ddb 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -281,7 +281,7 @@ Reference<XAccessible> SAL_CALL return mxAccessibleOLEObject; throw lang::IndexOutOfBoundsException ( - ::rtl::OUString::createFromAscii ("no child with index ") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("no child with index ") )) + rtl::OUString::valueOf(nIndex), NULL); } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index e748724054ab..8b1028377710 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -260,7 +260,7 @@ uno::Reference<XAccessible> SAL_CALL } else throw lang::IndexOutOfBoundsException ( - ::rtl::OUString::createFromAscii ("no accessible child with index ") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no accessible child with index ")) + rtl::OUString::valueOf(nIndex), static_cast<uno::XWeak*>(this)); } diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index b1969fdd7823..574b4a90d27a 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -103,7 +103,7 @@ uno::Reference<XAccessible> SAL_CALL throw (::com::sun::star::uno::RuntimeException) { throw lang::IndexOutOfBoundsException ( - ::rtl::OUString::createFromAscii ("page shape has no children"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("page shape has no children") ), static_cast<uno::XWeak*>(this)); } @@ -196,7 +196,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) if (aSet.is()) { uno::Any aColor; - aColor = aSet->getPropertyValue (::rtl::OUString::createFromAscii ("LineColor")); + aColor = aSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor"))); aColor >>= nColor; } } @@ -247,7 +247,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) if (xBGSet.is()) { uno::Any aColor; - aColor = xBGSet->getPropertyValue (::rtl::OUString::createFromAscii ("FillColor")); + aColor = xBGSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor"))); aColor >>= nColor; } else diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index af99c29fd564..badc16d208d4 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -109,11 +109,11 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) switch (nShapeType) { case PRESENTATION_GRAPHIC_OBJECT: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationGraphicShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("PresentationGraphicShape")))); break; default: aDG.Initialize ( - ::rtl::OUString::createFromAscii ("Unknown accessible presentation graphic shape")); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation graphic shape"))); uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) { diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index c95ccb5bff62..0773fbdbaaff 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -50,16 +50,10 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape ( { } - - - AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) { } - - - //===== XServiceInfo ======================================================== ::rtl::OUString SAL_CALL @@ -69,9 +63,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePresentationOLEShape")); } - - - /// Set this object's name if it is different to the current name. ::rtl::OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName (void) @@ -103,9 +94,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) return sName; } - - - ::rtl::OUString AccessiblePresentationOLEShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) @@ -116,25 +104,25 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) switch (nShapeType) { case PRESENTATION_OLE: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOLEShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationOLEShape"))); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString::createFromAscii ("CLSID"), + aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM ("CLSID")), DescriptionGenerator::STRING); break; case PRESENTATION_CHART: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationChartShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationChartShape"))); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString::createFromAscii ("CLSID"), + aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")), DescriptionGenerator::STRING); break; case PRESENTATION_TABLE: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTableShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTableShape"))); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString::createFromAscii ("CLSID"), + aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")), DescriptionGenerator::STRING); break; default: - aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation OLE shape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation OLE shape"))); uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) { diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index b8f48200ee4b..9558d3c546ef 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -136,37 +136,37 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) switch (nShapeType) { case PRESENTATION_TITLE: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTitleShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTitleShape"))); break; case PRESENTATION_OUTLINER: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOutlinerShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationOutlinerShape"))); break; case PRESENTATION_SUBTITLE: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationSubtitleShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationSubtitleShape"))); break; case PRESENTATION_PAGE: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageShape"))); break; case PRESENTATION_NOTES: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationNotesShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationNotesShape"))); break; case PRESENTATION_HANDOUT: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHandoutShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHandoutShape"))); break; case PRESENTATION_HEADER: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHeaderShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHeaderShape"))); break; case PRESENTATION_FOOTER: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationFooterShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationFooterShape"))); break; case PRESENTATION_DATETIME: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationDateAndTimeShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationDateAndTimeShape"))); break; case PRESENTATION_PAGENUMBER: - aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageNumberShape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageNumberShape"))); break; default: - aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation shape")); + aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation shape"))); uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY); if (xDescriptor.is()) { diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index ad7519ee295c..3b869c72c568 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -76,59 +76,59 @@ AccessibleShape* ShapeTypeDescriptor aSdShapeTypeList[] = { ShapeTypeDescriptor ( PRESENTATION_OUTLINER, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OutlinerShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OutlinerShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_SUBTITLE, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SubtitleShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.SubtitleShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_GRAPHIC_OBJECT, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.GraphicObjectShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.GraphicObjectShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_PAGE, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.PageShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.PageShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_OLE, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OLE2Shape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OLE2Shape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_CHART, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.ChartShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.ChartShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_TABLE, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TableShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.TableShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_NOTES, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.NotesShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.NotesShape"))), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_TITLE, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TitleTextShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.TitleTextShape")), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_HANDOUT, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HandoutShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HandoutShape")), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_HEADER, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HeaderShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HeaderShape")), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_FOOTER, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.FooterShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.FooterShape")), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_DATETIME, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.DateTimeShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.DateTimeShape")), CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_PAGENUMBER, - ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SlideNumberShape"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.SlideNumberShape")), CreateSdAccessibleShape ) }; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index e4295c800380..cd0d5fc30146 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -230,7 +230,7 @@ ImplStlEffectCategorySortHelper::ImplStlEffectCategorySortHelper() uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() ); if( xFac.is() ) { - mxCollator.set( xFac->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) ), uno::UNO_QUERY ); + mxCollator.set( xFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )) ), uno::UNO_QUERY ); if( mxCollator.is() ) { diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index a6a1ae2051fb..be6d374eea5c 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -182,7 +182,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds ); if(aTime.GetTime() != 0) - sRet = sRet + rtl::OUString::createFromAscii(" ") + rLocalData.getTime( aTime,false ); + sRet = sRet + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + rLocalData.getTime( aTime,false ); } return sRet; } |