summaryrefslogtreecommitdiff
path: root/svx/source/sdr
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svx/source/sdr
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'svx/source/sdr')
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx8
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx2
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx10
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx2
5 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 4d1dcfdb2fe2..8aa9abe90288 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -142,7 +142,7 @@ namespace sdr
// decomposition of MediaPrimitive2D to create needed invisible elements for HitTest
// and/or BoundRect
const basegfx::BColor aBackgroundColor(67.0 / 255.0, 67.0 / 255.0, 67.0 / 255.0);
- const rtl::OUString& rURL(GetSdrMediaObj().getURL());
+ const OUString& rURL(GetSdrMediaObj().getURL());
const sal_uInt32 nPixelBorder(4L);
const drawinglayer::primitive2d::Primitive2DReference xRetval(
new drawinglayer::primitive2d::MediaPrimitive2D(
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index ef8a8a2b33ad..6ee13eff2d74 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1203,7 +1203,7 @@ namespace sdr { namespace contact {
bool bSuccess = false;
try
{
- const ::rtl::OUString sControlServiceName( _rUnoObject.GetUnoControlTypeName() );
+ const OUString sControlServiceName( _rUnoObject.GetUnoControlTypeName() );
Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_SET_THROW );
_out_rControl = Reference< XControl >( xFactory->createInstance( sControlServiceName ), UNO_QUERY_THROW );
@@ -1382,9 +1382,9 @@ namespace sdr { namespace contact {
{
Reference< XPropertySet > xModelProperties( m_aControl.getModel(), UNO_QUERY_THROW );
if ( _bStart )
- xModelProperties->addPropertyChangeListener( ::rtl::OUString(), this );
+ xModelProperties->addPropertyChangeListener( OUString(), this );
else
- xModelProperties->removePropertyChangeListener( ::rtl::OUString(), this );
+ xModelProperties->removePropertyChangeListener( OUString(), this );
}
catch( const Exception& )
{
@@ -1403,7 +1403,7 @@ namespace sdr { namespace contact {
try
{
Reference< XPropertySet > xModelProperties( pUnoObject->GetUnoControlModel(), UNO_QUERY_THROW );
- static const ::rtl::OUString s_sPrintablePropertyName( "Printable" );
+ static const OUString s_sPrintablePropertyName( "Printable" );
OSL_VERIFY( xModelProperties->getPropertyValue( s_sPrintablePropertyName ) >>= bIsPrintable );
}
catch( const Exception& )
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 41cbcd0327d2..818bfc6b6b27 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -137,7 +137,7 @@ namespace sdr
if(bUseReducedDisplayQualityForDrag)
{
uno::Sequence< beans::PropertyValue > xProperties(1);
- xProperties[0].Name = rtl::OUString("ReducedDisplayQuality");
+ xProperties[0].Name = OUString("ReducedDisplayQuality");
xProperties[0].Value <<= true;
maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties);
}
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 39bd6cf9b0a9..23c93203b865 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -96,22 +96,22 @@ namespace drawinglayer
return aRetval;
}
- rtl::OUString PrimitiveFactory2D::getImplementationName_Static()
+ OUString PrimitiveFactory2D::getImplementationName_Static()
{
- static rtl::OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D");
+ static OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D");
return aRetval;
}
- uno::Sequence< rtl::OUString > PrimitiveFactory2D::getSupportedServiceNames_Static()
+ uno::Sequence< OUString > PrimitiveFactory2D::getSupportedServiceNames_Static()
{
- static uno::Sequence< rtl::OUString > aSeq;
+ static uno::Sequence< OUString > aSeq;
osl::Mutex aMutex;
osl::MutexGuard aGuard( aMutex );
if(!aSeq.getLength())
{
aSeq.realloc(1L);
- aSeq.getArray()[0L] = rtl::OUString("com.sun.star.graphic.PrimitiveFactory2D");
+ aSeq.getArray()[0L] = OUString("com.sun.star.graphic.PrimitiveFactory2D");
}
return aSeq;
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index c46aa095180a..ac3080cf5d44 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -49,7 +49,7 @@ namespace
{
try
{
- const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString("Number")));
+ const uno::Any aNumber(xSet->getPropertyValue(OUString("Number")));
aNumber >>= nRetval;
}
catch(const uno::Exception&)