unoshape.cxx (c7be74b1) unoshape.cxx (2d538b2c)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

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

87#include "svx/xlnstit.hxx"
88#include "svx/xlndsit.hxx"
89#include "svx/svdglob.hxx"
90#include "svx/svdstr.hrc"
91#include "svx/unomaster.hxx"
92#include <editeng/outlobj.hxx>
93#include <basegfx/matrix/b2dhommatrix.hxx>
94#include <basegfx/matrix/b2dhommatrixtools.hxx>
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

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

87#include "svx/xlnstit.hxx"
88#include "svx/xlndsit.hxx"
89#include "svx/svdglob.hxx"
90#include "svx/svdstr.hrc"
91#include "svx/unomaster.hxx"
92#include <editeng/outlobj.hxx>
93#include <basegfx/matrix/b2dhommatrix.hxx>
94#include <basegfx/matrix/b2dhommatrixtools.hxx>
95#include <basegfx/polygon/b2dpolypolygontools.hxx>
95
96#include <vector>
97
98// #i68523#
99#include "svx/lathe3d.hxx"
100#include "svx/extrud3d.hxx"
101#include "unopolyhelper.hxx"
102

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

2398 sal_Int32 nId = 0;
2399 if( rValue >>= nId )
2400 {
2401 pEdgeObj->setGluePointIndex( pProperty->nWID == OWN_ATTR_GLUEID_HEAD, nId );
2402 return true;
2403 }
2404 break;
2405 }
96
97#include <vector>
98
99// #i68523#
100#include "svx/lathe3d.hxx"
101#include "svx/extrud3d.hxx"
102#include "unopolyhelper.hxx"
103

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

2399 sal_Int32 nId = 0;
2400 if( rValue >>= nId )
2401 {
2402 pEdgeObj->setGluePointIndex( pProperty->nWID == OWN_ATTR_GLUEID_HEAD, nId );
2403 return true;
2404 }
2405 break;
2406 }
2406 case OWN_ATTR_EDGE_POLYPOLYGONBEZIER:
2407 {
2408 drawing::PolyPolygonBezierCoords aPolyPoly;
2409 if ( rValue >>= aPolyPoly )
2410 {
2411 basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) );
2407 case OWN_ATTR_EDGE_POLYPOLYGONBEZIER:
2408 {
2409 basegfx::B2DPolyPolygon aNewPolyPolygon;
2410
2411 // #123616# be a little bit more flexible regardin gthe data type used
2412 if( rValue.getValueType() == ::getCppuType(( const drawing::PointSequenceSequence*)0))
2413 {
2414 // get polygpon data from PointSequenceSequence
2415 aNewPolyPolygon = basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon(
2416 *(const drawing::PointSequenceSequence*)rValue.getValue());
2417 }
2418 else if( rValue.getValueType() == ::getCppuType(( const drawing::PolyPolygonBezierCoords*)0))
2419 {
2420 // get polygpon data from PolyPolygonBezierCoords
2421 aNewPolyPolygon = basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
2422 *(const drawing::PolyPolygonBezierCoords*)rValue.getValue());
2423 }
2424
2425 if(aNewPolyPolygon.count())
2426 {
2412 // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
2413 ForceMetricToItemPoolMetric( aNewPolyPolygon );
2414 // <--
2415 if( mpModel->IsWriter() )
2416 {
2417 Point aPoint( mpObj->GetAnchorPos() );
2418 aNewPolyPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(aPoint.X(), aPoint.Y()));
2419 }
2420 pEdgeObj->SetEdgeTrackPath( aNewPolyPolygon );
2421 return true;
2427 // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
2428 ForceMetricToItemPoolMetric( aNewPolyPolygon );
2429 // <--
2430 if( mpModel->IsWriter() )
2431 {
2432 Point aPoint( mpObj->GetAnchorPos() );
2433 aNewPolyPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(aPoint.X(), aPoint.Y()));
2434 }
2435 pEdgeObj->SetEdgeTrackPath( aNewPolyPolygon );
2436 return true;
2422 }
2423 }
2424 }
2437 }
2438 }
2439 }
2425 }
2426 break;
2427 }
2428 case OWN_ATTR_MEASURE_START_POS:
2429 case OWN_ATTR_MEASURE_END_POS:
2430 {
2431 SdrMeasureObj* pMeasureObj = dynamic_cast< SdrMeasureObj* >(mpObj.get());
2432 awt::Point aUnoPoint;

--- 2041 unchanged lines hidden --- 		2440 }
2441 break;
2442 }
2443 case OWN_ATTR_MEASURE_START_POS:
2444 case OWN_ATTR_MEASURE_END_POS:
2445 {
2446 SdrMeasureObj* pMeasureObj = dynamic_cast< SdrMeasureObj* >(mpObj.get());
2447 awt::Point aUnoPoint;

--- 2041 unchanged lines hidden ---