You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/05/02 16:47:44 UTC
svn commit: r1333067 [2/3] - in /incubator/ooo/branches/alg/aw080/main:
basctl/source/dlged/ chart2/source/controller/drawinglayer/
chart2/source/controller/main/ cui/source/tabpages/
drawinglayer/source/processor3d/ filter/source/msfilter/ reportdesig...
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx Wed May 2 14:47:40 2012
@@ -1554,13 +1554,6 @@ private:
aInfo.mnDrawMode = DRAWMODE_DEFAULT;
}
- // check if selected range of pages contains transparent objects
- /*
- const bool bPrintPages (bPrintNotes || bPrintDraw || bPrintHandout);
- const bool bContainsTransparency (bPrintPages && ContainsTransparency());
- if (pPrinter->InitJob (mrBase.GetWindow(), !bIsAPI && bContainsTransparency))
- */
-
if (mpOptions->IsDraw())
PrepareStdOrNotes(PK_STANDARD, aInfo);
if (mpOptions->IsNotes())
@@ -1632,11 +1625,10 @@ private:
while( iter != aAreas.end() )
{
basegfx::B2DRange aRange(*iter++);
-
- pHandout->InsertObjectToSdrObjList(
- new SdrPageObj(
- rModel,
- basegfx::tools::createScaleTranslateB2DHomMatrix(aRange.getRange(), aRange.getMinimum())));
+ SdrPageObj* pNewSdrPageObj = new SdrPageObj(
+ rModel,
+ basegfx::tools::createScaleTranslateB2DHomMatrix(aRange.getRange(), aRange.getMinimum()));
+ pHandout->InsertObjectToSdrObjList(*pNewSdrPageObj);
if( bDrawLines && (iter != aAreas.end()) )
{
@@ -1661,7 +1653,7 @@ private:
pPathObj->SetMergedItem(XLineStyleItem(XLINE_SOLID));
pPathObj->SetMergedItem(XLineColorItem(String(), Color(COL_BLACK)));
- pHandout->InsertObjectToSdrObjList( pPathObj );
+ pHandout->InsertObjectToSdrObjList(*pPathObj);
}
}
}
@@ -1669,35 +1661,6 @@ private:
- /** Detect whether any of the slides that are to be printed contains
- partially transparent or translucent shapes.
- */
- bool ContainsTransparency (const PrintInfo& rInfo) const
- {
- // const bool bPrintExcluded (mpOptions->IsPrintExcluded());
- bool bContainsTransparency = false;
-
- for (sal_uInt16
- nIndex=0,
- nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
- nIndex < nCount && !bContainsTransparency;
- ++nIndex)
- {
- SdPage* pPage = GetFilteredPage(nIndex, PK_STANDARD, rInfo);
- if (pPage == NULL)
- continue;
-
- bContainsTransparency = pPage->HasTransparentObjects();
- if ( ! bContainsTransparency && pPage->TRG_HasMasterPage())
- bContainsTransparency = pPage->TRG_GetMasterPage().HasTransparentObjects();
- }
-
- return bContainsTransparency;
- }
-
-
-
-
/** Detect whether the specified slide is to be printed.
@return
When the slide is not to be printed then <NULL/> is returned.
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx Wed May 2 14:47:40 2012
@@ -830,7 +830,7 @@ ErrCode DrawViewShell::DoVerb(long nVerb
aName,
aRect );
- pSdrPageView->GetCurrentObjectList()->InsertObjectToSdrObjList( pSdrOle2Obj );
+ pSdrPageView->GetCurrentObjectList()->InsertObjectToSdrObjList(*pSdrOle2Obj);
mpDrawView->ReplaceObjectAtView( *pSelected, *pTempSdrGrafObj );
pSdrOle2Obj->SetLogicRect(aRect);
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews8.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews8.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews8.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews8.cxx Wed May 2 14:47:40 2012
@@ -296,7 +296,7 @@ void DrawViewShell::FuTemp01(SfxRequest&
case SID_CAPTUREPOINT:
{
// negative Werte um Aufruf aus Menue zu signalisieren
- maMousePos = basegfx::B2DPoint(-1.0, -1.0); // TTTT: is this hack needed? Wouldn't a bool be better?
+ maMousePos = basegfx::B2DPoint(-1.0, -1.0);
}
case SID_SET_SNAPITEM:
{
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview2.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview2.cxx Wed May 2 14:47:40 2012
@@ -173,10 +173,10 @@ struct SdNavigatorDropEvent : public Exe
if( mpDocSh )
aObjDesc.maDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass();
- const Rectangle aMarkRect( getMarkedObjectSnapRect() );
- aObjDesc.maSize = aMarkRect.GetSize();
+ const basegfx::B2DRange aAllRange(getMarkedObjectSnapRange());
+ aObjDesc.maSize = Size(basegfx::fround(aAllRange.getWidth()), basegfx::fround(aAllRange.getHeight()));
- pTransferable->SetStartPos( basegfx::B2DPoint(aMarkRect.Left(), aMarkRect.Top()) );
+ pTransferable->SetStartPos(aAllRange.getMinimum());
pTransferable->SetObjectDescriptor( aObjDesc );
pTransferable->CopyToClipboard( mpViewSh->GetActiveWindow() );
@@ -224,7 +224,8 @@ struct SdNavigatorDropEvent : public Exe
mpDocSh->FillTransferableObjectDescriptor( aObjDesc );
}
- aObjDesc.maSize = getMarkedObjectSnapRect().GetSize();
+ const basegfx::B2DRange aAllRange(getMarkedObjectSnapRange());
+ aObjDesc.maSize = Size(basegfx::fround(aAllRange.getWidth()), basegfx::fround(aAllRange.getHeight()));
aObjDesc.maDragStartPos = rDragPos;
aObjDesc.maDisplayName = aDisplayName;
aObjDesc.mbCanLink = false;
@@ -253,10 +254,10 @@ struct SdNavigatorDropEvent : public Exe
mpDocSh->FillTransferableObjectDescriptor( aObjDesc );
}
- const Rectangle aMarkRect( getMarkedObjectSnapRect() );
- aObjDesc.maSize = aMarkRect.GetSize();
+ const basegfx::B2DRange aAllRange(getMarkedObjectSnapRange());
+ aObjDesc.maSize = Size(basegfx::fround(aAllRange.getWidth()), basegfx::fround(aAllRange.getHeight()));
- pTransferable->SetStartPos( basegfx::B2DPoint(aMarkRect.Left(), aMarkRect.Top()) );
+ pTransferable->SetStartPos(aAllRange.getMinimum());
pTransferable->SetObjectDescriptor( aObjDesc );
pTransferable->CopyToSelection( &rWindow );
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx Wed May 2 14:47:40 2012
@@ -496,7 +496,7 @@ bool View::InsertData( const Transferabl
sdr::legacy::transformSdrObject(*pObj, aTransform);
}
- pPage->InsertObjectToSdrObjList(pObj);
+ pPage->InsertObjectToSdrObjList(*pObj);
if( IsUndoEnabled() )
{
@@ -722,7 +722,7 @@ bool View::InsertData( const Transferabl
if( bUndo )
BegUndo( String( SdResId(STR_UNDO_DRAGDROP ) ) );
- rWorkPage.InsertObjectToSdrObjList( pNewObj );
+ rWorkPage.InsertObjectToSdrObjList(*pNewObj);
if( bUndo )
{
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx Wed May 2 14:47:40 2012
@@ -253,7 +253,7 @@ SdrGrafObj* View::InsertGraphic( const G
BegUndo(String(SdResId(STR_UNDO_DRAGDROP)));
SdrPage& rP = pPV->getSdrPageFromSdrPageView();
- rP.InsertObjectToSdrObjList(pNewGrafObj);
+ rP.InsertObjectToSdrObjList(*pNewGrafObj);
if( bUndo )
{
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/fmpage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/fmpage.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/fmpage.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/fmpage.hxx Wed May 2 14:47:40 2012
@@ -58,7 +58,7 @@ public:
FmFormPage(FmFormModel& rModel, StarBASIC*, bool bMasterPage = false);
~FmFormPage();
- virtual void InsertObjectToSdrObjList(SdrObject* pObj, sal_uInt32 nPos = CONTAINER_APPEND);
+ virtual void InsertObjectToSdrObjList(SdrObject& rObj, sal_uInt32 nPos = CONTAINER_APPEND);
virtual SdrObject* RemoveObjectFromSdrObjList(sal_uInt32 nObjNum);
// Zugriff auf alle Formulare
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx Wed May 2 14:47:40 2012
@@ -30,6 +30,7 @@
// global DRawItemPool vor various usages, mostly UNO API implementations
// which need an ItemPool which lives independent from DrawModels and
// DrawObjects
+// TTTT: Needed at all?
SVX_DLLPUBLIC void FreeGlobalDrawObjectItemPool();
SVX_DLLPUBLIC SdrItemPool& GetGlobalDrawObjectItemPool();
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx Wed May 2 14:47:40 2012
@@ -94,7 +94,7 @@ private:
bool mbTfHasChanged : 1;
bool mbIsSelected : 1;
- virtual void NewObjectInserted(const E3dObject* p3DObj);
+ virtual void NewObjectInserted(const E3dObject& r3DObj);
virtual basegfx::B3DRange RecalcBoundVolume() const;
// E3dObject is only a helper class (for E3DScene and E3DCompoundObject)
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/scene3d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/scene3d.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/scene3d.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/scene3d.hxx Wed May 2 14:47:40 2012
@@ -81,7 +81,7 @@ protected:
// Flag to determine if only selected objects should be drawn
bool bDrawOnlySelected : 1;
- virtual void NewObjectInserted(const E3dObject* p3DObj);
+ virtual void NewObjectInserted(const E3dObject& r3DObj);
void RebuildLists();
@@ -123,8 +123,8 @@ public:
virtual void SetTransformChanged();
// 3D-Objekt in die Gruppe einfuegen; Eigentumsuebergang!
- virtual void Insert3DObj(E3dObject* p3DObj);
- void Remove3DObj(E3dObject* p3DObj);
+ virtual void Insert3DObj(E3dObject& r3DObj);
+ void Remove3DObj(E3dObject& r3DObj);
virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx Wed May 2 14:47:40 2012
@@ -68,7 +68,6 @@ enum SdrMergeMode {
#define SDRINSERT_ADDMARK 0x0002 /* Das Obj wird zu einer ggf. bereits bestehenden Selektion hinzumarkiert */
#define SDRINSERT_SETDEFATTR 0x0004 /* Die aktuellen Attribute (+StyleSheet) werden dem Obj zugewiesen */
#define SDRINSERT_SETDEFLAYER 0x0008 /* Der aktuelle Layer wird dem Obj zugewiesen */
-#define SDRINSERT_NOBROADCAST 0x0010 /* Einfuegen mit InsertObjectToSdrObjList() fuer SolidDragging */
////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdhdl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdhdl.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdhdl.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdhdl.hxx Wed May 2 14:47:40 2012
@@ -295,7 +295,7 @@ protected:
bool mbFineHandles : 1;
public:
- SdrHdlList(SdrMarkView& rV); // TTTT: use reference?
+ SdrHdlList(SdrMarkView& rV);
~SdrHdlList();
void Clear();
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx Wed May 2 14:47:40 2012
@@ -129,7 +129,6 @@ private:
SdrHintKind meSdrHint;
const SdrPage* mpSdrPage;
const SdrObject* mpSdrObject;
- const basegfx::B2DRange maSdrLastBound;
public:
// constructor
@@ -140,14 +139,12 @@ public:
SdrHintKind eSdrHintKind = HINT_PAGEORDERCHG);
SdrBaseHint(
const SdrObject& rSdrObject,
- SdrHintKind eSdrHintKind = HINT_OBJCHG_RESIZE,
- const SdrView* pSdrView = 0); // TTTT: need to remove default and search
+ SdrHintKind eSdrHintKind = HINT_OBJCHG_RESIZE);
// data read access
const SdrHintKind GetSdrHintKind() const { return meSdrHint; }
const SdrPage* GetSdrHintPage() const { return mpSdrPage; }
const SdrObject* GetSdrHintObject() const { return mpSdrObject; }
- const basegfx::B2DRange& GetSdrHintLastBound() const { return maSdrLastBound; }
};
////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmrkv.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmrkv.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmrkv.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmrkv.hxx Wed May 2 14:47:40 2012
@@ -64,23 +64,23 @@ class ImplMarkingOverlay;
enum SdrHitKind // usage checked
{
SDRHIT_NONE, // Nicht getroffen, Schnaps gesoffen
- SDRHIT_OBJECT, // Treffer versenkt
- SDRHIT_HANDLE, // Markierungshandle
- SDRHIT_HELPLINE, // Hilfslinie
- SDRHIT_GLUEPOINT, // Klebepunkt
- SDRHIT_TEXTEDIT, // Offene OutlinerView getroffen
- SDRHIT_TEXTEDITOBJ, // Objekt fuer SdrBeginTextEdit (Textbereich)
- SDRHIT_URLFIELD, // Feld im TextObj getroffen (wird gerade nicht editiert)
- SDRHIT_MACRO, // Objekt fuer BegMacroObj
- SDRHIT_MARKEDOBJECT, // Markiertes Objekt (z.B. zum Draggen)
- SDRHIT_UNMARKEDOBJECT, // nichtmarkiertes Objekt (z.B. zum markieren)
+ SDRHIT_OBJECT, // Treffer versenkt
+ SDRHIT_HANDLE, // Markierungshandle
+ SDRHIT_HELPLINE, // Hilfslinie
+ SDRHIT_GLUEPOINT, // Klebepunkt
+ SDRHIT_TEXTEDIT, // Offene OutlinerView getroffen
+ SDRHIT_TEXTEDITOBJ, // Objekt fuer SdrBeginTextEdit (Textbereich)
+ SDRHIT_URLFIELD, // Feld im TextObj getroffen (wird gerade nicht editiert)
+ SDRHIT_MACRO, // Objekt fuer BegMacroObj
+ SDRHIT_MARKEDOBJECT, // Markiertes Objekt (z.B. zum Draggen)
+ SDRHIT_UNMARKEDOBJECT, // nichtmarkiertes Objekt (z.B. zum markieren)
SDRHIT_CELL // hit on a cell inside a table shape (outside of the cells text area)
};
enum SdrViewEditMode // usage checked
{
SDREDITMODE_EDIT, // Auch bekannt aus Pfeil- oder Zeigermodus
- SDREDITMODE_CREATE, // Objekterzeugungswerkzeug
+ SDREDITMODE_CREATE, // Objekterzeugungswerkzeug
SDREDITMODE_GLUEPOINTEDIT // Klebepunkteditiermodus
};
@@ -409,7 +409,6 @@ public:
bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); }
const basegfx::B2DRange& getMarkedObjectSnapRange() const;
- Rectangle getMarkedObjectSnapRect() const; // TTTT: candidate for replacement
const basegfx::B2DRange& getMarkedPointRange() const;
const basegfx::B2DRange& getMarkedGluePointRange() const;
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx Wed May 2 14:47:40 2012
@@ -85,36 +85,36 @@ class SdrEdgeObj;
enum SdrObjKind
{
- OBJ_NONE = 0 , // Abstraktes Objekt (SdrObject)
- OBJ_GRUP , // Objektgruppe
- OBJ_LINE , // Strecke
- OBJ_RECT , // Rechteck ww. mit runden Ecken
- OBJ_CIRC , // Kreis, Ellipse
- OBJ_SECT , // Kreissektor
- OBJ_CARC , // Kreisbogen
- OBJ_CCUT , // Kreisabschnitt
- OBJ_POLY , // Polygon, PolyPolygon
- OBJ_PLIN , // PolyLine
- OBJ_PATHLINE , // Offene Bezierkurve
- OBJ_PATHFILL , // Geschlossene Bezierkurve
- OBJ_FREELINE , // Offene Freihandlinie
- OBJ_FREEFILL , // Geschlossene Freihandlinie
- OBJ_TEXT , // Textobjekt
- OBJ_TITLETEXT , // Titeltext. Spezial-Textobjekt fuer StarDraw
- OBJ_OUTLINETEXT, // OutlineText. Spezial-Textobjekt fuer StarDraw
- OBJ_GRAF , // Fremdgrafik - (StarView Graphic)
- OBJ_OLE2 , // OLE-Objekt
- OBJ_EDGE , // Verbindungsobjekt fuer Konnektoren
- OBJ_CAPTION , // Legendenobjekt
- OBJ_PATHPOLY , // Polygon/PolyPolygon dargestellt durch SdrPathObj
- OBJ_PATHPLIN , // Polyline dargestellt durch SdrPathObj
- OBJ_PAGE , // Objekt, das eine SdrPage darstellt
- OBJ_MEASURE , // Bemassungsobjekt
- OBJ_FRAME , // staendig aktives OLE (PlugIn-Frame oder sowas)
- OBJ_UNO , // Universal Network Object im SvDraw-Obj eingepackt
- OBJ_CUSTOMSHAPE, // CustomShape
- OBJ_MEDIA , // Media shape
- OBJ_TABLE , // Table
+ OBJ_NONE = 0 , // Abstraktes Objekt (SdrObject)
+ OBJ_GRUP , // Objektgruppe
+ OBJ_LINE , // OBJ_POLY Strecke
+ OBJ_RECT , // Rechteck ww. mit runden Ecken
+ OBJ_CIRC , // Kreis, Ellipse
+ OBJ_SECT , // OBJ_CIRC Kreissektor
+ OBJ_CARC , // OBJ_CIRC Kreisbogen
+ OBJ_CCUT , // OBJ_CIRC Kreisabschnitt
+ OBJ_POLY , // Polygon, PolyPolygon
+ OBJ_PLIN , // OBJ_POLY PolyLine
+ OBJ_PATHLINE , // OBJ_POLY Offene Bezierkurve
+ OBJ_PATHFILL , // OBJ_POLY Geschlossene Bezierkurve
+ OBJ_FREELINE , // Offene Freihandlinie
+ OBJ_FREEFILL , // Geschlossene Freihandlinie
+ OBJ_TEXT , // Textobjekt
+ OBJ_TITLETEXT , // Titeltext. Spezial-Textobjekt fuer StarDraw
+ OBJ_OUTLINETEXT, // OutlineText. Spezial-Textobjekt fuer StarDraw
+ OBJ_GRAF , // Fremdgrafik - (StarView Graphic)
+ OBJ_OLE2 , // OLE-Objekt
+ OBJ_EDGE , // Verbindungsobjekt fuer Konnektoren
+ OBJ_CAPTION , // Legendenobjekt
+ OBJ_PATHPOLY , // Polygon/PolyPolygon dargestellt durch SdrPathObj
+ OBJ_PATHPLIN , // Polyline dargestellt durch SdrPathObj
+ OBJ_PAGE , // Objekt, das eine SdrPage darstellt
+ OBJ_MEASURE , // Bemassungsobjekt
+ OBJ_FRAME , // staendig aktives OLE (PlugIn-Frame oder sowas)
+ OBJ_UNO , // Universal Network Object im SvDraw-Obj eingepackt
+ OBJ_CUSTOMSHAPE, // CustomShape
+ OBJ_MEDIA , // Media shape
+ OBJ_TABLE , // Table
OBJ_MAXI
};
@@ -138,7 +138,6 @@ public:
basegfx::B2DPoint maPos;
basegfx::B2DPoint maDownPos;
OutputDevice* mpOut;
-// const SetOfByte* mpVisiLayer;
const SdrView* mpSdrView;
double mfTol;
@@ -148,7 +147,6 @@ public:
public:
SdrObjMacroHitRec()
: mpOut(0),
-// mpVisiLayer(0),
mpSdrView(0),
mfTol(0.0),
mbDown(false)
@@ -211,11 +209,10 @@ public:
class SVX_DLLPUBLIC SdrObjGeoData
{
public:
-// basegfx::B2DRange maObjectRange;
basegfx::B2DHomMatrix maSdrObjectTransformation;
basegfx::B2DPoint maObjectAnchor;
SdrGluePointList* mpGPL;
- SdrLayerID mnLayerID;
+ SdrLayerID mnLayerID;
/// bitfield
bool mbMoveProtect : 1;
@@ -248,6 +245,9 @@ public:
// in this case the following member is initialized as nonempty rectangle
basegfx::B2DRange maBLIPSizeRange;
+ // anchor (only used for SW as extra-translation)
+ basegfx::B2DPoint maObjectAnchor;
+
public:
SdrObjPlusData();
virtual ~SdrObjPlusData();
@@ -349,8 +349,8 @@ private:
SdrModel& mrSdrModelFromSdrObject;
// on-demand members
- sdr::properties::BaseProperties* mpProperties;
- sdr::contact::ViewContact* mpViewContact;
+ sdr::properties::BaseProperties* mpProperties;
+ sdr::contact::ViewContact* mpViewContact;
sdr::gluepoint::GluePointProvider* mpGluePointProvider;
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
@@ -361,27 +361,26 @@ private:
SvxShape* getSvxShape() const;
/** do not use directly, always use getSvxShape() if you have to! */
- SvxShape* mpSvxShape;
+ SvxShape* mpSvxShape;
::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > maWeakUnoShape;
// only allow SetOrdNumAtSdrObjectFromSdrObjList to call SetOrdNum
friend void SetOrdNumAtSdrObjectFromSdrObjList(SdrObject& rSdrObject, sal_uInt32 nOrdNum);
- SVX_DLLPRIVATE void SetOrdNum(sal_uInt32 nNew);
+ SVX_DLLPRIVATE void SetOrdNum(sal_uInt32 nOrdNum);
// only allow SetParentAtSdrObjectFromSdrObjList to call setParentOfSdrObject
friend void SetParentAtSdrObjectFromSdrObjList(SdrObject& rSdrObject, SdrObjList* pNew);
SVX_DLLPRIVATE void setParentOfSdrObject(SdrObjList* pNew);
-protected:
- // object graphic BoundRectangle in logical, view-independent coordinates
-// basegfx::B2DRange maObjectRange;
+ // only allow SetUnoShapeAtSdrObjectFromSvxShape to call impl_setUnoShape from outside SdrObject
+ // SVX_DLLPUBLIC needed for SetUnoShapeAtSdrObjectFromSvxShape since it's used in reportdesigner
+ friend void SVX_DLLPUBLIC SetUnoShapeAtSdrObjectFromSvxShape(SdrObject& rSdrObject, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape);
+ SVX_DLLPRIVATE void impl_setUnoShape(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape);
+protected:
// object transformation including scale, shearX, rotate and translate
basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose maSdrObjectTransformation;
- // anchor (only used for SW as extra-translation)
- basegfx::B2DPoint maObjectAnchor;
-
// parent list this object is added to
SdrObjList* mpParentOfSdrObject;
SdrObjPlusData* mpPlusData; // Broadcaster, UserData, Konnektoren, ... (Das ist der Bitsack)
@@ -444,8 +443,6 @@ protected:
// or deleteSafe to delete SdrObjects
virtual ~SdrObject();
- void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape );
-
/// method to copy all data from given source
virtual void copyDataFromSdrObject(const SdrObject& rSource);
@@ -528,9 +525,6 @@ public:
// geometry as hairlines. Invisible parts are included, text is ignored
const basegfx::B2DRange& getSnapRange() const;
-// virtual void recalculateObjectRange();
-// virtual void invalidateObjectRange();
-
// Modified-Flag am Model setzen
virtual void SetChanged();
@@ -635,7 +629,7 @@ public:
// #i108739# Anchor read/write access
virtual void SetAnchorPos(const basegfx::B2DPoint& rPnt);
- const basegfx::B2DPoint& GetAnchorPos() const { return maObjectAnchor; }
+ basegfx::B2DPoint GetAnchorPos() const;
// #i108739# extra bool flag for SC to get rid of the old Anchor-Hack
bool getUniversalApplicationFlag01() const { return mbUniversalApplicationFlag01; }
@@ -664,7 +658,6 @@ public:
virtual sal_uInt32 GetObjectPointCount() const;
virtual basegfx::B2DPoint GetObjectPoint(sal_uInt32 i) const;
virtual void SetObjectPoint(const basegfx::B2DPoint& rPnt, sal_uInt32 i);
- // virtual void NbcSetObjectPoint(const basegfx::B2DPoint& rPnt, sal_uInt32 i);
// Alle geometrischen Daten holen fuer's Undo/Redo
virtual SdrObjGeoData* GetGeoData() const;
@@ -830,9 +823,6 @@ public:
// ein delete (FreeMem+Dtor).
void DeleteUserData(sal_uInt32 nNum);
- // ItemPool fuer dieses Objekt wechseln
- void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
-
////////////////////////////////////////////////////////////////////////////////////////////////////
// access to the UNO representation of the shape
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape();
@@ -840,23 +830,6 @@ public:
static SdrObject* getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt );
- // helper struct for granting access exclusive to SvxShape
- struct GrantXShapeAccess
- {
- friend class SvxShape;
- private:
- GrantXShapeAccess() { }
- };
-
- // setting the UNO representation is allowed for the UNO representation itself only!
- void setUnoShape(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape,
- GrantXShapeAccess /*aGrant*/
- )
- {
- impl_setUnoShape( _rxUnoShape );
- }
-
/** retrieves the instance responsible for notifying changes in the properties of the shape associated with
the SdrObject
@@ -865,8 +838,7 @@ public:
@throws ::com::sun::star::uno::RuntimeException
if there does nt yet exists an SvxShape instance associated with the SdrObject.
*/
- ::svx::PropertyChangeNotifier&
- getShapePropertyChangeNotifier();
+ ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
/** notifies a change in the given property, to all applicable listeners registered at the associated SvxShape
@@ -874,9 +846,7 @@ public:
exception that it is allowed to be called when there does not yet exist an associated SvxShape - in which
case the method will silently return without doing anything.
*/
- void notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty ) const;
-
- bool IsTransparent( bool bCheckForAlphaChannel = false ) const;
+ void notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty ) const;
// return if fill is != XFILL_NONE
bool HasFillStyle() const;
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdograf.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdograf.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdograf.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdograf.hxx Wed May 2 14:47:40 2012
@@ -159,9 +159,6 @@ public:
void SetFilterName(const String& rFilterName);
const String& GetFilterName() const { return aFilterName; }
- void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L);
- void StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
-
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
virtual sal_uInt16 GetObjIdentifier() const;
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdopath.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdopath.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdopath.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdopath.hxx Wed May 2 14:47:40 2012
@@ -54,11 +54,11 @@ enum SdrPathObjType
{
/// basic types the path may have, derived from it's defining
/// polygon
- PathType_Line = 0,
- PathType_OpenPolygon,
- PathType_ClosedPolygon,
- PathType_OpenBezier,
- PathType_ClosedBezier,
+ PathType_Line = 0, // old OBJ_LINE
+ PathType_OpenPolygon, // old OBJ_PLIN
+ PathType_ClosedPolygon, // old OBJ_POLY
+ PathType_OpenBezier, // old OBJ_PATHLINE
+ PathType_ClosedBezier, // old OBJ_PATHFILL
};
//////////////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdpage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdpage.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdpage.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdpage.hxx Wed May 2 14:47:40 2012
@@ -122,8 +122,8 @@ public:
// react on content change
virtual void handleContentChange(const SfxHint& rHint);
- // insert SdrObject TTTT: should use SdrObject& ?
- virtual void InsertObjectToSdrObjList(SdrObject* pObj, sal_uInt32 nPos = CONTAINER_APPEND);
+ // insert SdrObject
+ virtual void InsertObjectToSdrObjList(SdrObject& rObj, sal_uInt32 nPos = CONTAINER_APPEND);
// remove SdrObject (without delete)
virtual SdrObject* RemoveObjectFromSdrObjList(sal_uInt32 nObjNum);
@@ -422,15 +422,9 @@ public:
virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const;
- bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const;
-
- /** *deprecated* returns an averaged background color of this page */
- // #i75566# GetBackgroundColor -> GetPageBackgroundColor
- Color GetPageBackgroundColor() const;
-
/** *deprecated* returns an averaged background color of this page */
// #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value
- Color GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay = true) const;
+ Color GetPageBackgroundColor(SdrPageView* pView = 0, bool bScreenDisplay = true) const;
/** this method returns true if the object from the ViewObjectContact should
be visible on this page while rendering.
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx Wed May 2 14:47:40 2012
@@ -739,13 +739,8 @@ EnhancedCustomShape2d::EnhancedCustomSha
// 2D helper shape.
ClearItem(SDRATTR_SHADOW);
- // TTTT: do not use GetSnapRect here as in the original since we are inside
+ // Do not use GetSnapRect here as in the original since we are inside
// the geometry creation (createViewIndependentPrimitive2DSequence)
-// Point aP( sdr::legacy::GetSnapRect(*pCustomShapeObj).Center() );
-// Size aS( sdr::legacy::GetLogicRect(*pCustomShapeObj).GetSize() );
-// aP.X() -= aS.Width() / 2;
-// aP.Y() -= aS.Height() / 2;
-// aLogicRect = Rectangle( aP, aS );
maLogicScale = basegfx::absolute(pCustomShapeObj->getSdrObjectScale());
const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
@@ -1148,7 +1143,7 @@ basegfx::B2DRange EnhancedCustomShape2d:
basegfx::fTools::equalZero(maLogicScale.getY()) ? 1.0 : 1.0 / maLogicScale.getY());
}
- // TTTT: to keep tight to the original, ignore rotate and shear. If this
+ // To keep tight to the original, ignore rotate and shear. If this
// is not wanted, just use getSdrObjectTransformation() instead
aTransform.scale(pCustomShapeObj->getSdrObjectScale());
aTransform.translate(pCustomShapeObj->getSdrObjectTranslate());
@@ -2159,19 +2154,13 @@ SdrObject* EnhancedCustomShape2d::Create
for (i = 0L; i < vObjectList.size(); i++)
{
SdrObject* pObj(vObjectList[i]);
- pNewGroup->InsertObjectToSdrObjList(pObj);
+ pNewGroup->InsertObjectToSdrObjList(*pObj);
}
}
else if(1L == vObjectList.size())
{
pRet = vObjectList[0L];
}
-
-// if(pRet)
-// {
-// sdr::legacy::transformSdrObject(*pRet,
-// basegfx::tools::createTranslateB2DHomMatrix(maLogicRange.getMinimum()));
-// }
}
return pRet;
@@ -2186,9 +2175,6 @@ SdrObject* EnhancedCustomShape2d::Create
pRet = new SdrRectObj(
pCustomShapeObj->getSdrModelFromSdrObject(),
pCustomShapeObj->getSdrObjectTransformation());
-// basegfx::tools::createScaleTranslateB2DHomMatrix(
-// maLogicRange.getRange(),
-// maLogicRange.getMinimum()));
pRet->SetMergedItemSet( *this );
}
if ( !pRet )
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape3d.cxx Wed May 2 14:47:40 2012
@@ -463,7 +463,7 @@ SdrObject* EnhancedCustomShape3d::Create
p3DObj->SetMergedItem( XFillBitmapItem( String(), aFillBmp ) );
}
}
- pScene->Insert3DObj( p3DObj );
+ pScene->Insert3DObj(*p3DObj);
p3DObj = new E3dExtrudeObj( pCustomShape->getSdrModelFromSdrObject(), a3DDefaultAttr, aPolyPoly, fDepth );
p3DObj->SetLayer( pShape2d->GetLayer() );
p3DObj->SetMergedItemSet( aSet );
@@ -472,7 +472,7 @@ SdrObject* EnhancedCustomShape3d::Create
p3DObj->SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
- pScene->Insert3DObj( p3DObj );
+ pScene->Insert3DObj(*p3DObj);
p3DObj = new E3dExtrudeObj( pCustomShape->getSdrModelFromSdrObject(), a3DDefaultAttr, aPolyPoly, 10 );
p3DObj->SetLayer( pShape2d->GetLayer() );
p3DObj->SetMergedItemSet( aSet );
@@ -492,7 +492,7 @@ SdrObject* EnhancedCustomShape3d::Create
p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
}
- pScene->Insert3DObj( p3DObj );
+ pScene->Insert3DObj(*p3DObj);
bSceneHasObjects = sal_True;
}
}
@@ -671,7 +671,7 @@ SdrObject* EnhancedCustomShape3d::Create
std::vector< E3dCompoundObject* >::iterator aObjectListIter( aPlaceholderObjectList.begin() );
while ( aObjectListIter != aPlaceholderObjectList.end() )
{
- pScene->Remove3DObj( *aObjectListIter );
+ pScene->Remove3DObj( **aObjectListIter );
deleteSdrObjectSafeAndClearPointer(*aObjectListIter++);
}
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeEngine.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeEngine.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeEngine.cxx Wed May 2 14:47:40 2012
@@ -153,11 +153,11 @@ SdrObject* EnhancedCustomShapeEngine::Im
if ( !pSdrObjGroup )
{
pSdrObjGroup = new SdrObjGroup(pCustoObj->getSdrModelFromSdrObject());
- pSdrObjGroup->InsertObjectToSdrObjList( pRenderedShape );
+ pSdrObjGroup->InsertObjectToSdrObjList(*pRenderedShape);
pRenderedShape = pSdrObjGroup;
}
- pSdrObjGroup->InsertObjectToSdrObjList( pShadowGeometry->CloneSdrObject(), 0 );
+ pSdrObjGroup->InsertObjectToSdrObjList(*pShadowGeometry->CloneSdrObject(), 0);
}
else
{
@@ -215,11 +215,11 @@ SdrObject* EnhancedCustomShapeEngine::Im
if ( !pSdrObjGroup )
{
pSdrObjGroup = new SdrObjGroup(pCustoObj->getSdrModelFromSdrObject());
- pSdrObjGroup->InsertObjectToSdrObjList( pRenderedShape );
+ pSdrObjGroup->InsertObjectToSdrObjList(*pRenderedShape);
pRenderedShape = pSdrObjGroup;
}
- pSdrObjGroup->InsertObjectToSdrObjList( pTextObj, LIST_APPEND );
+ pSdrObjGroup->InsertObjectToSdrObjList(*pTextObj);
}
else
{
@@ -235,7 +235,7 @@ SdrObject* EnhancedCustomShapeEngine::Im
if ( !pSdrObjGroup )
{
pSdrObjGroup = new SdrObjGroup(pCustoObj->getSdrModelFromSdrObject());
- pSdrObjGroup->InsertObjectToSdrObjList( pRenderedShape );
+ pSdrObjGroup->InsertObjectToSdrObjList(*pRenderedShape);
pRenderedShape = pSdrObjGroup;
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx Wed May 2 14:47:40 2012
@@ -837,7 +837,7 @@ SdrObject* CreateSdrObjectFromParagraphO
pCustomShape->getSdrModelFromSdrObject(),
OBJ_POLY,
aOutlineIter->getB2DPolyPolygon() );
- pRet->InsertObjectToSdrObjList( pPathObj );
+ pRet->InsertObjectToSdrObjList(*pPathObj);
aOutlineIter++;
}
aCharacterIter++;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/dialog/contwnd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/dialog/contwnd.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/dialog/contwnd.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/dialog/contwnd.cxx Wed May 2 14:47:40 2012
@@ -106,11 +106,8 @@ void ContourWindow::SetPolyPolygon( cons
aSet.Put( XFillStyleItem( XFILL_SOLID ) );
aSet.Put( XFillColorItem( String(), TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
-
- //pPathObj->SetItemSetAndBroadcast(aSet);
pPathObj->SetMergedItemSetAndBroadcast(aSet);
-
- pPage->InsertObjectToSdrObjList( pPathObj );
+ pPage->InsertObjectToSdrObjList(*pPathObj);
}
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/dialog/dlgctl3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/dialog/dlgctl3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/dialog/dlgctl3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/dialog/dlgctl3d.cxx Wed May 2 14:47:40 2012
@@ -128,7 +128,7 @@ void Svx3DPreviewControl::Construct()
rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, fDefaultCamFocal);
mpScene->SetCamera( rCamera );
- mpFmPage->InsertObjectToSdrObjList( mpScene );
+ mpFmPage->InsertObjectToSdrObjList(*mpScene);
basegfx::B3DHomMatrix aRotation;
aRotation.rotate(DEG2RAD( 25 ), 0.0, 0.0);
@@ -150,9 +150,6 @@ void Svx3DPreviewControl::Construct()
// PageView
mp3DView->ShowSdrPage( *mpFmPage );
-
- // mark scene
- mp3DView->MarkObj( *mpScene );
}
void Svx3DPreviewControl::Resize()
@@ -200,7 +197,7 @@ void Svx3DPreviewControl::SetObjectType(
if( mp3DObj )
{
aSet.Put(mp3DObj->GetMergedItemSet());
- mpScene->Remove3DObj( mp3DObj );
+ mpScene->Remove3DObj(*mp3DObj);
deleteSdrObjectSafeAndClearPointer(mp3DObj);
}
@@ -227,7 +224,7 @@ void Svx3DPreviewControl::SetObjectType(
break;
}
- mpScene->Insert3DObj( mp3DObj );
+ mpScene->Insert3DObj(*mp3DObj);
mp3DObj->SetMergedItemSet(aSet);
Resize();
@@ -327,7 +324,7 @@ void Svx3DLightControl::Construct2()
mp3DView->Get3DDefaultAttributes(),
basegfx::B3DPoint(-fMaxExpansion, -fMaxExpansion, -fMaxExpansion),
basegfx::B3DVector(2.0 * fMaxExpansion, 2.0 * fMaxExpansion, 2.0 * fMaxExpansion));
- mpScene->Insert3DObj( mpExpansionObject );
+ mpScene->Insert3DObj(*mpExpansionObject);
SfxItemSet aSet(mpExpansionObject->GetObjectItemPool());
aSet.Put( XLineStyleItem( XLINE_NONE ) );
aSet.Put( XFillStyleItem( XFILL_NONE ) );
@@ -353,7 +350,7 @@ void Svx3DLightControl::Construct2()
0,
0,
true);
- mpScene->Insert3DObj( mpLampBottomObject );
+ mpScene->Insert3DObj(*mpLampBottomObject);
// half circle with stand
basegfx::B2DPolygon a2DHalfCircle;
@@ -371,7 +368,7 @@ void Svx3DLightControl::Construct2()
0,
0,
true);
- mpScene->Insert3DObj( mpLampShaftObject );
+ mpScene->Insert3DObj(*mpLampShaftObject);
// initially invisible
SfxItemSet aSet(mpLampBottomObject->GetObjectItemPool());
@@ -417,7 +414,7 @@ void Svx3DLightControl::ConstructLightOb
// get rid of evtl. existing light object
if(maLightObjects[a])
{
- mpScene->Remove3DObj(maLightObjects[a]);
+ mpScene->Remove3DObj(*maLightObjects[a]);
deleteSdrObjectSafeAndClearPointer(maLightObjects[a]);
maLightObjects[a] = 0;
}
@@ -435,7 +432,7 @@ void Svx3DLightControl::ConstructLightOb
mp3DView->Get3DDefaultAttributes(),
basegfx::B3DPoint( 0, 0, 0 ),
basegfx::B3DVector( fLampSize, fLampSize, fLampSize));
- mpScene->Insert3DObj(pNewLight);
+ mpScene->Insert3DObj(*pNewLight);
basegfx::B3DHomMatrix aTransform;
aTransform.translate(aDirection);
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/dialog/imapwnd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/dialog/imapwnd.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/dialog/imapwnd.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/dialog/imapwnd.cxx Wed May 2 14:47:40 2012
@@ -147,7 +147,7 @@ void IMapWindow::ReplaceImageMap( const
if ( pNewObj )
{
- pPage->InsertObjectToSdrObjList( pNewObj );
+ pPage->InsertObjectToSdrObjList(*pNewObj);
}
}
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx Wed May 2 14:47:40 2012
@@ -268,10 +268,10 @@ void E3dObject::TakeObjInfo(SdrObjTransf
|*
\************************************************************************/
-void E3dObject::NewObjectInserted(const E3dObject* p3DObj)
+void E3dObject::NewObjectInserted(const E3dObject& r3DObj)
{
if(GetParentObj())
- GetParentObj()->NewObjectInserted(p3DObj);
+ GetParentObj()->NewObjectInserted(r3DObj);
}
/*************************************************************************
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/scene3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/scene3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/scene3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/scene3d.cxx Wed May 2 14:47:40 2012
@@ -447,11 +447,11 @@ void E3dScene::SetCamera(const Camera3D&
|*
\************************************************************************/
-void E3dScene::NewObjectInserted(const E3dObject* p3DObj)
+void E3dScene::NewObjectInserted(const E3dObject& r3DObj)
{
- E3dObject::NewObjectInserted(p3DObj);
+ E3dObject::NewObjectInserted(r3DObj);
- if ( p3DObj == this )
+ if(&r3DObj == this)
return;
// #110988#
@@ -549,9 +549,9 @@ void E3dScene::RebuildLists()
E3dObject* pCandidate = dynamic_cast< E3dObject* >(GetObj(a));
if(pCandidate)
- {
+ {
pCandidate->SetLayer(nCurrLayerID);
- NewObjectInserted(pCandidate);
+ NewObjectInserted(*pCandidate);
}
else
{
@@ -735,9 +735,9 @@ sal_Bool E3dScene::IsBreakObjPossible()
}
else
{
- OSL_ENSURE(false, "E3dScene::RebuildLists error in 3D SdrObjList (!)");
- }
-}
+ OSL_ENSURE(false, "E3dScene::IsBreakObjPossible error in 3D SdrObjList (!)");
+ }
+ }
return true;
}
@@ -946,23 +946,19 @@ void E3dScene::setSdrObjectTransformatio
|*
\************************************************************************/
-void E3dScene::Insert3DObj(E3dObject* p3DObj)
+void E3dScene::Insert3DObj(E3dObject& r3DObj)
{
- DBG_ASSERT(p3DObj, "Insert3DObj mit NULL-Zeiger!");
- InsertObjectToSdrObjList(p3DObj);
+ InsertObjectToSdrObjList(r3DObj);
InvalidateBoundVolume();
- NewObjectInserted(p3DObj);
+ NewObjectInserted(r3DObj);
StructureChanged();
}
-void E3dScene::Remove3DObj(E3dObject* p3DObj)
+void E3dScene::Remove3DObj(E3dObject& r3DObj)
{
- DBG_ASSERT(p3DObj, "Remove3DObj mit NULL-Zeiger!");
-
- if(p3DObj->GetParentObj() == this)
+ if(r3DObj.GetParentObj() == this)
{
- RemoveObjectFromSdrObjList(p3DObj->GetNavigationPosition());
-
+ RemoveObjectFromSdrObjList(r3DObj.GetNavigationPosition());
InvalidateBoundVolume();
StructureChanged();
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/view3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/view3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/view3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/view3d.cxx Wed May 2 14:47:40 2012
@@ -610,11 +610,9 @@ bool E3dView::ImpCloneAll3DObjectsToDest
pNewCompoundObj->SetB3DTransform(aModifyingTransform * aNewObjectTrans);
// fill and insert new object
- //pNewCompoundObj->SetModel(pDstScene->GetModel());
- //pNewCompoundObj->SetPage(pDstScene->GetPage());
pNewCompoundObj->SetLayer(pCompoundObj->GetLayer());
pNewCompoundObj->SetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True);
- pDstScene->Insert3DObj(pNewCompoundObj);
+ pDstScene->Insert3DObj(*pNewCompoundObj);
bRetval = true;
// Undo anlegen
@@ -815,7 +813,7 @@ void E3dView::ImpCreateSingle3DObjectFla
p3DObj->SetStyleSheet(pObj->GetStyleSheet(), sal_True);
// Neues 3D-Objekt einfuegen
- pScene->Insert3DObj(p3DObj);
+ pScene->Insert3DObj(*p3DObj);
}
}
}
@@ -911,21 +909,25 @@ void E3dView::ConvertMarkedObjTo3D(bool
Get3DDefaultAttributes());
// Rechteck bestimmen und evtl. korrigieren
- Rectangle aRect = getMarkedObjectSnapRect();
- if(aRect.GetWidth() <= 1)
- aRect.SetSize(Size(500, aRect.GetHeight()));
- if(aRect.GetHeight() <= 1)
- aRect.SetSize(Size(aRect.GetWidth(), 500));
+ basegfx::B2DRange aRange(getMarkedObjectSnapRange());
+
+ if(aRange.getWidth() < 500.0 || aRange.getHeight() < 500.0)
+ {
+ basegfx::B2DRange aCentered(aRange.getCenter());
+
+ aCentered.grow(500.0);
+ aRange.expand(aCentered);
+ }
// Tiefe relativ zur Groesse der Selektion bestimmen
- double fDepth = 0.0;
- double fRot3D = 0.0;
+ double fDepth(0.0);
+ double fRot3D(0.0);
basegfx::B2DHomMatrix aLatheMat;
if(bExtrude)
{
- double fW = (double)aRect.GetWidth();
- double fH = (double)aRect.GetHeight();
+ double fW = aRange.getWidth();
+ double fH = aRange.getHeight();
fDepth = sqrt(fW*fW + fH*fH) / 6.0;
}
@@ -942,12 +944,13 @@ void E3dView::ConvertMarkedObjTo3D(bool
fRot3D = atan2(aDiff.getY(), aDiff.getX()) - F_PI2;
if(basegfx::fTools::equalZero(fabs(fRot3D)))
+ {
fRot3D = 0.0;
+ }
if(fRot3D != 0.0)
{
- aLatheMat = basegfx::tools::createRotateAroundPoint(aPnt2, -fRot3D)
- * aLatheMat;
+ aLatheMat = basegfx::tools::createRotateAroundPoint(aPnt2, -fRot3D) * aLatheMat;
}
}
@@ -958,7 +961,7 @@ void E3dView::ConvertMarkedObjTo3D(bool
}
else
{
- aLatheMat.translate((double)-aRect.Left(), 0.0);
+ aLatheMat.translate(-aRange.getMinX(), 0.0);
}
// Inverse Matrix bilden, um die Zielausdehnung zu bestimmen
@@ -969,38 +972,34 @@ void E3dView::ConvertMarkedObjTo3D(bool
// erweitern
for(sal_uInt32 a(0); a < aSelection.size(); a++)
{
- SdrObject* pObj = aSelection[a];
- const Rectangle aTurnRect(sdr::legacy::GetSnapRect(*pObj));
+ const SdrObject* pObj = aSelection[a];
+ const basegfx::B2DRange aSnapRange(sdr::legacy::GetSnapRange(*pObj));
basegfx::B2DPoint aRot;
Point aRotPnt;
- aRot = basegfx::B2DPoint(aTurnRect.Left(), -aTurnRect.Top());
+ aRot = basegfx::B2DPoint(aSnapRange.getMinX(), -aSnapRange.getMinY());
aRot *= aLatheMat;
aRot.setX(-aRot.getX());
aRot *= aInvLatheMat;
- aRotPnt = Point((sal_Int32)(aRot.getX() + 0.5), (sal_Int32)(-aRot.getY() - 0.5));
- aRect.Union(Rectangle(aRotPnt, aRotPnt));
+ aRange.expand(aRot);
- aRot = basegfx::B2DPoint(aTurnRect.Left(), -aTurnRect.Bottom());
+ aRot = basegfx::B2DPoint(aSnapRange.getMinX(), -aSnapRange.getMaxY());
aRot *= aLatheMat;
aRot.setX(-aRot.getX());
aRot *= aInvLatheMat;
- aRotPnt = Point((sal_Int32)(aRot.getX() + 0.5), (sal_Int32)(-aRot.getY() - 0.5));
- aRect.Union(Rectangle(aRotPnt, aRotPnt));
+ aRange.expand(aRot);
- aRot = basegfx::B2DPoint(aTurnRect.Right(), -aTurnRect.Top());
+ aRot = basegfx::B2DPoint(aSnapRange.getMaxX(), -aSnapRange.getMinY());
aRot *= aLatheMat;
aRot.setX(-aRot.getX());
aRot *= aInvLatheMat;
- aRotPnt = Point((sal_Int32)(aRot.getX() + 0.5), (sal_Int32)(-aRot.getY() - 0.5));
- aRect.Union(Rectangle(aRotPnt, aRotPnt));
+ aRange.expand(aRot);
- aRot = basegfx::B2DPoint(aTurnRect.Right(), -aTurnRect.Bottom());
+ aRot = basegfx::B2DPoint(aSnapRange.getMaxX(), -aSnapRange.getMaxY());
aRot *= aLatheMat;
aRot.setX(-aRot.getX());
aRot *= aInvLatheMat;
- aRotPnt = Point((sal_Int32)(aRot.getX() + 0.5), (sal_Int32)(-aRot.getY() - 0.5));
- aRect.Union(Rectangle(aRotPnt, aRotPnt));
+ aRange.expand(aRot);
}
}
@@ -1025,9 +1024,9 @@ void E3dView::ConvertMarkedObjTo3D(bool
pScene->SetB3DTransform(aMatrix * pScene->GetB3DTransform()); // #112587#
// Szene initialisieren
- sdr::legacy::SetSnapRect(*pScene, aRect);
- basegfx::B3DRange aBoundVol = pScene->GetBoundVolume();
- InitScene(pScene, (double)aRect.GetWidth(), (double)aRect.GetHeight(), aBoundVol.getDepth());
+ sdr::legacy::SetSnapRange(*pScene, aRange);
+ const basegfx::B3DRange aBoundVol(pScene->GetBoundVolume());
+ InitScene(pScene, aRange.getWidth(), aRange.getHeight(), aBoundVol.getDepth());
// Szene anstelle des ersten selektierten Objektes einfuegen
// und alle alten Objekte weghauen
@@ -1057,7 +1056,7 @@ void E3dView::ConvertMarkedObjTo3D(bool
}
// SnapRects der Objekte ungueltig
- sdr::legacy::SetSnapRect(*pScene, aRect);
+ sdr::legacy::SetSnapRange(*pScene, aRange);
}
else
{
@@ -1412,24 +1411,20 @@ E3dScene* E3dView::GetMarkedScene()
E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj)
{
DBG_ASSERT(p3DObj != NULL, "Nana, wer steckt denn hier 'nen NULL-Zeiger rein?");
- E3dScene* pScene = NULL;
// get transformed BoundVolume of the object
basegfx::B3DRange aVolume(p3DObj->GetBoundVolume());
- aVolume.transform(p3DObj->GetB3DTransform());
- double fW(aVolume.getWidth());
+ aVolume.transform(p3DObj->GetB3DTransform());
+ double fW(aVolume.getWidth());
double fH(aVolume.getHeight());
-
- Rectangle aRect(0,0, (sal_Int32) fW, (sal_Int32) fH);
- pScene = new E3dScene(
+ E3dScene* pScene = new E3dScene(
getSdrModelFromSdrView(),
Get3DDefaultAttributes());
InitScene(pScene, fW, fH, aVolume.getMaxZ() + ((fW + fH) / 4.0));
-
- pScene->Insert3DObj(p3DObj);
- sdr::legacy::SetSnapRect(*pScene, aRect);
+ pScene->Insert3DObj(*p3DObj);
+ sdr::legacy::SetSnapRange(*pScene, basegfx::B2DRange(0.0, 0.0, fW, fH));
return pScene;
}
@@ -1613,14 +1608,18 @@ void E3dView::End3DCreation(bool bUseDef
{
if(bUseDefaultValuesForMirrorAxes)
{
- Rectangle aRect = getMarkedObjectSnapRect();
- if(aRect.GetWidth() <= 1)
- aRect.SetSize(Size(500, aRect.GetHeight()));
- if(aRect.GetHeight() <= 1)
- aRect.SetSize(Size(aRect.GetWidth(), 500));
+ basegfx::B2DRange aRange(getMarkedObjectSnapRange());
+
+ if(aRange.getWidth() < 500.0 || aRange.getHeight() < 500.0)
+ {
+ basegfx::B2DRange aCentered(aRange.getCenter());
- basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top());
- basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom());
+ aCentered.grow(500.0);
+ aRange.expand(aCentered);
+ }
+
+ const basegfx::B2DPoint aPnt1(aRange.getMinX(), -aRange.getMinY());
+ const basegfx::B2DPoint aPnt2(aRange.getMinX(), -aRange.getMaxY());
ConvertMarkedObjTo3D(false, aPnt1, aPnt2);
}
@@ -1631,9 +1630,8 @@ void E3dView::End3DCreation(bool bUseDef
const SdrHdlList &aHdlList = GetHdlList();
const basegfx::B2DPoint aMirrorRef1 = aHdlList.GetHdlByKind(HDL_REF1)->getPosition();
const basegfx::B2DPoint aMirrorRef2 = aHdlList.GetHdlByKind(HDL_REF2)->getPosition();
-
- basegfx::B2DPoint aPnt1(aMirrorRef1.getX(), -aMirrorRef1.getY());
- basegfx::B2DPoint aPnt2(aMirrorRef2.getX(), -aMirrorRef2.getY());
+ const basegfx::B2DPoint aPnt1(aMirrorRef1.getX(), -aMirrorRef1.getY());
+ const basegfx::B2DPoint aPnt2(aMirrorRef2.getX(), -aMirrorRef2.getY());
ConvertMarkedObjTo3D(false, aPnt1, aPnt2);
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/form/fmpage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/form/fmpage.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/form/fmpage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/form/fmpage.cxx Wed May 2 14:47:40 2012
@@ -139,14 +139,14 @@ SdrPage* FmFormPage::CloneSdrPage(SdrMod
}
//------------------------------------------------------------------
-void FmFormPage::InsertObjectToSdrObjList(SdrObject* pObj, sal_uInt32 nPos)
+void FmFormPage::InsertObjectToSdrObjList(SdrObject& rObj, sal_uInt32 nPos)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObjectToSdrObjList" );
- SdrPage::InsertObjectToSdrObjList( pObj, nPos );
+ SdrPage::InsertObjectToSdrObjList( rObj, nPos );
#ifndef SVX_LIGHT
FmFormModel* pFmFormModel = dynamic_cast< FmFormModel* >(&getSdrModelFromSdrPage());
if(pFmFormModel)
- pFmFormModel->GetUndoEnv().Inserted(pObj);
+ pFmFormModel->GetUndoEnv().Inserted(&rObj);
#endif
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/form/fmvwimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/form/fmvwimp.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/form/fmvwimp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/form/fmvwimp.cxx Wed May 2 14:47:40 2012
@@ -1335,8 +1335,8 @@ SdrObject* FmXFormView::implCreateFieldC
return pControl;
SdrObjGroup* pGroup = new SdrObjGroup(getView()->getSdrModelFromSdrView());
- pGroup->InsertObjectToSdrObjList( pLabel );
- pGroup->InsertObjectToSdrObjList( pControl );
+ pGroup->InsertObjectToSdrObjList(*pLabel);
+ pGroup->InsertObjectToSdrObjList(*pControl);
if ( bDateNTimeField )
{ // so far we created a date field only, but we also need a time field
@@ -1346,8 +1346,8 @@ SdrObject* FmXFormView::implCreateFieldC
xDataSource, sDataSource, sCommand, nCommandType )
)
{
- pGroup->InsertObjectToSdrObjList( pLabel );
- pGroup->InsertObjectToSdrObjList( pControl );
+ pGroup->InsertObjectToSdrObjList(*pLabel);
+ pGroup->InsertObjectToSdrObjList(*pControl);
}
}
@@ -1448,9 +1448,9 @@ SdrObject* FmXFormView::implCreateXForms
//////////////////////////////////////////////////////////////////////
// group objects
- SdrObjGroup* pGroup = new SdrObjGroup(getView()->getSdrModelFromSdrView());
- pGroup->InsertObjectToSdrObjList(pLabel);
- pGroup->InsertObjectToSdrObjList(pControl);
+ SdrObjGroup* pGroup = new SdrObjGroup(getView()->getSdrModelFromSdrView());
+ pGroup->InsertObjectToSdrObjList(*pLabel);
+ pGroup->InsertObjectToSdrObjList(*pControl);
return pGroup;
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/gallery2/galtheme.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/gallery2/galtheme.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/gallery2/galtheme.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/gallery2/galtheme.cxx Wed May 2 14:47:40 2012
@@ -1311,7 +1311,7 @@ sal_Bool GalleryTheme::InsertTransferabl
*pGraphic );
pGrafObj->InsertUserData( new SgaIMapInfo( aImageMap ) );
- pPage->InsertObjectToSdrObjList( pGrafObj );
+ pPage->InsertObjectToSdrObjList(*pGrafObj);
bRet = InsertModel( *aModel.GetModel(), nInsertPos );
}
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx Wed May 2 14:47:40 2012
@@ -1096,7 +1096,7 @@ void SdrEditView::CopyMarkedObj()
if(pClone)
{
- GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(pClone, CONTAINER_APPEND);
+ GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(*pClone);
if(bUndo)
{
@@ -1184,7 +1184,7 @@ bool SdrEditView::InsertObjectAtView(Sdr
}
}
- if(0 != (nOptions & SDRINSERT_SETDEFLAYER))
+ if(nOptions & SDRINSERT_SETDEFLAYER)
{
SdrLayerID nLayer(GetSdrPageView()->getSdrPageFromSdrPageView().GetPageLayerAdmin().GetLayerID(GetActiveLayer(), true));
@@ -1202,7 +1202,7 @@ bool SdrEditView::InsertObjectAtView(Sdr
rObj.SetLayer(nLayer);
}
- if(0 != (nOptions & SDRINSERT_SETDEFATTR))
+ if(nOptions & SDRINSERT_SETDEFATTR)
{
if(GetDefaultStyleSheet())
{
@@ -1214,14 +1214,7 @@ bool SdrEditView::InsertObjectAtView(Sdr
if(!rObj.IsObjectInserted())
{
- if(0 != (nOptions & SDRINSERT_NOBROADCAST))
- {
- GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(&rObj, CONTAINER_APPEND);
- }
- else
- {
- GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(&rObj, CONTAINER_APPEND);
- }
+ GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(rObj);
}
if(IsUndoEnabled())
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx Wed May 2 14:47:40 2012
@@ -1342,7 +1342,7 @@ void SdrEditView::MergeMarkedObjects(Sdr
SdrPathObj* pPath = new SdrPathObj(getSdrModelFromSdrView(), OBJ_PATHFILL, aMergePolyPolygonA);
ImpCopyAttributes(pAttrObj, pPath);
- pInsOL->InsertObjectToSdrObjList(pPath, nInsPos);
+ pInsOL->InsertObjectToSdrObjList(*pPath, nInsPos);
if(bUndo)
{
@@ -1544,7 +1544,7 @@ void SdrEditView::CombineMarkedObjects(b
pPath->SetMergedItem(XLineStyleItem(XLINE_SOLID));
}
- pInsOL->InsertObjectToSdrObjList(pPath,nInsPos);
+ pInsOL->InsertObjectToSdrObjList(*pPath,nInsPos);
if( bUndo )
{
@@ -1710,7 +1710,7 @@ void SdrEditView::ImpDismantleOneObject(
SdrPathObj* pPath = new SdrPathObj(getSdrModelFromSdrView(), (SdrObjKind)pSrcPath->GetObjIdentifier(), basegfx::B2DPolyPolygon(rCandidate));
ImpCopyAttributes(pSrcPath, pPath);
pLast = pPath;
- rOL.InsertObjectToSdrObjList(pPath, rPos);
+ rOL.InsertObjectToSdrObjList(*pPath, rPos);
if( bUndo )
{
@@ -1748,7 +1748,7 @@ void SdrEditView::ImpDismantleOneObject(
SdrPathObj* pPath = new SdrPathObj(getSdrModelFromSdrView(), eKind, basegfx::B2DPolyPolygon(aNewPolygon));
ImpCopyAttributes(pSrcPath, pPath);
pLast = pPath;
- rOL.InsertObjectToSdrObjList(pPath, rPos);
+ rOL.InsertObjectToSdrObjList(*pPath, rPos);
if( bUndo )
{
@@ -1787,7 +1787,7 @@ void SdrEditView::ImpDismantleOneObject(
}
}
- rOL.InsertObjectToSdrObjList(pCandidate, rPos);
+ rOL.InsertObjectToSdrObjList(*pCandidate, rPos);
if( bUndo )
{
@@ -1832,7 +1832,7 @@ void SdrEditView::ImpDismantleOneObject(
pTextObj->SetMergedItemSet(aTargetItemSet);
// insert object
- rOL.InsertObjectToSdrObjList(pTextObj, rPos + 1);
+ rOL.InsertObjectToSdrObjList(*pTextObj, rPos + 1);
if( bUndo )
{
@@ -2009,7 +2009,7 @@ void SdrEditView::GroupMarked(const SdrO
nInsPos--; // InsertPos korregieren
}
- pDstLst->InsertObjectToSdrObjList(pObj, 0);
+ pDstLst->InsertObjectToSdrObjList(*pObj, 0);
removeSdrObjectFromSelection(*pObj);
if(!pRefObj1)
@@ -2036,7 +2036,7 @@ void SdrEditView::GroupMarked(const SdrO
if(pGrp)
{
aNewMark.push_back(pGrp);
- pAktLst->InsertObjectToSdrObjList(pGrp, nInsPos);
+ pAktLst->InsertObjectToSdrObjList(*pGrp, nInsPos);
if( bUndo )
{
@@ -2145,7 +2145,7 @@ void SdrEditView::UnGroupMarked()
for (no=0; no<nAnz; no++)
{
SdrObject* pObj = pSrcLst->RemoveObjectFromSdrObjList(0);
- pDstLst->InsertObjectToSdrObjList(pObj, nDstCnt);
+ pDstLst->InsertObjectToSdrObjList(*pObj, nDstCnt);
if( bUndo )
{
@@ -2162,8 +2162,6 @@ void SdrEditView::UnGroupMarked()
if( bUndo )
{
- // Now it is safe to add the delete-UNDO which trigers the
- // MigrateItemPool now only for itself, not for the subobjects.
// nDstCnt is right, because previous inserts move group
// object deeper and increase nDstCnt.
AddUndo(getSdrModelFromSdrView().GetSdrUndoFactory().CreateUndoDeleteObject(*pGrp));
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx Wed May 2 14:47:40 2012
@@ -244,7 +244,7 @@ sal_uInt32 ImpSdrGDIMetaFileImport::DoIm
for (sal_uInt32 i=0; i<nAnz; i++)
{
SdrObject* pObj=aTmpList.GetObj(i);
- rOL.InsertObjectToSdrObjList(pObj,nInsPos);
+ rOL.InsertObjectToSdrObjList(*pObj, nInsPos);
nInsPos++;
if(pProgrInfo != NULL)
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx Wed May 2 14:47:40 2012
@@ -2433,8 +2433,7 @@ SdrBaseHint::SdrBaseHint(
: SfxHint(),
meSdrHint(eSdrHintKind),
mpSdrPage(0),
- mpSdrObject(0),
- maSdrLastBound()
+ mpSdrObject(0)
{
}
@@ -2444,20 +2443,17 @@ SdrBaseHint::SdrBaseHint(
: SfxHint(),
meSdrHint(eSdrHintKind),
mpSdrPage(&rSdrPage),
- mpSdrObject(0),
- maSdrLastBound()
+ mpSdrObject(0)
{
}
SdrBaseHint::SdrBaseHint(
const SdrObject& rSdrObject,
- SdrHintKind eSdrHintKind,
- const SdrView* pSdrView)
+ SdrHintKind eSdrHintKind)
: SfxHint(),
meSdrHint(eSdrHintKind),
mpSdrPage(rSdrObject.getSdrPageFromSdrObject()),
- mpSdrObject(&rSdrObject),
- maSdrLastBound(rSdrObject.getObjectRange(pSdrView))
+ mpSdrObject(&rSdrObject)
{
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmrkv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmrkv.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmrkv.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmrkv.cxx Wed May 2 14:47:40 2012
@@ -1994,23 +1994,6 @@ const basegfx::B2DRange& SdrMarkView::ge
return maSelection.getSnapRange();
}
-Rectangle SdrMarkView::getMarkedObjectSnapRect() const
-{
- const basegfx::B2DRange aSnapRange(getMarkedObjectSnapRange());
-
- if(aSnapRange.isEmpty())
- {
- // support empty rectangle
- return Rectangle();
- }
- else
- {
- return Rectangle(
- (sal_Int32)floor(aSnapRange.getMinX()), (sal_Int32)floor(aSnapRange.getMinY()),
- (sal_Int32)ceil(aSnapRange.getMaxX()), (sal_Int32)ceil(aSnapRange.getMaxY()));
- }
-}
-
void SdrMarkView::TakeMarkedDescriptionString(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
{
if(areSdrObjectsSelected())
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx Wed May 2 14:47:40 2012
@@ -185,7 +185,7 @@ SdrObjectChangeBroadcaster::~SdrObjectCh
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId) //, sal_uInt16 nVer)
+SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId)
: mnInventor(nInv),
mnIdentifier(nId)
{
@@ -327,9 +327,8 @@ SdrObjUserData* SdrObjUserDataList::Remo
////////////////////////////////////////////////////////////////////////////////////////////////////
SdrObjGeoData::SdrObjGeoData()
-: //maObjectRange(),
- maSdrObjectTransformation(),
- maObjectAnchor(),
+: maSdrObjectTransformation(),
+ maObjectAnchor(0.0, 0.0),
mpGPL(0),
mnLayerID(0),
mbMoveProtect(false),
@@ -353,7 +352,8 @@ SdrObjPlusData::SdrObjPlusData()
maObjTitle(),
maObjDescription(),
maHTMLName(),
- maBLIPSizeRange()
+ maBLIPSizeRange(),
+ maObjectAnchor(0.0, 0.0)
{
}
@@ -415,7 +415,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(Sd
pNeuPlusData->maBLIPSizeRange = maBLIPSizeRange;
}
- return pNeuPlusData;
+ // copy object anchor (sw only)
+ pNeuPlusData->maObjectAnchor = maObjectAnchor;
+
+ return pNeuPlusData;
}
//////////////////////////////////////////////////////////////////////////////
@@ -444,6 +447,14 @@ SdrObjTransformInfoRec::SdrObjTransformI
{
}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// helper to allow setting the SvxShape (UnoShape) at SdrObject, but only from SvxShape itself
+
+void SVX_DLLPUBLIC SetUnoShapeAtSdrObjectFromSvxShape(SdrObject& rSdrObject, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape)
+{
+ rSdrObject.impl_setUnoShape(_rxUnoShape);
+}
+
//////////////////////////////////////////////////////////////////////////////
sdr::properties::BaseProperties* SdrObject::CreateObjectSpecificProperties()
@@ -518,11 +529,11 @@ SdrObjList* SdrObject::getChildrenOfSdrO
return 0;
}
-void SdrObject::SetOrdNum(sal_uInt32 nNew)
+void SdrObject::SetOrdNum(sal_uInt32 nOrdNum)
{
- if(mnOrdNum != nNew)
+ if(mnOrdNum != nOrdNum)
{
- mnOrdNum = nNew;
+ mnOrdNum = nOrdNum;
}
}
@@ -558,7 +569,6 @@ SdrObject::SdrObject(SdrModel& rSdrModel
mpSvxShape(0),
maWeakUnoShape(),
maSdrObjectTransformation(rTransform),
- maObjectAnchor(),
mpParentOfSdrObject(),
mpPlusData(0),
mnOrdNum(0),
@@ -907,9 +917,6 @@ const basegfx::B2DRange& SdrObject::getS
void SdrObject::SetChanged()
{
- // #110094#-11
- // For test purposes, use the new ViewContact for change
- // notification now.
ActionChanged();
if(IsObjectInserted())
@@ -972,10 +979,8 @@ void SdrObject::copyDataFromSdrObject(co
mpGluePointProvider = &rSource.GetGluePointProvider().Clone();
}
- //maObjectRange = rSource.maObjectRange;
maSdrObjectTransformation = rSource.maSdrObjectTransformation.getB2DHomMatrix();
mnLayerID = rSource.mnLayerID;
- maObjectAnchor =rSource.maObjectAnchor;
mbMoveProtect = rSource.mbMoveProtect;
mbSizeProtect = rSource.mbSizeProtect;
mbNoPrint = rSource.mbNoPrint;
@@ -1357,10 +1362,25 @@ Pointer SdrObject::GetCreatePointer(cons
void SdrObject::SetAnchorPos(const basegfx::B2DPoint& rPnt)
{
- if(rPnt != maObjectAnchor)
+ if(!rPnt.equalZero() && !mpPlusData)
+ {
+ ImpForcePlusData();
+ }
+
+ if(mpPlusData && mpPlusData->maObjectAnchor != rPnt)
+ {
+ mpPlusData->maObjectAnchor = rPnt;
+ }
+}
+
+basegfx::B2DPoint SdrObject::GetAnchorPos() const
+{
+ if(mpPlusData)
{
- maObjectAnchor = rPnt;
+ return mpPlusData->maObjectAnchor;
}
+
+ return basegfx::B2DPoint(0.0, 0.0);
}
void SdrObject::AdjustToMaxRange( const basegfx::B2DRange& rMaxRange, bool /* bShrinkOnly = false */ )
@@ -1545,9 +1565,18 @@ SdrObjGeoData* SdrObject::NewGeoData() c
void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
{
- rGeo.maSdrObjectTransformation = maSdrObjectTransformation.getB2DHomMatrix(),
- rGeo.maObjectAnchor = maObjectAnchor;
- rGeo.mbMoveProtect = mbMoveProtect;
+ rGeo.maSdrObjectTransformation = maSdrObjectTransformation.getB2DHomMatrix();
+
+ if(mpPlusData)
+ {
+ rGeo.maObjectAnchor = mpPlusData->maObjectAnchor;
+ }
+ else
+ {
+ rGeo.maObjectAnchor = basegfx::B2DPoint(0.0, 0.0);
+ }
+
+ rGeo.mbMoveProtect = mbMoveProtect;
rGeo.mbSizeProtect = mbSizeProtect;
rGeo.mbNoPrint = mbNoPrint;
rGeo.mbVisible = mbVisible;
@@ -1580,8 +1609,18 @@ void SdrObject::RestGeoData(const SdrObj
ActionChanged();
maSdrObjectTransformation.setB2DHomMatrix(rGeo.maSdrObjectTransformation);
- maObjectAnchor = rGeo.maObjectAnchor;
- mbMoveProtect = rGeo.mbMoveProtect;
+
+ if(!rGeo.maObjectAnchor.equalZero())
+ {
+ ImpForcePlusData();
+ }
+
+ if(mpPlusData)
+ {
+ mpPlusData->maObjectAnchor = rGeo.maObjectAnchor;
+ }
+
+ mbMoveProtect = rGeo.mbMoveProtect;
mbSizeProtect = rGeo.mbSizeProtect;
mbNoPrint = rGeo.mbNoPrint;
mbVisible = rGeo.mbVisible;
@@ -2111,8 +2150,6 @@ SdrObject* SdrObject::ImpConvertToContou
}
}
- // || aMergedHairlinePolyPolygon.Count() removed; the conversion is ONLY
- // useful when new closed filled polygons are created
if(aMergedLineFillPolyPolygon.count() || (bForceLineDash && aMergedHairlinePolyPolygon.count()))
{
SfxItemSet aSet(pRet->GetMergedItemSet());
@@ -2197,17 +2234,17 @@ SdrObject* SdrObject::ImpConvertToContou
SdrObject* pClone = pRet->CloneSdrObject();
pClone->SetMergedItemSet(aSet);
- pGroup->InsertObjectToSdrObjList(pClone);
+ pGroup->InsertObjectToSdrObjList(*pClone);
}
if(aLinePolygonPart)
{
- pGroup->InsertObjectToSdrObjList(aLinePolygonPart);
+ pGroup->InsertObjectToSdrObjList(*aLinePolygonPart);
}
if(aLineHairlinePart)
{
- pGroup->InsertObjectToSdrObjList(aLineHairlinePart);
+ pGroup->InsertObjectToSdrObjList(*aLineHairlinePart);
}
pRet = pGroup;
@@ -2260,7 +2297,16 @@ SdrObject* SdrObject::ConvertToContourOb
for(sal_uInt32 a(0); a < pObjList2->GetObjCount(); a++)
{
SdrObject* pIterObj = pObjList2->GetObj(a);
- pGroup->InsertObjectToSdrObjList(ConvertToContourObj(pIterObj, bForceLineDash));
+ SdrObject* pConverted = ConvertToContourObj(pIterObj, bForceLineDash);
+
+ if(pConverted)
+ {
+ pGroup->InsertObjectToSdrObjList(*pConverted);
+ }
+ else
+ {
+ OSL_ENSURE(false, "OOps, ConvertToContourObj() returned NO shape (!)");
+ }
}
pRet = pGroup;
@@ -2436,75 +2482,6 @@ void SdrObject::DeleteUserData(sal_uInt3
}
}
-// ItemPool fuer dieses Objekt wechseln
-void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel)
-{
- if(pSrcPool && pDestPool && (pSrcPool != pDestPool))
- {
- GetProperties().MoveToItemPool(pSrcPool, pDestPool, pNewModel);
- }
-}
-
-bool SdrObject::IsTransparent( bool /*bCheckForAlphaChannel*/) const // TTTT: bool needed?
-{
- bool bRet = false;
-
- if(getChildrenOfSdrObject())
- {
- SdrObjListIter aIter(*getChildrenOfSdrObject(), IM_DEEPNOGROUPS);
-
- for(SdrObject* pO = aIter.Next(); pO && !bRet; pO = aIter.Next())
- {
- const SfxItemSet& rAttr = pO->GetMergedItemSet();
-
- if( ( ( (const XFillTransparenceItem&) rAttr.Get( XATTR_FILLTRANSPARENCE ) ).GetValue() ||
- ( (const XLineTransparenceItem&) rAttr.Get( XATTR_LINETRANSPARENCE ) ).GetValue() ) ||
- ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
- ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
- {
- bRet = true;
- }
- else
- {
- SdrGrafObj* pGrafObj = dynamic_cast< SdrGrafObj* >(pO);
-
- if(pGrafObj)
- {
- if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ||
- ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) )
- {
- bRet = true;
- }
- }
- }
- }
- }
- else
- {
- const SfxItemSet& rAttr = GetMergedItemSet();
-
- if( ( ( (const XFillTransparenceItem&) rAttr.Get( XATTR_FILLTRANSPARENCE ) ).GetValue() ||
- ( (const XLineTransparenceItem&) rAttr.Get( XATTR_LINETRANSPARENCE ) ).GetValue() ) ||
- ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
- ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
- {
- bRet = true;
- }
- else
- {
- const SdrGrafObj* pGrafObj = dynamic_cast< const SdrGrafObj* >(this);
-
- if(pGrafObj)
- {
- // #i25616#
- bRet = pGrafObj->IsObjectTransparent();
- }
- }
- }
-
- return bRet;
-}
-
void SdrObject::impl_setUnoShape( const uno::Reference< uno::XInterface >& _rxUnoShape )
{
maWeakUnoShape = _rxUnoShape;
@@ -2610,7 +2587,6 @@ void SdrObject::setSdrObjectTransformati
}
}
-// return if fill is != XFILL_NONE
bool SdrObject::HasFillStyle() const
{
return (((const XFillStyleItem&)GetObjectItem(XATTR_FILLSTYLE)).GetValue() != XFILL_NONE);
@@ -2621,7 +2597,6 @@ bool SdrObject::HasLineStyle() const
return (((const XLineStyleItem&)GetObjectItem(XATTR_LINESTYLE)).GetValue() != XLINE_NONE);
}
-
// #i52224#
// on import of OLE object from MS documents the BLIP size might be retrieved,
// the following four methods are used to control it;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx Wed May 2 14:47:40 2012
@@ -745,12 +745,12 @@ SdrObject* SdrCaptionObj::DoConvertToPol
if(bInsRect)
{
- pOL->InsertObjectToSdrObjList(pRect);
+ pOL->InsertObjectToSdrObjList(*pRect);
}
if(bInsTail)
{
- pOL->InsertObjectToSdrObjList(pTail, 0);
+ pOL->InsertObjectToSdrObjList(*pTail, 0);
}
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx Wed May 2 14:47:40 2012
@@ -956,24 +956,6 @@ void SdrGrafObj::handlePageChange(SdrPag
// -----------------------------------------------------------------------------
-void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/, long /*nExtraData*/)
-{
- // #111096#
- // use new graf animation
- SetGrafAnimationAllowed(true);
-}
-
-// -----------------------------------------------------------------------------
-
-void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
-{
- // #111096#
- // use new graf animation
- SetGrafAnimationAllowed(false);
-}
-
-// -----------------------------------------------------------------------------
-
bool SdrGrafObj::HasGDIMetaFile() const
{
return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE );
@@ -1114,10 +1096,10 @@ SdrObject* SdrGrafObj::DoConvertToPolygo
pGrp = new SdrObjGroup(getSdrModelFromSdrObject());
pGrp->SetLayer(GetLayer());
- pGrp->getChildrenOfSdrObject()->InsertObjectToSdrObjList(pRetval);
+ pGrp->getChildrenOfSdrObject()->InsertObjectToSdrObjList(*pRetval);
}
- pGrp->getChildrenOfSdrObject()->InsertObjectToSdrObjList(pLineFill, 0);
+ pGrp->getChildrenOfSdrObject()->InsertObjectToSdrObjList(*pLineFill, 0);
}
else
{
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx Wed May 2 14:47:40 2012
@@ -421,7 +421,7 @@ SdrObject* SdrObjGroup::DoConvertToPolyg
// pResult can be NULL e.g. for empty objects
if(pResult)
{
- pGroup->InsertObjectToSdrObjList(pResult);
+ pGroup->InsertObjectToSdrObjList(*pResult);
}
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx Wed May 2 14:47:40 2012
@@ -1054,7 +1054,7 @@ SdrObject* SdrMeasureObj::DoConvertToPol
pPath = new SdrPathObj(getSdrModelFromSdrObject(), OBJ_PATHLINE, aPolyPoly);
pPath->SetMergedItemSet(aSet);
pPath->SetStyleSheet(pStyleSheet, true);
- pGroup->InsertObjectToSdrObjList(pPath);
+ pGroup->InsertObjectToSdrObjList(*pPath);
aSet.Put(XLineStartWidthItem(0L));
aSet.Put(XLineEndWidthItem(0L));
nLoopStart = 1;
@@ -1072,7 +1072,7 @@ SdrObject* SdrMeasureObj::DoConvertToPol
pPath->SetMergedItemSet(aSet);
pPath->SetStyleSheet(pStyleSheet, true);
- pGroup->InsertObjectToSdrObjList(pPath);
+ pGroup->InsertObjectToSdrObjList(*pPath);
aSet.Put(XLineEndWidthItem(nEndWidth));
aSet.Put(XLineStartWidthItem(0L));
@@ -1083,7 +1083,7 @@ SdrObject* SdrMeasureObj::DoConvertToPol
pPath->SetMergedItemSet(aSet);
pPath->SetStyleSheet(pStyleSheet, true);
- pGroup->InsertObjectToSdrObjList(pPath);
+ pGroup->InsertObjectToSdrObjList(*pPath);
aSet.Put(XLineEndWidthItem(0L));
nLoopStart = 2;
@@ -1101,7 +1101,7 @@ SdrObject* SdrMeasureObj::DoConvertToPol
pPath->SetMergedItemSet(aSet);
pPath->SetStyleSheet(pStyleSheet, true);
- pGroup->InsertObjectToSdrObjList(pPath);
+ pGroup->InsertObjectToSdrObjList(*pPath);
aSet.Put(XLineEndWidthItem(nEndWidth));
aSet.Put(XLineStartWidthItem(0L));
@@ -1112,7 +1112,7 @@ SdrObject* SdrMeasureObj::DoConvertToPol
pPath->SetMergedItemSet(aSet);
pPath->SetStyleSheet(pStyleSheet, true);
- pGroup->InsertObjectToSdrObjList(pPath);
+ pGroup->InsertObjectToSdrObjList(*pPath);
aSet.Put(XLineEndWidthItem(0L));
nLoopStart = 2;
@@ -1126,7 +1126,7 @@ SdrObject* SdrMeasureObj::DoConvertToPol
pPath->SetMergedItemSet(aSet);
pPath->SetStyleSheet(pStyleSheet, true);
- pGroup->InsertObjectToSdrObjList(pPath);
+ pGroup->InsertObjectToSdrObjList(*pPath);
}
if(bAddText)
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxtr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxtr.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxtr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxtr.cxx Wed May 2 14:47:40 2012
@@ -164,7 +164,7 @@ SdrObject* SdrTextObj::ImpConvertContain
// apply prepared ItemSet and add to target
pPathObj->SetMergedItemSet(aAttributeSet);
- pObjectList->InsertObjectToSdrObjList(pPathObj);
+ pObjectList->InsertObjectToSdrObjList(*pPathObj);
}
}
@@ -266,7 +266,7 @@ SdrObject* SdrTextObj::ImpConvertAddText
{
// is already group object, add partial shape in front
SdrObjList* pOL = pText->getChildrenOfSdrObject();
- pOL->InsertObjectToSdrObjList(pObj, 0);
+ pOL->InsertObjectToSdrObjList(*pObj, 0);
return pText;
}
@@ -274,8 +274,8 @@ SdrObject* SdrTextObj::ImpConvertAddText
{
// not yet a group, create one and add partial and new shapes
SdrObjGroup* pGrp = new SdrObjGroup(getSdrModelFromSdrObject());
- pGrp->InsertObjectToSdrObjList(pObj);
- pGrp->InsertObjectToSdrObjList(pText);
+ pGrp->InsertObjectToSdrObjList(*pObj);
+ pGrp->InsertObjectToSdrObjList(*pText);
return pGrp;
}