[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc .gitignore
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Oct 17 07:49:48 PDT 2011
.gitignore | 2
binfilter/bf_svx/source/svdraw/makefile.mk | 1
binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx | 9 -
binfilter/bf_svx/source/svdraw/svx_svddrag.cxx | 77 ----------
binfilter/inc/bf_svx/svdcrtv.hxx | 4
binfilter/inc/bf_svx/svddrag.hxx | 178 -------------------------
binfilter/inc/bf_svx/svddrgv.hxx | 1
binfilter/inc/bf_svx/svdobj.hxx | 1
binfilter/inc/bf_svx/svdpntv.hxx | 2
binfilter/inc/bf_svx/svdshort.hxx | 1
10 files changed, 2 insertions(+), 274 deletions(-)
New commits:
commit e916bf90a681dcf3a69645f1344c47db1a30a9bb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 17 15:49:43 2011 +0100
can remove svddrag.*
diff --git a/.gitignore b/.gitignore
index e8d5fc6..0c1d61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,4 @@
/binfilter/unxios?.pro
/binfilter/unxand?
/binfilter/unxand?.pro
-
+.memdump
diff --git a/binfilter/bf_svx/source/svdraw/makefile.mk b/binfilter/bf_svx/source/svdraw/makefile.mk
index dffee90..fa10b8a 100644
--- a/binfilter/bf_svx/source/svdraw/makefile.mk
+++ b/binfilter/bf_svx/source/svdraw/makefile.mk
@@ -46,7 +46,6 @@ SLOFILES=\
$(SLO)$/svx_dialdll.obj \
$(SLO)$/svx_svdattr.obj \
$(SLO)$/svx_svdcrtv.obj \
- $(SLO)$/svx_svddrag.obj \
$(SLO)$/svx_svddrgv.obj \
$(SLO)$/svx_svdedtv.obj \
$(SLO)$/svx_svdedtv2.obj \
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
index 7a19e6f..49d21c8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
@@ -55,7 +55,6 @@ namespace binfilter {
/*N*/ bCurrentLibObjMoveNoResize=FALSE;
/*N*/ bCurrentLibObjSetDefAttr=FALSE;
/*N*/ bCurrentLibObjSetDefLayer=FALSE;
-/*N*/ pLibObjDragMeth=NULL;
/*N*/ pAktCreate=NULL;
/*N*/ pCreatePV=NULL;
/*N*/ bAutoTextEdit=FALSE;
@@ -124,14 +123,6 @@ namespace binfilter {
);
/*N*/ }
-/*N*/ BOOL SdrCreateView::IsEdgeTool() const
-/*N*/ {
-/*N*/ return eEditMode==SDREDITMODE_CREATE
- && pCurrentLibObj==NULL
- && nAktInvent==SdrInventor
- && (nAktIdent==OBJ_EDGE);
-/*N*/ }
-
/*N*/ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
/*N*/ {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx b/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
deleted file mode 100644
index 2e4a5ed..0000000
--- a/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "svddrag.hxx"
-namespace binfilter {
-
-/*N*/ void SdrDragStat::Clear(bool bLeaveOne)
-/*N*/ {
-/*N*/ void* pP=aPnts.First();
-/*N*/ while (pP!=NULL) {
-/*N*/ delete (Point*)pP;
-/*N*/ pP=aPnts.Next();
-/*N*/ }
-/*N*/ aPnts.Clear();
-/*N*/ if (bLeaveOne) {
-/*N*/ aPnts.Insert(new Point,CONTAINER_APPEND);
-/*N*/ }
-/*N*/ }
-
-/*N*/ void SdrDragStat::Reset()
-/*N*/ {
-/*N*/ pView=NULL;
-/*N*/ pPageView=NULL;
-/*N*/ bShown=FALSE;
-/*N*/ nMinMov=1;
-/*N*/ bMinMoved=FALSE;
-/*N*/ bHorFixed=FALSE;
-/*N*/ bVerFixed=FALSE;
-/*N*/ bWantNoSnap=FALSE;
-/*N*/ pHdl=NULL;
-/*N*/ bOrtho4=FALSE;
-/*N*/ bOrtho8=FALSE;
-/*N*/ pDragMethod=NULL;
-/*N*/ bEndDragChangesAttributes=FALSE;
-/*N*/ bEndDragChangesGeoAndAttributes=FALSE;
-/*N*/ bMouseIsUp=FALSE;
-/*N*/ Clear(TRUE);
-/*N*/ aActionRect=Rectangle();
-/*N*/ }
-
-
-
-
-
-
-
-
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/svdcrtv.hxx b/binfilter/inc/bf_svx/svdcrtv.hxx
index 26b6642..4c7394d 100644
--- a/binfilter/inc/bf_svx/svdcrtv.hxx
+++ b/binfilter/inc/bf_svx/svdcrtv.hxx
@@ -63,7 +63,6 @@ protected:
SdrObject* pAktCreate; // Aktuell in Erzeugung befindliches Objekt
SdrPageView* pCreatePV; // Hier wurde die Erzeugung gestartet
SdrObject* pCurrentLibObj;
- SdrDragMethod* pLibObjDragMeth;
Pointer aAktCreatePointer;
@@ -106,9 +105,6 @@ public:
// Feststellen, ob Textwerkzeug aktiviert
BOOL IsTextTool() const;
- // Feststellen, ob Objektverbinderwerkzeug aktiviert
- BOOL IsEdgeTool() const;
-
// Feststellen, ob Bemassungswerkzeug aktiviert
void SetCurrentObj(UINT16 nIdent, UINT32 nInvent=SdrInventor);
diff --git a/binfilter/inc/bf_svx/svddrag.hxx b/binfilter/inc/bf_svx/svddrag.hxx
deleted file mode 100644
index 3ec5ddc..0000000
--- a/binfilter/inc/bf_svx/svddrag.hxx
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVDDRAG_HXX
-#define _SVDDRAG_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include <tools/contnr.hxx>
-
-#include <tools/gen.hxx>
-
-namespace binfilter {
-// Statushalter fuer objektspeziefisches Draggen. Damit das Model
-// Statusfrei bleibt werden die Statusdaten an der View gehalten
-// und dem Objekt zu gegebener Zeit als Parameter uebergeben.
-// Ausserdem auch Statushalter fuer den Vorgang der Interaktiven
-// Objekterzeugung. pHdl ist in diesem Fall NULL.
-class SdrHdl;
-class SdrView;
-class SdrPageView;
-class SdrDragMethod;
-class SdrDragStat {
-protected:
- SdrHdl* pHdl; // Der Handle an dem der User zottelt
- SdrView* pView;
- SdrPageView* pPageView;
- Container aPnts; // Alle bisherigen Punkte: [0]=Start, [Count()-2]=Prev
- Point aRef1; // Referenzpunkt: Resize-Fixpunkt, (Drehachse,
- Point aRef2; // Spiegelachse, ...)
- Point aPos0; // Position beim letzten Event
- Point aRealPos0; // Position beim letzten Event
- Point aRealNow; // Aktuelle Dragposition ohne Snap, Ortho und Limit
- Point aRealLast; // RealPos des letzten Punkts (fuer MinMoved)
- Rectangle aActionRect;
-
- // Reserve fuer kompatible Erweiterungen, die sonst inkompatibel wuerden.
- Point aReservePoint1;
- Point aReservePoint2;
- Point aReservePoint3;
- Point aReservePoint4;
- Rectangle aReserveRect1;
- Rectangle aReserveRect2;
- bool bEndDragChangesAttributes;
- bool bEndDragChangesGeoAndAttributes;
- bool bMouseIsUp;
- bool aReserveBool3;
- bool aReserveBool4;
- long aReserveLong1;
- long aReserveLong2;
- long aReserveLong3;
- long aReserveLong4;
- void* aReservePtr1;
- void* aReservePtr2;
- void* aReservePtr3;
- void* aReservePtr4;
-
- bool bShown; // Xor sichrbar?
- USHORT nMinMov; // Soviel muss erstmal minimal bewegt werden
- bool bMinMoved; // MinMove durchbrochen?
-
- bool bHorFixed; // nur Vertikal draggen
- bool bVerFixed; // nur Horizontal draggen
- bool bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
- // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben.
- bool bOrtho4;
- bool bOrtho8;
-
- SdrDragMethod* pDragMethod;
-
-protected:
- void Clear(bool bLeaveOne);
- Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); }
-public:
- SdrDragStat(): aPnts(1024,16,16) { Reset(); }
- ~SdrDragStat() { Clear(FALSE); }
- void Reset();
- SdrView* GetView() const { return pView; }
- void SetView(SdrView* pV) { pView=pV; }
- SdrPageView* GetPageView() const { return pPageView; }
- void SetPageView(SdrPageView* pPV) { pPageView=pPV; }
- const Point& GetPoint(ULONG nNum) const { return *((Point*)aPnts.GetObject(nNum)); }
- ULONG GetPointAnz() const { return aPnts.Count(); }
- const Point& GetStart() const { return GetPoint(0); }
- Point& Start() { return Pnt(0); }
- const Point& GetPrev() const { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
- Point& Prev() { return Pnt(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
- const Point& GetPos0() const { return aPos0; }
- Point& Pos0() { return aPos0; }
- const Point& GetNow() const { return GetPoint(GetPointAnz()-1); }
- Point& Now() { return Pnt(GetPointAnz()-1); }
- const Point& GetRealNow() const { return aRealNow; }
- Point& RealNow() { return aRealNow; }
- const Point& GetRef1() const { return aRef1; }
- Point& Ref1() { return aRef1; }
- const Point& GetRef2() const { return aRef2; }
- Point& Ref2() { return aRef2; }
- const SdrHdl* GetHdl() const { return pHdl; }
- void SetHdl(SdrHdl* pH) { pHdl=pH; }
- bool IsShown() const { return bShown; }
- void SetShown(bool bOn) { bShown=bOn; }
-
- bool IsMinMoved() const { return bMinMoved; }
- void SetMinMoved() { bMinMoved=TRUE; }
- void ResetMinMoved() { bMinMoved=FALSE; }
- void SetMinMove(USHORT nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
- USHORT GetMinMove() const { return nMinMov; }
-
- bool IsHorFixed() const { return bHorFixed; }
- void SetHorFixed(bool bOn) { bHorFixed=bOn; }
- bool IsVerFixed() const { return bVerFixed; }
- void SetVerFixed(bool bOn) { bVerFixed=bOn; }
-
- // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!"
- // z.B. fuer den Winkel des Kreisbogen...
- bool IsNoSnap() const { return bWantNoSnap; }
- void SetNoSnap(bool bOn=TRUE) { bWantNoSnap=bOn; }
-
- // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins)
- // sinnvoll auf ihm angewendet werden kann.
- // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt)
- bool IsOrtho4Possible() const { return bOrtho4; }
- void SetOrtho4Possible(bool bOn=TRUE) { bOrtho4=bOn; }
- // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien)
- bool IsOrtho8Possible() const { return bOrtho8; }
- void SetOrtho8Possible(bool bOn=TRUE) { bOrtho8=bOn; }
-
- // Wird vom gedraggten Objekt gesetzt
- bool IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; }
- void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; }
- bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; }
- void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; }
-
- // Wird von der View gesetzt und kann vom Obj ausgewertet werden
- bool IsMouseDown() const { return !bMouseIsUp; }
- void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; }
-
- long GetDX() const { return GetNow().X()-GetPrev().X(); }
- long GetDY() const { return GetNow().Y()-GetPrev().Y(); }
-
- SdrDragMethod* GetDragMethod() const { return pDragMethod; }
- void SetDragMethod(SdrDragMethod* pMth) { pDragMethod=pMth; }
-
- const Rectangle& GetActionRect() const { return aActionRect; }
- void SetActionRect(const Rectangle& rR) { aActionRect=rR; }
-
- // Unter Beruecksichtigung von 1stPointAsCenter
-};
-
-}//end of namespace binfilter
-#endif //_SVDDRAG_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/svddrgv.hxx b/binfilter/inc/bf_svx/svddrgv.hxx
index b5866a4..0ca649b 100644
--- a/binfilter/inc/bf_svx/svddrgv.hxx
+++ b/binfilter/inc/bf_svx/svddrgv.hxx
@@ -43,7 +43,6 @@ namespace binfilter {
class SdrDragView: public SdrExchangeView
{
friend class SdrPageView;
- friend class SdrDragMethod;
protected:
unsigned bMarkedHitMovesAlways : 1; // Persistent
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index e015b38..14d918a 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -64,7 +64,6 @@ class SfxPoolItem;
class ExtOutputDevice;
class OutlinerParaObject;
class SdrOutliner;
-class SdrDragStat;
class SdrHdl;
class SdrHdlList;
class SdrItemPool;
diff --git a/binfilter/inc/bf_svx/svdpntv.hxx b/binfilter/inc/bf_svx/svdpntv.hxx
index 8db4978..4ccfec3 100644
--- a/binfilter/inc/bf_svx/svdpntv.hxx
+++ b/binfilter/inc/bf_svx/svdpntv.hxx
@@ -39,7 +39,6 @@
#include <bf_svtools/smplhint.hxx>
#include <bf_svtools/itemset.hxx>
#include <bf_svtools/undo.hxx>
-#include <bf_svx/svddrag.hxx>
#include <bf_svx/svdlayer.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
@@ -70,6 +69,7 @@ class SdrIOHeader;
class SdrOle2Obj;
class ImpMasterBmp;
class SdrObject;
+class SdrPageView;
//************************************************************
// Defines for cache modes
diff --git a/binfilter/inc/bf_svx/svdshort.hxx b/binfilter/inc/bf_svx/svdshort.hxx
index 8d90fce..7c2d18c 100644
--- a/binfilter/inc/bf_svx/svdshort.hxx
+++ b/binfilter/inc/bf_svx/svdshort.hxx
@@ -87,7 +87,6 @@ namespace binfilter {
#define SdrMarkView SdrMV
#define SdrPathObj SdrBO
#define SdrPageView SdrPV
-#define SdrDragStat SdrDS
#define SdrVirtObj SdrVO
#define SdrObject SdrO
More information about the Libreoffice-commits
mailing list