[Libreoffice-commits] .: svx/source
David Tardon
dtardon at kemper.freedesktop.org
Sat Nov 13 23:45:21 PST 2010
svx/source/accessibility/AccessibleControlShape.cxx | 8 ++--
svx/source/accessibility/AccessibleFrameSelector.cxx | 2 -
svx/source/accessibility/AccessibleShape.cxx | 12 +++---
svx/source/accessibility/ChildrenManager.cxx | 4 +-
svx/source/accessibility/ChildrenManagerImpl.cxx | 4 +-
svx/source/accessibility/DGColorNameLookUp.cxx | 2 -
svx/source/accessibility/DescriptionGenerator.cxx | 36 +++++++++----------
svx/source/accessibility/ShapeTypeHandler.cxx | 2 -
svx/source/fmcomp/fmgridcl.cxx | 4 +-
svx/source/fmcomp/gridcols.cxx | 4 +-
svx/source/gallery2/galbrws1.cxx | 2 -
svx/source/mnuctrls/SmartTagCtl.cxx | 4 --
12 files changed, 41 insertions(+), 43 deletions(-)
New commits:
commit 4a4ae0212c0b07cbd3a77f3d362f83c987a0cf41
Author: Joost Eekhoorn <joost.eekhoorn at gmail.com>
Date: Sun Nov 14 08:45:11 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in svx
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 0d1aed7..d3d181a 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -380,10 +380,10 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
if ( !sDesc.getLength() )
{ // no -> use the default
aDG.Initialize (STR_ObjNameSingulUno);
- aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBackground"),
+ aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
DescriptionGenerator::COLOR,
::rtl::OUString());
- aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBorder"),
+ aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")),
DescriptionGenerator::INTEGER,
::rtl::OUString());
}
@@ -393,8 +393,8 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
break;
default:
- aDG.Initialize (::rtl::OUString::createFromAscii (
- "Unknown accessible control shape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unknown accessible control shape")) );
Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
if (xDescriptor.is())
{
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index d4c1682..dfb7e81 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -563,7 +563,7 @@ void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventLis
OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException)
{
- return OUString::createFromAscii("AccFrameSelector");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("AccFrameSelector"));
}
// ----------------------------------------------------------------------------
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 61dde08..1b2577a 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -378,7 +378,7 @@ uno::Reference<XAccessible> SAL_CALL
}
else
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString::createFromAscii ("shape has no child with index ")
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shape has no child with index "))
+ rtl::OUString::valueOf(nIndex),
static_cast<uno::XWeak*>(this));
@@ -676,7 +676,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void)
if (aSet.is())
{
uno::Any aColor;
- aColor = aSet->getPropertyValue (OUString::createFromAscii ("LineColor"));
+ aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")) );
aColor >>= nColor;
}
}
@@ -702,7 +702,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void)
if (aSet.is())
{
uno::Any aColor;
- aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillColor"));
+ aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")) );
aColor >>= nColor;
}
}
@@ -1034,7 +1034,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::createFromAscii ("ZOrder")));
+ uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")) ));
aZOrder >>= nIndex;
// Add one to be not zero based.
@@ -1104,10 +1104,10 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
break;
case DRAWING_CONTROL:
- aDG.AddProperty (OUString::createFromAscii ("ControlBackground"),
+ aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
DescriptionGenerator::COLOR,
OUString());
- aDG.AddProperty (OUString::createFromAscii ("ControlBorder"),
+ aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")),
DescriptionGenerator::INTEGER,
OUString());
break;
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index 9019ad4..20328e6 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -53,8 +53,8 @@ ChildrenManager::ChildrenManager (
mpImpl->Init ();
else
throw uno::RuntimeException(
- ::rtl::OUString::createFromAscii(
- "ChildrenManager::ChildrenManager can't create implementation object"), NULL);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "ChildrenManager::ChildrenManager can't create implementation object")), NULL);
}
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 32dfa31..a6f86b0 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -133,8 +133,8 @@ uno::Reference<XAccessible>
// Check wether the given index is valid.
if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString::createFromAscii(
- "no accessible child with index ") + nIndex,
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "no accessible child with index ")) + nIndex,
mxParent);
return GetChild (maVisibleChildren[nIndex],nIndex);
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index cafe0d6..70dd580 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -99,7 +99,7 @@ DGColorNameLookUp::DGColorNameLookUp (void)
// Create color table in which to look up the given color.
uno::Reference<container::XNameContainer> xColorTable (
::comphelper::getProcessServiceFactory()->createInstance(
- OUString::createFromAscii("com.sun.star.drawing.ColorTable")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable")) ),
uno::UNO_QUERY);
// Get list of color names in order to iterate over the color table.
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 999b155..54c288a 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -123,19 +123,19 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix)
{
if (mxSet.is())
{
- uno::Any aValue = mxSet->getPropertyValue (OUString::createFromAscii ("Style"));
+ uno::Any aValue = mxSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("Style")) );
uno::Reference<container::XNamed> xStyle (aValue, uno::UNO_QUERY);
if (xStyle.is())
msDescription.append (xStyle->getName());
}
else
msDescription.append (
- OUString::createFromAscii("<no style>"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("<no style>")) );
}
catch (::com::sun::star::beans::UnknownPropertyException)
{
msDescription.append (
- OUString::createFromAscii("<unknown>"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
}
}
}
@@ -222,14 +222,14 @@ void DescriptionGenerator::AppendString (const ::rtl::OUString& sString)
void DescriptionGenerator::AddLineProperties (void)
{
- AddProperty (OUString::createFromAscii ("LineColor"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")),
DescriptionGenerator::COLOR,
SIP_XA_LINECOLOR);
- AddProperty (OUString::createFromAscii ("LineDashName"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineDashName")),
DescriptionGenerator::STRING,
SIP_XA_LINEDASH,
XATTR_LINEDASH);
- AddProperty (OUString::createFromAscii ("LineWidth"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")),
DescriptionGenerator::INTEGER,
SIP_XA_LINEWIDTH);
}
@@ -242,7 +242,7 @@ void DescriptionGenerator::AddLineProperties (void)
*/
void DescriptionGenerator::AddFillProperties (void)
{
- AddProperty (OUString::createFromAscii ("FillStyle"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")),
DescriptionGenerator::FILL_STYLE,
SIP_XA_FILLSTYLE);
}
@@ -252,7 +252,7 @@ void DescriptionGenerator::AddFillProperties (void)
void DescriptionGenerator::Add3DProperties (void)
{
- AddProperty (OUString::createFromAscii ("D3DMaterialColor"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("D3DMaterialColor")),
DescriptionGenerator::COLOR,
RID_SVXSTR_A11Y_3D_MATERIAL_COLOR);
AddLineProperties ();
@@ -264,7 +264,7 @@ void DescriptionGenerator::Add3DProperties (void)
void DescriptionGenerator::AddTextProperties (void)
{
- AddProperty (OUString::createFromAscii ("CharColor"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")),
DescriptionGenerator::COLOR);
AddFillProperties ();
}
@@ -296,7 +296,7 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName,
catch (::com::sun::star::beans::UnknownPropertyException)
{
msDescription.append (
- OUString::createFromAscii("<unknown>"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
}
}
@@ -332,7 +332,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName,
catch (::com::sun::star::beans::UnknownPropertyException)
{
msDescription.append (
- OUString::createFromAscii("<unknown>"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
}
}
@@ -368,7 +368,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName,
catch (::com::sun::star::beans::UnknownPropertyException)
{
msDescription.append (
- OUString::createFromAscii("<unknown>"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
}
}
@@ -422,27 +422,27 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
case drawing::FillStyle_NONE:
break;
case drawing::FillStyle_SOLID:
- AddProperty (OUString::createFromAscii ("FillColor"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),
COLOR,
SIP_XA_FILLCOLOR);
break;
case drawing::FillStyle_GRADIENT:
- AddProperty (OUString::createFromAscii ("FillGradientName"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillGradientName")),
STRING,
SIP_XA_FILLGRADIENT,
XATTR_FILLGRADIENT);
break;
case drawing::FillStyle_HATCH:
- AddProperty (OUString::createFromAscii ("FillColor"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),
COLOR,
SIP_XA_FILLCOLOR);
- AddProperty (OUString::createFromAscii ("FillHatchName"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillHatchName")),
STRING,
SIP_XA_FILLHATCH,
XATTR_FILLHATCH);
break;
case drawing::FillStyle_BITMAP:
- AddProperty (OUString::createFromAscii ("FillBitmapName"),
+ AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillBitmapName")),
STRING,
SIP_XA_FILLBITMAP,
XATTR_FILLBITMAP);
@@ -455,7 +455,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
catch (::com::sun::star::beans::UnknownPropertyException)
{
msDescription.append (
- OUString::createFromAscii("<unknown>"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
}
}
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index f26e55b..9952496 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -157,7 +157,7 @@ ShapeTypeHandler::ShapeTypeHandler (void)
// Resize the list, if necessary, so that the new type can be inserted.
maShapeTypeDescriptorList[0].mnShapeTypeId = UNKNOWN_SHAPE_TYPE;
maShapeTypeDescriptorList[0].msServiceName =
- OUString::createFromAscii ("UNKNOWN_SHAPE_TYPE");
+ OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN_SHAPE_TYPE"));
maShapeTypeDescriptorList[0].maCreateFunction = CreateEmptyShapeReference;
maServiceNameToSlotId[maShapeTypeDescriptorList[0].msServiceName] = 0;
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 03623fb..b906c74 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -354,7 +354,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
// not interested in any results
Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY);
- xStatProps->setPropertyValue(rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0)));
+ xStatProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0)));
xResultSet = xStatement->executeQuery();
Reference< XColumnsSupplier > xSupplyCols(xResultSet, UNO_QUERY);
@@ -1173,7 +1173,7 @@ void FmGridControl::DeleteSelectedRows()
// #100312# ------------
Reference< ::com::sun::star::util::XURLTransformer > xTransformer(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY);
if( xTransformer.is() )
xTransformer->parseStrict( aUrl );
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index ad0c94b..aa6c913 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -89,8 +89,8 @@ namespace
//------------------------------------------------------------------------------
sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
{
- const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component.");
- const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component.");
+ const ::rtl::OUString aModelPrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component."));
+ const ::rtl::OUString aCompatibleModelPrefix(RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component."));
sal_Int32 nTypeId = -1;
if (aModelName == FM_COMPONENT_EDIT)
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e379a01..1b29274 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -237,7 +237,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
util::DateTime aDateTimeModified;
DateTime aDateTime;
- aCnt.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aDateTimeModified;
+ aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTimeModified;
::utl::typeConvert( aDateTimeModified, aDateTime );
rData.aThemeChangeDate = aDateTime;
rData.aThemeChangeTime = aDateTime;
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 2de37c2..f98541b 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -42,8 +42,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
-
// STATIC DATA -----------------------------------------------------------
SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
@@ -118,7 +116,7 @@ void SvxSmartTagsControl::FillMenu()
pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
// sub-menu starts with smart tag caption and separator
- const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + C2U(": ") + aRangeText;
+ const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + aRangeText;
nSubMenuPos = 0;
pSbMenu->InsertItem( nMenuId++, aSmartTagCaption2, MIB_NOSELECT, nSubMenuPos++ );
pSbMenu->InsertSeparator( nSubMenuPos++ );
More information about the Libreoffice-commits
mailing list