diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-02 22:07:59 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-02 22:07:59 +0200 |
commit | ae0493ccfe7c232557fb87eef4d0444709d8b729 (patch) | |
tree | a4d2989d853bfdff9aa21ccd4d9f4b8aa4d5f047 | |
parent | d7c82096e74123a9bd8325592bec78a4675b777c (diff) |
got the ctors the wrong way around, fix resid loaded previews
Change-Id: I0a00a5bbd4616fd72e947cacd72ef23d38147638
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index c8d1e39eea99..ba848b9f6aac 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1838,32 +1838,19 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId ) { InitSettings( sal_True, sal_True ); - mpLineObjA = new SdrPathObj(OBJ_LINE); - mpLineObjA->SetModel(&getModel()); - - mpLineObjB = new SdrPathObj(OBJ_PLIN); - mpLineObjB->SetModel(&getModel()); - - mpLineObjC = new SdrPathObj(OBJ_PLIN); - mpLineObjC->SetModel(&getModel()); -} - -void SvxXLinePreview::Resize() -{ - SvxPreviewBase::Resize(); - const Size aOutputSize(GetOutputSize()); const sal_Int32 nDistance(500L); const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); - // create DrawObectA + // create DrawObjectA const sal_Int32 aYPosA(aOutputSize.Height() / 2); const basegfx::B2DPoint aPointA1( nDistance, aYPosA); const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA ); basegfx::B2DPolygon aPolygonA; aPolygonA.append(aPointA1); aPolygonA.append(aPointA2); - mpLineObjA->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonA)); + mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA)); + mpLineObjA->SetModel(&getModel()); // create DrawObectB const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4); @@ -1875,42 +1862,37 @@ void SvxXLinePreview::Resize() aPolygonB.append(aPointB1); aPolygonB.append(aPointB2); aPolygonB.append(aPointB3); - mpLineObjB->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonB)); + mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB)); + mpLineObjB->SetModel(&getModel()); // create DrawObectC - basegfx::B2DPolygon aPolygonC; const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1); const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 ); const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 ); + basegfx::B2DPolygon aPolygonC; aPolygonC.append(aPointC1); aPolygonC.append(aPointC2); aPolygonC.append(aPointC3); - mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC)); + mpLineObjC = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonC)); + mpLineObjC->SetModel(&getModel()); } -SvxXLinePreview::SvxXLinePreview( Window* pParent) -: SvxPreviewBase( pParent ), -mpLineObjA( 0L ), -mpLineObjB( 0L ), -mpLineObjC( 0L ), -mpGraphic( 0L ), -mbWithSymbol( sal_False ) +void SvxXLinePreview::Resize() { - const Size aOutputSize(GetOutputSize()); - InitSettings( true, true ); + SvxPreviewBase::Resize(); + const Size aOutputSize(GetOutputSize()); const sal_Int32 nDistance(500L); const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); - // create DrawObjectA + // create DrawObectA const sal_Int32 aYPosA(aOutputSize.Height() / 2); const basegfx::B2DPoint aPointA1( nDistance, aYPosA); const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA ); basegfx::B2DPolygon aPolygonA; aPolygonA.append(aPointA1); aPolygonA.append(aPointA2); - mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA)); - mpLineObjA->SetModel(&getModel()); + mpLineObjA->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonA)); // create DrawObectB const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4); @@ -1922,26 +1904,44 @@ mbWithSymbol( sal_False ) aPolygonB.append(aPointB1); aPolygonB.append(aPointB2); aPolygonB.append(aPointB3); - mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB)); - mpLineObjB->SetModel(&getModel()); + mpLineObjB->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonB)); // create DrawObectC + basegfx::B2DPolygon aPolygonC; const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1); const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 ); const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 ); - basegfx::B2DPolygon aPolygonC; aPolygonC.append(aPointC1); aPolygonC.append(aPointC2); aPolygonC.append(aPointC3); - mpLineObjC = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonC)); + mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC)); +} + +SvxXLinePreview::SvxXLinePreview(Window* pParent) + : SvxPreviewBase(pParent) + , mpLineObjA(NULL) + , mpLineObjB(NULL) + , mpLineObjC(NULL) + , mpGraphic(NULL) + , mbWithSymbol(false) +{ + InitSettings( true, true ); + + mpLineObjA = new SdrPathObj(OBJ_LINE); + mpLineObjA->SetModel(&getModel()); + + mpLineObjB = new SdrPathObj(OBJ_PLIN); + mpLineObjB->SetModel(&getModel()); + + mpLineObjC = new SdrPathObj(OBJ_PLIN); mpLineObjC->SetModel(&getModel()); } + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXLinePreview(Window *pParent, VclBuilder::stringmap &) { return new SvxXLinePreview(pParent); } - SvxXLinePreview::~SvxXLinePreview() { SdrObject *pFoo = mpLineObjA; |