[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Tor Lillqvist]

 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31a6ebe912305eff610d91497831e6ddd213f964
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 12 17:04:49 2013 +0300

    Don't display the "broken OLE link" icon except on Windows
    
    Change-Id: Iede3d98ab5e5f9cd1896465e2a8c61605601999f
    (cherry picked from commit fbb7c74a2c5cd37d4ff27deb154656655f047bbc)
    Reviewed-on: https://gerrit.libreoffice.org/4472
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 7177957..25dad75 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -51,7 +51,7 @@ namespace drawinglayer
                     bScaleContent = pSource->IsEmptyPresObj();
                 }
             }
-
+#ifdef WNT // Little point in displaying the "broken OLE" graphic on OSes that don't have real OLE, maybe?
             if(GRAPHIC_NONE == aGraphic.GetType())
             {
                 // no source, use fallback resource emty OLE graphic
@@ -59,7 +59,7 @@ namespace drawinglayer
                 aGraphic = Graphic(aEmptyOLEBitmap);
                 bScaleContent = true;
             }
-
+#endif
             if(GRAPHIC_NONE != aGraphic.GetType())
             {
                 const GraphicObject aGraphicObject(aGraphic);