diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-02 21:58:42 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-02 22:11:27 +0200 |
| commit | 02a72b30259923eece476abb4aa5c41965d454e7 (patch) | |
| tree | bcf7b2a788b80092ae3e270327afde266d7a2053 | |
| parent | 4f76bcd12bb363c0d053c03c5de350c71fdb285f (diff) | |
writerfilter: kill CONSTASCII in generated code
Change-Id: I7d1d7d8c5f8291defb86f205ea0d65674493b467
| -rw-r--r-- | writerfilter/source/doctok/resourcesimpl.xsl | 4 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl.xsl | 7 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.xsl | 8 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_values.xsl | 6 |
4 files changed, 12 insertions, 13 deletions
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl index 9a243f2666a0..431e72c22853 100644 --- a/writerfilter/source/doctok/resourcesimpl.xsl +++ b/writerfilter/source/doctok/resourcesimpl.xsl @@ -554,9 +554,9 @@ writerfilter::Reference < BinaryObj > ::Pointer_t createSprmBinary <xsl:with-param name="id" select="$optname"/> </xsl:call-template> <xsl:text>: - result = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("</xsl:text> + result = "</xsl:text> <xsl:value-of select="$optname"/> - <xsl:text>")); + <xsl:text>"; break;</xsl:text> </xsl:template> diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl index a70b3ccbcd01..07571b0d03cc 100644 --- a/writerfilter/source/ooxml/factoryimpl.xsl +++ b/writerfilter/source/ooxml/factoryimpl.xsl @@ -326,15 +326,14 @@ uno::Reference < xml::sax::XFastParser > OOXMLStreamImpl::getFastParser() (mxContext->getServiceManager()); mxFastParser.set(xFactory->createInstanceWithContext - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM - ( "com.sun.star.xml.sax.FastParser" )), + ( "com.sun.star.xml.sax.FastParser", mxContext ), uno::UNO_QUERY_THROW); </xsl:text> <xsl:for-each select="//namespace-alias"> <xsl:text> - mxFastParser->registerNamespace(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("</xsl:text> + mxFastParser->registerNamespace("</xsl:text> <xsl:value-of select="@name"/> - <xsl:text>")), </xsl:text> + <xsl:text>", </xsl:text> <xsl:call-template name="namespaceid"/> <xsl:text>);</xsl:text> </xsl:for-each> diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index da52c8384217..bf20ecc02c57 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -527,9 +527,9 @@ CreateElementMapPointer </xsl:text> <xsl:call-template name="idtoqname"> <xsl:with-param name="id" select="@tokenid"/> </xsl:call-template> - <xsl:text>, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("</xsl:text> + <xsl:text>, "</xsl:text> <xsl:value-of select="@value"/> - <xsl:text>")));</xsl:text> + <xsl:text>");</xsl:text> </xsl:when> <xsl:when test="@action='mark'"> <xsl:text> @@ -537,9 +537,9 @@ CreateElementMapPointer </xsl:text> <xsl:call-template name="idtoqname"> <xsl:with-param name="id" select="@sendtokenid"/> </xsl:call-template> - <xsl:text>, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("</xsl:text> + <xsl:text>, "</xsl:text> <xsl:value-of select="@value"/> - <xsl:text>")));</xsl:text> + <xsl:text>");</xsl:text> </xsl:when> <xsl:when test="@action='tokenproperty'"> <xsl:text> diff --git a/writerfilter/source/ooxml/factoryimpl_values.xsl b/writerfilter/source/ooxml/factoryimpl_values.xsl index f1902d71c5f1..35c967b51914 100644 --- a/writerfilter/source/ooxml/factoryimpl_values.xsl +++ b/writerfilter/source/ooxml/factoryimpl_values.xsl @@ -60,16 +60,16 @@ rtl::OUString </xsl:text> <xsl:call-template name="valuestringname"> <xsl:with-param name="string"></xsl:with-param> </xsl:call-template> -<xsl:text>(RTL_CONSTASCII_USTRINGPARAM(""));</xsl:text> +<xsl:text>("");</xsl:text> <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]"> <xsl:text> rtl::OUString </xsl:text> <xsl:call-template name="valuestringname"> <xsl:with-param name="string" select="."/> </xsl:call-template> -<xsl:text>(RTL_CONSTASCII_USTRINGPARAM("</xsl:text> +<xsl:text>("</xsl:text> <xsl:value-of select="."/> -<xsl:text>"));</xsl:text> +<xsl:text>");</xsl:text> </xsl:for-each> </xsl:template> |