Kaydet (Commit) 7f36ddf5 authored tarafından pjacquod's avatar pjacquod Kaydeden (comit) Caolán McNamara

RTL_CONSTASCII_USTRINGPARAM in components .. submission

components/forms/source/xforms/submission should be OK now
üst c150d11c
...@@ -67,19 +67,18 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla ...@@ -67,19 +67,18 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
if (!xLoader.is()) if (!xLoader.is())
xLoader = Reference< XComponentLoader >(xFactory->createInstance( xLoader = Reference< XComponentLoader >(xFactory->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY_THROW); ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), UNO_QUERY_THROW);
// open the stream from the result... // open the stream from the result...
// build media descriptor // build media descriptor
Sequence< PropertyValue > descriptor(2); Sequence< PropertyValue > descriptor(2);
descriptor[0] = PropertyValue(::rtl::OUString::createFromAscii( descriptor[0] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream") ),
"InputStream"), -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE);
descriptor[1] = PropertyValue(::rtl::OUString::createFromAscii( descriptor[1] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ),
"ReadOnly"), -1, makeAny(sal_True), PropertyState_DIRECT_VALUE); -1, makeAny(sal_True), PropertyState_DIRECT_VALUE);
//::rtl::OUString aURL = ::rtl::OUString::createFromAscii("private:stream");
::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE);
::rtl::OUString aTarget = ::rtl::OUString::createFromAscii("_default"); ::rtl::OUString aTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default") );
xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor); xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor);
return CSubmission::SUCCESS; return CSubmission::SUCCESS;
...@@ -88,7 +87,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla ...@@ -88,7 +87,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
if (aDocument.is()) { if (aDocument.is()) {
// parse the result stream into a new document // parse the result stream into a new document
Reference< XDocumentBuilder > xBuilder(xFactory->createInstance( Reference< XDocumentBuilder > xBuilder(xFactory->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY_THROW); ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder") ) ), UNO_QUERY_THROW);
Reference< XDocument > aNewDocument = xBuilder->parse(m_aResultStream); Reference< XDocument > aNewDocument = xBuilder->parse(m_aResultStream);
if (aNewDocument.is()) { if (aNewDocument.is()) {
...@@ -96,7 +95,6 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla ...@@ -96,7 +95,6 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
Reference< XElement > oldRoot = aDocument->getDocumentElement(); Reference< XElement > oldRoot = aDocument->getDocumentElement();
Reference< XElement > newRoot = aNewDocument->getDocumentElement(); Reference< XElement > newRoot = aNewDocument->getDocumentElement();
// aDocument->removeChild(Reference< XNode >(oldRoot, UNO_QUERY_THROW));
Reference< XNode > aImportedNode = aDocument->importNode(Reference< XNode >(newRoot, UNO_QUERY_THROW), sal_True); Reference< XNode > aImportedNode = aDocument->importNode(Reference< XNode >(newRoot, UNO_QUERY_THROW), sal_True);
Reference< XNode >(aDocument, UNO_QUERY_THROW)->replaceChild(aImportedNode, Reference< XNode >(oldRoot, UNO_QUERY_THROW)); Reference< XNode >(aDocument, UNO_QUERY_THROW)->replaceChild(aImportedNode, Reference< XNode >(oldRoot, UNO_QUERY_THROW));
return CSubmission::SUCCESS; return CSubmission::SUCCESS;
...@@ -131,7 +129,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla ...@@ -131,7 +129,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
pHelper->m_aInteractionHandler = _xHandler; pHelper->m_aInteractionHandler = _xHandler;
else else
pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY); ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY);
OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler");
CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper;
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
CSerializationAppXML::CSerializationAppXML() CSerializationAppXML::CSerializationAppXML()
: m_aFactory(utl::getProcessServiceFactory()) : m_aFactory(utl::getProcessServiceFactory())
, m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance( , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance(
rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), CSS::uno::UNO_QUERY)) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), CSS::uno::UNO_QUERY))
{ {
OSL_ENSURE(m_aPipe.is(), "cannot create Pipe"); OSL_ENSURE(m_aPipe.is(), "cannot create Pipe");
} }
......
...@@ -52,7 +52,7 @@ using namespace CSS::xml::dom; ...@@ -52,7 +52,7 @@ using namespace CSS::xml::dom;
CSerializationURLEncoded::CSerializationURLEncoded() CSerializationURLEncoded::CSerializationURLEncoded()
: m_aFactory(getProcessServiceFactory()) : m_aFactory(getProcessServiceFactory())
, m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance( , m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY)) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), UNO_QUERY))
{ {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment