[Libreoffice-commits] .: 3 commits - solenv/gbuild sw/inc sw/source

[Michael Stahl]

 solenv/gbuild/UnoApiTarget.mk   |    6 +++---
 sw/inc/editsh.hxx               |    1 -
 sw/source/core/edit/edattr.cxx  |    1 +
 sw/source/ui/shells/textsh1.cxx |    8 +++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 37af4b002422f889ceecc21474a4b049f516b72e
Author: Aldo Román Nureña <aldo.roman.nurena at gmail.com>
Date:   Sun Apr 8 23:39:12 2012 -0500

    fdo#35042: previous color applied instead of "no fill"
    
    There was a missing line when last select highlight color was "no fill"

diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1e8ef39..9cb232b 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1120,15 +1120,17 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if(pItem)
             {
                 aSet = ((const SvxColorItem*)pItem)->GetValue();
-                rEdtWin.SetTextBackColor(aSet);
+                rEdtWin.SetTextBackColor(aSet); //select last color
             }
+            else
+                rEdtWin.SetTextBackColor(Color(COL_TRANSPARENT)); //if last was "no fill"
             if(!pApply && (rWrtSh.HasSelection() || rReq.IsAPI()))
             {
                 SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
                 if(pItem)
-                    aBrushItem.SetColor(aSet);
+                    aBrushItem.SetColor(aSet); //set the selected color
                 else
-                    aBrushItem.SetColor(Color(COL_TRANSPARENT));
+                    aBrushItem.SetColor(Color(COL_TRANSPARENT));//set "no fill" color
                 rWrtSh.SetAttr( aBrushItem );
             }
             else if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
commit 2dca19256f28b04aed07c63f10ba07c16ff81542
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 10 13:03:01 2012 +0200

    move include out of editsh.hxx

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 051d39a..ecb77d5 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -44,7 +44,6 @@
 #include <tblenum.hxx>
 #include <IMark.hxx>
 
-#include <algorithm>
 #include <vector>
 #include <set>
 #include <swundo.hxx>
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 8ccb5d3..d2b7a70 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -56,6 +56,7 @@
 #include <charfmt.hxx>  // #i27615#
 #include <numrule.hxx>
 
+#include <algorithm>
 
 /*************************************
  * harte Formatierung (Attribute)
commit 7042f9bc5b4bdf64555ce7313425702594cdb7e2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 10 12:00:31 2012 +0200

    UnoApiTarget.mk: whitespace

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 02d2391..64ed831 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -196,7 +196,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) :| \
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl
 $(call gb_UnoApiTarget_get_dep_target,$(1)) : \
-       $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
+	$(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
 $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \
 	$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
 endif
@@ -301,10 +301,10 @@ $(call gb_UnoApiHeadersTarget_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs_native,\
 		rm -rf \
 			$(call gb_UnoApiHeadersTarget_get_dir,$*) \
-		   	$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
+			$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
 			$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*) \
 			$(call gb_UnoApiHeadersTarget_get_target,$*) \
-		   	$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*)) \
+			$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*)) \
 			$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*)
 
 define gb_UnoApiHeadersTarget_UnoApiHeadersTarget