This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ce2d062123 Cleanup
ce2d062123 is described below
commit ce2d0621236086eb2c446e84b3cb3998be7b452f
Author: mseidel <[email protected]>
AuthorDate: Mon Mar 17 02:12:00 2025 +0100
Cleanup
---
main/svx/source/svdraw/svddrgmt.cxx | 26 +-
main/svx/source/svdraw/svdopath.cxx | 721 ++++++++++++++++++------------------
2 files changed, 369 insertions(+), 378 deletions(-)
diff --git a/main/svx/source/svdraw/svddrgmt.cxx
b/main/svx/source/svdraw/svddrgmt.cxx
index ef1ff379e2..8a8ec9c1dc 100644
--- a/main/svx/source/svdraw/svddrgmt.cxx
+++ b/main/svx/source/svdraw/svddrgmt.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
@@ -82,8 +80,6 @@
#include <map>
#include <vector>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SdrDragEntry::SdrDragEntry()
: mbAddToTransparent(false)
{
@@ -379,8 +375,7 @@ void SdrDragMethod::createSdrDragEntries()
void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal,
sdr::contact::ObjectContact& rObjectContact, bool bModify)
{
- // add full object drag; Clone() at the object has to work
- // for this
+ // add full object drag; Clone() at the object has to work for this
addSdrDragEntry(new SdrDragEntrySdrObject(rOriginal, rObjectContact,
bModify));
}
@@ -1092,7 +1087,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
nSA=getSdrDragView().GetSnapAngle();
if (getSdrDragView().IsMirrorAllowed(true,true))
- { // eingeschraenkt
+ { // eingeschränkt
if
(!getSdrDragView().IsMirrorAllowed(false,false)) nSA=4500;
if
(!getSdrDragView().IsMirrorAllowed(true,false)) nSA=9000;
}
@@ -1443,7 +1438,7 @@ bool SdrDragObjOwn::EndSdrDrag(bool /*bCopy*/)
// evtl. use operator= for setting changed object data (do not
change selection in
// view, this will destroy the interactor). This is possible
since a clone is now
// directly modified by the modifiers. Only SdrTableObj is
adding own UNDOs
- // in it's SdrTableObj::endSpecialDrag, so currently not
possible. OTOH it uses
+ // in its SdrTableObj::endSpecialDrag, so currently not
possible. OTOH it uses
// a CreateUndoGeoObject() so maybe setting
SetEndDragChangesAttributes is okay. I
// will test this now
Rectangle aBoundRect0;
@@ -1520,7 +1515,7 @@ TYPEINIT1(SdrDragMove,SdrDragMethod);
void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal,
sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/)
{
- // for SdrDragMove, use current Primitive2DSequence of SdrObject
visualisation
+ // for SdrDragMove, use current Primitive2DSequence of SdrObject
visualization
// in given ObjectContact directly
sdr::contact::ViewContact& rVC = rOriginal.GetViewContact();
sdr::contact::ViewObjectContact& rVOC =
rVC.GetViewObjectContact(rObjectContact);
@@ -1670,7 +1665,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
}
if (aSR2.Left()>aLR.Left() || aSR2.Right()<aLR.Right())
- { // ist ueberhaupt Platz zum verschieben?
+ { // ist überhaupt Platz zum verschieben?
aSR2.Move(aD.X(),0);
if (aSR2.Left()<aLR.Left())
@@ -1686,7 +1681,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
aPt1.X()=DragStat().GetStart().X(); // kein
Platz zum verschieben
if (aSR2.Top()>aLR.Top() || aSR2.Bottom()<aLR.Bottom())
- { // ist ueberhaupt Platz zum verschieben?
+ { // ist überhaupt Platz zum verschieben?
aSR2.Move(0,aD.Y());
if (aSR2.Top()<aLR.Top())
@@ -2328,7 +2323,7 @@ bool SdrDragShear::BeginSdrDrag()
}
else
{
- DBG_ERROR("SdrDragShear::BeginSdrDrag(): Kein
Referenzpunkt-Handle fuer Shear gefunden");
+ DBG_ERROR("SdrDragShear::BeginSdrDrag(): Kein
Referenzpunkt-Handle für Shear gefunden");
return false;
}
@@ -2442,7 +2437,7 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
bUpSideDown=nNeuWink>9000 && nNeuWink<27000;
if (bSlant)
- { // Resize fuer Slant berechnen
+ { // Resize für Slant berechnen
// Mit Winkelfang jedoch ohne 89deg Begrenzung
long nTmpWink=nNeuWink;
if (bUpSideDown) nNeuWink-=18000;
@@ -3927,7 +3922,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
double fScaleY = ( aGraphicSize.Height() - rOldCrop.GetTop() -
rOldCrop.GetBottom() ) / (double)aOldRect.GetHeight();
// not needed since the modification is done in unit coordinates, free
from shear/rotate and mirror
- // // TTTT may be removed or exhanged by other stuff in aw080
+ // // TTTT may be removed or exchanged by other stuff in aw080
// // to correct the never working combination of cropped images and
mirroring
// // I have to correct the rectangles the calculation is based on
here. In the current
// // core geometry stuff a vertical mirror is expressed as 180 degree
rotation. All
@@ -3976,5 +3971,4 @@ Pointer SdrDragCrop::GetSdrDragPointer() const
return Pointer(POINTER_CROP);
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/svdopath.cxx
b/main/svx/source/svdraw/svdopath.cxx
index 7f559cd433..033f97cf67 100644
--- a/main/svx/source/svdraw/svdopath.cxx
+++ b/main/svx/source/svdraw/svdopath.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
@@ -36,9 +34,9 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdhdl.hxx>
-#include <svx/svdview.hxx> // fuer MovCreate bei Freihandlinien
-#include "svx/svdglob.hxx" // Stringcache
-#include "svx/svdstr.hrc" // Objektname
+#include <svx/svdview.hxx> // für MovCreate bei Freihandlinien
+#include "svx/svdglob.hxx" // Stringcache
+#include "svx/svdstr.hrc" // Objektname
#ifdef _MSC_VER
#pragma optimize ("",off)
@@ -51,7 +49,7 @@
#include <svx/svdogrp.hxx>
#include <svx/polypolygoneditor.hxx>
#include <svx/xlntrit.hxx>
-#include <vcl/salbtype.hxx> // FRound
+#include <vcl/salbtype.hxx> // FRound
#include "svdoimp.hxx"
#include <svx/sdr/contact/viewcontactofsdrpathobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -96,7 +94,7 @@ inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16
nPntMax, FASTBOOL bClos
struct ImpSdrPathDragData : public SdrDragStatUserData
{
- XPolygon aXP; //
Ausschnitt aud dem Originalpolygon
+ XPolygon aXP; //
Ausschnitt aus dem Originalpolygon
FASTBOOL bValid; //
sal_False = zu wenig Punkte
FASTBOOL bClosed; //
geschlossenes Objekt?
sal_uInt16 nPoly;
// Nummer des Polygons im PolyPolygon
@@ -106,14 +104,14 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
FASTBOOL bBegPnt; //
Gedraggter Punkt ist der Anfangspunkt einer Polyline
FASTBOOL bEndPnt; //
Gedraggter Punkt ist der Endpunkt einer Polyline
sal_uInt16 nPrevPnt;
// Index des vorherigen Punkts
- sal_uInt16 nNextPnt;
// Index des naechsten Punkts
+ sal_uInt16 nNextPnt;
// Index des nächsten Punkts
FASTBOOL bPrevIsBegPnt; //
Vorheriger Punkt ist Anfangspunkt einer Polyline
FASTBOOL bNextIsEndPnt; //
Folgepunkt ist Endpunkt einer Polyline
sal_uInt16 nPrevPrevPnt;
// Index des vorvorherigen Punkts
- sal_uInt16 nNextNextPnt;
// Index des uebernaechsten Punkts
+ sal_uInt16 nNextNextPnt;
// Index des übernächsten Punkts
FASTBOOL bControl; //
Punkt ist ein Kontrollpunkt
- FASTBOOL bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- FASTBOOL bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ FASTBOOL bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stützpunkt
+ FASTBOOL bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stützpunkt
FASTBOOL bPrevIsControl; //
Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
FASTBOOL bNextIsControl; //
Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
sal_uInt16 nPrevPrevPnt0;
@@ -121,7 +119,7 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
sal_uInt16 nPnt0;
sal_uInt16 nNextPnt0;
sal_uInt16 nNextNextPnt0;
- FASTBOOL bEliminate; //
Punkt loeschen? (wird von MovDrag gesetzt)
+ FASTBOOL bEliminate; //
Punkt löschen? (wird von MovDrag gesetzt)
// ##
sal_Bool
mbMultiPointDrag;
@@ -146,7 +144,7 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj&
rPO, const SdrHdl& rHdl
const SdrMarkView& rMarkView = *rDrag.GetView();
const SdrHdlList& rHdlList = rMarkView.GetHdlList();
const sal_uInt32 nHdlCount = rHdlList.GetHdlCount();
- const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ?
rHdlList.GetHdl(0)->GetObj() : 0);
+ const SdrObject* pInteractionObject(nHdlCount &&
rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : 0);
for(sal_uInt32 a(0); a < nHdlCount; a++)
{
@@ -178,18 +176,18 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj&
rPO, const SdrHdl& rHdl
bEndPnt=(nPntAnz<3) || nPnt==nPntMax-1;
}
nPrevPnt=nPnt; // Index des vorherigen
Punkts
- nNextPnt=nPnt; // Index des naechsten
Punkts
+ nNextPnt=nPnt; // Index des nächsten Punkts
if (!bBegPnt) nPrevPnt=GetPrevPnt(nPnt,nPntMax,bClosed);
if (!bEndPnt) nNextPnt=GetNextPnt(nPnt,nPntMax,bClosed);
bPrevIsBegPnt=bBegPnt || (!bClosed && nPrevPnt==0);
bNextIsEndPnt=bEndPnt || (!bClosed && nNextPnt==nPntMax);
nPrevPrevPnt=nPnt; // Index des vorvorherigen
Punkts
- nNextNextPnt=nPnt; // Index des uebernaechsten
Punkts
+ nNextNextPnt=nPnt; // Index des übernächsten
Punkts
if (!bPrevIsBegPnt)
nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed);
if (!bNextIsEndPnt)
nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed);
bControl=rHdl.IsPlusHdl(); // Punkt ist ein
Kontrollpunkt
- bIsPrevControl=sal_False; // Punkt ist
Kontrollpunkt vor einem Stuetzpunkt
- bIsNextControl=sal_False; // Punkt ist
Kontrollpunkt hinter einem Stuetzpunkt
+ bIsPrevControl=sal_False; // Punkt ist
Kontrollpunkt vor einem Stützpunkt
+ bIsNextControl=sal_False; // Punkt ist
Kontrollpunkt hinter einem Stützpunkt
bPrevIsControl=sal_False; // Falls nPnt ein
StPnt: Davor ist ein Kontrollpunkt
bNextIsControl=sal_False; // Falls nPnt ein
StPnt: Dahinter ist ein Kontrollpunkt
if (bControl) {
@@ -422,9 +420,9 @@ FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1,
const Point& rP2, const P
Point aP2(CalcLine(aTmpPt, nDirY,-nDirX,pView)); aP2-=aTmpPt; long
nQ2=Abs(aP2.X())+Abs(aP2.Y());
if (pView!=NULL && pView->IsOrtho()) nQ1=0; // Ortho schaltet
rechtwinklig aus
bLine90=nQ1>2*nQ2;
- if (!bLine90) { // glatter Uebergang
+ if (!bLine90) { // glatter Übergang
aLineEnd+=aP1;
- } else { // rechtwinkliger Uebergang
+ } else { // rechtwinkliger Übergang
aLineEnd+=aP2;
}
bLine=sal_True;
@@ -508,7 +506,7 @@ class ImpPathForDragAndCreate
SdrPathObj& mrSdrPathObject;
XPolyPolygon aPathPolygon;
SdrObjKind meObjectKind;
- ImpSdrPathDragData* mpSdrPathDragData;
+ ImpSdrPathDragData* mpSdrPathDragData;
bool mbCreating;
public:
@@ -517,11 +515,11 @@ public:
// drag stuff
bool beginPathDrag( SdrDragStat& rDrag ) const;
- bool movePathDrag( SdrDragStat& rDrag ) const;
- bool endPathDrag( SdrDragStat& rDrag );
- //void cancelSpecialDrag( SdrDragStat& rDrag ) const;
+ bool movePathDrag( SdrDragStat& rDrag ) const;
+ bool endPathDrag( SdrDragStat& rDrag );
+ //void cancelSpecialDrag( SdrDragStat& rDrag ) const;
String getSpecialDragComment(const SdrDragStat& rDrag) const;
- basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const;
+ basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag)
const;
// create stuff
FASTBOOL BegCreate(SdrDragStat& rStat);
@@ -547,23 +545,23 @@
ImpPathForDragAndCreate::ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject)
: mrSdrPathObject(rSdrPathObject),
aPathPolygon(rSdrPathObject.GetPathPoly()),
meObjectKind(mrSdrPathObject.meKind),
- mpSdrPathDragData(0),
+ mpSdrPathDragData(0),
mbCreating(false)
{
}
ImpPathForDragAndCreate::~ImpPathForDragAndCreate()
{
- if(mpSdrPathDragData)
- {
- delete mpSdrPathDragData;
- }
+ if(mpSdrPathDragData)
+ {
+ delete mpSdrPathDragData;
+ }
}
bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const
{
const SdrHdl* pHdl=rDrag.GetHdl();
- if(!pHdl)
+ if(!pHdl)
return sal_False;
sal_Bool bMultiPointDrag(sal_True);
@@ -576,14 +574,14 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat&
rDrag ) const
const SdrMarkView& rMarkView = *rDrag.GetView();
const SdrHdlList& rHdlList = rMarkView.GetHdlList();
const sal_uInt32 nHdlCount = rHdlList.GetHdlCount();
- const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ?
rHdlList.GetHdl(0)->GetObj() : 0);
+ const SdrObject* pInteractionObject(nHdlCount &&
rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : 0);
sal_uInt32 nSelectedPoints(0);
for(sal_uInt32 a(0); a < nHdlCount; a++)
{
SdrHdl* pTestHdl = rHdlList.GetHdl(a);
- if(pTestHdl && pTestHdl->IsSelected() &&
pTestHdl->GetObj() == pInteractionObject)
+ if(pTestHdl && pTestHdl->IsSelected() &&
pTestHdl->GetObj() == pInteractionObject)
{
nSelectedPoints++;
}
@@ -594,12 +592,12 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat&
rDrag ) const
}
((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new
ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag);
-
- if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
- {
+
+ if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
+ {
DBG_ERROR("ImpPathForDragAndCreate::BegDrag():
ImpSdrPathDragData ist ungueltig");
- delete mpSdrPathDragData;
- ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = 0;
+ delete mpSdrPathDragData;
+ ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = 0;
return false;
}
@@ -608,8 +606,8 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat&
rDrag ) const
bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
{
- if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
- {
+ if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
+ {
DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData ist ungueltig");
return false;
}
@@ -638,7 +636,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
{
rMove[nPointCount - 1] =
rOrig[nPointCount - 1] + aDelta;
- // when moving the last point it may be
necessary to move the
+ // when moving the last point it may be
necessary to move the
// control point in front of this one,
too.
if(nPointCount > 1 &&
rOrig.IsControl(nPointCount - 2))
rMove[nPointCount - 2] =
rOrig[nPointCount - 2] + aDelta;
@@ -670,11 +668,11 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; //
Gedraggter Punkt ist der Anfangspunkt einer Polyline
FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; //
Gedraggter Punkt ist der Endpunkt einer Polyline
sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ;
// Index des vorherigen Punkts
- sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ;
// Index des naechsten Punkts
+ sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ;
// Index des nächsten Punkts
FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; //
Vorheriger Punkt ist Anfangspunkt einer Polyline
FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; //
Folgepunkt ist Endpunkt einer Polyline
sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ;
// Index des vorvorherigen Punkts
- sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ;
// Index des uebernaechsten Punkts
+ sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ;
// Index des uebernächsten Punkts
FASTBOOL bControl =mpSdrPathDragData->bControl ; //
Punkt ist ein Kontrollpunkt
//int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stuetzpunkt
FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
@@ -755,7 +753,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
rDrag.SetActionRect(Rectangle(rDrag.GetNow(),rDrag.GetNow()));
// IBM Special: Punkte eliminieren, wenn die beiden angrenzenden
- // Linien eh' fast 180 deg sind.
+ // Linien eh fast 180 deg sind.
if (!bControl && rDrag.GetView()!=NULL &&
rDrag.GetView()->IsEliminatePolyPoints() &&
!bBegPnt && !bEndPnt && !bPrevIsControl &&
!bNextIsControl)
{
@@ -779,7 +777,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
// Um diese Entfernung wurde insgesamt gedraggd
Point aDiff(rDrag.GetNow());
aDiff-=mpSdrPathDragData->aXP[nPnt];
- // Insgesamt sind 8 Faelle moeglich:
+ // Insgesamt sind 8 Fälle möglich:
// X 1. Weder rechts noch links Ctrl.
// o--X--o 2. Rechts und links Ctrl, gedraggd wird St.
// o--X 3. Nur links Ctrl, gedraggd wird St.
@@ -788,17 +786,17 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
// x--O 6. Nur links Ctrl, gedraggd wird links.
// o--O--x 7. Rechts und links Ctrl, gedraggd wird rechts.
// O--x 8. Nur rechts Ctrl, gedraggd wird rechts.
- // Zusaetzlich ist zu beachten, dass das Veraendern einer Linie
(keine Kurve)
+ // Zusätzlich ist zu beachten, dass das Verändern einer Linie
(keine Kurve)
// eine evtl. Kurve am anderen Ende der Linie bewirkt, falls
dort Smooth
// gesetzt ist (Kontrollpunktausrichtung an Gerade).
mpSdrPathDragData->aXP[nPnt]+=aDiff;
// Nun symmetrische PlusHandles etc. checken
- if (bControl) { // Faelle 5,6,7,8
- sal_uInt16 nSt=nPnt; // der zugehoerige Stuetzpunkt
- sal_uInt16 nFix=nPnt; // der gegenueberliegende
Kontrollpunkt
- if (bIsNextControl) { // Wenn der naechste ein
Kontrollpunkt ist, muss der vorh. der Stuetzpunkt sein
+ if (bControl) { // Fälle 5,6,7,8
+ sal_uInt16 nSt=nPnt; // der zugehörige Stützpunkt
+ sal_uInt16 nFix=nPnt; // der gegenüberliegende
Kontrollpunkt
+ if (bIsNextControl) { // Wenn der nächste ein
Kontrollpunkt ist, muss der vorh. der Stützpunkt sein
nSt=nPrevPnt;
nFix=nPrevPrevPnt;
} else {
@@ -810,7 +808,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
}
}
- if (!bControl) { // Faelle 1,2,3,4 wobei bei 1 nix passiert und
bei 3+4 unten noch mehr folgt
+ if (!bControl) { // Fälle 1,2,3,4 wobei bei 1 nix passiert und
bei 3+4 unten noch mehr folgt
// die beiden Kontrollpunkte mit verschieben
if (bPrevIsControl)
mpSdrPathDragData->aXP[nPrevPnt]+=aDiff;
if (bNextIsControl)
mpSdrPathDragData->aXP[nNextPnt]+=aDiff;
@@ -853,12 +851,12 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat&
rDrag)
aLinePt2=rXP[1];
}
- if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
- {
- DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData ist ungueltig");
+ if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
+ {
+ DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData is invalid");
return false;
}
-
+
if(mpSdrPathDragData->IsMultiPointDrag())
{
aPathPolygon = mpSdrPathDragData->maMove;
@@ -870,27 +868,27 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat&
rDrag)
// Referenz auf das Polygon
XPolygon& rXP=aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()];
- // Die 5 Punkte die sich evtl. geaendert haben
+ // Die 5 Punkte die sich evtl. geändert haben
if (!mpSdrPathDragData->bPrevIsBegPnt)
rXP[mpSdrPathDragData->nPrevPrevPnt0]=mpSdrPathDragData->aXP[mpSdrPathDragData->nPrevPrevPnt];
if (!mpSdrPathDragData->bNextIsEndPnt)
rXP[mpSdrPathDragData->nNextNextPnt0]=mpSdrPathDragData->aXP[mpSdrPathDragData->nNextNextPnt];
if (!mpSdrPathDragData->bBegPnt)
rXP[mpSdrPathDragData->nPrevPnt0]
=mpSdrPathDragData->aXP[mpSdrPathDragData->nPrevPnt];
if (!mpSdrPathDragData->bEndPnt)
rXP[mpSdrPathDragData->nNextPnt0]
=mpSdrPathDragData->aXP[mpSdrPathDragData->nNextPnt];
- rXP[mpSdrPathDragData->nPnt0]
=mpSdrPathDragData->aXP[mpSdrPathDragData->nPnt];
+ rXP[mpSdrPathDragData->nPnt0]
=mpSdrPathDragData->aXP[mpSdrPathDragData->nPnt];
// Letzter Punkt muss beim Geschlossenen immer gleich dem
Ersten sein
if (mpSdrPathDragData->bClosed)
rXP[rXP.GetPointCount()-1]=rXP[0];
- if (mpSdrPathDragData->bEliminate)
+ if (mpSdrPathDragData->bEliminate)
{
basegfx::B2DPolyPolygon
aTempPolyPolygon(aPathPolygon.getB2DPolyPolygon());
sal_uInt32 nPoly,nPnt;
-
if(PolyPolygonEditor::GetRelativePolyPoint(aTempPolyPolygon,
rDrag.GetHdl()->GetSourceHdlNum(), nPoly, nPnt))
+
if(PolyPolygonEditor::GetRelativePolyPoint(aTempPolyPolygon,
rDrag.GetHdl()->GetSourceHdlNum(), nPoly, nPnt))
{
basegfx::B2DPolygon
aCandidate(aTempPolyPolygon.getB2DPolygon(nPoly));
aCandidate.remove(nPnt);
-
- if((IsClosed(meObjectKind) &&
aCandidate.count() < 3L) || aCandidate.count() < 2L)
+
+ if((IsClosed(meObjectKind) &&
aCandidate.count() < 3L) || aCandidate.count() < 2L)
{
aTempPolyPolygon.remove(nPoly);
}
@@ -903,8 +901,8 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat&
rDrag)
aPathPolygon = XPolyPolygon(aTempPolyPolygon);
}
- // Winkel anpassen fuer Text an einfacher Linie
- if (bLineGlueMirror)
+ // Winkel anpassen für Text an einfacher Linie
+ if (bLineGlueMirror)
{ // #40549#
Point aLinePt1_(aPathPolygon[0][0]);
Point aLinePt2_(aPathPolygon[0][1]);
@@ -927,7 +925,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat&
rDrag)
}
delete mpSdrPathDragData;
- mpSdrPathDragData = 0;
+ mpSdrPathDragData = 0;
return true;
}
@@ -945,94 +943,94 @@ String
ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
{
XubString aStr;
const SdrHdl* pHdl = rDrag.GetHdl();
- const bool bCreateComment(rDrag.GetView() && &mrSdrPathObject ==
rDrag.GetView()->GetCreateObj());
+ const bool bCreateComment(rDrag.GetView() && &mrSdrPathObject ==
rDrag.GetView()->GetCreateObj());
- if(bCreateComment && rDrag.GetUser())
- {
- // #i103058# re-add old creation comment mode
- ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser();
+ if(bCreateComment && rDrag.GetUser())
+ {
+ // #i103058# re-add old creation comment mode
+ ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser();
const SdrObjKind eKindMerk(meObjectKind);
- mrSdrPathObject.meKind = pU->eAktKind;
+ mrSdrPathObject.meKind = pU->eAktKind;
mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewCreateObj, aStr);
mrSdrPathObject.meKind = eKindMerk;
Point aPrev(rDrag.GetPrev());
Point aNow(rDrag.GetNow());
-
- if(pU->bLine)
+
+ if(pU->bLine)
aNow = pU->aLineEnd;
aNow -= aPrev;
aStr.AppendAscii(" (");
-
+
XubString aMetr;
-
- if(pU->bCircle)
+
+ if(pU->bCircle)
{
-
mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr);
+
mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr);
aStr += aMetr;
- aStr.AppendAscii(" r=");
-
mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
+ aStr.AppendAscii(" r=");
+
mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
aStr += aMetr;
}
- aStr.AppendAscii("dx=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr,
sal_True);
+ aStr.AppendAscii("dx=");
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr,
sal_True);
aStr += aMetr;
- aStr.AppendAscii(" dy=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr,
sal_True);
+ aStr.AppendAscii(" dy=");
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr,
sal_True);
aStr += aMetr;
-
- if(!IsFreeHand(meObjectKind))
+
+ if(!IsFreeHand(meObjectKind))
{
sal_Int32 nLen(GetLen(aNow));
- aStr.AppendAscii(" l=");
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr,
sal_True);
+ aStr.AppendAscii(" l=");
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr,
sal_True);
aStr += aMetr;
sal_Int32 nWink(GetAngle(aNow));
- aStr += sal_Unicode(' ');
- mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
+ aStr += sal_Unicode(' ');
+ mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
}
aStr += sal_Unicode(')');
- }
- else if(!mrSdrPathObject.GetModel() || !pHdl)
+ }
+ else if(!mrSdrPathObject.GetModel() || !pHdl)
{
- // #i103058# fallback when no model and/or Handle, both needed
- // for else-path
+ // #i103058# fallback when no model and/or Handle, both needed
+ // for else-path
mrSdrPathObject.ImpTakeDescriptionStr(STR_DragPathObj, aStr);
- }
- else
- {
- // #i103058# standard for modification; model and handle needed
- ImpSdrPathDragData* pDragData = mpSdrPathDragData;
-
- if(!pDragData)
- {
- // getSpecialDragComment is also used from create, so fallback to
GetUser()
- // when mpSdrPathDragData is not set
- pDragData = (ImpSdrPathDragData*)rDrag.GetUser();
- }
-
- if(!pDragData)
- {
- DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData ist ungueltig");
- return String();
- }
-
- if(!pDragData->IsMultiPointDrag() && pDragData->bEliminate)
+ }
+ else
+ {
+ // #i103058# standard for modification; model and handle needed
+ ImpSdrPathDragData* pDragData = mpSdrPathDragData;
+
+ if(!pDragData)
+ {
+ // getSpecialDragComment is also used from create, so
fallback to GetUser()
+ // when mpSdrPathDragData is not set
+ pDragData = (ImpSdrPathDragData*)rDrag.GetUser();
+ }
+
+ if(!pDragData)
+ {
+ DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData is invalid");
+ return String();
+ }
+
+ if(!pDragData->IsMultiPointDrag() && pDragData->bEliminate)
{
// Punkt von ...
-
mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewMarkedPoint, aStr);
+
mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewMarkedPoint, aStr);
- // %O loeschen
- XubString aStr2(ImpGetResStr(STR_EditDelete));
+ // %O löschen
+ XubString aStr2(ImpGetResStr(STR_EditDelete));
- // UNICODE: Punkt von ... loeschen
- aStr2.SearchAndReplaceAscii("%1", aStr);
+ // UNICODE: Punkt von ... löschen
+ aStr2.SearchAndReplaceAscii("%1", aStr);
return aStr2;
}
@@ -1045,12 +1043,12 @@ String
ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
Point aNow(rDrag.GetNow());
aStr = String();
- aStr.AppendAscii("dx=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(),
aMetr, sal_True);
+ aStr.AppendAscii("dx=");
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(),
aMetr, sal_True);
aStr += aMetr;
- aStr.AppendAscii(" dy=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(),
aMetr, sal_True);
+ aStr.AppendAscii(" dy=");
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(),
aMetr, sal_True);
aStr += aMetr;
if(!pDragData->IsMultiPointDrag())
@@ -1059,41 +1057,41 @@ String
ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
const XPolygon& rXPoly =
aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
sal_Bool bClose(IsClosed(meObjectKind));
-
- if(bClose)
+
+ if(bClose)
nPntAnz--;
- if(pHdl->IsPlusHdl())
- {
+ if(pHdl->IsPlusHdl())
+ {
// Hebel
sal_uInt16 nRef(nPntNum);
-
- if(rXPoly.IsControl(nPntNum + 1))
- nRef--;
- else
+
+ if(rXPoly.IsControl(nPntNum + 1))
+ nRef--;
+ else
nRef++;
aNow -= rXPoly[nRef];
-
+
sal_Int32 nLen(GetLen(aNow));
- aStr.AppendAscii(" l=");
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen,
aMetr, sal_True);
+ aStr.AppendAscii(" l=");
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen,
aMetr, sal_True);
aStr += aMetr;
-
+
sal_Int32 nWink(GetAngle(aNow));
aStr += sal_Unicode(' ');
- mrSdrPathObject.GetModel()->TakeWinkStr(nWink,
aMetr);
+ mrSdrPathObject.GetModel()->TakeWinkStr(nWink,
aMetr);
aStr += aMetr;
- }
- else if(nPntAnz > 1)
+ }
+ else if(nPntAnz > 1)
{
sal_uInt16 nPntMax(nPntAnz - 1);
Point aPt1,aPt2;
sal_Bool bIsClosed(IsClosed(meObjectKind));
sal_Bool bPt1(nPntNum > 0);
sal_Bool bPt2(nPntNum < nPntMax);
-
- if(bIsClosed && nPntAnz > 2)
+
+ if(bIsClosed && nPntAnz > 2)
{
bPt1 = sal_True;
bPt2 = sal_True;
@@ -1101,56 +1099,56 @@ String
ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
sal_uInt16 nPt1,nPt2;
- if(nPntNum > 0)
- nPt1 = nPntNum - 1;
- else
+ if(nPntNum > 0)
+ nPt1 = nPntNum - 1;
+ else
nPt1 = nPntMax;
- if(nPntNum < nPntMax)
- nPt2 = nPntNum + 1;
- else
+ if(nPntNum < nPntMax)
+ nPt2 = nPntNum + 1;
+ else
nPt2 = 0;
- if(bPt1 && rXPoly.IsControl(nPt1))
+ if(bPt1 && rXPoly.IsControl(nPt1))
bPt1 = sal_False; // Keine Anzeige
- if(bPt2 && rXPoly.IsControl(nPt2))
+ if(bPt2 && rXPoly.IsControl(nPt2))
bPt2 = sal_False; // von Bezierdaten
- if(bPt1)
+ if(bPt1)
{
Point aPt(aNow);
aPt -= rXPoly[nPt1];
-
+
sal_Int32 nLen(GetLen(aPt));
- aStr.AppendAscii(" l=");
-
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
+ aStr.AppendAscii(" l=");
+
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
aStr += aMetr;
-
+
sal_Int32 nWink(GetAngle(aPt));
- aStr += sal_Unicode(' ');
-
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
+ aStr += sal_Unicode(' ');
+
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
}
-
- if(bPt2)
+
+ if(bPt2)
{
- if(bPt1)
- aStr.AppendAscii(" / ");
- else
+ if(bPt1)
+ aStr.AppendAscii(" / ");
+ else
aStr.AppendAscii(" ");
Point aPt(aNow);
aPt -= rXPoly[nPt2];
-
+
sal_Int32 nLen(GetLen(aPt));
- aStr.AppendAscii("l=");
-
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
+ aStr.AppendAscii("l=");
+
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
aStr += aMetr;
-
+
sal_Int32 nWink(GetAngle(aPt));
- aStr += sal_Unicode(' ');
-
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
+ aStr += sal_Unicode(' ');
+
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
}
}
@@ -1162,15 +1160,15 @@ String
ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const
SdrDragStat& rDrag) const
{
- if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
- {
- DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData ist ungueltig");
+ if(!mpSdrPathDragData || !mpSdrPathDragData->bValid)
+ {
+ DBG_ERROR("ImpPathForDragAndCreate::MovDrag():
ImpSdrPathDragData is invalid");
return basegfx::B2DPolyPolygon();
}
XPolyPolygon aRetval;
- if(mpSdrPathDragData->IsMultiPointDrag())
+ if(mpSdrPathDragData->IsMultiPointDrag())
{
aRetval.Insert(mpSdrPathDragData->maMove);
}
@@ -1183,21 +1181,21 @@ basegfx::B2DPolyPolygon
ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
aRetval.Insert(aXPoly);
return aRetval.getB2DPolyPolygon();
}
- // Div. Daten lokal Kopieren fuer weniger Code und schnelleren
Zugriff
+ // Div. Daten lokal Kopieren für weniger Code und schnelleren
Zugriff
FASTBOOL bClosed =mpSdrPathDragData->bClosed ; //
geschlossenes Objekt?
sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ;
// Punktanzahl
sal_uInt16 nPnt =mpSdrPathDragData->nPnt ;
// Punktnummer innerhalb des Polygons
FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; //
Gedraggter Punkt ist der Anfangspunkt einer Polyline
FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; //
Gedraggter Punkt ist der Endpunkt einer Polyline
sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ;
// Index des vorherigen Punkts
- sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ;
// Index des naechsten Punkts
+ sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ;
// Index des nächsten Punkts
FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; //
Vorheriger Punkt ist Anfangspunkt einer Polyline
FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; //
Folgepunkt ist Endpunkt einer Polyline
sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ;
// Index des vorvorherigen Punkts
- sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ;
// Index des uebernaechsten Punkts
+ sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ;
// Index des übernächsten Punkts
FASTBOOL bControl =mpSdrPathDragData->bControl ; //
Punkt ist ein Kontrollpunkt
- //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stützpunkt
+ FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stützpunkt
FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; //
Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; //
Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
XPolygon aXPoly(mpSdrPathDragData->aXP);
@@ -1207,14 +1205,14 @@ basegfx::B2DPolyPolygon
ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
XPolygon aLine4(2);
if (bControl) {
aLine1[1]=mpSdrPathDragData->aXP[nPnt];
- if (bIsNextControl) { // bin ich Kontrollpunkt hinter
der Stuetzstelle?
+ if (bIsNextControl) { // bin ich Kontrollpunkt hinter
der Stützstelle?
aLine1[0]=mpSdrPathDragData->aXP[nPrevPnt];
aLine2[0]=mpSdrPathDragData->aXP[nNextNextPnt];
aLine2[1]=mpSdrPathDragData->aXP[nNextPnt];
if (mpSdrPathDragData->aXP.IsSmooth(nPrevPnt)
&& !bPrevIsBegPnt && mpSdrPathDragData->aXP.IsControl(nPrevPrevPnt)) {
aXPoly.Insert(0,rXP[mpSdrPathDragData->nPrevPrevPnt0-1],XPOLY_CONTROL);
aXPoly.Insert(0,rXP[mpSdrPathDragData->nPrevPrevPnt0-2],XPOLY_NORMAL);
- // Hebellienien fuer das
gegenueberliegende Kurvensegment
+ // Hebellienien für das
gegenüberliegende Kurvensegment
aLine3[0]=mpSdrPathDragData->aXP[nPrevPnt];
aLine3[1]=mpSdrPathDragData->aXP[nPrevPrevPnt];
aLine4[0]=rXP[mpSdrPathDragData->nPrevPrevPnt0-2];
@@ -1222,14 +1220,14 @@ basegfx::B2DPolyPolygon
ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
} else {
aXPoly.Remove(0,1);
}
- } else { // ansonsten bin ich Kontrollpunkt vor der
Stuetzstelle
+ } else { // ansonsten bin ich Kontrollpunkt vor der
Stützstelle
aLine1[0]=mpSdrPathDragData->aXP[nNextPnt];
aLine2[0]=mpSdrPathDragData->aXP[nPrevPrevPnt];
aLine2[1]=mpSdrPathDragData->aXP[nPrevPnt];
if (mpSdrPathDragData->aXP.IsSmooth(nNextPnt)
&& !bNextIsEndPnt && mpSdrPathDragData->aXP.IsControl(nNextNextPnt)) {
aXPoly.Insert(XPOLY_APPEND,rXP[mpSdrPathDragData->nNextNextPnt0+1],XPOLY_CONTROL);
aXPoly.Insert(XPOLY_APPEND,rXP[mpSdrPathDragData->nNextNextPnt0+2],XPOLY_NORMAL);
- // Hebellinien fuer das
gegenueberliegende Kurvensegment
+ // Hebellinien für das
gegenüberliegende Kurvensegment
aLine3[0]=mpSdrPathDragData->aXP[nNextPnt];
aLine3[1]=mpSdrPathDragData->aXP[nNextNextPnt];
aLine4[0]=rXP[mpSdrPathDragData->nNextNextPnt0+2];
@@ -1356,7 +1354,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat&
rStat)
if (bFreeHand) {
if (pU->nBezierStartPoint>nActPoint)
pU->nBezierStartPoint=nActPoint;
if (rStat.IsMouseDown() && nActPoint>0) {
- // keine aufeinanderfolgenden Punkte an zu Nahe
gelegenen Positionen zulassen
+ // keine aufeinanderfolgenden Punkte an zu nahe
gelegenen Positionen zulassen
long nMinDist=1;
if (pView!=NULL)
nMinDist=pView->GetFreeHandMinDistPix();
if (pOut!=NULL)
nMinDist=pOut->PixelToLogic(Size(nMinDist,0)).Width();
@@ -1489,7 +1487,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat&
rStat, SdrCreateCmd eCm
sal_uInt16 nPolyAnz=aPathPolygon.Count();
if (nPolyAnz!=0) {
- // den letzten Punkt ggf. wieder loeschen
+ // den letzten Punkt ggf. wieder löschen
if (eCmd==SDRCREATE_FORCEEND) {
XPolygon& rXP=aPathPolygon[nPolyAnz-1];
sal_uInt16 nPtAnz=rXP.GetPointCount();
@@ -1509,7 +1507,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat&
rStat, SdrCreateCmd eCm
nPolyNum--;
XPolygon& rXP=aPathPolygon[nPolyNum];
sal_uInt16 nPtAnz=rXP.GetPointCount();
- // Polygone mit zu wenig Punkten werden geloescht
+ // Polygone mit zu wenig Punkten werden gelöscht
if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) {
if (nPtAnz<2) aPathPolygon.Remove(nPolyNum);
}
@@ -1533,7 +1531,7 @@ FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat&
rStat)
sal_uInt16 nActPoint=rXPoly.GetPointCount();
if (nActPoint>0) {
nActPoint--;
- // Das letzte Stueck einer Bezierkurve wird erstmal zu
'ner Linie
+ // Das letzte Stück einer Bezierkurve wird erstmal zu
einer Linie
rXPoly.Remove(nActPoint,1);
if (nActPoint>=3 && rXPoly.IsControl(nActPoint-1)) {
// Beziersegment am Ende sollte zwar nicht
vorkommen, aber falls doch ...
@@ -1579,20 +1577,20 @@ basegfx::B2DPolyPolygon
ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr
basegfx::B2DPolyPolygon aRetval(aPathPolygon.getB2DPolyPolygon());
SdrView* pView = rDrag.GetView();
- if(pView && pView->IsUseIncompatiblePathCreateInterface())
+ if(pView && pView->IsUseIncompatiblePathCreateInterface())
return aRetval;
ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser();
basegfx::B2DPolygon aNewPolygon(aRetval.count() ?
aRetval.getB2DPolygon(aRetval.count() - 1L) : basegfx::B2DPolygon());
if(pU->IsFormFlag() && aNewPolygon.count() > 1L)
- {
+ {
// remove last segment and replace with current
- // do not forget to rescue the previous control point which
will be lost when
+ // do not forget to rescue the previous control point which
will be lost when
// the point it's associated with is removed
const sal_uInt32 nChangeIndex(aNewPolygon.count() - 2);
const basegfx::B2DPoint
aSavedPrevCtrlPoint(aNewPolygon.getPrevControlPoint(nChangeIndex));
-
+
aNewPolygon.remove(nChangeIndex, 2L);
aNewPolygon.append(pU->GetFormPoly().getB2DPolygon());
@@ -1621,12 +1619,12 @@ basegfx::B2DPolyPolygon
ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDr
basegfx::B2DPolyPolygon aRetval;
SdrView* pView = rDrag.GetView();
- if(pView && pView->IsUseIncompatiblePathCreateInterface())
+ if(pView && pView->IsUseIncompatiblePathCreateInterface())
return aRetval;
ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser();
- if(pU && pU->bBezier && rDrag.IsMouseDown())
+ if(pU && pU->bBezier && rDrag.IsMouseDown())
{
// no more XOR, no need for complicated helplines
basegfx::B2DPolygon aHelpline;
@@ -1710,7 +1708,7 @@ Rectangle ImpGetBoundRect(const basegfx::B2DPolyPolygon&
rPolyPolygon)
basegfx::B2DRange aRange(basegfx::tools::getRange(rPolyPolygon));
return Rectangle(
- FRound(aRange.getMinX()), FRound(aRange.getMinY()),
+ FRound(aRange.getMinX()), FRound(aRange.getMinY()),
FRound(aRange.getMaxX()), FRound(aRange.getMaxY()));
}
@@ -1741,19 +1739,19 @@ void SdrPathObj::ImpForceKind()
if (meKind==OBJ_PATHPLIN) meKind=OBJ_PLIN;
if (meKind==OBJ_PATHPOLY) meKind=OBJ_POLY;
- if(GetPathPoly().areControlPointsUsed())
+ if(GetPathPoly().areControlPointsUsed())
{
- switch (meKind)
+ switch (meKind)
{
case OBJ_LINE: meKind=OBJ_PATHLINE; break;
case OBJ_PLIN: meKind=OBJ_PATHLINE; break;
case OBJ_POLY: meKind=OBJ_PATHFILL; break;
default: break;
}
- }
- else
+ }
+ else
{
- switch (meKind)
+ switch (meKind)
{
case OBJ_PATHLINE: meKind=OBJ_PLIN; break;
case OBJ_FREELINE: meKind=OBJ_PLIN; break;
@@ -1768,7 +1766,7 @@ void SdrPathObj::ImpForceKind()
bClosedObj=IsClosed();
- if (meKind==OBJ_LINE)
+ if (meKind==OBJ_LINE)
{
ImpForceLineWink();
}
@@ -1800,7 +1798,7 @@ void SdrPathObj::ImpForceKind()
aRect = ImpGetBoundRect(GetPathPoly());
}
- // #116244# reset rotation
+ // #116244# reset rotation
aGeo.nDrehWink = aGeo.nShearWink = 0;
aGeo.RecalcSinCos(); aGeo.RecalcTan();
}
@@ -1813,28 +1811,28 @@ void SdrPathObj::ImpForceKind()
if((bool)IsClosed() != aCandidate.isClosed())
{
- // #i80213# really change polygon geometry; else e.g. the last
point which
- // needs to be identical with the first one will be missing when
opening
- // due to OBJ_PATH type
- if(aCandidate.isClosed())
- {
- basegfx::tools::openWithGeometryChange(aCandidate);
- }
- else
- {
- basegfx::tools::closeWithGeometryChange(aCandidate);
- }
+ // #i80213# really change polygon geometry; else e.g.
the last point which
+ // needs to be identical with the first one will be
missing when opening
+ // due to OBJ_PATH type
+ if(aCandidate.isClosed())
+ {
+
basegfx::tools::openWithGeometryChange(aCandidate);
+ }
+ else
+ {
+
basegfx::tools::closeWithGeometryChange(aCandidate);
+ }
- maPathPolygon.setB2DPolygon(a, aCandidate);
+ maPathPolygon.setB2DPolygon(a, aCandidate);
}
}
}
void SdrPathObj::ImpSetClosed(sal_Bool bClose)
{
- if(bClose)
+ if(bClose)
{
- switch (meKind)
+ switch (meKind)
{
case OBJ_LINE : meKind=OBJ_POLY; break;
case OBJ_PLIN : meKind=OBJ_POLY; break;
@@ -1843,12 +1841,12 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
case OBJ_SPLNLINE: meKind=OBJ_SPLNFILL; break;
default: break;
}
-
+
bClosedObj = sal_True;
- }
- else
+ }
+ else
{
- switch (meKind)
+ switch (meKind)
{
case OBJ_POLY : meKind=OBJ_PLIN; break;
case OBJ_PATHFILL: meKind=OBJ_PATHLINE; break;
@@ -1890,7 +1888,7 @@ void SdrPathObj::operator=(const SdrObject& rObj)
void SdrPathObj::TakeObjNameSingul(XubString& rName) const
{
- if(OBJ_LINE == meKind)
+ if(OBJ_LINE == meKind)
{
sal_uInt16 nId(STR_ObjNameSingulLINE);
@@ -1902,22 +1900,22 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName)
const
const Point aPoint0(FRound(aB2DPoint0.getX()),
FRound(aB2DPoint0.getY()));
const Point aPoint1(FRound(aB2DPoint0.getX()),
FRound(aB2DPoint0.getY()));
- if(aB2DPoint0 != aB2DPoint1)
+ if(aB2DPoint0 != aB2DPoint1)
{
- if(aB2DPoint0.getY() == aB2DPoint1.getY())
+ if(aB2DPoint0.getY() == aB2DPoint1.getY())
{
nId = STR_ObjNameSingulLINE_Hori;
- }
- else if(aB2DPoint0.getX() == aB2DPoint1.getX())
+ }
+ else if(aB2DPoint0.getX() == aB2DPoint1.getX())
{
nId = STR_ObjNameSingulLINE_Vert;
- }
- else
+ }
+ else
{
const double fDx(fabs(aB2DPoint0.getX()
- aB2DPoint1.getX()));
const double fDy(fabs(aB2DPoint0.getY()
- aB2DPoint1.getY()));
- if(fDx == fDy)
+ if(fDx == fDy)
{
nId =
STR_ObjNameSingulLINE_Diag;
}
@@ -1926,26 +1924,26 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName)
const
}
rName = ImpGetResStr(nId);
- }
- else if(OBJ_PLIN == meKind || OBJ_POLY == meKind)
+ }
+ else if(OBJ_PLIN == meKind || OBJ_POLY == meKind)
{
const sal_Bool bClosed(OBJ_POLY == meKind);
sal_uInt16 nId(0);
- if(mpDAC && mpDAC->IsCreating())
- {
- if(bClosed)
+ if(mpDAC && mpDAC->IsCreating())
+ {
+ if(bClosed)
{
nId = STR_ObjNameSingulPOLY;
- }
- else
+ }
+ else
{
nId = STR_ObjNameSingulPLIN;
}
rName = ImpGetResStr(nId);
- }
- else
+ }
+ else
{
// get point count
sal_uInt32 nPointCount(0L);
@@ -1956,28 +1954,28 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName)
const
nPointCount +=
GetPathPoly().getB2DPolygon(a).count();
}
- if(bClosed)
+ if(bClosed)
{
nId = STR_ObjNameSingulPOLY_PntAnz;
- }
- else
+ }
+ else
{
nId = STR_ObjNameSingulPLIN_PntAnz;
}
-
+
rName = ImpGetResStr(nId);
sal_uInt16 nPos(rName.SearchAscii("%2")); // #i96537#
- if(STRING_NOTFOUND != nPos)
+ if(STRING_NOTFOUND != nPos)
{
rName.Erase(nPos, 2);
rName.Insert(UniString::CreateFromInt32(nPointCount), nPos);
}
}
- }
- else
+ }
+ else
{
- switch (meKind)
+ switch (meKind)
{
case OBJ_PATHLINE:
rName=ImpGetResStr(STR_ObjNameSingulPATHLINE); break;
case OBJ_FREELINE:
rName=ImpGetResStr(STR_ObjNameSingulFREELINE); break;
@@ -2001,7 +1999,7 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName) const
void SdrPathObj::TakeObjNamePlural(XubString& rName) const
{
- switch(meKind)
+ switch(meKind)
{
case OBJ_LINE : rName=ImpGetResStr(STR_ObjNamePluralLINE
); break;
case OBJ_PLIN : rName=ImpGetResStr(STR_ObjNamePluralPLIN
); break;
@@ -2092,16 +2090,16 @@ sal_uInt32 SdrPathObj::GetPlusHdlCount(const SdrHdl&
rHdl) const
sal_uInt16 nPnt = (sal_uInt16)rHdl.GetPointNum();
sal_uInt16 nPolyNum = (sal_uInt16)rHdl.GetPolyNum();
- if(nPolyNum < aOldPathPolygon.Count())
+ if(nPolyNum < aOldPathPolygon.Count())
{
const XPolygon& rXPoly = aOldPathPolygon[nPolyNum];
sal_uInt16 nPntMax = rXPoly.GetPointCount();
- if (nPntMax>0)
+ if (nPntMax>0)
{
nPntMax--;
- if (nPnt<=nPntMax)
+ if (nPnt<=nPntMax)
{
- if (rXPoly.GetFlags(nPnt)!=XPOLY_CONTROL)
+ if (rXPoly.GetFlags(nPnt)!=XPOLY_CONTROL)
{
if (nPnt==0 && IsClosed()) nPnt=nPntMax;
if (nPnt>0 &&
rXPoly.GetFlags(nPnt-1)==XPOLY_CONTROL) nCnt++;
@@ -2123,29 +2121,29 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl,
sal_uInt32 nPlusNum) const
sal_uInt16 nPnt = (sal_uInt16)rHdl.GetPointNum();
sal_uInt16 nPolyNum = (sal_uInt16)rHdl.GetPolyNum();
- if (nPolyNum<aOldPathPolygon.Count())
+ if (nPolyNum<aOldPathPolygon.Count())
{
const XPolygon& rXPoly = aOldPathPolygon[nPolyNum];
sal_uInt16 nPntMax = rXPoly.GetPointCount();
- if (nPntMax>0)
+ if (nPntMax>0)
{
nPntMax--;
- if (nPnt<=nPntMax)
+ if (nPnt<=nPntMax)
{
pHdl=new SdrHdlBezWgt(&rHdl);
pHdl->SetPolyNum(rHdl.GetPolyNum());
if (nPnt==0 && IsClosed()) nPnt=nPntMax;
- if (nPnt>0 &&
rXPoly.GetFlags(nPnt-1)==XPOLY_CONTROL && nPlusNum==0)
+ if (nPnt>0 &&
rXPoly.GetFlags(nPnt-1)==XPOLY_CONTROL && nPlusNum==0)
{
pHdl->SetPos(rXPoly[nPnt-1]);
pHdl->SetPointNum(nPnt-1);
- }
- else
+ }
+ else
{
if (nPnt==nPntMax && IsClosed()) nPnt=0;
- if (nPnt<rXPoly.GetPointCount()-1 &&
rXPoly.GetFlags(nPnt+1)==XPOLY_CONTROL)
+ if (nPnt<rXPoly.GetPointCount()-1 &&
rXPoly.GetFlags(nPnt+1)==XPOLY_CONTROL)
{
pHdl->SetPos(rXPoly[nPnt+1]);
pHdl->SetPointNum(nPnt+1);
@@ -2170,24 +2168,24 @@ bool SdrPathObj::hasSpecialDrag() const
bool SdrPathObj::beginSpecialDrag(SdrDragStat& rDrag) const
{
ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this));
-
- return aDragAndCreate.beginPathDrag(rDrag);
+
+ return aDragAndCreate.beginPathDrag(rDrag);
}
bool SdrPathObj::applySpecialDrag(SdrDragStat& rDrag)
{
ImpPathForDragAndCreate aDragAndCreate(*this);
- bool bRetval(aDragAndCreate.beginPathDrag(rDrag));
+ bool bRetval(aDragAndCreate.beginPathDrag(rDrag));
- if(bRetval)
- {
- bRetval = aDragAndCreate.movePathDrag(rDrag);
- }
+ if(bRetval)
+ {
+ bRetval = aDragAndCreate.movePathDrag(rDrag);
+ }
- if(bRetval)
- {
- bRetval = aDragAndCreate.endPathDrag(rDrag);
- }
+ if(bRetval)
+ {
+ bRetval = aDragAndCreate.endPathDrag(rDrag);
+ }
if(bRetval)
{
@@ -2199,44 +2197,44 @@ bool SdrPathObj::applySpecialDrag(SdrDragStat& rDrag)
String SdrPathObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
- String aRetval;
+ String aRetval;
- if(mpDAC)
- {
- // #i103058# also get a comment when in creation
- const bool bCreateComment(rDrag.GetView() && this ==
rDrag.GetView()->GetCreateObj());
+ if(mpDAC)
+ {
+ // #i103058# also get a comment when in creation
+ const bool bCreateComment(rDrag.GetView() && this ==
rDrag.GetView()->GetCreateObj());
- if(bCreateComment)
- {
- aRetval = mpDAC->getSpecialDragComment(rDrag);
- }
- }
- else
- {
- ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this));
- bool bDidWork(aDragAndCreate.beginPathDrag((SdrDragStat&)rDrag));
+ if(bCreateComment)
+ {
+ aRetval = mpDAC->getSpecialDragComment(rDrag);
+ }
+ }
+ else
+ {
+ ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this));
+ bool
bDidWork(aDragAndCreate.beginPathDrag((SdrDragStat&)rDrag));
- if(bDidWork)
- {
- aRetval = aDragAndCreate.getSpecialDragComment(rDrag);
- }
- }
+ if(bDidWork)
+ {
+ aRetval = aDragAndCreate.getSpecialDragComment(rDrag);
+ }
+ }
- return aRetval;
+ return aRetval;
}
basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat&
rDrag) const
{
- basegfx::B2DPolyPolygon aRetval;
+ basegfx::B2DPolyPolygon aRetval;
ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this));
- bool bDidWork(aDragAndCreate.beginPathDrag((SdrDragStat&)rDrag));
+ bool bDidWork(aDragAndCreate.beginPathDrag((SdrDragStat&)rDrag));
- if(bDidWork)
- {
- aRetval = aDragAndCreate.getSpecialDragPoly(rDrag);
- }
+ if(bDidWork)
+ {
+ aRetval = aDragAndCreate.getSpecialDragPoly(rDrag);
+ }
- return aRetval;
+ return aRetval;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2313,7 +2311,7 @@ void SdrPathObj::BrkCreate(SdrDragStat& rStat)
basegfx::B2DPolyPolygon SdrPathObj::TakeCreatePoly(const SdrDragStat& rDrag)
const
{
basegfx::B2DPolyPolygon aRetval;
-
+
if(mpDAC)
{
aRetval = mpDAC->TakeObjectPolyPolygon(rDrag);
@@ -2355,7 +2353,7 @@ Pointer SdrPathObj::GetCreatePointer() const
void SdrPathObj::NbcMove(const Size& rSiz)
{
-
maPathPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(rSiz.Width(),
rSiz.Height()));
+
maPathPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(rSiz.Width(),
rSiz.Height()));
// #i19871# first modify locally, then call parent (to get correct
SnapRect with GluePoints)
SdrTextObj::NbcMove(rSiz);
@@ -2363,9 +2361,9 @@ void SdrPathObj::NbcMove(const Size& rSiz)
void SdrPathObj::NbcResize(const Point& rRef, const Fraction& xFact, const
Fraction& yFact)
{
- basegfx::B2DHomMatrix
aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRef.X(), -rRef.Y()));
+ basegfx::B2DHomMatrix
aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRef.X(), -rRef.Y()));
aTrans = basegfx::tools::createScaleTranslateB2DHomMatrix(
- double(xFact), double(yFact), rRef.X(), rRef.Y()) * aTrans;
+ double(xFact), double(yFact), rRef.X(), rRef.Y()) * aTrans;
maPathPolygon.transform(aTrans);
// #i19871# first modify locally, then call parent (to get correct
SnapRect with GluePoints)
@@ -2374,8 +2372,8 @@ void SdrPathObj::NbcResize(const Point& rRef, const
Fraction& xFact, const Fract
void SdrPathObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- // Thank JOE, the angles are defined mirrored to the mathematical meanings
- const basegfx::B2DHomMatrix
aTrans(basegfx::tools::createRotateAroundPoint(rRef.X(), rRef.Y(), -nWink *
nPi180));
+ // Thank JOE, the angles are defined mirrored to the mathematical
meanings
+ const basegfx::B2DHomMatrix
aTrans(basegfx::tools::createRotateAroundPoint(rRef.X(), rRef.Y(), -nWink *
nPi180));
maPathPolygon.transform(aTrans);
// #i19871# first modify locally, then call parent (to get correct
SnapRect with GluePoints)
@@ -2384,19 +2382,19 @@ void SdrPathObj::NbcRotate(const Point& rRef, long
nWink, double sn, double cs)
void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan,
FASTBOOL bVShear)
{
- basegfx::B2DHomMatrix
aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt.X(), -rRefPnt.Y()));
+ basegfx::B2DHomMatrix
aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt.X(), -rRefPnt.Y()));
- if(bVShear)
- {
- // Thank JOE, the angles are defined mirrored to the mathematical
meanings
- aTrans.shearY(-fTan);
- }
- else
- {
- aTrans.shearX(-fTan);
- }
+ if(bVShear)
+ {
+ // Thank JOE, the angles are defined mirrored to the
mathematical meanings
+ aTrans.shearY(-fTan);
+ }
+ else
+ {
+ aTrans.shearX(-fTan);
+ }
- aTrans.translate(rRefPnt.X(), rRefPnt.Y());
+ aTrans.translate(rRefPnt.X(), rRefPnt.Y());
maPathPolygon.transform(aTrans);
// #i19871# first modify locally, then call parent (to get correct
SnapRect with GluePoints)
@@ -2408,7 +2406,7 @@ void SdrPathObj::NbcMirror(const Point& rRefPnt1, const
Point& rRefPnt2)
const double fDiffX(rRefPnt2.X() - rRefPnt1.X());
const double fDiffY(rRefPnt2.Y() - rRefPnt1.Y());
const double fRot(atan2(fDiffY, fDiffX));
- basegfx::B2DHomMatrix
aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt1.X(),
-rRefPnt1.Y()));
+ basegfx::B2DHomMatrix
aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt1.X(),
-rRefPnt1.Y()));
aTrans.rotate(-fRot);
aTrans.scale(1.0, -1.0);
aTrans.rotate(fRot);
@@ -2424,11 +2422,11 @@ void SdrPathObj::NbcMirror(const Point& rRefPnt1, const
Point& rRefPnt2)
void SdrPathObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
{
- if(!aGeo.nDrehWink)
+ if(!aGeo.nDrehWink)
{
rRect = GetSnapRect();
- }
- else
+ }
+ else
{
XPolyPolygon aXPP(GetPathPoly());
RotateXPoly(aXPP,Point(),-aGeo.nSin,aGeo.nCos);
@@ -2454,12 +2452,12 @@ void SdrPathObj::NbcSetSnapRect(const Rectangle& rRect)
// #95736# Take RECT_EMPTY into account when calculating scale factors
long nMulX = (RECT_EMPTY == rRect.Right()) ? 0 : rRect.Right() -
rRect.Left();
-
+
long nDivX = aOld.Right() - aOld.Left();
-
+
// #95736# Take RECT_EMPTY into account when calculating scale factors
long nMulY = (RECT_EMPTY == rRect.Bottom()) ? 0 : rRect.Bottom() -
rRect.Top();
-
+
long nDivY = aOld.Bottom() - aOld.Top();
if ( nDivX == 0 ) { nMulX = 1; nDivX = 1; }
if ( nDivY == 0 ) { nMulY = 1; nDivY = 1; }
@@ -2477,7 +2475,7 @@ sal_uInt32 SdrPathObj::GetSnapPointCount() const
Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const
{
sal_uInt32 nPoly,nPnt;
- if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt,
nPoly, nPnt))
+ if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt,
nPoly, nPnt))
{
DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt
nicht vorhanden!");
}
@@ -2523,7 +2521,7 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt,
sal_uInt32 nHdlNum)
{
sal_uInt32 nPoly,nPnt;
- if(PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nHdlNum,
nPoly, nPnt))
+ if(PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nHdlNum,
nPoly, nPnt))
{
basegfx::B2DPolygon
aNewPolygon(GetPathPoly().getB2DPolygon(nPoly));
aNewPolygon.setB2DPoint(nPnt, basegfx::B2DPoint(rPnt.X(),
rPnt.Y()));
@@ -2538,7 +2536,7 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt,
sal_uInt32 nHdlNum)
if(GetPathPoly().count())
{
// #i10659# for SdrTextObj, keep aRect up to
date
- aRect = ImpGetBoundRect(GetPathPoly()); // fuer
SdrTextObj#
+ aRect = ImpGetBoundRect(GetPathPoly()); // for
SdrTextObj#
}
}
@@ -2550,11 +2548,11 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point&
rPos, sal_Bool bNewObj, sal_B
{
sal_uInt32 nNewHdl;
- if(bNewObj)
+ if(bNewObj)
{
nNewHdl = NbcInsPoint(0L, rPos, sal_True, bHideHim);
- }
- else
+ }
+ else
{
// look for smallest distance data
const basegfx::B2DPoint aTestPoint(rPos.X(), rPos.Y());
@@ -2573,7 +2571,7 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos,
sal_Bool bNewObj, sal_B
nNewHdl = NbcInsPoint(nPolyIndex, rPos, sal_False, bHideHim);
}
-
+
ImpForceKind();
return nNewHdl;
}
@@ -2582,7 +2580,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32
/*nHdlNum*/, const Point& rPos, sa
{
sal_uInt32 nNewHdl;
- if(bNewObj)
+ if(bNewObj)
{
basegfx::B2DPolygon aNewPoly;
const basegfx::B2DPoint aPoint(rPos.X(), rPos.Y());
@@ -2591,8 +2589,8 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32
/*nHdlNum*/, const Point& rPos, sa
maPathPolygon.append(aNewPoly);
SetRectsDirty();
nNewHdl = GetHdlCount();
- }
- else
+ }
+ else
{
// look for smallest distance data
const basegfx::B2DPoint aTestPoint(rPos.X(), rPos.Y());
@@ -2608,7 +2606,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32
/*nHdlNum*/, const Point& rPos, sa
{
// before first point
aCandidate.insert(0L, aTestPoint);
-
+
if(aCandidate.areControlPointsUsed())
{
if(aCandidate.isNextControlPointUsed(1))
@@ -2617,7 +2615,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32
/*nHdlNum*/, const Point& rPos, sa
aCandidate.setPrevControlPoint(1,
interpolate(aTestPoint, aCandidate.getB2DPoint(1), (2.0 / 3.0)));
}
}
-
+
nNewHdl = 0L;
}
else if(bAfter)
@@ -2699,7 +2697,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum,
sal_uInt32& rNewPt0Index)
const basegfx::B2DPolyPolygon aLocalPolyPolygon(GetPathPoly());
sal_uInt32 nPoly, nPnt;
- if(PolyPolygonEditor::GetRelativePolyPoint(aLocalPolyPolygon, nHdlNum,
nPoly, nPnt))
+ if(PolyPolygonEditor::GetRelativePolyPoint(aLocalPolyPolygon, nHdlNum,
nPoly, nPnt))
{
if(0L == nPoly)
{
@@ -2741,19 +2739,19 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum,
sal_uInt32& rNewPt0Index)
SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText)
const
{
- // #i89784# check for FontWork with activated HideContour
- const drawinglayer::attribute::SdrTextAttribute aText(
+ // #i89784# check for FontWork with activated HideContour
+ const drawinglayer::attribute::SdrTextAttribute aText(
drawinglayer::primitive2d::createNewSdrTextAttribute(GetObjectItemSet(),
*getText(0)));
- const bool bHideContour(
+ const bool bHideContour(
!aText.isDefault() &&
!aText.getSdrFormTextAttribute().isDefault() && aText.isHideContour());
- SdrObject* pRet = bHideContour ?
- 0 :
- ImpConvertMakeObj(GetPathPoly(), IsClosed(), bBezier);
+ SdrObject* pRet = bHideContour ?
+ 0 :
+ ImpConvertMakeObj(GetPathPoly(), IsClosed(), bBezier);
- SdrPathObj* pPath = PTR_CAST(SdrPathObj, pRet);
+ SdrPathObj* pPath = PTR_CAST(SdrPathObj, pRet);
- if(pPath)
+ if(pPath)
{
if(pPath->GetPathPoly().areControlPointsUsed())
{
@@ -2773,10 +2771,10 @@ SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool
bBezier, bool bAddText) const
}
}
- if(bAddText)
- {
- pRet = ImpConvertAddText(pRet, bBezier);
- }
+ if(bAddText)
+ {
+ pRet = ImpConvertAddText(pRet, bBezier);
+ }
return pRet;
}
@@ -2838,10 +2836,10 @@ void SdrPathObj::ToggleClosed() // long nOpenDistance)
SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
}
-// fuer friend class SdrPolyEditView auf einigen Compilern:
-void SdrPathObj::SetRectsDirty(sal_Bool bNotMyself)
-{
- SdrTextObj::SetRectsDirty(bNotMyself);
+// für friend class SdrPolyEditView auf einigen Compilern:
+void SdrPathObj::SetRectsDirty(sal_Bool bNotMyself)
+{
+ SdrTextObj::SetRectsDirty(bNotMyself);
}
ImpPathForDragAndCreate& SdrPathObj::impGetDAC() const
@@ -2865,9 +2863,9 @@ void SdrPathObj::impDeleteDAC() const
////////////////////////////////////////////////////////////////////////////////////////////////////
//
-// transformation interface for StarOfficeAPI. This implements support for
+// transformation interface for StarOfficeAPI. This implements support for
// homogen 3x3 matrices containing the transformation of the SdrObject. At the
-// moment it contains a shearX, rotation and translation, but for setting all
linear
+// moment it contains a shearX, rotation and translation, but for setting all
linear
// transforms like Scale, ShearX, ShearY, Rotate and Translate are supported.
//
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2908,7 +2906,7 @@ sal_Bool
SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::
fRotate = aGeo.nDrehWink * F_PI18000;
fShearX = aGeo.nShearWink * F_PI18000;
- // build mathematically correct (negative shear
and rotate) object transform
+ // build mathematically correct (negative shear
and rotate) object transform
// containing shear and rotate to extract
unsheared, unrotated polygon
basegfx::B2DHomMatrix aObjectMatrix;
aObjectMatrix.shearX(tan((36000 -
aGeo.nShearWink) * F_PI18000));
@@ -2920,7 +2918,7 @@ sal_Bool
SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::
rPolyPolygon.transform(aInvObjectMatrix);
// get range from unsheared, unrotated polygon
and extract scale and translate.
- // transform topLeft from it back to
transformed state to get original
+ // transform topLeft from it back to
transformed state to get original
// topLeft (rotation center)
// #i72287# use polygon without control points
for range calculation. Do not change rPolyPolygon
// itself, else this method will no longer
return the full polygon information (curve will
@@ -2928,9 +2926,9 @@ sal_Bool
SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::
const basegfx::B2DRange
aCorrectedRangeNoCurve(basegfx::tools::getRange(rPolyPolygon));
aTranslate = aObjectMatrix *
aCorrectedRangeNoCurve.getMinimum();
aScale = aCorrectedRangeNoCurve.getRange();
-
+
// define matrix for move polygon to zero point
- // #i112280# Added missing minus for Y-Translation
+ // #i112280# Added missing minus for
Y-Translation
aMoveToZeroMatrix.translate(-aCorrectedRangeNoCurve.getMinX(),
-aCorrectedRangeNoCurve.getMinY());
}
else
@@ -3002,8 +3000,8 @@ sal_Bool
SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::
return sal_True;
}
-// sets the base geometry of the object using infos contained in the homogen
3x3 matrix.
-// If it's an SdrPathObj it will use the provided geometry information. The
Polygon has
+// sets the base geometry of the object using infos contained in the homogen
3x3 matrix.
+// If it's an SdrPathObj it will use the provided geometry information. The
Polygon has
// to use (0,0) as upper left and will be scaled to the given size in the
matrix.
void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const
basegfx::B2DPolyPolygon& rPolyPolygon)
{
@@ -3046,7 +3044,7 @@ void SdrPathObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix& rMatrix, const b
// size
aScale.setX(ImplMMToTwips(aScale.getX()));
aScale.setY(ImplMMToTwips(aScale.getY()));
-
+
// polygon
basegfx::B2DHomMatrix aMMToTwips;
const double fFactorMMToTwips(72.0 / 127.0);
@@ -3093,19 +3091,19 @@ void SdrPathObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix& rMatrix, const b
if(!basegfx::fTools::equalZero(fRotate))
{
- // #i78696#
- // fRotate is matematically correct for linear transformations, so it's
- // the one to use for the geometry change
+ // #i78696#
+ // fRotate is mathematically correct for linear
transformations, so it's
+ // the one to use for the geometry change
aTransform.rotate(fRotate);
- // #i78696#
- // fRotate is matematically correct, but aGeoStat.nDrehWink is
- // mirrored -> mirror value here
+ // #i78696#
+ // fRotate is mathematically correct, but aGeoStat.nDrehWink is
+ // mirrored -> mirror value here
aGeo.nDrehWink = NormAngle360(FRound(-fRotate / F_PI18000));
aGeo.RecalcSinCos();
}
- if(!aTranslate.equalZero())
+ if(!aTranslate.equalZero())
{
// #i39529# absolute positioning, so get current position
(without control points (!))
const basegfx::B2DRange
aCurrentRange(basegfx::tools::getRange(aNewPolyPolygon));
@@ -3117,5 +3115,4 @@ void SdrPathObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix& rMatrix, const b
SetPathPoly(aNewPolyPolygon);
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
