[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 11 commits - basctl/source cppuhelper/source icon-themes/sifr javaunohelper/source oox/source svx/source sw/qa vcl/source vcl/unx vcl/win
Michael Meeks
michael.meeks at collabora.com
Mon Nov 16 10:02:58 PST 2015
basctl/source/basicide/baside3.cxx | 6 ++
basctl/source/inc/baside3.hxx | 3 -
cppuhelper/source/shlib.cxx | 22 +++++-----
icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png |binary
icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png |binary
icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png |binary
icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png |binary
icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png |binary
icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png |binary
javaunohelper/source/javaunohelper.cxx | 6 --
oox/source/shape/ShapeContextHandler.cxx | 2
svx/source/dialog/imapdlg.cxx | 13 ++++-
svx/source/svdraw/svdhdl.cxx | 5 --
svx/source/xoutdev/xtabcolr.cxx | 2
sw/qa/core/data/ooxml/pass/tdf89088.docx |binary
vcl/source/outdev/bitmap.cxx | 8 ++-
vcl/source/window/dialog.cxx | 1
vcl/unx/gtk/window/gtksalframe.cxx | 5 +-
vcl/win/source/window/salframe.cxx | 11 +----
26 files changed, 47 insertions(+), 37 deletions(-)
New commits:
commit 25aa4d4baf929cf41242e40cf45b860a66ca65ac
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Nov 12 17:38:25 2015 +0000
tdf#95551 - fix image map crash.
Remove listener we add, and don't crash on callback for disposed dialog.
Reviewed-on: https://gerrit.libreoffice.org/19936
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 45c6d948fbac77a8a6926f56579a4ceba981288f)
Conflicts:
svx/source/dialog/imapdlg.cxx
Change-Id: Ia6a1bddd212cb28a0331469e8e87324346d02841
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 0716dc9..fabf364 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -184,7 +184,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
m_pEdtText->SetModifyHdl( LINK( this, SvxIMapDlg, URLModifyHdl ) );
m_pCbbTarget->SetLoseFocusHdl( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) );
- SvtMiscOptions aMiscOptions;
+ SvtMiscOptions aMiscOptions;
aMiscOptions.AddListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) );
m_pTbxIMapDlg1->SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) );
@@ -222,6 +222,9 @@ void SvxIMapDlg::dispose()
{
pIMapWnd->SetUpdateLink( Link<>() );
+ SvtMiscOptions aMiscOptions;
+ aMiscOptions.RemoveListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) );
+
// Delete URL-List
pIMapWnd.disposeAndClear();
DELETEZ( pOwnData );
@@ -814,9 +817,11 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl)
{
- SvtMiscOptions aMiscOptions;
- m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() );
-
+ if (m_pTbxIMapDlg1)
+ {
+ SvtMiscOptions aMiscOptions;
+ m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() );
+ }
return 0L;
}
commit 80b682362b51453e39f6bad2f809f3e551710dd3
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 12 22:02:20 2015 +0100
svx: loplugin:badstatics
(cherry picked from commit d5016b013672056f89f908b6cde38183fad145bb)
Change-Id: Ief31d8153fdbf91cdd29df5ac7801bd88a98542e
Reviewed-on: https://gerrit.libreoffice.org/19955
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 d11d0915730f5eefda3f610a9e2c549a39cf655d)
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index c007892..93ea7df 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2252,10 +2252,7 @@ SdrCropHdl::SdrCropHdl(
BitmapEx SdrCropHdl::GetHandlesBitmap()
{
- static BitmapEx* pModernBitmap = 0;
- if( pModernBitmap == 0 )
- pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
- return *pModernBitmap;
+ return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index da2f0b3..c0d911b 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -36,7 +36,7 @@ XColorListRef XColorList::CreateStdColorList()
XColorListRef XColorList::GetStdColorList()
{
- static XColorListRef aTable( CreateStdColorList() );
+ XColorListRef aTable( CreateStdColorList() );
return aTable;
}
commit 676fb8497383758e8f8730841d83d5a24e214629
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 13 15:59:33 2015 +0100
Bogus assert
implementation can indeed be empty when cppu::writeSharedLibComponentInfo calls
getEnvironmentFromModule(mod, curEnv, "", ""), which in the final if-branch
calls getEnvironment with implementation = "". Happens when adding desktop/qa's
test-active.oxt. Regression introduced with
ae3a0c8da50b36db395984637f5ad74d3b4887bc "Add .component <implementation
constructor='...' feature."
(cherry picked from commit 97464be9808c0d349be8b84fea6973527496bf26)
Conflicts:
cppuhelper/source/shlib.cxx
Change-Id: Ia70958e4aa18d378ff35063bdf6187f6e073b765
Reviewed-on: https://gerrit.libreoffice.org/19956
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 2466c85c001761da6979e0e1b3a0b15d4b2bdd32)
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 258e9cb..a87071e 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -40,17 +40,19 @@
css::uno::Environment cppuhelper::detail::getEnvironment(
rtl::OUString const & name, rtl::OUString const & implementation)
{
- assert(!implementation.isEmpty());
rtl::OUString n(name);
- static char const * log = std::getenv("UNO_ENV_LOG");
- if (log != 0 && *log != 0) {
- rtl::OString imps(log);
- for (sal_Int32 i = 0; i != -1;) {
- rtl::OString imp(imps.getToken(0, ';', i));
- //TODO: this assumes UNO_ENV_LOG only contains ASCII characters:
- if (implementation.equalsAsciiL(imp.getStr(), imp.getLength())) {
- n += ":log";
- break;
+ if (!implementation.isEmpty()) {
+ static char const * log = std::getenv("UNO_ENV_LOG");
+ if (log != 0 && *log != 0) {
+ rtl::OString imps(log);
+ for (sal_Int32 i = 0; i != -1;) {
+ rtl::OString imp(imps.getToken(0, ';', i));
+ //TODO: this assumes UNO_ENV_LOG only contains ASCII characters:
+ if (implementation.equalsAsciiL(imp.getStr(), imp.getLength()))
+ {
+ n += ":log";
+ break;
+ }
}
}
}
commit c9bb754c44812968e18ca81e338669c3c6e385fa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 11 17:37:29 2015 +0000
coverity#1338592 Explicit null dereferenced
Change-Id: Ief5c2effbddebe29fc7a4d38ed0af4fed72de40e
(cherry picked from commit e08fbe4c592b25fb88828157ff054431ac8e2d8b)
Reviewed-on: https://gerrit.libreoffice.org/19915
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>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit b453342413fddbc808c39f5edd8b19ed49fff05d)
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index d91a081..145a753 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -69,8 +69,6 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
if (lib.is())
{
- lib.release();
-
// ========================= LATEST VERSION =========================
OUString aGetEnvName( COMPONENT_GETENV );
oslGenericFunction pSym = lib.getFunctionSymbol(aGetEnvName);
@@ -126,6 +124,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
}
}
}
+ lib.release();
}
#endif
return bRet ? JNI_TRUE : JNI_FALSE;
@@ -161,8 +160,6 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
if (lib.is())
{
- lib.release();
-
// ========================= LATEST VERSION =========================
OUString aGetEnvName( COMPONENT_GETENV );
oslGenericFunction pSym = lib.getFunctionSymbol(aGetEnvName);
@@ -232,6 +229,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
}
}
}
+ lib.release();
}
#endif
return joSLL_cpp;
commit a535f92dc70332c26468efd43d40db6675adc05c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 12 14:07:48 2015 +0000
Resolves: tdf#93847 gtk3: paint blocking is unnecessary and harmful
for gtk3. Probably also a fairly dumb idea for gtk2, but with the
extra unblocking opportunities it probably just "works out ok" in
that model.
Change-Id: I3d4716c691fc84a5e68c210fee51f9e31cfacc02
(cherry picked from commit f9dfd0129ce0b0e21e3f57488ff513794dbbaae5)
Reviewed-on: https://gerrit.libreoffice.org/19929
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 11d0bacd7441ee206163b62dce33fc28a25f99dc)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 980f0e4..13fec40 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -947,10 +947,12 @@ void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight)
{
gint nOrigwidth, nOrigheight;
gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight);
+#if !GTK_CHECK_VERSION(3,0,0)
if (nWidth > nOrigwidth || nHeight > nOrigheight)
{
m_bPaintsBlocked = true;
}
+#endif
gtk_widget_set_size_request(m_pWindow, nWidth, nHeight );
}
@@ -958,10 +960,12 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight)
{
gint nOrigwidth, nOrigheight;
gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight);
+#if !GTK_CHECK_VERSION(3,0,0)
if (nWidth > nOrigwidth || nHeight > nOrigheight)
{
m_bPaintsBlocked = true;
}
+#endif
gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight);
}
@@ -3658,7 +3662,6 @@ void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect)
gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
{
GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
- pThis->m_bPaintsBlocked = false;
cairo_save(cr);
commit 6459456561bd1fc94bdd6bf5413fede8f8684090
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 12 16:05:44 2015 +0000
Resolves: tdf#93317 Modified Document Dialog misses focus on Gtk3
Change-Id: I16ddac82a76a1e665797e4be192d3642f2660d9f
(cherry picked from commit 82abd23f3ee1900b7579e5a0afa23581d5836f01)
Reviewed-on: https://gerrit.libreoffice.org/19933
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 5a1d267a1ed7557db3fe4c73bc0749c885f0ebef)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 72652ae..4ce15de 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -816,6 +816,7 @@ bool Dialog::ImplStartExecuteModal()
ImplAdjustNWFSizes();
Show();
+ ToTop();
pSVData->maAppData.mnModalMode++;
return true;
commit c50223ac91c9fee4dced70e9b79e314d58edbe58
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 12 12:25:16 2015 +0000
Resolves: tdf#95021 crash on closing macro dialog editor
VclPtr related, dialog dtor is never called, so timer
is never stopped and timer refers to deleted parent
data
(cherry picked from commit 0943adb2f7ec319891c11889b40c9a69f0d1027e)
Change-Id: I804ba082817802c0017e61c6b86c5d3694995ea8
Reviewed-on: https://gerrit.libreoffice.org/19926
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
(cherry picked from commit 33df62efe3c94b87b765f8334c8b614eb896338b)
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 19c052d..9ebb90e 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -98,6 +98,12 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rD
SetReadOnly(true);
}
+void DialogWindow::dispose()
+{
+ pEditor.reset();
+ BaseWindow::dispose();
+}
+
void DialogWindow::LoseFocus()
{
if ( IsModified() )
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 94cd40e..49358a9 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -56,13 +56,14 @@ class DialogWindow: public BaseWindow
{
private:
DialogWindowLayout& rLayout;
- boost::scoped_ptr<DlgEditor> pEditor; // never nullptr
+ boost::scoped_ptr<DlgEditor> pEditor;
boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr
OUString aCurPath;
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
+ virtual void dispose() SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
commit 5deedec2ab708b841d0d696c8039c7fbcd4e62a7
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Nov 12 10:50:59 2015 +0100
tdf#95761 All Hotkeys with CTRL+ALT+ not worked
The problem was always masked out the combination ALT+CTRL, this only
needed when press the ALTGR key, but the other ALT-Key (left side) is
valid.
Change-Id: I8a6f953f519627418fb48ee8d1d68b3cbf797250
Reviewed-on: https://gerrit.libreoffice.org/19923
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>
Reviewed-on: https://gerrit.libreoffice.org/19932
(cherry picked from commit 0ff2015b429f7b5847f8b2eaab498416ef043642)
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 0a6fb73..07505d4 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3407,8 +3407,10 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
nModCode |= KEY_SHIFT;
if ( GetKeyState( VK_CONTROL ) & 0x8000 )
nModCode |= KEY_MOD1;
- if ( GetKeyState( VK_MENU ) & 0x8000 )
+ if ( GetKeyState( VK_LMENU ) & 0x8000 )
nModCode |= KEY_MOD2;
+ if ( GetKeyState( VK_RMENU ) & 0x8000 ) // this is the ALTGR-Key in this case
+ nModCode &= ~KEY_MOD1; // remove the Control flag
if ( (nMsg == WM_CHAR) || (nMsg == WM_SYSCHAR) )
{
@@ -3615,13 +3617,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
aKeyEvt.mnCode |= nModCode;
aKeyEvt.mnRepeat = nRepeat;
- if( (nModCode & (KEY_MOD1|KEY_MOD2)) == (KEY_MOD1|KEY_MOD2) &&
- aKeyEvt.mnCharCode )
- {
- // this is actually AltGr and should not be handled as Alt
- aKeyEvt.mnCode &= ~(KEY_MOD1|KEY_MOD2);
- }
-
bIgnoreCharMsg = bCharPeek ? TRUE : FALSE;
long nRet = pFrame->CallCallback( nEvent, &aKeyEvt );
// independent part only reacts on keyup but Windows does not send
commit 9daec3adf7ca18b789a9668b9c049379a3932bda
Author: Matthias Freund <matti_lx at secure.mailbox.org>
Date: Mon Nov 9 22:39:15 2015 +0100
tdf#75256 sifr updates: callout shapes
Change-Id: Id584edf091aebd95bb71d7efd2df6fdaa511c837
Reviewed-on: https://gerrit.libreoffice.org/19875
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 131a1962beb53d4945f7edf2cdb94fff0154bdc9)
Reviewed-on: https://gerrit.libreoffice.org/19920
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 ec0da57d9cc93b2bfaaa5b6b2d47c3850b3a814e)
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png
index c00263d..966c1f7 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png and b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png
index 0f70db4..3f6e961 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png and b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png
index 7dd34d4..430b365 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png and b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png b/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png
index 25fd333..449188f 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png and b/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png b/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png
index 87564a4..1324c78 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png and b/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png b/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png
index 9cf522a..6adde3b4 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png and b/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png
index 219f247..ac24e73 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png and b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png
index 5737a68..d062164 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png and b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png
index 5857bd5..73c0f1d 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png and b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.png b/icon-themes/sifr/cmd/sc_calloutshapes.png
index 1b1d7e0..c6bb30e 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.png and b/icon-themes/sifr/cmd/sc_calloutshapes.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png b/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png
index 99adb5b..422af5d 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png and b/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png b/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png
index 6e0910e..4c890c5 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png and b/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png b/icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png
index 1b1d7e0..c6bb30e 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png and b/icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png differ
commit 262581ec118ac20e42661ea298ade4f2fdf27ff3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 2 09:12:43 2015 +0100
tdf#89088 DOCX import: fix missing text due to throwing ShapeContextHandler
Regression from commit 866a4436d3cfac1ff42d7996250bf96fb703aeaa (oox:
handle textboxes in ShapeContextHandler::endFastElement(), 2014-06-04),
the problem was that code in ShapeContextHandler::endFastElement()
assumed that all the XShape implementation it may see provides a TextBox
UNO property (which is specific to Writer) of type bool, but this is not
true.
Fix the problem by assuming false in case it has an other type.
Testcase can be a simple "does it load" one, as in the meantime
exceptions such as trying to read a bool from an uno::Any make the DOCX
XFilter::filter() implementation return false, unlike in the originally
reported LibreOffice 4.4 version that just silently discarded the
remaining content of the document.
Change-Id: I81781a7ec28d085ceee50d386b8eda023f83c29f
(cherry picked from commit 4cae3689d4d78fabe6529c9df03c438b1e9d1611)
Reviewed-on: https://gerrit.libreoffice.org/19905
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 2c43db1ecfd9621f4eb6775a4f682d00987692f4)
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 39cc970..b69fc8c 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -356,7 +356,7 @@ void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element)
{
uno::Reference<beans::XPropertySet> xPropertySet(mxSavedShape, uno::UNO_QUERY);
if (xPropertySet.is())
- bTextBox = xPropertySet->getPropertyValue("TextBox").get<bool>();
+ xPropertySet->getPropertyValue("TextBox") >>= bTextBox;
}
if (bTextFrame || bTextBox)
mxWpsContext.clear();
diff --git a/sw/qa/core/data/ooxml/pass/tdf89088.docx b/sw/qa/core/data/ooxml/pass/tdf89088.docx
new file mode 100644
index 0000000..fc67185
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/tdf89088.docx differ
commit f5d44fe9297748a449e3c11a5e9cd507cc20b4f5
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date: Mon Nov 9 14:00:50 2015 +0100
tdf#95481 catch out-of-range access in vcl bitmap
blendBitmap24 assumes bitmap is 2 lines high for doing
interpolation. For bitmaps of height 1, really nothing to interpolate
there. Fix cornercase by 'blending' between the very same line instead.
Reviewed-on: https://gerrit.libreoffice.org/19863
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Cherry-picked from 99e3ab6effa9356a1a444160e60ed8df099b15a3
Change-Id: I9b94000aa563e525d0bb2418346ad2c86af26df8
Reviewed-on: https://gerrit.libreoffice.org/19888
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 5a86268e5dabaa5c02cf912e3793ce0f44c03a0b)
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 1ca0418..e845562 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -810,11 +810,13 @@ public:
const long nMapY = mpMapY[nY];
const long nMapFY = mpMapYOffset[nY];
- pLine0 = pSource->GetScanline(nMapY);
- pLine1 = pSource->GetScanline(nMapY + 1);
+ pLine0 = pSource->GetScanline(nMapY);
+ // tdf#95481 guard nMapY + 1 to be within bounds
+ pLine1 = (nMapY + 1 < pSource->Height()) ? pSource->GetScanline(nMapY + 1) : pLine0;
pLineAlpha0 = pSourceAlpha->GetScanline(nMapY);
- pLineAlpha1 = pSourceAlpha->GetScanline(nMapY + 1);
+ // tdf#95481 guard nMapY + 1 to be within bounds
+ pLineAlpha1 = (nMapY + 1 < pSourceAlpha->Height()) ? pSourceAlpha->GetScanline(nMapY + 1) : pLineAlpha0;
pDestScanline = pDestination->GetScanline(nY);
More information about the Libreoffice-commits
mailing list