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 /svx/source/form | |
| 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 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmobj.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/fmundo.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 7a42951c65f4..483c12cf85e6 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -128,7 +128,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW ); - static const OUString sRefDevicePropName( "ReferenceDevice" ); + static const char sRefDevicePropName[] = "ReferenceDevice"; if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) ) { VCLXDevice* pUnoRefDevice = new VCLXDevice; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index a36cb1e3526a..e69d9974a3fb 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -727,8 +727,8 @@ namespace svxform void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - static const OUString vbaInterOp("VBAInterop"); - if ( _rEvent.ScriptType.equals(vbaInterOp) ) + static const char vbaInterOp[] = "VBAInterop"; + if ( _rEvent.ScriptType == vbaInterOp ) return; // not handled here if ( impl_isDisposed_nothrow() ) diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index eeaa5330c8de..4c641587962f 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -678,7 +678,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // TODO: we should cache all those things, else this might be too expensive. // However, this requires we're notified of changes in the value binding - static const OUString s_sExternalData( "ExternalData" ); + static const char s_sExternalData[] = "ExternalData"; if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) ) { bool bExternalData = true; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 91330e11ea81..b464f06a745b 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3633,7 +3633,7 @@ namespace { try { - static OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" ); + static const char s_sFormsCheckRequiredFields[] = "FormsCheckRequiredFields"; // first, check whether the form has a property telling us the answer // this allows people to use the XPropertyContainer interface of a form to control |