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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/config/eventcfg.cxx | 12 | ||||
| -rw-r--r-- | unotools/source/misc/mediadescriptor.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 2e0c081ece5d..5f52f32e28ac 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -38,10 +38,10 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -#define ROOTNODE_EVENTS OUString("Office.Events/ApplicationEvents") -#define PATHDELIMITER OUString("/") -#define SETNODE_BINDINGS OUString("Bindings") -#define PROPERTYNAME_BINDINGURL OUString("BindingURL") +static const char ROOTNODE_EVENTS[] = "Office.Events/ApplicationEvents"; +#define PATHDELIMITER "/" +#define SETNODE_BINDINGS "Bindings" +#define PROPERTYNAME_BINDINGURL "BindingURL" const char* pEventAsciiNames[] = { @@ -169,8 +169,8 @@ void GlobalEventConfig_Impl::Commit() ClearNodeSet( SETNODE_BINDINGS ); Sequence< beans::PropertyValue > seqValues( 1 ); OUString sNode; - static const OUString sPrefix(SETNODE_BINDINGS + PATHDELIMITER + "BindingType['"); - static const OUString sPostfix("']" + PATHDELIMITER + PROPERTYNAME_BINDINGURL); + static const char sPrefix[] = SETNODE_BINDINGS PATHDELIMITER "BindingType['"; + static const char sPostfix[] = "']" PATHDELIMITER PROPERTYNAME_BINDINGURL; //step through the list of events for(int i=0;it!=it_end;++it,++i) { diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index de5a1f502c32..850db5b4bb5c 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -325,8 +325,8 @@ MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::PropertyV bool MediaDescriptor::isStreamReadOnly() const { - static OUString CONTENTSCHEME_FILE( "file" ); - static OUString CONTENTPROP_ISREADONLY( "IsReadOnly" ); + static const char CONTENTSCHEME_FILE[] = "file"; + static const char CONTENTPROP_ISREADONLY[] = "IsReadOnly"; static bool READONLY_FALLBACK = false; bool bReadOnly = READONLY_FALLBACK; |