From 705c48d32eec0aa5180e60ca157daca4b154e4a3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 3 Nov 2014 14:03:54 +0200 Subject: 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 --- sd/source/filter/eppt/epptso.cxx | 14 +++++++------- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 3 +-- sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 10 ++++------ sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 10 +++++----- sd/source/ui/slidesorter/controller/SlsListener.cxx | 4 ++-- sd/source/ui/unoidl/DrawController.cxx | 2 +- 6 files changed, 20 insertions(+), 23 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index dc0a6fcf7dd0..939751a533b1 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3575,9 +3575,9 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc { try { - static const OUString sModel( "Model" ); - static const OUString sWidth( "Width" ); - static const OUString sHeight( "Height" ); + static const char sModel[] = "Model"; + static const char sWidth[] = "Width"; + static const char sHeight[] = "Height"; uno::Reference< table::XTable > xTable; if ( mXPropSet->getPropertyValue( sModel ) >>= xTable ) @@ -3717,10 +3717,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc } } - static const OUString sTopBorder( "TopBorder" ); - static const OUString sBottomBorder( "BottomBorder" ); - static const OUString sLeftBorder( "LeftBorder" ); - static const OUString sRightBorder( "RightBorder" ); + static const char sTopBorder[] = "TopBorder"; + static const char sBottomBorder[] = "BottomBorder"; + static const char sLeftBorder[] = "LeftBorder"; + static const char sRightBorder[] = "RightBorder"; // creating horz lines for( sal_Int32 nLine = 0; nLine < ( xRows->getCount() + 1 ); nLine++ ) diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 26d4697752cf..cc3a5450e0e3 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -413,8 +413,7 @@ OUString SAL_CALL // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleDrawDocumentView"); - aServiceNames[nCount] = sAdditionalServiceName; + aServiceNames[nCount] = "com.sun.star.drawing.AccessibleDrawDocumentView"; return aServiceNames; } diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 235ddb884e3b..4f7b7577e952 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -48,15 +48,13 @@ using namespace ::com::sun::star::uno; namespace { -static const OUString& GetPathToImpressConfigurationRoot (void) +static OUString GetPathToImpressConfigurationRoot() { - static const OUString sPathToImpressConfigurationRoot ("/org.openoffice.Office.Impress/"); - return sPathToImpressConfigurationRoot; + return OUString("/org.openoffice.Office.Impress/"); } -static const OUString& GetPathToSetNode (void) +static OUString GetPathToSetNode() { - static const OUString sPathToSetNode("MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages"); - return sPathToSetNode; + return OUString("MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages"); } } // end of anonymous namespace diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 0de992a6b0a4..5bab786f43fd 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -81,11 +81,11 @@ namespace sd { namespace slidesorter { namespace cache { BitmapCache& rCache, sal_Int32 nMaximalCacheSize) { - static const OUString sNone ("None"); - static const OUString sCompress ("Compress"); - static const OUString sErase ("Erase"); - static const OUString sResolution ("ResolutionReduction"); - static const OUString sPNGCompression ("PNGCompression"); + static const char sNone[] = "None"; + static const char sCompress[] = "Compress"; + static const char sErase[] = "Erase"; + static const char sResolution[] = "ResolutionReduction"; + static const char sPNGCompression[] = "PNGCompression"; ::boost::shared_ptr pCompressor; OUString sCompressionPolicy(sPNGCompression); diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 58e890340bae..bdb30bd56c14 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -454,8 +454,8 @@ void SAL_CALL Listener::propertyChange ( { ThrowIfDisposed(); - static const OUString sCurrentPagePropertyName ("CurrentPage"); - static const OUString sEditModePropertyName ("IsMasterPageMode"); + static const char sCurrentPagePropertyName[] = "CurrentPage"; + static const char sEditModePropertyName[] = "IsMasterPageMode"; if (rEvent.PropertyName.equals(sCurrentPagePropertyName)) { diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 620e7a276368..7f23711a450c 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -211,7 +211,7 @@ OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeExcepti return OUString("DrawController") ; } -static OUString ssServiceName( "com.sun.star.drawing.DrawingDocumentDrawView"); +static const char ssServiceName[] = "com.sun.star.drawing.DrawingDocumentDrawView"; sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName) throw(RuntimeException, std::exception) -- cgit