[Libreoffice-commits] core.git: include/drawinglayer
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 4 07:34:20 UTC 2020
include/drawinglayer/primitive2d/animatedprimitive2d.hxx | 6 +--
include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/bitmapprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/controlprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/cropprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/epsprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/graphicprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/gridprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/groupprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/helplineprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/invertprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/maskprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/mediaprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/metafileprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/patternfillprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/polygonprimitive2d.hxx | 10 +++---
include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx | 16 +++++-----
include/drawinglayer/primitive2d/sceneprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/shadowprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/structuretagprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/svggradientprimitive2d.hxx | 8 ++---
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/texteffectprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 12 +++----
include/drawinglayer/primitive2d/textlineprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/textprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx | 4 +-
include/drawinglayer/primitive2d/transformprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/transparenceprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx | 2 -
include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx | 2 -
46 files changed, 68 insertions(+), 68 deletions(-)
New commits:
commit 2b089e1a2a0f41ce7d0d478a665116d3c2ee72f3
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Feb 2 22:20:55 2020 +0100
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Feb 4 08:33:45 2020 +0100
remove use of macro DeclPrimitive2DIDBlock in drawinglayer
It's quite a usless macro actually. It is forced that every class
implements this method anyway. This gets rid of usages in the
drawinglayer module first.
Change-Id: Ic2b2e7d5b72a8e0f7ea0748d0ea44cd38cf8c1ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87905
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 372e09b2b888..60dd7766d7b9 100644
--- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -94,7 +94,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/** Override getDecomposition() here since the decompose
depends on the point in time, so the default implementation is
@@ -128,7 +128,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -162,7 +162,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 6b91ca1b0d6e..5d3c7eff21d2 100644
--- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -73,7 +73,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/// Override standard getDecomposition call to be view-dependent here
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index 747e9e571c21..d35a2699b0af 100644
--- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
@@ -65,7 +65,7 @@ public:
virtual sal_Int64 SAL_CALL estimateUsage() override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index d3be9c8d4068..2c10eb96572d 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -139,7 +139,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
index 8cfbe7ca78dd..44ef537c9ac5 100644
--- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
@@ -97,7 +97,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/// Override standard getDecomposition to be view-dependent here
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
index 0b50a51d2fdb..05613783d73b 100644
--- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
@@ -89,7 +89,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
index 431c97245a9f..e32d1c5bbaca 100644
--- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
@@ -65,7 +65,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
index 2ce3f12cb419..da80bccc1a60 100644
--- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
@@ -108,7 +108,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
index e3b6b405e013..9bd91ec8c28b 100644
--- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
@@ -108,7 +108,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
index 78f6a53f6158..56ddafa35abc 100644
--- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
@@ -66,7 +66,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index 12c48a7ad6b8..f2924d6848c2 100644
--- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -109,7 +109,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx
index 3651b5a0a3c2..64b8c345b24e 100644
--- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx
@@ -74,7 +74,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index 4be6aaccc5c5..5ab72f338f54 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -95,7 +95,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
index 2799c4d95a3a..cad8f36c1ceb 100644
--- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
@@ -83,7 +83,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
index d076509567b8..84f057a069d3 100644
--- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
@@ -103,7 +103,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/// Override standard getDecomposition to be view-dependent here
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
index a38c28d4657c..054f1fb903be 100644
--- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -85,7 +85,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
// XAccounting
virtual sal_Int64 SAL_CALL estimateUsage() override;
diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
index 3236e0161a21..3da27d31afaa 100644
--- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
@@ -98,7 +98,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/// Override standard getDecomposition to be view-dependent here
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
index d12d281c305a..79666f6cdef3 100644
--- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
@@ -51,7 +51,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
index da37ead7d06f..77aab7578ac9 100644
--- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
explicit InvertPrimitive2D(const Primitive2DContainer& rChildren);
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
index 925e65eb3c61..a7b8fad38a9a 100644
--- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
@@ -74,7 +74,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
index 1b2ef677cd75..aea53f53709d 100644
--- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
@@ -66,7 +66,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 936944f2be63..431b55c7ac31 100644
--- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
@@ -82,7 +82,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx
index 6978d9d4f588..4a3175e365ee 100644
--- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx
@@ -85,7 +85,7 @@ namespace drawinglayer
virtual void accessMetafile(GDIMetaFile& rTargetMetafile) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index 4eb2b236e1e6..67cf0e49501e 100644
--- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
@@ -67,7 +67,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index 95ccd3495e00..187c6d7a9645 100644
--- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
@@ -59,7 +59,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
index cf4bbc1e6a5d..d4d50d8996d4 100644
--- a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
@@ -41,7 +41,7 @@ namespace drawinglayer
explicit PageHierarchyPrimitive2D(const Primitive2DContainer& rChildren);
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index c4dbaee7d67b..39315180e0e4 100644
--- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
@@ -85,7 +85,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
index 69f18cf4401c..b47a2bf6ac96 100644
--- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
@@ -84,7 +84,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
// XAccounting
virtual sal_Int64 SAL_CALL estimateUsage() override;
diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 0915ef1a8aae..b230dd145c75 100644
--- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index cda854fe144c..aaa73288d7d3 100644
--- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -135,7 +135,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -193,7 +193,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -247,7 +247,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -302,7 +302,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index 6d6397ee8760..c1907f829c84 100644
--- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -72,7 +72,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -127,7 +127,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -183,7 +183,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -227,7 +227,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -279,7 +279,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -337,7 +337,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -385,7 +385,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -447,7 +447,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
index 5dbfddb41e62..1b472c609f06 100644
--- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
@@ -140,7 +140,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/// get local decomposition. Override since this decomposition is view-dependent
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
index ddc832f92582..d1154caea531 100644
--- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -75,7 +75,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index 868fbb226e48..68bee96d3aa9 100644
--- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
@@ -70,7 +70,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index 9c2d31160ac8..e4567c17a577 100644
--- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
@@ -220,7 +220,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -290,7 +290,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -334,7 +334,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -401,7 +401,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 434011f198c0..cfa93490fa18 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -120,7 +120,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 74ca61e23b8b..0fa5fc74ce2c 100644
--- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -89,7 +89,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
/// Override standard getDecomposition to be view-dependent here
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 98322308e6db..8cc08d272738 100644
--- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -47,7 +47,7 @@ namespace drawinglayer
explicit TextHierarchyLinePrimitive2D(const Primitive2DContainer& rChildren);
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -69,7 +69,7 @@ namespace drawinglayer
explicit TextHierarchyBulletPrimitive2D(const Primitive2DContainer& rChildren);
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -103,7 +103,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -125,7 +125,7 @@ namespace drawinglayer
explicit TextHierarchyBlockPrimitive2D(const Primitive2DContainer& rChildren);
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -181,7 +181,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -209,7 +209,7 @@ namespace drawinglayer
explicit TextHierarchyEditPrimitive2D(const Primitive2DContainer& rChildren);
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
index c9bf017a6589..c0f757bbc707 100644
--- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
@@ -70,7 +70,7 @@ namespace drawinglayer
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index 4e2fc0f6699f..8b0aeedb7e8a 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -176,7 +176,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
/// small helper to have a compare operator for Locale
diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
index de0658910192..fb6a000a67d2 100644
--- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
@@ -96,7 +96,7 @@ namespace drawinglayer
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -135,7 +135,7 @@ namespace drawinglayer
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
index 54187bb19bce..fcae977042eb 100644
--- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
index 0c9c0091d845..ae873a4e4e05 100644
--- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
@@ -75,7 +75,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
index c5015d933401..1cc66582a4d3 100644
--- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
@@ -63,7 +63,7 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
index 092337c3bf2c..c5d4e42b95a8 100644
--- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
@@ -73,7 +73,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
index c517e1472cf8..9549d8c7795d 100644
--- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
@@ -79,7 +79,7 @@ namespace drawinglayer
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// provide unique ID
- DeclPrimitive2DIDBlock()
+ virtual sal_uInt32 getPrimitive2DID() const override;
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
More information about the Libreoffice-commits
mailing list