[Libreoffice-commits] core.git: 2 commits - drawinglayer/source include/drawinglayer
Tor Lillqvist
tml at collabora.com
Thu May 29 04:30:16 PDT 2014
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 1 +
include/drawinglayer/geometry/viewinformation2d.hxx | 2 +-
include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/invertprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/maskprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/texteffectprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 4 ++--
include/drawinglayer/primitive2d/textprimitive2d.hxx | 2 +-
include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx | 2 +-
include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx | 2 +-
include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx | 2 +-
include/drawinglayer/processor2d/baseprocessor2d.hxx | 2 +-
14 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit 1679baf6967fe4a80be5ce84a8e17bd5b27f5da1
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 29 14:27:55 2014 +0300
Comment seems incorrect
Change-Id: I7d81b9b616fc4b4b324d959282b6a71ce681fba5
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 836d72e..9ef1e55 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2228,6 +2228,7 @@ namespace
case META_MASK_ACTION :
{
/** CHECKED, WORKS WELL: Simply same as META_BMP_ACTION */
+ /** Huh, no it isn't!? */
const MetaMaskAction* pA = (const MetaMaskAction*)pAction;
const BitmapEx aBitmapEx(createMaskBmpEx(pA->GetBitmap(), pA->GetColor()));
commit 3f0678bfc8011a33d7bdc790665648e39994c657
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 29 14:17:29 2014 +0300
Some spelling corrections
Change-Id: Ie77596a51a6a37e9f59a6ba14bdde7994efd29ad
diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx
index eca24c9..2358c75 100644
--- a/include/drawinglayer/geometry/viewinformation2d.hxx
+++ b/include/drawinglayer/geometry/viewinformation2d.hxx
@@ -135,7 +135,7 @@ namespace drawinglayer
double getViewTime() const;
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& getVisualizedPage() const;
- /// On-demand prepared Object to View transformation and it's inerse for convenience
+ /// On-demand prepared Object to View transformation and its inverse for convenience
const basegfx::B2DHomMatrix& getObjectToViewTransformation() const;
const basegfx::B2DHomMatrix& getInverseObjectToViewTransformation() const;
diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 2df84d4..2b48c91 100644
--- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -40,7 +40,7 @@ namespace drawinglayer
a valid decomposition if a valid Viewport is given in the
ViewInformation2D at decomposition time.
- It will try to buffer it's last decomposition using maLastViewport
+ It will try to buffer its last decomposition using maLastViewport
to detect changes in the get2DDecomposition call.
*/
class DRAWINGLAYER_DLLPUBLIC BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D
diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
index 0e9dbe0..1351cc3 100644
--- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
This is a helper class which encapsulates geometry that should be
painted XOR, e.g. old cursor visualisations. It decomposes to
- it's content, so when not supporting it, the contained geometry
+ its content, so when not supporting it, the contained geometry
will be visualized normally.
Unfortunately this is still needed, but hard to support on various
systems. XOR painting needs read access to the target, so modern
diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
index e2111c7..1aae7c1 100644
--- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
@@ -39,7 +39,7 @@ namespace drawinglayer
inside of the mask PolyPolygon is defined to be visible.
This primitive should be handled by a renderer. If it is not handled,
- it decomposes to it's Child content, and thus the visualisation would
+ it decomposes to its Child content, and thus the visualisation would
contaiun no clips.
The geometrc range of this primitive is completely defined by the Mask
diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index e8713f4..8cf76f6 100644
--- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
Info hierarchy helper class to hold contents like Name, Title and
Description which are valid for the child content, e.g. created for
primitives based on DrawingLayer objects or SVG parts. It decomposes
- to it's content, so all direct renderers may ignore it. May e.g.
+ to its content, so all direct renderers may ignore it. May e.g.
be used when re-creating graphical content from a sequence of primitives
*/
class DRAWINGLAYER_DLLPUBLIC ObjectInfoPrimitive2D : public GroupPrimitive2D
diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index 4b39b20..e4e66be 100644
--- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
@@ -37,7 +37,7 @@ namespace drawinglayer
This primitive is needed to have the correct XDrawPage as ViewInformation for decomposing
the page contents (given as PageContent here) if these contain e.g.
view-dependent (in this case XDrawPage-dependent) text fields like PageNumber. If You want
- those primitives to be visualized correctly, Your renderer needs to locally correct it's
+ those primitives to be visualized correctly, Your renderer needs to locally correct its
ViewInformation2D to reference the new XDrawPage.
*/
class DRAWINGLAYER_DLLPUBLIC PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D
diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 1bef85e..27fad99 100644
--- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -85,7 +85,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
/** own get range implementation to solve more effective. Content is by definition displaced
- by a fixed discrete unit, thus the contained geometry needs only once be asked for it's
+ by a fixed discrete unit, thus the contained geometry needs only once be asked for its
own basegfx::B2DRange
*/
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 4553aa9..e77287a 100644
--- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -33,7 +33,7 @@ namespace drawinglayer
{
/** TextHierarchyLinePrimitive2D class
- Text format hierarchy helper class. It decomposes to it's
+ Text format hierarchy helper class. It decomposes to its
content, so all direct renderers may ignore it. If You need
to know more about line hierarchies You may react on it and
also need to take care that the source of data uses it.
@@ -132,7 +132,7 @@ namespace drawinglayer
enum FieldType
{
/** unspecified. If more info is needed for a FieldType,
- create a new type and it's handling
+ create a new type and its handling
*/
FIELD_TYPE_COMMON,
diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index da5b665..3259e81 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
/** TextSimplePortionPrimitive2D class
This is the basic primitive for representing a text portion. It contains
- all needed information. If it is not handled by a renderer, it's decomposition
+ all needed information. If it is not handled by a renderer, its decomposition
will provide the text PolyPolygon outlines as filled polygons, correctly
transformed.
diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
index b397110..320a357 100644
--- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
@@ -41,7 +41,7 @@ namespace drawinglayer
TextSimplePortionPrimitive2D more as needed.
A renderer who does not want to visualize this (if contained at all)
- can detect and ignore this primitive. If it's decomposition is used,
+ can detect and ignore this primitive. If its decomposition is used,
it will be visualized as red wavelines.
The geometric definition defines a line on the X-Axis (no Y-coordinates)
diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
index bd4a4fb..01064d9 100644
--- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
This 3D primitive expands the SdrPrimitive3D to a 3D cube definition.
The cube is implicitly in unit coordinates and the given transformation
- defines it's geometry in space.
+ defines its geometry in space.
*/
class DRAWINGLAYER_DLLPUBLIC SdrCubePrimitive3D : public SdrPrimitive3D
{
diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
index 50f3ad8..653fd37 100644
--- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
This 3D primitive expands the SdrPrimitive3D to a 3D sphere definition.
The sphere is implicitly in unit coordinates and the given transformation
- defines it's geometry in space.
+ defines its geometry in space.
*/
class DRAWINGLAYER_DLLPUBLIC SdrSpherePrimitive3D : public SdrPrimitive3D
{
diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx
index 674045c..bb35021 100644
--- a/include/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -147,7 +147,7 @@ namespace drawinglayer
only needs to handle some Basic Primitives and create outline and collect
outline polygons e.g. for primitives with area like BitmapPrimitive2D (a
rectangle) and PolyPolygonColorPrimitive2D. When also handling the Grouping
- Primitives MaskPrimitive2D (e.g. ignoring it's content, using the mask polyPolygon)
+ Primitives MaskPrimitive2D (e.g. ignoring its content, using the mask polyPolygon)
and TransformPrimitive2D (to have the correct local transformation), a processor
creating the outline can be written using just four (4) primitives. As a tipp, it can
be helpful to add many for the purpose not interesting higher level primitives
More information about the Libreoffice-commits
mailing list