Kaydet (Commit) ae0493cc authored tarafından Caolán McNamara's avatar Caolán McNamara

got the ctors the wrong way around, fix resid loaded previews

Change-Id: I0a00a5bbd4616fd72e947cacd72ef23d38147638
üst d7c82096
...@@ -1838,32 +1838,19 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId ) ...@@ -1838,32 +1838,19 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
{ {
InitSettings( sal_True, sal_True ); 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 Size aOutputSize(GetOutputSize());
const sal_Int32 nDistance(500L); const sal_Int32 nDistance(500L);
const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
// create DrawObectA // create DrawObjectA
const sal_Int32 aYPosA(aOutputSize.Height() / 2); const sal_Int32 aYPosA(aOutputSize.Height() / 2);
const basegfx::B2DPoint aPointA1( nDistance, aYPosA); const basegfx::B2DPoint aPointA1( nDistance, aYPosA);
const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA ); const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA );
basegfx::B2DPolygon aPolygonA; basegfx::B2DPolygon aPolygonA;
aPolygonA.append(aPointA1); aPolygonA.append(aPointA1);
aPolygonA.append(aPointA2); aPolygonA.append(aPointA2);
mpLineObjA->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonA)); mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA));
mpLineObjA->SetModel(&getModel());
// create DrawObectB // create DrawObectB
const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4); const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4);
...@@ -1875,42 +1862,37 @@ void SvxXLinePreview::Resize() ...@@ -1875,42 +1862,37 @@ void SvxXLinePreview::Resize()
aPolygonB.append(aPointB1); aPolygonB.append(aPointB1);
aPolygonB.append(aPointB2); aPolygonB.append(aPointB2);
aPolygonB.append(aPointB3); aPolygonB.append(aPointB3);
mpLineObjB->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonB)); mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB));
mpLineObjB->SetModel(&getModel());
// create DrawObectC // create DrawObectC
basegfx::B2DPolygon aPolygonC;
const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1); const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1);
const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 ); const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 );
const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 ); const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 );
basegfx::B2DPolygon aPolygonC;
aPolygonC.append(aPointC1); aPolygonC.append(aPointC1);
aPolygonC.append(aPointC2); aPolygonC.append(aPointC2);
aPolygonC.append(aPointC3); aPolygonC.append(aPointC3);
mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC)); mpLineObjC = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonC));
mpLineObjC->SetModel(&getModel());
} }
SvxXLinePreview::SvxXLinePreview( Window* pParent) void SvxXLinePreview::Resize()
: SvxPreviewBase( pParent ),
mpLineObjA( 0L ),
mpLineObjB( 0L ),
mpLineObjC( 0L ),
mpGraphic( 0L ),
mbWithSymbol( sal_False )
{ {
const Size aOutputSize(GetOutputSize()); SvxPreviewBase::Resize();
InitSettings( true, true );
const Size aOutputSize(GetOutputSize());
const sal_Int32 nDistance(500L); const sal_Int32 nDistance(500L);
const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
// create DrawObjectA // create DrawObectA
const sal_Int32 aYPosA(aOutputSize.Height() / 2); const sal_Int32 aYPosA(aOutputSize.Height() / 2);
const basegfx::B2DPoint aPointA1( nDistance, aYPosA); const basegfx::B2DPoint aPointA1( nDistance, aYPosA);
const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA ); const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength * 14) / 20), aYPosA );
basegfx::B2DPolygon aPolygonA; basegfx::B2DPolygon aPolygonA;
aPolygonA.append(aPointA1); aPolygonA.append(aPointA1);
aPolygonA.append(aPointA2); aPolygonA.append(aPointA2);
mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA)); mpLineObjA->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonA));
mpLineObjA->SetModel(&getModel());
// create DrawObectB // create DrawObectB
const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4); const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4);
...@@ -1922,26 +1904,44 @@ mbWithSymbol( sal_False ) ...@@ -1922,26 +1904,44 @@ mbWithSymbol( sal_False )
aPolygonB.append(aPointB1); aPolygonB.append(aPointB1);
aPolygonB.append(aPointB2); aPolygonB.append(aPointB2);
aPolygonB.append(aPointB3); aPolygonB.append(aPointB3);
mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB)); mpLineObjB->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonB));
mpLineObjB->SetModel(&getModel());
// create DrawObectC // create DrawObectC
basegfx::B2DPolygon aPolygonC;
const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1); const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1);
const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 ); const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 );
const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 ); const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength * 1) / 20), aYPosB1 );
basegfx::B2DPolygon aPolygonC;
aPolygonC.append(aPointC1); aPolygonC.append(aPointC1);
aPolygonC.append(aPointC2); aPolygonC.append(aPointC2);
aPolygonC.append(aPointC3); 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()); mpLineObjC->SetModel(&getModel());
} }
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXLinePreview(Window *pParent, VclBuilder::stringmap &) extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXLinePreview(Window *pParent, VclBuilder::stringmap &)
{ {
return new SvxXLinePreview(pParent); return new SvxXLinePreview(pParent);
} }
SvxXLinePreview::~SvxXLinePreview() SvxXLinePreview::~SvxXLinePreview()
{ {
SdrObject *pFoo = mpLineObjA; SdrObject *pFoo = mpLineObjA;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment