summaryrefslogtreecommitdiff
path: root/xmloff/source/text
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/text')
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.cxx12
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.hxx14
-rw-r--r--xmloff/source/text/XMLRedlineExport.cxx2
-rw-r--r--xmloff/source/text/XMLSectionExport.cxx12
-rw-r--r--xmloff/source/text/txtflde.cxx142
-rw-r--r--xmloff/source/text/txtfldi.cxx82
-rw-r--r--xmloff/source/text/txtparae.cxx4
-rw-r--r--xmloff/source/text/txtvfldi.cxx26
9 files changed, 148 insertions, 148 deletions
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 1fe7f134193b..b17062e9cbce 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -57,7 +57,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::lang::IllegalArgumentException;
-static const sal_Char* aIndexServiceMap[] =
+static const char* aIndexServiceMap[] =
{
"com.sun.star.text.ContentIndex",
"com.sun.star.text.DocumentIndex",
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 66be9d7a576e..4cf8c4c9cccd 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -57,7 +57,7 @@ XMLIndexTemplateContext::XMLIndexTemplateContext(
const OUString& rLocalName,
const SvXMLEnumMapEntry<sal_uInt16>* pLevelNameMap,
enum XMLTokenEnum eLevelAttrName,
- const sal_Char** pLevelStylePropMap,
+ const char** pLevelStylePropMap,
const bool* pAllowedTokenTypes,
bool bT )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
@@ -161,7 +161,7 @@ void XMLIndexTemplateContext::EndElement()
if (bStyleNameOK)
{
- const sal_Char* pStyleProperty =
+ const char* pStyleProperty =
pOutlineLevelStylePropMap[nOutlineLevel];
DBG_ASSERT(nullptr != pStyleProperty, "need property name");
@@ -315,7 +315,7 @@ const SvXMLEnumMapEntry<sal_uInt16> aSvLevelNameTOCMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-const sal_Char* aLevelStylePropNameTOCMap[] =
+const char* aLevelStylePropNameTOCMap[] =
{ nullptr, "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3",
"ParaStyleLevel4", "ParaStyleLevel5", "ParaStyleLevel6",
"ParaStyleLevel7", "ParaStyleLevel8", "ParaStyleLevel9",
@@ -357,7 +357,7 @@ const SvXMLEnumMapEntry<sal_uInt16> aLevelNameAlphaMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-const sal_Char* aLevelStylePropNameAlphaMap[] =
+const char* aLevelStylePropNameAlphaMap[] =
{ nullptr, "ParaStyleSeparator", "ParaStyleLevel1", "ParaStyleLevel2",
"ParaStyleLevel3", nullptr };
@@ -404,7 +404,7 @@ const SvXMLEnumMapEntry<sal_uInt16> aLevelNameBibliographyMap[] =
};
// TODO: replace with real property names, when available
-const sal_Char* aLevelStylePropNameBibliographyMap[] =
+const char* aLevelStylePropNameBibliographyMap[] =
{
nullptr, "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1",
"ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1",
@@ -433,7 +433,7 @@ const bool aAllowedTokenTypesBibliography[] =
// no name map
const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameTableMap = nullptr;
-const sal_Char* aLevelStylePropNameTableMap[] =
+const char* aLevelStylePropNameTableMap[] =
{ nullptr, "ParaStyleLevel1", nullptr };
const bool aAllowedTokenTypesTable[] =
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index c319aac9480c..5af747e0fad5 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -39,23 +39,23 @@ template<typename EnumT> struct SvXMLEnumMapEntry;
// TOC and user defined index:
extern const SvXMLEnumMapEntry<sal_uInt16> aSvLevelNameTOCMap[];
-extern const sal_Char* aLevelStylePropNameTOCMap[];
+extern const char* aLevelStylePropNameTOCMap[];
extern const bool aAllowedTokenTypesTOC[];
extern const bool aAllowedTokenTypesUser[];
// alphabetical index:
extern const SvXMLEnumMapEntry<sal_uInt16> aLevelNameAlphaMap[];
-extern const sal_Char* aLevelStylePropNameAlphaMap[];
+extern const char* aLevelStylePropNameAlphaMap[];
extern const bool aAllowedTokenTypesAlpha[];
// bibliography:
extern const SvXMLEnumMapEntry<sal_uInt16> aLevelNameBibliographyMap[];
-extern const sal_Char* aLevelStylePropNameBibliographyMap[];
+extern const char* aLevelStylePropNameBibliographyMap[];
extern const bool aAllowedTokenTypesBibliography[];
// table, illustration and object tables:
extern const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameTableMap; // NULL: no outline-level
-extern const sal_Char* aLevelStylePropNameTableMap[];
+extern const char* aLevelStylePropNameTableMap[];
extern const bool aAllowedTokenTypesTable[];
@@ -71,7 +71,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext
const SvXMLEnumMapEntry<sal_uInt16>* pOutlineLevelNameMap;
enum ::xmloff::token::XMLTokenEnum const eOutlineLevelAttrName;
- const sal_Char** pOutlineLevelStylePropMap;
+ const char** pOutlineLevelStylePropMap;
const bool* pAllowedTokenTypesMap;
sal_Int32 nOutlineLevel;
@@ -91,7 +91,7 @@ public:
const OUString& rLocalName,
const SvXMLEnumMapEntry<EnumT>* aLevelNameMap,
enum ::xmloff::token::XMLTokenEnum eLevelAttrName,
- const sal_Char** aLevelStylePropNameMap,
+ const char** aLevelStylePropNameMap,
const bool* aAllowedTokenTypes,
bool bTOC_=false)
: XMLIndexTemplateContext(rImport,rPropSet,nPrfx,rLocalName,
@@ -104,7 +104,7 @@ public:
const OUString& rLocalName,
const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameMap,
enum ::xmloff::token::XMLTokenEnum eLevelAttrName,
- const sal_Char** aLevelStylePropNameMap,
+ const char** aLevelStylePropNameMap,
const bool* aAllowedTokenTypes,
bool bTOC);
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 6ac62d6d6cb2..9b925830d59a 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -610,7 +610,7 @@ void XMLRedlineExport::WriteComment(const OUString& rComment)
{
// iterate over all string-pieces separated by return (0x0a) and
// put each inside a paragraph element.
- SvXMLTokenEnumerator aEnumerator(rComment, sal_Char(0x0a));
+ SvXMLTokenEnumerator aEnumerator(rComment, char(0x0a));
OUString aSubString;
while (aEnumerator.getNextToken(aSubString))
{
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index db936652cea4..aaeb9b244d21 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -910,17 +910,17 @@ static const XMLTokenEnum* aTypeLevelNameMap[] =
aLevelNameBibliographyMap // bibliography
};
-static const sal_Char* aLevelStylePropNameTOCMap[] =
+static const char* aLevelStylePropNameTOCMap[] =
{ nullptr, "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3",
"ParaStyleLevel4", "ParaStyleLevel5", "ParaStyleLevel6",
"ParaStyleLevel7", "ParaStyleLevel8", "ParaStyleLevel9",
"ParaStyleLevel10", nullptr };
-static const sal_Char* aLevelStylePropNameTableMap[] =
+static const char* aLevelStylePropNameTableMap[] =
{ nullptr, "ParaStyleLevel1", nullptr };
-static const sal_Char* aLevelStylePropNameAlphaMap[] =
+static const char* aLevelStylePropNameAlphaMap[] =
{ nullptr, "ParaStyleSeparator", "ParaStyleLevel1", "ParaStyleLevel2",
"ParaStyleLevel3", nullptr };
-static const sal_Char* aLevelStylePropNameBibliographyMap[] =
+static const char* aLevelStylePropNameBibliographyMap[] =
// TODO: replace with real property names, when available
{ nullptr, "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1",
"ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1",
@@ -932,7 +932,7 @@ static const sal_Char* aLevelStylePropNameBibliographyMap[] =
"ParaStyleLevel1",
nullptr };
-static const sal_Char** aTypeLevelStylePropNameMap[] =
+static const char** aTypeLevelStylePropNameMap[] =
{
aLevelStylePropNameTOCMap, // TOC
aLevelStylePropNameTableMap, // table index
@@ -1007,7 +1007,7 @@ bool XMLSectionExport::ExportIndexTemplate(
}
// paragraph level style name
- const sal_Char* pPropName(
+ const char* pPropName(
aTypeLevelStylePropNameMap[eType-TEXT_SECTION_TYPE_TOC][nOutlineLevel]);
OSL_ENSURE(nullptr != pPropName, "can't find property name");
if (nullptr != pPropName)
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index a1c04371666f..8c325bb4b54a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -82,76 +82,76 @@ using namespace ::com::sun::star::container;
using namespace ::xmloff::token;
-static sal_Char const FIELD_SERVICE_SENDER[] = "ExtendedUser";
-static sal_Char const FIELD_SERVICE_AUTHOR[] = "Author";
-static sal_Char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit";
-static sal_Char const FIELD_SERVICE_GETEXP[] = "GetExpression";
-static sal_Char const FIELD_SERVICE_SETEXP[] = "SetExpression";
-static sal_Char const FIELD_SERVICE_USER[] = "User";
-static sal_Char const FIELD_SERVICE_INPUT[] = "Input";
-static sal_Char const FIELD_SERVICE_USERINPUT[] = "InputUser";
-static sal_Char const FIELD_SERVICE_DATETIME[] = "DateTime";
-static sal_Char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber";
-static sal_Char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet";
-static sal_Char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet";
-static sal_Char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber";
-static sal_Char const FIELD_SERVICE_DB_DISPLAY[] = "Database";
-static sal_Char const FIELD_SERVICE_DB_NAME[] = "DatabaseName";
-static sal_Char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText";
-static sal_Char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText";
-static sal_Char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description";
-static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom";
-static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom";
-static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor";
-static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor";
-static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime";
-static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords";
-static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords";
-static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject";
-static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject";
-static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title";
-static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title";
-static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision";
-static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision";
-static sal_Char const FIELD_SERVICE_FILE_NAME[] = "FileName";
-static sal_Char const FIELD_SERVICE_CHAPTER[] = "Chapter";
-static sal_Char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName";
-static sal_Char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount";
-static sal_Char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount";
-static sal_Char const FIELD_SERVICE_WORD_COUNT[] = "WordCount";
-static sal_Char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount";
-static sal_Char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount";
-static sal_Char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount";
-static sal_Char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount";
-static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet";
-static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet";
-static sal_Char const FIELD_SERVICE_SHEET_NAME[] = "SheetName";
-static sal_Char const FIELD_SERVICE_PAGE_NAME[] = "PageName";
-static sal_Char const FIELD_SERVICE_MACRO[] = "Macro";
-static sal_Char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference";
-static sal_Char const FIELD_SERVICE_DDE[] = "DDE";
-static sal_Char const FIELD_SERVICE_URL[] = "URL";
-static sal_Char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography";
-static sal_Char const FIELD_SERVICE_SCRIPT[] = "Script";
-static sal_Char const FIELD_SERVICE_ANNOTATION[] = "Annotation";
-static sal_Char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters";
-static sal_Char const FIELD_SERVICE_META[] = "MetadataField";
-static sal_Char const FIELD_SERVICE_MEASURE[] = "Measure";
-static sal_Char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula";
-static sal_Char const FIELD_SERVICE_DROP_DOWN[] = "DropDown";
+static char const FIELD_SERVICE_SENDER[] = "ExtendedUser";
+static char const FIELD_SERVICE_AUTHOR[] = "Author";
+static char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit";
+static char const FIELD_SERVICE_GETEXP[] = "GetExpression";
+static char const FIELD_SERVICE_SETEXP[] = "SetExpression";
+static char const FIELD_SERVICE_USER[] = "User";
+static char const FIELD_SERVICE_INPUT[] = "Input";
+static char const FIELD_SERVICE_USERINPUT[] = "InputUser";
+static char const FIELD_SERVICE_DATETIME[] = "DateTime";
+static char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber";
+static char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet";
+static char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet";
+static char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber";
+static char const FIELD_SERVICE_DB_DISPLAY[] = "Database";
+static char const FIELD_SERVICE_DB_NAME[] = "DatabaseName";
+static char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText";
+static char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText";
+static char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph";
+static char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor";
+static char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor";
+static char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime";
+static char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime";
+static char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime";
+static char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime";
+static char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description";
+static char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description";
+static char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor";
+static char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor";
+static char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime";
+static char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime";
+static char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom";
+static char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom";
+static char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor";
+static char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor";
+static char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime";
+static char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime";
+static char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords";
+static char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords";
+static char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject";
+static char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject";
+static char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title";
+static char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title";
+static char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision";
+static char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision";
+static char const FIELD_SERVICE_FILE_NAME[] = "FileName";
+static char const FIELD_SERVICE_CHAPTER[] = "Chapter";
+static char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName";
+static char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount";
+static char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount";
+static char const FIELD_SERVICE_WORD_COUNT[] = "WordCount";
+static char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount";
+static char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount";
+static char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount";
+static char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount";
+static char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet";
+static char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet";
+static char const FIELD_SERVICE_SHEET_NAME[] = "SheetName";
+static char const FIELD_SERVICE_PAGE_NAME[] = "PageName";
+static char const FIELD_SERVICE_MACRO[] = "Macro";
+static char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference";
+static char const FIELD_SERVICE_DDE[] = "DDE";
+static char const FIELD_SERVICE_URL[] = "URL";
+static char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography";
+static char const FIELD_SERVICE_SCRIPT[] = "Script";
+static char const FIELD_SERVICE_ANNOTATION[] = "Annotation";
+static char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters";
+static char const FIELD_SERVICE_META[] = "MetadataField";
+static char const FIELD_SERVICE_MEASURE[] = "Measure";
+static char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula";
+static char const FIELD_SERVICE_DROP_DOWN[] = "DropDown";
namespace
{
@@ -2533,7 +2533,7 @@ void XMLTextFieldExport::ProcessParagraphSequence(
{
// iterate over all string-pieces separated by return (0x0a) and
// put each inside a paragraph element.
- SvXMLTokenEnumerator aEnumerator(sParagraphSequence, sal_Char(0x0a));
+ SvXMLTokenEnumerator aEnumerator(sParagraphSequence, char(0x0a));
OUString aSubString;
while (aEnumerator.getNextToken(aSubString))
{
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 391b047dd5cb..ea18f21f7ff7 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -80,44 +80,44 @@ using namespace ::xmloff::token;
// service prefix and service names
-const sal_Char sAPI_textfield_prefix[] = "com.sun.star.text.TextField.";
-const sal_Char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
-const sal_Char sAPI_presentation_prefix[] = "com.sun.star.presentation.TextField.";
-
-const sal_Char sAPI_date_time[] = "DateTime";
-const sal_Char sAPI_page_number[] = "PageNumber";
-const sal_Char sAPI_docinfo_change_date_time[] = "DocInfo.ChangeDateTime";
-const sal_Char sAPI_docinfo_create_date_time[] = "DocInfo.CreateDateTime";
-const sal_Char sAPI_docinfo_custom[] = "DocInfo.Custom";
-const sal_Char sAPI_docinfo_print_date_time[] = "DocInfo.PrintDateTime";
-const sal_Char sAPI_dde[] = "DDE";
-const sal_Char sAPI_url[] = "URL";
+const char sAPI_textfield_prefix[] = "com.sun.star.text.TextField.";
+const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
+const char sAPI_presentation_prefix[] = "com.sun.star.presentation.TextField.";
+
+const char sAPI_date_time[] = "DateTime";
+const char sAPI_page_number[] = "PageNumber";
+const char sAPI_docinfo_change_date_time[] = "DocInfo.ChangeDateTime";
+const char sAPI_docinfo_create_date_time[] = "DocInfo.CreateDateTime";
+const char sAPI_docinfo_custom[] = "DocInfo.Custom";
+const char sAPI_docinfo_print_date_time[] = "DocInfo.PrintDateTime";
+const char sAPI_dde[] = "DDE";
+const char sAPI_url[] = "URL";
// property names
-const sal_Char sAPI_is_fixed[] = "IsFixed";
-const sal_Char sAPI_content[] = "Content";
-const sal_Char sAPI_author[] = "Author";
-const sal_Char sAPI_hint[] = "Hint";
-const sal_Char sAPI_name[] = "Name";
-const sal_Char sAPI_sub_type[] = "SubType";
-const sal_Char sAPI_date_time_value[] = "DateTimeValue";
-const sal_Char sAPI_number_format[] = "NumberFormat";
-const sal_Char sAPI_numbering_type[] = "NumberingType";
-const sal_Char sAPI_offset[] = "Offset";
-const sal_Char sAPI_condition[] = "Condition";
-const sal_Char sAPI_set_number[] = "SetNumber";
-const sal_Char sAPI_file_format[] = "FileFormat";
-const sal_Char sAPI_is_date[] = "IsDate";
-const sal_Char sAPI_current_presentation[] = "CurrentPresentation";
-const sal_Char sAPI_is_hidden[] = "IsHidden";
-const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage";
-
-const sal_Char sAPI_true[] = "TRUE";
+const char sAPI_is_fixed[] = "IsFixed";
+const char sAPI_content[] = "Content";
+const char sAPI_author[] = "Author";
+const char sAPI_hint[] = "Hint";
+const char sAPI_name[] = "Name";
+const char sAPI_sub_type[] = "SubType";
+const char sAPI_date_time_value[] = "DateTimeValue";
+const char sAPI_number_format[] = "NumberFormat";
+const char sAPI_numbering_type[] = "NumberingType";
+const char sAPI_offset[] = "Offset";
+const char sAPI_condition[] = "Condition";
+const char sAPI_set_number[] = "SetNumber";
+const char sAPI_file_format[] = "FileFormat";
+const char sAPI_is_date[] = "IsDate";
+const char sAPI_current_presentation[] = "CurrentPresentation";
+const char sAPI_is_hidden[] = "IsHidden";
+const char sAPI_is_fixed_language[] = "IsFixedLanguage";
+
+const char sAPI_true[] = "TRUE";
XMLTextFieldImportContext::XMLTextFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
- const sal_Char* pService,
+ const char* pService,
sal_uInt16 nPrefix, const OUString& rElementName)
: SvXMLImportContext( rImport, nPrefix, rElementName )
, rTextImportHelper(rHlp)
@@ -1143,7 +1143,7 @@ static const OUStringLiteral gsPropertyIsVisible("IsVisible");
XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
- const sal_Char* pServiceName, sal_uInt16 nPrfx,
+ const char* pServiceName, sal_uInt16 nPrfx,
const OUString& sLocalName, bool bUseDisply)
: XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName)
, nCommandType( sdb::CommandType::TABLE )
@@ -1291,7 +1291,7 @@ void XMLDatabaseNameImportContext::ProcessAttribute(
XMLDatabaseNextImportContext::XMLDatabaseNextImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
- const sal_Char* pServiceName, sal_uInt16 nPrfx,
+ const char* pServiceName, sal_uInt16 nPrfx,
const OUString& sLocalName) :
XMLDatabaseFieldImportContext(rImport, rHlp, pServiceName,
nPrfx, sLocalName, false),
@@ -1535,10 +1535,10 @@ void XMLSimpleDocInfoImportContext::PrepareField(
}
}
-const sal_Char* XMLSimpleDocInfoImportContext::MapTokenToServiceName(
+const char* XMLSimpleDocInfoImportContext::MapTokenToServiceName(
sal_uInt16 nToken)
{
- const sal_Char* pServiceName = nullptr;
+ const char* pServiceName = nullptr;
switch(nToken)
{
@@ -2272,10 +2272,10 @@ void XMLCountFieldImportContext::PrepareField(
}
}
-const sal_Char* XMLCountFieldImportContext::MapTokenToServiceName(
+const char* XMLCountFieldImportContext::MapTokenToServiceName(
sal_uInt16 nToken)
{
- const sal_Char* pServiceName = nullptr;
+ const char* pServiceName = nullptr;
switch (nToken)
{
@@ -3132,10 +3132,10 @@ void XMLBibliographyFieldImportContext::PrepareField(
xPropertySet->setPropertyValue("Fields", Any(aValueSequence));
}
-const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName(
+const char* XMLBibliographyFieldImportContext::MapBibliographyFieldName(
const OUString& sName)
{
- const sal_Char* pName = nullptr;
+ const char* pName = nullptr;
if (IsXMLToken(sName, XML_IDENTIFIER))
{
@@ -3488,7 +3488,7 @@ void XMLAnnotationImportContext::PrepareField(
if ( sBuffer.getLength() )
{
// delete last paragraph mark (if necessary)
- if (sal_Char(0x0a) == sBuffer[sBuffer.getLength()-1])
+ if (char(0x0a) == sBuffer[sBuffer.getLength()-1])
sBuffer = sBuffer.copy(0, sBuffer.getLength()-1);
xPropertySet->setPropertyValue(sAPI_content, makeAny(sBuffer));
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 00b4968aa5fe..e23c78b5a962 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -347,7 +347,7 @@ static bool txtparae_bContainsIllegalCharacters = false;
// For the export pass all properties can be queried using a multi property
// set.
-static const sal_Char* aParagraphPropertyNamesAuto[] =
+static const char* aParagraphPropertyNamesAuto[] =
{
"NumberingRules",
"ParaConditionalStyleName",
@@ -366,7 +366,7 @@ enum eParagraphPropertyNamesEnumAuto
}
-static const sal_Char* aParagraphPropertyNames[] =
+static const char* aParagraphPropertyNames[] =
{
"NumberingIsNumber",
"NumberingStyleName",
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 257180699e9e..e8b30eb39aa1 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -50,18 +50,18 @@
// service names
-static const sal_Char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
-static const sal_Char sAPI_get_expression[] = "GetExpression";
-static const sal_Char sAPI_set_expression[] = "SetExpression";
-static const sal_Char sAPI_user[] = "User";
-static const sal_Char sAPI_database[] = "com.sun.star.text.TextField.Database";
+static const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
+static const char sAPI_get_expression[] = "GetExpression";
+static const char sAPI_set_expression[] = "SetExpression";
+static const char sAPI_user[] = "User";
+static const char sAPI_database[] = "com.sun.star.text.TextField.Database";
// property names
-static const sal_Char sAPI_content[] = "Content";
-static const sal_Char sAPI_sub_type[] = "SubType";
-static const sal_Char sAPI_number_format[] = "NumberFormat";
-static const sal_Char sAPI_is_visible[] = "IsVisible";
-static const sal_Char sAPI_current_presentation[] = "CurrentPresentation";
+static const char sAPI_content[] = "Content";
+static const char sAPI_sub_type[] = "SubType";
+static const char sAPI_number_format[] = "NumberFormat";
+static const char sAPI_is_visible[] = "IsVisible";
+static const char sAPI_current_presentation[] = "CurrentPresentation";
using namespace ::com::sun::star;
@@ -77,7 +77,7 @@ using namespace ::xmloff::token;
XMLVarFieldImportContext::XMLVarFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
- const sal_Char* pServiceName, sal_uInt16 nPrfx,
+ const char* pServiceName, sal_uInt16 nPrfx,
const OUString& rLocalName,
bool bFormula, bool bFormulaDefault,
bool bDescription, bool bHelp, bool bHint, bool bVisible,
@@ -244,7 +244,7 @@ void XMLVarFieldImportContext::PrepareField(
XMLSetVarFieldImportContext::XMLSetVarFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
- const sal_Char* pServiceName, sal_uInt16 nPrfx,
+ const char* pServiceName, sal_uInt16 nPrfx,
const OUString& rLocalName, VarType eVarType,
bool bFormula, bool bFormulaDefault,
bool bDescription, bool bHelp, bool bHint, bool bVisible, bool bIsDisplayFormula,
@@ -754,7 +754,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
}
case XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR:
cSeparationChar =
- static_cast<sal_Char>(xAttrList->getValueByIndex(i).toChar());
+ static_cast<char>(xAttrList->getValueByIndex(i).toChar());
break;
default:
generated by cgit (git 2.34.1) at 2024-06-16 09:14:57 +0000