diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:25:01 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:25:01 +0200 |
| commit | 002c16ce95fa6e384e7541b6e656b9058dd9b459 (patch) | |
| tree | c713903d39a6fa16db64fcf311b7b09a09528cfa /sw/source/ui/misc/bookmark.cxx | |
| parent | 870bf01177cda3e80d200b785040e0ebe248b263 (diff) | |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 884b525da5856cbd2c4a382e73327d8c59a91acc (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:09 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit b59804d94e107c5227532aa3511d4fad1dd15436
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 17:47:27 2011 +0100
Related: fdo#32553/fdo#31792 nsure correct odt mimetype and pdf export filter
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/ui/dbui/mmoutputpage.cxx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
commit d1234b1bcd542b4ce523b6be76e7491afdce4de8
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 12:29:41 2011 +0000
Resolves: fdo#32553 freeze/hang on mailmerge to attached pdf
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/core/docnode/nodes.cxx | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
commit 5974be757044982b8f510c5fc642e8e03ae62c74
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Mar 8 16:32:57 2011 +0100
n#663622: Fix the positions of imported fields to avoid crashes
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/core/crsr/bookmrk.cxx | 2 +-
sw/source/core/inc/bookmrk.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: writer_libreoffice-3.3.3.1
Diffstat (limited to 'sw/source/ui/misc/bookmark.cxx')
| -rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index d70f0a99d308..e865a41477ba 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ #include "view.hxx" #include "basesh.hxx" -#include "wrtsh.hxx" // +#include "wrtsh.hxx" // #include "cmdid.h" -#include "bookmark.hxx" // SwInsertBookmarkDlg -#include "IMark.hxx" +#include "bookmark.hxx" // SwInsertBookmarkDlg +#include "IMark.hxx" #include "bookmark.hrc" #include "misc.hrc" @@ -78,8 +78,8 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) } - aOkBtn.Enable(!bSelEntries); // neue Textmarke - aDeleteBtn.Enable(bSelEntries); // loeschbar? + aOkBtn.Enable(!bSelEntries); // neue Textmarke + aDeleteBtn.Enable(bSelEntries); // loeschbar? return 0; } @@ -95,10 +95,10 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG ) aBookmarkBox.RemoveEntry(aBookmarkBox.GetSelectEntryPos(i - 1)); aBookmarkBox.SetText(aEmptyStr); - aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden + aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden // aBookmarkBox.SetText(aEmptyStr); - aOkBtn.Enable(); // Im OK Handler wird geloescht + aOkBtn.Enable(); // Im OK Handler wird geloescht return 0; } @@ -122,8 +122,8 @@ void SwInsertBookmarkDlg::Apply() } // Textmarke einfuegen - USHORT nLen = aBookmarkBox.GetText().Len(); - SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 ); + USHORT nLen = aBookmarkBox.GetText().Len(); + SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 ); if ( nLen && (aBookmarkBox.GetEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND) ) { |