[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svtools/source

[Julien Nabet]

 svtools/source/contnr/treelistbox.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5d647341feac4ef2870923bde70ddcff33a24032
Author: Julien Nabet 
Date:   Thu Dec 8 22:21:52 2016 +0100

tdf#104495: prevent autotext to crash when drag

See bt https://bugs.documentfoundation.org/attachment.cgi?id=129407

For non regression, I retested tdf#91125 since the delete comes from

https://cgit.freedesktop.org/libreoffice/core/commit/?id=06ecf7d2aebe64226142ee27c2512351960f8bb1

Change-Id: I7ce833ffce20f1f159242014ba8ffe0ce5b7b11c
Reviewed-on: https://gerrit.libreoffice.org/31773
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 8776c20c1c72110d0f205150913eb17cdf3f1aaa)
Reviewed-on: https://gerrit.libreoffice.org/31784
Reviewed-by: Michael Meeks 
(cherry picked from commit 56261b0bb06e29b71e2cc555086100282e54d62e)
Reviewed-on: https://gerrit.libreoffice.org/31793

diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index b73d4df..6a53c7c 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1230,7 +1230,6 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& 
rPosPixel )
 {
 nDragDropMode = nOldDragMode;
 DragFinished( DND_ACTION_NONE );
-delete pContainer;
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svtools/source

[Caolán McNamara]

 svtools/source/control/valueset.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 934c79c22ee63c25538e25b18d780377cc09f3af
Author: Caolán McNamara 
Date:   Wed Aug 31 10:58:49 2016 +0100

Resolves: tdf#98100 no valueset tooltips with extended tips...

and no offline help available. I feel this was the original
(day-0-checkin) intent of the code, otherwise why bother with
the "| HelpEventMode::BALLOON" as that makes no difference
to the existing logic. And this per-item help is what other
similiar widgets do.

Change-Id: Idda130450db322acefd9ecc13986067790f9a614
(cherry picked from commit 281027ea88d4d683449d4ce2cdb0563223741465)
Reviewed-on: https://gerrit.libreoffice.org/28542
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index e3bdbeb..d411eea 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1494,7 +1494,7 @@ void ValueSet::Resize()
 
 void ValueSet::RequestHelp( const HelpEvent& rHelpEvent )
 {
-if ( (rHelpEvent.GetMode() & (HelpEventMode::QUICK | 
HelpEventMode::BALLOON)) == HelpEventMode::QUICK )
+if (rHelpEvent.GetMode() & (HelpEventMode::QUICK | HelpEventMode::BALLOON))
 {
 Point aPos = ScreenToOutputPixel( rHelpEvent.GetMousePosPixel() );
 size_t nItemPos = ImplGetItem( aPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svtools/source

[Caolán McNamara]

 svtools/source/control/ctrlbox.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2adc91069d73d47bfae2a78ff408d21339aba17c
Author: Caolán McNamara 
Date:   Thu Jul 28 21:30:55 2016 +0100

Resolves: tdf#94940 don't load font history if option is disabled

Change-Id: I70348b4e4bb85850331044e901c03aabb0d22ef8
(cherry picked from commit 171586cc4df4a9470251e50ce51338c2d53acf9b)
Reviewed-on: https://gerrit.libreoffice.org/27657
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index e64b0a5..20fdb89 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -982,7 +983,11 @@ void FontNameBox::SaveMRUEntries( const OUString& 
aFontMRUEntriesFile ) const
 
 void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile )
 {
-if( aFontMRUEntriesFile.isEmpty() )
+if (aFontMRUEntriesFile.isEmpty())
+return;
+
+SvtFontOptions aFontOpt;
+if (!aFontOpt.IsFontHistoryEnabled())
 return;
 
 SvFileStream aStream( aFontMRUEntriesFile, StreamMode::READ );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svtools/source

[Caolán McNamara]

 svtools/source/misc/ehdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0effc85942dcfc1b2f96a5671e0acc8f05d47db3
Author: Caolán McNamara 
Date:   Thu Jun 23 09:41:40 2016 +0100

VclPtr: svtools error message dialog doesn't dispose

Change-Id: I83640cc60d5e0239d228c749c32f896df5e2d9f2
(cherry picked from commit d531743ca34232aedc0b437a9ff5807dea8d51ed)
Reviewed-on: https://gerrit.libreoffice.org/26587
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 4579966..6f0864d 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -137,6 +137,7 @@ static sal_uInt16 aWndFunc(
 SAL_WARN( "svtools.misc", "Unknown MessBox return value" );
 break;
 }
+pBox.disposeAndClear();
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits