summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/cppcanvas/canvasgraphic.hxx65
-rw-r--r--include/editeng/AccessibleImageBullet.hxx2
-rw-r--r--include/editeng/numitem.hxx3
-rw-r--r--include/svtools/restartdialog.hxx3
-rw-r--r--include/vcl/graphictools.hxx5
-rw-r--r--include/xmloff/shapeimport.hxx50
-rw-r--r--include/xmloff/txtimp.hxx31
-rw-r--r--include/xmloff/xmlstyle.hxx3
8 files changed, 17 insertions, 145 deletions
diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index 8792b6c4982e..8f1797ab9045 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -47,68 +47,6 @@ namespace cppcanvas
{
public:
- /** These enums determine how the primitive color is combined
- with the background. When performing this calculations, it
- is assumed that all color values are premultiplied with
- the corresponding alpha values (if no alpha is specified,
- 1.0 is assumed). Then, the following general compositing
- operation is performed:
-
- C = Ca * Fa + Cb * Fb
-
- where C is the result color, Ca and Cb are the input
- colors, premultiplied with alpha, and Fa and Fb are
- described for the different composite modes (wherein Aa
- and Ab denote source and destination alpha, respectively).
- */
- enum CompositeOp
- {
- /// Clear destination. Fa = Fb = 0.
- CLEAR,
-
- /// Copy source as-is to destination. Fa = 1, Fb = 0.
- SOURCE,
-
- /// Leave destination as-is. Fa = 0, Fb = 1.
- DESTINATION,
-
- /// Copy source over destination. Fa = 1, Fb = 1-Aa.
- OVER,
-
- /// Copy source under destination. Fa = 1-Ab, Fb = 1.
- UNDER,
-
- /// Copy source to destination, but limited to where the destination is. Fa = Ab, Fb = 0.
- INSIDE,
-
- /// Leave destination as is, but only where source was. Fa = 0, Fb = Aa.
- INSIDE_REVERSE,
-
- /// Copy source to destination, but limited to where destination is not. Fa = 1-Ab, Fb = 0.
- OUTSIDE,
-
- /// Leave destination as is, but only where source has not been. Fa = 0, Fb = 1-Aa.
- OUTSIDE_REVERSE,
-
- /// Copy source over destination, but only where destination is. Keep destination. Fa = Ab, Fb = 1-Aa.
- ATOP,
-
- /// Copy destination over source, but only where source is. Keep source. Fa = 1-Ab, Fb = Aa.
- ATOP_REVERSE,
-
- /// Take only parts where either source or destination, but not both are. Fa = 1-Ab, Fb = 1-Aa.
- XOR,
-
- /** simply add contributions of both source and destination. The
- resulting color values are limited to the permissible color
- range, and clipped to the maximal value, if exceeded. Fa = 1, Fb = 1.
- */
- ADD,
-
- /// Fa = min(1,(1-Ab)/Aa), Fb = 1
- SATURATE
- };
-
virtual ~CanvasGraphic() {}
/** Set object transformation matrix
@@ -123,8 +61,9 @@ namespace cppcanvas
virtual void setClip() = 0;
/** Set object composite mode
+ * @see css::rendering::CompositeOperation
*/
- virtual void setCompositeOp( CompositeOp aOp ) = 0;
+ virtual void setCompositeOp( sal_Int8 aOp ) = 0;
/** Render to parent canvas
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index 2144d643009b..2cc2c12e0cf7 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -62,8 +62,6 @@ namespace accessibility
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
virtual sal_Int16 SAL_CALL getAccessibleRole() override;
- /// Maximal length of text returned by getAccessibleDescription()
- enum { MaxDescriptionLen = 40 };
virtual OUString SAL_CALL getAccessibleDescription() override;
virtual OUString SAL_CALL getAccessibleName() override;
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index fd1a01da6f91..040acd7b3f86 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -232,8 +232,7 @@ enum class SvxNumRuleType
{
NUMBERING,
OUTLINE_NUMBERING,
- PRESENTATION_NUMBERING,
- END
+ PRESENTATION_NUMBERING
};
class EDITENG_DLLPUBLIC SvxNumRule final
diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index 6b3791ebd282..74a90bde9c67 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -54,9 +54,6 @@ enum RestartReason {
// "For the extension to work properly,
// %PRODUCTNAME must be restarted."
RESTART_REASON_OPENGL,
- // "For the OpenGL changes to take effect,
- // %PRODUCTNAME must be restarted."
- RESTART_REASON_SAFE_MODE
};
// Must be called with the solar mutex locked:
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index b3da2733469a..42d81ff9484f 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -71,11 +71,6 @@ public:
/// Perform no join, leads to visible gaps between thick line segments
joinNone
};
- enum
- {
- /// Width of stroke start/end arrow to exactly fit the joining stroke
- normalizedArrowWidth=65536
- };
typedef ::std::vector< double > DashArray;
SvtGraphicStroke();
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index bad298cc5037..f70053f3731c 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -72,9 +72,7 @@ enum SdXMLGroupShapeElemTokenMap
XML_TOK_GROUP_ANNOTATION,
- XML_TOK_GROUP_A,
-
- XML_TOK_GROUP_LAST
+ XML_TOK_GROUP_A
};
enum SdXMLFrameShapeElemTokenMap
@@ -87,9 +85,7 @@ enum SdXMLFrameShapeElemTokenMap
XML_TOK_FRAME_FRAME,
XML_TOK_FRAME_FLOATING_FRAME,
XML_TOK_FRAME_APPLET,
- XML_TOK_FRAME_TABLE,
-
- XML_TOK_FRAME_LAST
+ XML_TOK_FRAME_TABLE
};
enum SdXML3DSceneShapeElemTokenMap
@@ -98,20 +94,7 @@ enum SdXML3DSceneShapeElemTokenMap
XML_TOK_3DSCENE_3DCUBE,
XML_TOK_3DSCENE_3DSPHERE,
XML_TOK_3DSCENE_3DLATHE,
- XML_TOK_3DSCENE_3DEXTRUDE,
-
- XML_TOK_3DSCENE_LAST
-};
-
-enum SdXMLShapeAttrTokenMap
-{
- XML_TOK_SHAPE_NAME,
- XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS,
- XML_TOK_SHAPE_PRESENTATION_CLASS,
- XML_TOK_SHAPE_DRAWSTYLE_NAME_PRESENTATION,
- XML_TOK_SHAPE_TRANSFORM,
- XML_TOK_SHAPE_IS_PLACEHOLDER,
- XML_TOK_SHAPE_IS_USER_TRANSFORMED
+ XML_TOK_3DSCENE_3DEXTRUDE
};
enum SdXML3DObjectAttrTokenMap
@@ -138,33 +121,6 @@ enum SdXML3DSphereObjectAttrTokenMap
XML_TOK_3DSPHEREOBJ_SIZE
};
-enum SdXMLPolygonShapeAttrTokenMap
-{
- XML_TOK_POLYGONSHAPE_VIEWBOX,
- XML_TOK_POLYGONSHAPE_POINTS
-};
-
-enum SdXMLPathShapeAttrTokenMap
-{
- XML_TOK_PATHSHAPE_VIEWBOX,
- XML_TOK_PATHSHAPE_D
-};
-
-enum SdXML3DSceneShapeAttrTokenMap
-{
- XML_TOK_3DSCENESHAPE_TRANSFORM,
- XML_TOK_3DSCENESHAPE_VRP,
- XML_TOK_3DSCENESHAPE_VPN,
- XML_TOK_3DSCENESHAPE_VUP,
- XML_TOK_3DSCENESHAPE_PROJECTION,
- XML_TOK_3DSCENESHAPE_DISTANCE,
- XML_TOK_3DSCENESHAPE_FOCAL_LENGTH,
- XML_TOK_3DSCENESHAPE_SHADOW_SLANT,
- XML_TOK_3DSCENESHAPE_SHADE_MODE,
- XML_TOK_3DSCENESHAPE_AMBIENT_COLOR,
- XML_TOK_3DSCENESHAPE_LIGHTING_MODE
-};
-
enum SdXML3DLightAttrTokenMap
{
XML_TOK_3DLIGHT_DIFFUSE_COLOR,
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index cab9f53653e4..2d8c1a445749 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -95,8 +95,7 @@ enum SwXMLTextElemTokens
XML_TOK_TEXT_FORMS,
XML_TOK_TEXT_CALCULATION_SETTINGS,
XML_TOK_TEXT_AUTOMARK,
- XML_TOK_TEXT_NUMBERED_PARAGRAPH,
- XML_TOK_TEXT_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_NUMBERED_PARAGRAPH
};
enum XMLTextPElemTokens
@@ -235,9 +234,7 @@ enum XMLTextPElemTokens
XML_TOK_TEXT_FIELDMARK,
XML_TOK_TEXT_FIELDMARK_START,
- XML_TOK_TEXT_FIELDMARK_END,
-
- XML_TOK_TEXT_P_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_FIELDMARK_END
};
enum XMLTextPAttrTokens
@@ -254,8 +251,7 @@ enum XMLTextPAttrTokens
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,
- XML_TOK_TEXT_P_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_P_START_VALUE
};
enum XMLTextNumberedParagraphAttrTokens
@@ -265,8 +261,7 @@ enum XMLTextNumberedParagraphAttrTokens
XML_TOK_TEXT_NUMBERED_PARAGRAPH_LEVEL,
XML_TOK_TEXT_NUMBERED_PARAGRAPH_STYLE_NAME,
XML_TOK_TEXT_NUMBERED_PARAGRAPH_CONTINUE_NUMBERING,
- XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE,
- XML_TOK_TEXT_NUMBERED_PARAGRAPH_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE
};
enum XMLTextListBlockAttrTokens
@@ -275,15 +270,13 @@ enum XMLTextListBlockAttrTokens
XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME,
XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING,
XML_TOK_TEXT_LIST_BLOCK_ID,
- XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST,
- XML_TOK_TEXT_LIST_BLOCK_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST
};
enum XMLTextListBlockElemTokens
{
XML_TOK_TEXT_LIST_HEADER,
- XML_TOK_TEXT_LIST_ITEM,
- XML_TOK_TEXT_LIST_BLOCK_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_LIST_ITEM
};
enum XMLTextFrameAttrTokens
@@ -313,8 +306,7 @@ enum XMLTextFrameAttrTokens
XML_TOK_TEXT_FRAME_APPLET_NAME,
XML_TOK_TEXT_FRAME_FRAME_NAME,
XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE,
- XML_TOK_TEXT_FRAME_MIN_WIDTH,
- XML_TOK_TEXT_FRAME_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_FRAME_MIN_WIDTH
};
enum XMLTextHyperlinkAttrTokens
@@ -325,8 +317,7 @@ enum XMLTextHyperlinkAttrTokens
XML_TOK_TEXT_HYPERLINK_SHOW,
XML_TOK_TEXT_HYPERLINK_STYLE_NAME,
XML_TOK_TEXT_HYPERLINK_VIS_STYLE_NAME,
- XML_TOK_TEXT_HYPERLINK_SERVER_MAP,
- XML_TOK_TEXT_HYPERLINK_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_HYPERLINK_SERVER_MAP
};
enum XMLTextPageMasterElemTokens
@@ -336,8 +327,7 @@ enum XMLTextPageMasterElemTokens
XML_TOK_TEXT_MP_HEADER_LEFT,
XML_TOK_TEXT_MP_FOOTER_LEFT,
XML_TOK_TEXT_MP_HEADER_FIRST,
- XML_TOK_TEXT_MP_FOOTER_FIRST,
- XML_TOK_TEXT_MP_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_MP_FOOTER_FIRST
};
enum XMLTextContourAttrTokens
@@ -347,8 +337,7 @@ enum XMLTextContourAttrTokens
XML_TOK_TEXT_CONTOUR_VIEWBOX,
XML_TOK_TEXT_CONTOUR_POINTS,
XML_TOK_TEXT_CONTOUR_D,
- XML_TOK_TEXT_CONTOUR_AUTO,
- XML_TOK_TEXT_CONTOUR_END=XML_TOK_UNKNOWN
+ XML_TOK_TEXT_CONTOUR_AUTO
};
enum XMLTextType
{
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 8841ec3b5cae..2dedfd4414d8 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -54,8 +54,7 @@ enum XMLStyleStylesElemTokens
XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG,
XML_TOK_TEXT_LINENUMBERING_CONFIG,
XML_TOK_STYLE_DEFAULT_STYLE,
- XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT, //text grid enhancement
- XML_TOK_STYLE_STYLES_ELEM_END=XML_TOK_UNKNOWN
+ XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT //text grid enhancement
};
class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext
generated by cgit (git 2.34.1) at 2025-02-15 11:52:10 +0000