Hello

Two new patchs that modify the default behaviour of the format
paintbrush.

0001-Format-paintbrush-default-behaviour.patch
To apply to the core repository.

0001-Change-format-paintbrush.patch
To apply to the help repository.

By default the paintbrush doesn't copy the paragraph formatting ; if
Ctrl is hold, paragraph and character formatting are copied ; if Ctrl
and Shift are hold, only the paragraph formatting is copied.

Regards

Maxime de Roucy

-- 
Maxime de Roucy
Groupe LINAGORA - OSSA
80 rue Roque de Fillol
92800 PUTEAUX
Tel. : 0 810 251 251


From a95ca339d7292882f2ee7a841fb08ce3b481852a Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <mdero...@linagora.com>
Date: Wed, 14 Mar 2012 18:26:07 +0100
Subject: [PATCH] Format paintbrush default behaviour

Don't copy paragraph formats by default
---
 sw/source/ui/docvw/edtwin.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index bb2daba..8084596 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4317,15 +4317,18 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
             SwWrtShell& rWrtShell = rView.GetWrtShell();
             SfxStyleSheetBasePool* pPool=0;
             bool bNoCharacterFormats = false;
-            bool bNoParagraphFormats = false;
+            bool bNoParagraphFormats = true;
             {
                 SwDocShell* pDocSh = rView.GetDocShell();
                 if(pDocSh)
                     pPool = pDocSh->GetStyleSheetPool();
                 if( (rMEvt.GetModifier()&KEY_MOD1) && (rMEvt.GetModifier()&KEY_SHIFT) )
+                {
                     bNoCharacterFormats = true;
+                    bNoParagraphFormats = false;
+                }
                 else if( rMEvt.GetModifier() & KEY_MOD1 )
-                    bNoParagraphFormats = true;
+                    bNoParagraphFormats = false;
             }
             //execute paste
             pFormatClipboard->Paste( rWrtShell, pPool, bNoCharacterFormats, bNoParagraphFormats );
-- 
1.7.9.4

From eb9c56218da94e67755f0472a41bc636e9723057 Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <mdero...@linagora.com>
Date: Wed, 14 Mar 2012 18:12:41 +0100
Subject: [PATCH] Change format paintbrush

Only copy character formatting by default.
---
 .../source/text/shared/guide/paintbrush.xhp        |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index fbe064b..c31bc36 100644
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -66,8 +66,7 @@
             <paragraph xml-lang="en-US" id="par_idN1066E" role="paragraph" l10n="NEW">Select or click the text or object that you want to apply the formatting to.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_idN10716" role="tip" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+      <paragraph xml-lang="en-US" id="par_idN10716" role="tip" l10n="NEW">By default only the character formatting is copied ; to include paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To copy only the paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
       <table id="tbl_id599688">
@@ -154,4 +153,4 @@
       </table>
 
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
-- 
1.7.9.4

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to