svdocapt.cxx (cdf0e10c) svdocapt.cxx (a5258243)
1/*************************************************************************
2 *
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * Copyright 2000, 2010 Oracle and/or its affiliates.
6 *
7 * OpenOffice.org - a multi-platform office productivity suite
8 *

--- 741 unchanged lines hidden (view full) ---

750
751void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
752{
753 SdrRectObj::RestGeoData(rGeo);
754 SdrCaptObjGeoData& rCGeo=(SdrCaptObjGeoData&)rGeo;
755 aTailPoly=rCGeo.aTailPoly;
756}
757
1/*************************************************************************
2 *
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * Copyright 2000, 2010 Oracle and/or its affiliates.
6 *
7 * OpenOffice.org - a multi-platform office productivity suite
8 *

--- 741 unchanged lines hidden (view full) ---

750
751void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
752{
753 SdrRectObj::RestGeoData(rGeo);
754 SdrCaptObjGeoData& rCGeo=(SdrCaptObjGeoData&)rGeo;
755 aTailPoly=rCGeo.aTailPoly;
756}
757
758SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const
758SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
759{ // #42334# - Convert implementiert
759{ // #42334# - Convert implementiert
760 SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier);
760 SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier, bAddText);
761 SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
762 SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
763 if (pTail!=NULL && pRect!=NULL) {
764 FASTBOOL bInsRect=sal_True;
765 FASTBOOL bInsTail=sal_True;
766 SdrObjList* pOL=pTail->GetSubList();
767 if (pOL!=NULL) { pRet=pRect; bInsTail=sal_False; }
768 if (pOL==NULL) pOL=pRect->GetSubList();

--- 83 unchanged lines hidden --- 		761 SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
762 SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
763 if (pTail!=NULL && pRect!=NULL) {
764 FASTBOOL bInsRect=sal_True;
765 FASTBOOL bInsTail=sal_True;
766 SdrObjList* pOL=pTail->GetSubList();
767 if (pOL!=NULL) { pRet=pRect; bInsTail=sal_False; }
768 if (pOL==NULL) pOL=pRect->GetSubList();

--- 83 unchanged lines hidden ---