[Libreoffice-commits] core.git: xmloff/source
Chr. Rossmanith
ChrRossmanith at gmx.de
Sat Mar 2 12:37:20 PST 2013
xmloff/source/text/XMLIndexObjectSourceContext.cxx | 15 -
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 4
xmloff/source/text/XMLIndexTOCContext.cxx | 10
xmloff/source/text/XMLIndexTOCSourceContext.cxx | 8
xmloff/source/text/XMLIndexTOCStylesContext.cxx | 2
xmloff/source/text/XMLIndexTabStopEntryContext.cxx | 3
xmloff/source/text/XMLIndexTableSourceContext.cxx | 6
xmloff/source/text/XMLIndexUserSourceContext.cxx | 21 -
xmloff/source/text/XMLLineNumberingExport.cxx | 22 +-
xmloff/source/text/XMLPropertyBackpatcher.cxx | 6
xmloff/source/text/XMLRedlineExport.cxx | 44 ++--
xmloff/source/text/XMLSectionExport.cxx | 138 ++++++------
xmloff/source/text/XMLSectionImportContext.cxx | 16 -
xmloff/source/text/XMLSectionSourceDDEImportContext.cxx | 8
xmloff/source/text/XMLSectionSourceImportContext.cxx | 4
xmloff/source/text/XMLTextColumnsContext.cxx | 19 -
xmloff/source/text/XMLTextColumnsExport.cxx | 16 -
xmloff/source/text/XMLTextFrameContext.cxx | 69 ++----
xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 6
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 10
xmloff/source/text/XMLTextListAutoStylePool.cxx | 6
xmloff/source/text/XMLTextListBlockContext.cxx | 3
xmloff/source/text/XMLTextListItemContext.cxx | 3
xmloff/source/text/XMLTextMasterPageContext.cxx | 9
xmloff/source/text/XMLTextNumRuleInfo.cxx | 20 -
xmloff/source/text/XMLTextShapeImportHelper.cxx | 6
xmloff/source/text/txtexppr.cxx | 5
xmloff/source/text/txtflde.cxx | 171 +++++++---------
xmloff/source/text/txtftne.cxx | 3
xmloff/source/text/txtparae.cxx | 8
xmloff/source/text/txtstyle.cxx | 4
xmloff/source/text/txtstyli.cxx | 31 +-
32 files changed, 325 insertions(+), 371 deletions(-)
New commits:
commit b15f095293c6127ecaef2f0fa3a1683e72392835
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sat Mar 2 21:32:41 2013 +0100
removed RTL_CONSTASCII_(U)STRINGPARAM xmloff(text)
Change-Id: I54af0ac7a3454259540e89267200d801b17ec179
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 97ef45f..ac542b0 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -64,16 +64,11 @@ XMLIndexObjectSourceContext::XMLIndexObjectSourceContext(
Reference<XPropertySet> & rPropSet) :
XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName,
rPropSet, sal_False),
- sCreateFromStarCalc(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromStarCalc)),
- sCreateFromStarChart(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromStarChart)),
- sCreateFromStarDraw(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromStarDraw)),
- sCreateFromStarMath(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromStarMath)),
- sCreateFromOtherEmbeddedObjects(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromOtherEmbeddedObjects)),
+ sCreateFromStarCalc(sAPI_CreateFromStarCalc),
+ sCreateFromStarChart(sAPI_CreateFromStarChart),
+ sCreateFromStarDraw(sAPI_CreateFromStarDraw),
+ sCreateFromStarMath(sAPI_CreateFromStarMath),
+ sCreateFromOtherEmbeddedObjects(sAPI_CreateFromOtherEmbeddedObjects),
bUseCalc(sal_False),
bUseChart(sal_False),
bUseDraw(sal_False),
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index e562db6..d29edc6 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -153,8 +153,8 @@ XMLIndexSourceBaseContext::XMLIndexSourceBaseContext(
Reference<XPropertySet> & rPropSet,
sal_Bool bLevelFormats)
: SvXMLImportContext(rImport, nPrfx, rLocalName)
-, sCreateFromChapter(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromChapter))
-, sIsRelativeTabstops(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsRelativeTabstops))
+, sCreateFromChapter(sAPI_CreateFromChapter)
+, sIsRelativeTabstops(sAPI_IsRelativeTabstops)
, bUseLevelFormats(bLevelFormats)
, bChapterIndex(sal_False)
, bRelativeTabs(sal_True)
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index f672757..4a92646 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -100,9 +100,9 @@ XMLIndexTOCContext::XMLIndexTOCContext(
sal_uInt16 nPrfx,
const OUString& rLocalName )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
-, sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"))
-, sIsProtected(RTL_CONSTASCII_USTRINGPARAM("IsProtected"))
-, sName(RTL_CONSTASCII_USTRINGPARAM("Name"))
+, sTitle("Title")
+, sIsProtected("IsProtected")
+, sName("Name")
, bValid(sal_False)
{
if (XML_NAMESPACE_TEXT == nPrfx)
@@ -198,9 +198,9 @@ void XMLIndexTOCContext::StartElement(
// preliminaries
#ifndef DBG_UTIL
- OUString sMarker(RTL_CONSTASCII_USTRINGPARAM(" "));
+ OUString sMarker(" ");
#else
- OUString sMarker(RTL_CONSTASCII_USTRINGPARAM("Y"));
+ OUString sMarker("Y");
#endif
UniReference<XMLTextImportHelper> rImport =
GetImport().GetTextImport();
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index 95d6cab..b1399d7 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -57,10 +57,10 @@ XMLIndexTOCSourceContext::XMLIndexTOCSourceContext(
const OUString& rLocalName,
Reference<XPropertySet> & rPropSet)
: XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, rPropSet, sal_True)
-, sCreateFromMarks(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromMarks))
-, sLevel(RTL_CONSTASCII_USTRINGPARAM(sAPI_Level))
-, sCreateFromOutline(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromOutline))
-, sCreateFromLevelParagraphStyles(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromLevelParagraphStyles))
+, sCreateFromMarks(sAPI_CreateFromMarks)
+, sLevel(sAPI_Level)
+, sCreateFromOutline(sAPI_CreateFromOutline)
+, sCreateFromLevelParagraphStyles(sAPI_CreateFromLevelParagraphStyles)
// use all chapters by default
, nOutlineLevel(rImport.GetTextImport()->GetChapterNumbering()->getCount())
, bUseOutline(sal_True)
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index 2a161da..1270461 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -53,7 +53,7 @@ XMLIndexTOCStylesContext::XMLIndexTOCStylesContext(
sal_uInt16 nPrfx,
const OUString& rLocalName )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
-, sLevelParagraphStyles(RTL_CONSTASCII_USTRINGPARAM(sAPI_LevelParagraphStyles))
+, sLevelParagraphStyles(sAPI_LevelParagraphStyles)
, rTOCPropertySet(rPropSet)
{
}
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 946280ea..d9bff35 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -154,8 +154,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues(
}
// tab character #i21237#
- pValues[nNextEntry].Name =
- OUString( RTL_CONSTASCII_USTRINGPARAM("WithTab") );
+ pValues[nNextEntry].Name = OUString( "WithTab" );
pValues[nNextEntry].Value.setValue( &bWithTab,
::getBooleanCppuType());
nNextEntry++;
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 9c0a1e4..ab11324 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -63,9 +63,9 @@ XMLIndexTableSourceContext::XMLIndexTableSourceContext(
Reference<XPropertySet> & rPropSet) :
XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName,
rPropSet, sal_False),
- sCreateFromLabels(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromLabels)),
- sLabelCategory(RTL_CONSTASCII_USTRINGPARAM(sAPI_LabelCategory)),
- sLabelDisplayType(RTL_CONSTASCII_USTRINGPARAM(sAPI_LabelDisplayType)),
+ sCreateFromLabels(sAPI_CreateFromLabels),
+ sLabelCategory(sAPI_LabelCategory),
+ sLabelDisplayType(sAPI_LabelDisplayType),
bSequenceOK(sal_False),
bDisplayFormatOK(sal_False),
bUseCaption(sal_True)
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 9a50d26..ff2409a 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -63,19 +63,14 @@ XMLIndexUserSourceContext::XMLIndexUserSourceContext(
Reference<XPropertySet> & rPropSet) :
XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName,
rPropSet, sal_True),
- sCreateFromEmbeddedObjects(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromEmbeddedObjects)),
- sCreateFromGraphicObjects(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromGraphicObjects)),
- sCreateFromMarks(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromMarks)),
- sCreateFromTables(RTL_CONSTASCII_USTRINGPARAM(sAPI_CreateFromTables)),
- sCreateFromTextFrames(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromTextFrames)),
- sUseLevelFromSource(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_UseLevelFromSource)),
- sCreateFromLevelParagraphStyles(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_CreateFromLevelParagraphStyles)),
- sUserIndexName(RTL_CONSTASCII_USTRINGPARAM(sAPI_UserIndexName)),
+ sCreateFromEmbeddedObjects(sAPI_CreateFromEmbeddedObjects),
+ sCreateFromGraphicObjects(sAPI_CreateFromGraphicObjects),
+ sCreateFromMarks(sAPI_CreateFromMarks),
+ sCreateFromTables(sAPI_CreateFromTables),
+ sCreateFromTextFrames(sAPI_CreateFromTextFrames),
+ sUseLevelFromSource(sAPI_UseLevelFromSource),
+ sCreateFromLevelParagraphStyles(sAPI_CreateFromLevelParagraphStyles),
+ sUserIndexName(sAPI_UserIndexName),
bUseObjects(sal_False),
bUseGraphic(sal_False),
bUseMarks(sal_False),
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 687908b..86c31ff 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -40,17 +40,17 @@ using ::com::sun::star::text::XLineNumberingProperties;
XMLLineNumberingExport::XMLLineNumberingExport(SvXMLExport& rExp)
-: sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName"))
-, sCountEmptyLines(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines"))
-, sCountLinesInFrames(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames"))
-, sDistance(RTL_CONSTASCII_USTRINGPARAM("Distance"))
-, sInterval(RTL_CONSTASCII_USTRINGPARAM("Interval"))
-, sSeparatorText(RTL_CONSTASCII_USTRINGPARAM("SeparatorText"))
-, sNumberPosition(RTL_CONSTASCII_USTRINGPARAM("NumberPosition"))
-, sNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType"))
-, sIsOn(RTL_CONSTASCII_USTRINGPARAM("IsOn"))
-, sRestartAtEachPage(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage"))
-, sSeparatorInterval(RTL_CONSTASCII_USTRINGPARAM("SeparatorInterval"))
+: sCharStyleName("CharStyleName")
+, sCountEmptyLines("CountEmptyLines")
+, sCountLinesInFrames("CountLinesInFrames")
+, sDistance("Distance")
+, sInterval("Interval")
+, sSeparatorText("SeparatorText")
+, sNumberPosition("NumberPosition")
+, sNumberingType("NumberingType")
+, sIsOn("IsOn")
+, sRestartAtEachPage("RestartAtEachPage")
+, sSeparatorInterval("SeparatorInterval")
, rExport(rExp)
{
}
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 6d3ac13..de91fc5 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -178,8 +178,7 @@ XMLTextImportHelper::MakeBackpatcherImpl()
static ::rtl::OUString const& GetSequenceNumber()
{
- static ::rtl::OUString s_SequenceNumber(
- RTL_CONSTASCII_USTRINGPARAM("SequenceNumber"));
+ static ::rtl::OUString s_SequenceNumber("SequenceNumber");
return s_SequenceNumber;
}
@@ -219,8 +218,7 @@ XMLPropertyBackpatcher<sal_Int16>& XMLTextImportHelper::GetSequenceIdBP()
XMLPropertyBackpatcher<OUString>& XMLTextImportHelper::GetSequenceNameBP()
{
- static ::rtl::OUString s_SourceName(
- RTL_CONSTASCII_USTRINGPARAM("SourceName"));
+ static OUString s_SourceName("SourceName");
if (!m_pBackpatcherImpl->m_pSequenceNameBackpatcher.get())
{
m_pBackpatcherImpl->m_pSequenceNameBackpatcher.reset(
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 69d72a1..635ed46 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -62,31 +62,31 @@ using ::std::list;
XMLRedlineExport::XMLRedlineExport(SvXMLExport& rExp)
-: sDelete(RTL_CONSTASCII_USTRINGPARAM("Delete"))
+: sDelete("Delete")
, sDeletion(GetXMLToken(XML_DELETION))
-, sFormat(RTL_CONSTASCII_USTRINGPARAM("Format"))
+, sFormat("Format")
, sFormatChange(GetXMLToken(XML_FORMAT_CHANGE))
-, sInsert(RTL_CONSTASCII_USTRINGPARAM("Insert"))
+, sInsert("Insert")
, sInsertion(GetXMLToken(XML_INSERTION))
-, sIsCollapsed(RTL_CONSTASCII_USTRINGPARAM("IsCollapsed"))
-, sIsStart(RTL_CONSTASCII_USTRINGPARAM("IsStart"))
-, sRedlineAuthor(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor"))
-, sRedlineComment(RTL_CONSTASCII_USTRINGPARAM("RedlineComment"))
-, sRedlineDateTime(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime"))
-, sRedlineSuccessorData(RTL_CONSTASCII_USTRINGPARAM("RedlineSuccessorData"))
-, sRedlineText(RTL_CONSTASCII_USTRINGPARAM("RedlineText"))
-, sRedlineType(RTL_CONSTASCII_USTRINGPARAM("RedlineType"))
-, sStyle(RTL_CONSTASCII_USTRINGPARAM("Style"))
-, sTextTable(RTL_CONSTASCII_USTRINGPARAM("TextTable"))
-, sUnknownChange(RTL_CONSTASCII_USTRINGPARAM("UnknownChange"))
-, sStartRedline(RTL_CONSTASCII_USTRINGPARAM("StartRedline"))
-, sEndRedline(RTL_CONSTASCII_USTRINGPARAM("EndRedline"))
-, sRedlineIdentifier(RTL_CONSTASCII_USTRINGPARAM("RedlineIdentifier"))
-, sIsInHeaderFooter(RTL_CONSTASCII_USTRINGPARAM("IsInHeaderFooter"))
-, sRedlineProtectionKey(RTL_CONSTASCII_USTRINGPARAM("RedlineProtectionKey"))
-, sRecordChanges(RTL_CONSTASCII_USTRINGPARAM("RecordChanges"))
-, sMergeLastPara(RTL_CONSTASCII_USTRINGPARAM("MergeLastPara"))
-, sChangePrefix(RTL_CONSTASCII_USTRINGPARAM("ct"))
+, sIsCollapsed("IsCollapsed")
+, sIsStart("IsStart")
+, sRedlineAuthor("RedlineAuthor")
+, sRedlineComment("RedlineComment")
+, sRedlineDateTime("RedlineDateTime")
+, sRedlineSuccessorData("RedlineSuccessorData")
+, sRedlineText("RedlineText")
+, sRedlineType("RedlineType")
+, sStyle("Style")
+, sTextTable("TextTable")
+, sUnknownChange("UnknownChange")
+, sStartRedline("StartRedline")
+, sEndRedline("EndRedline")
+, sRedlineIdentifier("RedlineIdentifier")
+, sIsInHeaderFooter("IsInHeaderFooter")
+, sRedlineProtectionKey("RedlineProtectionKey")
+, sRecordChanges("RecordChanges")
+, sMergeLastPara("MergeLastPara")
+, sChangePrefix("ct")
, rExport(rExp)
, pCurrentChangesList(NULL)
{
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 83fe8d4..3fd6877 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -79,63 +79,63 @@ using ::com::sun::star::uno::XInterface;
XMLSectionExport::XMLSectionExport(
SvXMLExport& rExp,
XMLTextParagraphExport& rParaExp)
-: sCondition(RTL_CONSTASCII_USTRINGPARAM("Condition"))
-, sCreateFromChapter(RTL_CONSTASCII_USTRINGPARAM("CreateFromChapter"))
-, sCreateFromEmbeddedObjects(RTL_CONSTASCII_USTRINGPARAM("CreateFromEmbeddedObjects"))
-, sCreateFromGraphicObjects(RTL_CONSTASCII_USTRINGPARAM("CreateFromGraphicObjects"))
-, sCreateFromLabels(RTL_CONSTASCII_USTRINGPARAM("CreateFromLabels"))
-, sCreateFromMarks(RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks"))
-, sCreateFromOtherEmbeddedObjects(RTL_CONSTASCII_USTRINGPARAM("CreateFromOtherEmbeddedObjects"))
-, sCreateFromOutline(RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline"))
-, sCreateFromStarCalc(RTL_CONSTASCII_USTRINGPARAM("CreateFromStarCalc"))
-, sCreateFromStarChart(RTL_CONSTASCII_USTRINGPARAM("CreateFromStarChart"))
-, sCreateFromStarDraw(RTL_CONSTASCII_USTRINGPARAM("CreateFromStarDraw"))
-, sCreateFromStarImage(RTL_CONSTASCII_USTRINGPARAM("CreateFromStarImage"))
-, sCreateFromStarMath(RTL_CONSTASCII_USTRINGPARAM("CreateFromStarMath"))
-, sCreateFromTables(RTL_CONSTASCII_USTRINGPARAM("CreateFromTables"))
-, sCreateFromTextFrames(RTL_CONSTASCII_USTRINGPARAM("CreateFromTextFrames"))
-, sDdeCommandElement(RTL_CONSTASCII_USTRINGPARAM("DDECommandElement"))
-, sDdeCommandFile(RTL_CONSTASCII_USTRINGPARAM("DDECommandFile"))
-, sDdeCommandType(RTL_CONSTASCII_USTRINGPARAM("DDECommandType"))
-, sFileLink(RTL_CONSTASCII_USTRINGPARAM("FileLink"))
-, sIsCaseSensitive(RTL_CONSTASCII_USTRINGPARAM("IsCaseSensitive"))
-, sIsProtected(RTL_CONSTASCII_USTRINGPARAM("IsProtected"))
-, sIsVisible(RTL_CONSTASCII_USTRINGPARAM("IsVisible"))
-, sLabelCategory(RTL_CONSTASCII_USTRINGPARAM("LabelCategory"))
-, sLabelDisplayType(RTL_CONSTASCII_USTRINGPARAM("LabelDisplayType"))
-, sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
-, sLevelFormat(RTL_CONSTASCII_USTRINGPARAM("LevelFormat"))
-, sLevelParagraphStyles(RTL_CONSTASCII_USTRINGPARAM("LevelParagraphStyles"))
-, sLinkRegion(RTL_CONSTASCII_USTRINGPARAM("LinkRegion"))
-, sMainEntryCharacterStyleName(RTL_CONSTASCII_USTRINGPARAM("MainEntryCharacterStyleName"))
-, sParaStyleHeading(RTL_CONSTASCII_USTRINGPARAM("ParaStyleHeading"))
-, sParaStyleLevel(RTL_CONSTASCII_USTRINGPARAM("ParaStyleLevel"))
-, sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"))
-, sName(RTL_CONSTASCII_USTRINGPARAM("Name"))
-, sUseAlphabeticalSeparators(RTL_CONSTASCII_USTRINGPARAM("UseAlphabeticalSeparators"))
-, sUseCombinedEntries(RTL_CONSTASCII_USTRINGPARAM("UseCombinedEntries"))
-, sUseDash(RTL_CONSTASCII_USTRINGPARAM("UseDash"))
-, sUseKeyAsEntry(RTL_CONSTASCII_USTRINGPARAM("UseKeyAsEntry"))
-, sUseLevelFromSource(RTL_CONSTASCII_USTRINGPARAM("UseLevelFromSource"))
-, sUsePP(RTL_CONSTASCII_USTRINGPARAM("UsePP"))
-, sUseUpperCase(RTL_CONSTASCII_USTRINGPARAM("UseUpperCase"))
-, sIsCommaSeparated(RTL_CONSTASCII_USTRINGPARAM("IsCommaSeparated"))
-, sIsAutomaticUpdate(RTL_CONSTASCII_USTRINGPARAM("IsAutomaticUpdate"))
-, sIsRelativeTabstops(RTL_CONSTASCII_USTRINGPARAM("IsRelativeTabstops"))
-, sCreateFromLevelParagraphStyles(RTL_CONSTASCII_USTRINGPARAM("CreateFromLevelParagraphStyles"))
-, sDocumentIndex(RTL_CONSTASCII_USTRINGPARAM("DocumentIndex"))
-, sContentSection(RTL_CONSTASCII_USTRINGPARAM("ContentSection"))
-, sHeaderSection(RTL_CONSTASCII_USTRINGPARAM("HeaderSection"))
-
-, sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection"))
-, sIsGlobalDocumentSection(RTL_CONSTASCII_USTRINGPARAM("IsGlobalDocumentSection"))
-, sProtectionKey(RTL_CONSTASCII_USTRINGPARAM("ProtectionKey"))
-, sSortAlgorithm(RTL_CONSTASCII_USTRINGPARAM("SortAlgorithm"))
-, sLocale(RTL_CONSTASCII_USTRINGPARAM("Locale"))
-, sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName"))
-
-, sIsCurrentlyVisible(RTL_CONSTASCII_USTRINGPARAM("IsCurrentlyVisible"))
-, sHeadingStyleName(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName"))
+: sCondition("Condition")
+, sCreateFromChapter("CreateFromChapter")
+, sCreateFromEmbeddedObjects("CreateFromEmbeddedObjects")
+, sCreateFromGraphicObjects("CreateFromGraphicObjects")
+, sCreateFromLabels("CreateFromLabels")
+, sCreateFromMarks("CreateFromMarks")
+, sCreateFromOtherEmbeddedObjects("CreateFromOtherEmbeddedObjects")
+, sCreateFromOutline("CreateFromOutline")
+, sCreateFromStarCalc("CreateFromStarCalc")
+, sCreateFromStarChart("CreateFromStarChart")
+, sCreateFromStarDraw("CreateFromStarDraw")
+, sCreateFromStarImage("CreateFromStarImage")
+, sCreateFromStarMath("CreateFromStarMath")
+, sCreateFromTables("CreateFromTables")
+, sCreateFromTextFrames("CreateFromTextFrames")
+, sDdeCommandElement("DDECommandElement")
+, sDdeCommandFile("DDECommandFile")
+, sDdeCommandType("DDECommandType")
+, sFileLink("FileLink")
+, sIsCaseSensitive("IsCaseSensitive")
+, sIsProtected("IsProtected")
+, sIsVisible("IsVisible")
+, sLabelCategory("LabelCategory")
+, sLabelDisplayType("LabelDisplayType")
+, sLevel("Level")
+, sLevelFormat("LevelFormat")
+, sLevelParagraphStyles("LevelParagraphStyles")
+, sLinkRegion("LinkRegion")
+, sMainEntryCharacterStyleName("MainEntryCharacterStyleName")
+, sParaStyleHeading("ParaStyleHeading")
+, sParaStyleLevel("ParaStyleLevel")
+, sTitle("Title")
+, sName("Name")
+, sUseAlphabeticalSeparators("UseAlphabeticalSeparators")
+, sUseCombinedEntries("UseCombinedEntries")
+, sUseDash("UseDash")
+, sUseKeyAsEntry("UseKeyAsEntry")
+, sUseLevelFromSource("UseLevelFromSource")
+, sUsePP("UsePP")
+, sUseUpperCase("UseUpperCase")
+, sIsCommaSeparated("IsCommaSeparated")
+, sIsAutomaticUpdate("IsAutomaticUpdate")
+, sIsRelativeTabstops("IsRelativeTabstops")
+, sCreateFromLevelParagraphStyles("CreateFromLevelParagraphStyles")
+, sDocumentIndex("DocumentIndex")
+, sContentSection("ContentSection")
+, sHeaderSection("HeaderSection")
+
+, sTextSection("TextSection")
+, sIsGlobalDocumentSection("IsGlobalDocumentSection")
+, sProtectionKey("ProtectionKey")
+, sSortAlgorithm("SortAlgorithm")
+, sLocale("Locale")
+, sUserIndexName("UserIndexName")
+
+, sIsCurrentlyVisible("IsCurrentlyVisible")
+, sHeadingStyleName("HeadingStyleName")
, rExport(rExp)
, rParaExport(rParaExp)
@@ -1638,8 +1638,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport)
UNO_QUERY );
if ( xTextFieldsSupp.is() )
{
- const OUString sFieldMaster_Bibliography(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_FieldMaster_Bibliography));
+ const OUString sFieldMaster_Bibliography(sAPI_FieldMaster_Bibliography);
// get bibliography field master
Reference<XNameAccess> xMasters =
@@ -1653,20 +1652,13 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport)
OSL_ENSURE( xPropSet.is(), "field master must have XPropSet" );
- const OUString sBracketBefore(
- RTL_CONSTASCII_USTRINGPARAM("BracketBefore"));
- const OUString sBracketAfter(
- RTL_CONSTASCII_USTRINGPARAM("BracketAfter"));
- const OUString sIsNumberEntries(
- RTL_CONSTASCII_USTRINGPARAM("IsNumberEntries"));
- const OUString sIsSortByPosition(
- RTL_CONSTASCII_USTRINGPARAM("IsSortByPosition"));
- const OUString sSortKeys(
- RTL_CONSTASCII_USTRINGPARAM("SortKeys"));
- const OUString sSortAlgorithm(
- RTL_CONSTASCII_USTRINGPARAM("SortAlgorithm"));
- const OUString sLocale(
- RTL_CONSTASCII_USTRINGPARAM("Locale"));
+ const OUString sBracketBefore("BracketBefore");
+ const OUString sBracketAfter("BracketAfter");
+ const OUString sIsNumberEntries("IsNumberEntries");
+ const OUString sIsSortByPosition("IsSortByPosition");
+ const OUString sSortKeys("SortKeys");
+ const OUString sSortAlgorithm("SortAlgorithm");
+ const OUString sLocale("Locale");
OUString sTmp;
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index ac8af94..00dc278 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -96,13 +96,13 @@ XMLSectionImportContext::XMLSectionImportContext(
sal_uInt16 nPrfx,
const OUString& rLocalName )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
-, sTextSection(RTL_CONSTASCII_USTRINGPARAM(sAPI_TextSection))
-, sIndexHeaderSection(RTL_CONSTASCII_USTRINGPARAM(sAPI_IndexHeaderSection))
-, sCondition(RTL_CONSTASCII_USTRINGPARAM(sAPI_Condition))
-, sIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsVisible))
-, sProtectionKey(RTL_CONSTASCII_USTRINGPARAM(sAPI_ProtectionKey))
-, sIsProtected(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsProtected))
-, sIsCurrentlyVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsCurrentlyVisible))
+, sTextSection(sAPI_TextSection)
+, sIndexHeaderSection(sAPI_IndexHeaderSection)
+, sCondition(sAPI_Condition)
+, sIsVisible(sAPI_IsVisible)
+, sProtectionKey(sAPI_ProtectionKey)
+, sIsProtected(sAPI_IsProtected)
+, sIsCurrentlyVisible(sAPI_IsCurrentlyVisible)
, bProtect(sal_False)
, bCondOK(sal_False)
, bIsVisible(sal_True)
@@ -215,7 +215,7 @@ void XMLSectionImportContext::StartElement(
#else
static const sal_Char sMarker[] = "X";
#endif
- OUString sMarkerString(RTL_CONSTASCII_USTRINGPARAM(sMarker));
+ OUString sMarkerString(sMarker);
rHelper->InsertString(sMarkerString);
rHelper->InsertControlCharacter(
ControlCharacter::APPEND_PARAGRAPH );
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index c366db4..d719fce 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -57,10 +57,10 @@ XMLSectionSourceDDEImportContext::XMLSectionSourceDDEImportContext(
Reference<XPropertySet> & rSectPropSet) :
SvXMLImportContext(rImport, nPrfx, rLocalName),
rSectionPropertySet(rSectPropSet),
- sDdeCommandFile(RTL_CONSTASCII_USTRINGPARAM(sAPI_DDECommandFile)),
- sDdeCommandType(RTL_CONSTASCII_USTRINGPARAM(sAPI_DDECommandType)),
- sDdeCommandElement(RTL_CONSTASCII_USTRINGPARAM(sAPI_DDECommandElement)),
- sIsAutomaticUpdate(RTL_CONSTASCII_USTRINGPARAM(sAPI_IsAutomaticUpdate))
+ sDdeCommandFile(sAPI_DDECommandFile),
+ sDdeCommandType(sAPI_DDECommandType),
+ sDdeCommandElement(sAPI_DDECommandElement),
+ sIsAutomaticUpdate(sAPI_IsAutomaticUpdate)
{
}
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 2447b8a..9162e64 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -110,8 +110,8 @@ void XMLSectionSourceImportContext::StartElement(
}
// we only need them once
- const OUString sFileLink(RTL_CONSTASCII_USTRINGPARAM("FileLink"));
- const OUString sLinkRegion(RTL_CONSTASCII_USTRINGPARAM("LinkRegion"));
+ const OUString sFileLink("FileLink");
+ const OUString sLinkRegion("LinkRegion");
Any aAny;
if (!sURL.isEmpty() || !sFilterName.isEmpty())
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index ea384b0..a1cc8c3 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -286,14 +286,14 @@ XMLTextColumnsContext::XMLTextColumnsContext(
const XMLPropertyState& rProp,
::std::vector< XMLPropertyState > &rProps )
: XMLElementPropertyContext( rImport, nPrfx, rLName, rProp, rProps )
-, sSeparatorLineIsOn(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineIsOn"))
-, sSeparatorLineWidth(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineWidth"))
-, sSeparatorLineColor(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineColor"))
-, sSeparatorLineRelativeHeight(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineRelativeHeight"))
-, sSeparatorLineVerticalAlignment(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineVerticalAlignment"))
-, sIsAutomatic(RTL_CONSTASCII_USTRINGPARAM("IsAutomatic"))
-, sAutomaticDistance(RTL_CONSTASCII_USTRINGPARAM("AutomaticDistance"))
-, sSeparatorLineStyle(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineStyle"))
+, sSeparatorLineIsOn("SeparatorLineIsOn")
+, sSeparatorLineWidth("SeparatorLineWidth")
+, sSeparatorLineColor("SeparatorLineColor")
+, sSeparatorLineRelativeHeight("SeparatorLineRelativeHeight")
+, sSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment")
+, sIsAutomatic("IsAutomatic")
+, sAutomaticDistance("AutomaticDistance")
+, sSeparatorLineStyle("SeparatorLineStyle")
, pColumns( 0 )
, pColumnSep( 0 )
, pColumnAttrTokenMap( new SvXMLTokenMap(aColAttrTokenMap) )
@@ -393,8 +393,7 @@ void XMLTextColumnsContext::EndElement( )
if( !xFactory.is() )
return;
- Reference<XInterface> xIfc = xFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextColumns")));
+ Reference<XInterface> xIfc = xFactory->createInstance(OUString("com.sun.star.text.TextColumns"));
if( !xIfc.is() )
return;
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 4f6005a..f301aed 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -44,14 +44,14 @@ using namespace ::xmloff::token;
XMLTextColumnsExport::XMLTextColumnsExport( SvXMLExport& rExp ) :
rExport( rExp ),
- sSeparatorLineIsOn(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineIsOn")),
- sSeparatorLineWidth(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineWidth")),
- sSeparatorLineColor(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineColor")),
- sSeparatorLineRelativeHeight(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineRelativeHeight")),
- sSeparatorLineVerticalAlignment(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineVerticalAlignment")),
- sIsAutomatic(RTL_CONSTASCII_USTRINGPARAM("IsAutomatic")),
- sAutomaticDistance(RTL_CONSTASCII_USTRINGPARAM("AutomaticDistance")),
- sSeparatorLineStyle(RTL_CONSTASCII_USTRINGPARAM("SeparatorLineStyle"))
+ sSeparatorLineIsOn("SeparatorLineIsOn"),
+ sSeparatorLineWidth("SeparatorLineWidth"),
+ sSeparatorLineColor("SeparatorLineColor"),
+ sSeparatorLineRelativeHeight("SeparatorLineRelativeHeight"),
+ sSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment"),
+ sIsAutomatic("IsAutomatic"),
+ sAutomaticDistance("AutomaticDistance"),
+ sSeparatorLineStyle("SeparatorLineStyle")
{
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 6e8fc2e2..6ed30d3 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -288,8 +288,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
}
}
- OUString sContourPolyPolygon(
- RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon") );
+ OUString sContourPolyPolygon("ContourPolyPolygon");
Reference < XPropertySetInfo > xPropSetInfo =
rPropSet->getPropertySetInfo();
if( xPropSetInfo->hasPropertyByName(sContourPolyPolygon ) &&
@@ -313,8 +312,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
aAny <<= aPoints.GetPointSequenceSequence();
}
- OUString sIsPixelContour(
- RTL_CONSTASCII_USTRINGPARAM("IsPixelContour") );
+ OUString sIsPixelContour("IsPixelContour");
xPropSet->setPropertyValue( sContourPolyPolygon, aAny );
if( xPropSetInfo->hasPropertyByName( sIsPixelContour ) )
@@ -323,8 +321,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
xPropSet->setPropertyValue( sIsPixelContour, aAny );
}
- OUString sIsAutomaticContour(
- RTL_CONSTASCII_USTRINGPARAM("IsAutomaticContour") );
+ OUString sIsAutomaticContour("IsAutomaticContour");
if( xPropSetInfo->hasPropertyByName( sIsAutomaticContour ) )
{
aAny.setValue( &bAuto, ::getBooleanCppuType() );
@@ -505,7 +502,7 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ )
}
else
{
- OUString sURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.ServiceName:") );
+ OUString sURL( "vnd.sun.star.ServiceName:" );
sURL += sFilterService;
xPropSet = GetImport().GetTextImport()
->createAndInsertOLEObject( GetImport(), sURL,
@@ -838,29 +835,29 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
const Reference< XAttributeList > & rFrameAttrList )
: SvXMLImportContext( rImport, nPrfx, rLName )
, mbListContextPushed( false )
-, sWidth(RTL_CONSTASCII_USTRINGPARAM("Width"))
-, sWidthType(RTL_CONSTASCII_USTRINGPARAM("WidthType"))
-, sRelativeWidth(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth"))
-, sHeight(RTL_CONSTASCII_USTRINGPARAM("Height"))
-, sRelativeHeight(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight"))
-, sSizeType(RTL_CONSTASCII_USTRINGPARAM("SizeType"))
-, sIsSyncWidthToHeight(RTL_CONSTASCII_USTRINGPARAM("IsSyncWidthToHeight"))
-, sIsSyncHeightToWidth(RTL_CONSTASCII_USTRINGPARAM("IsSyncHeightToWidth"))
-, sHoriOrient(RTL_CONSTASCII_USTRINGPARAM("HoriOrient"))
-, sHoriOrientPosition(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition"))
-, sVertOrient(RTL_CONSTASCII_USTRINGPARAM("VertOrient"))
-, sVertOrientPosition(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition"))
-, sChainNextName(RTL_CONSTASCII_USTRINGPARAM("ChainNextName"))
-, sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType"))
-, sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo"))
-, sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))
-, sGraphicFilter(RTL_CONSTASCII_USTRINGPARAM("GraphicFilter"))
-, sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"))
-, sDescription(RTL_CONSTASCII_USTRINGPARAM("Description"))
-, sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName"))
-, sGraphicRotation(RTL_CONSTASCII_USTRINGPARAM("GraphicRotation"))
-, sTextBoxServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame"))
-, sGraphicServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GraphicObject"))
+, sWidth("Width")
+, sWidthType("WidthType")
+, sRelativeWidth("RelativeWidth")
+, sHeight("Height")
+, sRelativeHeight("RelativeHeight")
+, sSizeType("SizeType")
+, sIsSyncWidthToHeight("IsSyncWidthToHeight")
+, sIsSyncHeightToWidth("IsSyncHeightToWidth")
+, sHoriOrient("HoriOrient")
+, sHoriOrientPosition("HoriOrientPosition")
+, sVertOrient("VertOrient")
+, sVertOrientPosition("VertOrientPosition")
+, sChainNextName("ChainNextName")
+, sAnchorType("AnchorType")
+, sAnchorPageNo("AnchorPageNo")
+, sGraphicURL("GraphicURL")
+, sGraphicFilter("GraphicFilter")
+, sTitle("Title")
+, sDescription("Description")
+, sFrameStyleName("FrameStyleName")
+, sGraphicRotation("GraphicRotation")
+, sTextBoxServiceName("com.sun.star.text.TextFrame")
+, sGraphicServiceName("com.sun.star.text.GraphicObject")
, nType( nNewType )
, eAnchorType( eATyp )
{
@@ -1252,14 +1249,10 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef,
const OUString& rTargetFrameName,
sal_Bool bMap )
{
- static ::rtl::OUString s_HyperLinkURL(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL"));
- static ::rtl::OUString s_HyperLinkName(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkName"));
- static ::rtl::OUString s_HyperLinkTarget(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkTarget"));
- static ::rtl::OUString s_ServerMap(
- RTL_CONSTASCII_USTRINGPARAM("ServerMap"));
+ static OUString s_HyperLinkURL("HyperLinkURL");
+ static OUString s_HyperLinkName("HyperLinkName");
+ static ::rtl::OUString s_HyperLinkTarget("HyperLinkTarget");
+ static ::rtl::OUString s_ServerMap("ServerMap");
if( !xPropSet.is() )
return;
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index c7ed32e..14c6e0a 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -93,11 +93,9 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
if( !sShow.isEmpty() && sTargetFrameName.isEmpty() )
{
if( IsXMLToken( sShow, XML_NEW ) )
- sTargetFrameName =
- OUString( RTL_CONSTASCII_USTRINGPARAM("_blank" ) );
+ sTargetFrameName = "_blank";
else if( IsXMLToken( sShow, XML_REPLACE ) )
- sTargetFrameName =
- OUString( RTL_CONSTASCII_USTRINGPARAM("_self" ) );
+ sTargetFrameName = "_self";
}
}
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 9c794dc..f152f1c 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -46,14 +46,12 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
sal_Bool bFooter, sal_Bool bLft, sal_Bool bFrst ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
- sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )) ),
- sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsShared" ))
- : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsShared" )) ),
+ sOn( bFooter ? OUString("FooterIsOn") : OUString("HeaderIsOn") ),
+ sShareContent( bFooter ? OUString("FooterIsShared") : OUString("HeaderIsShared") ),
sShareContentFirst( "FirstIsShared" ),
- sText( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterText" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderText" )) ),
+ sText( bFooter ? OUString("FooterText") : OUString("HeaderText") ),
sTextFirst(bFooter ? OUString("FooterTextFirst") : OUString("HeaderTextFirst")),
- sTextLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterTextLeft" ))
- : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderTextLeft" )) ),
+ sTextLeft( bFooter ? OUString("FooterTextLeft") : OUString("HeaderTextLeft") ),
bInsertContent( sal_True ),
bLeft( bLft ),
bFirst( bFrst )
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 9e875a9..5a0a0ea 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -140,17 +140,17 @@ class XMLTextListAutoStylePool_Impl : public o3tl::sorted_vector<XMLTextListAuto
XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
rExport( rExp ),
- sPrefix( RTL_CONSTASCII_USTRINGPARAM("L") ),
+ sPrefix( "L" ),
pPool( new XMLTextListAutoStylePool_Impl ),
nName( 0 )
{
Reference<ucb::XAnyCompareFactory> xCompareFac( rExp.GetModel(), uno::UNO_QUERY );
if( xCompareFac.is() )
- mxNumRuleCompare = xCompareFac->createAnyCompareByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ) );
+ mxNumRuleCompare = xCompareFac->createAnyCompareByName( OUString( "NumberingRules" ) );
sal_uInt16 nExportFlags = rExport.getExportFlags();
sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0;
if( bStylesOnly )
- sPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM("ML") );
+ sPrefix = OUString( "ML" );
}
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 4a3e628..827d575 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -62,8 +62,7 @@ XMLTextListBlockContext::XMLTextListBlockContext(
, msListId()
, msContinueListId()
{
- static ::rtl::OUString s_PropNameDefaultListId(
- RTL_CONSTASCII_USTRINGPARAM("DefaultListId"));
+ static ::rtl::OUString s_PropNameDefaultListId("DefaultListId");
{
// get the parent list block context (if any); this is a bit ugly...
XMLTextListBlockContext * pLB(0);
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 336707f..41c488a 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -52,8 +52,7 @@ XMLTextListItemContext::XMLTextListItemContext(
mnSubListCount( 0 ),
mxNumRulesOverride()
{
- static ::rtl::OUString s_NumberingRules(
- RTL_CONSTASCII_USTRINGPARAM("NumberingRules"));
+ static ::rtl::OUString s_NumberingRules("NumberingRules");
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 0b1c2ff..9f97d4b 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -52,8 +52,7 @@ Reference < XStyle > XMLTextMasterPageContext::Create()
if( xFactory.is() )
{
Reference < XInterface > xIfc =
- xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.style.PageStyle")) );
+ xFactory->createInstance(OUString("com.sun.star.style.PageStyle"));
if( xIfc.is() )
xNewStyle = Reference < XStyle >( xIfc, UNO_QUERY );
}
@@ -67,9 +66,9 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
const Reference< XAttributeList > & xAttrList,
sal_Bool bOverwrite )
: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_MASTER_PAGE )
-, sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) )
-, sPageStyleLayout( RTL_CONSTASCII_USTRINGPARAM( "PageStyleLayout" ) )
-, sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) )
+, sIsPhysical( "IsPhysical" )
+, sPageStyleLayout( "PageStyleLayout" )
+, sFollowStyle( "FollowStyle" )
, bInsertHeader( sal_False )
, bInsertFooter( sal_False )
, bInsertHeaderLeft( sal_False )
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 262d2b7..fd219c2 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -36,16 +36,16 @@ using namespace ::com::sun::star::style;
// Complete refactoring of the class and enhancement of the class for lists.
XMLTextNumRuleInfo::XMLTextNumRuleInfo()
- : msNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules"))
- , msNumberingLevel(RTL_CONSTASCII_USTRINGPARAM("NumberingLevel"))
- , msNumberingStartValue(RTL_CONSTASCII_USTRINGPARAM("NumberingStartValue"))
- , msParaIsNumberingRestart(RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart"))
- , msNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber"))
- , msNumberingIsOutline(RTL_CONSTASCII_USTRINGPARAM("NumberingIsOutline"))
- , msPropNameListId(RTL_CONSTASCII_USTRINGPARAM("ListId"))
- , msPropNameStartWith(RTL_CONSTASCII_USTRINGPARAM("StartWith"))
- , msContinueingPreviousSubTree(RTL_CONSTASCII_USTRINGPARAM("ContinueingPreviousSubTree"))
- , msListLabelStringProp(RTL_CONSTASCII_USTRINGPARAM("ListLabelString"))
+ : msNumberingRules("NumberingRules")
+ , msNumberingLevel("NumberingLevel")
+ , msNumberingStartValue("NumberingStartValue")
+ , msParaIsNumberingRestart("ParaIsNumberingRestart")
+ , msNumberingIsNumber("NumberingIsNumber")
+ , msNumberingIsOutline("NumberingIsOutline")
+ , msPropNameListId("ListId")
+ , msPropNameStartWith("StartWith")
+ , msContinueingPreviousSubTree("ContinueingPreviousSubTree")
+ , msListLabelStringProp("ListLabelString")
, mxNumRules()
, msNumRulesName()
, msListId()
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index b45d413..ab5ca78 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -47,9 +47,9 @@ XMLTextShapeImportHelper::XMLTextShapeImportHelper(
XMLShapeImportHelper( rImp, rImp.GetModel(),
XMLTextImportHelper::CreateShapeExtPropMapper(rImp) ),
rImport( rImp ),
- sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")),
- sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")),
- sVertOrientPosition(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition"))
+ sAnchorType("AnchorType"),
+ sAnchorPageNo("AnchorPageNo"),
+ sVertOrientPosition("VertOrientPosition")
{
Reference < XDrawPageSupplier > xDPS( rImp.GetModel(), UNO_QUERY );
if( xDPS.is() )
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index c2c042a..5392b22 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -853,8 +853,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
pAnchorTypeState->maValue >>= eAnchor;
else if( bNeedsAnchor )
{
- Any aAny = rPropSet->getPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) );
+ Any aAny = rPropSet->getPropertyValue( OUString( "AnchorType" ) );
aAny >>= eAnchor;
}
@@ -973,7 +972,7 @@ static bool lcl_IsOutlineStyle(const SvXMLExport &rExport, const OUString & rNam
xCNSupplier(rExport.GetModel(), UNO_QUERY);
OUString sOutlineName;
- OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ OUString sName("Name");
if (xCNSupplier.is())
{
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index c66e95d..92bc85b 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -278,82 +278,82 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
XMLPropertyState* pCombinedCharState)
: rExport(rExp),
pUsedMasters(NULL),
- sServicePrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.")),
- sFieldMasterPrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.FieldMaster.")),
- sPresentationServicePrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.")),
-
- sPropertyAdjust(RTL_CONSTASCII_USTRINGPARAM("Adjust")),
- sPropertyAuthor(RTL_CONSTASCII_USTRINGPARAM("Author")),
- sPropertyChapterFormat(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")),
- sPropertyChapterNumberingLevel(RTL_CONSTASCII_USTRINGPARAM("ChapterNumberingLevel")),
- sPropertyCharStyleNames(RTL_CONSTASCII_USTRINGPARAM("CharStyleNames")),
- sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM("Condition")),
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM("Content")),
- sPropertyDataBaseName(RTL_CONSTASCII_USTRINGPARAM("DataBaseName")),
- sPropertyDataBaseURL(RTL_CONSTASCII_USTRINGPARAM("DataBaseURL")),
- sPropertyDataColumnName(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")),
- sPropertyDataCommandType(RTL_CONSTASCII_USTRINGPARAM("DataCommandType")),
- sPropertyDataTableName(RTL_CONSTASCII_USTRINGPARAM("DataTableName")),
- sPropertyDate(RTL_CONSTASCII_USTRINGPARAM("Date")),
- sPropertyDateTime(RTL_CONSTASCII_USTRINGPARAM("DateTime")),
- sPropertyDateTimeValue(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
- sPropertyDDECommandElement(RTL_CONSTASCII_USTRINGPARAM("DDECommandElement")),
- sPropertyDDECommandFile(RTL_CONSTASCII_USTRINGPARAM("DDECommandFile")),
- sPropertyDDECommandType(RTL_CONSTASCII_USTRINGPARAM("DDECommandType")),
- sPropertyDependentTextFields(RTL_CONSTASCII_USTRINGPARAM("DependentTextFields")),
- sPropertyFalseContent(RTL_CONSTASCII_USTRINGPARAM("FalseContent")),
- sPropertyFields(RTL_CONSTASCII_USTRINGPARAM("Fields")),
- sPropertyFieldSubType(RTL_CONSTASCII_USTRINGPARAM("UserDataType")),
- sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM("FileFormat")),
- sPropertyFullName(RTL_CONSTASCII_USTRINGPARAM("FullName")),
- sPropertyHint(RTL_CONSTASCII_USTRINGPARAM("Hint")),
+ sServicePrefix("com.sun.star.text.textfield."),
+ sFieldMasterPrefix("com.sun.star.text.FieldMaster."),
+ sPresentationServicePrefix("com.sun.star.presentation.TextField."),
+
+ sPropertyAdjust("Adjust"),
+ sPropertyAuthor("Author"),
+ sPropertyChapterFormat("ChapterFormat"),
+ sPropertyChapterNumberingLevel("ChapterNumberingLevel"),
+ sPropertyCharStyleNames("CharStyleNames"),
+ sPropertyCondition("Condition"),
+ sPropertyContent("Content"),
+ sPropertyDataBaseName("DataBaseName"),
+ sPropertyDataBaseURL("DataBaseURL"),
+ sPropertyDataColumnName("DataColumnName"),
+ sPropertyDataCommandType("DataCommandType"),
+ sPropertyDataTableName("DataTableName"),
+ sPropertyDate("Date"),
+ sPropertyDateTime("DateTime"),
+ sPropertyDateTimeValue("DateTimeValue"),
+ sPropertyDDECommandElement("DDECommandElement"),
+ sPropertyDDECommandFile("DDECommandFile"),
+ sPropertyDDECommandType("DDECommandType"),
+ sPropertyDependentTextFields("DependentTextFields"),
+ sPropertyFalseContent("FalseContent"),
+ sPropertyFields("Fields"),
+ sPropertyFieldSubType("UserDataType"),
+ sPropertyFileFormat("FileFormat"),
+ sPropertyFullName("FullName"),
+ sPropertyHint("Hint"),
sPropertyInitials("Initials"),
- sPropertyInstanceName(RTL_CONSTASCII_USTRINGPARAM("InstanceName")),
- sPropertyIsAutomaticUpdate(RTL_CONSTASCII_USTRINGPARAM("IsAutomaticUpdate")),
- sPropertyIsConditionTrue(RTL_CONSTASCII_USTRINGPARAM("IsConditionTrue")),
- sPropertyIsDataBaseFormat(RTL_CONSTASCII_USTRINGPARAM("DataBaseFormat")),
- sPropertyIsDate(RTL_CONSTASCII_USTRINGPARAM("IsDate")),
- sPropertyIsExpression(RTL_CONSTASCII_USTRINGPARAM("IsExpression")),
- sPropertyIsFixed(RTL_CONSTASCII_USTRINGPARAM("IsFixed")),
- sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")),
- sPropertyIsHidden(RTL_CONSTASCII_USTRINGPARAM("IsHidden")),
- sPropertyIsInput(RTL_CONSTASCII_USTRINGPARAM("Input")),
- sPropertyIsShowFormula(RTL_CONSTASCII_USTRINGPARAM("IsShowFormula")),
- sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM("IsVisible")),
- sPropertyItems(RTL_CONSTASCII_USTRINGPARAM("Items")),
- sPropertyLevel(RTL_CONSTASCII_USTRINGPARAM("Level")),
- sPropertyMacro(RTL_CONSTASCII_USTRINGPARAM("Macro")),
- sPropertyMeasureKind(RTL_CONSTASCII_USTRINGPARAM("Kind")),
- sPropertyName(RTL_CONSTASCII_USTRINGPARAM("Name")),
- sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")),
- sPropertyNumberingSeparator(RTL_CONSTASCII_USTRINGPARAM("NumberingSeparator")),
- sPropertyNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
- sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM("Offset")),
- sPropertyOn(RTL_CONSTASCII_USTRINGPARAM("On")),
- sPropertyPlaceholder(RTL_CONSTASCII_USTRINGPARAM("PlaceHolder")),
- sPropertyPlaceholderType(RTL_CONSTASCII_USTRINGPARAM("PlaceHolderType")),
- sPropertyReferenceFieldPart(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldPart")),
- sPropertyReferenceFieldSource(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")),
- sPropertyReferenceFieldType(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldType")),
- sPropertyRevision(RTL_CONSTASCII_USTRINGPARAM("Revision")),
- sPropertyScriptType(RTL_CONSTASCII_USTRINGPARAM("ScriptType")),
- sPropertySelectedItem(RTL_CONSTASCII_USTRINGPARAM("SelectedItem")),
- sPropertySequenceNumber(RTL_CONSTASCII_USTRINGPARAM("SequenceNumber")),
- sPropertySequenceValue(RTL_CONSTASCII_USTRINGPARAM("SequenceValue")),
- sPropertySetNumber(RTL_CONSTASCII_USTRINGPARAM("SetNumber")),
- sPropertySourceName(RTL_CONSTASCII_USTRINGPARAM("SourceName")),
- sPropertySubType(RTL_CONSTASCII_USTRINGPARAM("SubType")),
- sPropertyTargetFrame(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")),
- sPropertyTrueContent(RTL_CONSTASCII_USTRINGPARAM("TrueContent")),
- sPropertyURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
- sPropertyURLContent(RTL_CONSTASCII_USTRINGPARAM("URLContent")),
- sPropertyUserText(RTL_CONSTASCII_USTRINGPARAM("UserText")),
- sPropertyValue(RTL_CONSTASCII_USTRINGPARAM("Value")),
- sPropertyVariableName(RTL_CONSTASCII_USTRINGPARAM("VariableName")),
- sPropertyVariableSubType(RTL_CONSTASCII_USTRINGPARAM("VariableSubtype")),
- sPropertyHelp(RTL_CONSTASCII_USTRINGPARAM("Help")),
- sPropertyTooltip(RTL_CONSTASCII_USTRINGPARAM("Tooltip")),
- sPropertyTextRange(RTL_CONSTASCII_USTRINGPARAM("TextRange")),
+ sPropertyInstanceName("InstanceName"),
+ sPropertyIsAutomaticUpdate("IsAutomaticUpdate"),
+ sPropertyIsConditionTrue("IsConditionTrue"),
+ sPropertyIsDataBaseFormat("DataBaseFormat"),
+ sPropertyIsDate("IsDate"),
+ sPropertyIsExpression("IsExpression"),
+ sPropertyIsFixed("IsFixed"),
+ sPropertyIsFixedLanguage("IsFixedLanguage"),
+ sPropertyIsHidden("IsHidden"),
+ sPropertyIsInput("Input"),
+ sPropertyIsShowFormula("IsShowFormula"),
+ sPropertyIsVisible("IsVisible"),
+ sPropertyItems("Items"),
+ sPropertyLevel("Level"),
+ sPropertyMacro("Macro"),
+ sPropertyMeasureKind("Kind"),
+ sPropertyName("Name"),
+ sPropertyNumberFormat("NumberFormat"),
+ sPropertyNumberingSeparator("NumberingSeparator"),
+ sPropertyNumberingType("NumberingType"),
+ sPropertyOffset("Offset"),
+ sPropertyOn("On"),
+ sPropertyPlaceholder("PlaceHolder"),
+ sPropertyPlaceholderType("PlaceHolderType"),
+ sPropertyReferenceFieldPart("ReferenceFieldPart"),
+ sPropertyReferenceFieldSource("ReferenceFieldSource"),
+ sPropertyReferenceFieldType("ReferenceFieldType"),
+ sPropertyRevision("Revision"),
+ sPropertyScriptType("ScriptType"),
+ sPropertySelectedItem("SelectedItem"),
+ sPropertySequenceNumber("SequenceNumber"),
+ sPropertySequenceValue("SequenceValue"),
+ sPropertySetNumber("SetNumber"),
+ sPropertySourceName("SourceName"),
+ sPropertySubType("SubType"),
+ sPropertyTargetFrame("TargetFrame"),
+ sPropertyTrueContent("TrueContent"),
+ sPropertyURL("URL"),
+ sPropertyURLContent("URLContent"),
+ sPropertyUserText("UserText"),
+ sPropertyValue("Value"),
+ sPropertyVariableName("VariableName"),
+ sPropertyVariableSubType("VariableSubtype"),
+ sPropertyHelp("Help"),
+ sPropertyTooltip("Tooltip"),
+ sPropertyTextRange("TextRange"),
pCombinedCharactersPropertyState(pCombinedCharState)
{
SetExportOnlyUsedFieldDeclarations();
@@ -1021,8 +1021,7 @@ void XMLTextFieldExport::ExportField(
if( bHasHyperlink )
{
// export events (if supported)
- OUString sHyperLinkEvents(RTL_CONSTASCII_USTRINGPARAM(
- "HyperLinkEvents"));
+ OUString sHyperLinkEvents("HyperLinkEvents");
if (xRangePropSetInfo->hasPropertyByName(sHyperLinkEvents))
{
Any aAny = xRangePropSet->getPropertyValue(sHyperLinkEvents);
@@ -2246,15 +2245,15 @@ void XMLTextFieldExport::ExportMacro(
const OUString& rContent )
{
// some strings we'll need
- OUString sEventType( RTL_CONSTASCII_USTRINGPARAM( "EventType" ));
- OUString sStarBasic( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ));
- OUString sScript( RTL_CONSTASCII_USTRINGPARAM( "Script" ));
- OUString sLibrary( RTL_CONSTASCII_USTRINGPARAM( "Library" ));
- OUString sMacroName( RTL_CONSTASCII_USTRINGPARAM( "MacroName" ));
- OUString sOnClick( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ));
- OUString sPropertyMacroLibrary( RTL_CONSTASCII_USTRINGPARAM( "MacroLibrary" ));
- OUString sPropertyMacroName( RTL_CONSTASCII_USTRINGPARAM( "MacroName" ));
- OUString sPropertyScriptURL( RTL_CONSTASCII_USTRINGPARAM( "ScriptURL" ));
+ OUString sEventType( "EventType" );
+ OUString sStarBasic( "StarBasic" );
+ OUString sScript( "Script" );
+ OUString sLibrary( "Library" );
+ OUString sMacroName( "MacroName" );
+ OUString sOnClick( "OnClick" );
+ OUString sPropertyMacroLibrary( "MacroLibrary" );
+ OUString sPropertyMacroName( "MacroName" );
+ OUString sPropertyScriptURL( "ScriptURL" );
// the description attribute
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index fd4f026..a24597e 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -117,8 +117,7 @@ void XMLTextParagraphExport::exportTextFootnote(
if( bHasHyperlink )
{
// export events (if supported)
- OUString sHyperLinkEvents(RTL_CONSTASCII_USTRINGPARAM(
- "HyperLinkEvents"));
+ OUString sHyperLinkEvents("HyperLinkEvents");
if (xPropSetInfo->hasPropertyByName(sHyperLinkEvents))
{
Any a = rPropSet->getPropertyValue(sHyperLinkEvents);
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 96cb842..44f7e4d 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2077,9 +2077,7 @@ void XMLTextParagraphExport::exportParagraph(
}
{
- rtl::OUString sParaIsNumberingRestart
- (RTL_CONSTASCII_USTRINGPARAM
- ("ParaIsNumberingRestart"));
+ OUString sParaIsNumberingRestart("ParaIsNumberingRestart");
bool bIsRestartNumbering = false;
Reference< XPropertySetInfo >
@@ -2100,9 +2098,7 @@ void XMLTextParagraphExport::exportParagraph(
XML_RESTART_NUMBERING,
XML_TRUE);
- rtl::OUString sNumberingStartValue
- (RTL_CONSTASCII_USTRINGPARAM
- ("NumberingStartValue"));
+ OUString sNumberingStartValue("NumberingStartValue");
if (xPropSetInfo->
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index ee704a4..3186708 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -119,7 +119,7 @@ void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg )
Reference < lang::XMultiServiceFactory > xFactory (GetExport().GetModel(), UNO_QUERY);
if (xFactory.is())
{
- OUString sTextDefaults ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.Defaults" ) );
+ OUString sTextDefaults ( "com.sun.star.text.Defaults" );
Reference < XPropertySet > xPropSet (xFactory->createInstance ( sTextDefaults ), UNO_QUERY);
if (xPropSet.is())
{
@@ -148,7 +148,7 @@ void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg )
bUsed, XML_STYLE_FAMILY_TEXT_TEXT );
// get shape export to make sure the frame family is added correctly.
GetExport().GetShapeExport();
- exportStyleFamily( "FrameStyles", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), GetFramePropMapper(),
+ exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetFramePropMapper(),
bUsed, XML_STYLE_FAMILY_TEXT_FRAME, 0);
exportNumStyles( bUsed );
if( !IsBlockMode() )
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 3497125..348a9a0 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -131,12 +131,12 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
sal_Bool bDefaultStyle )
: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle )
-, sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) )
-, sCategory( RTL_CONSTASCII_USTRINGPARAM( "Category" ) )
-, sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) )
-, sOutlineLevel(RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) )
-, sDropCapCharStyleName( RTL_CONSTASCII_USTRINGPARAM( "DropCapCharStyleName" ) )
-, sPageDescName( RTL_CONSTASCII_USTRINGPARAM( "PageDescName" ) )
+, sIsAutoUpdate( "IsAutoUpdate" )
+, sCategory( "Category" )
+, sNumberingStyleName( "NumberingStyleName" )
+, sOutlineLevel("OutlineLevel" )
+, sDropCapCharStyleName( "DropCapCharStyleName" )
+, sPageDescName( "PageDescName" )
, nOutlineLevel( -1 )
, bAutoUpdate( sal_False )
, bHasMasterPageName( sal_False )
@@ -258,7 +258,7 @@ void XMLTextStyleContext::SetDefaults( )
if (xFactory.is())
{
Reference < XInterface > xInt = xFactory->createInstance (
- OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.Defaults" ) ) );
+ OUString ( "com.sun.star.text.Defaults" ) );
Reference < XPropertySet > xProperties ( xInt, UNO_QUERY );
if ( xProperties.is() )
FillPropertySet ( xProperties );
@@ -439,8 +439,8 @@ void XMLTextStyleContext::FillPropertySet(
if( !GetAutoName().isEmpty() )
{
OUString sAutoProp = ( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT ) ?
- OUString( RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName") ):
- OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName") );
+ OUString( "CharAutoStyleName" ):
+ OUString( "ParaAutoStyleName" );
try
{
if ( xInfo->hasPropertyByName( sAutoProp ) )
@@ -477,8 +477,7 @@ void XMLTextStyleContext::FillPropertySet(
// border-model: same
if( IsDefaultStyle() && GetFamily() == XML_STYLE_FAMILY_TABLE_ROW )
{
- OUString sIsSplitAllowed =
- OUString( RTL_CONSTASCII_USTRINGPARAM( "IsSplitAllowed" ) );
+ OUString sIsSplitAllowed( "IsSplitAllowed" );
DBG_ASSERT( rPropSet->getPropertySetInfo()->hasPropertyByName( sIsSplitAllowed ),
"property missing?" );
rPropSet->setPropertyValue( sIsSplitAllowed,
@@ -489,8 +488,7 @@ void XMLTextStyleContext::FillPropertySet(
if( IsDefaultStyle() && GetFamily() == XML_STYLE_FAMILY_TABLE_TABLE )
{
- OUString sCollapsingBorders(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "CollapsingBorders" ) ) );
+ OUString sCollapsingBorders("CollapsingBorders");
DBG_ASSERT( rPropSet->getPropertySetInfo()->hasPropertyByName( sCollapsingBorders ),
"property missing?" );
rPropSet->setPropertyValue( sCollapsingBorders,
@@ -519,14 +517,13 @@ void XMLTextStyleContext::FillPropertySet(
rAny >>= sFontName;
if ( !sFontName.isEmpty() )
{
- OUString sStarBats( RTL_CONSTASCII_USTRINGPARAM("StarBats" ) );
- OUString sStarMath( RTL_CONSTASCII_USTRINGPARAM("StarMath" ) );
+ OUString sStarBats( "StarBats" );
+ OUString sStarMath( "StarMath" );
if ( sFontName.equalsIgnoreAsciiCase( sStarBats ) ||
sFontName.equalsIgnoreAsciiCase( sStarMath ) )
{
// construct new value
- sFontName = OUString(
- RTL_CONSTASCII_USTRINGPARAM("StarSymbol") );
+ sFontName = OUString("StarSymbol");
Any aAny( rAny );
aAny <<= sFontName;
More information about the Libreoffice-commits
mailing list