diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-15 10:01:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-16 09:04:07 +0100 |
| commit | e0225e7e733aaa90bd109ee11c977183ce823170 (patch) | |
| tree | 201e293b0fd749132af5389d7e3ac5e5a2ecc8c7 /sfx2/source/doc/SfxDocumentMetaData.cxx | |
| parent | f3eea21424b27575defc9faff41958c4ed66ffb0 (diff) | |
const char*->const char[]
Diffstat (limited to 'sfx2/source/doc/SfxDocumentMetaData.cxx')
| -rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 66e1b049937d..864652c5de9b 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -501,8 +501,7 @@ const char* s_nsODF = "urn:oasis:names:tc:opendocument:xmlns:office:1.0"; const char* s_nsODFMeta = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"; // const char* s_nsOOo = "http://openoffice.org/2004/office"; // not used (yet?) -const char* s_metaXml = "meta.xml"; - +static const char s_meta [] = "meta.xml"; bool isValidDate(const css::util::Date & i_rDate) { @@ -682,7 +681,7 @@ SfxDocumentMetaData::getURLProperties( } xPropArg->addProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), css::beans::PropertyAttribute::MAYBEVOID, - css::uno::makeAny(::rtl::OUString::createFromAscii(s_metaXml))); + css::uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s_meta)))); } catch (css::uno::Exception &) { // ignore } @@ -1932,7 +1931,7 @@ SfxDocumentMetaData::loadFromStorage( // open meta data file css::uno::Reference<css::io::XStream> xStream( xStorage->openStreamElement( - ::rtl::OUString::createFromAscii(s_metaXml), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s_meta)), css::embed::ElementModes::READ) ); if (!xStream.is()) throw css::uno::RuntimeException(); css::uno::Reference<css::io::XInputStream> xInStream = @@ -1966,9 +1965,9 @@ SfxDocumentMetaData::loadFromStorage( xPropArg->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI"))) >>= input.sSystemId; input.sSystemId += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")).concat( - ::rtl::OUString::createFromAscii(s_metaXml)); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s_meta))); } catch (css::uno::Exception &) { - input.sSystemId = ::rtl::OUString::createFromAscii(s_metaXml); + input.sSystemId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s_meta)); } css::uno::Sequence< css::uno::Any > args(1); args[0] <<= xPropArg; @@ -2013,7 +2012,7 @@ SfxDocumentMetaData::storeToStorage( // write into storage css::uno::Reference<css::io::XStream> xStream = - xStorage->openStreamElement(::rtl::OUString::createFromAscii(s_metaXml), + xStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s_meta)), css::embed::ElementModes::WRITE | css::embed::ElementModes::TRUNCATE); if (!xStream.is()) throw css::uno::RuntimeException(); |