[Libreoffice-commits] .: svx/inc svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 22 11:39:51 PST 2013
svx/inc/svx/gallery1.hxx | 2
svx/inc/tbunocontroller.hxx | 2
svx/inc/tbunosearchcontrollers.hxx | 6 -
svx/source/accessibility/AccessibleControlShape.cxx | 35 ++----
svx/source/accessibility/AccessibleFrameSelector.cxx | 8 -
svx/source/accessibility/AccessibleGraphicShape.cxx | 17 +-
svx/source/accessibility/AccessibleOLEShape.cxx | 20 +--
svx/source/accessibility/AccessibleShape.cxx | 53 +++------
svx/source/accessibility/AccessibleTextHelper.cxx | 33 ++---
svx/source/accessibility/ChildrenManager.cxx | 3
svx/source/accessibility/ChildrenManagerImpl.cxx | 13 --
svx/source/accessibility/DescriptionGenerator.cxx | 64 +++--------
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 10 -
svx/source/accessibility/ShapeTypeHandler.cxx | 8 -
svx/source/accessibility/SvxShapeTypes.cxx | 93 +++++-----------
svx/source/accessibility/lookupcolorname.cxx | 3
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 20 +--
17 files changed, 150 insertions(+), 240 deletions(-)
New commits:
commit bd99ab11e38b57e00bc29bd7d54c231fbc1638e2
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Tue Jan 22 20:36:32 2013 +0100
Remove RTL_CONSTASCII_USTRINGPARAM in svx
replaced equals() with ==
Change-Id: I8697cc700d9780306ac83f52253b60ea55be6853
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 3bf19d7..ac13509 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -68,7 +68,7 @@ public:
sal_Bool IsReadOnly() const { return bReadOnly; }
sal_Bool IsDefault() const;
- sal_Bool IsHidden() const { return aName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/")); }
+ sal_Bool IsHidden() const { return aName.match("private://gallery/hidden/"); }
sal_Bool IsModified() const { return bModified; }
void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsReadOnly() ); }
diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx
index 6761932..02365fc 100644
--- a/svx/inc/tbunocontroller.hxx
+++ b/svx/inc/tbunocontroller.hxx
@@ -48,7 +48,7 @@ class FontHeightToolBoxControl : public svt::ToolboxController,
static ::rtl::OUString getImplementationName_Static() throw()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.FontHeightToolBoxController" ));
+ return ::rtl::OUString("com.sun.star.svx.FontHeightToolBoxController");
}
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 674f718..dd57f0c 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -106,7 +106,7 @@ public:
static ::rtl::OUString getImplementationName_Static() throw()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.FindTextToolboxController" ));
+ return ::rtl::OUString("com.sun.star.svx.FindTextToolboxController");
}
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
@@ -238,9 +238,9 @@ public:
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException );
virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
- static ::rtl::OUString getImplementationName_Static() throw()
+ static OUString getImplementationName_Static() throw()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.Impl.FindbarDispatcher" ));
+ return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher");
}
static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 412fb41..972804e 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -57,19 +57,19 @@ namespace
//................................................................
const ::rtl::OUString& lcl_getNamePropertyName( )
{
- static ::rtl::OUString s_sNamePropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
+ static ::rtl::OUString s_sNamePropertyName( "Name" );
return s_sNamePropertyName;
}
//................................................................
const ::rtl::OUString& lcl_getDescPropertyName( )
{
- static ::rtl::OUString s_sDescPropertyDesc( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) );
+ static ::rtl::OUString s_sDescPropertyDesc( "HelpText" );
return s_sDescPropertyDesc;
}
//................................................................
const ::rtl::OUString& lcl_getLabelPropertyName( )
{
- static ::rtl::OUString s_sLabelPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
+ static ::rtl::OUString s_sLabelPropertyLabel( "Label" );
return s_sLabelPropertyLabel;
}
//................................................................
@@ -320,7 +320,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
//-----------------------------------------------------------------------------
::rtl::OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.accessibility.AccessibleControlShape" ) );
+ return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" );
}
//-----------------------------------------------------------------------------
@@ -332,14 +332,13 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
switch (nShapeType)
{
case DRAWING_CONTROL:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ControlShape"));
+ sName = "ControlShape";
break;
default:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleControlShape"));
+ sName = "UnknownAccessibleControlShape";
Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
if (xDescriptor.is())
- sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
- + xDescriptor->getShapeType();
+ sName += ": " + xDescriptor->getShapeType();
}
return sName;
@@ -364,12 +363,8 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
if ( sDesc.isEmpty() )
{ // no -> use the default
aDG.Initialize (STR_ObjNameSingulUno);
- aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
- DescriptionGenerator::COLOR,
- ::rtl::OUString());
- aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")),
- DescriptionGenerator::INTEGER,
- ::rtl::OUString());
+ aDG.AddProperty ("ControlBackground", DescriptionGenerator::COLOR, "");
+ aDG.AddProperty ( "ControlBorder", DescriptionGenerator::INTEGER, "");
}
// ensure that we are listening to the Name property
m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, sal_True, lcl_getDescPropertyName() );
@@ -377,12 +372,11 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
break;
default:
- aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unknown accessible control shape")) );
+ aDG.Initialize ("Unknown accessible control shape");
Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
if (xDescriptor.is())
{
- aDG.AppendString (::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("service name=")));
+ aDG.AppendString ("service name=");
aDG.AppendString (xDescriptor->getShapeType());
}
}
@@ -400,15 +394,14 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent&
::osl::MutexGuard aGuard( maMutex );
// check if it is the name or the description
- if ( _rEvent.PropertyName.equals( lcl_getNamePropertyName() )
- || _rEvent.PropertyName.equals( lcl_getLabelPropertyName( ) )
- )
+ if ( _rEvent.PropertyName == lcl_getNamePropertyName()
+ || _rEvent.PropertyName == lcl_getLabelPropertyName() )
{
SetAccessibleName(
CreateAccessibleName(),
AccessibleContextBase::AutomaticallyCreated);
}
- else if ( _rEvent.PropertyName.equals( lcl_getDescPropertyName() ) )
+ else if ( _rEvent.PropertyName == lcl_getDescPropertyName() )
{
SetAccessibleDescription(
CreateAccessibleDescription(),
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index a84cc75..7c60da1 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -557,7 +557,7 @@ void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessib
OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("AccFrameSelector"));
+ return OUString("AccFrameSelector");
}
// ----------------------------------------------------------------------------
@@ -581,9 +581,9 @@ Sequence< OUString > AccFrameSelector::getSupportedServiceNames( )
{
Sequence< OUString > aRet(3);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessible ) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleContext ) );
- pArray[2] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleComponent) );
+ pArray[0] = OUString( sAccessible );
+ pArray[1] = OUString( sAccessibleContext );
+ pArray[2] = OUString( sAccessibleComponent );
return aRet;
}
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 2ff15ff..479be27 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -111,12 +111,11 @@ void SAL_CALL
//===== XServiceInfo ========================================================
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
AccessibleGraphicShape::getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("AccessibleGraphicShape"));
+ return OUString("AccessibleGraphicShape");
}
@@ -134,8 +133,7 @@ void SAL_CALL
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
- static const OUString sAdditionalServiceName (RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.AccessibleGraphicShape"));
+ static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleGraphicShape");
aServiceNames[nCount] = sAdditionalServiceName;
return aServiceNames;
@@ -170,21 +168,20 @@ uno::Sequence<uno::Type> SAL_CALL
AccessibleGraphicShape::CreateAccessibleBaseName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString sName;
+ OUString sName;
ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
switch (nShapeType)
{
case DRAWING_GRAPHIC_OBJECT:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("GraphicObjectShape"));
+ sName = "GraphicObjectShape";
break;
default:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleGraphicShape"));
+ sName = "UnknownAccessibleGraphicShape";
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;
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index d0ef782..8226586 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -126,7 +126,7 @@ void SAL_CALL
AccessibleOLEShape::getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleOLEShape"));
+ return OUString("AccessibleOLEShape");
}
@@ -144,8 +144,7 @@ void SAL_CALL
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
- static const ::rtl::OUString sAdditionalServiceName (RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.AccessibleOLEShape"));
+ static const ::rtl::OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleOLEShape");
aServiceNames[nCount] = sAdditionalServiceName;
return aServiceNames;
@@ -180,30 +179,29 @@ uno::Sequence<uno::Type> SAL_CALL
AccessibleOLEShape::CreateAccessibleBaseName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString sName;
+ OUString sName;
ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
switch (nShapeType)
{
case DRAWING_APPLET:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("AppletOLEShape"));
+ sName = "AppletOLEShape";
break;
case DRAWING_FRAME:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("FrameOLEShape"));
+ sName = "FrameOLEShape";
break;
case DRAWING_OLE:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("OLEShape"));
+ sName = "OLEShape";
break;
case DRAWING_PLUGIN:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("PluginOLEShape"));
+ sName = "PluginOLEShape";
break;
default:
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleOLEShape"));
+ sName = "UnknownAccessibleOLEShape";
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;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index fa634f4..f4f237b 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -222,7 +222,7 @@ void AccessibleShape::UpdateStates (void)
try
{
drawing::FillStyle aFillStyle;
- bShapeIsOpaque = ( xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle"))) >>= aFillStyle)
+ bShapeIsOpaque = ( xSet->getPropertyValue (::rtl::OUString("FillStyle")) >>= aFillStyle)
&& aFillStyle == drawing::FillStyle_SOLID;
}
catch (::com::sun::star::beans::UnknownPropertyException&)
@@ -371,7 +371,7 @@ uno::Reference<XAccessible> SAL_CALL
}
else
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shape has no child with index "))
+ ::rtl::OUString("shape has no child with index ")
+ rtl::OUString::valueOf(nIndex),
static_cast<uno::XWeak*>(this));
@@ -482,10 +482,8 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void)
if ( mxShape.is() )
{
- static const OUString sBoundRectName (
- RTL_CONSTASCII_USTRINGPARAM("BoundRect"));
- static const OUString sAnchorPositionName (
- RTL_CONSTASCII_USTRINGPARAM("AnchorPosition"));
+ static const OUString sBoundRectName ("BoundRect");
+ static const OUString sAnchorPositionName ("AnchorPosition");
// Get the shape's bounding box in internal coordinates (in 100th of
// mm). Use the property BoundRect. Only if that is not supported ask
@@ -544,8 +542,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void)
// Transform coordinates from internal to pixel.
if (maShapeTreeInfo.GetViewForwarder() == NULL)
throw uno::RuntimeException (::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM(
- "AccessibleShape has no valid view forwarder")),
+ "AccessibleShape has no valid view forwarder"),
static_cast<uno::XWeak*>(this));
::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
::Size (aBoundingBox.Width, aBoundingBox.Height));
@@ -648,7 +645,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void)
if (aSet.is())
{
uno::Any aColor;
- aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")) );
+ aColor = aSet->getPropertyValue (OUString("LineColor"));
aColor >>= nColor;
}
}
@@ -674,7 +671,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void)
if (aSet.is())
{
uno::Any aColor;
- aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")) );
+ aColor = aSet->getPropertyValue (OUString("FillColor"));
aColor >>= nColor;
}
}
@@ -770,7 +767,7 @@ void SAL_CALL
AccessibleShape::getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleShape"));
+ return ::rtl::OUString("AccessibleShape");
}
@@ -788,8 +785,7 @@ uno::Sequence<OUString> SAL_CALL
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
- static const OUString sAdditionalServiceName (RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.AccessibleShape"));
+ static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleShape");
aServiceNames[nCount] = sAdditionalServiceName;
return aServiceNames;
@@ -876,8 +872,7 @@ void SAL_CALL
AccessibleShape::notifyEvent (const document::EventObject& rEventObject)
throw (uno::RuntimeException)
{
- static const OUString sShapeModified (
- RTL_CONSTASCII_USTRINGPARAM("ShapeModified"));
+ static const OUString sShapeModified ("ShapeModified");
// First check if the event is for us.
uno::Reference<drawing::XShape> xShape (
@@ -992,7 +987,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
uno::Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
if (xSet.is())
{
- uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")) ));
+ uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString("ZOrder")));
aZOrder >>= nIndex;
// Add one to be not zero based.
@@ -1003,7 +998,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
{
// We throw our own exception that is a bit more informative.
throw uno::RuntimeException (::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM("AccessibleShape has invalid index and no ZOrder property")),
+ "AccessibleShape has invalid index and no ZOrder property"),
static_cast<uno::XWeak*>(this));
}
@@ -1011,7 +1006,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
// Put a space between name and index because of Gnopernicus othewise
// spells the name.
- sName += OUString (RTL_CONSTASCII_USTRINGPARAM(" ")) + OUString::valueOf (nIndex);
+ sName += " " + OUString::valueOf (nIndex);
return sName;
}
@@ -1062,12 +1057,8 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
break;
case DRAWING_CONTROL:
- aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
- DescriptionGenerator::COLOR,
- OUString());
- aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")),
- DescriptionGenerator::INTEGER,
- OUString());
+ aDG.AddProperty ("ControlBackground", DescriptionGenerator::COLOR, "");
+ aDG.AddProperty ("ControlBorder", DescriptionGenerator::INTEGER, "");
break;
case DRAWING_TEXT:
@@ -1075,12 +1066,11 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
break;
default:
- aDG.Initialize (::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM("Unknown accessible shape")));
+ aDG.Initialize ("Unknown accessible 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());
}
}
@@ -1169,20 +1159,20 @@ void AccessibleShape::UpdateNameAndDescription (void)
OUString sString;
// Get the accessible name.
- sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Title")));
+ sString = GetOptionalProperty(xSet, "Title");
if (!sString.isEmpty())
{
SetAccessibleName(sString, AccessibleContextBase::FromShape);
}
else
{
- sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Name")));
+ sString = GetOptionalProperty(xSet, "Name");
if (!sString.isEmpty())
SetAccessibleName(sString, AccessibleContextBase::FromShape);
}
// Get the accessible description.
- sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
+ sString = GetOptionalProperty(xSet, "Description");
if (!sString.isEmpty())
SetAccessibleDescription(sString, AccessibleContextBase::FromShape);
}
@@ -1191,9 +1181,6 @@ void AccessibleShape::UpdateNameAndDescription (void)
}
}
-
-
-
} // end of namespace accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 08ed92b..6694a8f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -300,17 +300,17 @@ namespace accessibility
DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( !maEditSource.IsValid() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
+ throw uno::RuntimeException("Unknown edit source", mxFrontEnd);
SvxTextForwarder* pTextForwarder = maEditSource.GetTextForwarder();
if( !pTextForwarder )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch text forwarder, model might be dead")), mxFrontEnd);
+ throw uno::RuntimeException("Unable to fetch text forwarder, model might be dead", mxFrontEnd);
if( pTextForwarder->IsValid() )
return *pTextForwarder;
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text forwarder is invalid, model might be dead")), mxFrontEnd);
+ throw uno::RuntimeException("Text forwarder is invalid, model might be dead", mxFrontEnd);
}
SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
@@ -318,17 +318,17 @@ namespace accessibility
DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( !maEditSource.IsValid() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
+ throw uno::RuntimeException("Unknown edit source", mxFrontEnd);
SvxViewForwarder* pViewForwarder = maEditSource.GetViewForwarder();
if( !pViewForwarder )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch view forwarder, model might be dead")), mxFrontEnd);
+ throw uno::RuntimeException("Unable to fetch view forwarder, model might be dead", mxFrontEnd);
if( pViewForwarder->IsValid() )
return *pViewForwarder;
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, model might be dead")), mxFrontEnd);
+ throw uno::RuntimeException("View forwarder is invalid, model might be dead", mxFrontEnd);
}
SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
@@ -336,16 +336,16 @@ namespace accessibility
DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( !maEditSource.IsValid() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
+ throw uno::RuntimeException("Unknown edit source", mxFrontEnd);
SvxEditViewForwarder* pViewForwarder = maEditSource.GetEditViewForwarder( bCreate );
if( !pViewForwarder )
{
if( bCreate )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch edit view forwarder, model might be dead")), mxFrontEnd);
+ throw uno::RuntimeException("Unable to fetch edit view forwarder, model might be dead", mxFrontEnd);
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No edit view forwarder, object not in edit mode")), mxFrontEnd);
+ throw uno::RuntimeException("No edit view forwarder, object not in edit mode", mxFrontEnd);
}
if( pViewForwarder->IsValid() )
@@ -353,9 +353,9 @@ namespace accessibility
else
{
if( bCreate )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, model might be dead")), mxFrontEnd);
+ throw uno::RuntimeException("View forwarder is invalid, model might be dead", mxFrontEnd);
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object not in edit mode")), mxFrontEnd);
+ throw uno::RuntimeException("View forwarder is invalid, object not in edit mode", mxFrontEnd);
}
}
@@ -366,7 +366,7 @@ namespace accessibility
if( maEditSource.IsValid() )
return maEditSource;
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTextHelper_Impl::GetEditSource: no edit source")), mxFrontEnd );
+ throw uno::RuntimeException("AccessibleTextHelper_Impl::GetEditSource: no edit source", mxFrontEnd );
}
sal_Bool AccessibleTextHelper_Impl::IsSelected() const
@@ -1634,7 +1634,7 @@ namespace accessibility
if( 0 > i || i >= getAccessibleChildCount() ||
GetTextForwarder().GetParagraphCount() <= i )
{
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid child index")), mxFrontEnd);
+ throw lang::IndexOutOfBoundsException("Invalid child index", mxFrontEnd);
}
DBG_ASSERT(mxFrontEnd.is(), "AccessibleTextHelper_Impl::UpdateVisibleChildren: no frontend set");
@@ -1667,18 +1667,17 @@ namespace accessibility
// make given position relative
if( !mxFrontEnd.is() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid")), mxFrontEnd );
+ throw uno::RuntimeException("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid", mxFrontEnd );
uno::Reference< XAccessibleContext > xFrontEndContext = mxFrontEnd->getAccessibleContext();
if( !xFrontEndContext.is() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid")), mxFrontEnd );
+ throw uno::RuntimeException("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid", mxFrontEnd );
uno::Reference< XAccessibleComponent > xFrontEndComponent( xFrontEndContext, uno::UNO_QUERY );
if( !xFrontEndComponent.is() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTextHelper_Impl::getAccessibleAt: frontend is no XAccessibleComponent")),
- mxFrontEnd );
+ throw uno::RuntimeException("AccessibleTextHelper_Impl::getAccessibleAt: frontend is no XAccessibleComponent", mxFrontEnd );
// #103862# No longer need to make given position relative
Point aPoint( _aPoint.X, _aPoint.Y );
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index c6054ae..c2cfdcb 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -42,8 +42,7 @@ ChildrenManager::ChildrenManager (
mpImpl->Init ();
else
throw uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ChildrenManager::ChildrenManager can't create implementation object")), NULL);
+ "ChildrenManager::ChildrenManager can't create implementation object", NULL);
}
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index a0cf80c..a853b78 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -121,8 +121,7 @@ uno::Reference<XAccessible>
// Check whether the given index is valid.
if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
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),
mxParent);
return GetChild (maVisibleChildren[nIndex],nIndex);
@@ -667,15 +666,13 @@ void SAL_CALL
const document::EventObject& rEventObject)
throw (uno::RuntimeException)
{
- static const ::rtl::OUString sShapeInserted (
- RTL_CONSTASCII_USTRINGPARAM("ShapeInserted"));
- static const ::rtl::OUString sShapeRemoved (
- RTL_CONSTASCII_USTRINGPARAM("ShapeRemoved"));
+ static const ::rtl::OUString sShapeInserted ("ShapeInserted");
+ static const ::rtl::OUString sShapeRemoved ("ShapeRemoved");
- if (rEventObject.EventName.equals (sShapeInserted))
+ if (rEventObject.EventName == sShapeInserted)
AddShape (Reference<drawing::XShape>(rEventObject.Source, uno::UNO_QUERY));
- else if (rEventObject.EventName.equals (sShapeRemoved))
+ else if (rEventObject.EventName == sShapeRemoved)
RemoveShape (Reference<drawing::XShape>(rEventObject.Source, uno::UNO_QUERY));
// else ignore unknown event.
}
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 3a21d1e..2a407d3 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -109,19 +109,17 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix)
{
if (mxSet.is())
{
- uno::Any aValue = mxSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("Style")) );
+ uno::Any aValue = mxSet->getPropertyValue ("Style");
uno::Reference<container::XNamed> xStyle (aValue, uno::UNO_QUERY);
if (xStyle.is())
msDescription.append (xStyle->getName());
}
else
- msDescription.append (
- OUString(RTL_CONSTASCII_USTRINGPARAM("<no style>")) );
+ msDescription.append ("<no style>");
}
catch (const ::com::sun::star::beans::UnknownPropertyException &)
{
- msDescription.append (
- OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
+ msDescription.append ("<unknown>");
}
}
}
@@ -208,16 +206,10 @@ void DescriptionGenerator::AppendString (const ::rtl::OUString& sString)
void DescriptionGenerator::AddLineProperties (void)
{
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")),
- DescriptionGenerator::COLOR,
- SIP_XA_LINECOLOR);
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineDashName")),
- DescriptionGenerator::STRING,
- SIP_XA_LINEDASH,
- XATTR_LINEDASH);
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")),
- DescriptionGenerator::INTEGER,
- SIP_XA_LINEWIDTH);
+ AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR);
+ AddProperty ("LineDashName", DescriptionGenerator::STRING,
+ SIP_XA_LINEDASH, XATTR_LINEDASH);
+ AddProperty ("LineWidth", DescriptionGenerator::INTEGER, SIP_XA_LINEWIDTH);
}
@@ -228,9 +220,7 @@ void DescriptionGenerator::AddLineProperties (void)
*/
void DescriptionGenerator::AddFillProperties (void)
{
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")),
- DescriptionGenerator::FILL_STYLE,
- SIP_XA_FILLSTYLE);
+ AddProperty ("FillStyle", DescriptionGenerator::FILL_STYLE, SIP_XA_FILLSTYLE);
}
@@ -238,8 +228,7 @@ void DescriptionGenerator::AddFillProperties (void)
void DescriptionGenerator::Add3DProperties (void)
{
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("D3DMaterialColor")),
- DescriptionGenerator::COLOR,
+ AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR,
RID_SVXSTR_A11Y_3D_MATERIAL_COLOR);
AddLineProperties ();
AddFillProperties ();
@@ -250,8 +239,7 @@ void DescriptionGenerator::Add3DProperties (void)
void DescriptionGenerator::AddTextProperties (void)
{
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")),
- DescriptionGenerator::COLOR);
+ AddProperty ("CharColor", DescriptionGenerator::COLOR);
AddFillProperties ();
}
@@ -281,8 +269,7 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName,
}
catch (const ::com::sun::star::beans::UnknownPropertyException &)
{
- msDescription.append (
- OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
+ msDescription.append ("<unknown>");
}
}
@@ -307,8 +294,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName,
}
catch (const ::com::sun::star::beans::UnknownPropertyException &)
{
- msDescription.append (
- OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
+ msDescription.append ("<unknown>");
}
}
@@ -343,8 +329,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName,
}
catch (const ::com::sun::star::beans::UnknownPropertyException &)
{
- msDescription.append (
- OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
+ msDescription.append ("<unknown>");
}
}
@@ -398,29 +383,19 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
case drawing::FillStyle_NONE:
break;
case drawing::FillStyle_SOLID:
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),
- COLOR,
- SIP_XA_FILLCOLOR);
+ AddProperty ("FillColor", COLOR, SIP_XA_FILLCOLOR);
break;
case drawing::FillStyle_GRADIENT:
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillGradientName")),
- STRING,
- SIP_XA_FILLGRADIENT,
+ AddProperty ("FillGradientName", STRING, SIP_XA_FILLGRADIENT,
XATTR_FILLGRADIENT);
break;
case drawing::FillStyle_HATCH:
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),
- COLOR,
- SIP_XA_FILLCOLOR);
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillHatchName")),
- STRING,
- SIP_XA_FILLHATCH,
+ AddProperty ("FillColor", COLOR, SIP_XA_FILLCOLOR);
+ AddProperty ("FillHatchName", STRING, SIP_XA_FILLHATCH,
XATTR_FILLHATCH);
break;
case drawing::FillStyle_BITMAP:
- AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillBitmapName")),
- STRING,
- SIP_XA_FILLBITMAP,
+ AddProperty ("FillBitmapName", STRING, SIP_XA_FILLBITMAP,
XATTR_FILLBITMAP);
break;
case drawing::FillStyle_MAKE_FIXED_SIZE:
@@ -430,8 +405,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
}
catch (const ::com::sun::star::beans::UnknownPropertyException &)
{
- msDescription.append (
- OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
+ msDescription.append ("<unknown>");
}
}
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 58c34a4..61d09f9 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -560,7 +560,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void)
OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ) );
+ return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" );
}
//-----------------------------------------------------------------------------
@@ -588,9 +588,9 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
{
Sequence< OUString > aSNs( 3 );
- aSNs[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.Accessible" ) );
- aSNs[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) );
- aSNs[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.AccessibleGraphControl" ) );
+ aSNs[0] = "com.sun.star.accessibility.Accessible";
+ aSNs[1] = "com.sun.star.accessibility.AccessibleContext";
+ aSNs[2] = "com.sun.star.drawing.AccessibleGraphControl";
return aSNs;
}
@@ -607,7 +607,7 @@ Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId(
OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) );
+ return OUString( "com.sun.star.accessibility.AccessibleContext" );
}
//===== XAccessibleSelection =============================================
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index a68c43c..719fc3e 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -136,8 +136,7 @@ ShapeTypeHandler::ShapeTypeHandler (void)
// Make sure that at least the UNKNOWN entry is present.
// Resize the list, if necessary, so that the new type can be inserted.
maShapeTypeDescriptorList[0].mnShapeTypeId = UNKNOWN_SHAPE_TYPE;
- maShapeTypeDescriptorList[0].msServiceName =
- OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN_SHAPE_TYPE"));
+ maShapeTypeDescriptorList[0].msServiceName = "UNKNOWN_SHAPE_TYPE";
maShapeTypeDescriptorList[0].maCreateFunction = CreateEmptyShapeReference;
maServiceNameToSlotId[maShapeTypeDescriptorList[0].msServiceName] = 0;
}
@@ -298,11 +297,10 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape
break;
default:
nResourceId = -1;
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleShape"));
+ sName = "UnknownAccessibleShape";
uno::Reference<drawing::XShapeDescriptor> xDescriptor (rxShape, uno::UNO_QUERY);
if (xDescriptor.is())
- sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
- + xDescriptor->getShapeType();
+ sName += ": " + xDescriptor->getShapeType();
break;
}
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index e88236e..373b227 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
@@ -90,98 +90,67 @@ void RegisterDrawShapeTypes (void)
<type>SvxShapeTypes</type> enum.
*/
ShapeTypeDescriptor aSvxShapeTypeList[] = {
- ShapeTypeDescriptor (DRAWING_TEXT,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape")),
+ ShapeTypeDescriptor ( DRAWING_TEXT, "com.sun.star.drawing.TextShape",
CreateSvxAccessibleShape),
- ShapeTypeDescriptor (DRAWING_RECTANGLE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")),
+ ShapeTypeDescriptor (DRAWING_RECTANGLE, "com.sun.star.drawing.RectangleShape",
CreateSvxAccessibleShape),
- ShapeTypeDescriptor ( DRAWING_ELLIPSE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.EllipseShape")),
+ ShapeTypeDescriptor ( DRAWING_ELLIPSE, "com.sun.star.drawing.EllipseShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_CONTROL,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")),
+ ShapeTypeDescriptor ( DRAWING_CONTROL, "com.sun.star.drawing.ControlShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_CONNECTOR,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")),
+ ShapeTypeDescriptor ( DRAWING_CONNECTOR, "com.sun.star.drawing.ConnectorShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_MEASURE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MeasureShape")),
+ ShapeTypeDescriptor ( DRAWING_MEASURE, "com.sun.star.drawing.MeasureShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_LINE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")),
+ ShapeTypeDescriptor ( DRAWING_LINE, "com.sun.star.drawing.LineShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_POLY_POLYGON,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonShape")),
+ ShapeTypeDescriptor ( DRAWING_POLY_POLYGON, "com.sun.star.drawing.PolyPolygonShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_POLY_LINE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")),
+ ShapeTypeDescriptor ( DRAWING_POLY_LINE, "com.sun.star.drawing.PolyLineShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenBezierShape")),
+ ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER, "com.sun.star.drawing.OpenBezierShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedBezierShape")),
+ ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER, "com.sun.star.drawing.ClosedBezierShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OpenFreeHandShape")),
+ ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND, "com.sun.star.drawing.OpenFreeHandShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ClosedFreeHandShape")),
+ ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND, "com.sun.star.drawing.ClosedFreeHandShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyPolygonPathShape")),
+ ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH, "com.sun.star.drawing.PolyPolygonPathShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLinePathShape")),
+ ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH, "com.sun.star.drawing.PolyLinePathShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")),
+ ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT, "com.sun.star.drawing.GraphicObjectShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_GROUP,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")),
+ ShapeTypeDescriptor ( DRAWING_GROUP, "com.sun.star.drawing.GroupShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_OLE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")),
+ ShapeTypeDescriptor ( DRAWING_OLE, "com.sun.star.drawing.OLE2Shape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_PAGE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PageShape")),
+ ShapeTypeDescriptor ( DRAWING_PAGE, "com.sun.star.drawing.PageShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_CAPTION,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")),
+ ShapeTypeDescriptor ( DRAWING_CAPTION, "com.sun.star.drawing.CaptionShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_FRAME,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FrameShape")),
+ ShapeTypeDescriptor ( DRAWING_FRAME, "com.sun.star.drawing.FrameShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_PLUGIN,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PluginShape")),
+ ShapeTypeDescriptor ( DRAWING_PLUGIN, "com.sun.star.drawing.PluginShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_APPLET,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AppletShape")),
+ ShapeTypeDescriptor ( DRAWING_APPLET, "com.sun.star.drawing.AppletShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_3D_SCENE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSceneObject")),
+ ShapeTypeDescriptor ( DRAWING_3D_SCENE, "com.sun.star.drawing.Shape3DSceneObject",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_3D_CUBE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DCubeObject")),
+ ShapeTypeDescriptor ( DRAWING_3D_CUBE, "com.sun.star.drawing.Shape3DCubeObject",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_3D_SPHERE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DSphereObject")),
+ ShapeTypeDescriptor ( DRAWING_3D_SPHERE, "com.sun.star.drawing.Shape3DSphereObject",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_3D_LATHE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DLatheObject")),
+ ShapeTypeDescriptor ( DRAWING_3D_LATHE, "com.sun.star.drawing.Shape3DLatheObject",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject")),
+ ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE, "com.sun.star.drawing.Shape3DExtrudeObject",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_CUSTOM,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")),
+ ShapeTypeDescriptor ( DRAWING_CUSTOM, "com.sun.star.drawing.CustomShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_TABLE,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ),
+ ShapeTypeDescriptor ( DRAWING_TABLE, "com.sun.star.drawing.TableShape",
CreateSvxAccessibleShape ),
- ShapeTypeDescriptor ( DRAWING_MEDIA,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ),
+ ShapeTypeDescriptor ( DRAWING_MEDIA, "com.sun.star.drawing.MediaShape",
CreateSvxAccessibleShape ),
};
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index a108d84..6c2ff29 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -55,8 +55,7 @@ ColorNameMap::ColorNameMap() {
{
// Create color table in which to look up the given color.
css::uno::Reference< css::container::XNameContainer > xColorTable (
- comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable")) ),
+ comphelper::getProcessServiceFactory()->createInstance( "com.sun.star.drawing.ColorTable" ),
css::uno::UNO_QUERY);
// Get list of color names in order to iterate over the color table.
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 8bb7ad4..a5f0703 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -505,7 +505,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( )
::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ) );
+ return ::rtl::OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" );
}
sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException )
@@ -526,10 +526,10 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const ::rtl::OUS
return sal_False;
}
-Sequence< ::rtl::OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException )
+Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException )
{
- const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) );
- return Sequence< ::rtl::OUString >( &sServiceName, 1 );
+ const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" );
+ return Sequence< OUString >( &sServiceName, 1 );
}
//===== XTypeProvider =======================================================
@@ -600,7 +600,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccess
void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- ::rtl::OUString aMessage( RTL_CONSTASCII_USTRINGPARAM( "deselectAccessibleChild is not possible in this context" ) );
+ OUString aMessage( "deselectAccessibleChild is not possible in this context" );
DBG_ASSERT( sal_False, "SvxRectCtlAccessibleContext::deselectAccessibleChild() is not possible!" );
@@ -1035,9 +1035,9 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeE
//===== XServiceInfo ========================================================
-::rtl::OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException )
+OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ) );
+ return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" );
}
sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException )
@@ -1056,10 +1056,10 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const ::rtl
return sal_False;
}
-Sequence< ::rtl::OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException )
+Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException )
{
- const ::rtl::OUString sServiceName (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.AccessibleContext"));
- return Sequence< ::rtl::OUString >( &sServiceName, 1 );
+ const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext");
+ return Sequence< OUString >( &sServiceName, 1 );
}
//===== XTypeProvider =======================================================
More information about the Libreoffice-commits
mailing list