[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                      |    1 
 patches/dev300/sw-font-color-gui-fix.diff |   34 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

New commits:
commit baa9573ff2fafa3e1839bf45c4e5667601fb6302
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Nov 24 12:03:42 2010 +0100

    n#652204: Font color selection didn't effect new text
    
    * patches/dev300/apply: applied the patch
    * patches/dev300/sw-font-color-gui-fix.diff: the patch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 304d6ec..9095210 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3050,6 +3050,7 @@ dummy-fields-ole-links.diff, n#628098, cbosdo
 fields-nested-set.diff, n#634478, cbosdo
 fields-double-click.diff, n#639288, cbosdo
 sw-ww8-colbreak-import.diff, n#652364, cbosdo
+sw-font-color-gui-fix.diff, n#652204, cbosdo
 
 [ IxionUse ]
 fields-table-formula.diff, n#631912, cbosdo
diff --git a/patches/dev300/sw-font-color-gui-fix.diff b/patches/dev300/sw-font-color-gui-fix.diff
new file mode 100644
index 0000000..6a26cf0
--- /dev/null
+++ b/patches/dev300/sw-font-color-gui-fix.diff
@@ -0,0 +1,34 @@
+diff --git sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/textsh1.cxx
+index 1d2fe1b..6457c36 100644
+--- sw/source/ui/shells/textsh1.cxx
++++ sw/source/ui/shells/textsh1.cxx
+@@ -1100,27 +1100,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
+                 SvxColorItem aItem(aSet, RES_CHRATR_COLOR);
+ 
+                 // besteht eine Selektion, wird sie gleich gefaerbt
+-                if(!pApply && rWrtSh.HasSelection())
+-                {
+-                    rWrtSh.SetAttr(SvxColorItem (aSet, RES_CHRATR_COLOR));
+-                }
+-                else if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_EXT)
++                if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_EXT)
+                 {
+-                    GetView().GetViewFrame()->GetDispatcher()->Execute(SID_ATTR_CHAR_COLOR_EXT);
++                    rWrtSh.SetAttr(aItem);
+                 }
+ 
+                 rReq.Done();
+-/*		 		OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht
+-                SwEditWin& rEdtWin = GetView().GetEditWin();
+-
+-                SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
+-                SvxColorItem aItem(aSet, RES_CHRATR_COLOR);
+-
+-                if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_EXT)
+-                {
+-                    GetShell().SetAttr(aItem);
+-                }
+-*/
+             }
+         }
+         break;