summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-01-31 15:36:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-31 15:50:10 +0100
commitca3e3e7e3198f492b2d4608ffc5420e657d99b00 (patch)
tree98b28439bf0cf0a45b8e87bbcb45aea0431d99c3 /officecfg
parent9babbf346c4d6f76e8b3a243a00e73a173c16ba6 (diff)
Move unotools/configuration.hxx to comphelper
...so that other code in comphelper can use it.
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/prj/build.lst2
-rw-r--r--officecfg/registry/cppheader.xsl10
2 files changed, 6 insertions, 6 deletions
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst
index 6a1f8aae2c98..da5651f46397 100644
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,2 +1,2 @@
-oc officecfg : TRANSLATIONS:translations soltools solenv unotools LIBXSLT:libxslt NULL
+oc officecfg : TRANSLATIONS:translations comphelper soltools solenv LIBXSLT:libxslt NULL
oc officecfg\prj nmake - all oc_prj NULL
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index 85ccafcf18d9..372876ec3adc 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -28,7 +28,7 @@
-->
<!-- Generate a .hxx file with type-safe C++ abstractions (based on
- unotools/configuration.hxx) for all the <prop> and <set> elements in an
+ comphelper/configuration.hxx) for all the <prop> and <set> elements in an
.xcs file.
Takes up to three parameters ns1, ns2, ns3 that represent the .xcs file's
@@ -110,7 +110,7 @@
<xsl:if test=".//prop/@oor:type = 'xs:short' or .//prop/@oor:type = 'xs:int' or .//prop/@oor:type = 'xs:long' or .//prop/@oor:type = 'xs:hexBinary'">
<xsl:text>#include "sal/types.h"&#xA;</xsl:text>
</xsl:if>
- <xsl:text>#include "unotools/configuration.hxx"&#xA;</xsl:text>
+ <xsl:text>#include "comphelper/configuration.hxx"&#xA;</xsl:text>
<xsl:text>&#xA;</xsl:text>
<xsl:text>namespace officecfg { namespace </xsl:text>
<xsl:value-of select="$ns1"/>
@@ -145,7 +145,7 @@
<xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
<xsl:text>struct </xsl:text>
<xsl:value-of select="$name"/>
- <xsl:text>: public unotools::ConfigurationGroup&lt; </xsl:text>
+ <xsl:text>: public comphelper::ConfigurationGroup&lt; </xsl:text>
<xsl:value-of select="$name"/>
<xsl:text>&gt; {&#xA;</xsl:text>
<xsl:text> static rtl::OUString path() { return rtl::OUString(<!--
@@ -179,7 +179,7 @@
<xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
<xsl:text>struct </xsl:text>
<xsl:value-of select="$name"/>
- <xsl:text>: public unotools::ConfigurationSet&lt; </xsl:text>
+ <xsl:text>: public comphelper::ConfigurationSet&lt; </xsl:text>
<xsl:value-of select="$name"/>
<xsl:text>&gt; {&#xA;</xsl:text>
<xsl:text> static rtl::OUString path() { return rtl::OUString(<!--
@@ -204,7 +204,7 @@
<xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
<xsl:text>struct </xsl:text>
<xsl:value-of select="$name"/>
- <xsl:text>: public unotools::</xsl:text>
+ <xsl:text>: public comphelper::</xsl:text>
<xsl:choose>
<xsl:when test="@oor:localized = 'true'">
<xsl:text>ConfigurationLocalizedProperty</xsl:text>