summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2014-09-01 15:36:35 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-01-16 20:34:59 +0900
commit2d92cfd38eb89fdf527a00754eb97d7b49f08ada (patch)
tree2a4d6e1404ddeda14f4185c321600c2e8e61f21f /svx
parentcb6b1a6c7c66801f5ba9ff7bd80cc666c8ada0cb (diff)
make OverlayTriangle public, allow to change each point
Change-Id: Ifdc8df1852e29173ee571102aed1c21d5611171b
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/overlay/overlaytriangle.hxx62
-rw-r--r--svx/source/sdr/overlay/overlaytriangle.cxx27
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
3 files changed, 27 insertions, 64 deletions
diff --git a/svx/inc/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx
deleted file mode 100644
index c1f780f4eb8e..000000000000
--- a/svx/inc/sdr/overlay/overlaytriangle.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-
-
-
-namespace sdr
-{
- namespace overlay
- {
- class OverlayTriangle : public OverlayObjectWithBasePosition
- {
- protected:
- // second and third position in pixel
- basegfx::B2DPoint maSecondPosition;
- basegfx::B2DPoint maThirdPosition;
-
- // geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
- public:
- OverlayTriangle(
- const basegfx::B2DPoint& rBasePos,
- const basegfx::B2DPoint& rSecondPos,
- const basegfx::B2DPoint& rThirdPos,
- Color aTriangleColor);
- virtual ~OverlayTriangle();
-
- // change second position
- const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
-
- // change third position
- const basegfx::B2DPoint& getThirdPosition() const { return maThirdPosition; }
- };
- } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index 752a73a6a933..52a3cb7c351c 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sdr/overlay/overlaytriangle.hxx>
+#include <svx/sdr/overlay/overlaytriangle.hxx>
#include <tools/poly.hxx>
#include <vcl/outdev.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -64,6 +64,31 @@ namespace sdr
OverlayTriangle::~OverlayTriangle()
{
}
+
+ void OverlayTriangle::setSecondPosition(const basegfx::B2DPoint& rNew)
+ {
+ if(rNew != maSecondPosition)
+ {
+ // remember new value
+ maSecondPosition = rNew;
+
+ // register change (after change)
+ objectChange();
+ }
+ }
+
+ void OverlayTriangle::setThirdPosition(const basegfx::B2DPoint& rNew)
+ {
+ if(rNew != maThirdPosition)
+ {
+ // remember new value
+ maThirdPosition = rNew;
+
+ // register change (after change)
+ objectChange();
+ }
+ }
+
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 69deb579b8c2..dd0ad36022f5 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -49,7 +49,7 @@
#include <svx/sdr/overlay/overlayanimatedbitmapex.hxx>
#include <svx/sdr/overlay/overlaybitmapex.hxx>
#include <sdr/overlay/overlayline.hxx>
-#include <sdr/overlay/overlaytriangle.hxx>
+#include <svx/sdr/overlay/overlaytriangle.hxx>
#include <sdr/overlay/overlayrectangle.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/sdrpaintwindow.hxx>