summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-08-14 12:21:55 +0100
committerKohei Yoshida <kohei.yoshida@collabora.com>2013-12-13 09:00:24 -0500
commit415b47827fae8ad0c2a747ca9b062170f00f1e7c (patch)
treeec0905154e1418cd57a153e3eafa56bdd5d7fe70
parent3943b59c17f6fd8988b4d8c7aebd662ce387a6d6 (diff)
Revert "Always disable anti-aliasing for drawing cell borders." fdo#60805
Unfortunately this patch creates a very weird ( and took me forever to find ) bug ( fdo#60805 ). Basically certain double line borders seems to dissappear at certain zoom levels. I guess maybe its possible to tweak the create2DDecomposition to process the line as hairline at those problematic zoom levels ( but I suspect that actually would look worse ) Best maybe would be to tweak the rendering/painting ( but isn't that processor specific maybe ? ) as is maybe this problem. I admit this is outside my comfort zone :/ This reverts commit a551cad4e35b6b664167d65dfc25e5a0f6990687. Change-Id: Idb25493ffb038cb1f8ae9b364a29052abafd940d (cherry picked from commit 1b3f3ce53a26ba52d27784a2f9adbffcbd6169f3)
-rw-r--r--sc/source/ui/view/output.cxx30
1 files changed, 4 insertions, 26 deletions
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 71d469e780a1..1a5cddee00d4 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -24,7 +24,6 @@
#include <editeng/brushitem.hxx>
#include <editeng/editdata.hxx>
#include <svtools/colorcfg.hxx>
-#include "svtools/optionsdrawinglayer.hxx"
#include <svx/rotmodit.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/svxfont.hxx>
@@ -1280,7 +1279,10 @@ void ScOutputData::DrawClear()
}
}
-namespace {
+
+//
+// Linien
+//
long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel )
{
@@ -1297,32 +1299,8 @@ size_t lclGetArrayColFromCellInfoX( sal_uInt16 nCellInfoX, sal_uInt16 nCellInfoF
return static_cast< size_t >( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) : (nCellInfoX - nCellInfoFirstX) );
}
-/**
- * Temporarily turn off antialiasing.
- */
-class AntiAliasingSwitch
-{
- SvtOptionsDrawinglayer maDrawOpt;
- bool mbOldSetting;
-public:
- AntiAliasingSwitch(bool bOn) : mbOldSetting(maDrawOpt.IsAntiAliasing())
- {
- maDrawOpt.SetAntiAliasing(bOn);
- }
-
- ~AntiAliasingSwitch()
- {
- maDrawOpt.SetAntiAliasing(mbOldSetting);
- }
-};
-
-}
-
void ScOutputData::DrawFrame()
{
- // No anti-aliasing for drawing cell borders.
- AntiAliasingSwitch aAASwitch(false);
-
sal_uLong nOldDrawMode = mpDev->GetDrawMode();
Color aSingleColor;