summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-24 12:48:22 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-25 15:55:19 +0100
commit6eef1937db49788ac55a1fd2df3f1e2505e27499 (patch)
tree48265bf66a1ffffd26816202125a72193dee6869 /include
parent4797a92297883f2a8c62f0ffaa83b89b8d0737cb (diff)
sal_Char->char in xmloff..xmlsecurity
Change-Id: I292d699ce1de10ca9341525161f5da2592102ff7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85778 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/xmloff/maptype.hxx2
-rw-r--r--include/xmloff/styleexp.hxx4
-rw-r--r--include/xmloff/xmlement.hxx2
-rw-r--r--include/xmloff/xmlevent.hxx6
-rw-r--r--include/xmloff/xmlexp.hxx8
-rw-r--r--include/xmloff/xmlprmap.hxx2
6 files changed, 12 insertions, 12 deletions
diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx
index 0e944656f716..91288e2d7d58 100644
--- a/include/xmloff/maptype.hxx
+++ b/include/xmloff/maptype.hxx
@@ -30,7 +30,7 @@
*/
struct XMLPropertyMapEntry
{
- const sal_Char* msApiName; /// Property-Name
+ const char* msApiName; /// Property-Name
sal_Int32 nApiNameLength; /// length of property name
sal_uInt16 mnNameSpace; /** declares the Namespace in which this
property exists */
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index 84f687713911..4024740d25b4 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -83,7 +83,7 @@ public:
// const OUString* pPrefix = 0);
// void exportStyleFamily(
-// const sal_Char *pFamily, const OUString& rXMLFamily,
+// const char *pFamily, const OUString& rXMLFamily,
// const rtl::Reference < XMLPropertySetMapper >& rPropMapper,
// bool bUsed, sal_uInt16 nFamily = 0,
// const OUString* pPrefix = 0);
@@ -100,7 +100,7 @@ public:
const OUString* pPrefix = nullptr);
void exportStyleFamily(
- const sal_Char *pFamily, const OUString& rXMLFamily,
+ const char *pFamily, const OUString& rXMLFamily,
const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper,
bool bUsed, sal_uInt16 nFamily,
const OUString* pPrefix = nullptr);
diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx
index 4591cb945bbe..92173b31b2b0 100644
--- a/include/xmloff/xmlement.hxx
+++ b/include/xmloff/xmlement.hxx
@@ -63,7 +63,7 @@ public:
#define ENUM_STRING_MAP_END() { nullptr, 0, 0 }
-/** Map a const sal_Char* (with length) to a sal_uInt16 value.
+/** Map a const char* (with length) to a sal_uInt16 value.
* To be used with SvXMLUnitConverter::convertEnum(...)
*/
template<typename EnumT>
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index 5907d7acb4e6..433d9b076201 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -49,7 +49,7 @@ struct XMLEventName
OUString m_aName;
XMLEventName() : m_nPrefix( 0 ) {}
- XMLEventName( sal_uInt16 n, const sal_Char *p ) :
+ XMLEventName( sal_uInt16 n, const char *p ) :
m_nPrefix( n ),
m_aName( OUString::createFromAscii(p) )
{}
@@ -74,9 +74,9 @@ struct XMLEventName
*/
struct XMLEventNameTranslation
{
- const sal_Char* sAPIName;
+ const char* sAPIName;
sal_uInt16 const nPrefix; // namespace prefix
- const sal_Char* sXMLName;
+ const char* sXMLName;
};
/// a translation table for the events defined in the XEventsSupplier service
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index b413f00b922a..bb4fb6b92ad2 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -335,9 +335,9 @@ public:
void ClearAttrList();
// Add an attribute to the common attribute list.
- void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName,
- const sal_Char *pValue );
- void AddAttribute( sal_uInt16 nPrefix, const sal_Char *pName,
+ void AddAttributeASCII( sal_uInt16 nPrefix, const char *pName,
+ const char *pValue );
+ void AddAttribute( sal_uInt16 nPrefix, const char *pName,
const OUString& rValue );
void AddAttribute( sal_uInt16 nPrefix, const OUString& rName,
const OUString& rValue );
@@ -649,7 +649,7 @@ public:
// The constructor prints a start tag that has the common attributes
// of the XMLExport instance attached.
SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix,
- const sal_Char *pName,
+ const char *pName,
bool bIgnWSOutside, bool bIgnWSInside );
SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix,
const OUString& rName,
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index baf01aa2eadd..ecb9f2145d1e 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -105,7 +105,7 @@ public:
/** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */
sal_Int32 FindEntryIndex(
- const sal_Char* sApiName, sal_uInt16 nNameSpace, const OUString& sXMLName ) const;
+ const char* sApiName, sal_uInt16 nNameSpace, const OUString& sXMLName ) const;
/** searches for an entry that matches the given ContextId or gives -1 if nothing found */
sal_Int32 FindEntryIndex( const sal_Int16 nContextId ) const;