diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-03 14:03:54 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-05 08:44:19 +0200 |
commit | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch) | |
tree | 97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /drawinglayer/source | |
parent | b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff) |
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'drawinglayer/source')
-rw-r--r-- | drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 7 | ||||
-rw-r--r-- | drawinglayer/source/geometry/viewinformation2d.cxx | 30 | ||||
-rw-r--r-- | drawinglayer/source/geometry/viewinformation3d.cxx | 45 |
3 files changed, 33 insertions, 49 deletions
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 03c12fd60948..4ce1d7b71b83 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -81,10 +81,9 @@ namespace drawinglayer { uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames() { - static OUString aServiceName("com.sun.star.graphic.Primitive2DTools" ); - static uno::Sequence< OUString > aServiceNames( &aServiceName, 1 ); - - return( aServiceNames ); + OUString aServiceName("com.sun.star.graphic.Primitive2DTools" ); + uno::Sequence< OUString > aServiceNames( &aServiceName, 1 ); + return aServiceNames; } OUString XPrimitive2DRenderer_getImplementationName() diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 6e24fe975f05..8af6781f1e5d 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -79,40 +79,34 @@ namespace drawinglayer uno::Sequence< beans::PropertyValue > mxExtendedInformation; // the local UNO API strings - const OUString& getNamePropertyObjectTransformation() + static OUString getNamePropertyObjectTransformation() { - static OUString s_sNameProperty("ObjectTransformation"); - return s_sNameProperty; + return OUString("ObjectTransformation"); } - const OUString& getNamePropertyViewTransformation() + static OUString getNamePropertyViewTransformation() { - static OUString s_sNameProperty("ViewTransformation"); - return s_sNameProperty; + return OUString("ViewTransformation"); } - const OUString& getNamePropertyViewport() + static OUString getNamePropertyViewport() { - static OUString s_sNameProperty("Viewport"); - return s_sNameProperty; + return OUString("Viewport"); } - const OUString& getNamePropertyTime() + static OUString getNamePropertyTime() { - static OUString s_sNameProperty("Time"); - return s_sNameProperty; + return OUString("Time"); } - const OUString& getNamePropertyVisualizedPage() + static OUString getNamePropertyVisualizedPage() { - static OUString s_sNameProperty("VisualizedPage"); - return s_sNameProperty; + return OUString("VisualizedPage"); } - const OUString& getNamePropertyReducedDisplayQuality() + static OUString getNamePropertyReducedDisplayQuality() { - static OUString s_sNameProperty("ReducedDisplayQuality"); - return s_sNameProperty; + return OUString("ReducedDisplayQuality"); } void impInterpretPropertyValues(const uno::Sequence< beans::PropertyValue >& rViewParameters) diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 9fe0b010ca78..78e5017d788d 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -77,58 +77,49 @@ namespace drawinglayer uno::Sequence< beans::PropertyValue > mxExtendedInformation; // the local UNO API strings - const OUString& getNamePropertyObjectTransformation() + static OUString getNamePropertyObjectTransformation() { - static OUString s_sNameProperty("ObjectTransformation"); - return s_sNameProperty; + return OUString("ObjectTransformation"); } - const OUString& getNamePropertyOrientation() + static OUString getNamePropertyOrientation() { - static OUString s_sNameProperty("Orientation"); - return s_sNameProperty; + return OUString("Orientation"); } - const OUString& getNamePropertyProjection() + static OUString getNamePropertyProjection() { - static OUString s_sNameProperty("Projection"); - return s_sNameProperty; + return OUString("Projection"); } - const OUString& getNamePropertyProjection_30() + static OUString getNamePropertyProjection_30() { - static OUString s_sNameProperty("Projection30"); - return s_sNameProperty; + return OUString("Projection30"); } - const OUString& getNamePropertyProjection_31() + static OUString getNamePropertyProjection_31() { - static OUString s_sNameProperty("Projection31"); - return s_sNameProperty; + return OUString("Projection31"); } - const OUString& getNamePropertyProjection_32() + static OUString getNamePropertyProjection_32() { - static OUString s_sNameProperty("Projection32"); - return s_sNameProperty; + return OUString("Projection32"); } - const OUString& getNamePropertyProjection_33() + static OUString getNamePropertyProjection_33() { - static OUString s_sNameProperty("Projection33"); - return s_sNameProperty; + return OUString("Projection33"); } - const OUString& getNamePropertyDeviceToView() + static OUString getNamePropertyDeviceToView() { - static OUString s_sNameProperty("DeviceToView"); - return s_sNameProperty; + return OUString("DeviceToView"); } - const OUString& getNamePropertyTime() + static OUString getNamePropertyTime() { - static OUString s_sNamePropertyTime("Time"); - return s_sNamePropertyTime; + return OUString("Time"); } // a central PropertyValue parsing method to allow transportatin of |