diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-05-02 18:24:09 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-05-03 00:27:37 +0200 |
| commit | d57033ddf8eaa2f6992ac7d89c33dc47c7293492 (patch) | |
| tree | e550e14925a64db3402fc993d6d55bbf8dc214e1 /include | |
| parent | 52b6e4c9e508af0db7f942b30735bec1bb184399 (diff) | |
tdf#117145 Cleanup MapMode handling between SdrModel/UNO API
In current versions MapMode handling is done in ::TRSet/Get-
BaseGeometry methods. These belong to SdrModel level and
should not do any MapMode conversions (else all geometry
and Rectangle setters/getters should have to do these, too).
Instead, the UNO API implementation should do these, there
are already some done there and this is the level which offers
pure 100ThMM handling to the caller, independent from the
used application.
Change-Id: I3d7781440fc0fc6a20b5d4e79c747c988677483d
Reviewed-on: https://gerrit.libreoffice.org/53748
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdobj.hxx | 3 | ||||
| -rw-r--r-- | include/svx/unoshape.hxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index df6d42f2233f..c901dfa1416d 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -970,9 +970,6 @@ protected: return static_cast<const T&>(GetObjectItem(sal_uInt16(nWhich))); } - // get MapUnit the object is using - MapUnit GetObjectMapUnit() const; - /// Sets a new UNO shape /// /// The default implementation of this function sets the new UNO diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 422f6b13b446..d015d8f39820 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -148,10 +148,15 @@ protected: void ForceMetricTo100th_mm(Pair& rPoint) const throw(); void ForceMetricTo100th_mm(Point& rPoint) const throw() { ForceMetricTo100th_mm(rPoint.toPair()); } void ForceMetricTo100th_mm(Size& rPoint) const throw() { ForceMetricTo100th_mm(rPoint.toPair()); } - // Dimension arrows change size/position on save/reload (#i59051#) + + // version for basegfx::B2DPolyPolygon void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); + // tdf#117145 version for basegfx::B2DHomMatrix + void ForceMetricToItemPoolMetric(basegfx::B2DHomMatrix& rB2DHomMatrix) const throw(); + void ForceMetricTo100th_mm(basegfx::B2DHomMatrix& rB2DHomMatrix) const throw(); + css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const; bool SetFillAttribute( sal_uInt16 nWID, const OUString& rName ); |