[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b00a3b67cc6774deb8b8d9d488b6f7b331114137
Author: Caolán McNamara 
Date:   Thu Dec 10 11:48:47 2015 +

guard against missing geometry

Change-Id: I6b2945f1d5a1654f6b5d6a5f5287b4cb9514d97c
(cherry picked from commit d4d247866eac108162f43dae2c6ddbd9c12382a6)
(cherry picked from commit 6a9f91915afbcff71121b3485376ab6f1fdcecee)
Reviewed-on: https://gerrit.libreoffice.org/20597
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 3863458..27f9d5c 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1033,10 +1033,10 @@ sal_Int32 LwpMiddleLayout::DetermineWidth()
 {
 assert(false);
 }
-else
+else if (LwpLayoutGeometry* pGeo = GetGeometry())
 {
 m_nAttributes3 |= STYLE3_WIDTHVALID;
-return GetGeometry()->GetWidth();
+return pGeo->GetWidth();
 }
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 54e95789adf05c6852db18b80a549b789a40d6d3
Author: Caolán McNamara 
Date:   Thu Dec 10 15:25:55 2015 +

check dynamic casts

Change-Id: Icc3eee0776fb385a5c750293811dec796458a26b

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index d5d17973..cf3742d 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -903,7 +903,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode()
 return GetLayoutScale()->GetScaleMode();
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleMode();
+return dynamic_cast(*xBase.get()).GetScaleMode();
 else
 return (LwpLayoutScale::FIT_IN_FRAME | 
LwpLayoutScale::MAINTAIN_ASPECT_RATIO);
 }
@@ -915,7 +915,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile()
 ? 1 : 0;
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleTile();
+return dynamic_cast(*xBase.get()).GetScaleTile();
 else
 return 0;
 }
@@ -927,7 +927,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter()
 ? 1 : 0;
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleCenter();
+return dynamic_cast(*xBase.get()).GetScaleCenter();
 else
 return 0;
 }
@@ -938,7 +938,7 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage()
 return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 
1000 = 100%
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return 
dynamic_cast(xBase.get())->GetScalePercentage();
+return 
dynamic_cast(*xBase.get()).GetScalePercentage();
 else
 return 100;
 }
@@ -949,7 +949,7 @@ double LwpMiddleLayout::GetScaleWidth()
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleWidth();
+return dynamic_cast(*xBase.get()).GetScaleWidth();
 else
 return 0;
 }
@@ -960,7 +960,7 @@ double LwpMiddleLayout::GetScaleHeight()
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleHeight();
+return dynamic_cast(*xBase.get()).GetScaleHeight();
 else
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfribtable.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6799aa79069f2367c2b84160b9e17646da52fc2f
Author: Caolán McNamara 
Date:   Wed Dec 9 16:41:26 2015 +

guard against missing SuperTable

Change-Id: Ic7cc6c807905e0c4ffbf2a3f009b27be6100cdf0
(cherry picked from commit 0cde3ca230364492aa6b7f634b97178164268728)
Reviewed-on: https://gerrit.libreoffice.org/20542
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Miklos Vajna 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx 
b/lotuswordpro/source/filter/lwpfribtable.cxx
index 4adb3ac..86c70ea 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -78,7 +78,9 @@ LwpSuperTableLayout* LwpFribTable::GetSuperTable()
 
 void LwpFribTable::RegisterNewStyle()
 {
-GetSuperTable()->RegisterNewStyle();
+LwpSuperTableLayout* pSuper = GetSuperTable();
+if (pSuper)
+pSuper->RegisterNewStyle();
 XFParaStyle* pOldStyle = m_pPara->GetXFParaStyle();
 if(HasNextFrib())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 96357] Switching icon theme doesnt update toolbar or statusbar

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96357

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|bibisected  |bibisected target:5.2.0

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 96357] Switching icon theme doesnt update toolbar or statusbar

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96357

--- Comment #3 from Commit Notification 
 ---
Maxim Monastirsky committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=f513a173152cb1c1afd7b700d1b264bc2ea6a5a8

tdf#96357 Switching icon theme doesn't update toolbar or statusbar

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f3ea5e849356a4f1567121059570ce8ed28fedf
Author: Caolán McNamara 
Date:   Thu Dec 10 15:34:35 2015 +

guard against missing Foundry

Change-Id: I7e76589689d2c9e79a8823d594e8f3ca030e26cf
(cherry picked from commit 6093ba6065ea339c5c6de162294eabf0eebe3c80)

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 905e379..3f31da2 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -130,7 +130,7 @@ void LwpTocSuperLayout::RegisterStyle()
 LwpSuperTableLayout::RegisterStyle();
 
 // Get font info of default text style and set into tab style
-const LwpObjectID *pDefaultTextStyle = m_pFoundry->GetDefaultTextStyle();
+const LwpObjectID *pDefaultTextStyle = m_pFoundry ? 
m_pFoundry->GetDefaultTextStyle() : nullptr;
 XFParaStyle* pBaseStyle = pDefaultTextStyle ? 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(*pDefaultTextStyle))
 : nullptr;
 XFTextStyle*pTextStyle = new XFTextStyle;
 if (pBaseStyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 7 commits - extensions/source lotuswordpro/source oox/source sfx2/source vcl/win

[Tor Lillqvist]

 extensions/source/plugin/base/xplugin.cxx   |   11 ---
 extensions/source/plugin/inc/plugin/win/sysplug.hxx |3 +++
 extensions/source/plugin/win/sysplug.cxx|   10 +-
 lotuswordpro/source/filter/lwpfilter.cxx|2 +-
 lotuswordpro/source/filter/lwptabrack.cxx   |7 +--
 oox/source/export/chartexport.cxx   |2 +-
 sfx2/source/sidebar/ControllerItem.cxx  |1 +
 vcl/win/source/gdi/winlayout.cxx|3 ++-
 8 files changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 4fbc1875a1a44efaf852fecf1fe997f28a4063cb
Author: Tor Lillqvist 
Date:   Mon Dec 7 14:01:39 2015 +0200

tdf#96070: Just give up on glyph caching for non-horizontal text

Change-Id: I60f54523f927e97d739a4c735e54b2cc3400aff3
Reviewed-on: https://gerrit.libreoffice.org/20436
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 3b74c0f8b750cfe89598358fba811f4900287b64)

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index abbdc5a..3f5a78c 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -371,7 +371,8 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 aChunk.mbVertical = false;
 }
 
-if (aChunk.mbVertical && aLogfont.lfEscapement != 2700)
+// Don't even try to handle non-horizontal text
+if (aChunk.mbVertical || aLogfont.lfEscapement != 0)
 return false;
 
 OpenGLCompatibleDC aDC(rGraphics, 0, 0, nBitmapWidth, nBitmapHeight);
commit a1195d9f66c93f229623f14b6ec6d302f3035bce
Author: Stephan Bergmann 
Date:   Tue Dec 8 17:32:13 2015 +0100

tdf#62381: Stop using NPAPI plugin when NP_Initialize fails

(...in the Windows-specific code path)

Change-Id: I5984ecd88a12d3f22aecaa685bd552f4235fb13d
(cherry picked from commit 00daa67d745ae84ed15d3f210001193c6e950144)
Reviewed-on: https://gerrit.libreoffice.org/20474
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 448fec81bf45e0e74be887d139519a3c403c625e)

diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index 9933739..c1a25dc 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -548,9 +548,14 @@ void XPlugin_Impl::loadPlugin()
 return;
 
 #elif defined WNT
-PluginComm* pComm = new PluginComm_Impl( m_aDescription.Mimetype,
- m_aDescription.PluginName,
- (HWND)pEnvData->hWnd );
+PluginComm* pComm;
+try {
+pComm = new PluginComm_Impl(
+m_aDescription.Mimetype, m_aDescription.PluginName,
+(HWND)pEnvData->hWnd);
+} catch (PluginComm_Impl::CannotInitializeException &) {
+return;
+}
 #endif
 
 setPluginComm( pComm );
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx 
b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 555d400..bd4ff2c 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -86,6 +86,8 @@ class PluginComm_Impl :
 
 virtual longdoIt();
 public:
+struct CannotInitializeException {};
+
 PluginComm_Impl( const OUString& rMIME, const 
OUString& rName, HWND hWnd );
 virtual ~PluginComm_Impl();
 
@@ -114,6 +116,7 @@ public:
 virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void 
*ret_alue );
 
 private:
+voidshutdown();
 BOOLretrieveFunction( TCHAR const * pName, void** ppFunc ) 
const;
 
 private:
diff --git a/extensions/source/plugin/win/sysplug.cxx 
b/extensions/source/plugin/win/sysplug.cxx
index d34c800..eb14ec0 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -98,12 +98,20 @@ PluginComm_Impl::PluginComm_Impl( const OUString& 
/*rMIME*/, const OUString& rNa
 "### version failure!" );
 
 m_eCall = eNP_Initialize;
-execute();
+if (execute() != NPERR_NO_ERROR) {
+shutdown();
+throw CannotInitializeException();
+}
 }
 
 
 PluginComm_Impl::~PluginComm_Impl()
 {
+shutdown();
+}
+
+void PluginComm_Impl::shutdown()
+{
 if (_plDLL)
 {
 //  NPP_Shutdown();
commit 939441c78c3486801b14ea50753fbe7eb41f9ecf
Author: Michael Stahl 
Date:   Tue Dec 8 22:11:13 2015 +0100

lotuswordpro: GCC 4.6 seems to need stdexcept included

Change-Id: I30bbf7bab8cb37422fd20a25741e564500faa31c
(cherry 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5710f2530b6ad2c3bcf76bd90cc13c2e7bf3f456
Author: Caolán McNamara 
Date:   Thu Dec 10 10:24:19 2015 +

guard against missing parent layout

Change-Id: Ib08403edf805367c7392325fcfb66bc7ed4d6f6a
(cherry picked from commit 713d737b1ff73e76c6543198ce9299e1c83ac147)
(cherry picked from commit 5f469a2a1af8bff36fc3a5849a1500345febdba4)
Reviewed-on: https://gerrit.libreoffice.org/20587
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 61325da..6a2f9be 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -189,8 +189,10 @@ void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
 */
  void LwpFrame::XFConvert(XFContentContainer* pCont)
  {
- //parse the frame which anchor to page
+// parse the frame which anchor to page
 LwpVirtualLayout* pParent = m_pLayout->GetParentLayout();
+if (!pParent)
+throw std::runtime_error("missing Parent Layout");
 if(pParent->IsPage()&& pParent->GetParentLayout()->IsPage())
 {
 //for mirror page, problems exist if the parent layout is header or 
footer layout,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 34 commits - configure.ac cui/source cui/uiconfig lotuswordpro/source sfx2/source

[Andras Timar]

 configure.ac   |2 
 cui/source/dialogs/iconcdlg.cxx|4 
 cui/uiconfig/ui/spelloptionsdialog.ui  |1 
 lotuswordpro/source/filter/bencont.cxx |2 
 lotuswordpro/source/filter/lwp9reader.cxx  |2 
 lotuswordpro/source/filter/lwpcelllayout.cxx   |   15 +
 lotuswordpro/source/filter/lwpdoc.cxx  |   24 +-
 lotuswordpro/source/filter/lwpfnlayout.cxx |4 
 lotuswordpro/source/filter/lwpfont.cxx |5 
 lotuswordpro/source/filter/lwpfootnote.cxx |2 
 lotuswordpro/source/filter/lwpfoundry.cxx  |8 
 lotuswordpro/source/filter/lwpframelayout.cxx  |   10 -
 lotuswordpro/source/filter/lwpfribframe.cxx|2 
 lotuswordpro/source/filter/lwpfribptr.cxx  |6 
 lotuswordpro/source/filter/lwpfribsection.cxx  |6 
 lotuswordpro/source/filter/lwpfribtable.cxx|6 
 lotuswordpro/source/filter/lwpidxmgr.cxx   |7 
 lotuswordpro/source/filter/lwplayout.cxx   |  202 +++--
 lotuswordpro/source/filter/lwplayout.hxx   |5 
 lotuswordpro/source/filter/lwpnotes.cxx|6 
 lotuswordpro/source/filter/lwpobj.cxx  |3 
 lotuswordpro/source/filter/lwpobj.hxx  |   29 +++
 lotuswordpro/source/filter/lwpobjid.cxx|6 
 lotuswordpro/source/filter/lwpobjstrm.cxx  |2 
 lotuswordpro/source/filter/lwppagelayout.cxx   |   11 -
 lotuswordpro/source/filter/lwppara.cxx |   55 +++---
 lotuswordpro/source/filter/lwppara.hxx |2 
 lotuswordpro/source/filter/lwppara1.cxx|2 
 lotuswordpro/source/filter/lwprowlayout.cxx|7 
 lotuswordpro/source/filter/lwpsilverbullet.cxx |5 
 lotuswordpro/source/filter/lwptablelayout.cxx  |2 
 lotuswordpro/source/filter/lwptabrack.cxx  |2 
 lotuswordpro/source/filter/lwptoc.cxx  |6 
 lotuswordpro/source/filter/lwpvpointer.cxx |2 
 sfx2/source/dialog/backingwindow.cxx   |3 
 sfx2/source/dialog/backingwindow.hxx   |3 
 36 files changed, 253 insertions(+), 206 deletions(-)

New commits:
commit 804c19f48d88ad4efc11dc4046b75bb6d6db8ff6
Author: Andras Timar 
Date:   Thu Dec 10 16:17:43 2015 +0100

Bump version to 5.0-13

Change-Id: I2dafee880299d1f822f1cf3856f3e48e3987b6b0

diff --git a/configure.ac b/configure.ac
index 37753d3..db9ab05 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.12],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.13],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
commit a2920ac6cd255cf27e51de58113c915ff53733fc
Author: Caolán McNamara 
Date:   Wed Dec 9 17:15:10 2015 +

Resolves: tdf#86845 hyperlink details not retained between tabs

Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2
(cherry picked from commit eb38493c4101d8777052267ee83a5d4f883dd9ac)
(cherry picked from commit e34e0c8d97b90786e9ca9cf88d9fc3e127ce8350)
Reviewed-on: https://gerrit.libreoffice.org/20549
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit b82567327fa64ceb7d486774df3ac9c95763009c)

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 0b77226..d6eab9a 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -333,8 +333,6 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId)
 {
 sal_uInt16 nOldPageId = GetCurPageId();
 bool bInvalidate = nOldPageId != nId;
-SetCurPageId(nId);
-ActivatePageImpl();
 if (bInvalidate)
 {
 IconChoicePageData* pOldData = GetPageData(nOldPageId);
@@ -346,6 +344,8 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId)
 
 Invalidate();
 }
+SetCurPageId(nId);
+ActivatePageImpl();
 IconChoicePageData* pNewData = GetPageData(nId);
 if (pNewData && pNewData->pPage)
 ShowPageImpl(pNewData);
commit fbff9f884dbf5aa1dc962d5b608c6ae1941a50ff
Author: Stephan Bergmann 
Date:   Thu Dec 10 13:38:52 2015 +0100

Memory leak

(cherry picked from commit 5ac6e00274e732435b55c2908db9cea658fe549b)
Conflicts:
sfx2/source/dialog/backingwindow.cxx

Change-Id: Ica40750d628946678019376d91db67ba3f9ed67e
Reviewed-on: https://gerrit.libreoffice.org/20601
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 75f25d00848068c677fca450d35aa59af0422c60)

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 5686c43..2c0d8c0 100644
--- 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 063488d1a0e530c74eac0ba0079811276a77a214
Author: Caolán McNamara 
Date:   Thu Dec 10 10:06:58 2015 +

guard against missing table container

Change-Id: I11f6381374c7fc12374cd5089e581ddc777005e2
(cherry picked from commit c732a1ae8cc0cc94bfeddba243657a0b9e52a0f9)
Reviewed-on: https://gerrit.libreoffice.org/20581
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index e2edf49..ecf37c4 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -719,7 +719,7 @@ void LwpTableLayout::RegisterStyle()
 // If the table is not "with paragraph above" placement, create an frame 
style
 // by supertable layout
 if ( LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType
-&& !pSuper->GetContainerLayout()->IsCell())
+&& (!pSuper->GetContainerLayout() || 
!pSuper->GetContainerLayout()->IsCell()) )
 {
 //with para above
 //  pSuper->ApplyBackColor(pTableStyle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 76f5c0c7af8d1881b95196652d1c82561abf176a
Author: Caolán McNamara 
Date:   Thu Dec 10 09:16:59 2015 +

guard against missing paragraph container

Change-Id: I6ac074c7fe2821983b4a056e28fc5379f7a93974
(cherry picked from commit 130eaf02de89c8996ff6e817a005993dcbd586e6)
Reviewed-on: https://gerrit.libreoffice.org/20565
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwppara.hxx 
b/lotuswordpro/source/filter/lwppara.hxx
index d3d7bf6..57886ab 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -345,6 +345,8 @@ inline OUString LwpPara::GetBulletStyleName() const
 }
 inline void LwpPara::AddXFContent(XFContent* pCont)
 {
+if (!m_pXFContainer)
+throw std::runtime_error("paragraph lacks container");
 m_pXFContainer->Add(pCont);
 }
 inline void LwpPara::SetXFContainer(XFContentContainer* pCont)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b1d710430aa8ea49664cc766504eb6260a2ef7cd
Author: Caolán McNamara 
Date:   Wed Dec 9 13:00:24 2015 +

guard against missing BaseStyle

Change-Id: I173b12f0a28f917f24d1923e531da1b798beb1f6
(cherry picked from commit d34cbe279cc8e1db941a4da1130d5a6d7429357d)
Reviewed-on: https://gerrit.libreoffice.org/20524
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Miklos Vajna 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 75b9aa7..16f8737 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -132,7 +132,8 @@ void LwpTocSuperLayout::RegisterStyle()
 // Get font info of default text style and set into tab style
 XFParaStyle* pBaseStyle = 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(*m_pFoundry->GetDefaultTextStyle()));
 XFTextStyle*pTextStyle = new XFTextStyle;
-pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this font?
+if (pBaseStyle)
+pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this 
font?
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
 m_TabStyleName = 
pXFStyleManager->AddStyle(pTextStyle).m_pStyle->GetStyleName();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfribptr.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 20f59bf1fb20bece669e5d4a2606a021384cd54a
Author: Caolán McNamara 
Date:   Wed Dec 9 13:10:27 2015 +

guard against missing paragraph Story

Change-Id: Iae617e9731dbdcedf8aa6bf02977911dce60bdd0
(cherry picked from commit 9d2a1c48b4a39967bc21776b471f1a4eca735cb6)
Reviewed-on: https://gerrit.libreoffice.org/20527
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Miklos Vajna 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx 
b/lotuswordpro/source/filter/lwpfribptr.cxx
index 4f3211a..79486a2 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -269,9 +269,9 @@ void LwpFribPtr::XFConvert()
 case FRIB_TAG_HARDSPACE:
 {
 OUString sHardSpace(sal_Unicode(0x00a0));
-LwpHyperlinkMgr* pHyperlink =
-m_pPara->GetStory()->GetHyperlinkMgr();
-if (pHyperlink->GetHyperlinkFlag())
+LwpStory *pStory = m_pPara->GetStory();
+LwpHyperlinkMgr* pHyperlink = pStory ? pStory->GetHyperlinkMgr() : 
nullptr;
+if (pHyperlink && pHyperlink->GetHyperlinkFlag())
 pFrib->ConvertHyperLink(m_pXFPara,pHyperlink,sHardSpace);
 else
 pFrib->ConvertChars(m_pXFPara,sHardSpace);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9e8d34b2620c50866fa713dd1ebbe53017e46f56
Author: Caolán McNamara 
Date:   Wed Dec 9 13:30:02 2015 +

guard against no default text style

Change-Id: I7416d709de79ae88cf4a9546d8adfecec9935238
(cherry picked from commit 80297dd0f21bfeaa9bae09cacfa29ab2eee64c09)
Reviewed-on: https://gerrit.libreoffice.org/20530
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Miklos Vajna 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 16f8737..dfb4178 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -130,7 +130,8 @@ void LwpTocSuperLayout::RegisterStyle()
 LwpSuperTableLayout::RegisterStyle();
 
 // Get font info of default text style and set into tab style
-XFParaStyle* pBaseStyle = 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(*m_pFoundry->GetDefaultTextStyle()));
+const LwpObjectID *pDefaultTextStyle = m_pFoundry->GetDefaultTextStyle();
+XFParaStyle* pBaseStyle = pDefaultTextStyle ? 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(*pDefaultTextStyle))
 : nullptr;
 XFTextStyle*pTextStyle = new XFTextStyle;
 if (pBaseStyle)
 pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this 
font?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.cxx |   20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

New commits:
commit cf3acc198c804140e2dab73a0ee4df81a6ae5927
Author: Caolán McNamara 
Date:   Thu Dec 10 09:35:46 2015 +

guard against missing spacing property

(cherry picked from commit 10de96bf0fb820b38607b0c25a0d3219ad343819)
Reviewed-on: https://gerrit.libreoffice.org/20569
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit cb6f34b370da1d45e1c2b945b60cbcaf7b9c3a45)

Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb
Reviewed-on: https://gerrit.libreoffice.org/20571
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwppara.cxx 
b/lotuswordpro/source/filter/lwppara.cxx
index 7cebb58..f6f7c90 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -413,18 +413,20 @@ void LwpPara::RegisterStyle()
 case PP_LOCAL_SPACING:
 {
 noSpacing = false;
-if (!rParaStyle.GetSpacing())
-
OverrideSpacing(NULL,static_cast(pProps)->GetSpacing(),pOverStyle);
-else
+LwpSpacingOverride *pSpacing = 
static_cast(pProps)->GetSpacing();
+if (pSpacing)
 {
-boost::scoped_ptr const
-pSpacing(rParaStyle.GetSpacing()->clone());
-OverrideSpacing(pSpacing.get(),
-
static_cast(pProps)->GetSpacing(),
-pOverStyle);
+if (!rParaStyle.GetSpacing())
+OverrideSpacing(nullptr, pSpacing, pOverStyle);
+else
+{
+std::unique_ptr const
+pNewSpacing(rParaStyle.GetSpacing()->clone());
+OverrideSpacing(pNewSpacing.get(), pSpacing, 
pOverStyle);
+}
 }
-}
 break;
+}
 case PP_LOCAL_BORDER:
 {
 OverrideParaBorder(pProps, pOverStyle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3228b30f76b7d734a5bb5b825ee1cd517a893639
Author: Caolán McNamara 
Date:   Thu Dec 10 15:25:55 2015 +

check dynamic casts

Change-Id: Icc3eee0776fb385a5c750293811dec796458a26b
(cherry picked from commit 54e95789adf05c6852db18b80a549b789a40d6d3)

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index d5d17973..cf3742d 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -903,7 +903,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode()
 return GetLayoutScale()->GetScaleMode();
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleMode();
+return dynamic_cast(*xBase.get()).GetScaleMode();
 else
 return (LwpLayoutScale::FIT_IN_FRAME | 
LwpLayoutScale::MAINTAIN_ASPECT_RATIO);
 }
@@ -915,7 +915,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile()
 ? 1 : 0;
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleTile();
+return dynamic_cast(*xBase.get()).GetScaleTile();
 else
 return 0;
 }
@@ -927,7 +927,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter()
 ? 1 : 0;
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleCenter();
+return dynamic_cast(*xBase.get()).GetScaleCenter();
 else
 return 0;
 }
@@ -938,7 +938,7 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage()
 return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 
1000 = 100%
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return 
dynamic_cast(xBase.get())->GetScalePercentage();
+return 
dynamic_cast(*xBase.get()).GetScalePercentage();
 else
 return 100;
 }
@@ -949,7 +949,7 @@ double LwpMiddleLayout::GetScaleWidth()
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleWidth();
+return dynamic_cast(*xBase.get()).GetScaleWidth();
 else
 return 0;
 }
@@ -960,7 +960,7 @@ double LwpMiddleLayout::GetScaleHeight()
 return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight());
 rtl::Reference xBase(GetBasedOnStyle());
 if (xBase.is())
-return dynamic_cast(xBase.get())->GetScaleHeight();
+return dynamic_cast(*xBase.get()).GetScaleHeight();
 else
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 381677690ca0f7f071cb998ec457f7b79e87c0f2
Author: Caolán McNamara 
Date:   Wed Dec 9 16:21:38 2015 +

guard against missing indent property

(cherry picked from commit ae94fc5b28105c920b2e9d336f463b27cae5b0e1)
Reviewed-on: https://gerrit.libreoffice.org/20535
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit d9f6f9063d34f29eb44d82159c411646dc19c83f)

Change-Id: I2d3369aed4b242acc936a71ee9be573c1ebc7a8f
Reviewed-on: https://gerrit.libreoffice.org/20537
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Miklos Vajna 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwppara.cxx 
b/lotuswordpro/source/filter/lwppara.cxx
index f6f7c90..13845f4 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -401,15 +401,16 @@ void LwpPara::RegisterStyle()
 case PP_LOCAL_INDENT:
 {
 noIndent = false;
-if (!rParaStyle.GetIndent())
-
OverrideIndent(NULL,static_cast(pProps)->GetIndent(),pOverStyle);
-
-else
+LwpIndentOverride *pIndent = 
static_cast(pProps)->GetIndent();
+if (pIndent)
 {
-
OverrideIndent(m_pIndentOverride,static_cast(pProps)->GetIndent(),pOverStyle);
+if (!rParaStyle.GetIndent())
+OverrideIndent(nullptr, pIndent, pOverStyle);
+else
+OverrideIndent(m_pIndentOverride, pIndent, pOverStyle);
 }
-}
 break;
+}
 case PP_LOCAL_SPACING:
 {
 noSpacing = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Maxim Monastirsky]

 vcl/source/bitmap/CommandImageResolver.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f513a173152cb1c1afd7b700d1b264bc2ea6a5a8
Author: Maxim Monastirsky 
Date:   Thu Dec 10 12:30:44 2015 +0200

tdf#96357 Switching icon theme doesn't update toolbar or statusbar

Regression of 6480b4d11a0cf2dd489d30b6290aa6d831704a45

Change-Id: I00141b3d9c5ea8dc813530a2ee095d61a35b3c04
Reviewed-on: https://gerrit.libreoffice.org/20591
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/vcl/source/bitmap/CommandImageResolver.cxx 
b/vcl/source/bitmap/CommandImageResolver.cxx
index 5c636d7..94bff8a 100644
--- a/vcl/source/bitmap/CommandImageResolver.cxx
+++ b/vcl/source/bitmap/CommandImageResolver.cxx
@@ -8,11 +8,10 @@
  */
 
 #include 
-
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
 
 using css::uno::Sequence;
 
@@ -124,11 +123,11 @@ bool CommandImageResolver::hasImage(const OUString& 
rCommandURL)
 
 ImageList* CommandImageResolver::getImageList(sal_Int16 nImageType)
 {
-const OUString& rIconTheme = 
officecfg::Office::Common::Misc::SymbolStyle::get();
+const OUString sIconTheme = 
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
 
-if (rIconTheme != m_sIconTheme)
+if (sIconTheme != m_sIconTheme)
 {
-m_sIconTheme = rIconTheme;
+m_sIconTheme = sIconTheme;
 for (sal_Int32 n = 0; n < ImageType_COUNT; ++n)
 {
 delete m_pImageList[n];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6093ba6065ea339c5c6de162294eabf0eebe3c80
Author: Caolán McNamara 
Date:   Thu Dec 10 15:34:35 2015 +

guard against missing Foundry

Change-Id: I7e76589689d2c9e79a8823d594e8f3ca030e26cf

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 905e379..3f31da2 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -130,7 +130,7 @@ void LwpTocSuperLayout::RegisterStyle()
 LwpSuperTableLayout::RegisterStyle();
 
 // Get font info of default text style and set into tab style
-const LwpObjectID *pDefaultTextStyle = m_pFoundry->GetDefaultTextStyle();
+const LwpObjectID *pDefaultTextStyle = m_pFoundry ? 
m_pFoundry->GetDefaultTextStyle() : nullptr;
 XFParaStyle* pBaseStyle = pDefaultTextStyle ? 
static_cast(m_pFoundry->GetStyleManager()->GetStyle(*pDefaultTextStyle))
 : nullptr;
 XFTextStyle*pTextStyle = new XFTextStyle;
 if (pBaseStyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - vcl/headless

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 986b0862236d16e6aaf5a083947a302729fe54b7
Author: Caolán McNamara 
Date:   Mon Nov 30 15:29:03 2015 +

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 
Reviewed-by: Michael Stahl 
(cherry picked from commit 81aeddfd6ae6f760fd11d73091b5891882dc1d62)
Reviewed-on: https://gerrit.libreoffice.org/20551
Reviewed-by: David Tardon 
Reviewed-by: Miklos Vajna 
Tested-by: Michael Stahl 

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, , , , );
-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();
 
 cairo_fill_extents(cr, , , , );
-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, );
 
 cairo_region_get_extents(region, );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwp9reader.cxx |2 +-
 lotuswordpro/source/filter/lwpcelllayout.cxx  |2 +-
 lotuswordpro/source/filter/lwpdoc.cxx |   10 +-
 lotuswordpro/source/filter/lwpfnlayout.cxx|4 ++--
 lotuswordpro/source/filter/lwpfootnote.cxx|2 +-
 lotuswordpro/source/filter/lwpfoundry.cxx |8 
 lotuswordpro/source/filter/lwpframelayout.cxx |2 +-
 lotuswordpro/source/filter/lwpfribframe.cxx   |2 +-
 lotuswordpro/source/filter/lwplayout.cxx  |2 +-
 lotuswordpro/source/filter/lwpnotes.cxx   |6 +++---
 lotuswordpro/source/filter/lwpobj.cxx |2 +-
 lotuswordpro/source/filter/lwpobj.hxx |   15 ++-
 lotuswordpro/source/filter/lwppagelayout.cxx  |5 ++---
 lotuswordpro/source/filter/lwpvpointer.cxx|2 +-
 14 files changed, 38 insertions(+), 26 deletions(-)

New commits:
commit 17b166804c961e627dd70a04df8ae4f6bd3ae238
Author: Caolán McNamara 
Date:   Wed Dec 9 21:32:21 2015 +

guard against infinite recursion on registering styles

(cherry picked from commit 66686e443b568ad5aab1b32b3f25eb73487cfef6)
Reviewed-on: https://gerrit.libreoffice.org/20554
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 282b1aa32c27a513eb2858ad6e7e534ef52c1b99)

Change-Id: Iabedfcce9d8ef21172e6bd0d654f3a258aae97e3
Reviewed-on: https://gerrit.libreoffice.org/20556
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwp9reader.cxx 
b/lotuswordpro/source/filter/lwp9reader.cxx
index f23c8fc..e74d02e 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -192,7 +192,7 @@ void Lwp9Reader::ParseDocument()
 
 //Register Styles
 RegisteArrowStyles();
-doc->RegisterStyle();
+doc->DoRegisterStyle();
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
 pXFStyleManager->ToXml(m_pStream);
 
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 9fba0a1..449d28e 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -599,7 +599,7 @@ void LwpCellLayout::RegisterStyle()
 if (pObj.is())
 {
 pObj->SetFoundry(m_pFoundry);
-pObj->RegisterStyle();
+pObj->DoRegisterStyle();
 }
 
 //register child layout style
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index fcbc894..c93b668 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -224,7 +224,7 @@ void LwpDocument::RegisterStyle()
 rtl::Reference pDocSock = GetSocket().obj();
 if(pDocSock.is())
 {
-pDocSock->RegisterStyle();
+pDocSock->DoRegisterStyle();
 }
 }
 /**
@@ -322,7 +322,7 @@ void LwpDocument::RegisterGraphicsStyles()
 if(pGraphic.is())
 {
 pGraphic->SetFoundry(m_pFoundry);
-pGraphic->RegisterStyle();
+pGraphic->DoRegisterStyle();
 }
 }
 /**
@@ -619,7 +619,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 
 LwpDocument* pDivision = GetFirstDivision();
 
-while (pDivision)
+while (pDivision && pDivision != this)
 {
 LwpDocument* pContentDivision = 
pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
 if(pContentDivision)
@@ -782,11 +782,11 @@ void LwpDocSock::RegisterStyle()
 {
 rtl::Reference pDoc = GetNext().obj();
 if(pDoc.is())
-pDoc->RegisterStyle();
+pDoc->DoRegisterStyle();
 
 pDoc = GetChildHead().obj();
 if(pDoc.is())
-pDoc->RegisterStyle();
+pDoc->DoRegisterStyle();
 }
  /**
  * @descrparse contents of documents plugged
diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx 
b/lotuswordpro/source/filter/lwpfnlayout.cxx
index 86ddc5f..e02c597 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.cxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.cxx
@@ -164,7 +164,7 @@ void LwpFnCellLayout::RegisterStyle()
 if (pObj.is())
 {
 pObj->SetFoundry(m_pFoundry);
-pObj->RegisterStyle();
+pObj->DoRegisterStyle();
 }
 }
 
@@ -241,7 +241,7 @@ void LwpEnSuperTableLayout::RegisterStyle()
 if (pTableLayout != NULL)
 {
 pTableLayout->SetFoundry(m_pFoundry);
-pTableLayout->RegisterStyle();
+pTableLayout->DoRegisterStyle();
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 5c64d00..86c69ff 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -181,7 +181,7 @@ void LwpFootnote::RegisterStyle()
 if(pContent)
   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Maxim Monastirsky]

 vcl/source/bitmap/CommandImageResolver.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 68fb533ed190d09b080b99fc80f5026afeae968d
Author: Maxim Monastirsky 
Date:   Thu Dec 10 12:30:44 2015 +0200

tdf#96357 Switching icon theme doesn't update toolbar or statusbar

Regression of 6480b4d11a0cf2dd489d30b6290aa6d831704a45

Change-Id: I00141b3d9c5ea8dc813530a2ee095d61a35b3c04
Reviewed-on: https://gerrit.libreoffice.org/20591
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 
(cherry picked from commit f513a173152cb1c1afd7b700d1b264bc2ea6a5a8)
Reviewed-on: https://gerrit.libreoffice.org/20620
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/bitmap/CommandImageResolver.cxx 
b/vcl/source/bitmap/CommandImageResolver.cxx
index 5c636d7..94bff8a 100644
--- a/vcl/source/bitmap/CommandImageResolver.cxx
+++ b/vcl/source/bitmap/CommandImageResolver.cxx
@@ -8,11 +8,10 @@
  */
 
 #include 
-
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
 
 using css::uno::Sequence;
 
@@ -124,11 +123,11 @@ bool CommandImageResolver::hasImage(const OUString& 
rCommandURL)
 
 ImageList* CommandImageResolver::getImageList(sal_Int16 nImageType)
 {
-const OUString& rIconTheme = 
officecfg::Office::Common::Misc::SymbolStyle::get();
+const OUString sIconTheme = 
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
 
-if (rIconTheme != m_sIconTheme)
+if (sIconTheme != m_sIconTheme)
 {
-m_sIconTheme = rIconTheme;
+m_sIconTheme = sIconTheme;
 for (sal_Int32 n = 0; n < ImageType_COUNT; ++n)
 {
 delete m_pImageList[n];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 96357] Switching icon theme doesnt update toolbar or statusbar

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96357

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|bibisected target:5.2.0 |bibisected target:5.2.0
   ||target:5.1.0.1

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 96357] Switching icon theme doesnt update toolbar or statusbar

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96357

--- Comment #4 from Commit Notification 
 ---
Maxim Monastirsky committed a patch related to this issue.
It has been pushed to "libreoffice-5-1":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=68fb533ed190d09b080b99fc80f5026afeae968d=libreoffice-5-1

tdf#96357 Switching icon theme doesn't update toolbar or statusbar

It will be available in 5.1.0.1.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 92197] Slow Performance of Calc

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=92197

--- Comment #11 from jean-mathieu.desche...@aviyatech.com ---
I saw very similar issue on my computer with LibreOffice 5.0.3 on Ubuntu 14.04

I am usually working with decently sized spreadsheets(~50 column, ~20k rows)
and and it is really hard to get anything done with this problem.

I can confirm that the removing the Spell Checker features made it run a lot
smoother.

Let me know if you want more information.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |2 +-
 lotuswordpro/source/filter/lwpfoundry.cxx |   24 +---
 lotuswordpro/source/filter/lwpstory.cxx   |2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 46fe3bddebf30775ae19eaa0fefe1d8e2f78eced
Author: Caolán McNamara 
Date:   Thu Dec 10 16:10:20 2015 +

need dynamic casts here, etc.

Change-Id: I578343719d2d7feff51775ff1b073b6584e76f82

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 140e00d..12975e3 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -294,7 +294,7 @@ void LwpDocument::RegisterStylesInPara()
 {
 //Register the child para
 pStory->SetFoundry(m_pFoundry);
-pStory->RegisterStyle();
+pStory->DoRegisterStyle();
 pStory = 
dynamic_cast(pStory->GetNext().obj(VO_STORY).get());
 }
 }
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx 
b/lotuswordpro/source/filter/lwpfoundry.cxx
index 64897e2..74bfded 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -219,18 +219,21 @@ void LwpFoundry::RegisterAllLayouts()
 
 LwpBookMark* LwpFoundry::GetBookMark(LwpObjectID objMarker)
 {
-LwpDLVListHeadHolder* pHeadHolder= static_cast
+LwpDLVListHeadHolder* pHeadHolder= dynamic_cast
 (m_BookMarkHead.obj().get());
+
+if (!pHeadHolder)
+return nullptr;
+
 LwpObjectID& rObjID = pHeadHolder->GetHeadID();
-LwpBookMark* pBookMark;
-pBookMark = static_cast(rObjID.obj().get());
+LwpBookMark* pBookMark = dynamic_cast(rObjID.obj().get());
 
 while (pBookMark)
 {
 if (pBookMark->IsRightMarker(objMarker))
 return pBookMark;
 rObjID = pBookMark->GetNext();
-pBookMark = static_cast(rObjID.obj().get());
+pBookMark = dynamic_cast(rObjID.obj().get());
 }
 return nullptr;
 }
@@ -475,23 +478,22 @@ LwpListList* 
LwpOrderedObjectManager::GetNextActiveListList(LwpListList * pLast)
 {
 LwpListList* pList = nullptr;
 if(pLast)
-pList = static_cast(pLast->GetNext().obj().get());
+pList = dynamic_cast(pLast->GetNext().obj().get());
 else
 {
-LwpDLVListHeadHolder* pHeadHolder= 
static_cast(m_Head.obj().get());
+LwpDLVListHeadHolder* pHeadHolder= 
dynamic_cast(m_Head.obj().get());
 if(pHeadHolder)
 {
-pList = 
static_cast(pHeadHolder->GetHeadID().obj().get());
+pList = 
dynamic_cast(pHeadHolder->GetHeadID().obj().get());
 }
 }
 
 while(pList)
 {
-LwpContent* pContent = 
static_cast(pList->GetObject().obj().get());
-if(pContent && pContent->HasNonEmbeddedLayouts() &&
-!pContent->IsStyleContent())
+LwpContent* pContent = 
dynamic_cast(pList->GetObject().obj().get());
+if (pContent && pContent->HasNonEmbeddedLayouts() && 
!pContent->IsStyleContent())
 return pList;
-pList = static_cast(pList->GetNext().obj().get());
+pList = dynamic_cast(pList->GetNext().obj().get());
 }
 return nullptr;
 }
diff --git a/lotuswordpro/source/filter/lwpstory.cxx 
b/lotuswordpro/source/filter/lwpstory.cxx
index 1300b15..b165647 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -134,7 +134,7 @@ void LwpStory::RegisterStyle()
 while(pPara)
 {
 pPara->SetFoundry(m_pFoundry);
-pPara->RegisterStyle();
+pPara->DoRegisterStyle();
 pPara = dynamic_cast(pPara->GetNext().obj().get());
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-qa] minutes of ESC call ...

[Michael Meeks]

* Present:
+ Armin, Oliver, Robinson, Michael M, Sophie, JanI, Christian, Stephan,
  Norbert, Eike, Muthu, Andras, Bjoern, Cloph, Michael S, David, Miklos,
  Lionel
 
* Completed Actions / Items:
+ enable calc bits by default for now for more testing (Kendy)
+ poke the users-list on MS Surface / GL issue (Michael)
[ oddly no reply ]
+ merge slide transition artwork to -5-1 for B2 (Michael)
+ ask for QA support of Android remote on Windows (Robinson)
[ waiting to hear back, people moved off windows ... ]
+ list of developers who havn't contributed in a while (JanI)
[ done, pending E-mail ]
 
* Pending Action Items:
+ book FOSDEM conf. room for board meeting (Florian)
[ perhaps after not before to avoid hackfest conflict ]
+ double-check libmar/src, update/src, remove the duplicate, etc. (Kendy)
+ UserAgent - move to 1% of users, drop bundled-languages etc. (Michael)
+ try out 'make check' for gerrit / Linux builders (Norbert)
 [ will take a while ]
+ get callgrind trace of SVG rendering in tdf#82214 (JMux)
 
* Release Engineering update (Cloph)
+ 4.4.7 - released as final today.
+ 5.0.4 RC1
+ on the mirrors.
+ RC2 to be tagge later today.
+ 5.1.0 B2
+ on mirrors, and available from website.
+ 5.1.0 RC1
+ due for tag (but no branch) next week.
+ string and UI freeze from next week.
+ but not code freese.
+ until RC1 - free to commit without review.
+ after RC1 - double review required for libreoffice-5-1
+ Late Features:
+ OpenGL - switch to simpler double-buffering.
[ good progress, fixes bugs;
  swap buffers at (high prio.) idle like Mac.
  More testing / validation ongoing
  Pending CI catchup. ]
+ Slide Transitions: artwork & polish
+ poke at artwork bits ...
+ UserAgent display & tweakage
[ still needs random 1% bits doing ]
+ Android & iOS Remote
+ https://bugs.documentfoundation.org/show_bug.cgi?id=96127
   + simple patch submitted (thanks)
  
* blanket approval for lwp filter (Michael)
+ any objections to Caolan skipping review for all branches
  for simple lwp fixes for 5-0 ?
   + fine but wants a CI build (Norbert)
   + but the CI slaves are horribly over-loaded (Michael)
  + capacity is 4x per hour on Windows (Norbert)
   + current 60 patches CI backlog is a 10x hour delay (Michael) 
+ happy to drop review; or post review them, putting
  them into 1x patch not ideal either (Caolan)
   + temporary disturbance not a problem (Norbert)
   + 35 issues outstanding and coming
+ patches on a feature branch vs. 5.0.4 - and 1x push to gerrit from tip 
(Bjoern)
   => push to gerrit & make it easy to merge. (see ./logerrit testfeature 
for the concept)
+ propose avoiding individual review for these patches (Michael)
   + sounds fine (Bjoern)
   + automatically solves this problem (Norbert)
   + just 1x commit in gerrit to approve.
 
* Crashtest update (Caolan)
+ ? import failures, ? export failures, ??? coverity
 
* IRC - ESC attendees appreciated as op's (Michael)
+ helps me remind you of ESC
+ ideally use channel service instead (Miklos)
+ bit like root; but flags may help others.
+ helps newbies find mentors (beware)
+ not moderator - since account not registered (Bjoern)
AI: + get ops who are not listed in the developers page listed (JanI)
 
* Madrid (Bjoern)
+ Jacobo approaching the university was great
+ taught design-patterns in university.
+ where are they in LibreOffice ?
+ perhaps a blog series wrt. design patterns in-use.
+ "welcome to the real world" experience (Norbert)
+ colleague teaching theory (Jacobo)
+ wants students to see the reality.
+ could make patterns more visible for interested newcomers.
+ code-base pre-dates discovery of the patterns (Norbert)
+ Pasqual from Valencia, submitted some patches already
+ also interested in certification; 100k seats there.
 
* Hackfests (Bjoern)
+ FOSDEM / Beta Co-working (Bjoern)
+ https://wiki.documentfoundation.org/Hackfest/FOSDEM2016
+ check-in with Italo for papers committe.
+ next venues / suggestions
+ considering another Gran Canaria hack-fest (Thorsten)
+ March next year (?)
Please remember the easter holidays are in march this year, and 
big in spain
+ Turkey
+ talked to them; lots of enthusiasm & desire for training.
 
* Mentoring Update (JanI)
+ how to point to people that need help the most effectively? (Kendy)
+ sometimes I know how to help, just don't have time for the details 
(Kendy)
+ sorted out & provided more 

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Armin, Oliver, Robinson, Michael M, Sophie, JanI, Christian, Stephan,
  Norbert, Eike, Muthu, Andras, Bjoern, Cloph, Michael S, David, Miklos,
  Lionel
 
* Completed Actions / Items:
+ enable calc bits by default for now for more testing (Kendy)
+ poke the users-list on MS Surface / GL issue (Michael)
[ oddly no reply ]
+ merge slide transition artwork to -5-1 for B2 (Michael)
+ ask for QA support of Android remote on Windows (Robinson)
[ waiting to hear back, people moved off windows ... ]
+ list of developers who havn't contributed in a while (JanI)
[ done, pending E-mail ]
 
* Pending Action Items:
+ book FOSDEM conf. room for board meeting (Florian)
[ perhaps after not before to avoid hackfest conflict ]
+ double-check libmar/src, update/src, remove the duplicate, etc. (Kendy)
+ UserAgent - move to 1% of users, drop bundled-languages etc. (Michael)
+ try out 'make check' for gerrit / Linux builders (Norbert)
 [ will take a while ]
+ get callgrind trace of SVG rendering in tdf#82214 (JMux)
 
* Release Engineering update (Cloph)
+ 4.4.7 - released as final today.
+ 5.0.4 RC1
+ on the mirrors.
+ RC2 to be tagge later today.
+ 5.1.0 B2
+ on mirrors, and available from website.
+ 5.1.0 RC1
+ due for tag (but no branch) next week.
+ string and UI freeze from next week.
+ but not code freese.
+ until RC1 - free to commit without review.
+ after RC1 - double review required for libreoffice-5-1
+ Late Features:
+ OpenGL - switch to simpler double-buffering.
[ good progress, fixes bugs;
  swap buffers at (high prio.) idle like Mac.
  More testing / validation ongoing
  Pending CI catchup. ]
+ Slide Transitions: artwork & polish
+ poke at artwork bits ...
+ UserAgent display & tweakage
[ still needs random 1% bits doing ]
+ Android & iOS Remote
+ https://bugs.documentfoundation.org/show_bug.cgi?id=96127
   + simple patch submitted (thanks)
  
* blanket approval for lwp filter (Michael)
+ any objections to Caolan skipping review for all branches
  for simple lwp fixes for 5-0 ?
   + fine but wants a CI build (Norbert)
   + but the CI slaves are horribly over-loaded (Michael)
  + capacity is 4x per hour on Windows (Norbert)
   + current 60 patches CI backlog is a 10x hour delay (Michael) 
+ happy to drop review; or post review them, putting
  them into 1x patch not ideal either (Caolan)
   + temporary disturbance not a problem (Norbert)
   + 35 issues outstanding and coming
+ patches on a feature branch vs. 5.0.4 - and 1x push to gerrit from tip 
(Bjoern)
   => push to gerrit & make it easy to merge. (see ./logerrit testfeature 
for the concept)
+ propose avoiding individual review for these patches (Michael)
   + sounds fine (Bjoern)
   + automatically solves this problem (Norbert)
   + just 1x commit in gerrit to approve.
 
* Crashtest update (Caolan)
+ ? import failures, ? export failures, ??? coverity
 
* IRC - ESC attendees appreciated as op's (Michael)
+ helps me remind you of ESC
+ ideally use channel service instead (Miklos)
+ bit like root; but flags may help others.
+ helps newbies find mentors (beware)
+ not moderator - since account not registered (Bjoern)
AI: + get ops who are not listed in the developers page listed (JanI)
 
* Madrid (Bjoern)
+ Jacobo approaching the university was great
+ taught design-patterns in university.
+ where are they in LibreOffice ?
+ perhaps a blog series wrt. design patterns in-use.
+ "welcome to the real world" experience (Norbert)
+ colleague teaching theory (Jacobo)
+ wants students to see the reality.
+ could make patterns more visible for interested newcomers.
+ code-base pre-dates discovery of the patterns (Norbert)
+ Pasqual from Valencia, submitted some patches already
+ also interested in certification; 100k seats there.
 
* Hackfests (Bjoern)
+ FOSDEM / Beta Co-working (Bjoern)
+ https://wiki.documentfoundation.org/Hackfest/FOSDEM2016
+ check-in with Italo for papers committe.
+ next venues / suggestions
+ considering another Gran Canaria hack-fest (Thorsten)
+ March next year (?)
Please remember the easter holidays are in march this year, and 
big in spain
+ Turkey
+ talked to them; lots of enthusiasm & desire for training.
 
* Mentoring Update (JanI)
+ how to point to people that need help the most effectively? (Kendy)
+ sometimes I know how to help, just don't have time for the details 
(Kendy)
+ sorted out & provided more 

[Libreoffice-bugs] [Bug 96336] Format > Page dialog and selection doubtably different for Writer/Calc/Draw

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96336

V Stuart Foote  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC||vstuart.fo...@utsa.edu
 Ever confirmed|0   |1

--- Comment #6 from V Stuart Foote  ---
Yes, all of OPs observations are correct. There is inconsistency across the
components in how the page background fill tool for bitmaps are structured.

--Tab labels--
   Area (Writer) vs. Background (Calc, Draw, Impress)

--Dialog names--
   Page Style (Writer, Calc) vs. Page Setup (Draw, Impress --w/ no Import) 

--Button lables--
   Import graphic...(Writer)  vs. Browse (Calc) 
   **Draw and Impress are missing an import option button - that seems
incorrect

Possible that the dialogs really are different (Page Style vs. Page Setup), but
believe they are all controlling the same page background fill attribute(s) of
the internal and ODF document. So, IMHO the crux here is simple inconsistency
of labeling in the UI.

I also believe the handling in Writer's Format -> Page dialog: Area tab is
incorrect label it should also be "Background" (for the page), but otherwise is
the most complete and should be the model to bring the other dialogs and tabs
consistent.


Regards nomenclature:

"Vector" based drawings, and "Raster" bitmaps are all "graphics", internally
they are all processed into bitmap metafiles for rendering onto the drawing
canvas. So we do not need to be too concerned with notation--so long as it is
consistent.   And so long as when saved to ODF or export to external
format--the correct conversions are applied--mainly to preserve/control
resolution where appropriate.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 96336] Format > Page dialog and selection doubtably different for Writer/Calc/Draw

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96336

V Stuart Foote  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC||vstuart.fo...@utsa.edu
 Ever confirmed|0   |1

--- Comment #6 from V Stuart Foote  ---
Yes, all of OPs observations are correct. There is inconsistency across the
components in how the page background fill tool for bitmaps are structured.

--Tab labels--
   Area (Writer) vs. Background (Calc, Draw, Impress)

--Dialog names--
   Page Style (Writer, Calc) vs. Page Setup (Draw, Impress --w/ no Import) 

--Button lables--
   Import graphic...(Writer)  vs. Browse (Calc) 
   **Draw and Impress are missing an import option button - that seems
incorrect

Possible that the dialogs really are different (Page Style vs. Page Setup), but
believe they are all controlling the same page background fill attribute(s) of
the internal and ODF document. So, IMHO the crux here is simple inconsistency
of labeling in the UI.

I also believe the handling in Writer's Format -> Page dialog: Area tab is
incorrect label it should also be "Background" (for the page), but otherwise is
the most complete and should be the model to bring the other dialogs and tabs
consistent.


Regards nomenclature:

"Vector" based drawings, and "Raster" bitmaps are all "graphics", internally
they are all processed into bitmap metafiles for rendering onto the drawing
canvas. So we do not need to be too concerned with notation--so long as it is
consistent.   And so long as when saved to ODF or export to external
format--the correct conversions are applied--mainly to preserve/control
resolution where appropriate.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise

[Libreoffice-bugs] [Bug 96384] LOKView signal when selection changes

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96384

Pranav Kant  changed:

   What|Removed |Added

URL||https://gerrit.libreoffice.
   ||org/#/c/20621/

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-commits] core.git: basegfx/source bridges/source compilerplugins/clang include/com include/rtl include/salhelper include/sfx2 include/tools sal/rtl stoc/source store/source sw/source

[Stephan Bergmann]

 basegfx/source/inc/hommatrixtemplate.hxx   |2 
 bridges/source/cpp_uno/shared/guardedarray.hxx |2 
 compilerplugins/clang/store/nullptr.cxx|   68 +
 include/com/sun/star/uno/Reference.h   |2 
 include/com/sun/star/uno/Reference.hxx |8 +-
 include/rtl/ref.hxx|8 +-
 include/salhelper/dynload.hxx  |2 
 include/salhelper/singletonref.hxx |2 
 include/sfx2/itemconnect.hxx   |2 
 include/tools/ref.hxx  |   20 +++
 include/tools/weakbase.hxx |4 -
 sal/rtl/math.cxx   |4 -
 stoc/source/security/lru_cache.h   |2 
 store/source/storbase.hxx  |   10 +--
 sw/source/filter/ww8/writerwordglue.cxx|4 -
 15 files changed, 104 insertions(+), 36 deletions(-)

New commits:
commit 4a1edf626ad48b5955892e5590d75fa7ae5eaf58
Author: Stephan Bergmann 
Date:   Thu Dec 10 17:33:54 2015 +0100

More loplugin:nullptr automatic rewrite (within templates)

Change-Id: I9bc06cfb5eeb38fd7ae7fb25f876ea9f96e4a65a

diff --git a/basegfx/source/inc/hommatrixtemplate.hxx 
b/basegfx/source/inc/hommatrixtemplate.hxx
index 58a3b46..76dc8a5 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -200,7 +200,7 @@ namespace basegfx
 if(!bNecessary)
 {
 delete mpLine;
-mpLine = 0L;
+mpLine = nullptr;
 }
 }
 }
diff --git a/bridges/source/cpp_uno/shared/guardedarray.hxx 
b/bridges/source/cpp_uno/shared/guardedarray.hxx
index ad5d6bd..13e6f16 100644
--- a/bridges/source/cpp_uno/shared/guardedarray.hxx
+++ b/bridges/source/cpp_uno/shared/guardedarray.hxx
@@ -30,7 +30,7 @@ public:
 
 T * get() const { return pointer; }
 
-T * release() { T * p = pointer; pointer = 0; return p; }
+T * release() { T * p = pointer; pointer = nullptr; return p; }
 
 private:
 GuardedArray(GuardedArray &) = delete;
diff --git a/compilerplugins/clang/store/nullptr.cxx 
b/compilerplugins/clang/store/nullptr.cxx
index 8bed1ce..6bf4e54 100644
--- a/compilerplugins/clang/store/nullptr.cxx
+++ b/compilerplugins/clang/store/nullptr.cxx
@@ -44,6 +44,12 @@ public:
 
 bool VisitGNUNullExpr(GNUNullExpr const * expr);
 
+bool VisitBinaryOperator(BinaryOperator const * expr);
+
+bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr);
+
+// bool shouldVisitTemplateInstantiations() const { return true; }
+
 private:
 bool isInLokIncludeFile(SourceLocation spellingLocation) const;
 
@@ -111,6 +117,68 @@ bool Nullptr::VisitGNUNullExpr(GNUNullExpr const * expr) {
 return true;
 }
 
+bool Nullptr::VisitBinaryOperator(BinaryOperator const * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+Expr const * e;
+switch (expr->getOpcode()) {
+case BO_EQ:
+case BO_NE:
+if (expr->getRHS()->getType()->isPointerType()) {
+e = expr->getLHS();
+break;
+}
+// fall through
+case BO_Assign:
+if (expr->getLHS()->getType()->isPointerType()) {
+e = expr->getRHS();
+break;
+}
+// fall through
+default:
+return true;
+}
+//TODO: detect NPCK_ZeroExpression where appropriate
+auto const lit = dyn_cast(e->IgnoreParenImpCasts());
+if (lit == nullptr || lit->getValue().getBoolValue()) {
+return true;
+}
+handleNull(e, nullptr, Expr::NPCK_ZeroLiteral);
+return true;
+}
+
+bool Nullptr::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+Expr const * e;
+switch (expr->getOperator()) {
+case OO_EqualEqual:
+case OO_ExclaimEqual:
+if (expr->getArg(1)->getType()->isPointerType()) {
+e = expr->getArg(0);
+break;
+}
+// fall through
+case OO_Equal:
+if (expr->getArg(0)->getType()->isPointerType()) {
+e = expr->getArg(1);
+break;
+}
+// fall through
+default:
+return true;
+}
+//TODO: detect NPCK_ZeroExpression where appropriate
+auto const lit = dyn_cast(e->IgnoreParenImpCasts());
+if (lit == nullptr || lit->getValue().getBoolValue()) {
+return true;
+}
+handleNull(e, nullptr, Expr::NPCK_ZeroLiteral);
+return true;
+}
+
 bool Nullptr::isInLokIncludeFile(SourceLocation spellingLocation) const {
 return compiler.getSourceManager().getFilename(spellingLocation)
 .startswith(SRCDIR "/include/LibreOfficeKit/");
diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index 8e266cd..368c998 100644
--- 

[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests

[Caolán McNamara]

 qadevOOo/runner/util/DBTools.java|4 ++-
 qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java  |4 ++-
 qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java|4 ++-
 qadevOOo/tests/java/mod/_defreg/NestedRegistry.java  |4 ++-
 qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java   |4 ++-
 qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java  |8 
--
 qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java |4 ++-
 qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java |   12 
+-
 qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java |4 ++-
 qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java |4 ++-
 qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java |4 ++-
 qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java |4 ++-
 qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java|4 ++-
 qadevOOo/tests/java/mod/_svx/AccessibleShape.java|4 ++-
 qadevOOo/tests/java/mod/_svx/SvxShapeControl.java|8 
+-
 qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java   |8 
+-
 qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java|8 
+-
 qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java  |8 
+-
 18 files changed, 72 insertions(+), 28 deletions(-)

New commits:
commit b1c472fd873c6396890135a3804a5b93e8581457
Author: Caolán McNamara 
Date:   Thu Dec 10 10:55:21 2015 +

coverity#1326610 DE: Dropped or ignored exception

and

coverity#1326611 DE: Dropped or ignored exception
coverity#1326612 DE: Dropped or ignored exception
coverity#1326613 DE: Dropped or ignored exception
coverity#1326614 DE: Dropped or ignored exception
coverity#1326615 DE: Dropped or ignored exception
coverity#1326617 DE: Dropped or ignored exception
coverity#1326618 DE: Dropped or ignored exception
coverity#1326619 DE: Dropped or ignored exception
coverity#1326620 DE: Dropped or ignored exception
coverity#1326621 DE: Dropped or ignored exception
coverity#1326622 DE: Dropped or ignored exception
coverity#1326623 DE: Dropped or ignored exception
coverity#1326624 DE: Dropped or ignored exception
coverity#1326625 DE: Dropped or ignored exception
coverity#1326626 DE: Dropped or ignored exception
coverity#1326627 DE: Dropped or ignored exception

Change-Id: I921a5434a6a116db5033cb2c90a59008c13f1bb2

diff --git a/qadevOOo/runner/util/DBTools.java 
b/qadevOOo/runner/util/DBTools.java
index 685ce2c..4fd764a 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -161,7 +161,9 @@ public class DBTools {
 dbContext = UnoRuntime.queryInterface
 (XNamingService.class, cont) ;
 
-} catch (com.sun.star.uno.Exception e) {}
+} catch (com.sun.star.uno.Exception e) {
+System.out.println("caught exception: " + e);
+}
 }
 
 /**
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java 
b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
index 742aa7e..3538eb6 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
@@ -174,7 +174,9 @@ public class _UnoControlFormattedFieldModel extends 
MultiPropertyTest {
 try {
 newValue = tParam.getMSF().createInstance(
 "com.sun.star.util.NumberFormatsSupplier");
-} catch (com.sun.star.uno.Exception e) {}
+} catch (com.sun.star.uno.Exception e) {
+System.out.println("caught exception: " + e);
+}
 return newValue;
 }
 }) ;
diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java 
b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
index e18a834..88b7683 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
@@ -92,7 +92,9 @@ public class _XGoalSeek extends MultiMethodTest {
 xSheet.getCellByPosition(3, 4).setValue(0.8);
 xSheet.getCellByPosition(3, 5).setFormula("= (D5 ^ 2 - 1) / (D5 - 
1)");
 }
-catch(Exception e) {}
+catch(Exception e) {
+System.out.println("caught exception: " + e);
+}
 goal = oObj.seekGoal(aFormula, aValue, "2");
 log.println("Goal Result: " + goal.Result + "   Divergence: " + 
goal.Divergence);
 result &= goal.Divergence < divergence;
diff --git a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java 
b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java
index c6bc3e8..efd3b33 100644

[Libreoffice-bugs] [Bug 96391] New: Text wrong layouted after pptx import

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=96391

Bug ID: 96391
   Summary: Text wrong layouted after pptx import
   Product: LibreOffice
   Version: 5.1.0.0.alpha1
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Impress
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: armin.le.gr...@me.com

Created attachment 121205
  --> https://bugs.documentfoundation.org/attachment.cgi?id=121205=edit
Bugdoc for demonstration - load and see

For text fields from PowerPoint that are too small for text (format text box to
not autmatically resize and type much text) the imported text is wrong. To
reproduce:

- import attacted bugdoc
-> the text should be inside the added lines

Office is already capable of text boxes which have 'overhanging' text, that was
already added in the past. Still, the import is wrong in this case.

Selecting the text box (press TAB) and choosing 'Format/Text...' from menu (or
context menu) and changing anchor to top-left cures this. There seems to be an
error in the importer for this cases with text anchoring.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs