summaryrefslogtreecommitdiff
path: root/chart2/source/view/main/Clipping.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /chart2/source/view/main/Clipping.cxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 737b6a92adca9a8285370918671b93b56a028537 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:21 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e Author: Jani Monoses <jani.monoses@canonical.com> Date: Thu Jan 27 15:33:06 2011 +0200 Remove unused declaration Signed-off-by: Michael Meeks <michael.meeks@novell.com> sc/source/core/tool/token.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 96bee1507119ca0525845022019d90f0694996aa Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 20 23:44:52 2011 -0500 Fixed incorrect page number in page preview mode. (fdo#33155) When the window is large enough to show several 'Page X' strings, the page number was not properly incremented. This commit fixes it. sc/source/ui/view/gridwin4.cxx | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83 Author: Kohei Yoshida <kyoshida@novell.com> Date: Wed Jan 19 00:24:24 2011 -0500 Fixed incorrect import of cell attributes from Excel documents. When a cell with non-default formatting attribute starts with non-first row in a column, the filter would incorrectly apply the same format to all the cells above it if they didn't have any formats. This commit fixes it. sc/source/filter/excel/xistyle.cxx | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit af63319fcdeea3f9b5018eab83ef5a9e64905446 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:18:07 2011 -0500 Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c. I created a patch between before and after the merge commit, and reverse-applied it. This is because if you revert a merge commit in git you are denying all future merges from that branch. I wasn't sure if we really wanted that. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/inc/document.hxx | 22 +------ sc/inc/drwlayer.hxx | 2 +- sc/inc/table.hxx | 16 +----- sc/source/core/data/document.cxx | 7 +-- sc/source/core/data/drwlayer.cxx | 6 +- sc/source/core/data/table1.cxx | 38 ++++-------- sc/source/core/data/table2.cxx | 91 ++++++------------------------ sc/source/core/data/table3.cxx | 71 +---------------------- sc/source/filter/xml/xmlrowi.cxx | 17 +---- sc/source/ui/docshell/externalrefmgr.cxx | 7 +- sc/source/ui/view/dbfunc.cxx | 5 +- sc/source/ui/view/tabvwshe.cxx | 4 +- 12 files changed, 52 insertions(+), 234 deletions(-) commit 5ada5635cff38af87830b091b36159cf80e4cf5d Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:04:14 2011 -0500 Revert "This is also part of the merge." This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/source/core/data/table3.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit c900e3db767518b7a60eaf24bdf298c94315f685 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 15d298ba7c4e89b043b3077e17747ba027a62c43 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.1.1 split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'chart2/source/view/main/Clipping.cxx')
-rw-r--r--chart2/source/view/main/Clipping.cxx66
1 files changed, 33 insertions, 33 deletions
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index 20e59e4a8442..2719e147797d 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ using ::basegfx::B2DTuple;
//-----------------------------------------------------------------------------
namespace{
-/** @descr This is a supporting function for lcl_clip2d. It computes a new parametric
+/** @descr This is a supporting function for lcl_clip2d. It computes a new parametric
value for an entering (dTE) or leaving (dTL) intersection point with one
of the edges bounding the clipping area.
For explanation of the parameters please refer to :
@@ -62,83 +62,83 @@ namespace{
*/
bool lcl_CLIPt(double fDenom,double fNum, double & fTE, double & fTL)
{
- double fT;
-
- if (fDenom > 0) // Intersection enters: PE
+ double fT;
+
+ if (fDenom > 0) // Intersection enters: PE
{
- fT = fNum / fDenom; // Parametric value at the intersection.
- if (fT > fTL) // fTE and fTL crossover
- return false; // therefore reject the line.
- else if (fT > fTE) // A new fTE has been found.
+ fT = fNum / fDenom; // Parametric value at the intersection.
+ if (fT > fTL) // fTE and fTL crossover
+ return false; // therefore reject the line.
+ else if (fT > fTE) // A new fTE has been found.
fTE = fT;
}
- else if (fDenom < 0) // Intersection leaves: PL
+ else if (fDenom < 0) // Intersection leaves: PL
{
- fT = fNum / fDenom; // Parametric Value at the intersection.
- if (fT < fTE) // fTE and fTL crossover
- return false; // therefore reject the line.
- else if (fT < fTL) // A new fTL has been found.
+ fT = fNum / fDenom; // Parametric Value at the intersection.
+ if (fT < fTE) // fTE and fTL crossover
+ return false; // therefore reject the line.
+ else if (fT < fTL) // A new fTL has been found.
fTL = fT;
}
else if (fNum > 0)
- return false; // Line lies on the outside of the edge.
-
+ return false; // Line lies on the outside of the edge.
+
return true;
}
-/** @descr The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle
+/** @descr The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle
rRectangle. If there is at least a part of it visible then TRUE is returned and
the endpoints of that part are stored in rP0 and rP1. The points rP0 and rP1
may have the same coordinates.
- @param rP0 Start point of the line to clip. Modified to contain a start point inside
+ @param rP0 Start point of the line to clip. Modified to contain a start point inside
the clipping area if possible.
- @param rP1 End point of the line to clip. Modified to contain an end point inside
+ @param rP1 End point of the line to clip. Modified to contain an end point inside
the clipping area if possible.
- @param rRectangle Clipping area.
- @return If the line lies completely or partly inside the clipping area then TRUE
+ @param rRectangle Clipping area.
+ @return If the line lies completely or partly inside the clipping area then TRUE
is returned. If the line lies completely outside then FALSE is returned and rP0 and
rP1 are left unmodified.
*/
bool lcl_clip2d(B2DTuple& rPoint0, B2DTuple& rPoint1, const B2DRectangle& rRectangle)
{
- //Direction vector of the line.
+ //Direction vector of the line.
B2DTuple aDirection = rPoint1 - rPoint0;
if( aDirection.getX()==0 && aDirection.getY()==0 && rRectangle.isInside(rPoint0) )
{
- // Degenerate case of a zero length line.
+ // Degenerate case of a zero length line.
return true;
}
else
{
- // Values of the line parameter where the line enters resp. leaves the rectangle.
+ // Values of the line parameter where the line enters resp. leaves the rectangle.
double fTE = 0,
fTL = 1;
-
- // Test wether at least a part lies in the four half-planes with respect to
- // the rectangles four edges.
+
+ // Test wether at least a part lies in the four half-planes with respect to
+ // the rectangles four edges.
if( lcl_CLIPt(aDirection.getX(), rRectangle.getMinX() - rPoint0.getX(), fTE, fTL) )
if( lcl_CLIPt(-aDirection.getX(), rPoint0.getX() - rRectangle.getMaxX(), fTE, fTL) )
if( lcl_CLIPt(aDirection.getY(), rRectangle.getMinY() - rPoint0.getY(), fTE, fTL) )
if( lcl_CLIPt(-aDirection.getY(), rPoint0.getY() - rRectangle.getMaxY(), fTE, fTL) )
{
- // At least a part is visible.
+ // At least a part is visible.
if (fTL < 1)
{
- // Compute the new end point.
+ // Compute the new end point.
rPoint1.setX( rPoint0.getX() + fTL * aDirection.getX() );
rPoint1.setY( rPoint0.getY() + fTL * aDirection.getY() );
}
if (fTE > 0)
{
- // Compute the new starting point.
+ // Compute the new starting point.
rPoint0.setX( rPoint0.getX() + fTE * aDirection.getX() );
rPoint0.setY( rPoint0.getY() + fTE * aDirection.getY() );
}
return true;
}
-
- // Line is not visible.
+
+ // Line is not visible.
return false;
}
}
@@ -221,7 +221,7 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg
if(!rPolygon.SequenceX.getLength())
return;
-
+
//need clipping?:
{
::basegfx::B3DRange a3DRange( BaseGFXHelper::getBoundVolume( rPolygon ) );