cid#1546444 COPY_INSTEAD_OF_MOVE
and cid#1546389 COPY_INSTEAD_OF_MOVE cid#1546388 COPY_INSTEAD_OF_MOVE cid#1546360 COPY_INSTEAD_OF_MOVE cid#1546158 COPY_INSTEAD_OF_MOVE Change-Id: I3707d55b88674dfb5ae786fc2cc45000862340de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160611 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
@@ -130,7 +130,7 @@ protected:
|
||||
with a new one), this new element must pass our own internal approval, plus the approval
|
||||
given here.
|
||||
*/
|
||||
void setElementApproval( PContainerApprove _pElementApproval ) { m_pElementApproval = _pElementApproval; }
|
||||
void setElementApproval(const PContainerApprove& _pElementApproval ) { m_pElementApproval = _pElementApproval; }
|
||||
const PContainerApprove& getElementApproval() const { return m_pElementApproval; }
|
||||
|
||||
protected:
|
||||
|
||||
@@ -52,12 +52,10 @@ namespace drawinglayer::primitive2d
|
||||
aObjectTransform.set(0, 2, getLocalObjectRange().getMinX());
|
||||
aObjectTransform.set(1, 2, getLocalObjectRange().getMinY());
|
||||
|
||||
Primitive2DReference xReference(
|
||||
aRetval.set(
|
||||
new BitmapPrimitive2D(
|
||||
getBitmapEx(),
|
||||
aObjectTransform));
|
||||
|
||||
aRetval = xReference;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -151,11 +149,10 @@ namespace drawinglayer::primitive2d
|
||||
aObjectTransform.set(0, 2, aTargetRange.getMinX());
|
||||
aObjectTransform.set(1, 2, aTargetRange.getMinY());
|
||||
|
||||
Primitive2DReference xReference(
|
||||
aRetval.set(
|
||||
new BitmapPrimitive2D(
|
||||
getBitmapEx(),
|
||||
aObjectTransform));
|
||||
aRetval = xReference;
|
||||
|
||||
// clip when not completely inside object range
|
||||
bNeedsClipping = !getLocalObjectRange().isInside(aTargetRange);
|
||||
@@ -188,11 +185,10 @@ namespace drawinglayer::primitive2d
|
||||
getLocalObjectRange().getMinimum()));
|
||||
|
||||
// create FillBitmapPrimitive
|
||||
const drawinglayer::primitive2d::Primitive2DReference xFillBitmap(
|
||||
aRetval.set(
|
||||
new drawinglayer::primitive2d::FillGraphicPrimitive2D(
|
||||
aObjectTransform,
|
||||
aFillGraphicAttribute));
|
||||
aRetval = xFillBitmap;
|
||||
|
||||
// always embed tiled fill to clipping
|
||||
bNeedsClipping = true;
|
||||
|
||||
@@ -127,9 +127,8 @@ void SvxDrawPage::dispose()
|
||||
// Create an event with this as sender
|
||||
try
|
||||
{
|
||||
uno::Reference< uno::XInterface > xSource( uno::Reference< uno::XInterface >::query( static_cast<lang::XComponent *>(this) ) );
|
||||
css::document::EventObject aEvt;
|
||||
aEvt.Source = xSource;
|
||||
aEvt.Source.set(uno::Reference<uno::XInterface>::query( static_cast<lang::XComponent *>(this) ));
|
||||
// inform all listeners to release this object
|
||||
// The listener container are automatically cleared
|
||||
mrBHelper.aLC.disposeAndClear( aEvt );
|
||||
|
||||
@@ -1525,8 +1525,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
|
||||
{
|
||||
// return nothing, because property <TextRange> isn't
|
||||
// valid for to-page anchored shapes
|
||||
uno::Any aAny;
|
||||
aRet = aAny;
|
||||
aRet = uno::Any();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -133,12 +133,11 @@ void ScriptEventContainer::removeByName( const OUString& Name )
|
||||
}
|
||||
|
||||
sal_Int32 iHashResult = (*aIt).second;
|
||||
Any aOldElement = mValues[ iHashResult ];
|
||||
|
||||
// Fire event
|
||||
ContainerEvent aEvent;
|
||||
aEvent.Source = *this;
|
||||
aEvent.Element = aOldElement;
|
||||
aEvent.Element = mValues[iHashResult];
|
||||
aEvent.Accessor <<= Name;
|
||||
maContainerListeners.elementRemoved( aEvent );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user