Skip to content

C
core
Kaydet (Commit) 6d960bd7 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Unindent. 

Change-Id: I1b65915b7d864f1a69f48fcacf38e7aec23c38a4
üst 946daff6
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 101 deletions
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
Dosyayı görüntüle @ 6d960bd7
...@@ -32,129 +32,124 @@ ...@@ -32,129 +32,124 @@
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include <svtools/embedhlp.hxx> #include <svtools/embedhlp.hxx>
using namespace com::sun::star; using namespace com::sun::star;
namespace sdr { namespace contact {
const SdrOle2Obj& ViewObjectContactOfSdrOle2Obj::getSdrOle2Object() const
{
return static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).GetOle2Obj();
}
namespace sdr drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence(
const DisplayInfo& /*rDisplayInfo*/) const
{ {
namespace contact // this method is overloaded to do some things the old SdrOle2Obj::DoPaintObject did.
// In the future, some of these may be solved different, but ATM try to stay compatible
// with the old behaviour
drawinglayer::primitive2d::Primitive2DSequence xRetval;
const SdrOle2Obj& rSdrOle2 = getSdrOle2Object();
sal_Int32 nState(-1);
{ {
const SdrOle2Obj& ViewObjectContactOfSdrOle2Obj::getSdrOle2Object() const const svt::EmbeddedObjectRef& xObjRef = rSdrOle2.getEmbeddedObjectRef();
if ( xObjRef.is() )
nState = xObjRef->getCurrentState();
}
const bool bIsOutplaceActive(nState == embed::EmbedStates::ACTIVE);
const bool bIsInplaceActive((nState == embed::EmbedStates::INPLACE_ACTIVE) || (nState == embed::EmbedStates::UI_ACTIVE));
bool bDone(false);
if(!bDone && bIsInplaceActive)
{
if( !GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile() )
{ {
return static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).GetOle2Obj(); //no need to create a primitive sequence here as the OLE object does render itself
//in case of charts the superfluous creation of a metafile is strongly performance relevant!
bDone = true;
} }
}
drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence( if( !bDone )
const DisplayInfo& /*rDisplayInfo*/) const {
//old stuff that should be reworked
{ {
// this method is overloaded to do some things the old SdrOle2Obj::DoPaintObject did. //if no replacement image is available load the OLE object
// In the future, some of these may be solved different, but ATM try to stay compatible // if(!rSdrOle2.GetGraphic()) //try to fetch the metafile - this can lead to the actual creation of the metafile what can be extremely expensive (e.g. for big charts)!!! #i101925#
// with the old behaviour // {
drawinglayer::primitive2d::Primitive2DSequence xRetval; // // try to create embedded object
const SdrOle2Obj& rSdrOle2 = getSdrOle2Object(); // rSdrOle2.GetObjRef(); //this loads the OLE object if it is not loaded already
sal_Int32 nState(-1); // }
const svt::EmbeddedObjectRef& xObjRef = rSdrOle2.getEmbeddedObjectRef();
if(xObjRef.is())
{ {
const svt::EmbeddedObjectRef& xObjRef = rSdrOle2.getEmbeddedObjectRef(); const sal_Int64 nMiscStatus(xObjRef->getStatus(rSdrOle2.GetAspect()));
if ( xObjRef.is() )
nState = xObjRef->getCurrentState();
}
const bool bIsOutplaceActive(nState == embed::EmbedStates::ACTIVE);
const bool bIsInplaceActive((nState == embed::EmbedStates::INPLACE_ACTIVE) || (nState == embed::EmbedStates::UI_ACTIVE));
bool bDone(false);
if(!bDone && bIsInplaceActive) // this hack (to change model data during PAINT argh(!)) should be reworked
{ if(!rSdrOle2.IsResizeProtect() && (nMiscStatus & embed::EmbedMisc::EMBED_NEVERRESIZE))
if( !GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile() )
{ {
//no need to create a primitive sequence here as the OLE object does render itself const_cast< SdrOle2Obj* >(&rSdrOle2)->SetResizeProtect(true);
//in case of charts the superfluous creation of a metafile is strongly performance relevant!
bDone = true;
} }
}
if( !bDone ) SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
{ if(pPageView && ((nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) ||
//old stuff that should be reworked xObjRef.IsGLChart()))
{ {
//if no replacement image is available load the OLE object // connect plugin object
// if(!rSdrOle2.GetGraphic()) //try to fetch the metafile - this can lead to the actual creation of the metafile what can be extremely expensive (e.g. for big charts)!!! #i101925# pPageView->GetView().DoConnect(const_cast< SdrOle2Obj* >(&rSdrOle2));
// {
// // try to create embedded object
// rSdrOle2.GetObjRef(); //this loads the OLE object if it is not loaded already
// }
const svt::EmbeddedObjectRef& xObjRef = rSdrOle2.getEmbeddedObjectRef();
if(xObjRef.is())
{
const sal_Int64 nMiscStatus(xObjRef->getStatus(rSdrOle2.GetAspect()));
// this hack (to change model data during PAINT argh(!)) should be reworked
if(!rSdrOle2.IsResizeProtect() && (nMiscStatus & embed::EmbedMisc::EMBED_NEVERRESIZE))
{
const_cast< SdrOle2Obj* >(&rSdrOle2)->SetResizeProtect(true);
}
SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
if(pPageView && ((nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) ||
xObjRef.IsGLChart()))
{
// connect plugin object
pPageView->GetView().DoConnect(const_cast< SdrOle2Obj* >(&rSdrOle2));
}
}
}//end old stuff to rework
// create OLE primitive stuff directly at VC with HC as parameter
const ViewContactOfSdrOle2Obj& rVC = static_cast< const ViewContactOfSdrOle2Obj& >(GetViewContact());
xRetval = rVC.createPrimitive2DSequenceWithParameters();
if(bIsOutplaceActive)
{
// do not shade when printing or PDF exporting
if(!GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile())
{
// get object transformation
const basegfx::B2DHomMatrix aObjectMatrix(static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).createObjectTransform());
// shade the representation if the object is activated outplace
basegfx::B2DPolygon aObjectOutline(basegfx::tools::createUnitPolygon());
aObjectOutline.transform(aObjectMatrix);
// Use a FillHatchPrimitive2D with necessary attributes
const drawinglayer::attribute::FillHatchAttribute aFillHatch(
drawinglayer::attribute::HATCHSTYLE_SINGLE, // single hatch
125.0, // 1.25 mm
45.0 * F_PI180, // 45 degree diagonal
Color(COL_BLACK).getBColor(), // black color
3, // same default as VCL, a minimum of three discrete units (pixels) offset
false); // no filling
const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonHatchPrimitive2D(
basegfx::B2DPolyPolygon(aObjectOutline),
Color(COL_BLACK).getBColor(),
aFillHatch));
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReference);
}
} }
} }
}//end old stuff to rework
return xRetval; // create OLE primitive stuff directly at VC with HC as parameter
} const ViewContactOfSdrOle2Obj& rVC = static_cast< const ViewContactOfSdrOle2Obj& >(GetViewContact());
xRetval = rVC.createPrimitive2DSequenceWithParameters();
ViewObjectContactOfSdrOle2Obj::ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact) if(bIsOutplaceActive)
: ViewObjectContactOfSdrObj(rObjectContact, rViewContact)
{ {
// do not shade when printing or PDF exporting
if(!GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile())
{
// get object transformation
const basegfx::B2DHomMatrix aObjectMatrix(static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).createObjectTransform());
// shade the representation if the object is activated outplace
basegfx::B2DPolygon aObjectOutline(basegfx::tools::createUnitPolygon());
aObjectOutline.transform(aObjectMatrix);
// Use a FillHatchPrimitive2D with necessary attributes
const drawinglayer::attribute::FillHatchAttribute aFillHatch(
drawinglayer::attribute::HATCHSTYLE_SINGLE, // single hatch
125.0, // 1.25 mm
45.0 * F_PI180, // 45 degree diagonal
Color(COL_BLACK).getBColor(), // black color
3, // same default as VCL, a minimum of three discrete units (pixels) offset
false); // no filling
const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonHatchPrimitive2D(
basegfx::B2DPolyPolygon(aObjectOutline),
Color(COL_BLACK).getBColor(),
aFillHatch));
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReference);
}
} }
ViewObjectContactOfSdrOle2Obj::~ViewObjectContactOfSdrOle2Obj() }
{
} return xRetval;
} // end of namespace contact }
} // end of namespace sdr
ViewObjectContactOfSdrOle2Obj::ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact)
: ViewObjectContactOfSdrObj(rObjectContact, rViewContact)
{
}
ViewObjectContactOfSdrOle2Obj::~ViewObjectContactOfSdrOle2Obj()
{
}
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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