[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Feb 8 08:18:12 UTC 2017
include/xmloff/txtimp.hxx | 1 -
xmloff/inc/txtflde.hxx | 3 ---
xmloff/source/draw/sdxmlexp.cxx | 2 --
xmloff/source/draw/sdxmlexp_impl.hxx | 2 --
xmloff/source/forms/formattributes.cxx | 6 ------
xmloff/source/forms/formattributes.hxx | 3 ---
xmloff/source/style/xmlnumfi.cxx | 8 --------
xmloff/source/text/txtflde.cxx | 5 +----
xmloff/source/text/txtparai.cxx | 3 ---
xmloff/source/transform/ElemTransformerAction.hxx | 5 -----
xmloff/source/transform/PropertyActionsOASIS.hxx | 1 -
xmloff/source/transform/StyleOASISTContext.cxx | 11 -----------
xmloff/source/transform/TransformerBase.cxx | 11 -----------
13 files changed, 1 insertion(+), 60 deletions(-)
New commits:
commit f5245bf4833b37faaabd715a95bb3f57bb81aee9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Feb 7 14:09:51 2017 +0200
loplugin:unusedenumconstants read-only constants in xmloff
Change-Id: I88afb3b4b3aa7d823c46062ead894561a66ac275
Reviewed-on: https://gerrit.libreoffice.org/33995
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index e01f5d9..3e8ff12 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -248,7 +248,6 @@ enum XMLTextPAttrTokens
XML_TOK_TEXT_P_STYLE_NAME,
XML_TOK_TEXT_P_COND_STYLE_NAME,
XML_TOK_TEXT_P_LEVEL,
- XML_TOK_TEXT_P_CLASS_NAMES,
XML_TOK_TEXT_P_IS_LIST_HEADER,
XML_TOK_TEXT_P_RESTART_NUMBERING,
XML_TOK_TEXT_P_START_VALUE
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 61090c7..732d10b 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -65,16 +65,13 @@ enum FieldIdEnum {
FIELD_ID_PLACEHOLDER, // placeholder field == jump edit field
- FIELD_ID_VARIABLE_DECL, // field type for set variable
FIELD_ID_VARIABLE_GET, // get variable == get expression
FIELD_ID_VARIABLE_SET, // set variable == set expression
FIELD_ID_VARIABLE_INPUT, // input field (variable)
- FIELD_ID_USER_DECL, // field type for user field
FIELD_ID_USER_GET, // user field
FIELD_ID_USER_INPUT, // input field (user field)
FIELD_ID_TEXT_INPUT, // input field (text)
FIELD_ID_EXPRESSION, // expression field = formula field
- FIELD_ID_SEQUENCE_DECL, // field type for sequence
FIELD_ID_SEQUENCE, // sequence field
FIELD_ID_DATABASE_NEXT, // select next row
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ed72c78b..ebc578b 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1179,11 +1179,9 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan
case XmlPlaceholderTitle: aStr = "title"; break;
case XmlPlaceholderOutline: aStr = "outline"; break;
case XmlPlaceholderSubtitle: aStr = "subtitle"; break;
- case XmlPlaceholderText: aStr = "text"; break;
case XmlPlaceholderGraphic: aStr = "graphic"; break;
case XmlPlaceholderObject: aStr = "object"; break;
case XmlPlaceholderChart: aStr = "chart"; break;
- case XmlPlaceholderOrgchart: aStr = "orgchart"; break;
case XmlPlaceholderTable: aStr = "table"; break;
case XmlPlaceholderPage: aStr = "page"; break;
case XmlPlaceholderNotes: aStr = "notes"; break;
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 4841933..5d24eac 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -46,11 +46,9 @@ enum XmlPlaceholder
XmlPlaceholderTitle,
XmlPlaceholderOutline,
XmlPlaceholderSubtitle,
- XmlPlaceholderText,
XmlPlaceholderGraphic,
XmlPlaceholderObject,
XmlPlaceholderChart,
- XmlPlaceholderOrgchart,
XmlPlaceholderTable,
XmlPlaceholderPage,
XmlPlaceholderNotes,
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 323dde9..fb04f93 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -86,11 +86,9 @@ namespace xmloff
switch (_eAttrib)
{
case faName: return "name";
- case faServiceName: return "service-name";
case faAction: return "href"; // the only special thing here: Action is represented by an xlink:href attribute
case faEnctype: return "enctype";
case faMethod: return "method";
- case faTargetFrame: return "target-frame";
case faAllowDeletes: return "allow-deletes";
case faAllowInserts: return "allow-inserts";
case faAllowUpdates: return "allow-updates";
@@ -99,7 +97,6 @@ namespace xmloff
case faCommandType: return "command-type";
case faEscapeProcessing: return "escape-processing";
case faDatasource: return "datasource";
- case faConnectionResource: return "connection-resource";
case faDetailFiels: return "detail-fields";
case faFilter: return "filter";
case faIgnoreResult: return "ignore-result";
@@ -118,9 +115,6 @@ namespace xmloff
if (faAction == _eAttrib)
return XML_NAMESPACE_XLINK;
- if (faTargetFrame == _eAttrib)
- return XML_NAMESPACE_OFFICE;
-
return XML_NAMESPACE_FORM;
}
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index 7167c1f..c41ebfd 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -141,11 +141,9 @@ namespace xmloff
enum FormAttributes
{
faName,
- faServiceName,
faAction,
faEnctype,
faMethod,
- faTargetFrame,
faAllowDeletes,
faAllowInserts,
faAllowUpdates,
@@ -154,7 +152,6 @@ namespace xmloff
faCommandType,
faEscapeProcessing,
faDatasource,
- faConnectionResource,
faDetailFiels,
faFilter,
faIgnoreResult,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index e4298ab..b48dfc6 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -244,9 +244,7 @@ enum SvXMLStyleAttrTokens
XML_TOK_STYLE_ATTR_TRUNCATE_ON_OVERFLOW,
XML_TOK_STYLE_ATTR_VOLATILE,
XML_TOK_STYLE_ATTR_TRANSL_FORMAT,
- XML_TOK_STYLE_ATTR_TRANSL_RFC_LANGUAGE_TAG,
XML_TOK_STYLE_ATTR_TRANSL_LANGUAGE,
- XML_TOK_STYLE_ATTR_TRANSL_SCRIPT,
XML_TOK_STYLE_ATTR_TRANSL_COUNTRY,
XML_TOK_STYLE_ATTR_TRANSL_STYLE
};
@@ -1452,15 +1450,9 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
case XML_TOK_STYLE_ATTR_TRANSL_FORMAT:
aNatNumAttr.Format = sValue;
break;
- case XML_TOK_STYLE_ATTR_TRANSL_RFC_LANGUAGE_TAG:
- sNatNumAttrRfcLanguageTag = sValue;
- break;
case XML_TOK_STYLE_ATTR_TRANSL_LANGUAGE:
aNatNumAttr.Locale.Language = sValue;
break;
- case XML_TOK_STYLE_ATTR_TRANSL_SCRIPT:
- sNatNumAttrScript = sValue;
- break;
case XML_TOK_STYLE_ATTR_TRANSL_COUNTRY:
aNatNumAttr.Locale.Country = sValue;
break;
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 0c901ae..4037bab 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -731,11 +731,8 @@ bool XMLTextFieldExport::IsStringField(
case FIELD_ID_SCRIPT:
case FIELD_ID_ANNOTATION:
- case FIELD_ID_DATABASE_NEXT:
+ case FIELD_ID_DATABASE_NEXT:
case FIELD_ID_DATABASE_SELECT:
- case FIELD_ID_VARIABLE_DECL:
- case FIELD_ID_USER_DECL:
- case FIELD_ID_SEQUENCE_DECL:
case FIELD_ID_PLACEHOLDER:
case FIELD_ID_UNKNOWN:
case FIELD_ID_DRAW_HEADER:
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 74da4e6..61cb1e3 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1825,9 +1825,6 @@ XMLParaContext::XMLParaContext(
case XML_TOK_TEXT_P_STYLE_NAME:
sStyleName = rValue;
break;
- case XML_TOK_TEXT_P_CLASS_NAMES:
- sClassNames = rValue;
- break;
case XML_TOK_TEXT_P_COND_STYLE_NAME:
aCondStyleName = rValue;
break;
diff --git a/xmloff/source/transform/ElemTransformerAction.hxx b/xmloff/source/transform/ElemTransformerAction.hxx
index 2430177..b9eef07 100644
--- a/xmloff/source/transform/ElemTransformerAction.hxx
+++ b/xmloff/source/transform/ElemTransformerAction.hxx
@@ -52,11 +52,6 @@ enum XMLElemTransformerAction
// token of local name
// - param3: attr value (low)
// attr action map (high)
- XML_ETACTION_RENAME_ELEM_COND, // rename element if child of another:
- // - param1: namespace +
- // token of new local name
- // - param2: namespace +
- // token of parent element
XML_ETACTION_RENAME_ELEM_PROC_ATTRS_COND,// rename element and proc attr
// if child of another:
// - param1: elem namespace +
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 5d4864c..7ae64e9 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -44,7 +44,6 @@ enum XMLPropOASISTransformerAction
XML_OPTACTION_IMAGE_OPACITY,
XML_OPTACTION_KEEP_TOGETHER,
XML_OPTACTION_CONTROL_TEXT_ALIGN,
- XML_OPTACTION_DRAW_WRITING_MODE,
XML_ATACTION_CAPTION_ESCAPE_OASIS,
XML_ATACTION_DECODE_PROTECT
};
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6018aa5..b3a5427 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -430,17 +430,6 @@ void XMLPropertiesTContext_Impl::StartElement(
}
break;
- case XML_OPTACTION_DRAW_WRITING_MODE:
- if( IsXMLToken( m_aStyleFamily, XML_GRAPHICS ) )
- {
- pAttrList->AddAttribute(
- GetTransformer().GetNamespaceMap().GetQNameByKey(
- XML_NAMESPACE_DRAW,
- GetXMLToken( XML_WRITING_MODE ) ), rAttrValue );
- }
- pAttrList->AddAttribute( rAttrName, rAttrValue );
- break;
-
case XML_ATACTION_CAPTION_ESCAPE_OASIS:
{
OUString aAttrValue( rAttrValue );
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 9d7048d..8995f5e 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -123,17 +123,6 @@ XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix,
(*aIter).second.GetQNameTokenFromParam2(),
static_cast< XMLTokenEnum >(
(*aIter).second.m_nParam3 & 0xffff ) );
- case XML_ETACTION_RENAME_ELEM_COND:
- {
- const XMLTransformerContext *pCurrent = GetCurrentContext();
- if( pCurrent->HasQName(
- (*aIter).second.GetQNamePrefixFromParam2(),
- (*aIter).second.GetQNameTokenFromParam2() ) )
- return new XMLRenameElemTransformerContext( *this, rQName,
- (*aIter).second.GetQNamePrefixFromParam1(),
- (*aIter).second.GetQNameTokenFromParam1() );
- }
- break;
case XML_ETACTION_RENAME_ELEM_PROC_ATTRS_COND:
{
const XMLTransformerContext *pCurrent = GetCurrentContext();
More information about the Libreoffice-commits
mailing list