[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 12 commits - configure.ac cui/source drawinglayer/source external/liborcus framework/source icon-themes/sifr sfx2/source vcl/headless vcl/unx xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Sun Dec 6 05:28:30 PST 2015
configure.ac | 2
cui/source/inc/autocdlg.hxx | 2
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 35 ++++++++++++--
external/liborcus/UnpackedTarball_liborcus.mk | 1
external/liborcus/unusedheader.patch.0 | 11 ++++
framework/source/services/autorecovery.cxx | 2
icon-themes/sifr/cmd/lc_entirecolumn.png |binary
icon-themes/sifr/cmd/lc_entirerow.png |binary
icon-themes/sifr/cmd/lc_insertcolumnsafter.png |binary
icon-themes/sifr/cmd/lc_insertcolumnsbefore.png |binary
icon-themes/sifr/cmd/lc_insertrowsafter.png |binary
icon-themes/sifr/cmd/lc_insertrowsbefore.png |binary
icon-themes/sifr/cmd/sc_entirecolumn.png |binary
icon-themes/sifr/cmd/sc_entirerow.png |binary
icon-themes/sifr/cmd/sc_insertcolumnsafter.png |binary
icon-themes/sifr/cmd/sc_insertcolumnsbefore.png |binary
icon-themes/sifr/cmd/sc_insertrowsafter.png |binary
icon-themes/sifr/cmd/sc_insertrowsbefore.png |binary
sfx2/source/dialog/dinfdlg.cxx | 15 +++---
sfx2/source/sidebar/SidebarController.cxx | 1
vcl/headless/svpgdi.cxx | 4 -
vcl/unx/gtk/window/gtksalframe.cxx | 15 +++++-
xmlsecurity/source/xmlsec/saxhelper.cxx | 2
23 files changed, 72 insertions(+), 18 deletions(-)
New commits:
commit ea7a663ce1eeb0ecb8d89421e2b0f5f09507c75b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 2 14:41:11 2015 +0000
unnecessary include brings in boost headers that are broken under rhel-7
(cherry picked from commit 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b)
(cherry picked from commit 7587f8bab881303f77864dae03999048e43c642f)
Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
Reviewed-on: https://gerrit.libreoffice.org/20354
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit a18fed7db4f4a5cd85b08dce516a38e874758be6)
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index 126f250..63e5421 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -30,6 +30,7 @@ liborcus_patches += visibility.patch
# f60d6eecee72349993a392a9a63ddf3383d3b8c8 at 2>:
liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+liborcus_patches += unusedheader.patch.0
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
diff --git a/external/liborcus/unusedheader.patch.0 b/external/liborcus/unusedheader.patch.0
new file mode 100644
index 0000000..4f7a77b
--- /dev/null
+++ b/external/liborcus/unusedheader.patch.0
@@ -0,0 +1,11 @@
+--- ./src/parser/pstring.cpp.orig 2015-12-02 14:38:44.658744408 +0000
++++ ./src/parser/pstring.cpp 2015-12-02 14:38:50.449658497 +0000
+@@ -13,8 +13,6 @@
+ #include <iostream>
+ #include <vector>
+
+-#include <boost/thread/mutex.hpp>
+-
+ using namespace std;
+
+ namespace orcus {
commit 1072274697c3774049f3ad439b11f1fedff65326
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 3 09:12:40 2015 +0000
Resolves: tdf#95960 displaced field value in user-defined properties
Change-Id: Idc9e8fd0c35de48a2366dca3850bcc4e69ef997f
(cherry picked from commit afc565bf26464a4999b45d8bc57545fa1ff534e5)
(cherry picked from commit 46c5197feec5e64544433f2d6e22cf986408552a)
Reviewed-on: https://gerrit.libreoffice.org/20368
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 69725ffe0d17811984c8d52073262b5e76ae7080)
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0e47101..6de3b56 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1449,16 +1449,19 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
m_pCurrentLine (NULL),
m_aNumberFormatter( ::comphelper::getProcessComponentContext(),
Application::GetSettings().GetLanguageTag().getLanguageType() )
-
{
- m_aEditButton->SetPosSizePixel(
- LogicToPixel(Point(159, 2), MAP_APPFONT),
+ Point aPos(LogicToPixel(Point(159, 2), MAP_APPFONT));
+
+ m_aEditButton->SetPosSizePixel(aPos,
LogicToPixel(Size(RSC_CD_TEXTBOX_HEIGHT, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT));
+
m_aRemoveButton->SetSizePixel(LogicToPixel(Size(RSC_CD_PUSHBUTTON_HEIGHT, RSC_CD_PUSHBUTTON_HEIGHT), MAP_APPFONT));
- m_aValueEdit->SetPosSizePixel(
- LogicToPixel(Point(159, 2), MAP_APPFONT),
- LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT));
+ Size aSize(LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT));
+ m_aValueEdit->SetPosSizePixel(aPos, aSize);
+ m_aDurationField->SetPosSizePixel(aPos, aSize);
+ m_aDateField->SetPosSizePixel(aPos, aSize);
+ m_aTimeField->SetPosSizePixel(aPos, aSize);
m_aEditLoseFocusIdle.SetPriority( SchedulerPriority::LOWEST );
m_aEditLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
commit 991d5609a6e5ccd71027cce8f96550e242e43d4b
Author: Matthias Freund <matti_lx at secure.mailbox.org>
Date: Sun Nov 29 22:50:44 2015 +0100
tdf#75256 - sifr updates
Change-Id: I222bd8bb4c647c2c7d2a673b95e4c9be3234ef86
Reviewed-on: https://gerrit.libreoffice.org/20273
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 224ceff5f2c64ff47f4e687ac674d0a320bb9872)
diff --git a/icon-themes/sifr/cmd/lc_entirecolumn.png b/icon-themes/sifr/cmd/lc_entirecolumn.png
new file mode 100644
index 0000000..9351a37
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_entirecolumn.png differ
diff --git a/icon-themes/sifr/cmd/lc_entirerow.png b/icon-themes/sifr/cmd/lc_entirerow.png
new file mode 100644
index 0000000..14cf5b0
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_entirerow.png differ
diff --git a/icon-themes/sifr/cmd/lc_insertcolumnsafter.png b/icon-themes/sifr/cmd/lc_insertcolumnsafter.png
new file mode 100644
index 0000000..7b243a2
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertcolumnsafter.png differ
diff --git a/icon-themes/sifr/cmd/lc_insertcolumnsbefore.png b/icon-themes/sifr/cmd/lc_insertcolumnsbefore.png
new file mode 100644
index 0000000..80d14a8
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertcolumnsbefore.png differ
diff --git a/icon-themes/sifr/cmd/lc_insertrowsafter.png b/icon-themes/sifr/cmd/lc_insertrowsafter.png
new file mode 100644
index 0000000..188ede0
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertrowsafter.png differ
diff --git a/icon-themes/sifr/cmd/lc_insertrowsbefore.png b/icon-themes/sifr/cmd/lc_insertrowsbefore.png
new file mode 100644
index 0000000..2e74751
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertrowsbefore.png differ
diff --git a/icon-themes/sifr/cmd/sc_entirecolumn.png b/icon-themes/sifr/cmd/sc_entirecolumn.png
new file mode 100644
index 0000000..2eaeddd
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_entirecolumn.png differ
diff --git a/icon-themes/sifr/cmd/sc_entirerow.png b/icon-themes/sifr/cmd/sc_entirerow.png
new file mode 100644
index 0000000..1dc44e9
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_entirerow.png differ
diff --git a/icon-themes/sifr/cmd/sc_insertcolumnsafter.png b/icon-themes/sifr/cmd/sc_insertcolumnsafter.png
new file mode 100644
index 0000000..7a34046
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_insertcolumnsafter.png differ
diff --git a/icon-themes/sifr/cmd/sc_insertcolumnsbefore.png b/icon-themes/sifr/cmd/sc_insertcolumnsbefore.png
new file mode 100644
index 0000000..a2d7ced
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_insertcolumnsbefore.png differ
diff --git a/icon-themes/sifr/cmd/sc_insertrowsafter.png b/icon-themes/sifr/cmd/sc_insertrowsafter.png
new file mode 100644
index 0000000..051aa1d
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_insertrowsafter.png differ
diff --git a/icon-themes/sifr/cmd/sc_insertrowsbefore.png b/icon-themes/sifr/cmd/sc_insertrowsbefore.png
new file mode 100644
index 0000000..246f47c
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_insertrowsbefore.png differ
commit a26a76fb25745b3c9b2a19a7b3f855c3a8bcd03d
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 27 09:33:42 2015 +0100
xmlsecurity: fix DrMemory warning
Presumably that was the intent?
(cherry picked from commit a933990a3f24f7c3ed40500f782f6fcb25462824)
Change-Id: Ibfca90041d6913827d2f329bab448afe4d725b46
Reviewed-on: https://gerrit.libreoffice.org/20289
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 3faec544285e898c87cbeb37ef787d698d617bb6)
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index b017efa..f281dfd 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -137,7 +137,7 @@ SAXHelper::SAXHelper( )
{
xmlSAXVersion(m_pParserCtxt->sax, 1);
- if( m_pParserCtxt->inputTab[0] != NULL )
+ if (m_pParserCtxt->inputTab != nullptr)
{
m_pParserCtxt->inputTab[0] = NULL ;
}
commit 4982db9047476b742ebc7b02fee8dfa96a5c58db
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Nov 30 11:38:21 2015 +0100
rhbz#1286416: Be more resilient during auto-recovery attempts
...called from within the signal handler, so any bets are off
Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6
(cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef)
Reviewed-on: https://gerrit.libreoffice.org/20282
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 85a4677c201c3957db55ddd66506526d908e7947)
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8b75271..b05fdc3 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2480,6 +2480,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
return;
css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame();
+ if (!xFrame.is())
+ return;
css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY);
if (!xDesktop.is())
return;
commit 513c6092542b0fffa505299545308001a0091c5f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 30 16:42:15 2015 +0000
gtk3: implement GetIndicatorState
(cherry picked from commit 503864037b2f6b73979f46d11df5d365b81f9dcf)
(cherry picked from commit 6408b735283751cf6cacb8c758b99a2d90a9868a)
Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
Reviewed-on: https://gerrit.libreoffice.org/20312
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 754990128f177779e3279a3b06bc768ea2954621)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index a28c144..0e58788 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3047,8 +3047,19 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState()
#if !GTK_CHECK_VERSION(3,0,0)
return GetGtkSalData()->GetGtkDisplay()->GetIndicatorState();
#else
- g_warning ("missing get indicator state");
- return KeyIndicatorState::NONE;
+ KeyIndicatorState nState = KeyIndicatorState::NONE;
+
+ GdkKeymap *pKeyMap = gdk_keymap_get_for_display(getGdkDisplay());
+
+ if (gdk_keymap_get_caps_lock_state(pKeyMap))
+ nState |= KeyIndicatorState::CAPSLOCK;
+ if (gdk_keymap_get_num_lock_state(pKeyMap))
+ nState |= KeyIndicatorState::NUMLOCK;
+#if GTK_CHECK_VERSION(3,18,0)
+ if (gdk_keymap_get_scroll_lock_state(pKeyMap))
+ nState |= KeyIndicatorState::SCROLLLOCK;
+#endif
+ return nState;
#endif
}
commit 82074023fa78df4802abbdd53ae546f9402efea8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 30 15:29:03 2015 +0000
gtk3: glitches because yours truly cannot tell x from y
(cherry picked from commit 2ca429e781cba94608e9838e2c1c50f1e8632b90)
(cherry picked from commit 9401a065d0d53b31427f85a936ef53244ac8a6b8)
Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5
Reviewed-on: https://gerrit.libreoffice.org/20311
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 81aeddfd6ae6f760fd11d73091b5891882dc1d62)
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 06030d9..cc4baab 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -144,11 +144,11 @@ namespace
double x1, y1, x2, y2;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
- extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+ extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1;
cairo_region_t *region = cairo_region_create_rectangle(&extents);
cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
- extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+ extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1;
cairo_region_intersect_rectangle(region, &extents);
cairo_region_get_extents(region, &extents);
commit 0a2995d34424521c2d7310fe03642a5f289b4e5e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Nov 30 15:14:35 2015 +0100
cui: GCC 4.6 still doesn't do "override"
But you can use SAL_OVERRIDE instead.
Change-Id: I2697593606ef3ff63f923e364d0ea7e5661b1b3a
Reviewed-on: https://gerrit.libreoffice.org/20297
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 85cabc28b9a762a884972a857a6ac6f70e4bcb56)
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 4302e0a..fc2a823 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -187,7 +187,7 @@ class AutoCorrEdit : public Edit
sal_Int32 m_nCol;
bool bSpaces;
- void dispose() override;
+ void dispose() SAL_OVERRIDE;
public:
AutoCorrEdit(vcl::Window* pParent, const ResId& rResId)
commit 300a2acc9a994692fbd8a428aeaf27ddd431c4f4
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 30 15:07:50 2015 +0100
try to fix MSVC build
Because i'm an idiot i pushed a commit without looking at the jenkins
build failure...
Change-Id: I8e7a02d6c1d20c2231288ea050986064f1f814c8
(cherry picked from commit b0c13c4927c536e845614f1e7a171b7eed680f35)
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index ba55f41..7c66c2c 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -27,6 +27,8 @@
#include <vcl/lazydelete.hxx>
#include <vcl/dibtools.hxx>
+#include <map>
+
// buffered VDev usage
commit f187d16d445a2bf66b5685586e86569f05863556
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 27 16:10:10 2015 +0000
Resolves: rhbz#1283426 using vdevs based on now dead physical devs is unsafe
This is the same problem that
commit 133e04fc1a870c0aad207e82eefeeeceaba5dc6d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 17 09:23:32 2015 +0100
Resolves: tdf#91880 Invalidate graphics when the gtk window is destroyed
not just when the GtkSalFrame is dtored
tried to fix, but that just made it more unlikely to fail
(cherry picked from commit 26c32cfee9fc9a769adba19f455e4d6c13b6d89d)
(cherry picked from commit aab8bed7c0c0cf4d72af7d8a9d84316280887417)
Change-Id: Icba750c787adb6cd5c5ed0874ef07e6201c4cf25
Reviewed-on: https://gerrit.libreoffice.org/20231
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 43697500af7649ef74cf6bf4bb78abe2e99fed63)
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 93919c0..ba55f41 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -43,6 +43,11 @@ namespace
// allocated/used buffers (remembered to allow deleting them in destructor)
aBuffers maUsedBuffers;
+ // remember what outputdevice was the template passed to VirtualDevice::Create
+ // so we can test if that OutputDevice was disposed before reusing a
+ // virtualdevice because that isn't safe to do at least for Gtk2
+ std::map< VclPtr<VirtualDevice>, VclPtr<OutputDevice> > maDeviceTemplates;
+
public:
VDevBuffer();
virtual ~VDevBuffer();
@@ -88,14 +93,14 @@ namespace
if (nBits == 0)
nBits = rOutDev.GetBitCount();
+ bool bOkay(false);
if(!maFreeBuffers.empty())
{
- bool bOkay(false);
aBuffers::iterator aFound(maFreeBuffers.end());
for(aBuffers::iterator a(maFreeBuffers.begin()); a != maFreeBuffers.end(); ++a)
{
- OSL_ENSURE(*a, "Empty pointer in VDevBuffer (!)");
+ assert(*a && "Empty pointer in VDevBuffer (!)");
if(nBits == (*a)->GetBitCount())
{
@@ -145,10 +150,25 @@ namespace
{
pRetval = *aFound;
maFreeBuffers.erase(aFound);
+ }
+ }
- if(bOkay)
+ if (pRetval)
+ {
+ // found a suitable cached virtual device, but the
+ // outputdevice it was based on has been disposed,
+ // drop it and create a new one instead as reusing
+ // such devices is unsafe under at least Gtk2
+ if (maDeviceTemplates[pRetval]->isDisposed())
+ {
+ maDeviceTemplates.erase(pRetval);
+ pRetval = nullptr;
+ }
+ else
+ {
+ if (bOkay)
{
- if(bClear)
+ if (bClear)
{
pRetval->Erase(Rectangle(0, 0, rSizePixel.getWidth(), rSizePixel.getHeight()));
}
@@ -164,6 +184,7 @@ namespace
if(!pRetval)
{
pRetval = VclPtr<VirtualDevice>::Create(rOutDev, nBits);
+ maDeviceTemplates[pRetval] = &rOutDev;
pRetval->SetOutputSizePixel(rSizePixel, bClear);
}
else
@@ -197,7 +218,9 @@ namespace
while(!maFreeBuffers.empty())
{
- (*(maFreeBuffers.end() - 1)).disposeAndClear();
+ aBuffers::iterator aLastOne(maFreeBuffers.end() - 1);
+ maDeviceTemplates.erase(*aLastOne);
+ aLastOne->disposeAndClear();
maFreeBuffers.pop_back();
}
}
commit ed1370641e26ea371bcd1daa1c48f101f22785b2
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Sat Nov 28 02:33:34 2015 +0100
tdf#94689 fix crash on new file, close file, open file
partially cherry-picked from the
commit 187445b2d2885ced92be37ffb11cd2a9bb11f8d6
Change-Id: I9e74fb41448c6be0b8daa6c0f8a0e207be0be6d6
Reviewed-on: https://gerrit.libreoffice.org/20250
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: jan iversen <jani at documentfoundation.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit 6d101b6296962b444f535eeb2ff37580dc9bb60c)
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 9afa3f5..ae82afc 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -229,6 +229,7 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
{
maAsynchronousDeckSwitch.CancelRequest();
maContextChangeUpdate.RequestCall();
+ UpdateConfigurations();
}
}
commit 536a5611d9de8b3f08fdf0128335a8b52c66e725
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun Dec 6 14:28:14 2015 +0100
Bump version to 5.0-12
Change-Id: I48c23a3c31b527164b365061c2b14a27c392802c
diff --git a/configure.ac b/configure.ac
index f78057a..37753d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([Collabora Office],[5.0.10.11],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.12],[],[],[https://CollaboraOffice.com/])
AC_PREREQ([2.59])
More information about the Libreoffice-commits
mailing list