summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/drawing
diff options
context:
space:
mode:
Diffstat (limited to 'offapi/com/sun/star/drawing')
-rw-r--r--offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl10
-rw-r--r--offapi/com/sun/star/drawing/AccessibleGraphControl.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleGraphicShape.idl7
-rw-r--r--offapi/com/sun/star/drawing/AccessibleImageBullet.idl8
-rw-r--r--offapi/com/sun/star/drawing/AccessibleOLEShape.idl11
-rw-r--r--offapi/com/sun/star/drawing/AccessibleShape.idl14
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideView.idl8
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl8
-rw-r--r--offapi/com/sun/star/drawing/AppletShape.idl7
-rw-r--r--offapi/com/sun/star/drawing/Background.idl2
-rw-r--r--offapi/com/sun/star/drawing/BezierPoint.idl6
-rw-r--r--offapi/com/sun/star/drawing/BitmapTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/BoundVolume.idl2
-rw-r--r--offapi/com/sun/star/drawing/CameraGeometry.idl5
-rw-r--r--offapi/com/sun/star/drawing/CaptionShape.idl21
-rw-r--r--offapi/com/sun/star/drawing/ClosedBezierShape.idl16
-rw-r--r--offapi/com/sun/star/drawing/ColorMode.idl2
-rw-r--r--offapi/com/sun/star/drawing/ConnectorProperties.idl2
-rw-r--r--offapi/com/sun/star/drawing/ConnectorShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/ControlShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/CustomShape.idl17
-rw-r--r--offapi/com/sun/star/drawing/CustomShapeEngine.idl4
-rw-r--r--offapi/com/sun/star/drawing/DashTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/Defaults.idl17
-rw-r--r--offapi/com/sun/star/drawing/DocumentSettings.idl9
-rw-r--r--offapi/com/sun/star/drawing/DoubleSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/DrawPage.idl7
-rw-r--r--offapi/com/sun/star/drawing/DrawPages.idl6
-rw-r--r--offapi/com/sun/star/drawing/DrawViewMode.idl2
-rw-r--r--offapi/com/sun/star/drawing/DrawingDocument.idl2
-rw-r--r--offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl23
-rw-r--r--offapi/com/sun/star/drawing/DrawingDocumentFactory.idl2
-rw-r--r--offapi/com/sun/star/drawing/EllipseShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl16
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl12
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl6
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl13
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl2
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl2
-rw-r--r--offapi/com/sun/star/drawing/FillProperties.idl28
-rw-r--r--offapi/com/sun/star/drawing/FlagSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/FlagSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/GenericDrawPage.idl24
-rw-r--r--offapi/com/sun/star/drawing/GenericDrawingDocument.idl34
-rw-r--r--offapi/com/sun/star/drawing/GluePoint.idl2
-rw-r--r--offapi/com/sun/star/drawing/GluePoint2.idl8
-rw-r--r--offapi/com/sun/star/drawing/GradientTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/GraphicExportFilter.idl8
-rw-r--r--offapi/com/sun/star/drawing/GraphicFilterRequest.idl4
-rw-r--r--offapi/com/sun/star/drawing/GraphicObjectShape.idl22
-rw-r--r--offapi/com/sun/star/drawing/GroupShape.idl7
-rw-r--r--offapi/com/sun/star/drawing/Hatch.idl6
-rw-r--r--offapi/com/sun/star/drawing/HatchTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix.idl4
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix3.idl4
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix4.idl4
-rw-r--r--offapi/com/sun/star/drawing/Layer.idl2
-rw-r--r--offapi/com/sun/star/drawing/LayerManager.idl4
-rw-r--r--offapi/com/sun/star/drawing/LineDash.idl2
-rw-r--r--offapi/com/sun/star/drawing/LineProperties.idl22
-rw-r--r--offapi/com/sun/star/drawing/LineShape.idl12
-rw-r--r--offapi/com/sun/star/drawing/MarkerTable.idl2
-rw-r--r--offapi/com/sun/star/drawing/MasterPage.idl2
-rw-r--r--offapi/com/sun/star/drawing/MasterPages.idl2
-rw-r--r--offapi/com/sun/star/drawing/MeasureProperties.idl6
-rw-r--r--offapi/com/sun/star/drawing/MeasureShape.idl15
-rw-r--r--offapi/com/sun/star/drawing/OLE2Shape.idl12
-rw-r--r--offapi/com/sun/star/drawing/OpenBezierShape.idl14
-rw-r--r--offapi/com/sun/star/drawing/PageShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/PluginShape.idl7
-rw-r--r--offapi/com/sun/star/drawing/PointSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/PointSequenceSequence.idl2
-rw-r--r--offapi/com/sun/star/drawing/PolyLineShape.idl12
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl6
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl10
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl17
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl8
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonShape.idl17
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonShape3D.idl2
-rw-r--r--offapi/com/sun/star/drawing/PolygonFlags.idl2
-rw-r--r--offapi/com/sun/star/drawing/RectangleShape.idl13
-rw-r--r--offapi/com/sun/star/drawing/RotationDescriptor.idl2
-rw-r--r--offapi/com/sun/star/drawing/ShadeMode.idl2
-rw-r--r--offapi/com/sun/star/drawing/ShadowProperties.idl2
-rw-r--r--offapi/com/sun/star/drawing/Shape.idl29
-rw-r--r--offapi/com/sun/star/drawing/ShapeCollection.idl5
-rw-r--r--offapi/com/sun/star/drawing/Shapes.idl2
-rw-r--r--offapi/com/sun/star/drawing/SlideRenderer.idl2
-rw-r--r--offapi/com/sun/star/drawing/SlideSorter.idl12
-rw-r--r--offapi/com/sun/star/drawing/Text.idl4
-rw-r--r--offapi/com/sun/star/drawing/TextAnimationKind.idl2
-rw-r--r--offapi/com/sun/star/drawing/TextFitToSizeType.idl7
-rw-r--r--offapi/com/sun/star/drawing/TextProperties.idl40
-rw-r--r--offapi/com/sun/star/drawing/TextShape.idl14
-rw-r--r--offapi/com/sun/star/drawing/TransparencyGradientTable.idl4
-rw-r--r--offapi/com/sun/star/drawing/XConnectableShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/XConnectorShape.idl6
-rw-r--r--offapi/com/sun/star/drawing/XControlShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/XCustomShapeEngine.idl10
-rw-r--r--offapi/com/sun/star/drawing/XCustomShapeHandle.idl7
-rw-r--r--offapi/com/sun/star/drawing/XDrawPage.idl2
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageDuplicator.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageExpander.idl6
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageSummarizer.idl6
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawPages.idl6
-rw-r--r--offapi/com/sun/star/drawing/XDrawPagesSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawSubController.idl8
-rw-r--r--offapi/com/sun/star/drawing/XDrawView.idl4
-rw-r--r--offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl2
-rw-r--r--offapi/com/sun/star/drawing/XGluePointsSupplier.idl2
-rw-r--r--offapi/com/sun/star/drawing/XLayer.idl2
-rw-r--r--offapi/com/sun/star/drawing/XLayerManager.idl8
-rw-r--r--offapi/com/sun/star/drawing/XLayerSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XMasterPageTarget.idl4
-rw-r--r--offapi/com/sun/star/drawing/XMasterPagesSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XPresenterHelper.idl8
-rw-r--r--offapi/com/sun/star/drawing/XSelectionFunction.idl22
-rw-r--r--offapi/com/sun/star/drawing/XShape.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapeAligner.idl6
-rw-r--r--offapi/com/sun/star/drawing/XShapeArranger.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapeBinder.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapeCombiner.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapeDescriptor.idl2
-rw-r--r--offapi/com/sun/star/drawing/XShapeGroup.idl2
-rw-r--r--offapi/com/sun/star/drawing/XShapeGrouper.idl6
-rw-r--r--offapi/com/sun/star/drawing/XShapeMirror.idl8
-rw-r--r--offapi/com/sun/star/drawing/XShapes.idl4
-rw-r--r--offapi/com/sun/star/drawing/XSlidePreviewCache.idl10
-rw-r--r--offapi/com/sun/star/drawing/XSlideRenderer.idl10
-rw-r--r--offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/BasicViewFactory.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/Configuration.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/ConfigurationController.idl8
-rw-r--r--offapi/com/sun/star/drawing/framework/ModuleController.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/ResourceId.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/TabBarButton.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfiguration.idl8
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationController.idl18
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XControllerManager.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XModuleController.idl10
-rw-r--r--offapi/com/sun/star/drawing/framework/XPane.idl8
-rw-r--r--offapi/com/sun/star/drawing/framework/XPane2.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl20
-rw-r--r--offapi/com/sun/star/drawing/framework/XRelocatableResource.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XResource.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceFactory.idl10
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XResourceId.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XTabBar.idl6
-rw-r--r--offapi/com/sun/star/drawing/framework/XToolBar.idl2
-rw-r--r--offapi/com/sun/star/drawing/framework/XView.idl4
-rw-r--r--offapi/com/sun/star/drawing/modules.idl2
166 files changed, 106 insertions, 1083 deletions
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index b010fdff3..21c575df0 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
module com { module sun { module star { module drawing {
@@ -56,7 +50,7 @@ module com { module sun { module star { module drawing {
<li>Only the current draw page and only the visible shapes are
accessible. To switch to another page or to access shapes that lie
outside the currently visible area, the user has to issue these requests
- manually or programmatically through the usual chanels, e.g. pressing
+ manually or programmatically through the usual channels, e.g. pressing
keys or selecting menu entries.</li>
<li>The hierarchy exposed through the
<type scope="::com::sun::star::accessibility">XAccessibleContext</type>
@@ -100,7 +94,7 @@ published service AccessibleDrawDocumentView
mode--the appropriate listeners are called and the user gets
informed of this.</li>
<li>Parent: The parent will usually be the window that contains the
- draw document view. It has to be set via implementation dependend
+ draw document view. It has to be set via implementation dependent
ways.</li>
<li>Relations: Relations are set and modified from the outside.</li>
<li>States: <const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
index 1a81f8489..c76fc8d3c 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module drawing {
image map of the Draw and Impress applications and the contour dialog of
the Writer application.
- <p>The children of graph controls are shapes that define contrours.</p>
+ <p>The children of graph controls are shapes that define contours.</p>
@since OOo 1.1.2
*/
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index 7c6ec058a..80e06e80b 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
#include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
#include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
module com { module sun { module star { module drawing {
@@ -42,7 +37,7 @@ module com { module sun { module star { module drawing {
graphic object shapes shapes com.sun.star.drawing.GraphicObjectShape and
com.sun.star.presentation.GraphicObjectShape.
- <p>It differs from the included <type>AccessibleShape</type> 'base'
+ <p>It differs from the included <type>AccessibleShape</type> "base"
service by the additional support of the
<type
scope="::com::sun::star::accessibility">XAccessibleImage</type>
diff --git a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
index b678b0eb5..744e25bb7 100644
--- a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
+++ b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_AccessibleImageBullet_idl__
#define __com_sun_star_drawing_AccessibleImageBullet_idl__
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
#include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 4dbff16a5..2d2d30c51 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -28,28 +28,23 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
#include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
module com { module sun { module star { module drawing {
/** The <type>AccessibleOLEShape</type> service is implemented by
OLE shapes.
- <p>This includes generic OLE shapes, frames, plugins, and applets.</p>
+ <p>This includes generic OLE shapes, frames, plug-ins, and applets.</p>
<p>This service supports the additional <type
scope="::com::sun::star::accessibility">XAccessibleAction</type>
interface.</p>
<p>OLE objects are handled as place holders. While not activated the
- accessible OLE shape is the only indicator of the OLE objects'
- existence. When an OLE object has been activated then the accessbility
+ accessible OLE shape is the only indicator of the OLE object's
+ existence. When an OLE object has been activated then the accessibility
tree representing it (as far as that is available) is included directly
under the accessible document view and not under the OLE object. This
is due to underlying implementation constraints and may change in the
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 119b08317..cde9f72a5 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -28,27 +28,21 @@
#ifndef __com_sun_star_drawing_AccessibleShape_idl__
#define __com_sun_star_drawing_AccessibleShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
module com { module sun { module star { module drawing {
/** The <type>AccessibleShape</type> service is implemented by UNO shapes to
- provide accessibility information that describe the shapes' features.
+ provide accessibility information that describe the shape's features.
A UNO shape is any object that implements the <type
scope="::com::sun::star::drawing">XShape</type> interface.
<p>The content of a draw page is modeled as tree of accessible shapes
and accessible text paragraphs. The root of this (sub-)tree is the
accessible draw document view. An accessible shape implements either
- this service or one of the 'derived' services
+ this service or one of the "derived" services
<type>AccessibleGraphicShape</type> or <type>AccessibleOLEShape</type>.
See the section Children in the description of the
<type scope="::com::sun::star::accessibility"
@@ -122,8 +116,8 @@ published service AccessibleShape
exceptions.</p>
<p>If this state is set then no other of the states below is
set. This is also true for the states that are otherwise
- allways set (which makes 'allways' more of a sort of
- 'normally').</p></li>
+ always set (which makes "always" more of a sort of
+ "normally").</p></li>
<li><const scope="com::sun::star::accessibility"
>AccessibleStateType::EDITABLE</const></li> is always set.
This state is interpreted to mean that not only text but
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index ac5738aab..b5a98c784 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index b4cc9c544..015a38d44 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/AppletShape.idl b/offapi/com/sun/star/drawing/AppletShape.idl
index 4164150ce..df8131492 100644
--- a/offapi/com/sun/star/drawing/AppletShape.idl
+++ b/offapi/com/sun/star/drawing/AppletShape.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_AppletShape_idl__
#define __com_sun_star_drawing_AppletShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
@@ -78,7 +73,7 @@ published service AppletShape
//-------------------------------------------------------------------------
- /** This sequence contains paramaters that are passed to the applet
+ /** This sequence contains parameters that are passed to the applet
when it is initialized.
*/
[property] sequence< com::sun::star::beans::PropertyValue > AppletCommands;
diff --git a/offapi/com/sun/star/drawing/Background.idl b/offapi/com/sun/star/drawing/Background.idl
index 22ad933e2..30cd2838d 100644
--- a/offapi/com/sun/star/drawing/Background.idl
+++ b/offapi/com/sun/star/drawing/Background.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_Background_idl__
#define __com_sun_star_drawing_Background_idl__
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index c2283c441..da44ffac0 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_BezierPoint_idl__
#define __com_sun_star_drawing_BezierPoint_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
@@ -39,9 +37,9 @@
//=============================================================================
// DocMerge from xml: struct com::sun::star::drawing::BezierPoint
-/** This is a point on a bezier curve.
+/** This is a point on a Bezier curve.
- <p>The two control points specify how the bezier curve
+ <p>The two control points specify how the Bezier curve
goes through the given position.</p>
@deprecated
diff --git a/offapi/com/sun/star/drawing/BitmapTable.idl b/offapi/com/sun/star/drawing/BitmapTable.idl
index 155e62157..da7dc8d72 100644
--- a/offapi/com/sun/star/drawing/BitmapTable.idl
+++ b/offapi/com/sun/star/drawing/BitmapTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_BitmapTable_idl__
#define __com_sun_star_drawing_BitmapTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/BoundVolume.idl b/offapi/com/sun/star/drawing/BoundVolume.idl
index 20e787b90..ca1f6c475 100644
--- a/offapi/com/sun/star/drawing/BoundVolume.idl
+++ b/offapi/com/sun/star/drawing/BoundVolume.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_BoundVolume_idl__
#define __com_sun_star_drawing_BoundVolume_idl__
-#ifndef __com_sun_star_drawing_Position3D_idl__
#include <com/sun/star/drawing/Position3D.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CameraGeometry.idl b/offapi/com/sun/star/drawing/CameraGeometry.idl
index 3bdd6e8a8..055665864 100644
--- a/offapi/com/sun/star/drawing/CameraGeometry.idl
+++ b/offapi/com/sun/star/drawing/CameraGeometry.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_drawing_CameraGeometry_idl__
#define __com_sun_star_drawing_CameraGeometry_idl__
-#ifndef __com_sun_star_drawing_Direction3D_idl__
#include <com/sun/star/drawing/Direction3D.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Position3D_idl__
#include <com/sun/star/drawing/Position3D.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CaptionShape.idl b/offapi/com/sun/star/drawing/CaptionShape.idl
index c94438351..63314e327 100644
--- a/offapi/com/sun/star/drawing/CaptionShape.idl
+++ b/offapi/com/sun/star/drawing/CaptionShape.idl
@@ -27,33 +27,16 @@
#ifndef __com_sun_star_drawing_CaptionShape_idl__
#define __com_sun_star_drawing_CaptionShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
@@ -130,12 +113,12 @@ published service CaptionShape
*/
[property] boolean CaptionIsEscapeRelative;
- /** This property specifies the relativ escape distance for
+ /** This property specifies the relative escape distance for
the line of a caption.
*/
[property] long CaptionEscapeRelative;
- /** This property specifies the absolut escape distance for
+ /** This property specifies the absolute escape distance for
the line of a caption.
*/
[property] long CaptionEscapeAbsolute;
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index f747e4dda..af5cf13d3 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -27,33 +27,19 @@
#ifndef __com_sun_star_drawing_ClosedBezierShape_idl__
#define __com_sun_star_drawing_ClosedBezierShape_idl__
-#ifndef __com_sun_star_drawing_LineShape_idl__
#include <com/sun/star/drawing/LineShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
@@ -62,7 +48,7 @@
//=============================================================================
-/** This service is for a closed bezier shape.
+/** This service is for a closed Bezier shape.
*/
published service ClosedBezierShape
{
diff --git a/offapi/com/sun/star/drawing/ColorMode.idl b/offapi/com/sun/star/drawing/ColorMode.idl
index 81b5ea20b..b9582f846 100644
--- a/offapi/com/sun/star/drawing/ColorMode.idl
+++ b/offapi/com/sun/star/drawing/ColorMode.idl
@@ -51,7 +51,7 @@ published enum ColorMode
//-------------------------------------------------------------------------
// DocMerge from xml: value com::sun::star::drawing::ColorMode::GREYS
- /** the graphic is rendered in greyscales on the output device,
+ /** the graphic is rendered in grayscale on the output device,
*/
GREYS,
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
index 51300ea85..02a7afaf1 100644
--- a/offapi/com/sun/star/drawing/ConnectorProperties.idl
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
#define __com_sun_star_drawing_ConnectorProperties_idl__
-#ifndef __com_sun_star_drawing_ConnectorType_idl__
#include <com/sun/star/drawing/ConnectorType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index 0ae94af11..447574c3d 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_ConnectorShape_idl__
#define __com_sun_star_drawing_ConnectorShape_idl__
-#ifndef __com_sun_star_drawing_XConnectorShape_idl__
#include <com/sun/star/drawing/XConnectorShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
#include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index ca0767750..8f3e42f5c 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_ControlShape_idl__
#define __com_sun_star_drawing_ControlShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XControlShape_idl__
#include <com/sun/star/drawing/XControlShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
index a4bf78c80..a9f7d635f 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_CoordinateSequenceSequence_idl__
#define __com_sun_star_drawing_CoordinateSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_CoordinateSequence_idl__
#include <com/sun/star/drawing/CoordinateSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CustomShape.idl b/offapi/com/sun/star/drawing/CustomShape.idl
index 4ed2579ce..d46c8045d 100644
--- a/offapi/com/sun/star/drawing/CustomShape.idl
+++ b/offapi/com/sun/star/drawing/CustomShape.idl
@@ -27,33 +27,16 @@
#ifndef __com_sun_star_drawing_CustomShape_idl__
#define __com_sun_star_drawing_CustomShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/CustomShapeEngine.idl b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
index a72d2a4c9..95e6361d6 100644
--- a/offapi/com/sun/star/drawing/CustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_CustomShapeEngine_idl__
#define __com_sun_star_drawing_CustomShapeEngine_idl__
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
#include <com/sun/star/drawing/XCustomShapeEngine.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DashTable.idl b/offapi/com/sun/star/drawing/DashTable.idl
index e41ea0c9c..a3b841023 100644
--- a/offapi/com/sun/star/drawing/DashTable.idl
+++ b/offapi/com/sun/star/drawing/DashTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_DashTable_idl__
#define __com_sun_star_drawing_DashTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
index 35e5cbc10..b957019d3 100644
--- a/offapi/com/sun/star/drawing/Defaults.idl
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -27,29 +27,12 @@
#ifndef __com_sun_star_drawing_Defaults_idl__
#define __com_sun_star_drawing_Defaults_idl__
-#ifndef __com_sun_star_drawing_TextProperties_idl__
#include <com/sun/star/drawing/TextProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
#include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
#include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DocumentSettings.idl b/offapi/com/sun/star/drawing/DocumentSettings.idl
index 45d0a8891..604ddc2e5 100644
--- a/offapi/com/sun/star/drawing/DocumentSettings.idl
+++ b/offapi/com/sun/star/drawing/DocumentSettings.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_DocumentSettings_idl__
#define __com_sun_star_drawing_DocumentSettings_idl__
-#ifndef __com_sun_star_document_Settings_idl__
#include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
#include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
//=============================================================================
@@ -61,7 +56,7 @@ published service DocumentSettings
//-------------------------------------------------------------------------
/** This is the default logical measure unit that is used for string
- formatings inside the document, f.e. the measure text
+ formating inside the document, f.e. the measure text
*/
[optional, property] short MeasureUnit;
@@ -96,7 +91,7 @@ published service DocumentSettings
/** If this is true, the distance between two paragraphs is
the sum of ParaTopMargin of the previous and ParaBottomMargin of
the next paragraph. If false, only the greater of the two is
- choosen.
+ chosen.
*/
[optional, property] boolean ParagraphSummation;
diff --git a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
index 427fb051d..25c7e5a9f 100644
--- a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
#define __com_sun_star_drawing_DoubleSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_DoubleSequence_idl__
#include <com/sun/star/drawing/DoubleSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index bc0b033c6..8bbfc2b9a 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_drawing_DrawPage_idl__
#define __com_sun_star_drawing_DrawPage_idl__
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
#include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
#include <com/sun/star/drawing/XMasterPageTarget.idl>
-#endif
-
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
#include <com/sun/star/form/XFormsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index 73ae48965..53d81bcaa 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_DrawPages_idl__
#define __com_sun_star_drawing_DrawPages_idl__
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
#include <com/sun/star/drawing/XDrawPageSummarizer.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
#include <com/sun/star/drawing/XDrawPageExpander.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawViewMode.idl b/offapi/com/sun/star/drawing/DrawViewMode.idl
index 72c2a1af8..99362665e 100644
--- a/offapi/com/sun/star/drawing/DrawViewMode.idl
+++ b/offapi/com/sun/star/drawing/DrawViewMode.idl
@@ -35,7 +35,7 @@
//=============================================================================
// DocMerge from xml: enum com::sun::star::drawing::DrawViewMode
-/** This enumeration specifies the viewmode of a view in a presentation
+/** This enumeration specifies the view mode of a view in a presentation
document.
@deprecated
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index 5fdca8fa5..2f9a39e34 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_DrawingDocument_idl__
#define __com_sun_star_drawing_DrawingDocument_idl__
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
#include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index f9b919612..ff365780f 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -27,37 +27,18 @@
#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
#define __com_sun_star_drawing_DrawingDocumentDrawView_idl__
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_frame_Controller_idl__
#include <com/sun/star/frame/Controller.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
module com { module sun { module star { module view {
@@ -70,7 +51,7 @@ module com { module sun { module star { module view {
//=============================================================================
-/** This componend integrates a view to a <type>DrawPage</type>s or
+/** This component integrates a view to a <type>DrawPage</type>s or
<type>MasterPage</type> from a <type>DrawingDocument</type>.
*/
published service DrawingDocumentDrawView
@@ -126,7 +107,7 @@ published service DrawingDocumentDrawView
//-------------------------------------------------------------------------
- /** If the view is in masterpage mode, the view shows the masterpages
+ /** If the view is in master page mode, the view shows the master pages
of this model.
*/
[property] boolean IsMasterPageMode;
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index be3ef6cd3..a8762ab0b 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
#define __com::sun::star::drawing_DrawingDocumentFactory_idl__
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index cdc52ab8f..1b553ec45 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_EllipseShape_idl__
#define __com_sun_star_drawing_EllipseShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_CircleKind_idl__
#include <com/sun/star/drawing/CircleKind.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
index 8eb1da01c..ebdbabb26 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
-#ifndef __com_sun_star_beans_PropertyState_idl__
#include <com/sun/star/beans/PropertyState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
index 4ebd27990..746c036f1 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
@@ -27,30 +27,14 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_Position3D_idl__
#include <com/sun/star/drawing/Position3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_Direction3D_idl__
#include <com/sun/star/drawing/Direction3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_ProjectionMode_idl__
#include <com/sun/star/drawing/ProjectionMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadeMode_idl__
#include <com/sun/star/drawing/ShadeMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
index b3ecedef8..db36c29ec 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
#include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeHandle.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl>
-#endif
//=============================================================================
@@ -94,7 +84,7 @@ service EnhancedCustomShapeGeometry
*/
[optional, property] sequence<::com::sun::star::beans::PropertyValue> Path;
- /** This property sequence is including the textpath description, the properties
+ /** This property sequence is including the text path description, the properties
are as same as specified in the service com::sun::star:drawing::EnhancedCustomShapeTextPath
*/
[optional, property] sequence<::com::sun::star::beans::PropertyValue> TextPath;
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
index 98e806019..26701a47f 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
@@ -34,15 +34,15 @@
//=============================================================================
-/** defines which gluepoints are being offered by the EnhancedCustomShape
+/** defines which glue points are being offered by the EnhancedCustomShape
*/
constants EnhancedCustomShapeGluePointType
{
- /** no gluepoints are offered
+ /** no glue points are offered
*/
const short NONE = 0;
- /** gluepoints are offered for each segment
+ /** glue points are offered for each segment
*/
const short SEGMENTS = 1;
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
index 2d5f57d57..24e5aeed4 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
index 5b6a92bd1..6a3dca9e2 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
index b15de6f5e..829f1e5a7 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
@@ -27,25 +27,12 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapePath_idl__
#define __com_sun_star_drawing_EnhancedCustomShapePath_idl__
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeSegment_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl>
-#endif
-
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
index 6b0ad9f84..426df1891 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
index 88a1cb8d5..b4787ec03 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
index 820c94a09..a6dc9277c 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
#define __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__
#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index 2dc91cd58..eb35d3acf 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_drawing_FillProperties_idl__
#define __com_sun_star_drawing_FillProperties_idl__
-#ifndef __com_sun_star_drawing_FillStyle_idl__
#include <com/sun/star/drawing/FillStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Gradient_idl__
#include <com/sun/star/awt/Gradient.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Hatch_idl__
#include <com/sun/star/drawing/Hatch.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
#include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
#include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
//=============================================================================
@@ -132,7 +112,7 @@ published service FillProperties
[property] boolean FillBackground;
//-------------------------------------------------------------------------
- /** If the property <memebr>FillStyle</member> is set to <const>
+ /** If the property <member>FillStyle</member> is set to <const>
FillStyle::BITMAP</const>, this is the name of the used fill bitmap
style.
*/
@@ -166,7 +146,7 @@ published service FillProperties
//-------------------------------------------------------------------------
/** Every second line of tiles is moved the given percent of the
- witdh of the bitmap.
+ width of the bitmap.
*/
[property] short FillBitmapOffsetX;
@@ -235,7 +215,7 @@ published service FillProperties
instead to set all supported bitmap modes.</p>
<p>If set to <TRUE/>, the value of the FillBitmapMode property changes
- to <const>BitmapMode::STRETCH</const>. BUT: behaviour is undefined, if
+ to <const>BitmapMode::STRETCH</const>. BUT: behavior is undefined, if
the property <member>FillBitmapTile</member> is <TRUE/> too.</p>
<p>If set to <FALSE/>, the value of the FillBitmapMode property
@@ -253,7 +233,7 @@ published service FillProperties
instead to set all supported bitmap modes.</p>
<p>If set to <TRUE/>, the value of the FillBitmapMode property changes
- to <const>BitmapMode::REPEAT</const>. BUT: behaviour is undefined, if
+ to <const>BitmapMode::REPEAT</const>. BUT: behavior is undefined, if
the property <member>FillBitmapStretch</member> is <TRUE/> too.</p>
<p>If set to <FALSE/>, the value of the FillBitmapMode property
diff --git a/offapi/com/sun/star/drawing/FlagSequence.idl b/offapi/com/sun/star/drawing/FlagSequence.idl
index 01e115492..38ce17d7d 100644
--- a/offapi/com/sun/star/drawing/FlagSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_FlagSequence_idl__
#define __com_sun_star_drawing_FlagSequence_idl__
-#ifndef __com_sun_star_drawing_PolygonFlags_idl__
#include <com/sun/star/drawing/PolygonFlags.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
index 01bc7bdc4..8fc5f134b 100644
--- a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
#define __com_sun_star_drawing_FlagSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_FlagSequence_idl__
#include <com/sun/star/drawing/FlagSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index ef2076c21..cd3504b8f 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -27,41 +27,23 @@
#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
#define __com_sun_star_drawing_GenericDrawPage_idl__
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
#include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
#include <com/sun/star/drawing/XShapeCombiner.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeBinder_idl__
#include <com/sun/star/drawing/XShapeBinder.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_view_PaperOrientation_idl__
#include <com/sun/star/view/PaperOrientation.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
@@ -129,7 +111,7 @@ published service GenericDrawPage
// DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::container::XNamed
/** Gets or sets the name of this page.
- <p>Duplicated pagenames inside a document are not allowed.
+ <p>Duplicated page names inside a document are not allowed.
*/
[optional] interface com::sun::star::container::XNamed;
@@ -214,9 +196,9 @@ published service GenericDrawPage
//-------------------------------------------------------------------------
- /** this property is true if the avveraged background filling colors luminance
+ /** this property is true if the averaged background filling colors luminance
is belove an application specified threshold value. This can be used to
- determine the actuall value of an auto color.
+ determine the actual value of an auto color.
*/
[readonly, optional, property] boolean IsBackgroundDark;
diff --git a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
index 761fc3252..7cad94297 100644
--- a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
@@ -27,49 +27,17 @@
#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
#define __com_sun_star_drawing_GenericDrawingDocument_idl__
-#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
#include <com/sun/star/drawing/XDrawPageDuplicator.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
#include <com/sun/star/drawing/XMasterPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
#include <com/sun/star/drawing/XLayerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
#include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
#include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
//=============================================================================
@@ -219,7 +187,7 @@ published service GenericDrawingDocument
//-------------------------------------------------------------------------
- /** if this document is an ole client, this is the current visible area
+ /** if this document is an OLE client, this is the current visible area
in 100th mm
*/
[property] com::sun::star::awt::Rectangle VisibleArea;
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index d2fa2a5cb..3cd82e9be 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_GluePoint_idl__
#define __com_sun_star_drawing_GluePoint_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GluePoint2.idl b/offapi/com/sun/star/drawing/GluePoint2.idl
index dc5269665..36cc2c2b9 100644
--- a/offapi/com/sun/star/drawing/GluePoint2.idl
+++ b/offapi/com/sun/star/drawing/GluePoint2.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_GluePoint2_idl__
#define __com_sun_star_drawing_GluePoint2_idl__
-#ifndef __com_sun_star_drawing_Alignment_idl__
#include <com/sun/star/drawing/Alignment.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_EscapeDirection_idl__
#include <com/sun/star/drawing/EscapeDirection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GradientTable.idl b/offapi/com/sun/star/drawing/GradientTable.idl
index 7630303f1..94ce06370 100644
--- a/offapi/com/sun/star/drawing/GradientTable.idl
+++ b/offapi/com/sun/star/drawing/GradientTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_GradientTable_idl__
#define __com_sun_star_drawing_GradientTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 317114d93..e8c19e1bd 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_drawing_GraphicExportFilter_idl__
#define __com_sun_star_drawing_GraphicExportFilter_idl__
-#ifndef __com_sun_star_document_XFilter_idl__
#include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XExporter_idl__
#include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XMimeTypeInfo_idl__
#include <com/sun/star/document/XMimeTypeInfo.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
index 536e0bac2..5e3561bdd 100644
--- a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
+++ b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_GraphicFilterRequest_idl__
#define __com_sun_star_drawing_GraphicFilterRequest_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
@@ -39,7 +37,7 @@
/** represents a general error graphic filter exception.
It can be used to transport the error code information.
- E.g. that can be usefull for interactions.
+ E.g. that can be useful for interactions.
@since OOo 3.0
*/
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 05f40ce84..286bcd5f2 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -27,37 +27,19 @@
#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
#define __com_sun_star_drawing_GraphicObjectShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_drawing_ColorMode_idl__
#include <com/sun/star/drawing/ColorMode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
@@ -83,7 +65,7 @@ published service GraphicObjectShape
[property] string GraphicURL;
//-------------------------------------------------------------------------
- /** This is an url to the stream ('in document' or linked graphic) for this graphic shape.
+ /** This is an url to the stream ("in document" or linked graphic) for this graphic shape.
*/
[property] string GraphicStreamURL;
@@ -124,7 +106,7 @@ published service GraphicObjectShape
[property] short AdjustBlue;
//-------------------------------------------------------------------------
- /** If this property is set, the gama value of this graphic shape is
+ /** If this property is set, the gamma value of this graphic shape is
adjusted by the given value.
*/
[property] double Gamma;
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index 49538a307..82d1c5af9 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_drawing_GroupShape_idl__
#define __com_sun_star_drawing_GroupShape_idl__
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
#include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index ad93b2b52..dba5b0a9e 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_Hatch_idl__
#define __com_sun_star_drawing_Hatch_idl__
-#ifndef __com_sun_star_drawing_HatchStyle_idl__
#include <com/sun/star/drawing/HatchStyle.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
@@ -43,7 +39,7 @@
//=============================================================================
// DocMerge from xml: struct com::sun::star::drawing::Hatch
-/** This struct defines the appearence of a hatch.
+/** This struct defines the appearance of a hatch.
<p>A hatch is a texture made of straight lines.</p>
*/
diff --git a/offapi/com/sun/star/drawing/HatchTable.idl b/offapi/com/sun/star/drawing/HatchTable.idl
index aa61bea9b..30d93d0b5 100644
--- a/offapi/com/sun/star/drawing/HatchTable.idl
+++ b/offapi/com/sun/star/drawing/HatchTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HatchTable_idl__
#define __com_sun_star_drawing_HatchTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index 3cc96af40..fd8af8571 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HomogenMatrix_idl__
#define __com_sun_star_drawing_HomogenMatrix_idl__
-#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__
#include <com/sun/star/drawing/HomogenMatrixLine.idl>
-#endif
//=============================================================================
@@ -39,7 +37,7 @@
//=============================================================================
// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
-/** specifies a homogenous matrix by three homogenous lines
+/** specifies a homogeneous matrix by three homogeneous lines
*/
published struct HomogenMatrix
{
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index 1de545a34..1aca1e83f 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
#define __com_sun_star_drawing_HomogenMatrix3_idl__
-#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__
#include <com/sun/star/drawing/HomogenMatrixLine3.idl>
-#endif
//=============================================================================
@@ -39,7 +37,7 @@
//=============================================================================
// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
-/** specifies a homogenous matrix by three homogenous lines
+/** specifies a homogeneous matrix by three homogeneous lines
*/
published struct HomogenMatrix3
{
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index df1a2a4c4..c71cffd15 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_HomogenMatrix4_idl__
#define __com_sun_star_drawing_HomogenMatrix4_idl__
-#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__
#include <com/sun/star/drawing/HomogenMatrixLine4.idl>
-#endif
//=============================================================================
@@ -39,7 +37,7 @@
//=============================================================================
// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
-/** specifies a homogenous matrix by four homogenous lines.
+/** specifies a homogeneous matrix by four homogeneous lines.
*/
published struct HomogenMatrix4
{
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index 9aff24a4c..d4ac568e3 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_Layer_idl__
#define __com_sun_star_drawing_Layer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index abf61cd43..5ebd8ef1d 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_LayerManager_idl__
#define __com_sun_star_drawing_LayerManager_idl__
-#ifndef __com_sun_star_drawing_XLayerManager_idl__
#include <com/sun/star/drawing/XLayerManager.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index cc7c95f9b..83e3e0d22 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_LineDash_idl__
#define __com_sun_star_drawing_LineDash_idl__
-#ifndef __com_sun_star_drawing_DashStyle_idl__
#include <com/sun/star/drawing/DashStyle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
index 97e086cd2..a384265cd 100644
--- a/offapi/com/sun/star/drawing/LineProperties.idl
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_drawing_LineProperties_idl__
#define __com_sun_star_drawing_LineProperties_idl__
-#ifndef __com_sun_star_drawing_LineStyle_idl__
#include <com/sun/star/drawing/LineStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineDash_idl__
#include <com/sun/star/drawing/LineDash.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineJoint_idl__
#include <com/sun/star/drawing/LineJoint.idl>
-#endif
//=============================================================================
@@ -102,27 +88,27 @@ published service LineProperties
//-------------------------------------------------------------------------
- /** This property contains the name of the line start poly polygon bezier.
+ /** This property contains the name of the line start poly polygon Bezier.
<p>If this string is empty, no line start polygon is rendered.
*/
[optional, property] string LineStartName;
//-------------------------------------------------------------------------
- /** This property contains the name of the line end poly polygon bezier.
+ /** This property contains the name of the line end poly polygon Bezier.
<p>If this string is empty, no line end polygon is rendered.
*/
[optional, property] string LineEndName;
//-------------------------------------------------------------------------
- /** This property contains the line start in the form of a poly polygon bezier.
+ /** This property contains the line start in the form of a poly polygon Bezier.
*/
[optional, property] com::sun::star::drawing::PolyPolygonBezierCoords LineStart;
//-------------------------------------------------------------------------
- /** This property contains the line end in the form of a poly polygon bezier.
+ /** This property contains the line end in the form of a poly polygon Bezier.
*/
[optional, property] com::sun::star::drawing::PolyPolygonBezierCoords LineEnd;
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index a2b3b8bf9..23aba7d4e 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_drawing_LineShape_idl__
#define __com_sun_star_drawing_LineShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MarkerTable.idl b/offapi/com/sun/star/drawing/MarkerTable.idl
index fc677d136..bca36f42e 100644
--- a/offapi/com/sun/star/drawing/MarkerTable.idl
+++ b/offapi/com/sun/star/drawing/MarkerTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_MarkerTable_idl__
#define __com_sun_star_drawing_MarkerTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index a0330bf3c..ed70ec562 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_MasterPage_idl__
#define __com_sun_star_drawing_MasterPage_idl__
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
#include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MasterPages.idl b/offapi/com/sun/star/drawing/MasterPages.idl
index b316989e5..82747f690 100644
--- a/offapi/com/sun/star/drawing/MasterPages.idl
+++ b/offapi/com/sun/star/drawing/MasterPages.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_MasterPages_idl__
#define __com_sun_star_drawing_MasterPages_idl__
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
index e73b01cae..e39994229 100644
--- a/offapi/com/sun/star/drawing/MeasureProperties.idl
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_MeasureProperties_idl__
#define __com_sun_star_drawing_MeasureProperties_idl__
-#ifndef __com_sun_star_drawing_MeasureKind_idl__
#include <com/sun/star/drawing/MeasureKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__
#include <com/sun/star/drawing/MeasureTextHorzPos.idl>
-#endif
-#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__
#include <com/sun/star/drawing/MeasureTextVertPos.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
index ddb309274..36ab21af9 100644
--- a/offapi/com/sun/star/drawing/MeasureShape.idl
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_MeasureShape_idl__
#define __com_sun_star_drawing_MeasureShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
#include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index 38ad28a79..b92f51348 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -27,24 +27,16 @@
#ifndef __com_sun_star_drawing_OLE2Shape_idl__
#define __com_sun_star_drawing_OLE2Shape_idl__
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
#include <com/sun/star/frame/XModel.idl>
-#endif
//=============================================================================
module com { module sun { module star { module drawing {
//=============================================================================
-/** This service is for an ole shape.
+/** This service is for an OLE shape.
*/
published service OLE2Shape
{
@@ -67,7 +59,7 @@ published service OLE2Shape
//-------------------------------------------------------------------------
/** This is the model for the OLE2 inside this shape.
- <p>This property returns an empty reference if the ole2 is not an
+ <p>This property returns an empty reference if the OLE2 is not an
Office component.
*/
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index 6af64c0ae..d97b5e56f 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_drawing_OpenBezierShape_idl__
#define __com_sun_star_drawing_OpenBezierShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
@@ -58,7 +46,7 @@
//=============================================================================
-/** This service is for an open bezier shape.
+/** This service is for an open Bezier shape.
*/
published service OpenBezierShape
{
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index a7867dc43..4d3e914a4 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PageShape_idl__
#define __com_sun_star_drawing_PageShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
//=============================================================================
@@ -42,7 +40,7 @@
/** This service is for a page shape.
A page shape displays a preview of another page. These shapes
are used inside notes pages to preview the corresponding
- drawing page. Theyre also used in the handout page to preview
+ drawing page. They're also used in the handout page to preview
the printing position and order of pages
*/
published service PageShape
diff --git a/offapi/com/sun/star/drawing/PluginShape.idl b/offapi/com/sun/star/drawing/PluginShape.idl
index c14cd1a1c..514254267 100644
--- a/offapi/com/sun/star/drawing/PluginShape.idl
+++ b/offapi/com/sun/star/drawing/PluginShape.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_PluginShape_idl__
#define __com_sun_star_drawing_PluginShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
@@ -68,7 +63,7 @@ published service PluginShape
//-------------------------------------------------------------------------
- /** This sequence contains paramaters that are passed to the application
+ /** This sequence contains parameters that are passed to the application
that renders the plugin when it is initialized.
*/
[property] sequence< com::sun::star::beans::PropertyValue > PluginCommands;
diff --git a/offapi/com/sun/star/drawing/PointSequence.idl b/offapi/com/sun/star/drawing/PointSequence.idl
index 37406e9b1..ff64cfd1d 100644
--- a/offapi/com/sun/star/drawing/PointSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PointSequence_idl__
#define __com_sun_star_drawing_PointSequence_idl__
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PointSequenceSequence.idl b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
index d46345a39..19c501fad 100644
--- a/offapi/com/sun/star/drawing/PointSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#define __com_sun_star_drawing_PointSequenceSequence_idl__
-#ifndef __com_sun_star_drawing_PointSequence_idl__
#include <com/sun/star/drawing/PointSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index d0a1368d3..19fe34d68 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -27,29 +27,17 @@
#ifndef __com_sun_star_drawing_PolyLineShape_idl__
#define __com_sun_star_drawing_PolyLineShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index 00225d1a5..977cfe848 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#define __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
#include <com/sun/star/drawing/FlagSequenceSequence.idl>
-#endif
//=============================================================================
@@ -43,7 +39,7 @@
//=============================================================================
// DocMerge from xml: struct com::sun::star::drawing::PolyPolygonBezierCoords
-/** specifies the coordinates for a poly polygon bezier.
+/** specifies the coordinates for a poly polygon Bezier.
*/
published struct PolyPolygonBezierCoords
{
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
index 5dfafb02f..ec3d25c48 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#define __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
#include <com/sun/star/drawing/PolygonKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
//=============================================================================
@@ -43,7 +39,7 @@
//=============================================================================
/** This service describes a polypolygonbezier.
- <p>A polypolygonbezier consists of multiple bezier polygons combined
+ <p>A polypolygonbezier consists of multiple Bezier polygons combined
in one.</p>
*/
published service PolyPolygonBezierDescriptor
@@ -56,13 +52,13 @@ published service PolyPolygonBezierDescriptor
//-------------------------------------------------------------------------
- /** These are the bezier points of this polygon.
+ /** These are the Bezier points of this polygon.
*/
[property] com::sun::star::drawing::PolyPolygonBezierCoords PolyPolygonBezier;
//-------------------------------------------------------------------------
- /** These are the untransformed bezier coordinates of this polygon.
+ /** These are the untransformed Bezier coordinates of this polygon.
*/
[property] com::sun::star::drawing::PolyPolygonBezierCoords Geometry;
};
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index 73372eb55..7de116a66 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__
#define __com_sun_star_drawing_PolyPolygonBezierShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
@@ -63,7 +48,7 @@
//=============================================================================
// DocMerge from xml: service com::sun::star::drawing::PolyPolygonBezierShape
-/** This service specifies a polypolygon bezier shape.
+/** This service specifies a poly-polygon Bezier shape.
*/
published service PolyPolygonBezierShape
{
diff --git a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
index de3c7eac8..af65e8a56 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#define __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
#include <com/sun/star/drawing/PolygonKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
//=============================================================================
@@ -42,8 +38,8 @@
//=============================================================================
-/** This service describes a polypolygon.
- <p>A polypolygon consists of multiple polygons combined in one.</p>
+/** This service describes a poly-polygon.
+ <p>A poly-polygon consists of multiple polygons combined in one.</p>
*/
published service PolyPolygonDescriptor
{
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index 3a1f1aa3f..32f0e8c48 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -27,33 +27,18 @@
#ifndef __com_sun_star_drawing_PolyPolygonShape_idl__
#define __com_sun_star_drawing_PolyPolygonShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
@@ -63,7 +48,7 @@
//=============================================================================
/** This service is for a polygon shape.
- <p>A polypolygon has 2 or more straight lines, with the first and
+ <p>A poly-polygon has 2 or more straight lines, with the first and
last point connected by a straight line.</p>
*/
published service PolyPolygonShape
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 0a5e2fab4..3fcf9a65a 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_PolyPolygonShape3D_idl__
#define __com_sun_star_drawing_PolyPolygonShape3D_idl__
-#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
#include <com/sun/star/drawing/DoubleSequenceSequence.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolygonFlags.idl b/offapi/com/sun/star/drawing/PolygonFlags.idl
index 4e7dc9059..1b8093999 100644
--- a/offapi/com/sun/star/drawing/PolygonFlags.idl
+++ b/offapi/com/sun/star/drawing/PolygonFlags.idl
@@ -35,7 +35,7 @@
//=============================================================================
// DocMerge from xml: enum com::sun::star::drawing::PolygonFlags
-/** defines how a bezier curve goes through a point.
+/** defines how a Bezier curve goes through a point.
*/
published enum PolygonFlags
{
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 3ee1626d0..64311fc8b 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -27,29 +27,16 @@
#ifndef __com_sun_star_drawing_RectangleShape_idl__
#define __com_sun_star_drawing_RectangleShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/RotationDescriptor.idl b/offapi/com/sun/star/drawing/RotationDescriptor.idl
index e84573f44..8f5b87cdf 100644
--- a/offapi/com/sun/star/drawing/RotationDescriptor.idl
+++ b/offapi/com/sun/star/drawing/RotationDescriptor.idl
@@ -37,7 +37,7 @@
/** This abstract service specifies the general characteristics of an optional
rotation and shearing for a <type>Shape</type>.
- This service is depricated, instead please use the <code>Transformation</code>
+ This service is deprecated, instead please use the <code>Transformation</code>
property of the service <type>Shape</type>.
@deprecated
diff --git a/offapi/com/sun/star/drawing/ShadeMode.idl b/offapi/com/sun/star/drawing/ShadeMode.idl
index ebd5d4954..cf569eebc 100644
--- a/offapi/com/sun/star/drawing/ShadeMode.idl
+++ b/offapi/com/sun/star/drawing/ShadeMode.idl
@@ -57,7 +57,7 @@ published enum ShadeMode
//-------------------------------------------------------------------------
- /** With <const>SMOOTH</const> shading, the colors of the lit vertiecs is
+ /** With <const>SMOOTH</const> shading, the colors of the lit vertices is
interpolated.
*/
SMOOTH,
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
index 0dd82a07b..7aecec8ae 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#define __com_sun_star_drawing_ShadowProperties_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index 360352a91..b194811a2 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -27,37 +27,14 @@
#ifndef __com_sun_star_drawing_Shape_idl__
#define __com_sun_star_drawing_Shape_idl__
-#ifndef __com_sun_star_document_LinkTarget_idl__
#include <com/sun/star/document/LinkTarget.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyle_idl__
#include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
#include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
#include <com/sun/star/drawing/XGluePointsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
//=============================================================================
@@ -179,7 +156,7 @@ published service Shape
/** this property lets you get and set the transformation matrix
for this shape.
- The transformation is a 3x3 homogen matrix and can contain
+ The transformation is a 3x3 homogeneous matrix and can contain
translation, rotation, shearing and scaling.
*/
[optional, property] com::sun::star::drawing::HomogenMatrix3 Transformation;
@@ -200,6 +177,10 @@ published service Shape
the z-order.
*/
[optional, property] long NavigationOrder;
+
+ /** this property lets you get and set a hyperlink for this shape.
+ */
+ [optional, property] string Hyperlink;
};
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/ShapeCollection.idl b/offapi/com/sun/star/drawing/ShapeCollection.idl
index 8789c6196..c7bbcf428 100644
--- a/offapi/com/sun/star/drawing/ShapeCollection.idl
+++ b/offapi/com/sun/star/drawing/ShapeCollection.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_ShapeCollection_idl__
#define __com_sun_star_drawing_ShapeCollection_idl__
-#ifndef __com_sun_star_drawing_Shapes_idl__
#include <com/sun/star/drawing/Shapes.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index 4f769d63b..123124d05 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_Shapes_idl__
#define __com_sun_star_drawing_Shapes_idl__
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/SlideRenderer.idl b/offapi/com/sun/star/drawing/SlideRenderer.idl
index 07f97eaed..7d5711fe2 100644
--- a/offapi/com/sun/star/drawing/SlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/SlideRenderer.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_SlideRenderer_idl__
#define __com_sun_star_drawing_SlideRenderer_idl__
-#ifndef __com_sun_star_drawing_XSlideRenderer_idl__
#include <com/sun/star/drawing/XSlideRenderer.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl
index 2f2404938..5825ac48e 100644
--- a/offapi/com/sun/star/drawing/SlideSorter.idl
+++ b/offapi/com/sun/star/drawing/SlideSorter.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_drawing_SlideSorter_idl__
#define __com_sun_star_drawing_SlideSorter_idl__
-#ifndef __com_sun_star_drawing_framework_XView_idl__
#include <com/sun/star/drawing/framework/XView.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index 5d1fc5e5c..372da35a4 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_Text_idl__
#define __com_sun_star_drawing_Text_idl__
-#ifndef __com_sun_star_text_XText_idl__
#include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextProperties_idl__
#include <com/sun/star/drawing/TextProperties.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/TextAnimationKind.idl b/offapi/com/sun/star/drawing/TextAnimationKind.idl
index 0b0ba878b..e1b2289b0 100644
--- a/offapi/com/sun/star/drawing/TextAnimationKind.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationKind.idl
@@ -49,7 +49,7 @@ published enum TextAnimationKind
//-------------------------------------------------------------------------
// DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::BLINK
- /** Let this text switch its state from visibile to nonvisible continuously.
+ /** Let this text switch its state from visible to invisible continuously.
*/
BLINK,
diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index 248090b5b..2539d697a 100644
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -60,9 +60,10 @@ published enum TextFitToSizeType
//-------------------------------------------------------------------------
- /** if the shape is scaled, the font attributes are scaled and hard set
- on the text */
- RESIZEATTR
+ /** if the shape is scaled, the font is scaled isotropically to
+ fit the available space. Auto line-breaks will keep working
+ */
+ AUTOFIT
};
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index ccbec2392..5ee1dc624 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -27,61 +27,27 @@
#ifndef __com_sun_star_drawing_TextProperties_idl__
#define __com_sun_star_drawing_TextProperties_idl__
-#ifndef __com_sun_star_container_XIndexReplace_idl__
#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
#include <com/sun/star/drawing/TextFitToSizeType.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextAdjust_idl__
#include <com/sun/star/drawing/TextAdjust.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
#include <com/sun/star/drawing/TextAnimationDirection.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
#include <com/sun/star/drawing/TextAnimationKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
#include <com/sun/star/drawing/TextVerticalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
#include <com/sun/star/drawing/TextHorizontalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode_idl__
#include <com/sun/star/text/WritingMode.idl>
-#endif
//=============================================================================
@@ -102,7 +68,7 @@ published service TextProperties
//-------------------------------------------------------------------------
- /** The properties in this service set default formats for asian text
+ /** The properties in this service set default formats for Asian text
inside the <type>Shape</type>.
*/
[optional] service com::sun::star::style::CharacterPropertiesAsian;
@@ -123,7 +89,7 @@ published service TextProperties
//-------------------------------------------------------------------------
- /** The properties in this service set default formats for asian text
+ /** The properties in this service set default formats for Asian text
inside the <type>Shape</type>.
*/
[optional] service com::sun::star::style::ParagraphPropertiesAsian;
@@ -244,7 +210,7 @@ published service TextProperties
//-------------------------------------------------------------------------
/** with this property you can set the maximum height for a shape with text.
- On edit, the auto grow feature will not grow the object heigher than
+ On edit, the auto grow feature will not grow the object higher than
the value of this property.
*/
[property] long TextMaximumFrameHeight;
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index 0db839c2c..c5802348b 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -27,29 +27,15 @@
#ifndef __com_sun_star_drawing_TextShape_idl__
#define __com_sun_star_drawing_TextShape_idl__
-#ifndef __com_sun_star_drawing_Shape_idl__
#include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_drawing_Text_idl__
#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
index 01b938805..a42cd344e 100644
--- a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
+++ b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_TransparencyGradientTable_idl__
#define __com_sun_star_drawing_TransparencyGradientTable_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
@@ -47,7 +45,7 @@
*/
published service TransparencyGradientTable
{
- /** this container lets you access the <typeu scope="com::sun::star::awt">Gradient</type>s that
+ /** this container lets you access the <type scope="com::sun::star::awt">Gradient</type>s that
are indexed with a name.
<p>Note: You can add new entries for later use, but you cannot
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index 174924e5f..72d62f571 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XConnectableShape_idl__
#define __com_sun_star_drawing_XConnectableShape_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index 2163f45ad..3ae3cced4 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XConnectorShape_idl__
#define __com_sun_star_drawing_XConnectorShape_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XConnectableShape_idl__
#include <com/sun/star/drawing/XConnectableShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_ConnectionType_idl__
#include <com/sun/star/drawing/ConnectionType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl
index 2bcbbe88c..9ad0ecf0a 100644
--- a/offapi/com/sun/star/drawing/XControlShape.idl
+++ b/offapi/com/sun/star/drawing/XControlShape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XControlShape_idl__
#define __com_sun_star_drawing_XControlShape_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
#include <com/sun/star/awt/XControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
index 9a934de4f..ee195caa2 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
#define __com_sun_star_drawing_XCustomShapeEngine_idl__
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
#include <com/sun/star/drawing/XCustomShapeHandle.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
index aafe9e347..8fadedd21 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
#define __com_sun_star_drawing_XCustomShapeHandle_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
//=============================================================================
@@ -54,7 +49,7 @@ interface XCustomShapeHandle: com::sun::star::uno::XInterface
*/
com::sun::star::awt::Point getPosition();
- /** is setting a new positon for the handle
+ /** is setting a new position for the handle
*/
void setControllerPosition( [in] com::sun::star::awt::Point aPoint );
diff --git a/offapi/com/sun/star/drawing/XDrawPage.idl b/offapi/com/sun/star/drawing/XDrawPage.idl
index 0ee0e5e87..a80d723e2 100644
--- a/offapi/com/sun/star/drawing/XDrawPage.idl
+++ b/offapi/com/sun/star/drawing/XDrawPage.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XDrawPage_idl__
#define __com_sun_star_drawing_XDrawPage_idl__
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
index f08c87fb7..5b0ae0ac0 100644
--- a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
#define __com_sun_star_drawing_XDrawPageDuplicator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageExpander.idl b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
index 92e436fe0..36d2d35de 100644
--- a/offapi/com/sun/star/drawing/XDrawPageExpander.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
#define __com_sun_star_drawing_XDrawPageExpander_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index 557f3ccfb..f4f9e2bf0 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
#define __com_sun_star_drawing_XDrawPageSummarizer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index 19e77b911..e2902bfe9 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
#define __com_sun_star_drawing_XDrawPageSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPages.idl b/offapi/com/sun/star/drawing/XDrawPages.idl
index cf27bec39..3e6cde0b9 100644
--- a/offapi/com/sun/star/drawing/XDrawPages.idl
+++ b/offapi/com/sun/star/drawing/XDrawPages.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPages_idl__
#define __com_sun_star_drawing_XDrawPages_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
@@ -47,7 +43,7 @@
<p>The pages are stored in an index container. The order is determined by
the index.
- You usualy get this interface if you use the
+ You usually get this interface if you use the
<type>XDrawPagesSupplier</type> or the <type>XMasterPagesSupplier</type>
at a model that contains <type>DrawPage</type>s or <type>MasterPage</type>s
*/
diff --git a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
index 436241b5a..3f848b9ed 100644
--- a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#define __com_sun_star_drawing_XDrawPagesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawSubController.idl b/offapi/com/sun/star/drawing/XDrawSubController.idl
index c4f1681de..23a62512a 100644
--- a/offapi/com/sun/star/drawing/XDrawSubController.idl
+++ b/offapi/com/sun/star/drawing/XDrawSubController.idl
@@ -28,19 +28,11 @@
#ifndef __com_sun_star_drawing_XDrawSubController_idl__
#define __com_sun_star_drawing_XDrawSubController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
diff --git a/offapi/com/sun/star/drawing/XDrawView.idl b/offapi/com/sun/star/drawing/XDrawView.idl
index 3ce9fc3fe..9a47daba0 100644
--- a/offapi/com/sun/star/drawing/XDrawView.idl
+++ b/offapi/com/sun/star/drawing/XDrawView.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XDrawView_idl__
#define __com_sun_star_drawing_XDrawView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
index e747eeaf8..8015b3c1a 100644
--- a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
+++ b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
#define __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
index 0a258076d..597f86e29 100644
--- a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
+++ b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
#define __com_sun_star_drawing_XGluePointsSupplier_idl__
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayer.idl b/offapi/com/sun/star/drawing/XLayer.idl
index 738f7b406..2daeef0d5 100644
--- a/offapi/com/sun/star/drawing/XLayer.idl
+++ b/offapi/com/sun/star/drawing/XLayer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XLayer_idl__
#define __com_sun_star_drawing_XLayer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayerManager.idl b/offapi/com/sun/star/drawing/XLayerManager.idl
index 865fccfe6..5b4bf7f8e 100644
--- a/offapi/com/sun/star/drawing/XLayerManager.idl
+++ b/offapi/com/sun/star/drawing/XLayerManager.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XLayerManager_idl__
#define __com_sun_star_drawing_XLayerManager_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_drawing_XLayer_idl__
#include <com/sun/star/drawing/XLayer.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayerSupplier.idl b/offapi/com/sun/star/drawing/XLayerSupplier.idl
index b5aecc8be..68f32c827 100644
--- a/offapi/com/sun/star/drawing/XLayerSupplier.idl
+++ b/offapi/com/sun/star/drawing/XLayerSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
#define __com_sun_star_drawing_XLayerSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XMasterPageTarget.idl b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
index 763587bf1..c1b0c2a49 100644
--- a/offapi/com/sun/star/drawing/XMasterPageTarget.idl
+++ b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
#define __com_sun_star_drawing_XMasterPageTarget_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
index 4ffc451c9..0017694c4 100644
--- a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
#define __com_sun_star_drawing_XMasterPagesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index 8e3cf7ac3..d6e6dd053 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_XPresenterHelper_idl__
#define __com_sun_star_drawing_XPresenterHelper_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/XSelectionFunction.idl b/offapi/com/sun/star/drawing/XSelectionFunction.idl
index d7de4033b..fb486aa75 100644
--- a/offapi/com/sun/star/drawing/XSelectionFunction.idl
+++ b/offapi/com/sun/star/drawing/XSelectionFunction.idl
@@ -27,37 +27,15 @@
#ifndef __com_sun_star_drawing_XSelectionFunction_idl__
#define __com_sun_star_drawing_XSelectionFunction_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
#include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
#include <com/sun/star/awt/XMouseClickHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
#include <com/sun/star/awt/XMouseMotionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
#include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShape.idl b/offapi/com/sun/star/drawing/XShape.idl
index 6869e0c44..dcb551cb0 100644
--- a/offapi/com/sun/star/drawing/XShape.idl
+++ b/offapi/com/sun/star/drawing/XShape.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XShape_idl__
#define __com_sun_star_drawing_XShape_idl__
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
#include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index ed7ba262e..af30b69dd 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeAligner_idl__
#define __com_sun_star_drawing_XShapeAligner_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_Alignment_idl__
#include <com/sun/star/drawing/Alignment.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index 39a7a6b66..6efbc9a81 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XShapeArranger_idl__
#define __com_sun_star_drawing_XShapeArranger_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_Arrangement_idl__
#include <com/sun/star/drawing/Arrangement.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index fe6b7183c..9fe15c7fd 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeBinder_idl__
#define __com_sun_star_drawing_XShapeBinder_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
@@ -55,7 +49,7 @@ published interface XShapeBinder: com::sun::star::uno::XInterface
/** binds <type>Shape</type>s together.
@param xShapes
- a container with <type>Shape</type>s that will be bind toghether.
+ a container with <type>Shape</type>s that will be bind together.
All <type>Shapes</type> will be converted to a <type>PolyPolygonBezierShape</type>
and the lines will be connected. The <type>Shape</types>s in xShape will be
removed from the <type>GenericDrawPage</type> and disposed.
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index 93535c6a9..022c616e0 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
#define __com_sun_star_drawing_XShapeCombiner_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
@@ -75,7 +69,7 @@ published interface XShapeCombiner: com::sun::star::uno::XInterface
@param xShapes
the <type>Shape</type> is converted to a
- <type>PolyPolygonBezierShape</type>s and then splited into
+ <type>PolyPolygonBezierShape</type>s and then split into
several <type>PolyPolygonBezierShape</type>s
The <type>Shape</types>s in xShape will be removed from the
<type>GenericDrawPage</type> and disposed.
diff --git a/offapi/com/sun/star/drawing/XShapeDescriptor.idl b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
index c0d1830fe..d24938dfd 100644
--- a/offapi/com/sun/star/drawing/XShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#define __com_sun_star_drawing_XShapeDescriptor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index 536d1f264..4eecca1c7 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XShapeGroup_idl__
#define __com_sun_star_drawing_XShapeGroup_idl__
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index 4611f5cad..107bf2833 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
#define __com_sun_star_drawing_XShapeGrouper_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
#include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeMirror.idl b/offapi/com/sun/star/drawing/XShapeMirror.idl
index 5bbe7e97b..2b13e74d3 100644
--- a/offapi/com/sun/star/drawing/XShapeMirror.idl
+++ b/offapi/com/sun/star/drawing/XShapeMirror.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_drawing_XShapeMirror_idl__
#define __com_sun_star_drawing_XShapeMirror_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_drawing_MirrorAxis_idl__
#include <com/sun/star/drawing/MirrorAxis.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapes.idl b/offapi/com/sun/star/drawing/XShapes.idl
index 499800d03..0b42a57cc 100644
--- a/offapi/com/sun/star/drawing/XShapes.idl
+++ b/offapi/com/sun/star/drawing/XShapes.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_drawing_XShapes_idl__
#define __com_sun_star_drawing_XShapes_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index eb1cecb7a..78ee0a965 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_drawing_XSlidePreviewCache_idl__
#define __com_sun_star_drawing_XSlidePreviewCache_idl__
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
#include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/XSlideRenderer.idl b/offapi/com/sun/star/drawing/XSlideRenderer.idl
index af4e01a83..cdd9952db 100644
--- a/offapi/com/sun/star/drawing/XSlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/XSlideRenderer.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_XSlideRenderer_idl__
#define __com_sun_star_drawing_XSlideRenderer_idl__
-#ifndef __com_sun_star_awt_XBitmap_idl__
#include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
module com { module sun { module star { module drawing {
@@ -74,7 +66,7 @@ interface XSlideRenderer
memory consumption and longer runtime.
This value is an attempt to provide some antialiasing and so to
provide more readable slide previews. May become obsolete in
- the future when true antialiasing suppport will be integrated.
+ the future when true antialiasing support will be integrated.
*/
com::sun::star::awt::XBitmap createPreview (
[in] XDrawPage xSlide,
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index 2dac30e00..2a273f6b4 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
#define __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index 9a6514451..4d0ab101b 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_ResourceSearchMode_idl__
#define __com_sun_star_drawing_framework_ResourceSearchMode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
index 6f478627e..c9443c758 100644
--- a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_BasicPaneFactory_idl__
#define __com_sun_star_drawing_framework_BasicPaneFactory_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
#include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
index 273293e43..ac39e4247 100644
--- a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
#define __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
#include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
index 85528e990..06f02248e 100644
--- a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_BasicViewFactory_idl__
#define __com_sun_star_drawing_framework_BasicViewFactory_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
#include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index 6b5e9e85c..1b3edaa5f 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
#define __com_sun_star_drawing_framework_ConfigurationController_idl__
-#ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
#include <com/sun/star/drawing/framework/XConfiguration.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
index ac4db617e..c92772a0b 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#define __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module uno { interface XInterface; }; }; }; };
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
index 1504f4076..a10d084ba 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
#define __com_sun_star_drawing_framework_ConfigurationController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
#include <com/sun/star/drawing/framework/XConfigurationController.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -46,7 +40,7 @@ module com { module sun { module star { module drawing { module framework {
<p>This service is used at the moment by the
<type>XControllerManager</type> to create a configuration controller.
This allows developers to replace the default implementation of the
- configuration controller with their own. This may not be a usefull
+ configuration controller with their own. This may not be a useful
feature. Furthermore the sub controllers may need a tighter coupling
than the interfaces allow. These are reasons for removing this service
in the future and let the controller manager create the sub controllers
diff --git a/offapi/com/sun/star/drawing/framework/ModuleController.idl b/offapi/com/sun/star/drawing/framework/ModuleController.idl
index 15dbe1da3..b9da00bc6 100644
--- a/offapi/com/sun/star/drawing/framework/ModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/ModuleController.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_ModuleController_idl__
#define __com_sun_star_drawing_framework_ModuleController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XModuleController_idl__
#include <com/sun/star/drawing/framework/XModuleController.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/ResourceId.idl b/offapi/com/sun/star/drawing/framework/ResourceId.idl
index 8aec771b3..44c10c9ea 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceId.idl
@@ -28,15 +28,13 @@
#ifndef __com_sun_star_drawing_framework_ResourceId_idl__
#define __com_sun_star_drawing_framework_ResourceId_idl__
-#ifndef __com_sun_star_drawing_framework_XResourceId_idl__
#include <com/sun/star/drawing/framework/XResourceId.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
/** The <type>ResourceId</type> service provides several constructors for
resource ids.
- <p>They mainly differe in how the anchor is specified.</p>
+ <p>They mainly differ in how the anchor is specified.</p>
*/
service ResourceId
: XResourceId
@@ -52,7 +50,7 @@ service ResourceId
create ([in] string sResourceURL);
/** Create a resource id for an anchor that is given as
- <type>XResourceId</type> object. This is the mose general of the
+ <type>XResourceId</type> object. This is the most general of the
constructor variants.
*/
createWithAnchor ([in] string sResourceURL, [in] XResourceId xAnchor);
diff --git a/offapi/com/sun/star/drawing/framework/TabBarButton.idl b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
index 398c4b81b..578d0b07e 100644
--- a/offapi/com/sun/star/drawing/framework/TabBarButton.idl
+++ b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module drawing { module framework {
interface XResourceId;
/** Descriptor of a tab bar button. Tab bar buttons are typically used to
- offer the user the choice between different views to be disiplayed in
+ offer the user the choice between different views to be displayed in
one pane.
<p>For identification only the <member>ResourceId</member> is used, so for
some methods of the <type>XTabBar</type> interface only the
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index acbb5ecab..ad6bf6aa5 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
#define __com_sun_star_drawing_framework_XConfiguration_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
#include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
#include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -90,7 +84,7 @@ published interface XConfiguration
[in] string sTargetURLPrefix,
[in] AnchorBindingMode eSearchMode);
- /** <p>Returns wether the specified resource is part of the
+ /** <p>Returns weather the specified resource is part of the
configuration.</p>
This is independent of whether the resource does really exist and is
active, i.e. has a visible representation in the GUI.
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
index 742a31413..2bc727a06 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
#define __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
index 7a37f8e56..709e2350b 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
#define __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index 9d7630318..e80c14333 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
#define __com_sun_star_drawing_framework_XConfigurationController_idl__
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
#include <com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
#include <com/sun/star/drawing/framework/XResourceFactoryManager.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceActivationMode_idl__
#include <com/sun/star/drawing/framework/ResourceActivationMode.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -65,7 +55,7 @@ published interface XResource;
<p>When the two configurations differ then the current configuration is
updated eventually to reflect the requested configuration. An update
- takes place when the following three conditions are fullfilled.
+ takes place when the following three conditions are fulfilled.
<ol>
<li>when the last pending request for configuration changes has been
processed,</li>
@@ -108,7 +98,7 @@ published interface XResource;
temporarily or permanently unavailable. For example, during the
start-up of a new Impress application the side panes are displayed
with a visible delay because they are not provided sooner by the
- underlying framework. Such anavailable resources are not forgotten but
+ underlying framework. Such unavailable resources are not forgotten but
remain in the requested configuration. Every time the configuration
controller updates its current configuration these resources are
requested once more.</li></ol></p>
@@ -252,12 +242,12 @@ published interface XConfigurationController
allows the saving and restoring of configurations. However, the
given configuration can have other origins then these methods.</p>
<p>The given configuration is transformed into a list of of change
- requests so that the resulting reqeusted configuration equals the
+ requests so that the resulting requested configuration equals the
given configuration. This has the advantage that not only the
resource activations and deactivations but all configuration
changes are properly broadcasted.</p>
<p>Note that because of the configuration change notifications
- listeners can make more configuratio change requests, so that the
+ listeners can make more configuration change requests, so that the
resulting requested configuration can be different from the given
configuration.</p>
@param xConfiguration
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
index 01755f1ab..7411be758 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
#define __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -61,7 +57,7 @@ published interface XConfigurationControllerBroadcaster
will be called for all types of event.
@param aUserData
Arbitrary data that is passed to the listener when it is called
- for the specified event type. When one listener is regisered
+ for the specified event type. When one listener is registered
for more than one event type then different user data objects
may be given as well. Supplying unique integer values allows
the listener to use a switch statement to distinguish between
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index e993b5bef..940f8be35 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
#define __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -40,7 +38,7 @@ published interface XConfigurationChangeRequest;
changes to the current configuration.
<p>This interface allows callers to add requests to the back of the
- queue and to determine wheter the queue is empty. Using this interace
+ queue and to determine whether the queue is empty. Using this interface
should normally not be necessary for anyone else than the
<type>XConfigurationController</type>. It may be removed in the future.</p>
*/
@@ -56,7 +54,7 @@ published interface XConfigurationControllerRequestQueue
/** Add a request for a configuration change to the request queue.
<p>This method should not be called from outside the drawing
- famework. Other sub conrollers of the drawing framework are typical
+ framework. Other sub controllers of the drawing framework are typical
callers. They can add change requests that can not be made with the
<member>requestResourceActivation()</member> and
<member>requestResourceDeactivation()</member> methods.</p>
diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
index 40990d04b..ab21d8181 100644
--- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XControllerManager_idl__
#define __com_sun_star_drawing_framework_XControllerManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XModuleController.idl b/offapi/com/sun/star/drawing/framework/XModuleController.idl
index 7a54c77e1..e125cdd5a 100644
--- a/offapi/com/sun/star/drawing/framework/XModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/XModuleController.idl
@@ -28,24 +28,16 @@
#ifndef __com_sun_star_drawing_framework_XModuleController_idl__
#define __com_sun_star_drawing_framework_XModuleController_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_IDL_
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceId_idl__
#include <com/sun/star/drawing/framework/ResourceId.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
interface XView;
-/** The module controller is responsible for loading a module (addon,
+/** The module controller is responsible for loading a module (ad-don,
plugin, whatever the name) when it is first used.
<p>For this there is a
list in the office configuration which associates resource URLs with
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index 1126b69be..a99dd567e 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_drawing_framework_XPane_idl__
#define __com_sun_star_drawing_framework_XPane_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCcanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
#include <com/sun/star/drawing/framework/XResource.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
#include <com/sun/star/drawing/framework/XRelocatableResource.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
index 2784e5fe3..4c52ec7f9 100644
--- a/offapi/com/sun/star/drawing/framework/XPane2.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XPane2_idl__
#define __com_sun_star_drawing_framework_XPane2_idl__
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index 80bd19403..d4d953b1a 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
#define __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
#include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -53,7 +47,7 @@ published enum BorderType
/** Paint the border around a rectangular region, typically a pane.
- <p>Calling objects have to be able to derive inner bounding boxs of the
+ <p>Calling objects have to be able to derive inner bounding boxes of the
border from the outer ones and inner ones from outer ones. This
conversion and the painting of the border involves three rectangles.
The inner and outer bounding box of the border. This is a logical
@@ -87,7 +81,7 @@ published interface XPaneBorderPainter
[in] ::com::sun::star::awt::Rectangle aRectangle,
[in] BorderType eBorderType);
- /** Shring the given rectangle by the size of the specified part of the
+ /** Shrink the given rectangle by the size of the specified part of the
border. This method can be used to convert an outer bounding box
into the center box or the inner bounding box.
@param sPaneBorderStyleName
@@ -132,11 +126,11 @@ published interface XPaneBorderPainter
[in] ::com::sun::star::awt::Rectangle aRepaintArea,
[in] string sTitle);
- /** Paint the border around a pane where the border includes a callout
+ /** Paint the border around a pane where the border includes a call out
that is anchored at the given point. Most arguments have the same
meaning as in the <method>paintBorder</method>.
@param aCalloutAnchor
- The anchor point of the callout. It is usually located outside
+ The anchor point of the call out. It is usually located outside
the border.
*/
void paintBorderWithCallout (
@@ -147,10 +141,10 @@ published interface XPaneBorderPainter
[in] string sTitle,
[in] ::com::sun::star::awt::Point aCalloutAnchor);
- /** Return the offset of a callout anchor with respect to the outer
- border. This value is used when the callout is realized by a fixed
+ /** Return the offset of a call out anchor with respect to the outer
+ border. This value is used when the call out is realized by a fixed
bitmap in order to determine the size and/or location of the outer
- border for a given callout.
+ border for a given call out.
*/
::com::sun::star::awt::Point getCalloutOffset (
[in] string sPaneBorderStyleName);
diff --git a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
index f34013170..0f3b7ee97 100644
--- a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
#define __com_sun_star_drawing_framework_XRelocatableResource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -46,7 +44,7 @@ interface XRelocatableResource
@param xNewAnchor
The new anchor.
@return
- Returns <TRUE/> when the relocation was successfull.
+ Returns <TRUE/> when the relocation was successful.
*/
boolean relocateToAnchor ([in] XResource xNewAnchor);
};
diff --git a/offapi/com/sun/star/drawing/framework/XResource.idl b/offapi/com/sun/star/drawing/framework/XResource.idl
index 3b3c6a643..99cf9e2f2 100644
--- a/offapi/com/sun/star/drawing/framework/XResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XResource.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XResource_idl__
#define __com_sun_star_drawing_framework_XResource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -42,7 +40,7 @@ published interface XResourceId;
published interface XResource
{
/** Return an <type>XResourceId</type> object for the called resource.
- The returned id unambiguously indentifies the resource.
+ The returned id unambiguously identifies the resource.
*/
XResourceId getResourceId ();
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 6b76edad5..2ed59bd0e 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
#define __com_sun_star_drawing_framework_XResourceFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
@@ -53,7 +47,7 @@ published interface XResourceFactory
{
/** Create a resource for the given <type>XResourceId</type> object.
@param xResourceId
- The resourc URL of this id specifies the type of resource to
+ The resource URL of this id specifies the type of resource to
create. The anchor can be used to obtain the associated object
from the configuration controller. For example, when a view is
created, then the new object can be initialized with the pane
@@ -64,7 +58,7 @@ published interface XResourceFactory
Returns a resource object that has been just created or was
taken from a cache. When the requested resource can not be
created then an empty reference is returned. A later call may
- be successfull. This, for example, can be the case with SFX
+ be successful. This, for example, can be the case with SFX
based side panes. They are not available right after the
creation of a new application frame.
@throws InvalidArgumentException
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
index 5865d4625..0c5e3fceb 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
#define __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XResourceId.idl b/offapi/com/sun/star/drawing/framework/XResourceId.idl
index 1f5871f3a..5dfe46acc 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceId.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XResourceId_idl__
#define __com_sun_star_drawing_framework_XResourceId_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
#include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XTabBar.idl b/offapi/com/sun/star/drawing/framework/XTabBar.idl
index 7ade5dfcd..0022e3176 100644
--- a/offapi/com/sun/star/drawing/framework/XTabBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XTabBar.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_drawing_framework_XTabBar_idl__
#define __com_sun_star_drawing_framework_XTabBar_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_TabBarButton_idl__
#include <com/sun/star/drawing/framework/TabBarButton.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XToolBar.idl b/offapi/com/sun/star/drawing/framework/XToolBar.idl
index 7cb8c44f1..a85a31ea2 100644
--- a/offapi/com/sun/star/drawing/framework/XToolBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XToolBar.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_drawing_framework_XToolBar_idl__
#define __com_sun_star_drawing_framework_XToolBar_idl__
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
#include <com/sun/star/drawing/framework/XResource.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index 3a45919fb..3f9d5d379 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_drawing_framework_XView_idl__
#define __com_sun_star_drawing_framework_XView_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
#include <com/sun/star/drawing/framework/XResource.idl>
-#endif
module com { module sun { module star { module drawing { module framework {
diff --git a/offapi/com/sun/star/drawing/modules.idl b/offapi/com/sun/star/drawing/modules.idl
index ff869c751..a9530490e 100644
--- a/offapi/com/sun/star/drawing/modules.idl
+++ b/offapi/com/sun/star/drawing/modules.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module drawing {
It coordinates changes to the configuration made by the other sub
controllers so that
<ul><li>unnecessary ui updates (flickering) is avoided and</li>
- <li>and the configuration is always in a valid and meaningfull
+ <li>and the configuration is always in a valid and meaningful
state.</li></ul></p>
<p>For more information please see the wiki page of the <a
href="http://wiki.services.openoffice.org/wiki/Drawing_framework">drawing framework</a>.