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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 02b9fe69402e..02e3c626072b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2002,7 +2002,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) if ( xColProps.is() ) xPSI = xColProps->getPropertySetInfo( ); - static const OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" ); + static const char PROPERTY_CONTROLDEFAULT[] = "ControlDefault"; if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_CONTROLDEFAULT ) ) { Any aDefault = xColProps->getPropertyValue( PROPERTY_CONTROLDEFAULT ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 6ed72744f167..70a9db9dd4c0 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -682,7 +682,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) Reference<XNumberFormats> xFormats = xSupplier->getNumberFormats(); OUString sFormatDescription; LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; - static const OUString s_aLocaleProp ("Locale"); + static const char s_aLocaleProp[] = "Locale"; Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); if (hasProperty(s_aLocaleProp, xFormat)) { @@ -694,7 +694,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) eFormatLanguage = LanguageTag::convertToLanguageType( *pLocale, false); } } - static const OUString s_aFormatStringProp ("FormatString"); + static const char s_aFormatStringProp[] = "FormatString"; if (hasProperty(s_aFormatStringProp, xFormat)) xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription; _rxOutStream->writeUTF(sFormatDescription); |