[Libreoffice-commits] core.git: compilerplugins/clang writerfilter/inc writerfilter/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Feb 8 11:01:01 UTC 2017
compilerplugins/clang/unusedenumconstants.py | 1
writerfilter/inc/ooxml/OOXMLDocument.hxx | 2 -
writerfilter/source/dmapper/PropertyIds.cxx | 33 --------------------------
writerfilter/source/dmapper/PropertyIds.hxx | 33 --------------------------
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 4 ---
5 files changed, 2 insertions(+), 71 deletions(-)
New commits:
commit 25702ff6c9b00efb3263bc2cd67783d207e16af0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Feb 7 14:51:40 2017 +0200
loplugin:unusedenumconstants read-only constants in writerfilter
Change-Id: I3cc0d696059b130a8f1f1d8d3b1908d2e84d1a75
Reviewed-on: https://gerrit.libreoffice.org/34017
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 6ee56d8..50d680e 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -98,6 +98,7 @@ for d in definitionSet:
"include/registry/version.h",
"include/svtools/rtftoken.h",
"sc/source/filter/inc/xltracer.hxx",
+ "writerfilter/source/dmapper/FieldTypes.hxx",
# unit test code
"cppu/source/uno/check.cxx",
# general weird nonsense going on
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index af06038..27ecf84 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -75,7 +75,7 @@ class OOXMLStream
{
public:
enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE, NUMBERING,
- FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT, FOOTER, HEADER, SIGNATURE };
+ FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT, FOOTER, HEADER };
typedef std::shared_ptr<OOXMLStream> Pointer_t;
virtual ~OOXMLStream() {}
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index eec6ba2..a807c47 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -52,21 +52,10 @@ OUString getPropertyName( PropertyIds eId )
case PROP_CHAR_SCALE_WIDTH: sName = "CharScaleWidth"; break;
case PROP_CHAR_STYLE_NAME: sName = "CharStyleName"; break;
case PROP_CHAR_FONT_NAME: sName = "CharFontName"; break;
- case PROP_CHAR_FONT_STYLE: sName = "CharFontStyle"; break;
- case PROP_CHAR_FONT_FAMILY: sName = "CharFontFamily"; break;
case PROP_CHAR_FONT_CHAR_SET: sName = "CharFontCharSet"; break;
- case PROP_CHAR_FONT_PITCH: sName = "CharFontPitch"; break;
case PROP_CHAR_FONT_NAME_ASIAN : sName = "CharFontNameAsian"; break;
case PROP_CHAR_HEIGHT_ASIAN : sName = "CharHeightAsian"; break;
- case PROP_CHAR_FONT_STYLE_ASIAN : sName = "CharFontStyleAsian"; break;
- case PROP_CHAR_FONT_FAMILY_ASIAN : sName = "CharFontFamilyAsian"; break;
- case PROP_CHAR_FONT_CHAR_SET_ASIAN : sName = "CharFontCharSetAsian"; break;
- case PROP_CHAR_FONT_PITCH_ASIAN : sName = "CharFontPitchAsian"; break;
case PROP_CHAR_FONT_NAME_COMPLEX : sName = "CharFontNameComplex"; break;
- case PROP_CHAR_FONT_STYLE_COMPLEX : sName = "CharFontStyleComplex"; break;
- case PROP_CHAR_FONT_FAMILY_COMPLEX: sName = "CharFontFamilyComplex"; break;
- case PROP_CHAR_FONT_CHAR_SET_COMPLEX: sName = "CharFontCharSetComplex"; break;
- case PROP_CHAR_FONT_PITCH_COMPLEX: sName = "CharFontPitchComplex"; break;
case PROP_CHAR_HIDDEN : sName = "CharHidden"; break;
case PROP_CHAR_WEIGHT_ASIAN : sName = "CharWeightAsian"; break;
case PROP_CHAR_POSTURE_ASIAN : sName = "CharPostureAsian"; break;
@@ -143,14 +132,10 @@ OUString getPropertyName( PropertyIds eId )
case PROP_IS_INPUT : sName = "IsInput"; break;
case PROP_HINT : sName = "Hint"; break;
case PROP_FULL_NAME : sName = "FullName"; break;
- case PROP_KEYWORDS : sName = "Keywords"; break;
case PROP_DESCRIPTION : sName = "Description"; break;
case PROP_MACRO_NAME : sName = "MacroName"; break;
- case PROP_SUBJECT : sName = "Subject"; break;
- case PROP_USER_DATA_TYPE : sName = "UserDataType"; break;
case PROP_TITLE : sName = "Title"; break;
case PROP_CONTENT : sName = "Content"; break;
- case PROP_DATA_COLUMN_NAME : sName = "DataColumnName"; break;
case PROP_INPUT_STREAM : sName = "InputStream"; break;
case PROP_GRAPHIC : sName = "Graphic"; break;
case PROP_ANCHOR_TYPE : sName = "AnchorType"; break;
@@ -161,7 +146,6 @@ OUString getPropertyName( PropertyIds eId )
case PROP_VERT_ORIENT : sName = "VertOrient"; break;
case PROP_VERT_ORIENT_POSITION : sName = "VertOrientPosition"; break;
case PROP_VERT_ORIENT_RELATION : sName = "VertOrientRelation"; break;
- case PROP_GRAPHIC_CROP : sName = "GraphicCrop"; break;
case PROP_SIZE100th_M_M : sName = "Size100thMM"; break;
case PROP_SIZE_PIXEL : sName = "SizePixel"; break;
case PROP_SURROUND : sName = "Surround"; break;
@@ -190,13 +174,11 @@ OUString getPropertyName( PropertyIds eId )
case PROP_FOOTNOTE_COUNTING : sName = "FootnoteCounting"; break;
case PROP_WIDTH : sName = "Width"; break;
case PROP_HEIGHT : sName = "Height"; break;
- case PROP_SEPARATOR_LINE_IS_ON : sName = "SeparatorLineIsOn"; break;
case PROP_TEXT_COLUMNS : sName = "TextColumns"; break;
case PROP_AUTOMATIC_DISTANCE : sName = "AutomaticDistance"; break;
case PROP_IS_LANDSCAPE : sName = "IsLandscape"; break;
case PROP_PRINTER_PAPER_TRAY_INDEX: sName = "PrinterPaperTrayIndex"; break;
case PROP_FIRST_PAGE : sName = "First Page"; break;
- case PROP_DEFAULT : sName = "Default"; break;
case PROP_PAGE_DESC_NAME : sName = "PageDescName"; break;
case PROP_PAGE_NUMBER_OFFSET: sName = "PageNumberOffset"; break;
case PROP_BREAK_TYPE : sName = "BreakType"; break;
@@ -212,7 +194,6 @@ OUString getPropertyName( PropertyIds eId )
case PROP_GRID_MODE : sName = "GridMode"; break;
case PROP_GRID_DISPLAY : sName = "GridDisplay"; break;
case PROP_GRID_PRINT : sName = "GridPrint"; break;
- case PROP_ADD_EXTERNAL_LEADING : sName = "AddExternalLeading"; break;
case PROP_GRID_LINES : sName = "GridLines"; break;
case PROP_GRID_BASE_HEIGHT : sName = "GridBaseHeight"; break;
case PROP_GRID_RUBY_HEIGHT : sName = "GridRubyHeight"; break;
@@ -243,30 +224,20 @@ OUString getPropertyName( PropertyIds eId )
case META_PROP_VERTICAL_BORDER : sName = "VerticalBorder"; break;
case META_PROP_HORIZONTAL_BORDER : sName = "HorizontalBorder"; break;
case PROP_HEADER_ROW_COUNT : sName = "HeaderRowCount"; break;
- case PROP_IS_AUTO_HEIGHT : sName = "IsAutoHeight"; break;
case PROP_SIZE_TYPE : sName = "SizeType"; break;
case PROP_TABLE_COLUMN_SEPARATORS: sName = "TableColumnSeparators"; break;
case META_PROP_TABLE_STYLE_NAME : sName = "TableStyleName"; break;
case PROP_TABLE_REDLINE_PARAMS : sName = "TableRedlineParams"; break;
- case PROP_TABLE_REDLINE_AUTHOR : sName = "TableRedlineAuthor"; break;
- case PROP_TABLE_REDLINE_DATE : sName = "TableRedlineDate"; break;
- case PROP_TABLE_REDLINE_ID : sName = "TableRedlineID"; break;
- case PROP_TABLE_REDLINE_TOKEN : sName = "TableRedlineToken"; break;
case PROP_REDLINE_AUTHOR : sName = "RedlineAuthor"; break;
case PROP_REDLINE_DATE_TIME : sName = "RedlineDateTime"; break;
- case PROP_REDLINE_COMMENT : sName = "RedlineComment"; break;
case PROP_REDLINE_TYPE : sName = "RedlineType"; break;
- case PROP_REDLINE_TOKEN : sName = "RedlineToken"; break;
case PROP_REDLINE_REVERT_PROPERTIES: sName = "RedlineRevertProperties"; break;
- case PROP_REDLINE_SUCCESSOR_DATA: sName = "RedlineSuccessorData"; break;
- case PROP_REDLINE_IDENTIFIER : sName = "RedlineIdentifier"; break;
case PROP_SIZE_PROTECTED : sName = "SizeProtected"; break;
case PROP_POSITION_PROTECTED : sName = "PositionProtected"; break;
case PROP_OPAQUE : sName = "Opaque"; break;
case PROP_VERTICAL_MERGE : sName = "VerticalMerge"; break;
case PROP_BULLET_CHAR : sName = "BulletChar"; break;
case PROP_BULLET_FONT_NAME : sName = "BulletFontName"; break;
- case PROP_PARA_BACK_COLOR : sName = "ParaBackColor"; break;
case PROP_TABS_RELATIVE_TO_INDENT: sName = "TabsRelativeToIndent"; break;
case PROP_PREFIX : sName = "Prefix"; break;
case PROP_SUFFIX : sName = "Suffix"; break;
@@ -283,14 +254,12 @@ OUString getPropertyName( PropertyIds eId )
case PROP_SERVICE_PARA_STYLE : sName = "com.sun.star.style.ParagraphStyle"; break;
case PROP_CHARACTER_STYLES : sName = "CharacterStyles"; break;
case PROP_PARAGRAPH_STYLES : sName = "ParagraphStyles"; break;
- case PROP_PARAGRAPH_STYLE_NAME : sName = "ParagraphStyleName"; break;
case PROP_TABLE_BORDER_DISTANCES: sName = "TableBorderDistances"; break;
case META_PROP_CELL_MAR_TOP : sName = "MetaPropCellMarTop"; break;
case META_PROP_CELL_MAR_BOTTOM : sName = "MetaPropCellMarBottom"; break;
case META_PROP_CELL_MAR_LEFT : sName = "MetaPropCellMarLeft"; break;
case META_PROP_CELL_MAR_RIGHT : sName = "MetaPropCellMarRight"; break;
case PROP_START_AT : sName = "StartAt"; break;
- case PROP_ADD_PARA_TABLE_SPACING : sName = "AddParaTableSpacing"; break;
case PROP_CHAR_PROP_HEIGHT : sName = "CharPropHeight"; break;
case PROP_CHAR_PROP_HEIGHT_ASIAN : sName = "CharPropHeightAsian"; break;
case PROP_CHAR_PROP_HEIGHT_COMPLEX: sName = "CharPropHeightComplex"; break;
@@ -326,7 +295,6 @@ OUString getPropertyName( PropertyIds eId )
case PROP_CHAR_SHADING_VALUE: sName = "CharShadingValue"; break;
case PROP_CHAR_SHADING_MARKER: sName = "CharShadingMarker"; break;
case PROP_LABEL_CATEGORY: sName = "LabelCategory"; break;
- case PROP_FIRST_IS_SHARED : sName = "FirstIsShared"; break;
case PROP_MIRROR_INDENTS : sName = "MirrorIndents"; break;
case PROP_SURROUND_TEXT_WRAP_SMALL: sName = "SurroundTextWrapSmall"; break;
case PROP_PARA_SHADOW_FORMAT: sName = "ParaShadowFormat"; break;
@@ -338,7 +306,6 @@ OUString getPropertyName( PropertyIds eId )
case PROP_CHAR_THEME_NAME_EAST_ASIA : sName = "CharThemeNameEastAsia"; break;
case PROP_CHAR_THEME_FONT_NAME_ASCII : sName = "CharThemeFontNameAscii"; break;
case PROP_CHAR_THEME_FONT_NAME_CS : sName = "CharThemeFontNameCs"; break;
- case PROP_CHAR_THEME_FONT_NAME_H_ANSI : sName = "CharThemeFontNameHAnsi"; break;
case PROP_CHAR_THEME_FONT_NAME_EAST_ASIA: sName = "CharThemeFontNameEastAsia"; break;
case PROP_CHAR_THEME_COLOR : sName = "CharThemeColor"; break;
case PROP_CHAR_THEME_ORIGINAL_COLOR : sName = "CharThemeOriginalColor"; break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index 52a24f1..1a97ca5 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -31,8 +31,6 @@ enum PropertyIds
,META_PROP_HORIZONTAL_BORDER
,META_PROP_TABLE_STYLE_NAME
,META_PROP_VERTICAL_BORDER
- ,PROP_ADD_EXTERNAL_LEADING
- ,PROP_ADD_PARA_TABLE_SPACING
,PROP_ADJUST
,PROP_ADJUST_CONTRAST
,PROP_ADJUST_LUMINANCE
@@ -72,20 +70,9 @@ enum PropertyIds
,PROP_CHAR_ESCAPEMENT_HEIGHT
,PROP_CHAR_FLASH
,PROP_CHAR_FONT_CHAR_SET
- ,PROP_CHAR_FONT_CHAR_SET_ASIAN
- ,PROP_CHAR_FONT_CHAR_SET_COMPLEX
- ,PROP_CHAR_FONT_FAMILY
- ,PROP_CHAR_FONT_FAMILY_ASIAN
- ,PROP_CHAR_FONT_FAMILY_COMPLEX
,PROP_CHAR_FONT_NAME
,PROP_CHAR_FONT_NAME_ASIAN
,PROP_CHAR_FONT_NAME_COMPLEX
- ,PROP_CHAR_FONT_PITCH
- ,PROP_CHAR_FONT_PITCH_ASIAN
- ,PROP_CHAR_FONT_PITCH_COMPLEX
- ,PROP_CHAR_FONT_STYLE
- ,PROP_CHAR_FONT_STYLE_ASIAN
- ,PROP_CHAR_FONT_STYLE_COMPLEX
,PROP_CHAR_HEIGHT
,PROP_CHAR_HEIGHT_ASIAN
,PROP_CHAR_HEIGHT_COMPLEX
@@ -124,8 +111,6 @@ enum PropertyIds
,PROP_CREATE_FROM_MARKS
,PROP_CREATE_FROM_OUTLINE
,PROP_CURRENT_PRESENTATION
- ,PROP_DATA_COLUMN_NAME
- ,PROP_DEFAULT
,PROP_DELETE
,PROP_DESCRIPTION
,PROP_DISTANCE
@@ -148,7 +133,6 @@ enum PropertyIds
,PROP_GAMMA
,PROP_GRAPHIC
,PROP_GRAPHIC_COLOR_MODE
- ,PROP_GRAPHIC_CROP
,PROP_GRID_BASE_HEIGHT
,PROP_GRID_DISPLAY
,PROP_GRID_LINES
@@ -178,7 +162,6 @@ enum PropertyIds
,PROP_INPUT_STREAM
,PROP_INSERT
,PROP_INTERVAL
- ,PROP_IS_AUTO_HEIGHT
,PROP_IS_DATE
,PROP_IS_FIXED
,PROP_IS_INPUT
@@ -186,7 +169,6 @@ enum PropertyIds
,PROP_IS_ON
,PROP_IS_SPLIT_ALLOWED
,PROP_IS_VISIBLE
- ,PROP_KEYWORDS
,PROP_LABEL_CATEGORY
,PROP_LEFT_BORDER
,PROP_LEFT_BORDER_DISTANCE
@@ -211,9 +193,7 @@ enum PropertyIds
,PROP_PAGE_TOGGLE
,PROP_PARAGRAPH_FORMAT
,PROP_PARAGRAPH_STYLES
- ,PROP_PARAGRAPH_STYLE_NAME
,PROP_PARA_ADJUST
- ,PROP_PARA_BACK_COLOR
,PROP_PARA_BOTTOM_MARGIN
,PROP_PARA_FIRST_LINE_INDENT
,PROP_PARA_IS_HANGING_PUNCTUATION
@@ -238,12 +218,8 @@ enum PropertyIds
,PROP_PREFIX
,PROP_PRINTER_PAPER_TRAY_INDEX
,PROP_REDLINE_AUTHOR
- ,PROP_REDLINE_COMMENT
,PROP_REDLINE_DATE_TIME
- ,PROP_REDLINE_IDENTIFIER
- ,PROP_REDLINE_SUCCESSOR_DATA
,PROP_REDLINE_TYPE
- ,PROP_REDLINE_TOKEN
,PROP_REDLINE_REVERT_PROPERTIES
,PROP_REFERENCE_FIELD_PART
,PROP_REFERENCE_FIELD_SOURCE
@@ -251,7 +227,6 @@ enum PropertyIds
,PROP_RIGHT_BORDER
,PROP_RIGHT_BORDER_DISTANCE
,PROP_RIGHT_MARGIN
- ,PROP_SEPARATOR_LINE_IS_ON
,PROP_SERVICE_CHAR_STYLE
,PROP_SERVICE_PARA_STYLE
,PROP_SIZE
@@ -265,7 +240,6 @@ enum PropertyIds
,PROP_START_AT
,PROP_START_WITH
,PROP_STREAM_NAME
- ,PROP_SUBJECT
,PROP_SUB_TYPE
,PROP_SUFFIX
,PROP_SURROUND
@@ -274,10 +248,6 @@ enum PropertyIds
,PROP_TABLE_BORDER_DISTANCES
,PROP_TABLE_COLUMN_SEPARATORS
,PROP_TABLE_REDLINE_PARAMS
- ,PROP_TABLE_REDLINE_AUTHOR
- ,PROP_TABLE_REDLINE_DATE
- ,PROP_TABLE_REDLINE_ID
- ,PROP_TABLE_REDLINE_TOKEN
,PROP_TABLE_ROW_DELETE
,PROP_TABLE_ROW_INSERT
,PROP_TABLE_CELL_DELETE
@@ -297,7 +267,6 @@ enum PropertyIds
,PROP_TOP_BORDER
,PROP_TOP_BORDER_DISTANCE
,PROP_TOP_MARGIN
- ,PROP_USER_DATA_TYPE
,PROP_VERTICAL_MERGE
,PROP_VERT_MIRRORED
/*254*/ ,PROP_GRID_STANDARD_MODE
@@ -322,7 +291,6 @@ enum PropertyIds
,PROP_GRAPHIC_BITMAP
,PROP_CHAR_SHADING_VALUE
,PROP_CHAR_SHADING_MARKER
- ,PROP_FIRST_IS_SHARED
,PROP_MIRROR_INDENTS
,PROP_SURROUND_TEXT_WRAP_SMALL
,PROP_PARA_SHADOW_FORMAT
@@ -336,7 +304,6 @@ enum PropertyIds
,PROP_CHAR_THEME_NAME_EAST_ASIA
,PROP_CHAR_THEME_FONT_NAME_ASCII
,PROP_CHAR_THEME_FONT_NAME_CS
- ,PROP_CHAR_THEME_FONT_NAME_H_ANSI
,PROP_CHAR_THEME_FONT_NAME_EAST_ASIA
,PROP_CHAR_THEME_COLOR
,PROP_CHAR_THEME_ORIGINAL_COLOR
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 16d7ae3..9530654 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -151,7 +151,6 @@ bool OOXMLStreamImpl::lcl_getTarget(const uno::Reference<embed::XRelationshipAcc
static const char sFooterType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";
static const char sHeaderType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";
static const char sOleObjectType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
- static const char sSignatureType[] = "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin";
// OOXML strict
static const char sDocumentTypeStrict[] = "http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument";
static const char sStylesTypeStrict[] = "http://purl.oclc.org/ooxml/officeDocument/relationships/styles";
@@ -259,9 +258,6 @@ bool OOXMLStreamImpl::lcl_getTarget(const uno::Reference<embed::XRelationshipAcc
sStreamType = sHeaderType;
sStreamTypeStrict = sHeaderTypeStrict;
break;
- case SIGNATURE:
- sStreamType = sSignatureType;
- break;
default:
break;
}
More information about the Libreoffice-commits
mailing list