[Libreoffice-commits] .: 8 commits - sd/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Fri Apr 13 16:48:19 PDT 2012
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 21 --
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 24 --
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2
sd/source/ui/accessibility/AccessiblePageShape.cxx | 36 +--
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 16 -
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 33 +--
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 51 ++---
sd/source/ui/accessibility/AccessibleScrollPanel.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 11 -
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 14 -
sd/source/ui/accessibility/AccessibleTreeNode.cxx | 11 -
sd/source/ui/accessibility/SdShapeTypes.cxx | 28 +-
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 8
sd/source/ui/animations/CustomAnimationPane.cxx | 40 ++--
sd/source/ui/animations/motionpathtag.cxx | 4
sd/source/ui/annotations/annotationmanager.cxx | 15 -
sd/source/ui/annotations/annotationwindow.cxx | 4
sd/source/ui/app/sddll.cxx | 4
sd/source/ui/app/sdmod.cxx | 4
sd/source/ui/app/sdmod1.cxx | 4
sd/source/ui/app/sdxfer.cxx | 6
sd/source/ui/app/tbxww.cxx | 4
sd/source/ui/controller/slidelayoutcontroller.cxx | 22 +-
sd/source/ui/dlg/PaneShells.cxx | 6
sd/source/ui/dlg/TemplateScanner.cxx | 8
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/diactrl.cxx | 4
sd/source/ui/dlg/dlgass.cxx | 31 +--
sd/source/ui/dlg/filedlg.cxx | 16 -
sd/source/ui/dlg/gluectrl.cxx | 4
sd/source/ui/dlg/morphdlg.cxx | 6
sd/source/ui/dlg/present.cxx | 6
sd/source/ui/dlg/sdabstdlg.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 6
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 3
sd/source/ui/dlg/vectdlg.cxx | 6
sd/source/ui/docshell/docshel4.cxx | 22 +-
sd/source/ui/framework/configuration/Configuration.cxx | 18 -
sd/source/ui/framework/configuration/ConfigurationController.cxx | 14 -
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx | 6
sd/source/ui/framework/configuration/ConfigurationTracer.cxx | 2
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 4
sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 3
sd/source/ui/framework/configuration/ResourceId.cxx | 9
sd/source/ui/framework/configuration/UpdateRequest.cxx | 2
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 18 -
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 10 -
sd/source/ui/framework/factories/BasicViewFactory.cxx | 6
sd/source/ui/framework/factories/FullScreenPane.cxx | 4
sd/source/ui/framework/factories/Pane.cxx | 4
sd/source/ui/framework/factories/PresentationFactory.cxx | 13 -
sd/source/ui/framework/factories/TaskPanelFactory.cxx | 6
sd/source/ui/framework/module/ModuleController.cxx | 24 +-
sd/source/ui/framework/module/ReadOnlyModeObserver.cxx | 4
sd/source/ui/framework/tools/FrameworkHelper.cxx | 95 +++-------
sd/source/ui/func/fuformatpaintbrush.cxx | 2
sd/source/ui/func/fuhhconv.cxx | 12 -
sd/source/ui/func/fuinsert.cxx | 8
sd/source/ui/func/fuinsfil.cxx | 18 -
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/presenter/PresenterCanvas.cxx | 25 --
sd/source/ui/presenter/PresenterHelper.cxx | 10 -
sd/source/ui/presenter/PresenterPreviewCache.cxx | 9
sd/source/ui/presenter/PresenterTextView.cxx | 30 +--
sd/source/ui/presenter/SlideRenderer.cxx | 18 -
sd/source/ui/slideshow/SlideShowRestarter.cxx | 7
sd/source/ui/slideshow/slideshow.cxx | 24 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 78 +++-----
sd/source/ui/slideshow/slideshowviewimpl.cxx | 5
sd/source/ui/table/TableDesignPane.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 11 -
75 files changed, 407 insertions(+), 590 deletions(-)
New commits:
commit 301217d7087280f1ec4053dd873f79922d981dd3
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Fri Apr 13 20:46:47 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 11e4b90..2ca6673 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<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
if (xSet.is())
xSet->addPropertyChangeListener (
- OUString (RTL_CONSTASCII_USTRINGPARAM("")),
+ "",
static_cast<beans::XPropertyChangeListener*>(this));
// Register this object as dispose event listener at the controller.
@@ -278,10 +278,7 @@ Reference<XAccessible> 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<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
if (xSet.is())
- xSet->removePropertyChangeListener (
- OUString (RTL_CONSTASCII_USTRINGPARAM("")),
- static_cast<beans::XPropertyChangeListener*>(this));
+ xSet->removePropertyChangeListener ("", static_cast<beans::XPropertyChangeListener*>(this));
mxController->removeEventListener (
static_cast<awt::XWindowListener*>(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 b025ced..8def721 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<lang::XMultiServiceFactory> xFactory (mxModel, uno::UNO_QUERY);
uno::Reference<drawing::XShape> xRectangle;
if (xFactory.is())
- xRectangle = uno::Reference<drawing::XShape>(xFactory->createInstance (
- OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape"))),
+ xRectangle = uno::Reference<drawing::XShape>(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<XAccessible> 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<uno::XWeak*>(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 d26f1a4..42ac364 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 64f7d64..fca43b9 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -99,8 +99,7 @@ uno::Reference<XAccessible> 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<uno::XWeak*>(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<beans::XPropertySet> xBGSet (aBGSet, uno::UNO_QUERY);
if ( ! xBGSet.is())
{
@@ -234,8 +228,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void)
{
xSet = Reference<beans::XPropertySet> (xTarget->getMasterPage(),
uno::UNO_QUERY);
- aBGSet = xSet->getPropertyValue (
- ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("Background")));
+ aBGSet = xSet->getPropertyValue ("Background");
xBGSet = Reference<beans::XPropertySet> (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 8703964..0c49877 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<drawing::XShapeDescriptor> 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<drawing::XShapeDescriptor> 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 79d98e3..594d9b2 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<drawing::XShapeDescriptor> 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<drawing::XShapeDescriptor> 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 90a00a8..4b16b69 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<drawing::XShapeDescriptor> 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<drawing::XShapeDescriptor> 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 0090c0a..d43d8e4 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 f9f7a24..17e479e 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<OUString> (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<uno::XWeak*>(this));
}
}
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index fca04ea..31cc1ce 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<OUString> (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<uno::XWeak*>(this));
}
}
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 2831895..871995e 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<OUString> (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<uno::XWeak*>(this));
}
}
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index 55d53b4..5fdc42d 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 )
};
commit 2db3ba987fa20516c4e8eab7c13c37758b16efbd
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Fri Apr 13 20:17:40 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index ced683a..542411e 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -228,7 +228,7 @@ ImplStlEffectCategorySortHelper::ImplStlEffectCategorySortHelper()
uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
if( xFac.is() )
{
- mxCollator.set( xFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )) ), uno::UNO_QUERY );
+ mxCollator.set( xFac->createInstance( "com.sun.star.i18n.Collator" ), uno::UNO_QUERY );
if( mxCollator.is() )
{
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 8e42e16..a8ad199 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1999,7 +1999,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
pSet->getPropertyValue( nHandleCurrentPage ) >>= xCurrentPage;
if( xCurrentPage.is() )
{
- const OUString aStrIsEmptyPresObj( RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ) );
+ const OUString aStrIsEmptyPresObj( "IsEmptyPresentationObject" );
sal_Int32 nShape, nCount = xCurrentPage->getCount();
for( nShape = 0; nShape < nCount; nShape++ )
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index a950281..761fe30 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -134,12 +134,12 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
if( xSet.is() )
{
Reference< XPropertySetInfo > xInfo( xSet->getPropertySetInfo() );
- const OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("UINameSingular") );
+ const OUString aPropName( "UINameSingular");
if( xInfo->hasPropertyByName( aPropName ) )
xSet->getPropertyValue( aPropName ) >>= aDescription;
}
- aDescription += OUString( RTL_CONSTASCII_USTRINGPARAM(" "));
+ aDescription += " ";
aDescription += OUString::valueOf( getShapeIndex( xShape ) );
if( bWithText )
@@ -150,7 +150,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
OUString aText( xText->getString() );
if( !aText.isEmpty() )
{
- aDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(": "));
+ aDescription += ": ";
aText = aText.replace( (sal_Unicode)'\n', (sal_Unicode)' ' );
aText = aText.replace( (sal_Unicode)'\r', (sal_Unicode)' ' );
@@ -670,7 +670,7 @@ void CustomAnimationList::update()
SvLBoxEntry* pLBoxEntry = new CustomAnimationListEntry;
pLBoxEntry->AddItem( new SvLBoxContextBmp( pLBoxEntry, 0, Image(), Image(), 0));
OUString aDescription = String( SdResId( STR_CUSTOMANIMATION_TRIGGER ) );
- aDescription += OUString( RTL_CONSTASCII_USTRINGPARAM(": ") );
+ aDescription += ": ";
aDescription += getShapeDescription( xShape, false );
pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription, this ) );
Insert( pLBoxEntry );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index f2ec94b..498185f 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1099,7 +1099,7 @@ static sal_Int32 calcMaxParaDepth( Reference< XShape > xTargetShape )
if( xText.is() )
{
Reference< XPropertySet > xParaSet;
- const OUString strNumberingLevel( RTL_CONSTASCII_USTRINGPARAM("NumberingLevel") );
+ const OUString strNumberingLevel( "NumberingLevel" );
Reference< XEnumeration > xEnumeration( xText->createEnumeration(), UNO_QUERY_THROW );
while( xEnumeration->hasMoreElements() )
@@ -1141,11 +1141,11 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, CustomAnimationEffe
}
case nPropertyTypeFont:
- return pEffect->getProperty( AnimationNodeType::SET, OUString( RTL_CONSTASCII_USTRINGPARAM("CharFontName") ), VALUE_TO );
+ return pEffect->getProperty( AnimationNodeType::SET, "CharFontName" , VALUE_TO );
case nPropertyTypeCharHeight:
{
- const OUString aAttributeName( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
+ const OUString aAttributeName( "CharHeight" );
Any aValue( pEffect->getProperty( AnimationNodeType::SET, aAttributeName, VALUE_TO ) );
if( !aValue.hasValue() )
aValue = pEffect->getProperty( AnimationNodeType::ANIMATE, aAttributeName, VALUE_TO );
@@ -1156,7 +1156,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, CustomAnimationEffe
return pEffect->getTransformationProperty( AnimationTransformType::ROTATE, VALUE_BY);
case nPropertyTypeTransparency:
- return pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("Opacity")), VALUE_TO );
+ return pEffect->getProperty( AnimationNodeType::SET, "Opacity" , VALUE_TO );
case nPropertyTypeScale:
return pEffect->getTransformationProperty( AnimationTransformType::SCALE, VALUE_BY );
@@ -1164,9 +1164,9 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, CustomAnimationEffe
case nPropertyTypeCharDecoration:
{
Sequence< Any > aValues(3);
- aValues[0] = pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")), VALUE_TO );
- aValues[1] = pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")), VALUE_TO );
- aValues[2] = pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")), VALUE_TO );
+ aValues[0] = pEffect->getProperty( AnimationNodeType::SET, "CharWeight" , VALUE_TO );
+ aValues[1] = pEffect->getProperty( AnimationNodeType::SET, "CharPosture" , VALUE_TO );
+ aValues[2] = pEffect->getProperty( AnimationNodeType::SET, "CharUnderline" , VALUE_TO );
return makeAny( aValues );
}
}
@@ -1212,12 +1212,12 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff
break;
case nPropertyTypeFont:
- bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), VALUE_TO, rValue );
+ bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "CharFontName" , VALUE_TO, rValue );
break;
case nPropertyTypeCharHeight:
{
- const OUString aAttributeName( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
+ const OUString aAttributeName( "CharHeight" );
bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, aAttributeName, VALUE_TO, rValue );
if( !bEffectChanged )
bEffectChanged = pEffect->setProperty( AnimationNodeType::ANIMATE, aAttributeName, VALUE_TO, rValue );
@@ -1228,7 +1228,7 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff
break;
case nPropertyTypeTransparency:
- bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, OUString( RTL_CONSTASCII_USTRINGPARAM("Opacity") ), VALUE_TO, rValue );
+ bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "Opacity" , VALUE_TO, rValue );
break;
case nPropertyTypeScale:
@@ -1239,9 +1239,9 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff
{
Sequence< Any > aValues(3);
rValue >>= aValues;
- bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")), VALUE_TO, aValues[0] );
- bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")), VALUE_TO, aValues[1] );
- bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")), VALUE_TO, aValues[2] );
+ bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "CharWeight" , VALUE_TO, aValues[0] );
+ bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, "CharPosture" , VALUE_TO, aValues[1] );
+ bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, "CharUnderline" , VALUE_TO, aValues[2] );
}
break;
@@ -1259,8 +1259,8 @@ static sal_Bool hasVisibleShape( const Reference< XShape >& xShape )
if( sShapeType == "com.sun.star.presentation.TitleTextShape" || sShapeType == "com.sun.star.presentation.OutlinerShape" ||
sShapeType == "com.sun.star.presentation.SubtitleShape" || sShapeType == "com.sun.star.drawing.TextShape" )
{
- const OUString sFillStyle( RTL_CONSTASCII_USTRINGPARAM("FillStyle" ) );
- const OUString sLineStyle( RTL_CONSTASCII_USTRINGPARAM("LineStyle" ) );
+ const OUString sFillStyle( "FillStyle" );
+ const OUString sLineStyle( "LineStyle" );
Reference< XPropertySet > xSet( xShape, UNO_QUERY_THROW );
FillStyle eFillStyle;
@@ -1376,17 +1376,17 @@ STLPropertySet* CustomAnimationPane::createSelectionSet()
addValue( pSet, nHandleProperty1Value, getProperty1Value( nType, pEffect ) );
}
- if( pDescriptor->hasProperty( OUString( RTL_CONSTASCII_USTRINGPARAM( "Accelerate" ) ) ) )
+ if( pDescriptor->hasProperty( "Accelerate" ) )
{
addValue( pSet, nHandleAccelerate, makeAny( pEffect->getAcceleration() ) );
}
- if( pDescriptor->hasProperty( OUString( RTL_CONSTASCII_USTRINGPARAM( "Decelerate" ) ) ) )
+ if( pDescriptor->hasProperty( "Decelerate" ) )
{
addValue( pSet, nHandleDecelerate, makeAny( pEffect->getDecelerate() ) );
}
- if( pDescriptor->hasProperty( OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoReverse" ) ) ) )
+ if( pDescriptor->hasProperty( "AutoReverse" ) )
{
addValue( pSet, nHandleAutoReverse, makeAny( pEffect->getAutoReverse() ) );
}
@@ -2376,11 +2376,11 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimationNode )
{
- Reference< XTimeContainer > xRoot(::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.ParallelTimeContainer"))), UNO_QUERY);
+ Reference< XTimeContainer > xRoot(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.ParallelTimeContainer"), UNO_QUERY);
if( xRoot.is() )
{
Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) );
+ aUserData[0].Name = "node-type";
aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT;
xRoot->setUserData( aUserData );
xRoot->appendChild( xAnimationNode );
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index d4cd4b3..56cd83c 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -388,7 +388,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
}
XDash aDash( XDASH_RECT, 1, 80, 1, 80, 80);
- String aEmpty( RTL_CONSTASCII_USTRINGPARAM("?") );
+ rtl::OUString aEmpty( "?" );
mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) );
mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) );
mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) );
@@ -431,7 +431,7 @@ MotionPathTag::~MotionPathTag()
void MotionPathTag::updatePathAttributes()
{
- String aEmpty( RTL_CONSTASCII_USTRINGPARAM("?") );
+ rtl::OUString aEmpty( "?" );
::basegfx::B2DPolygon aCandidate;
if( mxPolyPoly.count() )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 96a0331..f4831f3 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -179,7 +179,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(RTL_CONSTASCII_USTRINGPARAM(" ")) + rLocalData.getTime( aTime,false );
+ sRet = sRet + " " + rLocalData.getTime( aTime,false );
}
return sRet;
}
@@ -474,16 +474,16 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
aStr.SearchAndReplaceAscii("%1", sAuthor);
- aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM(" (") ) );
- aStr.Append( String( getAnnotationDateTimeString( xAnnotation ) ) );
- aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("): \"") ) );
+ aStr.Append( rtl::OUString(" (") );
+ aStr.Append( rtl::OUString( getAnnotationDateTimeString( xAnnotation ) ) );
+ aStr.Append( rtl::OUString("): \"") );
String sQuote( pTextApi->GetText() );
if( sQuote.Len() == 0 )
- sQuote = String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+ sQuote = rtl::OUString( "..." );
aStr.Append( sQuote );
- aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) );
+ aStr.Append( rtl::OUString("\"\n") );
sal_uInt16 nParaCount = comphelper::string::getTokenCount(aStr, '\n');
for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
@@ -1051,7 +1051,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
nId = pMenu->GetItemId( nPos );
if( pMenu->IsItemEnabled( nId ) )
{
- OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+ OUString sSlotURL( "slot:" );
sSlotURL += OUString::valueOf( sal_Int32( nId ));
Image aImage( GetImage( xFrame, sSlotURL, false ) );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 50fe477..d6bc917 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -105,8 +105,6 @@ using namespace ::com::sun::star::text;
#define METABUTTON_AREA_WIDTH 30
#define POSTIT_META_HEIGHT (sal_Int32) 30
-#define EMPTYSTRING rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))
-
namespace sd {
extern OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation );
@@ -579,7 +577,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
if( !sDateTime.isEmpty() )
{
if( !sMeta.isEmpty() )
- sMeta += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
+ sMeta += "\n";
sMeta += sDateTime;
}
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 094bbcb..dad91d7 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -95,12 +95,12 @@ void SdDLL::Init()
{
// Register the Impress shape types in order to make the shapes accessible.
::accessibility::RegisterImpressShapeTypes ();
- ::sd::DrawDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) );
+ ::sd::DrawDocShell::Factory().SetDocumentServiceName( "com.sun.star.presentation.PresentationDocument" );
}
if (SvtModuleOptions().IsDraw())
{
- ::sd::GraphicDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) );
+ ::sd::GraphicDocShell::Factory().SetDocumentServiceName( "com.sun.star.drawing.DrawingDocument" );
}
// register your view-factories here
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 1b212ac..73382f0 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -93,7 +93,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
bWaterCan(sal_False),
mpResourceContainer(new ::sd::SdGlobalResourceContainer())
{
- SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen!
+ SetName( rtl::OUString( "StarDraw" ) ); // Nicht uebersetzen!
pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW);
StartListening( *SFX_APP() );
@@ -229,7 +229,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName,
{
INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
- aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "drawing.cfg" ) ) );
+ aURL.Append( rtl::OUString( "drawing.cfg" ) );
SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 2cb4b67..6cdcec1 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -575,7 +575,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
//we start without wizard
//check whether we should load a template document
- const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) );
+ const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" );
String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) );
if( aStandardTemplate.Len() > 0 )
@@ -645,7 +645,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
aRequest.AppendItem (aPassword);
aRequest.AppendItem (SfxStringItem (
SID_TARGETNAME,
- String (RTL_CONSTASCII_USTRINGPARAM ("_default"))));
+ rtl::OUString("_default")));
try
{
const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest);
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 53c795d..2f4c93f 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -220,14 +220,14 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
return;
::com::sun::star::form::FormButtonType eButtonType;
- Any aTmp( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) );
+ Any aTmp( xPropSet->getPropertyValue( "ButtonType" ) );
if( aTmp >>= eButtonType )
{
::rtl::OUString aLabel, aURL;
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) ) ) >>= aLabel;
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TargetURL") ) ) >>= aURL;
+ xPropSet->getPropertyValue( "Label" ) >>= aLabel;
+ xPropSet->getPropertyValue( "TargetURL" ) >>= aURL;
mpBookmark = new INetBookmark( String( aURL ), String( aLabel ) );
}
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index f562f4b..b7a53a6 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -82,7 +82,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow()
{
SfxPopupWindow *pWin = NULL;
rtl::OUString aToolBarResStr;
- rtl::OUStringBuffer aTbxResName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" )));
+ rtl::OUStringBuffer aTbxResName( "private:resource/toolbar/" );
switch( GetSlotId() )
{
case SID_OBJECT_ALIGN:
@@ -164,7 +164,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
}
else
{
- rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+ rtl::OUString aSlotURL( "slot:" );
aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index b4f04cf..0982c71 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -186,7 +186,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
if( xFrame.is() ) try
{
Reference< XPropertySet > xControllerSet( xFrame->getController(), UNO_QUERY_THROW );
- xControllerSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DrawViewMode" ) ) ) >>= eMode;
+ xControllerSet->getPropertyValue( "DrawViewMode" ) >>= eMode;
}
catch( Exception& e )
{
@@ -259,9 +259,9 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
if( mxFrame.is() )
{
if( bInsertPage )
- sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) );
+ sSlotStr = ".uno:DuplicatePage";
else
- sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) );
+ sSlotStr = ".uno:Undo";
aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False );
String sSlotTitle;
@@ -307,12 +307,12 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
if( eLayout != AUTOLAYOUT__END )
{
aArgs = Sequence< PropertyValue >(1);
- aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "WhatLayout" ) );
+ aArgs[0].Name = "WhatLayout";
aArgs[0].Value <<= (sal_Int32)eLayout;
}
else if( mbInsertPage )
{
- sCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) );
+ sCommandURL = ".uno:DuplicatePage";
}
mrController.dispatchCommand( sCommandURL, aArgs );
@@ -324,7 +324,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
OUString SlideLayoutController_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sd.SlideLayoutController" ));
+ return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
}
// --------------------------------------------------------------------
@@ -332,7 +332,7 @@ OUString SlideLayoutController_getImplementationName()
Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+ aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -340,14 +340,14 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru
Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
{
- return *new SlideLayoutController( rSMgr, OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )), false );
+ return *new SlideLayoutController( rSMgr, ".uno:AssignLayout", false );
}
// --------------------------------------------------------------------
OUString InsertSlideController_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sd.InsertSlideController" ));
+ return OUString( "com.sun.star.comp.sd.InsertSlideController" );
}
// --------------------------------------------------------------------
@@ -355,7 +355,7 @@ OUString InsertSlideController_getImplementationName()
Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+ aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -363,7 +363,7 @@ Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( Ru
Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
{
- return *new SlideLayoutController( rSMgr, OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPage" )), true );
+ return *new SlideLayoutController( rSMgr, ".uno:InsertPage" , true );
}
//========================================================================
commit 4326d0bd27f4ea9620d77457b6856875e59072cc
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Fri Apr 13 19:37:04 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 91efb14..5c39d6f 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(LeftImpressPaneShell, SfxShell);
LeftImpressPaneShell::LeftImpressPaneShell (void)
: SfxShell()
{
- SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
+ SetName(rtl::OUString("LeftImpressPane"));
}
@@ -96,7 +96,7 @@ TYPEINIT1(LeftDrawPaneShell, SfxShell);
LeftDrawPaneShell::LeftDrawPaneShell (void)
: SfxShell()
{
- SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
+ SetName(rtl::OUString("LeftDrawPane"));
}
@@ -129,7 +129,7 @@ TYPEINIT1( ToolPanelPaneShell, SfxShell );
ToolPanelPaneShell::ToolPanelPaneShell()
:SfxShell()
{
- SetName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ToolPanel" )) );
+ SetName(rtl::OUString("ToolPanel"));
}
ToolPanelPaneShell::~ToolPanelPaneShell(void)
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index c0adcfe..a98fa13 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -107,19 +107,19 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL)
if (rsURL.isEmpty())
nPriority = 100;
- else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("presnt")))>=0)
+ else if (rsURL.indexOf("presnt")>=0)
{
nPriority = 30;
}
- else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("layout")))>=0)
+ else if (rsURL.indexOf("layout")>=0)
{
nPriority = 20;
}
- else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("educate")))>=0)
+ else if (rsURL.indexOf("educate")>=0)
{
nPriority = 40;
}
- else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("finance")))>=0)
+ else if (rsURL.indexOf("finance")>=0)
{
nPriority = 40;
}
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f8adf5f..d73f125 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -302,7 +302,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
bDisableCtrls = sal_True;
aBtnStop.Enable();
aBtnStop.Update();
- String aStr( RTL_CONSTASCII_USTRINGPARAM( "Animator:" ) ); // Hier sollte man sich noch etwas gescheites ausdenken!
+ rtl::OUString aStr("Animator:"); // Hier sollte man sich noch etwas gescheites ausdenken!
pProgress = new SfxProgress( NULL, aStr, nFullTime );
}
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 0ee36b7..a8e98ca 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -110,11 +110,11 @@ void SdPagesField::Modify()
::uno::Any a;
::uno::Sequence< ::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PagesPerRow" ));
+ aArgs[0].Name = "PagesPerRow";
aItem.QueryValue( a );
aArgs[0].Value = a;
SfxToolBoxControl::Dispatch( ::uno::Reference< ::frame::XDispatchProvider >( m_xFrame->getController(), ::uno::UNO_QUERY ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PagesPerRow" )),
+ ".uno:PagesPerRow",
aArgs );
/*
rBindings.GetDispatcher()->Execute(
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 814730f..80ff333 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -434,15 +434,15 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
// Set text and icon of the 'Open...' button.
{
- String sText (GetUiTextForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))));
+ String sText (GetUiTextForCommand(".uno:Open"));
// Remove the mnemonic and add a leading space so that icon and text
// are not too close together.
- sText.SearchAndReplaceAll(String(RTL_CONSTASCII_USTRINGPARAM("~")),String());
- sText.Insert(String(RTL_CONSTASCII_USTRINGPARAM(" ")),0);
+ sText.SearchAndReplaceAll(rtl::OUString("~"),String());
+ sText.Insert(rtl::OUString(" "),0);
mpPage1OpenPB->SetText(sText);
// Place icon left of text and both centered in the button.
mpPage1OpenPB->SetModeImage(
- GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open")))
+ GetUiIconForCommand(".uno:Open")
);
mpPage1OpenPB->EnableImageDisplay(sal_True);
mpPage1OpenPB->EnableTextDisplay(sal_True);
@@ -629,7 +629,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
UpdatePreview( sal_True );
//check whether we should start with a template document initialy and preselect it
- const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) );
+ const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" );
String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) );
if( aStandardTemplate.Len() )
{
@@ -784,11 +784,10 @@ void AssistentDlgImpl::ScanDocmenu (void)
SvtHistoryOptions().GetList (ePICKLIST);
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
- uno::Reference< container::XNameAccess > xFilterFactory( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ), uno::UNO_QUERY );
+ uno::Reference< container::XNameAccess > xFilterFactory( xFactory->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY );
Reference< ::com::sun::star::ucb::XSimpleFileAccess > xFileAccess(
- xFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
+ xFactory->createInstance("com.sun.star.ucb.SimpleFileAccess"),
UNO_QUERY_THROW);
sal_uInt32 nCount = aHistory.getLength();
@@ -1579,12 +1578,10 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview )
}
else
{
- const String aTargetStr( RTL_CONSTASCII_USTRINGPARAM("_default") );
-
SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) );
- aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) );
+ aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) );
aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) );
@@ -1757,11 +1754,9 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL
if ( ! xFactory.is())
break;
- ::rtl::OUString sModuleIdentifier (
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+ ::rtl::OUString sModuleIdentifier ("com.sun.star.presentation.PresentationDocument");
Reference<container::XNameAccess> xNameAccess (
- xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.UICommandDescription"))),
+ xFactory->createInstance("com.sun.star.frame.UICommandDescription"),
UNO_QUERY);
if ( ! xNameAccess.is())
break;
@@ -1818,12 +1813,10 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL)
if ( ! xFactory.is())
break;
- ::rtl::OUString sModuleIdentifier (
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+ ::rtl::OUString sModuleIdentifier ("com.sun.star.presentation.PresentationDocument");
Reference<com::sun::star::ui::XModuleUIConfigurationManagerSupplier> xSupplier (
- xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),
+ xFactory->createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"),
UNO_QUERY_THROW);
Reference<com::sun::star::ui::XUIConfigurationManager> xManager (
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index a6f7859..44df98d 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -319,25 +319,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
{
String aDescr;
aDescr = String(SdResId(STR_ALL_FILES));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.*" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.*"));
// setup filter
#if defined UNX
aDescr = String(SdResId(STR_AU_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.au;*.snd" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.au;*.snd" ));
aDescr = String(SdResId(STR_VOC_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.voc" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.voc" ));
aDescr = String(SdResId(STR_WAV_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.wav" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.wav" ));
aDescr = String(SdResId(STR_AIFF_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.aiff" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.aiff" ));
aDescr = String(SdResId(STR_SVX_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.svx" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.svx" ));
#else
aDescr = String(SdResId(STR_WAV_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.wav;*.mp3;*.ogg" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.wav;*.mp3;*.ogg" ));
aDescr = String(SdResId(STR_MIDI_FILE));
- mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.mid" ) ) );
+ mpImpl->AddFilter( aDescr, rtl::OUString("*.mid" ));
#endif
}
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 26d847e..c9e6357 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -113,11 +113,11 @@ void GlueEscDirLB::Select()
{
Any a;
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GlueEscapeDirection" ));
+ aArgs[0].Name = "GlueEscapeDirection";
aItem.QueryValue( a );
aArgs[0].Value = a;
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GlueEscapeDirection" )),
+ ".uno:GlueEscapeDirection",
aArgs );
}
/*
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 64686d9..cda852d 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -92,8 +92,7 @@ MorphDlg::~MorphDlg()
void MorphDlg::LoadSettings()
{
- SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ),
+ SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) ,
SD_OPTION_LOAD ) );
sal_uInt16 nSteps;
sal_Bool bOrient, bAttrib;
@@ -119,8 +118,7 @@ void MorphDlg::LoadSettings()
void MorphDlg::SaveSettings() const
{
- SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ),
+ SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) ,
SD_OPTION_STORE ) );
if( xOStm.Is() )
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index b012fb4..b83cad7 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -185,7 +185,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
try
{
Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- Reference< XIndexAccess > xMultiMon( xFactory->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.DisplayAccess" ) ) ), UNO_QUERY_THROW );
+ Reference< XIndexAccess > xMultiMon( xFactory->createInstance("com.sun.star.awt.DisplayAccess" ), UNO_QUERY_THROW );
maGrpMonitor.Show( true );
maFtMonitor.Show( true );
maLBMonitor.Show( true );
@@ -204,9 +204,9 @@ void SdStartPresentationDlg::InitMonitorSettings()
Reference< XPropertySet > xMonProps( xMultiMon, UNO_QUERY );
if( xMonProps.is() ) try
{
- const OUString sPropName1( RTL_CONSTASCII_USTRINGPARAM( "IsUnifiedDisplay" ) );
+ const OUString sPropName1( "IsUnifiedDisplay" );
xMonProps->getPropertyValue( sPropName1 ) >>= bUnifiedDisplay;
- const OUString sPropName2( RTL_CONSTASCII_USTRINGPARAM( "DefaultDisplay" ) );
+ const OUString sPropName2( "DefaultDisplay" );
xMonProps->getPropertyValue( sPropName2 ) >>= nPrimaryIndex;
}
catch( Exception& )
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index c5f68ff..520f5a4 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -44,7 +44,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
- aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
+ aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" );
if ( fp )
return fp();
return 0;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index f44032d..1ce334a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -209,10 +209,8 @@ SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::ge
sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
{
if (mnListBoxDropFormatId == SAL_MAX_UINT32)
- mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "application/x-openoffice-treelistbox-moveonly;"
- "windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\"")));
+ mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(rtl::OUString(
+ "application/x-openoffice-treelistbox-moveonly;windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\""));
return mnListBoxDropFormatId;
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 507739a..2571bee 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -486,7 +486,7 @@ void SdTPAction::OpenFileDialog()
// links on the desktop to directories.
aFileDialog.AddFilter (
String (SfxResId (STR_SFX_FILTERNAME_ALL)),
- String (RTL_CONSTASCII_USTRINGPARAM("*.*")));
+ rtl::OUString("*.*"));
if( aFileDialog.Execute() == ERRCODE_NONE )
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d7552c8..807d7a2 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -728,8 +728,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void)
if ( ! xFactory.is())
break;
- Reference<frame::XDesktop> xDesktop (xFactory->createInstance (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY);
+ Reference<frame::XDesktop> xDesktop (xFactory->createInstance ("com.sun.star.frame.Desktop"), UNO_QUERY);
if ( ! xDesktop.is())
break;
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index db7c590..d4fad0a 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -347,8 +347,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl)
void SdVectorizeDlg::LoadSettings()
{
SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream(
- UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ),
+ rtl::OUString( SD_OPTION_VECTORIZE ) ,
SD_OPTION_LOAD ) );
sal_uInt16 nLayers;
sal_uInt16 nReduce;
@@ -381,8 +380,7 @@ void SdVectorizeDlg::LoadSettings()
void SdVectorizeDlg::SaveSettings() const
{
SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
- UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ),
+ rtl::OUString(SD_OPTION_VECTORIZE) ,
SD_OPTION_STORE ) );
if( xOStm.Is() )
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index d002566..89d3003 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -341,12 +341,12 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
else
{
if( nError == ERRCODE_IO_BROKENPACKAGE )
- SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( ERRCODE_IO_BROKENPACKAGE, OSL_LOG_PREFIX );
// TODO/LATER: correct error handling?!
//pStore->SetError( SVSTREAM_WRONGVERSION, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
else
- SetError( ERRCODE_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( ERRCODE_ABORT, OSL_LOG_PREFIX );
}
// tell SFX to change viewshell when in preview mode
@@ -575,7 +575,7 @@ sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium )
}
if( GetError() == ERRCODE_NONE )
- SetError( nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nVBWarning, OSL_LOG_PREFIX );
return bRet;
}
@@ -729,28 +729,28 @@ sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark)
SdrObject* pObj = NULL;
rtl::OUString sBookmark( rBookmark );
- const rtl::OUString sInteraction( RTL_CONSTASCII_USTRINGPARAM( "action?" ) );
+ const rtl::OUString sInteraction( "action?" );
if ( sBookmark.match( sInteraction ) )
{
- const rtl::OUString sJump( RTL_CONSTASCII_USTRINGPARAM( "jump=" ) );
+ const rtl::OUString sJump( "jump=" );
if ( sBookmark.match( sJump, sInteraction.getLength() ) )
{
rtl::OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) );
- if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "firstslide" ) ) ) )
+ if ( aDestination.match( "firstslide" ) )
{
nPageNumber = 1;
}
- else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "lastslide" ) ) ) )
+ else if ( aDestination.match( "lastslide" ) )
{
nPageNumber = mpDoc->GetPageCount() - 2;
}
- else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "previousslide" ) ) ) )
+ else if ( aDestination.match( "previousslide" ) )
{
SdPage* pPage = pDrawViewShell->GetActualPage();
nPageNumber = pPage->GetPageNum();
nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND;
}
- else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "nextslide" ) ) ) )
+ else if ( aDestination.match( "nextslide" ) )
{
SdPage* pPage = pDrawViewShell->GetActualPage();
nPageNumber = pPage->GetPageNum() + 2;
@@ -971,13 +971,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
{
*pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
*pFormat = bTemplate ? SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE : SOT_FORMATSTR_ID_STARDRAW_8;
- *pFullTypeName = String(RTL_CONSTASCII_USTRINGPARAM("Draw 8")); // HACK: method will be removed with new storage API
+ *pFullTypeName = "Draw 8"; // HACK: method will be removed with new storage API
}
else
{
*pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
*pFormat = bTemplate ? SOT_FORMATSTR_ID_STARIMPRESS_8_TEMPLATE : SOT_FORMATSTR_ID_STARIMPRESS_8;
- *pFullTypeName = String(RTL_CONSTASCII_USTRINGPARAM("Impress 8")); // HACK: method will be removed with new storage API
+ *pFullTypeName = "Impress 8"; // HACK: method will be removed with new storage API
}
}
commit 5aa0bc7b9a830fe497c6e74b109bbb7af40141a6
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Fri Apr 13 15:50:41 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 0e01cc9..a892f65 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -86,8 +86,7 @@ Reference<XInterface> SAL_CALL Configuration_createInstance (
OUString Configuration_getImplementationName (void) throw(RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Draw.framework.configuration.Configuration"));
+ return OUString("com.sun.star.comp.Draw.framework.configuration.Configuration");
}
@@ -96,8 +95,7 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException)
Sequence<rtl::OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.framework.Configuration")));
+ static const OUString sServiceName("com.sun.star.drawing.framework.Configuration");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -289,8 +287,8 @@ OUString SAL_CALL Configuration::getName (void)
OUString aString;
if (rBHelper.bDisposed || rBHelper.bInDispose)
- aString += OUString(RTL_CONSTASCII_USTRINGPARAM("DISPOSED "));
- aString += OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration["));
+ aString += "DISPOSED ";
+ aString += "Configuration[";
ResourceContainer::const_iterator iResource;
for (iResource=mpResourceContainer->begin();
@@ -298,10 +296,10 @@ OUString SAL_CALL Configuration::getName (void)
++iResource)
{
if (iResource != mpResourceContainer->begin())
- aString += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
+ aString += ", ";
aString += FrameworkHelper::ResourceIdToString(*iResource);
}
- aString += OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+ aString += "]";
return aString;
}
@@ -355,9 +353,7 @@ void Configuration::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Configuration object has already been disposed")),
+ throw lang::DisposedException ("Configuration object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 5bfec32..0f49bae 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -66,8 +66,7 @@ Reference<XInterface> SAL_CALL ConfigurationController_createInstance (
OUString ConfigurationController_getImplementationName (void) throw(RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Draw.framework.configuration.ConfigurationController"));
+ return OUString("com.sun.star.comp.Draw.framework.configuration.ConfigurationController");
}
@@ -76,8 +75,7 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep
Sequence<rtl::OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.framework.ConfigurationController")));
+ static const OUString sServiceName("com.sun.star.drawing.framework.ConfigurationController");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -656,18 +654,14 @@ void ConfigurationController::ThrowIfDisposed (void) const
{
if (mbIsDisposed)
{
- throw lang::DisposedException (
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ConfigurationController object has already been disposed")),
+ throw lang::DisposedException ("ConfigurationController object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
if (mpImplementation.get() == NULL)
{
OSL_ASSERT(mpImplementation.get() != NULL);
- throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ConfigurationController not initialized")),
+ throw RuntimeException("ConfigurationController not initialized",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index ec03006..0c27964 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -56,8 +56,7 @@ void ConfigurationControllerBroadcaster::AddListener(
const Any& rUserData)
{
if ( ! rxListener.is())
- throw lang::IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
+ throw lang::IllegalArgumentException("invalid listener",
mxConfigurationController,
0);
@@ -76,8 +75,7 @@ void ConfigurationControllerBroadcaster::RemoveListener(
const Reference<XConfigurationChangeListener>& rxListener)
{
if ( ! rxListener.is())
- throw lang::IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
+ throw lang::IllegalArgumentException("invalid listener",
mxConfigurationController,
0);
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 32685cf..1700b95 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -68,7 +68,7 @@ void ConfigurationTracer::TraceBoundResources (
{
Sequence<Reference<XResourceId> > aResourceList (
rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT));
- const ::rtl::OUString sIndentation (RTL_CONSTASCII_USTRINGPARAM(" "));
+ const ::rtl::OUString sIndentation (" ");
for (sal_Int32 nIndex=0; nIndex<aResourceList.getLength(); ++nIndex)
{
::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL());
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 498f22b..01f60c5 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -85,8 +85,8 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
OUString SAL_CALL GenericConfigurationChangeRequest::getName (void)
throw (RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("GenericConfigurationChangeRequest "))
- + (meMode==Activation ? OUString(RTL_CONSTASCII_USTRINGPARAM("activate ")) : OUString(RTL_CONSTASCII_USTRINGPARAM("deactivate ")))
+ return OUString("GenericConfigurationChangeRequest ")
+ + (meMode==Activation ? OUString("activate ") : OUString("deactivate "))
+ FrameworkHelper::ResourceIdToString(mxResourceId);
}
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index f4c0965..4f77bf2 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -54,8 +54,7 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag
Reference<lang::XMultiServiceFactory> xServiceManager (
::comphelper::getProcessServiceFactory());
mxURLTransformer = Reference<util::XURLTransformer>(
- xServiceManager->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+ xServiceManager->createInstance("com.sun.star.util.URLTransformer"),
UNO_QUERY);
}
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 83b531e..aece40c 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -63,8 +63,7 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance (
::rtl::OUString ResourceId_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.ResourceId"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.ResourceId");
}
@@ -73,8 +72,7 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance (
Sequence<rtl::OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ResourceId")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ResourceId");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -602,8 +600,7 @@ void ResourceId::ParseResourceURL (void)
Reference<lang::XMultiServiceFactory> xServiceManager (
::comphelper::getProcessServiceFactory());
xURLTransformer = Reference<util::XURLTransformer>(
- xServiceManager->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+ xServiceManager->createInstance("com.sun.star.util.URLTransformer"),
UNO_QUERY);
mxURLTransformerWeak = xURLTransformer;
SdGlobalResourceContainer::Instance().AddResource(
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 827b3d6..959bfa4 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -69,7 +69,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu
OUString SAL_CALL UpdateRequest::getName (void)
throw (RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateRequest"));
+ return OUString("UpdateRequest");
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 2b6b9d6..76e97a8 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -107,8 +107,7 @@ Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
::rtl::OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.BasicPaneFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory");
}
@@ -117,8 +116,7 @@ Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicPaneFactory")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -324,9 +322,7 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
{
// The requested pane can not be created by any of the factories
// managed by the called BasicPaneFactory object.
- throw lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicPaneFactory::createPane() called for unknown resource id")),
+ throw lang::IllegalArgumentException("BasicPaneFactory::createPane() called for unknown resource id",
NULL,
0);
}
@@ -383,9 +379,7 @@ void SAL_CALL BasicPaneFactory::releaseResource (
// The given XPane reference is either empty or the pane was not
// created by any of the factories managed by the called
// BasicPaneFactory object.
- throw lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicPaneFactory::releasePane() called for pane that that was not created by same factory.")),
+ throw lang::IllegalArgumentException("BasicPaneFactory::releasePane() called for pane that that was not created by same factory.",
NULL,
0);
}
@@ -524,9 +518,7 @@ void BasicPaneFactory::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicPaneFactory object has already been disposed")),
+ throw lang::DisposedException ("BasicPaneFactory object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index d272119..0b05ca4 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -55,8 +55,7 @@ Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
::rtl::OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.BasicToolBarFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory");
}
@@ -65,8 +64,7 @@ Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicToolBarFactory")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -232,9 +230,7 @@ void BasicToolBarFactory::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicToolBarFactory object has already been disposed")),
+ throw lang::DisposedException ("BasicToolBarFactory object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 3159e6b..9badf15 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -76,8 +76,7 @@ Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
::rtl::OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.BasicViewFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicViewFactory");
}
@@ -86,8 +85,7 @@ Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicViewFactory")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 9038001..0c50698 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -252,8 +252,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void)
Reference<lang::XMultiServiceFactory> xFactory (
mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
return Reference<rendering::XCanvas>(
- xFactory->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.SpriteCanvas.VCL")),
+ xFactory->createInstanceWithArguments("com.sun.star.rendering.SpriteCanvas.VCL",
aArg),
UNO_QUERY);
}
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list