sw/source/ui/docvw/edtwin.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1574c76ec20d1da479ed7e9c85a6cefacc132dfe
Author: Maxime de Roucy <mdero...@linagora.com>
Date: Wed Mar 14 18:26:07 2012 +0100
Format paintbrush default behaviour
Don't copy paragraph formats by default
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 4fd5a68..09e9633 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4338,15 +4338,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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
