From: buliabyak <buliabyak@users.sourceforge.net>
Date: Fri, 15 Feb 2008 10:07:50 +0000 (+0000)
Subject: fix logic of sp_desktop_query_style_all so that copy/pasting style could work on... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3fddc0e00a92085075f2a64c0b85bba30912b31e;p=inkscape.git

fix logic of sp_desktop_query_style_all so that copy/pasting style could work on text selections
---

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 7ff2be2c8..619986b57 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -1317,8 +1317,8 @@ sp_desktop_query_style(SPDesktop *desktop, SPStyle *style, int property)
 }
 
 /**
- * Do the same as sp_desktop_query_style for all (defined) style properties, return true if none of
- * the properties returned QUERY_STYLE_NOTHING.
+ * Do the same as sp_desktop_query_style for all (defined) style properties, return true if at 
+ * least one of the properties did not return QUERY_STYLE_NOTHING.
  */
 bool
 sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query)
@@ -1335,7 +1335,17 @@ sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query)
         int result_opacity = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_MASTEROPACITY);
         int result_blur = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_BLUR);
         
-        return (result_family != QUERY_STYLE_NOTHING && result_fstyle != QUERY_STYLE_NOTHING && result_fnumbers != QUERY_STYLE_NOTHING && result_fill != QUERY_STYLE_NOTHING && result_stroke != QUERY_STYLE_NOTHING && result_opacity != QUERY_STYLE_NOTHING && result_strokewidth != QUERY_STYLE_NOTHING && result_strokemiterlimit != QUERY_STYLE_NOTHING && result_strokecap != QUERY_STYLE_NOTHING && result_strokejoin != QUERY_STYLE_NOTHING && result_blur != QUERY_STYLE_NOTHING);
+        return (result_family != QUERY_STYLE_NOTHING || 
+                result_fstyle != QUERY_STYLE_NOTHING || 
+                result_fnumbers != QUERY_STYLE_NOTHING || 
+                result_fill != QUERY_STYLE_NOTHING || 
+                result_stroke != QUERY_STYLE_NOTHING || 
+                result_opacity != QUERY_STYLE_NOTHING || 
+                result_strokewidth != QUERY_STYLE_NOTHING || 
+                result_strokemiterlimit != QUERY_STYLE_NOTHING ||
+                result_strokecap != QUERY_STYLE_NOTHING ||
+                result_strokejoin != QUERY_STYLE_NOTHING ||
+                result_blur != QUERY_STYLE_NOTHING);
 }