[Libreoffice-commits] core.git: svx/source

[Tor Lillqvist]

 svx/source/sdr/contact/objectcontactofpageview.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16d0e0b8077de0cb67e312b1b7397fd8ab7d03d8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 4 13:28:09 2014 +0200

    HAVE_FEATURE_DESKTOP is always defined, it is 0 or 1
    
    One should not use #ifdef (or #if defined) on the macros from
    <config_features.h>.
    
    Fix mistake introduced in 663a8c79700da18e45ed5f69391f5fc1f2406229.

diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 4722632..e2a1357 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -243,7 +243,7 @@ namespace sdr
             updateViewInformation2D(aNewViewInformation2D);
 
             drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence;
-#if defined( HAVE_FEATURE_DESKTOP ) || defined( ANDROID )
+#if HAVE_FEATURE_DESKTOP || defined( ANDROID )
             // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D
             // and may use the MapMode from the Target OutDev in the DisplayInfo
             xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo);