summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-23 22:27:57 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-04-25 08:20:18 +0000
commit63397e1e699845e92e3046fd50bbbdcba6512a32 (patch)
tree2162b1321fe972abe0125fc01c633159a7085666
parentfixed a mess of out of bounds string accesses (diff)
downloadcore-63397e1e699845e92e3046fd50bbbdcba6512a32.tar.gz
core-63397e1e699845e92e3046fd50bbbdcba6512a32.zip
fdo#60280: sw: restore anti-aliasing for all OLE objects
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the anti-aliasing always but reset it only for Charts. (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e (cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c) Reviewed-on: https://gerrit.libreoffice.org/3589 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit f3e8a9649ac653eafaf8c5fa57e20d3dbe90d82c) Reviewed-on: https://gerrit.libreoffice.org/3594 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/doc/notxtfrm.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189a2707..a839420abf6f 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1143,8 +1143,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
}
// see #i99665#
- if ( pOLENd->IsChart() &&
- pShell->Imp()->GetDrawView()->IsAntiAliasing() )
+ if (pShell->Imp()->GetDrawView()->IsAntiAliasing())
{
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
}