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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/source/components/fontident.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/font/PhysicalFontCollection.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index dce92d30bf3b..e5880d3bcd88 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -153,8 +153,8 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep Sequence< OUString > FontIdentificator_getSupportedServiceNames() { - static OUString aServiceName( "com.sun.star.awt.FontIdentificator" ); - static Sequence< OUString > aServiceNames( &aServiceName, 1 ); + OUString aServiceName( "com.sun.star.awt.FontIdentificator" ); + Sequence< OUString > aServiceNames( &aServiceName, 1 ); return aServiceNames; } diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 416cc6b8945a..56a8d74eb58c 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -1161,8 +1161,8 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindByFont( FontSelectPattern& r a korean bitmap font that is not suitable here. Use the font replacement table, that automatically leads to the desired "HG Mincho Light J". Same story for MS Gothic, there are thai and korean "Gothic" fonts, so we even prefer Andale */ - static OUString aMS_Mincho( "msmincho" ); - static OUString aMS_Gothic( "msgothic" ); + static const char aMS_Mincho[] = "msmincho"; + static const char aMS_Gothic[] = "msgothic"; if ((aSearchName != aMS_Mincho) && (aSearchName != aMS_Gothic)) // TODO: add heuristic to only throw out the fake ms* fonts #endif diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 1f9cec0aa1c7..4eeafb1aeff7 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -788,7 +788,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length { - static const OUString aStarDot( "*." ); + static const char aStarDot[] = "*."; OUString aNewFilter; OUString aOldFilter = getCurrentFilter(); @@ -1805,7 +1805,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O OString aFilterName = OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); gtk_file_filter_set_name( filter, aFilterName.getStr() ); - static const OUString aStarDot( "*." ); + static const char aStarDot[] = "*."; OUString aTokens; bool bAllGlob = rType.equalsAscii( "*.*" ) || rType.equalsAscii( "*" ); |