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

[Noel Grandin]

 include/vcl/bitmapex.hxx   |   20 +++
 svtools/source/graphic/transformer.cxx |   43 ++---
 vcl/source/gdi/bitmapex.cxx|   28 +
 3 files changed, 57 insertions(+), 34 deletions(-)

New commits:
commit 5531e6338bc9d7d5676a5c52059d5ccb2fcccb0c
Author: Noel Grandin 
Date:   Wed Feb 7 15:09:12 2018 +0200

move setAlphaFrom from GraphicTransformer to BitmapEx

Change-Id: I69329c61e81791db3806fabe3256571fa937deb6
Reviewed-on: https://gerrit.libreoffice.org/49360
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 31b008a081b2..9faf3c8eb41c 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -265,6 +265,24 @@ public:
 const Color& rSearchColor,
 const Color& rReplaceColor );
 
+/** Replace all pixel having the search color with the specified color
+
+@param rSearchColor
+Color specifying which pixel should be replaced
+
+@param rReplaceColor
+Color to be placed in all changed pixel
+
+@param nTolerance
+Tolerance value. Specifies the maximal difference between
+rSearchColor and the individual pixel values, such that the
+corresponding pixel is still regarded a match.
+ */
+voidReplace(
+const Color& rSearchColor,
+const Color& rReplaceColor,
+sal_uInt8 nTolerance );
+
 /** Replace all pixel having one the search colors with the corresponding 
replace color
 
 @param pSearchColors
@@ -421,6 +439,8 @@ public:
 boolCreate(
 const css::uno::Reference< 
css::rendering::XBitmapCanvas > &xBitmapCanvas,
 const Size &rSize );
+
+voidsetAlphaFrom( sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo 
);
 public:
 
 SAL_DLLPRIVATE std::shared_ptr const & ImplGetBitmapImpBitmap() 
const { return aBitmap.ImplGetImpBitmap(); }
diff --git a/svtools/source/graphic/transformer.cxx 
b/svtools/source/graphic/transformer.cxx
index 17fb3a3f87c6..12bc40f3babc 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -46,28 +46,6 @@ GraphicTransformer::~GraphicTransformer()
 }
 
 
-void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, 
sal_Int8 nAlphaTo )
-{
-BitmapWriteAccess* pWriteAccess = rAlpha.AcquireWriteAccess();
-BitmapReadAccess* pReadAccess = rBitmap.AcquireReadAccess();
-if ( pReadAccess && pWriteAccess )
-{
-for ( long nY = 0; nY < pReadAccess->Height(); nY++ )
-{
-Scanline pScanline = pWriteAccess->GetScanline( nY );
-Scanline pScanlineRead = pReadAccess->GetScanline( nY );
-for ( long nX = 0; nX < pReadAccess->Width(); nX++ )
-{
-const sal_uInt8 cIndex = pReadAccess->GetIndexFromData( 
pScanlineRead, nX );
-if ( cIndex == cIndexFrom )
-pWriteAccess->SetPixelOnData( pScanline, nX, 
BitmapColor(nAlphaTo) );
-}
-}
-}
-Bitmap::ReleaseAccess( pReadAccess );
-rAlpha.ReleaseAccess( pWriteAccess );
-}
-
 // XGraphicTransformer
 uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
 const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 
nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
@@ -90,10 +68,9 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTransformer::colorChange(
 
 if (aBitmapEx.IsAlpha())
 {
-AlphaMask aAlphaMask(aBitmapEx.GetAlpha());
-setAlpha(aBitmap, aAlphaMask, cIndexFrom, nAlphaTo);
-aBitmap.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(BitmapEx(aBitmap, aAlphaMask));
+aBitmapEx.setAlphaFrom( cIndexFrom, nAlphaTo );
+aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance);
+aGraphic = ::Graphic(aBitmapEx);
 }
 else if (aBitmapEx.IsTransparent())
 {
@@ -107,10 +84,9 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTransformer::colorChange(
 }
 else
 {
-AlphaMask aAlphaMask(aBitmapEx.GetMask());
-setAlpha(aBitmap, aAlphaMask, cIndexFrom, 0xff - nAlphaTo);
-aBitmap.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(BitmapEx(aBitmap, aAlphaMask));
+aBitmapEx.setAlphaFrom(cIndexFrom, 0xff - nAlphaTo);
+aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance);
+aGraphic = ::Graphic(aBitmapEx);
 }
 }
 else
@@ -123,10 +99,9 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTrans

[Libreoffice-commits] core.git: bin/update_pch Repository.mk solenv/clang-format xmlsecurity/inc xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Module_xmlsecurity.mk

[Miklos Vajna]

 Repository.mk   |1 
 bin/update_pch  |1 
 solenv/clang-format/blacklist   |2 
 xmlsecurity/Library_xmlsecurity.mk  |   10 +++
 xmlsecurity/Library_xsec_fw.mk  |   44 --
 xmlsecurity/Module_xmlsecurity.mk   |1 
 xmlsecurity/inc/framework/saxeventkeeperimpl.hxx|4 -
 xmlsecurity/inc/framework/securityengine.hxx|4 -
 xmlsecurity/inc/framework/signaturecreatorimpl.hxx  |2 
 xmlsecurity/inc/framework/signatureengine.hxx   |4 -
 xmlsecurity/inc/framework/signatureverifierimpl.hxx |4 -
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |1 
 xmlsecurity/inc/pch/precompiled_xsec_fw.cxx |   12 
 xmlsecurity/inc/pch/precompiled_xsec_fw.hxx |   60 
 xmlsecurity/inc/xsecfwdllapi.h  |   23 ---
 15 files changed, 18 insertions(+), 155 deletions(-)

New commits:
commit 89fa5e45c3cc87cba450aff965918bf5af8f2fa9
Author: Miklos Vajna 
Date:   Wed Feb 7 21:31:58 2018 +0100

xmlsecurity: fold Library_xsec_fw into Library_xmlsecurity

That little amount of code hardly justifies a separate library.

Change-Id: Idbb039f38258bc12759fcf6d29328e1afe7443ab
Reviewed-on: https://gerrit.libreoffice.org/49391
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/Repository.mk b/Repository.mk
index 6ba9571c67d3..17dab1319038 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -636,7 +636,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
ucppkg1 \
unopkgapp \
xmlsecurity \
-   xsec_fw \
xsec_xmlsec \
xstor \
$(if $(filter $(OS),MACOSX), \
diff --git a/bin/update_pch b/bin/update_pch
index ffc0ca3ec700..9b04e4cd4470 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -123,7 +123,6 @@ DEFAULTS = \
 'xmloff.xof': ( 1, EXCLUDE, EXCLUDE, INCLUDE), #   
4.4
 'xmlscript.xmlscript'   : ( 4, EXCLUDE, EXCLUDE, INCLUDE), #   
3.6
 'xmlsecurity.xmlsecurity'   : ( 6, EXCLUDE, INCLUDE, INCLUDE), #   
5.1
-'xmlsecurity.xsec_fw'   : ( 2, EXCLUDE, INCLUDE, EXCLUDE), #   
2.7
 'xmlsecurity.xsec_xmlsec'   : ( 2, EXCLUDE, INCLUDE, INCLUDE), #   
4.4
 'xmlsecurity.xsec_gpg'  : ( 2, EXCLUDE, INCLUDE, INCLUDE), #   
?
 }
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index b34a286c896b..63e99edbbea2 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -19699,8 +19699,6 @@ xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
 xmlsecurity/inc/macrosecurity.hxx
 xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
-xmlsecurity/inc/pch/precompiled_xsec_fw.cxx
-xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
 xmlsecurity/inc/pch/precompiled_xsec_gpg.cxx
 xmlsecurity/inc/pch/precompiled_xsec_gpg.hxx
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.cxx
diff --git a/xmlsecurity/Library_xmlsecurity.mk 
b/xmlsecurity/Library_xmlsecurity.mk
index 1c30ab25817c..a6f4e09d0c45 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\
vcl \
xo \
i18nlangtag \
-   xsec_fw \
xsec_xmlsec \
 ))
 
@@ -53,6 +52,15 @@ $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\
xmlsecurity/source/dialogs/digitalsignaturesdialog \
xmlsecurity/source/dialogs/macrosecurity \
xmlsecurity/source/dialogs/resourcemanager \
+   xmlsecurity/source/framework/buffernode \
+   xmlsecurity/source/framework/elementcollector \
+   xmlsecurity/source/framework/elementmark \
+   xmlsecurity/source/framework/saxeventkeeperimpl \
+   xmlsecurity/source/framework/securityengine \
+   xmlsecurity/source/framework/signaturecreatorimpl \
+   xmlsecurity/source/framework/signatureengine \
+   xmlsecurity/source/framework/signatureverifierimpl \
+   xmlsecurity/source/framework/xmlsignaturetemplateimpl \
xmlsecurity/source/helper/documentsignaturehelper \
xmlsecurity/source/helper/documentsignaturemanager \
xmlsecurity/source/helper/ooxmlsecparser \
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
deleted file mode 100644
index c205a3f2d684..
--- a/xmlsecurity/Library_xsec_fw.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,xsec_fw))
-
-$(

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

[Tamás Zolnai]

 cui/source/dialogs/sdrcelldlg.cxx |2 ++
 cui/source/inc/sdrcelldlg.hxx |1 +
 2 files changed, 3 insertions(+)

New commits:
commit de8a1b4f6c8fcca9fc9cc5ad83c393ecd7292f76
Author: Tamás Zolnai 
Date:   Wed Feb 7 15:54:41 2018 +0100

tdf#115506: Crash when trying to set pattern fill for tables in Impress

Setting pattern list was missed in this specific dialog.

Change-Id: I9f47e9e0dd4f99bf5403c70685508b0f14a5bd61
Reviewed-on: https://gerrit.libreoffice.org/49361
Reviewed-by: Julien Nabet 
Tested-by: Jenkins 

diff --git a/cui/source/dialogs/sdrcelldlg.cxx 
b/cui/source/dialogs/sdrcelldlg.cxx
index 7011a4de1d9c..7789ddd64c13 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -33,6 +33,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* 
pParent, const SfxItemS
 , mpGradientList(pModel->GetGradientList())
 , mpHatchingList(pModel->GetHatchList())
 , mpBitmapList(pModel->GetBitmapList())
+, mpPatternList(pModel->GetPatternList())
 , m_nAreaPageId(0)
 {
 AddTabPage("name", RID_SVXPAGE_CHAR_NAME);
@@ -50,6 +51,7 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, 
SfxTabPage &rPage )
 rAreaPage.SetGradientList( mpGradientList );
 rAreaPage.SetHatchingList( mpHatchingList );
 rAreaPage.SetBitmapList( mpBitmapList );
+rAreaPage.SetPatternList( mpPatternList );;
 rAreaPage.ActivatePage( mrOutAttrs );
 }
 else if (nId == m_nBorderPageId)
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index f5976be5d7f6..97a2abeec613 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -34,6 +34,7 @@ private:
 XGradientListRefmpGradientList;
 XHatchListRef   mpHatchingList;
 XBitmapListRef  mpBitmapList;
+XPatternListRef mpPatternList;
 
 sal_uInt16  m_nAreaPageId;
 sal_uInt16  m_nBorderPageId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/qa sw/source

[Miklos Vajna]

 sw/inc/shellio.hxx  |4 ++--
 sw/qa/extras/htmlimport/data/outline-level.html |5 +
 sw/qa/extras/htmlimport/htmlimport.cxx  |8 
 sw/source/filter/basflt/shellio.cxx |   10 +-
 sw/source/filter/html/swhtml.cxx|6 +-
 sw/source/filter/html/wrthtml.cxx   |2 +-
 sw/source/filter/inc/fltini.hxx |2 +-
 7 files changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 303f8e5160ddb39914ba7f669698d5dbe958878a
Author: Miklos Vajna 
Date:   Wed Feb 7 17:54:49 2018 +0100

sw HTML import: avoid loading the Writer/Web template for the Writer filter

The share/template/common/internal/html.stw template we have is for
Writer/Web, loading that into Writer is questionable at best. Also it
means that the outline numbering of the heading styles is not set, which
is a problem, as the sw HTML import only sets the style, not the
outline numbering.

Change-Id: I86d11d8a5744c3c2ca71b03fd41a24d3f88ea333
Reviewed-on: https://gerrit.libreoffice.org/49381
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index ac1cd9e50d48..5cbd0f502639 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -211,7 +211,7 @@ protected:
 bool bIgnoreHTMLComments : 1;
 bool bSkipImages : 1;
 
-virtual OUString GetTemplateName() const;
+virtual OUString GetTemplateName(SwDoc& rDoc) const;
 
 public:
 Reader();
@@ -230,7 +230,7 @@ public:
 static void ResetFrameFormats( SwDoc& rDoc );
 
 // Load filter template, set it and release it again.
-SwDoc* GetTemplateDoc();
+SwDoc* GetTemplateDoc(SwDoc& rDoc);
 bool SetTemplate( SwDoc& rDoc );
 void ClearTemplate();
 void SetTemplateName( const OUString& rDir );
diff --git a/sw/qa/extras/htmlimport/data/outline-level.html 
b/sw/qa/extras/htmlimport/data/outline-level.html
new file mode 100644
index ..cd36fc3c1b60
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/outline-level.html
@@ -0,0 +1,5 @@
+
+
+heading
+
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 9b20423ea945..bfe1f436e03c 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -271,6 +271,14 @@ DECLARE_HTMLIMPORT_TEST(testTableBorder1px, 
"table_border_1px.html")
 CPPUNIT_ASSERT_MESSAGE("Missing cell right border", aBorder.InnerLineWidth 
> 0);
 }
 
+DECLARE_HTMLIMPORT_TEST(testOutlineLevel, "outline-level.html")
+{
+// This was 0, HTML imported into Writer lost the outline numbering for
+// Heading 1 styles.
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+ getProperty(getParagraph(1), 
"OutlineLevel"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/basflt/shellio.cxx 
b/sw/source/filter/basflt/shellio.cxx
index 037c12b4a993..3e98da244e51 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -442,17 +442,17 @@ Reader::~Reader()
 {
 }
 
-OUString Reader::GetTemplateName() const
+OUString Reader::GetTemplateName(SwDoc& /*rDoc*/) const
 {
 return OUString();
 }
 
 // load the Filter template, set and release
-SwDoc* Reader::GetTemplateDoc()
+SwDoc* Reader::GetTemplateDoc(SwDoc& rDoc)
 {
 if( !bHasAskTemplateName )
 {
-SetTemplateName( GetTemplateName() );
+SetTemplateName( GetTemplateName(rDoc) );
 bHasAskTemplateName = true;
 }
 
@@ -529,7 +529,7 @@ bool Reader::SetTemplate( SwDoc& rDoc )
 {
 bool bRet = false;
 
-GetTemplateDoc();
+GetTemplateDoc(rDoc);
 if( mxTemplate.is() )
 {
 rDoc.RemoveAllFormatLanguageDependencies();
@@ -901,7 +901,7 @@ ErrCode SwWriter::Write( WriterRef const & rxWriter, const 
OUString* pRealFileNa
 bool SetHTMLTemplate( SwDoc & rDoc )
 {
 // get template name of the Sfx-HTML-Filter !!!
-if( !ReadHTML->GetTemplateDoc() )
+if( !ReadHTML->GetTemplateDoc(rDoc) )
 ReadHTML->MakeHTMLDummyTemplateDoc();
 
 bool bRet = ReadHTML->SetTemplate( rDoc );
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c21a373315ed..4586686e1693 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -158,8 +158,12 @@ HTMLReader::HTMLReader()
 bTmplBrowseMode = true;
 }
 
-OUString HTMLReader::GetTemplateName() const
+OUString HTMLReader::GetTemplateName(SwDoc& rDoc) const
 {
+if (!rDoc.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE))
+// HTML import into Writer, avoid loading the Writer/Web template.
+return OUString();
+
 const OUString sTemplateWithoutExt("internal/html");
 SvtPathOptions aPathOpt;
 
diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 4fd3cd91be9d..dd6a2d

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

[Maxim Monastirsky]

 include/toolkit/awt/vclxwindow.hxx   |   17 
 svtools/source/control/toolbarmenu.cxx   |2 
 svtools/source/uno/popupwindowcontroller.cxx |3 -
 toolkit/source/awt/vclxwindow.cxx|   46 --
 toolkit/source/controls/unocontrol.cxx   |   55 +++
 vcl/source/window/menubarwindow.cxx  |7 +++
 vcl/source/window/window.cxx |2 
 7 files changed, 57 insertions(+), 75 deletions(-)

New commits:
commit 3ecf542af410536d64d217c71002799bbe48b9c3
Author: Maxim Monastirsky 
Date:   Sun Jan 28 00:54:23 2018 +0200

Different approach for tdf#115227

This reverts the previous attempt of commit
250ad9311a613d9b4e1cf5cf5fdaf33d9b326220 ("tdf#115227 svtools:
suppress UNO notifications for color selectors"), in favor of
a different fix. The advantage of this new approach is that
is doesn't affect events other than activate/deativate, and that
it covers more cases: Toolbar popups even if not based on
svtools::ToolbarPopup, or if closed by clicking outside them,
font name/size and paragraph style toolbar controls, notebookbar,
context and main menus (for the non gtk3 native case, the gtk3
native menus left for a future investigation). For now, keep this
logic inside toolkit, but ideally it should be in vcl (after
reviewing vcl internal listeners).

One side effect that I noticed after this change, is that there is
a deactivation/activation pair which suppressed when e.g. opening a
new document from the start center. But I'm not sure if that's a
problem, given that the focus state of the top window as a whole
wasn't changed, only its contents, and there are other APIs to track
activation of document components. This happens because the source
and the target windows of those events are the same, and we need to
suppress this case to fix the font name/size style controls, and also
the color picker after 27473d1c0f8ba3006262001cbefff33f639a19ac
("tdf#114935 Move the focus back to the document"). Otherwise we'll
need to find another way to move the focus to the document w/o
triggering listeners.

Another case that will see a change in behavior, is document event
listeners in dbaccess, as the Focus/UnFocus events there are based
on top window activation/deactivation. However, I think it's a good
change, as currently just opening of a toolbar popup or main/context
menus there triggers those document events, making them useless.

I would like to also mention here, that in fact those top window
activation events never really worked as tdf#115227 expects them, as
the superfluous events for at least the font name/size, style and
color toolbar buttons existed already in OOo. The behavior of the
color buttons changed in LO for a few years, but regressed again in
the work on a real focus grabbing for floating windows starting with
commit dd46727b99d4bb5135451aa7e5e1bdb197373843 ("Resolves; tdf#87120
no keyboard navigation inside floating windows"). That work also
introduced superfluous events when using menus.

And a note about the change in menubarwindow.cxx: When a menubar
popup is closed it's deleted using the lazydelete mechanism, which
reparents the popup window, so it doesn't appear anymore in the
hierarchy of the document window. Moreover, I suspect that at some
point the lazydelete thing will be replaced by a VclPtr mechanism,
which might break this even further, so the event won't appear as
coming from the popup window (which might be already disposed at
this stage). So instead, temporarily set the menubar window as the
current focus window, so the activation will appear as if it was
coming from the menu bar window itself.

Change-Id: I292232adfcbd1a31d66ce394cd2f1bf42a013ecb
Reviewed-on: https://gerrit.libreoffice.org/48746
Reviewed-by: Maxim Monastirsky 
Tested-by: Jenkins 

diff --git a/include/toolkit/awt/vclxwindow.hxx 
b/include/toolkit/awt/vclxwindow.hxx
index 3c925a59143b..27be3e102d32 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -233,23 +233,6 @@ public:
 virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL 
getStyleSettings() override;
 };
 
-class TOOLKIT_DLLPUBLIC VclListenerLock
-{
-private:
-VCLXWindow* m_pLockWindow;
-
-public:
-explicit VclListenerLock(VCLXWindow* _pLockWindow);
-/**
- * @param bSystemWindow - if pVclWindow or its first system window parent
- * is locked.
- */
-explicit VclListenerLock(vcl::Window* pVclWindow, bool bSystemWindow);
-~VclListenerLock();
-VclListenerLock(const VclListenerLock&) = delete;
-VclListenerLock& operator=(const VclListenerLock&) = delete;
-};
-
 #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 ex

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

[László Németh]

 extras/source/autocorr/lang/hu/DocumentList.xml |   27 
 1 file changed, 27 insertions(+)

New commits:
commit 0d0c13bfbdff85a18433aee6e94558689f0cb722
Author: László Németh 
Date:   Thu Feb 1 16:54:14 2018 +0100

tdf#115382 Hungarian autocorrect: help apostrophe usage

Change-Id: I1d3368c9acb7ddc90d84bde6db9940b76c3ad8d8
Reviewed-on: https://gerrit.libreoffice.org/49111
Tested-by: Jenkins 
Reviewed-by: László Németh 

diff --git a/extras/source/autocorr/lang/hu/DocumentList.xml 
b/extras/source/autocorr/lang/hu/DocumentList.xml
index a535caaf86a7..67532b14c47d 100644
--- a/extras/source/autocorr/lang/hu/DocumentList.xml
+++ b/extras/source/autocorr/lang/hu/DocumentList.xml
@@ -14,6 +14,15 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -28,6 +37,8 @@
   
   
   
+  
+  
   
   
   
@@ -78,6 +89,10 @@
   
   
   
+  
+  
+  
+  
   
   
   
@@ -215,6 +230,12 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
   
   
@@ -354,6 +375,8 @@
   
   
   
+  
+  
   
   
   
@@ -483,6 +506,8 @@
   
   
   
+  
+  
   
   
   
@@ -515,6 +540,8 @@
   
   
   
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl sc/inc sc/qa sc/source sd/qa sd/source

[Pranav Kant]

 include/vcl/ITiledRenderable.hxx |2 -
 sc/inc/docuno.hxx|3 +
 sc/qa/unit/tiledrendering/tiledrendering.cxx |   35 ++
 sc/source/ui/unoobj/docuno.cxx   |   25 
 sd/qa/unit/tiledrendering/tiledrendering.cxx |   42 +++
 sd/source/ui/inc/unomodel.hxx|2 +
 sd/source/ui/unoidl/unomodel.cxx |   27 +
 7 files changed, 135 insertions(+), 1 deletion(-)

New commits:
commit b746577d27437f9298fa111512d083eaccd4fbed
Author: Pranav Kant 
Date:   Wed Feb 7 21:23:42 2018 +0530

sd, sc lok: IME support + unit tests

Change-Id: I710ba4347977641102b89fd274a159d34bc29e72
Reviewed-on: https://gerrit.libreoffice.org/49385
Tested-by: Jenkins 
Reviewed-by: pranavk 

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 135f74064afa..de3b098a496d 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -107,7 +107,7 @@ public:
  *
  * @see lok::Document::postExtTextInputEvent().
  */
-virtual void postExtTextInputEvent(int /*nType*/, const OUString& 
/*rText*/) {}
+virtual void postExtTextInputEvent(int nType, const OUString& rText) = 0;
 
 /**
  * Posts a mouse event on the document.
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index aa55a1ad4c35..6cf2cc35c360 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -325,6 +325,9 @@ public:
 /// @see vcl::ITiledRenderable::postKeyEvent().
 virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
 
+/// @see vcl::ITiledRenderable::postExtTextInputEvent().
+virtual void postExtTextInputEvent(int nType, const OUString& rText) 
override;
+
 /// @see vcl::ITiledRenderable::postMouseEvent().
 virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int 
nButtons, int nModifier) override;
 
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index a1dd154f4717..e70ec8b519a5 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -89,6 +89,7 @@ public:
 void testDocumentRepair();
 void testLanguageStatus();
 void testMultiViewCopyPaste();
+void testIMESupport();
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnSelections);
@@ -119,6 +120,7 @@ public:
 CPPUNIT_TEST(testDocumentRepair);
 CPPUNIT_TEST(testLanguageStatus);
 CPPUNIT_TEST(testMultiViewCopyPaste);
+CPPUNIT_TEST(testIMESupport);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1568,6 +1570,39 @@ void ScTiledRenderingTest::testMultiViewCopyPaste()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void ScTiledRenderingTest::testIMESupport()
+{
+comphelper::LibreOfficeKit::setActive();
+
+ScModelObj* pModelObj = createDoc("empty.ods");
+ScDocument* pDoc = pModelObj->GetDocument();
+
+ScTabViewShell* pView = 
dynamic_cast(SfxViewShell::Current());
+CPPUNIT_ASSERT(pView);
+
+pView->SetCursor(0, 0);
+// sequence of chineese IME compositions when 'nihao' is typed in an IME
+const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
+std::vector aInputs;
+std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
+   std::back_inserter(aInputs), [](OString aInput) {
+   return OUString::fromUtf8(aInput);
+   });
+for (const auto& aInput: aInputs)
+{
+pModelObj->postExtTextInputEvent(LOK_EXT_TEXTINPUT, aInput);
+}
+pModelObj->postExtTextInputEvent(LOK_EXT_TEXTINPUT_END, "");
+
+// commit the string to the cell
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+
+CPPUNIT_ASSERT_EQUAL(aInputs[aInputs.size() - 1], 
pDoc->GetString(ScAddress(0, 0, 0)));
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 70c8123711af..d12a063a926a 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -618,6 +619,30 @@ void ScModelObj::postKeyEvent(int nType, int nCharCode, 
int nKeyCode)
 }
 }
 
+void ScModelObj::postExtTextInputEvent(int nType, const OUString& rText)
+{
+SolarMutexGuard aGuard;
+
+ScViewData* pViewData = ScDocShell::GetViewData();
+vcl::Window* pWindow = pViewData->GetActiveWin();
+
+if (!pWindow)
+return;
+
+CommandExtTextInputData aTextInputData(rText, nullptr, 0, 0, false);
+switch (nType)
+{
+case LOK_EXT_TEXTINPUT:
+pWindow->PostExtTextInputEvent(VclEventId::ExtTextInput, rText);
+  

[Libreoffice-commits] online.git: bundled/include common/Protocol.cpp kit/ChildSession.cpp kit/ChildSession.hpp loleaflet/src test/WhiteBoxTests.cpp wsd/ClientSession.cpp

[Pranav Kant]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |5 +
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|   11 
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   48 +--
 common/Protocol.cpp  |2 
 kit/ChildSession.cpp |   27 ++
 kit/ChildSession.hpp |1 
 loleaflet/src/map/handler/Map.Keyboard.js|   15 +++--
 test/WhiteBoxTests.cpp   |3 +
 wsd/ClientSession.cpp|1 
 9 files changed, 102 insertions(+), 11 deletions(-)

New commits:
commit ad1da235d3c7ac893fc7c0d0369b4b7b3ed29db6
Author: Pranav Kant 
Date:   Thu Feb 8 00:00:45 2018 +0530

IME support

Dialogs still need to be adapted to this. Only works for documents as of
now.

Change-Id: I0fb1114e279a9e563943f3f65dd5a577523e9841

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index d42bd343..ebc112fb 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -300,6 +300,11 @@ struct _LibreOfficeKitDocumentClass
 /// @see lok::Document::setViewLanguage().
 void (*setViewLanguage) (LibreOfficeKitDocument* pThis, int nId, const 
char* language);
 
+/// @see lok::Document::postExtTextInputEvent
+void (*postExtTextInputEvent) (LibreOfficeKitDocument* pThis,
+   int nType,
+   const char* pText);
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 310b9cfc..09835608 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -537,6 +537,17 @@ public:
 mpDoc->pClass->setViewLanguage(mpDoc, nId, language);
 }
 
+/**
+ * Post the text input from external input window, like IME
+ *
+ * @param nType see LibreOfficeKitExtTextInputType
+ * @param pText Text for LOK_EXT_TEXTINPUT
+ */
+void postExtTextInputEvent(int nType, const char* pText)
+{
+mpDoc->pClass->postExtTextInputEvent(mpDoc, nType, pText);
+}
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index f14ce4d3..ccbc3b96 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -267,6 +267,11 @@ typedef enum
 /**
  * The size and/or the position of the cell cursor changed.
  *
+ * Payload format: "x, y, width, height, column, row", where the first
+ * 4 numbers are document coordinates, in twips, and the last 2 are table
+ * coordinates starting from 0.
+ * When the cursor is not shown the payload format is the "EMPTY" string.
+ *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
 LOK_CALLBACK_CELL_CURSOR = 17,
@@ -509,11 +514,12 @@ typedef enum
  * The column/row header is no more valid because of a column/row insertion
  * or a similar event. Clients must query a new column/row header set.
  *
- * The payload says if we are invalidating a row or column header.
+ * The payload says if we are invalidating a row or column header. So,
+ * payload values can be: "row", "column", "all".
  */
 LOK_CALLBACK_INVALIDATE_HEADER = 33,
 /**
- * The text content of the address field in Calc.
+ * The text content of the address field in Calc. Eg: "A7"
  */
 LOK_CALLBACK_CELL_ADDRESS = 34,
 /**
@@ -534,7 +540,32 @@ typedef enum
  */
 LOK_CALLBACK_RULER_UPDATE = 35,
 /**
- * Dialog invalidation
+ * Window related callbacks are emitted under this category. It includes
+ * external windows like dialogs, autopopups for now.
+ *
+ * The payload format is:
+ *
+ * {
+ *"id": "unique integer id of the dialog",
+ *"action": "",
+ *"type": ""
+ *"rectangle": "x, y, width, height"
+ * }
+ *
+ * "type" tells the type of the window the action is associated with
+ *  - "dialog" - window is a dialog
+ *  - "child" - window is a floating window (combo boxes, etc.)
+ *
+ * "action" can take following values:
+ * - "created" - window is created in the backend, client can render it now
+ * - "title_changed" - window's title is changed
+ * - "size_changed" - window's size is changed
+ * - "invalidate" - the area as described by "rectangle" is invalidated
+ *Clients must request the new area
+ * - "cursor_invalidate" - cursor is invalidated. New position is in 
"rectangle"

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit b10ae2faae6f3c448bbab71585550387e18cc248
Author: Caolán McNamara 
Date:   Wed Feb 7 15:50:35 2018 +

check O_head size

Change-Id: Idf5d30eaed0196cfa9266e35131c538c606a0960
Reviewed-on: https://gerrit.libreoffice.org/49365
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 48326e11c0f0..3071bd5dee1c 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1524,7 +1524,6 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 int i;
 sal_uInt32 length, tag;
 sal_uInt32 tdoffset = 0;/* offset to TableDirectory in a TTC file. 
For TTF files is 0 */
-int indexfmt;
 
 sal_uInt32 TTCTag = GetInt32(t->ptr, 0);
 
@@ -1660,8 +1659,13 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 t->nglyphs = table_size >= 6 ? GetUInt16(table, 4) : 0;
 
 table = getTable(t, O_head);
+table_size = getTableSize(t, O_head);
+if (table_size < 52) {
+CloseTTFont(t);
+return SF_TTFORMAT;
+}
 t->unitsPerEm = GetUInt16(table, 18);
-indexfmt = GetInt16(table, 50);
+int indexfmt = GetInt16(table, 50);
 
 if( ((indexfmt != 0) && (indexfmt != 1)) || (t->unitsPerEm <= 0) ) {
 CloseTTFont(t);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 08dd51bfcaa6b493e134bcc7787cc18c36ad5db1
Author: Caolán McNamara 
Date:   Wed Feb 7 15:33:36 2018 +

check table size before reading nglyphs

Change-Id: Ib511fdf16006877ca76085137eb9200601b2f8f7
Reviewed-on: https://gerrit.libreoffice.org/49363
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 21ffb3c13255..48326e11c0f0 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1656,7 +1656,8 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 }
 
 const sal_uInt8* table = getTable(t, O_maxp);
-t->nglyphs = GetUInt16(table, 4);
+sal_uInt32 table_size = getTableSize(t, O_maxp);
+t->nglyphs = table_size >= 6 ? GetUInt16(table, 4) : 0;
 
 table = getTable(t, O_head);
 t->unitsPerEm = GetUInt16(table, 18);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 08d15ad6c38a15444044204dabb2a7f29e6550d8
Author: Caolán McNamara 
Date:   Wed Feb 7 16:20:54 2018 +

return early on short stream

Change-Id: Ia9cb4dec5358281322a2428c5f2153836a1ee1af
Reviewed-on: https://gerrit.libreoffice.org/49373
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 3071bd5dee1c..1b77d7ec7142 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1521,6 +1521,8 @@ int OpenTTFontBuffer(const void* pBuffer, sal_uInt32 
nLen, sal_uInt32 facenum, T
 
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 {
+if (t->fsize < 4)
+return SF_TTFORMAT;
 int i;
 sal_uInt32 length, tag;
 sal_uInt32 tdoffset = 0;/* offset to TableDirectory in a TTC file. 
For TTF files is 0 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 37a2830387f437cf57104f7f509ec59944004e4d
Author: Caolán McNamara 
Date:   Wed Feb 7 16:51:32 2018 +

what matters is the availability of the last element, not the first

Change-Id: I23d3abdbe62b735d66261fb337613da88cc4206b
Reviewed-on: https://gerrit.libreoffice.org/49378
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 1b77d7ec7142..76367cbc43ae 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2440,7 +2440,8 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
 info->symbolEncoded = (ttf->cmapType == CMAP_MS_Symbol);
 
 const sal_uInt8* table = getTable(ttf, O_OS2);
-if (table) {
+sal_uInt32 table_size = getTableSize(ttf, O_OS2);
+if (table && table_size >= 42) {
 info->weight = GetUInt16(table, 4);
 info->width  = GetUInt16(table, 6);
 
@@ -2448,7 +2449,7 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
  * Microsoft old (78 bytes long) and Microsoft new (86 bytes long,)
  * Apple's documentation recommends looking at the table length.
  */
-if (getTableSize(ttf, O_OS2) > 68) {
+if (table_size >= 78) {
 info->typoAscender = XUnits(UPEm,GetInt16(table, 68));
 info->typoDescender = XUnits(UPEm, GetInt16(table, 70));
 info->typoLineGap = XUnits(UPEm, GetInt16(table, 72));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a1c58b95bf4c5ce6edf638b8e5fc971148db7bfe
Author: Caolán McNamara 
Date:   Wed Feb 7 16:57:27 2018 +

check kern table size

Change-Id: I65b5f0a8950d54c00d6fd7c385ca1c5dca2ef2c8
Reviewed-on: https://gerrit.libreoffice.org/49382
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 76367cbc43ae..1e2215a1ae6f 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1348,7 +1348,7 @@ static void GetKern(TrueTypeFont *ttf)
 if( !table )
 goto badtable;
 
-if (GetUInt16(table, 0) == 0) {/* 
Traditional Microsoft style table with sal_uInt16 version and nTables fields */
+if (nTableSize >= 4 && GetUInt16(table, 0) == 0) { /* Traditional 
Microsoft style table with sal_uInt16 version and nTables fields */
 ttf->nkern = GetUInt16(table, 2);
 ptr = table + 4;
 
@@ -1379,7 +1379,7 @@ static void GetKern(TrueTypeFont *ttf)
 return;
 }
 
-if (GetUInt32(table, 0) == 0x0001) {   /* MacOS 
style kern tables: fixed32 version and sal_uInt32 nTables fields */
+if (nTableSize >= 8 && GetUInt32(table, 0) == 0x0001) { /* MacOS style 
kern tables: fixed32 version and sal_uInt32 nTables fields */
 ttf->nkern = GetUInt32(table, 4);
 ptr = table + 8;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source

[Justin Luth]

 sfx2/source/doc/objstor.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d51c01846afb9bea5a39fd48fbb30b9fd02c2870
Author: Justin Luth 
Date:   Fri Feb 2 14:53:40 2018 +0300

init known ExtraLanguages before document loads

Extensions can add RegisterOnTheFly languages for spell checkers.
A late initialization of the LanguageTable resulted in the inability
to recognize the available spell checker.

So, if a .doc file had an onTheFly language inside, and it was
the first document that LibreOffice opened, then the spell checking
extension was disabled for any other document opened while LibreOffice
was living, including docx and odt files.  (Starting with a blank
document, or a .docx or .odt file seems to initialize OK - and
then subsequent .doc files are also ok in those sessions.)

Ensuring that the static LanguageTable is intialized early in the process
avoids this headache.

In my case, .doc was failing with:
LanguageTag::registerOnTheFly: not cross-inserted
0x7e0 for 'kbo' have 'en-US'

but with this patch now matches .odt/docx with:

LanguageTag::registerOnTheFly: cross-inserted
0x7e0 for 'kbo' [have 'kbo']

This fixes .ods .odg, odp,
   .xls .xlsx .ppt, pptx
   .doc and likely many others

Change-Id: Ie6dcbfd73e063eef4573016c3c62d29cf8ad43ca
Reviewed-on: https://gerrit.libreoffice.org/49142
Reviewed-by: Martin Hosken 
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 427c0804cd4aecde1cadb7cb3c4f3487991bd573)
Reviewed-on: https://gerrit.libreoffice.org/49171
Reviewed-by: Justin Luth 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index a82821922606..207c4fdeae96 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -642,6 +643,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 pImpl->nLoadedFlags = SfxLoadedFlags::NONE;
 pImpl->bModelInitialized = false;
 
+// initialize static language table so language-related extensions are 
learned before the document loads
+(void)SvtLanguageTable::GetLanguageEntryCount();
+
 //TODO/LATER: make a clear strategy how to handle "UsesStorage" etc.
 bool bOwnStorageFormat = IsOwnStorageFormat( *pMedium );
 bool bHasStorage = IsPackageStorageFormat_Impl( *pMedium );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src

[Pranav Kant]

 loleaflet/dist/leaflet.css|4 ++--
 loleaflet/src/layer/tile/TileLayer.js |5 +
 loleaflet/src/map/Map.js  |3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 1e91799663945fdfde84385bcfbb96fd03c6fe2e
Author: Pranav Kant 
Date:   Thu Feb 8 15:04:29 2018 +0530

Move the IME candidate window with cursor position

Change-Id: I7b37b0c4981b4ebcefb7606915711ca2adec3c31

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index c324ebfd..b2bf8115 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -679,7 +679,7 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header 
{
 }
 
 .clipboard-container {
-   position: fixed;
+   position: absolute;
left: 0px;
top: 0px;
width: 0px;
@@ -863,4 +863,4 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header 
{
border-radius: 2px;
top: 24px;
color: white;
-   }
\ No newline at end of file
+   }
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 1494fe88..3752f58b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1534,6 +1534,11 @@ L.TileLayer = L.GridLayer.extend({
this._cursorMarker.setLatLng(cursorPos, 
pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom(;
}
this._map.addLayer(this._cursorMarker);
+
+   // move the hidden input field with the cursor
+   var clipContainer = 
L.DomUtil.get('doc-clipboard-container');
+   var pos = 
this._map.latLngToLayerPoint(L.latLng(cursorPos)).round();
+   L.DomUtil.setPosition(clipContainer, pos);
}
else if (this._cursorMarker) {
this._map.removeLayer(this._cursorMarker);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f2b31925..c90b6a0c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -692,7 +692,8 @@ L.Map = L.Evented.extend({
throw new Error('Map container is already 
initialized.');
}
 
-   var textAreaContainer = L.DomUtil.create('div', 
'clipboard-container', container.parentElement);
+   var textAreaContainer = L.DomUtil.create('div', 
'clipboard-container', container);
+   textAreaContainer.id = 'doc-clipboard-container';
this._textArea = L.DomUtil.create('input', 'clipboard', 
textAreaContainer);
this._textArea.setAttribute('type', 'text');
this._textArea.setAttribute('autocorrect', 'off');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze]

 extras/source/palettes/standard.soc |  240 ++--
 1 file changed, 123 insertions(+), 117 deletions(-)

New commits:
commit bbde6eeae5c0ca5e106eec53dc7882361897a616
Author: heiko tietze 
Date:   Tue Jan 30 09:26:03 2018 +0100

tdf#114719 RYB based color palette

Base colors Red, Yellow, Blue / Orange, Green, Purple /
Magenta, Indigo, Teal, Lime, Gold, Brick;
Hues and shades modified with Gossett & Chen algorithm

Change-Id: I71facf3b143bb8c922a84075df03ec00f7c55b6b
Reviewed-on: https://gerrit.libreoffice.org/48887
Reviewed-by: V Stuart Foote 
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/extras/source/palettes/standard.soc 
b/extras/source/palettes/standard.soc
index fa4c9bc9a013..9e61e89ac4dc 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -1,7 +1,9 @@
 
 http://openoffice.org/2000/office"; 
xmlns:style="http://openoffice.org/2000/style"; 
xmlns:text="http://openoffice.org/2000/text"; 
xmlns:table="http://openoffice.org/2000/table"; 
xmlns:draw="http://openoffice.org/2000/drawing"; 
xmlns:fo="http://www.w3.org/1999/XSL/Format"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="http://openoffice.org/2000/meta"; 
xmlns:number="http://openoffice.org/2000/datastyle"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:chart="http://openoffice.org/2000/chart"; 
xmlns:dr3d="http://openoffice.org/2000/dr3d"; 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="http://openoffice.org/2000/form"; 
xmlns:script="http://openoffice.org/2000/script";>
-  
-  
+  
+  
+  
+
   
   
   
@@ -16,126 +18,130 @@
   
   
 
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+   
+  
+  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+   
+  
+  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  
-  
-  
-  
-  
-  
-   
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/htmltab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c406640970c7b881946f454e20293d43e3b65e0
Author: Caolán McNamara 
Date:   Thu Feb 8 09:53:07 2018 +

ofz#6102 Null-dereference

Change-Id: Ie69b8ac7fd402a2f13dca9a81513adeb9cae1832

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index fa9a8a6e9f87..9865974cd44e 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1602,7 +1602,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
 nTopRow, nStartCol,
 nBottomRow, nSplitCol);
 
-if ( 1 != nBoxRowSpan )
+if (1 != nBoxRowSpan && pBox)
 pBox->setRowSpan( nBoxRowSpan );
 
 bSplitted = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   19 +--
 lotuswordpro/source/filter/lwplayout.hxx |2 ++
 2 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit f9826620aae0f9f9fb1dd30216e6be317ecb103b
Author: Caolán McNamara 
Date:   Thu Feb 8 10:01:06 2018 +

ofz#6104 guard against self recursive GetShadow

Change-Id: If1cf0ef365f78665cc5b9f5f1ea53e82b531f9b0

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index c3aae4ee1369..5dc583dce675 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1422,9 +1422,11 @@ bool LwpMiddleLayout::HasContent()
 return content.is();
 }
 
-LwpLayout::LwpLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm ) :
-LwpMiddleLayout(objHdr, pStrm)
-{}
+LwpLayout::LwpLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
+: LwpMiddleLayout(objHdr, pStrm)
+, m_bGettingShadow(false)
+{
+}
 
 LwpLayout::~LwpLayout()
 {
@@ -1813,20 +1815,25 @@ bool LwpLayout::IsUseOnPage()
 */
 LwpShadow* LwpLayout::GetShadow()
 {
+if (m_bGettingShadow)
+throw std::runtime_error("recursion in layout");
+m_bGettingShadow = true;
+LwpShadow* pRet = nullptr;
 if(m_nOverrideFlag & OVER_SHADOW)
 {
 LwpLayoutShadow* pLayoutShadow = 
dynamic_cast(m_LayShadow.obj().get());
-return pLayoutShadow ? &pLayoutShadow->GetShadow() : nullptr;
+pRet = pLayoutShadow ? &pLayoutShadow->GetShadow() : nullptr;
 }
 else
 {
 rtl::Reference xBase(GetBasedOnStyle());
 if (LwpLayout* pLay = dynamic_cast(xBase.get()))
 {
-return pLay->GetShadow();
+pRet = pLay->GetShadow();
 }
 }
-return nullptr;
+m_bGettingShadow = false;
+return pRet;
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 3c900b4d8a6d..a0f6ef868da3 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -415,6 +415,8 @@ public:
 
 class LwpLayout : public LwpMiddleLayout
 {
+private:
+bool m_bGettingShadow;
 public:
 LwpLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
 virtual ~LwpLayout() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/eff1e58839df4f4cc7d2ff239dd818880372a1a0/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb1d8f4abf22b627faf4fd0cf58a4f2e7fa317d2
Author: Caolán McNamara 
Date:   Wed Feb 7 16:57:27 2018 +

check kern table size

Change-Id: I65b5f0a8950d54c00d6fd7c385ca1c5dca2ef2c8
Reviewed-on: https://gerrit.libreoffice.org/49383
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 1a4f5f16e4ef..b66324a5a730 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1348,7 +1348,7 @@ static void GetKern(TrueTypeFont *ttf)
 if( !table )
 goto badtable;
 
-if (GetUInt16(table, 0) == 0) {/* 
Traditional Microsoft style table with sal_uInt16 version and nTables fields */
+if (nTableSize >= 4 && GetUInt16(table, 0) == 0) { /* Traditional 
Microsoft style table with sal_uInt16 version and nTables fields */
 ttf->nkern = GetUInt16(table, 2);
 ptr = table + 4;
 
@@ -1379,7 +1379,7 @@ static void GetKern(TrueTypeFont *ttf)
 return;
 }
 
-if (GetUInt32(table, 0) == 0x0001) {   /* MacOS 
style kern tables: fixed32 version and sal_uInt32 nTables fields */
+if (nTableSize >= 8 && GetUInt32(table, 0) == 0x0001) { /* MacOS style 
kern tables: fixed32 version and sal_uInt32 nTables fields */
 ttf->nkern = GetUInt32(table, 4);
 ptr = table + 8;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/comphelper

[Tor Lillqvist]

 include/comphelper/windowsdebugoutput.hxx |   41 ++
 1 file changed, 41 insertions(+)

New commits:
commit ceb082c94fd1a8bb308a2c2699699b1fc0f0e7fb
Author: Tor Lillqvist 
Date:   Thu Feb 8 12:51:29 2018 +0200

Add debug output operator for IID

This file is the place for future similar additions.

Change-Id: Ibe168731ed97fe2366afb89409fe5ae2afa711e4

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
new file mode 100644
index ..5efda11e7271
--- /dev/null
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/* Debug output operators for Windows-specific types. For use in SAL_INFO(), 
SAL_WARN(), and
+ * friends. The exact format of the generated output is not guaranteed to be 
stable or contain
+ * complete information.
+ */
+
+#ifndef INCLUDED_COMPHELPER_WINDOWSDEBUGOUTPUT_HXX
+#define INCLUDED_COMPHELPER_WINDOWSDEBUGOUTPUT_HXX
+
+#include 
+#include 
+#include 
+#include 
+
+template 
+inline std::basic_ostream& operator<<(std::basic_ostream& stream,
+ const IID& rIid)
+{
+LPOLESTR pRiid;
+if (StringFromIID(rIid, &pRiid) != S_OK)
+return stream << "?";
+
+// TODO: Maybe look up a descriptive name for the service or interface, 
from HKCR\CLSID or
+// HKCR\Interface?
+
+stream << OUString(reinterpret_cast(pRiid));
+CoTaskMemFree(pRiid);
+return stream;
+}
+
+#endif // INCLUDED_COMPHELPER_WINDOWSDEBUGOUTPUT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d566c200995d2124fb76adc9484cb8ef58ab78ae
Author: Caolán McNamara 
Date:   Wed Feb 7 16:57:27 2018 +

check kern table size

Change-Id: I65b5f0a8950d54c00d6fd7c385ca1c5dca2ef2c8
Reviewed-on: https://gerrit.libreoffice.org/49384
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 2170acd08d1c..28713f47dbd7 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1354,7 +1354,7 @@ static void GetKern(TrueTypeFont *ttf)
 if( !table )
 goto badtable;
 
-if (GetUInt16(table, 0) == 0) {/* 
Traditional Microsoft style table with sal_uInt16 version and nTables fields */
+if (nTableSize >= 4 && GetUInt16(table, 0) == 0) { /* Traditional 
Microsoft style table with sal_uInt16 version and nTables fields */
 ttf->nkern = GetUInt16(table, 2);
 ttf->kerntype = KT_MICROSOFT;
 ptr = table + 4;
@@ -1386,7 +1386,7 @@ static void GetKern(TrueTypeFont *ttf)
 return;
 }
 
-if (GetUInt32(table, 0) == 0x0001) {   /* MacOS 
style kern tables: fixed32 version and sal_uInt32 nTables fields */
+if (nTableSize >= 8 && GetUInt32(table, 0) == 0x0001) { /* MacOS style 
kern tables: fixed32 version and sal_uInt32 nTables fields */
 ttf->nkern = GetUInt32(table, 4);
 ttf->kerntype = KT_APPLE_NEW;
 ptr = table + 8;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c21f8635d7814fc6e05169cbac0a49b67f71
Author: Caolán McNamara 
Date:   Wed Feb 7 16:51:32 2018 +

what matters is the availability of the last element, not the first

Change-Id: I23d3abdbe62b735d66261fb337613da88cc4206b
Reviewed-on: https://gerrit.libreoffice.org/49379
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index b66324a5a730..d69a6132d938 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2433,7 +2433,8 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
 info->symbolEncoded = (ttf->cmapType == CMAP_MS_Symbol);
 
 const sal_uInt8* table = getTable(ttf, O_OS2);
-if (table) {
+sal_uInt32 table_size = getTableSize(ttf, O_OS2);
+if (table && table_size >= 42) {
 info->weight = GetUInt16(table, 4);
 info->width  = GetUInt16(table, 6);
 
@@ -2441,7 +2442,7 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
  * Microsoft old (78 bytes long) and Microsoft new (86 bytes long,)
  * Apple's documentation recommends looking at the table length.
  */
-if (getTableSize(ttf, O_OS2) > 68) {
+if (table_size >= 78) {
 info->typoAscender = XUnits(UPEm,GetInt16(table, 68));
 info->typoDescender = XUnits(UPEm, GetInt16(table, 70));
 info->typoLineGap = XUnits(UPEm, GetInt16(table, 72));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f975fbf50ef6da9d610885eb7ca46d93ef779481
Author: Caolán McNamara 
Date:   Wed Feb 7 16:51:32 2018 +

what matters is the availability of the last element, not the first

Change-Id: I23d3abdbe62b735d66261fb337613da88cc4206b
Reviewed-on: https://gerrit.libreoffice.org/49380
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 28713f47dbd7..566226f1e1f0 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2450,7 +2450,8 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
 info->symbolEncoded = (ttf->cmapType == CMAP_MS_Symbol);
 
 const sal_uInt8* table = getTable(ttf, O_OS2);
-if (table) {
+sal_uInt32 table_size = getTableSize(ttf, O_OS2);
+if (table && table_size >= 42) {
 info->weight = GetUInt16(table, 4);
 info->width  = GetUInt16(table, 6);
 
@@ -2458,7 +2459,7 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
  * Microsoft old (78 bytes long) and Microsoft new (86 bytes long,)
  * Apple's documentation recommends looking at the table length.
  */
-if (getTableSize(ttf, O_OS2) > 68) {
+if (table_size >= 78) {
 info->typoAscender = XUnits(UPEm,GetInt16(table, 68));
 info->typoDescender = XUnits(UPEm, GetInt16(table, 70));
 info->typoLineGap = XUnits(UPEm, GetInt16(table, 72));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Pranav Kant]

 loleaflet/src/map/handler/Map.Keyboard.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed9253208c728feeea0dcfae897e3d9af2e3258f
Author: Pranav Kant 
Date:   Thu Feb 8 16:45:19 2018 +0530

fix some lint errors

Change-Id: I33bcb37afffd9614e3b64e90c556a46ce36f4327

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index a707a710..95433c8d 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -384,7 +384,7 @@ L.Map.Keyboard = L.Handler.extend({
if (!this._keyHandled && 
this._bufferedTextInputEvent) {
var textInputData = 
this._bufferedTextInputEvent.originalEvent.data;
charCode = e.originalEvent.keyCode;
-   for (idx = 0; i < textInputData.length; 
i++) {
+   for (var idx = 0; i < 
textInputData.length; i++) {
postEventFn.call(eventObject, 
'input', textInputData[idx].charCodeAt(), 0);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - 4 commits - configure.ac sc/inc sc/source

[Andras Timar]

 configure.ac  |2 +-
 sc/inc/document.hxx   |2 ++
 sc/source/core/data/conditio.cxx  |6 ++
 sc/source/core/data/documen8.cxx  |   23 +++
 sc/source/core/data/formulacell.cxx   |3 +--
 sc/source/core/tool/rangenam.cxx  |8 +++-
 sc/source/filter/excel/excform.cxx|1 +
 sc/source/filter/excel/excform8.cxx   |1 +
 sc/source/filter/excel/impop.cxx  |1 +
 sc/source/filter/excel/xicontent.cxx  |6 ++
 sc/source/filter/excel/xiname.cxx |3 +++
 sc/source/filter/oox/condformatbuffer.cxx |2 ++
 sc/source/filter/oox/defnamesbuffer.cxx   |2 ++
 sc/source/filter/oox/formulabuffer.cxx|4 
 14 files changed, 60 insertions(+), 4 deletions(-)

New commits:
commit 1f8f63fd52c7522342a8e5cec0a4f9a92d5e89c8
Author: Andras Timar 
Date:   Thu Feb 8 12:34:36 2018 +0100

Bump version to 5.3-40

Change-Id: Iea8491ad87f999cbe202e1609aca3ff089836d70

diff --git a/configure.ac b/configure.ac
index e87804ac1b03..f672075344e8 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.3.10.39],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.40],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 7df05a4b4bbc91a2abf51f27976f1aebf92f9a14
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 908854a7b281454332af434be9468ec45d420030)

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index eae117c08434..18cbabb1cd93 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -199,6 +204,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index 7189c2a0a2f2..efc181921091 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 79457ab57e5f..a1d10906c687 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -38,6 +38,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -334,6 +335,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-5.3-40'

[Andras Timar]

Tag 'co-5.3-40' created by Andras Timar  at 
2018-02-08 11:59 +

co-5.3-40

Changes since co-5.3-39-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Pranav Kant]

 wsd/LOOLWSD.cpp |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit f246f50b9e5b36daa47e35e42eac34a1ae391c2c
Author: Pranav Kant 
Date:   Thu Feb 8 17:04:55 2018 +0530

Don't try different ports unless we are testing

Change-Id: Ideb6b6ccb64f708bf4621cfc92c5836a0fd3b511

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 9c598725..5ae13552 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2565,6 +2565,7 @@ private:
 std::shared_ptr socket = getServerSocket(
 ServerSocket::Type::Local, port, PrisonerPoll, factory);
 
+#ifdef BUILDING_TESTS
 // If we fail, try the next 100 ports.
 for (int i = 0; i < 100 && !socket; ++i)
 {
@@ -2573,10 +2574,11 @@ private:
 socket = getServerSocket(
 ServerSocket::Type::Local, port, PrisonerPoll, factory);
 }
+#endif
 
-if (!UnitWSD::isUnitTesting() && !socket)
+if (!socket)
 {
-LOG_FTL("Failed to listen on Prisoner port (" <<
+LOG_FTL("Failed to listen on Prisoner port(s) (" <<
 MasterPortNumber << '-' << port << "). Exiting.");
 _exit(Application::EXIT_SOFTWARE);
 }
@@ -2598,8 +2600,10 @@ private:
 #endif
 factory = std::make_shared();
 
+
 std::shared_ptr socket = getServerSocket(
 ServerSocket::Type::Public, port, WebServerPoll, factory);
+#ifdef BUILDLING_TESTS
 while (!socket)
 {
 ++port;
@@ -2607,6 +2611,14 @@ private:
 socket = getServerSocket(
 ServerSocket::Type::Public, port, WebServerPoll, factory);
 }
+#endif
+
+if (!socket)
+{
+LOG_FTL("Failed to listen on Server port(s) (" <<
+ClientPortNumber << '-' << port << "). Exiting.");
+_exit(Application::EXIT_SOFTWARE);
+}
 
 ClientPortNumber = port;
 LOG_INF("Listening to client connections on port " << port);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f81fc101ea3040f81166cb2c3de2427be9088013
Author: Christian Lohmaier 
Date:   Thu Feb 8 12:42:29 2018 +0100

Updated core
Project: translations  4092195506ca82679ed8ed0feb596777a39aaa20

update translations for 6.0

Change-Id: Id8c4eaee752bfced960d94a76e2434b1c21a4638

diff --git a/translations b/translations
index 5634878ae8bf..4092195506ca 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5634878ae8bfcd66bdf403e9ae009eab7312c611
+Subproject commit 4092195506ca82679ed8ed0feb596777a39aaa20
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna]

 sw/inc/ccoll.hxx   |7 ---
 sw/inc/charatr.hxx |5 +
 sw/inc/colwd.hxx   |2 --
 sw/inc/crsrsh.hxx  |2 +-
 sw/inc/crstate.hxx |1 -
 sw/inc/cshtyp.hxx  |1 -
 sw/inc/dbmgr.hxx   |1 -
 sw/inc/dcontact.hxx|1 -
 sw/inc/dlelstnr.hxx|2 --
 sw/inc/doc.hxx |2 ++
 sw/inc/docary.hxx  |   10 --
 sw/inc/docfac.hxx  |3 +--
 sw/source/core/inc/docfld.hxx  |1 +
 sw/source/core/layout/pagedesc.cxx |1 +
 sw/source/core/unocore/unocoll.cxx |1 +
 sw/source/core/unocore/unostyle.cxx|1 +
 sw/source/filter/ascii/ascatr.cxx  |1 +
 sw/source/filter/docx/swdocxreader.cxx |1 +
 sw/source/filter/ww8/rtfexport.cxx |1 +
 sw/source/filter/xml/xmlimp.cxx|1 +
 sw/source/uibase/inc/swuiccoll.hxx |1 +
 21 files changed, 18 insertions(+), 28 deletions(-)

New commits:
commit 152e022f1efacd49fefbd5367776c1e1fc044492
Author: Miklos Vajna 
Date:   Wed Feb 7 09:25:55 2018 +0100

Fix some IWYU warnings

Change-Id: Ie1639cc4017d696ea3fd9ffb96f1559aa3ac6397
Reviewed-on: https://gerrit.libreoffice.org/49340
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index b8115e1169b2..4ffbd9e77af9 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -19,16 +19,9 @@
 #ifndef INCLUDED_SW_INC_CCOLL_HXX
 #define INCLUDED_SW_INC_CCOLL_HXX
 
-#include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include "swdllapi.h"
-#include "cmdid.h"
 
 enum class Master_CollCondition;
 
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 9d90f2dfc3c5..7161f45571ed 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -32,21 +32,18 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
+#include 
 
 // implementation of the character attribute methods of SwAttrSet
 
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 5f6c5380dc9e..c6d13e159130 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -20,9 +20,7 @@
 #define INCLUDED_SW_INC_COLWD_HXX
 
 #include 
-#include 
 #include 
-#include 
 
 class SwTableFUNC;
 
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 515ee873e9e2..ef89060b88f6 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -29,7 +29,6 @@
 #include "IShellCursorSupplier.hxx"
 #include "swdllapi.h"
 #include "docary.hxx"
-#include "swtypes.hxx"
 #include "viewsh.hxx"
 #include "calbck.hxx"
 #include "cshtyp.hxx"
@@ -38,6 +37,7 @@
 #include "tblsel.hxx"
 #include "viscrs.hxx"
 #include "node.hxx"
+#include "fldbas.hxx"
 #include "IDocumentMarkAccess.hxx"
 
 class SfxItemSet;
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 594757be3b76..29f959e196b8 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include "swtypes.hxx"
 #include "swrect.hxx"
 
 enum SwFillMode
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 3546bb1ff256..1ecde9f6d1d7 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_CSHTYP_HXX
 #define INCLUDED_SW_INC_CSHTYP_HXX
 
-#include 
 #include "swdllapi.h"
 #include 
 
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b4a6f9e8abfe..9bc2e3b90a0b 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 451064a6010b..87c18ff8dfa0 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include "swtypes.hxx"
 #include "fmtanchr.hxx"
 #include "frmfmt.hxx"
 #include 
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 56562fda9f1e..7f58e9ba2db6 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_SW_INC_DLELSTNR_HXX
 #define INCLUDED_SW_INC_DLELSTNR_HXX
 
-#include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9389604c94aa..7eb5bf067c5a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -42,6 +42,8 @@
 #include "docary.hxx"
 #include "pagedesc.hxx"
 #include "tblenum.hxx"
+#include "ndarr.hxx"
+#include "ndtyp.hxx"
 #include 
 #include 
 #include 
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index d616a0b839a7..068880d8c22e 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -19,10 +19,7 @@
 #ifndef INCLUDED_SW_INC_DOCARY_HXX
 #define INCLUDED_SW_INC_DOCARY_HXX
 
-#include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
@@ -33,15 +30,13 @@
 #include 
 #include 
 
-#include "swtyp

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 3 commits - sc/inc sc/source

[Eike Rathke]

 sc/inc/document.hxx   |2 ++
 sc/source/core/data/conditio.cxx  |6 ++
 sc/source/core/data/documen8.cxx  |   23 +++
 sc/source/core/data/formulacell.cxx   |3 +--
 sc/source/core/tool/rangenam.cxx  |8 +++-
 sc/source/filter/excel/excform.cxx|1 +
 sc/source/filter/excel/excform8.cxx   |1 +
 sc/source/filter/excel/impop.cxx  |1 +
 sc/source/filter/excel/xicontent.cxx  |6 ++
 sc/source/filter/excel/xiname.cxx |3 +++
 sc/source/filter/oox/condformatbuffer.cxx |2 ++
 sc/source/filter/oox/defnamesbuffer.cxx   |2 ++
 sc/source/filter/oox/formulabuffer.cxx|4 
 13 files changed, 59 insertions(+), 3 deletions(-)

New commits:
commit f9dd5c60b43e1ad81f4862e7b03a8a16c7510021
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 908854a7b281454332af434be9468ec45d420030)

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index d7fba04de639..1932534300e1 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -197,6 +202,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index 7189c2a0a2f2..efc181921091 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 79457ab57e5f..a1d10906c687 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -38,6 +38,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -334,6 +335,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must be reset.
 FormulaError nErr = pArray->GetCodeError();
 aCompiler.CompileTokenArray();
+getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
 pArray->DelRPN();
 pArray->SetCodeError(nErr);
 
commit 1df76508f73186ce42d96c0ab244920fef724673
Author: Eike Rathke 
Date:   Thu Jan 25 13:20:27 2018 +0100

CheckLinkFormulaNeedingCheck() for conditional format expressions

 This is a combination of 4 commits.

Prepare CheckLinkFormulaNeedingCheck() to use either RPN or tokenized code

Conditional format formulas aren't finally compiled until needed
so the check will have to operate on the tokenized expression
instead of RPN code.

(cherry picked from commit faa0305ba3d0dc698fce4915d4f3a1fb52422380)

Ch

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fa83c595e48d74d686b3ed894d3d4893d82975c9
Author: Caolán McNamara 
Date:   Wed Feb 7 16:05:08 2018 +

stay within font bounds

Change-Id: Ie8ed610b71cb1b20963827c2be97155d2d8aa22c
Reviewed-on: https://gerrit.libreoffice.org/49370
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d69a6132d938..5c7929b76615 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1560,7 +1560,12 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 /* parse the tables */
 for (i=0; i<(int)t->ntables; i++) {
 int nIndex;
-tag = GetUInt32(t->ptr + tdoffset + 12, 16 * i);
+const sal_uInt32 nStart = tdoffset + 12;
+const sal_uInt32 nOffset = 16 * i;
+if (nStart + nOffset + sizeof(sal_uInt32) <=  
static_cast(t->fsize))
+tag = GetUInt32(t->ptr + nStart, nOffset);
+else
+tag = static_cast(-1);
 switch( tag ) {
 case T_maxp: nIndex = O_maxp; break;
 case T_glyf: nIndex = O_glyf; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - 6 commits - sc/inc sc/Library_sc.mk sc/qa sc/source

[Eike Rathke]

 sc/Library_sc.mk  |1 
 sc/inc/document.hxx   |8 +-
 sc/inc/documentlinkmgr.hxx|6 -
 sc/qa/unit/ucalc.cxx  |2 
 sc/source/core/data/conditio.cxx  |6 +
 sc/source/core/data/documen2.cxx  |2 
 sc/source/core/data/documen8.cxx  |   23 ++
 sc/source/core/data/formulacell.cxx   |7 -
 sc/source/core/inc/webservicelink.hxx |   49 +
 sc/source/core/tool/interpr2.cxx  |8 +-
 sc/source/core/tool/interpr7.cxx  |  106 ++
 sc/source/core/tool/rangenam.cxx  |8 +-
 sc/source/core/tool/webservicelink.cxx|  106 ++
 sc/source/filter/excel/excform.cxx|1 
 sc/source/filter/excel/excform8.cxx   |1 
 sc/source/filter/excel/impop.cxx  |1 
 sc/source/filter/excel/xicontent.cxx  |6 +
 sc/source/filter/excel/xiname.cxx |3 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sc/source/filter/oox/defnamesbuffer.cxx   |2 
 sc/source/filter/oox/formulabuffer.cxx|4 +
 sc/source/ui/docshell/docsh4.cxx  |4 -
 sc/source/ui/docshell/documentlinkmgr.cxx |   20 -
 sc/source/ui/view/tabvwsh4.cxx|2 
 24 files changed, 329 insertions(+), 49 deletions(-)

New commits:
commit 8705f7fc2312345ee03481a9b7662451493209b0
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 908854a7b281454332af434be9468ec45d420030)

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index d7fba04de639..1932534300e1 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -197,6 +202,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index 7189c2a0a2f2..efc181921091 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 79457ab57e5f..a1d10906c687 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -38,6 +38,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -334,6 +335,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must be reset.
 FormulaError nErr = pArray->GetCodeError();
 aCompiler.CompileTokenArray();
+getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
 pArray->DelRPN();
 

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 358808aeb353e9d17e54c6255dd10be4a7517136
Author: Caolán McNamara 
Date:   Wed Feb 7 16:05:08 2018 +

stay within font bounds

Change-Id: Ie8ed610b71cb1b20963827c2be97155d2d8aa22c
Reviewed-on: https://gerrit.libreoffice.org/49371
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 566226f1e1f0..37a1b14bfc6b 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1576,7 +1576,12 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 /* parse the tables */
 for (i=0; i<(int)t->ntables; i++) {
 int nIndex;
-tag = GetUInt32(t->ptr + tdoffset + 12, 16 * i);
+const sal_uInt32 nStart = tdoffset + 12;
+const sal_uInt32 nOffset = 16 * i;
+if (nStart + nOffset + sizeof(sal_uInt32) <=  
static_cast(t->fsize))
+tag = GetUInt32(t->ptr + nStart, nOffset);
+else
+tag = static_cast(-1);
 switch( tag ) {
 case T_maxp: nIndex = O_maxp; break;
 case T_glyf: nIndex = O_glyf; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - postprocess/signing

[Mike Kaganski]

 postprocess/signing/no_signing.txt |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2f8f0365c2846a755d4c1093ea85e0929b64b84d
Author: Mike Kaganski 
Date:   Wed Feb 7 20:27:46 2018 +0100

Don't re-sign vc_redist packages

Change-Id: I62f55463c04f9bab1dd37f80fe6e15e0296d10bf
Reviewed-on: https://gerrit.libreoffice.org/49388
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit f19f8d1a3c175045fa43a8a5e2a12dd55fedb4b8)
Reviewed-on: https://gerrit.libreoffice.org/49401
Reviewed-by: Michael Stahl 

diff --git a/postprocess/signing/no_signing.txt 
b/postprocess/signing/no_signing.txt
index 53aaac652c2b..2fa129a80bab 100644
--- a/postprocess/signing/no_signing.txt
+++ b/postprocess/signing/no_signing.txt
@@ -8,3 +8,5 @@ policy.1.0.cli_oootypes.dll
 policy.1.0.cli_ure.dll
 policy.1.0.cli_cppuhelper.dll
 policy.1.0.cli_basetypes.dll
+vc_redist.x64.exe
+vc_redist.x86.exe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 43b1e91ec376ae69c843e576cf7352f085d356b6
Author: Caolán McNamara 
Date:   Wed Feb 7 16:20:54 2018 +

return early on short stream

Change-Id: Ia9cb4dec5358281322a2428c5f2153836a1ee1af
Reviewed-on: https://gerrit.libreoffice.org/49375
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 37a1b14bfc6b..966393fa4fe3 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1534,6 +1534,8 @@ int OpenTTFontBuffer(const void* pBuffer, sal_uInt32 
nLen, sal_uInt32 facenum, T
 
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 {
+if (t->fsize < 4)
+return SF_TTFORMAT;
 int i;
 sal_uInt32 length, tag;
 sal_uInt32 tdoffset = 0;/* offset to TableDirectory in a TTC file. 
For TTF files is 0 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 96af996b06f980006414dedcecc96978f5a31779
Author: Caolán McNamara 
Date:   Wed Feb 7 16:20:54 2018 +

return early on short stream

Change-Id: Ia9cb4dec5358281322a2428c5f2153836a1ee1af
Reviewed-on: https://gerrit.libreoffice.org/49374
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 5c7929b76615..7c35d3207e0d 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1521,6 +1521,8 @@ int OpenTTFontBuffer(const void* pBuffer, sal_uInt32 
nLen, sal_uInt32 facenum, T
 
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 {
+if (t->fsize < 4)
+return SF_TTFORMAT;
 int i;
 sal_uInt32 length, tag;
 sal_uInt32 tdoffset = 0;/* offset to TableDirectory in a TTC file. 
For TTF files is 0 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/vector/vtext-6.5' - sw/inc sw/source

[Miklos Vajna]

 sw/inc/shellio.hxx  |4 ++--
 sw/source/filter/basflt/shellio.cxx |   10 +-
 sw/source/filter/html/swhtml.cxx|6 +-
 sw/source/filter/html/wrthtml.cxx   |2 +-
 sw/source/filter/inc/fltini.hxx |2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 6c6095a92fb866ff4b62a277325215d8af06cfae
Author: Miklos Vajna 
Date:   Wed Feb 7 17:54:49 2018 +0100

sw HTML import: avoid loading the Writer/Web template for the Writer filter

The share/template/common/internal/html.stw template we have is for
Writer/Web, loading that into Writer is questionable at best. Also it
means that the outline numbering of the heading styles is not set, which
is a problem, as the sw HTML import only sets the style, not the
outline numbering.

Reviewed-on: https://gerrit.libreoffice.org/49381
Tested-by: Jenkins 

(cherry picked from commit 303f8e5160ddb39914ba7f669698d5dbe958878a)

Conflicts:
sw/inc/shellio.hxx
sw/qa/extras/htmlimport/htmlimport.cxx
sw/source/filter/basflt/shellio.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/html/wrthtml.cxx
sw/source/filter/inc/fltini.hxx

Change-Id: I86d11d8a5744c3c2ca71b03fd41a24d3f88ea333

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index e0bdf94f2c65..409a0e3a4f33 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -220,7 +220,7 @@ protected:
 sal_Bool bHasAskTemplateName : 1;
 sal_Bool bIgnoreHTMLComments : 1;
 
-virtual String GetTemplateName() const;
+virtual String GetTemplateName(SwDoc& rDoc) const;
 
 public:
 Reader();
@@ -239,7 +239,7 @@ public:
 static void ResetFrmFmts( SwDoc& rDoc );
 
 // Load filter template, set it and release it again.
-SwDoc* GetTemplateDoc();
+SwDoc* GetTemplateDoc(SwDoc& rDoc);
 sal_Bool SetTemplate( SwDoc& rDoc );
 void ClearTemplate();
 void SetTemplateName( const String& rDir );
diff --git a/sw/source/filter/basflt/shellio.cxx 
b/sw/source/filter/basflt/shellio.cxx
index fc9ec6b3b8fc..c4f5d2483cd6 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -450,17 +450,17 @@ Reader::~Reader()
 delete pTemplate;
 }
 
-String Reader::GetTemplateName() const
+String Reader::GetTemplateName(SwDoc& /*rDoc*/) const
 {
 return aEmptyStr;
 }
 
 // Die Filter-Vorlage laden, setzen und wieder freigeben
-SwDoc* Reader::GetTemplateDoc()
+SwDoc* Reader::GetTemplateDoc(SwDoc& rDoc)
 {
 if( !bHasAskTemplateName )
 {
-SetTemplateName( GetTemplateName() );
+SetTemplateName( GetTemplateName(rDoc) );
 bHasAskTemplateName = sal_True;
 }
 
@@ -543,7 +543,7 @@ sal_Bool Reader::SetTemplate( SwDoc& rDoc )
 {
 sal_Bool bRet = sal_False;
 
-GetTemplateDoc();
+GetTemplateDoc(rDoc);
 if( pTemplate )
 {
 rDoc.RemoveAllFmtLanguageDependencies();
@@ -955,7 +955,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const 
String* pRealFileName )
 sal_Bool SetHTMLTemplate( SwDoc & rDoc )
 {
 // Vorlagennamen von den Sfx-HTML-Filter besorgen!!!
-if( !ReadHTML->GetTemplateDoc() )
+if( !ReadHTML->GetTemplateDoc(rDoc) )
 ReadHTML->MakeHTMLDummyTemplateDoc();
 
 sal_Bool bRet = ReadHTML->SetTemplate( rDoc );
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index fcee5a4cd969..f7079d99f018 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -146,8 +146,12 @@ HTMLReader::HTMLReader()
 bTmplBrowseMode = sal_True;
 }
 
-String HTMLReader::GetTemplateName() const
+String HTMLReader::GetTemplateName(SwDoc& rDoc) const
 {
+if (!rDoc.get(IDocumentSettingAccess::HTML_MODE))
+// HTML import into Writer, avoid loading the Writer/Web template.
+return String();
+
 String sTemplate(rtl::OUString("internal"));
 sTemplate += INET_PATH_TOKEN;
 sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") );
diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 470f2ca2d27d..62b93327f388 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -216,7 +216,7 @@ sal_uLong SwHTMLWriter::WriteStream()
 sal_uInt16 nOldTxtFmtCollCnt = 0, nOldCharFmtCnt = 0;
 
 OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
-pTemplate = ((HTMLReader*)ReadHTML)->GetTemplateDoc();
+pTemplate = ((HTMLReader*)ReadHTML)->GetTemplateDoc(*pDoc);
 if( pTemplate )
 {
 pTemplate->acquire();
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index b3758cdcb5c5..d74d2615d53c 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -34,7 +34,7 @@ class HTMLReader: public Reader
 // wir wollen die Streams / Storages nicht geoeffnet haben
 virtual int SetStrmStgP

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

[Caolán McNamara]

 sw/qa/core/data/html/fail/ofz5909-1.html |1 
 sw/source/core/doc/htmltbl.cxx   |7 
 sw/source/filter/html/htmlftn.cxx|   31 +--
 sw/source/filter/html/htmlnumreader.cxx  |   14 +
 sw/source/filter/html/htmlsect.cxx   |6 
 sw/source/filter/html/htmltab.cxx|  245 ---
 sw/source/filter/html/swhtml.cxx |6 
 sw/source/filter/html/swhtml.hxx |   42 +
 sw/source/filter/html/wrthtml.hxx|4 
 9 files changed, 297 insertions(+), 59 deletions(-)

New commits:
commit 1c6311b3fe9bbbf978960167bd67cf8d51cd1f6e
Author: Caolán McNamara 
Date:   Mon Jan 1 16:12:21 2018 +

ofz#4767 Bad-cast

Reviewed-on: https://gerrit.libreoffice.org/47235
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5670a9619b77a6a9e53b0cf20c059ea66ca5f450)

ofz: avoid deleting the table still being processed

Reviewed-on: https://gerrit.libreoffice.org/46902
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f297b0d043e0767d85f00aa1e4cae5b036b0ac51)

ofz#4753 Bad-cast, check all open tables

Reviewed-on: https://gerrit.libreoffice.org/47199
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 80fc91db239869b513f47866f45d8a43fb98fe16)

CurrentTableInPaM->PendingTableInPaM

(cherry picked from commit 2ed6eba4f99681fe717741ddc1534ed3ccc15e82)

ofz#4848 Null-dereference READ

(cherry picked from commit d4d0b1a2b9f11fb7629559e08c345697ba129c04)

ofz#4817 Bad-cast

Reviewed-on: https://gerrit.libreoffice.org/47236
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 9e269ef68e33fc9da154f6694be7cbcd5e3b4bfc)

ofz#4872 Null-dereference READ

we're going to need a bigger boat

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

ofz#4971 Bad-cast

Reviewed-on: https://gerrit.libreoffice.org/47466
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit c75c3b2fdab5614664215e52d85657472ec86f05)

ofz#5007 Null-dereference READ

Reviewed-on: https://gerrit.libreoffice.org/47537
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 6d05e0945054459ed04d50ae16731f933be48664)

ofz#5235 Bad-cast

Reviewed-on: https://gerrit.libreoffice.org/47747
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 710cf469bf0e43a021fc1a24a80745bc602368ef)

ofz#5909 Null-dereference READ

Reviewed-on: https://gerrit.libreoffice.org/49218
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5090d575117fbe6ced75dc45c514f8d990523251)

ofz#6064 clear footnotes from tobe-deleted paragraph

Change-Id: Ibf8285efae7c570452954feb41a1a36bf44504a4
a92d469fd0e280bdc6470e780ab12b00366f0f8d
e6e2fb9f2e16e021a4719c418f52ce074c359904
c8b48d3b3e3f87e9ac3e8a6bb832f8e8dfe8ab7d
632aca7e3f59b7edf48c8c35eff4abf1946af652
5dc9c66ce17f6401fbc9683cf8b10bf62755a166
e4ee3ae1ac9f906ca3faec412bbafc0c6a911aaf
cf66aa82e72a2b9f24f590b84bb0441ebf09463f
830483071ce481fd14b0d1227c90e492e125f35e
041f09f37941a92ccee3f0ebf9e5a950dee0c52f
830d3e8bda517e7681cea7481c32457486ced693
33f75adab35d43a4bbf51e33a0abcb5daeca93a3

ofz: Null-deref

Change-Id: I9992191fe5b4cfd771cc36a61d0ebaa8a9e6e9db
Reviewed-on: https://gerrit.libreoffice.org/46743
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit e867b393ef95cb9bec7f68787771dfa329b00bea)

ofz#4728 Null-deref

Reviewed-on: https://gerrit.libreoffice.org/47000
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f2e0c18cd44fff1e1b79924f582ced400fb00dad)

Change-Id: Ide91a63424f864e2913b8268c4eca7961ba54572
Reviewed-on: https://gerrit.libreoffice.org/49358
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/core/data/html/fail/ofz5909-1.html 
b/sw/qa/core/data/html/fail/ofz5909-1.html
new file mode 100644
index ..9511b2bc1eac
--- /dev/null
+++ b/sw/qa/core/data/html/fail/ofz5909-1.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 9f9e6fdfeac1..dcfed6c3f04c 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -561,10 +56

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/html/fail/ofz5909-1.html |1 
 sw/source/core/doc/htmltbl.cxx   |7 
 sw/source/filter/html/htmlftn.cxx|   31 +--
 sw/source/filter/html/htmlnumreader.cxx  |   14 +
 sw/source/filter/html/htmlsect.cxx   |6 
 sw/source/filter/html/htmltab.cxx|  245 ---
 sw/source/filter/html/swhtml.cxx |6 
 sw/source/filter/html/swhtml.hxx |   42 +
 sw/source/filter/html/wrthtml.hxx|4 
 9 files changed, 297 insertions(+), 59 deletions(-)

New commits:
commit 2a2436c34ff70a99c803eac503f6495dcdeffc2d
Author: Caolán McNamara 
Date:   Mon Jan 1 16:12:21 2018 +

ofz#4767 Bad-cast

Reviewed-on: https://gerrit.libreoffice.org/47235
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5670a9619b77a6a9e53b0cf20c059ea66ca5f450)

Change-Id: Ibf8285efae7c570452954feb41a1a36bf44504a4

ofz: avoid deleting the table still being processed

Change-Id: Ia92d469fd0e280bdc6470e780ab12b00366f0f8d
Reviewed-on: https://gerrit.libreoffice.org/46902
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f297b0d043e0767d85f00aa1e4cae5b036b0ac51)

ofz#4753 Bad-cast, check all open tables

Reviewed-on: https://gerrit.libreoffice.org/47199
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 80fc91db239869b513f47866f45d8a43fb98fe16)

Change-Id: Ie6e2fb9f2e16e021a4719c418f52ce074c359904

CurrentTableInPaM->PendingTableInPaM

Change-Id: Ic8b48d3b3e3f87e9ac3e8a6bb832f8e8dfe8ab7d
(cherry picked from commit 2ed6eba4f99681fe717741ddc1534ed3ccc15e82)

ofz#4848 Null-dereference READ

Change-Id: I632aca7e3f59b7edf48c8c35eff4abf1946af652
(cherry picked from commit d4d0b1a2b9f11fb7629559e08c345697ba129c04)

ofz#4817 Bad-cast

Change-Id: I5dc9c66ce17f6401fbc9683cf8b10bf62755a166
Reviewed-on: https://gerrit.libreoffice.org/47236
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 9e269ef68e33fc9da154f6694be7cbcd5e3b4bfc)

ofz#4872 Null-dereference READ

we're going to need a bigger boat

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

Change-Id: Ie4ee3ae1ac9f906ca3faec412bbafc0c6a911aaf

ofz#4971 Bad-cast

Reviewed-on: https://gerrit.libreoffice.org/47466
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit c75c3b2fdab5614664215e52d85657472ec86f05)

Change-Id: Icf66aa82e72a2b9f24f590b84bb0441ebf09463f

ofz#5007 Null-dereference READ

Reviewed-on: https://gerrit.libreoffice.org/47537
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 6d05e0945054459ed04d50ae16731f933be48664)

Change-Id: I830483071ce481fd14b0d1227c90e492e125f35e

ofz#5235 Bad-cast

Change-Id: I041f09f37941a92ccee3f0ebf9e5a950dee0c52f
Reviewed-on: https://gerrit.libreoffice.org/47747
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 710cf469bf0e43a021fc1a24a80745bc602368ef)

ofz#5909 Null-dereference READ

Reviewed-on: https://gerrit.libreoffice.org/49218
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5090d575117fbe6ced75dc45c514f8d990523251)

Change-Id: I830d3e8bda517e7681cea7481c32457486ced693

ofz#6064 clear footnotes from tobe-deleted paragraph

Change-Id: I33f75adab35d43a4bbf51e33a0abcb5daeca93a3

ofz: Null-deref

Change-Id: I9992191fe5b4cfd771cc36a61d0ebaa8a9e6e9db
Reviewed-on: https://gerrit.libreoffice.org/46743
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit e867b393ef95cb9bec7f68787771dfa329b00bea)

ofz#4728 Null-deref

Reviewed-on: https://gerrit.libreoffice.org/47000
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f2e0c18cd44fff1e1b79924f582ced400fb00dad)

Change-Id: Ide91a63424f864e2913b8268c4eca7961ba54572
Reviewed-on: https://gerrit.libreoffice.org/49357
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/core/data/html/fail/ofz5909-1.html 
b/sw/qa/core/data/html/fail/ofz5909-1.html
new file mode 100644
index ..9511b2bc1eac
--- /dev/null
+++ b/sw/qa/core/data/html/fail/ofz5909-1.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/sw/source/core/doc/htmltbl.cxx

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81f770d533f32ba14d22dfc19d2208e881298053
Author: Christian Lohmaier 
Date:   Thu Feb 8 12:42:29 2018 +0100

Updated core
Project: translations  d9691646f9c43068799b866ffaa9dd8d9ad77240

update translations for 6.0

Change-Id: Id8c4eaee752bfced960d94a76e2434b1c21a4638
(cherry picked from commit 4092195506ca82679ed8ed0feb596777a39aaa20)

diff --git a/translations b/translations
index 549b95a9fd9f..d9691646f9c4 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 549b95a9fd9f426968821aa459e4d2f129504f65
+Subproject commit d9691646f9c43068799b866ffaa9dd8d9ad77240
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa

[Andrea Gelmini]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |2 +-
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |2 +-
 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6d4764af32aeed6d193340dc629ef70c98feef10
Author: Andrea Gelmini 
Date:   Thu Feb 8 10:24:38 2018 +0100

Fix typos

Change-Id: I5d222807706e44d245507484b302ab1b9b2e482c
Reviewed-on: https://gerrit.libreoffice.org/49412
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index e70ec8b519a5..d306b32afd46 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1581,7 +1581,7 @@ void ScTiledRenderingTest::testIMESupport()
 CPPUNIT_ASSERT(pView);
 
 pView->SetCursor(0, 0);
-// sequence of chineese IME compositions when 'nihao' is typed in an IME
+// sequence of chinese IME compositions when 'nihao' is typed in an IME
 const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
 std::vector aInputs;
 std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index c32e9876971c..6990b25ae3ce 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1957,7 +1957,7 @@ void SdTiledRenderingTest::testIMESupport()
 pViewShell->GetViewFrame()->GetDispatcher()->ExecuteList(SID_ATTR_CHAR,
  
SfxCallMode::SYNCHRON, { &aInputString });
 
-// sequence of chineese IME compositions when 'nihao' is typed in an IME
+// sequence of chinese IME compositions when 'nihao' is typed in an IME
 const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
 std::vector aInputs;
 std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index cfd5fab7dc2f..7848a877cf41 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2098,7 +2098,7 @@ void SwTiledRenderingTest::testIMESupport()
 SwView* pView = dynamic_cast(SfxViewShell::Current());
 SwWrtShell* pWrtShell = pView->GetWrtShellPtr();
 
-// sequence of chineese IME compositions when 'nihao' is typed in an IME
+// sequence of chinese IME compositions when 'nihao' is typed in an IME
 const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
 std::vector aInputs;
 std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/uiconfig

[Christian Lohmaier]

 xmlsecurity/uiconfig/ui/selectcertificatedialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f36b8d0291ec7b2255c462947ca7f17beb3111b
Author: Christian Lohmaier 
Date:   Sat Feb 3 14:57:06 2018 +0100

certdialog: kille useless double-space in "Issued to  "

not only is it unnecessary, it also confuses translators

Change-Id: Ifaebc150a155c44f76e3aedcf1d652bfad2c7443

diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui 
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 6ddeec32cfb6..15dc2a45ee23 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -89,7 +89,7 @@
   
 False
 True
-Issued to  
+Issued to
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 vcl/osx/vclnsapp.mm |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9d77e7551e56b85d7f1b40bc42b9ba6876091f22
Author: Maxim Monastirsky 
Date:   Thu Feb 8 01:47:46 2018 +0200

tdf#100784 macOS: Don't attempt to handle shortcuts via the menubar

... when it's hidden.

Change-Id: I7930afb8124dd552843512cd30bce4d82ade0c70
Reviewed-on: https://gerrit.libreoffice.org/49399
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 26f826467677..825edac6be6c 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -160,7 +160,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 // the main menu just beeps for an unknown or disabled key 
equivalent
 // and swallows the event wholesale
 NSMenu* pMainMenu = [NSApp mainMenu];
-if( ! bHandled && (pMainMenu == nullptr || ! [pMainMenu 
performKeyEquivalent: pEvent]) )
+if( ! bHandled &&
+(pMainMenu == nullptr || ! [NSMenu menuBarVisible] || ! 
[pMainMenu performKeyEquivalent: pEvent]) )
 {
 [[pKeyWin contentView] keyDown: pEvent];
 bHandled = GetSalData()->maKeyEventAnswer[ pEvent ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sfx2/source sfx2/uiconfig

[Andras Timar]

 sfx2/source/appl/appserv.cxx  |8 
 sfx2/uiconfig/ui/licensedialog.ui |   37 +++--
 2 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 97d66828b6a2fcf495c89211a3d0cd648516e72a
Author: Andras Timar 
Date:   Wed Feb 7 22:57:04 2018 +0100

add EULA button to Help - License Information... dialog

Change-Id: I62b9293c68059389a63e523ea5747fdb267b1a99
Reviewed-on: https://gerrit.libreoffice.org/49398
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index de9b8af352f0..aad7dcdec3a6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -281,6 +281,7 @@ namespace
 {
 private:
 DECL_LINK(ShowHdl, Button*, void);
+DECL_LINK(EulaHdl, Button*, void);
 public:
 explicit LicenseDialog();
 };
@@ -289,6 +290,7 @@ namespace
 : ModalDialog(nullptr, "LicenseDialog", "sfx/ui/licensedialog.ui")
 {
 get("show")->SetClickHdl(LINK(this, LicenseDialog, 
ShowHdl));
+get("eula")->SetClickHdl(LINK(this, LicenseDialog, 
EulaHdl));
 }
 
 IMPL_LINK_NOARG(LicenseDialog, ShowHdl, Button*, void)
@@ -297,6 +299,12 @@ namespace
 showDocument("LICENSE");
 }
 
+IMPL_LINK_NOARG(LicenseDialog, EulaHdl, Button*, void)
+{
+EndDialog(RET_OK);
+showDocument("EULA.odt");
+}
+
 class SafeModeQueryDialog : public ModalDialog
 {
 private:
diff --git a/sfx2/uiconfig/ui/licensedialog.ui 
b/sfx2/uiconfig/ui/licensedialog.ui
index 1f9c30919faf..8d0fe33d522b 100644
--- a/sfx2/uiconfig/ui/licensedialog.ui
+++ b/sfx2/uiconfig/ui/licensedialog.ui
@@ -35,6 +35,23 @@
   
 
 
+  
+_EULA
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+1
+True
+  
+
+
   
 gtk-close
 True
@@ -45,7 +62,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -57,6 +74,22 @@
   
 
 
+  
+True
+False
+%PRODUCTNAME binary 
package is made available subject to the terms of the End User License and 
Subscription Agreement; choose EULA to see exact details in English.
+True
+80
+0
+0
+  
+  
+False
+True
+1
+  
+
+
   
 True
 False
@@ -77,7 +110,7 @@ This product was created by %OOOVENDOR, based on 
OpenOffice.org, which is Copyri
   
 False
 True
-1
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sfx2/source sfx2/uiconfig

[Andras Timar]

 sfx2/source/appl/appserv.cxx  |8 
 sfx2/uiconfig/ui/licensedialog.ui |   37 +++--
 2 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 532e9f751b1ec40588b7edf0de156377eed79287
Author: Andras Timar 
Date:   Wed Feb 7 22:57:04 2018 +0100

add EULA button to Help - License Information... dialog

Change-Id: I62b9293c68059389a63e523ea5747fdb267b1a99
Reviewed-on: https://gerrit.libreoffice.org/49398
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 97d66828b6a2fcf495c89211a3d0cd648516e72a)
Reviewed-on: https://gerrit.libreoffice.org/49432
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index de9b8af352f0..aad7dcdec3a6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -281,6 +281,7 @@ namespace
 {
 private:
 DECL_LINK(ShowHdl, Button*, void);
+DECL_LINK(EulaHdl, Button*, void);
 public:
 explicit LicenseDialog();
 };
@@ -289,6 +290,7 @@ namespace
 : ModalDialog(nullptr, "LicenseDialog", "sfx/ui/licensedialog.ui")
 {
 get("show")->SetClickHdl(LINK(this, LicenseDialog, 
ShowHdl));
+get("eula")->SetClickHdl(LINK(this, LicenseDialog, 
EulaHdl));
 }
 
 IMPL_LINK_NOARG(LicenseDialog, ShowHdl, Button*, void)
@@ -297,6 +299,12 @@ namespace
 showDocument("LICENSE");
 }
 
+IMPL_LINK_NOARG(LicenseDialog, EulaHdl, Button*, void)
+{
+EndDialog(RET_OK);
+showDocument("EULA.odt");
+}
+
 class SafeModeQueryDialog : public ModalDialog
 {
 private:
diff --git a/sfx2/uiconfig/ui/licensedialog.ui 
b/sfx2/uiconfig/ui/licensedialog.ui
index 1f9c30919faf..8d0fe33d522b 100644
--- a/sfx2/uiconfig/ui/licensedialog.ui
+++ b/sfx2/uiconfig/ui/licensedialog.ui
@@ -35,6 +35,23 @@
   
 
 
+  
+_EULA
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+1
+True
+  
+
+
   
 gtk-close
 True
@@ -45,7 +62,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -57,6 +74,22 @@
   
 
 
+  
+True
+False
+%PRODUCTNAME binary 
package is made available subject to the terms of the End User License and 
Subscription Agreement; choose EULA to see exact details in English.
+True
+80
+0
+0
+  
+  
+False
+True
+1
+  
+
+
   
 True
 False
@@ -77,7 +110,7 @@ This product was created by %OOOVENDOR, based on 
OpenOffice.org, which is Copyri
   
 False
 True
-1
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/uibase/config/usrpref.cxx |4 ++--
 sw/source/uibase/inc/usrpref.hxx|   12 
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 35140501779622194337e630b274e74abeedca4d
Author: Stephan Bergmann 
Date:   Wed Feb 7 22:33:40 2018 +0100

Add missing no-modify mode for SwMasterUsrPref::Set* functions

...that erroneously called m_aLayoutConfig.SetModified when called from
SwMasterUsrPref ctor -> SwLayoutViewConfig::Load, and thus caused
m_aLayoutConfig to always be written back to the configuration upon
utl::ConfigManager::storeConfigItems during termination.

Change-Id: I85e48c6b5cebe9b2b711c943afa27fbeb1e36c49
Reviewed-on: https://gerrit.libreoffice.org/49408
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sw/source/uibase/config/usrpref.cxx 
b/sw/source/uibase/config/usrpref.cxx
index f98e575c4bb7..c47f88b6dfaf 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -351,14 +351,14 @@ void SwLayoutViewConfig::Load()
 case  8: rParent.SetSmoothScroll(bSet); break;// 
"Window/SmoothScroll",
 case  9: rParent.SetZoom( static_cast< sal_uInt16 
>(nInt32Val) ); break;// "Zoom/Value",
 case 10: rParent.SetZoomType( static_cast< SvxZoomType 
>(nInt32Val) ); break;// "Zoom/Type",
-case 11: rParent.SetAlignMathObjectsToBaseline(bSet); 
break;// "Other/IsAlignMathObjectsToBaseline"
+case 11: rParent.SetAlignMathObjectsToBaseline(bSet, 
true); break;// "Other/IsAlignMathObjectsToBaseline"
 case 12: 
rParent.SetMetric(static_cast(nInt32Val), true); break;// 
"Other/MeasureUnit",
 case 13: rParent.SetDefTabInMm100(nInt32Val, true); 
break;// "Other/TabStop",
 case 14: rParent.SetVRulerRight(bSet); break;// 
"Window/IsVerticalRulerRight",
 case 15: rParent.SetViewLayoutColumns( 
static_cast(nInt32Val) ); break;// "ViewLayout/Columns",
 case 16: rParent.SetViewLayoutBookMode(bSet); break;// 
"ViewLayout/BookMode",
 case 17: rParent.SetDefaultPageMode(bSet,true); break;// 
"Other/IsSquaredPageMode",
-case 18: rParent.SetApplyCharUnit(bSet); break;// 
"Other/ApplyUserChar"
+case 18: rParent.SetApplyCharUnit(bSet, true); break;// 
"Other/ApplyUserChar"
 case 19: rParent.SetShowScrollBarTips(bSet); break;// 
"Window/ShowScrollBarTips",
 }
 }
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 42d29861dc82..be76a80a979f 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -233,10 +233,12 @@ public:
 {
 return m_bApplyCharUnit;
 }
-void   SetApplyCharUnit(bool bSet)
+void   SetApplyCharUnit(bool bSet, bool noModify = false)
 {
 m_bApplyCharUnit = bSet;
-m_aLayoutConfig.SetModified();
+if (!noModify) {
+m_aLayoutConfig.SetModified();
+}
 }
 
 sal_Int32   GetDefTabInMm100() const { return m_nDefTabInMm100;}
@@ -257,10 +259,12 @@ public:
 }
 
 boolIsAlignMathObjectsToBaseline() const { return 
m_bIsAlignMathObjectsToBaseline; }
-voidSetAlignMathObjectsToBaseline( bool bVal )
+voidSetAlignMathObjectsToBaseline( bool bVal, bool noModify = 
false )
 {
 m_bIsAlignMathObjectsToBaseline = bVal;
-m_aLayoutConfig.SetModified();
+if (!noModify) {
+m_aLayoutConfig.SetModified();
+}
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/uibase/app/appopt.cxx |4 ++--
 sw/source/uibase/app/docshini.cxx   |2 +-
 sw/source/uibase/config/usrpref.cxx |6 +++---
 sw/source/uibase/inc/usrpref.hxx|8 
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f7011dc1c740dcb4b5e142aa6ddbafd212c2a7d8
Author: Stephan Bergmann 
Date:   Wed Feb 7 22:15:28 2018 +0100

Store SwMasterUsrPref::m_nDefTab in 1/100 mm instead of twips

...to match its source (/org.openoffice.Office.Writer/Layout/Other/TabStop) 
and
avoid rounding errors in case the value read from the configuration is ever
written back to the configuration (which is pointless, but e.g. currently
happens when the SwMasterUsrPref ctor calls SwLayoutViewConfig::Load, which
calls SwMasterUsrPref::SetAlignMathObjectsToBaseline, which unconditionally
calls SetModified, so that a later utl::ConfigManager::storeConfigItems will
write them all back)

Change-Id: I7a1ddfbc4771fac101b7ea3a8258bb51f09d9bc1
Reviewed-on: https://gerrit.libreoffice.org/49407
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 55f6643174bf..50ee0cc1997d 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -197,7 +197,7 @@ std::unique_ptr SwModule::CreateItemSet( 
sal_uInt16 nId )
 pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, 
static_cast(::GetTabDist(rDefTabs;
 }
 else
-pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, 
static_cast(pPref->GetDefTab(;
+pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, 
static_cast(convertMm100ToTwip(pPref->GetDefTabInMm100();
 }
 
 // Options for GridTabPage
@@ -329,7 +329,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const 
SfxItemSet& rSet )
 if( SfxItemState::SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, false, 
&pItem ) )
 {
 sal_uInt16 nTabDist = static_cast(pItem)->GetValue();
-pPref->SetDefTab(nTabDist);
+pPref->SetDefTabInMm100(convertTwipToMm100(nTabDist));
 if(pAppView)
 {
 SvxTabStopItem aDefTabs( 0, 0, SvxTabAdjust::Default, 
RES_PARATR_TABSTOP );
diff --git a/sw/source/uibase/app/docshini.cxx 
b/sw/source/uibase/app/docshini.cxx
index 42dcb2933bef..e9bbeb63a2b6 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -678,7 +678,7 @@ void SwDocShell::SubInitNew()
 
 aDfltSet.Put( aHyp );
 
-sal_uInt16 nNewPos = static_cast< sal_uInt16 
>(SW_MOD()->GetUsrPref(false)->GetDefTab());
+sal_uInt16 nNewPos = static_cast< sal_uInt16 
>(convertMm100ToTwip(SW_MOD()->GetUsrPref(false)->GetDefTabInMm100()));
 if( nNewPos )
 aDfltSet.Put( SvxTabStopItem( 1, nNewPos,
   SvxTabAdjust::Default, 
RES_PARATR_TABSTOP ) );
diff --git a/sw/source/uibase/config/usrpref.cxx 
b/sw/source/uibase/config/usrpref.cxx
index b2c5db331231..f98e575c4bb7 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -50,7 +50,7 @@ SwMasterUsrPref::SwMasterUsrPref(bool bWeb) :
 m_nLinkUpdateMode(0),
 m_bIsHScrollMetricSet(false),
 m_bIsVScrollMetricSet(false),
-m_nDefTab( MM50 * 4 ),
+m_nDefTabInMm100( 2000 ), // 2 cm
 m_bIsSquaredPageMode(false),
 m_bIsAlignMathObjectsToBaseline(false),
 m_aContentConfig(bWeb, *this),
@@ -299,7 +299,7 @@ void SwLayoutViewConfig::ImplCommit()
 case 10: rVal <<= static_cast(rParent.GetZoomType()); 
break;  // "Zoom/Type",
 case 11: rVal <<= rParent.IsAlignMathObjectsToBaseline(); break;   
 // "Other/IsAlignMathObjectsToBaseline"
 case 12: rVal <<= static_cast(rParent.GetMetric()); 
break;// "Other/MeasureUnit",
-case 13: rVal <<= 
static_cast(convertTwipToMm100(rParent.GetDefTab())); break;// 
"Other/TabStop",
+case 13: rVal <<= rParent.GetDefTabInMm100(); break;// 
"Other/TabStop",
 case 14: rVal <<= rParent.IsVRulerRight(); break;  
 // "Window/IsVerticalRulerRight",
 case 15: rVal <<= 
static_cast(rParent.GetViewLayoutColumns()); break; // 
"ViewLayout/Columns",
 case 16: rVal <<= rParent.IsViewLayoutBookMode(); break;   
 // "ViewLayout/BookMode",
@@ -353,7 +353,7 @@ void SwLayoutViewConfig::Load()
 case 10: rParent.SetZoomType( static_cast< SvxZoomType 
>(nInt32Val) ); break;// "Zoom/Type",
 case 11: rParent.SetAlignMathObjectsToBaseline(bSet); 
break;// "Other/IsAlignMathObjectsToBaseline"
 case 12: 
rParent.SetMetric(static_cast(nInt32Val), true); break;// 
"Other/MeasureUnit",
-case 13: rParent.SetDefTab(convertMm100ToTwip(nInt32Val), 
true); break;// "Other/TabStop",
+case 13: rP

[Libreoffice-commits] core.git: solenv/bin

[Caolán McNamara]

 solenv/bin/native-code.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bdfc38e828fe33dda66826f50266a746afc2e6bf
Author: Caolán McNamara 
Date:   Thu Feb 8 14:09:01 2018 +

fix oss-fuzz build

Change-Id: I9ca03f1b39906cc416e77fe74a07bda04388f166

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 8499a94e13e9..b5f729b22434 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -242,8 +242,8 @@ core_constructor_list = [
 "com_sun_star_comp_xmlscript_XMLOasisBasicExporter",
 "com_sun_star_comp_xmlscript_XMLOasisBasicImporter",
 # xmlsecurity/util/xmlsecurity.component
-"com_sun_star_security_CertificateContainer_get_implementation",
-"com_sun_star_security_DocumentDigitalSignatures_get_implementation",
+("com_sun_star_security_CertificateContainer_get_implementation", "#if 
HAVE_FEATURE_NSS"),
+("com_sun_star_security_DocumentDigitalSignatures_get_implementation", 
"#if HAVE_FEATURE_NSS"),
 ]
 
 # edit group for apps, where you can edit documents
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 emfio/source/reader/emfreader.cxx |   48 --
 1 file changed, 26 insertions(+), 22 deletions(-)

New commits:
commit af8fc34702d9f7d73a81541cab2983bbdc7b6636
Author: Caolán McNamara 
Date:   Thu Feb 8 10:29:16 2018 +

ofz: timeout

Change-Id: Ia99ce4efe5ad7740f1cae7afcc199bc164b760ca
Reviewed-on: https://gerrit.libreoffice.org/49418
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/emfio/source/reader/emfreader.cxx 
b/emfio/source/reader/emfreader.cxx
index fdb8dbf43cbb..38b26086993d 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -335,30 +335,34 @@ bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, 
SvStream& rStream, sal_uInt3
 rStream.ReadUInt32(nCount);
 rStream.ReadUInt32(nRgnSize);
 
-if (   nCount > 0
-&& nType == RDH_RECTANGLES
-&& nLen >= ((nCount << 4) + (nHdSize - 16)))
-{
-sal_Int32 nx1, ny1, nx2, ny2;
+if (!rStream.good() || nCount == 0 || nType != RDH_RECTANGLES)
+return false;
 
-for (i = 0; i < nCount; i++)
-{
-rStream.ReadInt32(nx1);
-rStream.ReadInt32(ny1);
-rStream.ReadInt32(nx2);
-rStream.ReadInt32(ny2);
-
-tools::Rectangle aRectangle(Point(nx1, ny1), Point(nx2, ny2));
-
-tools::Polygon aPolygon(aRectangle);
-tools::PolyPolygon aPolyPolyOr1(aPolygon);
-tools::PolyPolygon aPolyPolyOr2(rPolyPoly);
-rPolyPoly.GetUnion(aPolyPolyOr1, aPolyPolyOr2);
-rPolyPoly = aPolyPolyOr2;
-}
-return true;
+sal_uInt32 nSize;
+if (o3tl::checked_multiply(nCount, 16, nSize))
+return false;
+if (o3tl::checked_add(nSize, nHdSize - 16, nSize))
+return false;
+if (nLen < nSize)
+return false;
+
+sal_Int32 nx1, ny1, nx2, ny2;
+for (i = 0; i < nCount; i++)
+{
+rStream.ReadInt32(nx1);
+rStream.ReadInt32(ny1);
+rStream.ReadInt32(nx2);
+rStream.ReadInt32(ny2);
+
+tools::Rectangle aRectangle(Point(nx1, ny1), Point(nx2, ny2));
+
+tools::Polygon aPolygon(aRectangle);
+tools::PolyPolygon aPolyPolyOr1(aPolygon);
+tools::PolyPolygon aPolyPolyOr2(rPolyPoly);
+rPolyPoly.GetUnion(aPolyPolyOr1, aPolyPolyOr2);
+rPolyPoly = aPolyPolyOr2;
 }
-return false;
+return true;
 }
 
 } // anonymous namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - test/Makefile.am test/UnitWOPIVersionRestore.cpp test/WopiTestServer.hpp

[Pranav Kant]

 test/Makefile.am|8 ++
 test/UnitWOPIVersionRestore.cpp |  119 
 test/WopiTestServer.hpp |4 +
 3 files changed, 128 insertions(+), 3 deletions(-)

New commits:
commit 5bd4d6781813e0a91edc527cb33b4d4eb0f84c2d
Author: Pranav Kant 
Date:   Thu Feb 8 19:54:37 2018 +0530

versionrestore: unit test; checks if wsd saves a modified document

See comment for more details

Change-Id: If79537c4ca61926f06015ad6827a473d18a2a79f

diff --git a/test/Makefile.am b/test/Makefile.am
index d7894bd9..1184f31f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -17,7 +17,9 @@ noinst_LTLIBRARIES = \
unit-storage.la unit-client.la \
unit-admin.la unit-tilecache.la \
unit-fuzz.la unit-oob.la unit-oauth.la \
-   unit-wopi.la unit-wopi-saveas.la unit-wopi-ownertermination.la
+   unit-wopi.la unit-wopi-saveas.la \
+   unit-wopi-ownertermination.la unit-wopi-versionrestore.la
+
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION) $(ZLIB_LIBS)
@@ -85,6 +87,8 @@ unit_wopi_saveas_la_SOURCES = UnitWOPISaveAs.cpp
 unit_wopi_saveas_la_LIBADD = $(CPPUNIT_LIBS)
 unit_wopi_ownertermination_la_SOURCES = UnitWopiOwnertermination.cpp
 unit_wopi_ownertermination_la_LIBADD = $(CPPUNIT_LIBS)
+unit_wopi_versionrestore_la_SOURCES = UnitWOPIVersionRestore.cpp
+unit_wopi_versionrestore_la_LIBADD = $(CPPUNIT_LIBS)
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -98,7 +102,7 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
-TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la 
unit-wopi.la unit-wopi-saveas.la unit-wopi-ownertermination.la
+TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la 
unit-wopi.la unit-wopi-saveas.la unit-wopi-ownertermination.la 
unit-wopi-versionrestore.la
 # TESTS = unit-client.la
 # TESTS += unit-admin.la
 # TESTS += unit-storage.la
diff --git a/test/UnitWOPIVersionRestore.cpp b/test/UnitWOPIVersionRestore.cpp
new file mode 100644
index ..fb0c9400
--- /dev/null
+++ b/test/UnitWOPIVersionRestore.cpp
@@ -0,0 +1,119 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "config.h"
+
+#include "WopiTestServer.hpp"
+#include "Log.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include "helpers.hpp"
+
+#include 
+#include 
+#include 
+
+
+/*
+ * 1) Modifies a current document
+ * 2) Issue a version restore request
+ * 3) Wait for the ack from wsd
+ * 4) checks, after getting ack from wsd, if it saved our unsaved changes
+ */
+class UnitWOPIVersionRestore : public WopiTestServer
+{
+enum class Phase
+{
+Load,
+Modify,
+VersionRestoreRequest,
+VersionRestoreAck,
+Polling
+} _phase;
+
+bool _isDocumentSaved = false;
+
+public:
+UnitWOPIVersionRestore() :
+_phase(Phase::Load)
+{
+}
+
+void assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
+{
+if (_phase == Phase::Polling)
+{
+_isDocumentSaved = true;
+}
+}
+
+bool filterSendMessage(const char* data, const size_t len, const WSOpCode 
/* code */, const bool /* flush */, int& /*unitReturn*/) override
+{
+std::string message(data, len);
+if (message == "close: versionrestore: prerestore_ack")
+{
+_phase = Phase::VersionRestoreAck;
+}
+
+return false;
+}
+
+void invokeTest() override
+{
+constexpr char testName[] = "UnitWOPIVersionRestore";
+
+switch (_phase)
+{
+case Phase::Load:
+{
+initWebsocket("/wopi/files/0?access_token=anything");
+
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + 
_wopiSrc, testName);
+
+_phase = Phase::Modify;
+break;
+}
+case Phase::Modify:
+{
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key 
type=input char=97 key=0", testName);
+helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=up 
char=0 key=512", testName);
+
+_phase = Phase::VersionRestoreRequest;
+SocketPoll::wakeupWorld();
+break;
+}
+   case Phase::VersionRestoreRequest:
+{
+// tell wsd that we are about to restore
+   

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d9796b91fec23990e494efcce373a2f0944f294a
Author: Stephan Bergmann 
Date:   Thu Feb 8 15:32:56 2018 +0100

Adapt solenv/flatpak-manifest.in to apache-ant-1.10.2

...that apparently made the URL for apache-ant-1.10.1 become 404.  (Again, 
the
sha512 for the new version is as given at
.)

(Asked at  "Stable link to
apache-ant-*-bin.tar.xz?" whether there's any better link that I could use, 
to
avoid having to constantly track the latest revision of Ant here.)

Change-Id: Ic13732d172ade9337f006d4495f066fdd52302a1

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a954b3d639e8..c19528f999d4 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -27,8 +27,8 @@
 },
 {
 "type": "archive",
-"url": 
"http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.xz";,
-"sha512": 
"8732ecfd96bcfde626260939f17fdb7e85700092ef69932b250e3572810cd53eaac24e1c72921d89900170804d27cc3100bee7c8b5159d0e5b64c3d79e07bec6",
+"url": 
"http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz";,
+"sha512": 
"a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385",
 "dest": "ant"
 },
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b6f88eeba6529a59b4a606b6a31d6dbf222671fd
Author: Christian Lohmaier 
Date:   Thu Feb 8 15:36:05 2018 +0100

bump product version to 6.0.2.0.0+

Change-Id: I6d86af6663fdac9e8704f23a862a31de184708d1

diff --git a/configure.ac b/configure.ac
index dd97036b40bb..dcba0de5d5b1 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([LibreOffice],[6.0.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.2.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.0.1.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.1.1' created by Christian Lohmaier 
 at 2018-02-08 14:35 +

Tag libreoffice-6.0.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJafGAsAAoJEPQ0oe+v7q6jcbQP/RcWjuns6FjJyPzZghrONqZf
jfwiSRY9V/2Ynb+pPA9RmVxQNSrSEG72XoUY9I35VhuPaoUN+Qx05eM/4/0skVFo
Myndnz6u8avRCiENKzSiTDscD4jCHv5ygnrjKy6tSvdYgMRUvCHS0Tsb6MRxS1Nk
nxmsKta6iXHQ5p4T47Y++lg1vefPfOPFSGWnS4lT2fCIKmZ1h1ag4mr+xAfdn/m8
hQ8ySb3oNRDwsFFuafRHBpbL0hDcXuPSb8TD4iBML40K6PnZcXuvP3tVyuBcLdSQ
rECFuMCUpSTzNZ1+gUOytmezaYRKWSvap7jvKPHDiww9D1GXChDO8to6QBWSmKrf
/w3N1dAYXDY9btg3/bdyPSgGt3AGkGCdxFlfihzXgvPc1fgsm/+6poagGgfVej0w
nfAj52PE/yEbQVWxNXVJwA0Ayq41LjEBnXkphLMnh48KV79AgC5WUX5E1WsSV1+E
wnLUyVli5upvQSFMZM6c/yfVVWN/6RD7TuOciFcNsf/5qas91WSVPvWMzrfDe52w
drjsQkquSACLTGglCwNmNPjQLpKtScEWSsY5272v4CH9vb6B74ni2owSA3B03t6h
AdU01SgokEKiiklEHou1IeLPcGWV22FZovjNm1gpy5EqhpHZXZHfy4Zh+vw3LZQK
i5JZ7ZaCHbpXbCveeXDt
=ipF3
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.0.1.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.1.1' created by Christian Lohmaier 
 at 2018-02-08 14:35 +

Tag libreoffice-6.0.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJafGA2AAoJEPQ0oe+v7q6j0zMP/09FrimXRlhL4x52wG296RmZ
PG5vbgabYj0RPXl2wfzfr9sRemrhRZfuaZ9H9LeUDHRXbtWStUilDV7ZvKl0DhGj
D4NJXETAybOoHjBwauM6qvbDoIeQL9T92lpH0cOrccPcfVJBvRUGEI8bPVf0qg5B
293EXPYbaYcuE0CldUcnx1v6kYELz+SI1TfrJ7xmoU8xZLNU24VsLmXTaP5rergu
SGg/JcSjrX2ECv3QVlbTSbuOsPxUjH60MgXr8VYDlvOx30ZWQLKntzfBSrbcz2zx
LTcDRHmszCyIVjkV6DztRjSKFgHD8OTDzD65YssZiWfjuDM1MGlXACGnVALbuB3u
hVccj2OQaB/+stF8Tko8fO7scCsMMbhwl0SdVu6LhqaErDDGR3sx1tQSl0DDDwux
FwQXG579gfNNyU0XKyyX1qlE5ToJLu8Vc8lbR0fKbaWGWf2I8JlDeA8k0tKQLNU0
9gboQs0BOxwJ8YlUWj1tkd0unM/XwKv9iG/Z17dZv/U+vRKMghP26wc+nhPaLp6m
ZgZ3okprgV2Lp0j/JNT9lY1VpgUsGIPo0+NwkfzwaxGwP8raUVCwUgFUccAs4Ywj
kMQO4nQ65vJ52KxKKAEKk9zcg7Bq7NKrtCrJaZ1taHoJK/Rs1HlgvXmw6WK00p9D
88Pm2QCVH0XTjFkjUWli
=+d3e
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-555:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.0.1.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.1.1' created by Christian Lohmaier 
 at 2018-02-08 14:35 +

Tag libreoffice-6.0.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJafGAzAAoJEPQ0oe+v7q6joZ8QAJmun3iaqAfUOjLuR5Z9DNxU
tx3Gi/ONWj3l1irWPwmaM+GZnWhScAYrowvUqPVz0saVIaoJY80erU/kxMedp8WR
PDeDaT7vHEdOEpk1Wgnr3ade6cEXM6XJyRkgUN6u6mIcmFpYzYsdZ9SfOs8IyKtt
yf7Zb6SKS/dKK+1vBHEV0Gs7CSHFDcAgdJdaV7fAtOK5XPNtVMgnn6b4NY6UuJmL
L9Er4jLJROj9VXgT5+Lrb0onvScseqnDSjVQ6wGM+xxPLP+c9il2kwfmAeb0zaH3
EwjKPvyfZ7CXlghgmVb53eq2kNgJLfKTKqQngQ1DK0kSzIOqd0g2FjPRn4ge1AdX
Y5t7ZpXAqjkgkWrdnNo9smxd3r3mfye4JrK9SKAwqs1fUtWUPmxjWlvqCtsPLl5M
xGEdtmDLgIj6kVXwUdMEaE2+rfasc/z5moayOx6Do4/TOx0db4KHDiQkCz4+FWqT
6p2oIrXD4sSb+bdfSXejToZP9IHAZrIRyUPlVyRqRDaaGOcZ4pHWUcvqhhtuhCcy
6TBwwU4/yuXi0fbUz590y4+Ji8K37PFfDf9K+9aQdx6wMrzCMhkJ8UyEqT3fbjIV
KFIzJ1YZXW5CoMzX4VDi4A1M3eLu1Ya6rOXM/rnH/0HZnGH+BjP2R6P4yTqMPyRj
1LIF8JTshBfVnf/YomZf
=DmXr
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-18:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.0.1.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.1.1' created by Christian Lohmaier 
 at 2018-02-08 14:35 +

Tag libreoffice-6.0.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJafGAwAAoJEPQ0oe+v7q6jFIEQAL8EVOpqw9sfYoO0a8x+vQvj
c6J1QbTlELP16i+D3vlfDWcbmBsRLN7zSTHGN51K1zaXb5bb/5A7h8ZCRGQQRhej
0iCN8EcQxSC8e8rEXUbn59ErrsQ15Q0NEzPDQD1e8SZeNnYc/aT6IDKtyoE/Yvfl
xHzVe47mSGYrionOUHxju2y7bzglYwvysiDVJlK6Kw5veobAXvZtXQXLBb+4n+XZ
YdEeol+MzvqbKtjdYze/3xDp9yPvzPHanLXE9rc7NpOkoA88z7b9AtOehkdtMbRr
gn2xzz1OfoHytqkCOke642JYKPDei7xFnPf+ELykjTgUhj2dwqB2L1sn0VbaH43c
8G5vGbh9tGeRAU+lyHKrLBaoIMhNvCGdvVg8XnjVO7NkAm6JrdavUg71+eHGFavt
JqdWDh0tMBEC7wlsfYO4HoWApcLSRBK/kripJX+Lp1fTPu4D7SYRv8WZ5mydwwjA
U2UOzoaSMQdifoURWY4Bg18/6Pfldm+stdAYDKS0bPxlkXPlMBneRtyL2P21XvhH
jg/9GI7hT04ExiuNEY5u/qKn0gXlob86aGhf0nj6jlACJeR6+4HHD6eVqz0ULE/B
8CXDAWwSJ7n4cGNhOy6QE9+xCQ7CLV7MPV3lTZjLGtZ6NTkWy0J/wexxOX4Ibcj4
gZe9alZ5r4009IF+xBqA
=SM7L
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-39:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 3c94e8c3e6b1b0bce03a4cfc63df62f5ed17
Author: Caolán McNamara 
Date:   Wed Feb 7 16:44:43 2018 +

check O_hhea and O_vhea sizes

Change-Id: I82e47732815f0112801c8c3a3e5b0b09ac25610a
Reviewed-on: https://gerrit.libreoffice.org/49377
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 1e2215a1ae6f..cfad36e35f64 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1521,8 +1521,10 @@ int OpenTTFontBuffer(const void* pBuffer, sal_uInt32 
nLen, sal_uInt32 facenum, T
 
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 {
-if (t->fsize < 4)
+if (t->fsize < 4) {
+CloseTTFont(t);
 return SF_TTFORMAT;
+}
 int i;
 sal_uInt32 length, tag;
 sal_uInt32 tdoffset = 0;/* offset to TableDirectory in a TTC file. 
For TTF files is 0 */
@@ -1699,10 +1701,12 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 }
 
 table = getTable(t, O_hhea);
-t->numberOfHMetrics = (table != nullptr) ? GetUInt16(table, 34) : 0;
+table_size = getTableSize(t, O_hhea);
+t->numberOfHMetrics = (table && table_size >= 36) ? GetUInt16(table, 34) : 
0;
 
 table = getTable(t, O_vhea);
-t->numOfLongVerMetrics = (table != nullptr) ? GetUInt16(table, 34) : 0;
+table_size = getTableSize(t, O_vhea);
+t->numOfLongVerMetrics = (table && table_size >= 36) ? GetUInt16(table, 
34) : 0;
 
 GetNames(t);
 FindCmap(t);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 configmgr/source/access.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit a26adf6679aa13dc5821047f6aa1f05e7d0d00fd
Author: Stephan Bergmann 
Date:   Thu Feb 8 09:07:32 2018 +0100

Better return nil than an arbitrary xml:lang="..." value

...for a localized property that doesn't have a suitable value, but is 
nillable.

E.g., 
/org.openoffice.Office.Writer/Insert/Caption/CaptionOrderNumberingFirst
(once fixed to indeed be a localized property as apparently intended, with a
follow-up commit to this) only has an explicit value (true) for 
xml:lang="hu",
but shouldn't return that for any other locale (where the implicit default 
for a
nil value should instead be false, cf. the else branch at the end of
SwInsertConfig::Load, sw/source/uibase/config/modcfg.cxx).

Change-Id: I7b991c1bc4df22bf2359175b0734e85e0844ce99
Reviewed-on: https://gerrit.libreoffice.org/49409
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 0d19af353b49..718f6339967b 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1430,9 +1430,8 @@ rtl::Reference< ChildAccess > Access::getChild(OUString 
const & name) {
 }
 }
 }
-// Defaults are the "en-US" locale, the "en" locale, the empty string
-// locale, the first child (if any), or a null ChildAccess, in that
-// order:
+// Defaults are the "en-US" locale, the "en" locale, the empty string 
locale, the first child (if
+// any, and if the property is non-nillable), or a null ChildAccess, 
in that order:
 rtl::Reference< ChildAccess > child(getChild("en-US"));
 if (child.is()) {
 return child;
@@ -1445,9 +1444,11 @@ rtl::Reference< ChildAccess > Access::getChild(OUString 
const & name) {
 if (child.is()) {
 return child;
 }
-std::vector< rtl::Reference< ChildAccess > > 
children(getAllChildren());
-if (!children.empty()) {
-return children.front();
+if (!static_cast(getNode().get())->isNillable()) {
+std::vector< rtl::Reference< ChildAccess > > 
children(getAllChildren());
+if (!children.empty()) {
+return children.front();
+}
 }
 return rtl::Reference< ChildAccess >();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: configure.ac

[Miklos Vajna]

 configure.ac |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit b8926baa1809300410783fc9991a02162767a374
Author: Miklos Vajna 
Date:   Thu Feb 8 15:27:12 2018 +0100

configure: allow disable werror with --disable-werror

Change-Id: Ie614ce2143669008c38ecf4b267d6fec78337be6
Reviewed-on: https://gerrit.libreoffice.org/49434
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/configure.ac b/configure.ac
index ff96e7a6..bafe11e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,10 @@ AC_ARG_ENABLE([setcap],
 AS_HELP_STRING([--disable-setcap],
   [Do not set capabilities on files. For packaging 
builds]))
 
+AC_ARG_ENABLE([werror],
+AS_HELP_STRING([--disable-werror],
+  [Do not turn warnings into errors.]))
+
 # Handle options
 AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
   [POCO_DEBUG_SUFFIX=d],
@@ -170,8 +174,17 @@ AC_SUBST(MAX_DOCUMENTS)
 # Test for build environment
 
 CXXFLAGS="$CXXFLAGS -std=c++11"
-CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror -Wshadow"
-CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow"
+CFLAGS="$CFLAGS -Wall -Wextra"
+
+AC_MSG_CHECKING([whether to turn warnings to errors])
+if test -z "$enable_werror" -o "$enable_werror" = "yes"; then
+AC_MSG_RESULT([yes])
+CXXFLAGS="$CXXFLAGS -Werror"
+CFLAGS="$CFLAGS -Werror"
+else
+AC_MSG_RESULT([no])
+fi
 
 # check for C++11 support
 HAVE_CXX11=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Newly localized properties

[Stephan Bergmann]

 
"/org...Writer/Insert/Caption/CaptionOrderNumberingFirst should be 
localized" and  
"/org.openoffice.Office.Writer/Layout/Other/TabStop should be localized" 
will cause the Option dialog's


* "LibreOffice Writer - AutoCaption - Caption Order"

and

* "LibreOffice Writer - General - Settings - Tab stops"

settings to be localized.  That is, changes made to these two settings 
while LO is being run in one locale will no longer affect other locales. 
 (With one exception, due to how the configuration works:  Changes made 
in the en-US locale will also be seen in other locales, unless changes 
are explicitly made in those other locales, too.)  (Plus, there's some 
havoc caused by the bugs that are now being fixed wrt existing user 
installations.  See the two Gerrit changes' commit messages for details.)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 emfio/source/reader/wmfreader.cxx |   28 ++--
 1 file changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 37e5c9efb19224974a3861eae18e16d6432c6bde
Author: Caolán McNamara 
Date:   Thu Feb 8 11:13:47 2018 +

ofz: timeout

Change-Id: I3eff48549761aa8fa2569cd23c122f98fb2ea491
Reviewed-on: https://gerrit.libreoffice.org/49419
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index e0822757eefe..983fe70a1a4e 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -511,14 +511,30 @@ namespace emfio
 
 case W_META_TEXTOUT:
 {
+//record is Recordsize, RecordFunction, StringLength, 
, YStart, XStart
+const sal_uInt32 nNonStringLen = sizeof(sal_uInt32) + 4 * 
sizeof(sal_uInt16);
+const sal_uInt32 nRecSize = mnRecSize * 2;
 sal_uInt16 nLength = 0;
-mpInputStream->ReadUInt16( nLength );
-if ( nLength )
+mpInputStream->ReadUInt16(nLength);
+sal_uInt16 nStoredLength = (nLength + 1) &~ 1;
+
+if (nRecSize < nNonStringLen)
+{
+SAL_WARN("vcl.wmf", "W_META_TEXTOUT too short");
+break;
+}
+
+if (nRecSize - nNonStringLen < nStoredLength)
+{
+SAL_WARN("vcl.wmf", "W_META_TEXTOUT too short, truncating 
string");
+nLength = nStoredLength = nRecSize - nNonStringLen;
+}
+
+if (nLength)
 {
-std::unique_ptr pChar(new char[ ( nLength + 1 ) &~ 
1 ]);
-nLength = std::min(nLength, 
mpInputStream->ReadBytes(pChar.get(), (nLength + 1) &~ 1));
-OUString aText( pChar.get(), nLength, GetCharSet() );
-pChar.reset();
+std::vector aChars(nStoredLength);
+nLength = std::min(nLength, 
mpInputStream->ReadBytes(aChars.data(), aChars.size()));
+OUString aText(aChars.data(), nLength, GetCharSet());
 Point aPosition( ReadYX() );
 DrawText( aPosition, aText );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit f4e32af7450c4e6fa1063aec95ba9df49c055a3b
Author: Caolán McNamara 
Date:   Wed Feb 7 16:05:08 2018 +

stay within font bounds

Change-Id: Ie8ed610b71cb1b20963827c2be97155d2d8aa22c
Reviewed-on: https://gerrit.libreoffice.org/49369
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index cfad36e35f64..c61c74b672dd 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1563,7 +1563,12 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 /* parse the tables */
 for (i=0; i(t->ntables); i++) {
 int nIndex;
-tag = GetUInt32(t->ptr + tdoffset + 12, 16 * i);
+const sal_uInt32 nStart = tdoffset + 12;
+const sal_uInt32 nOffset = 16 * i;
+if (nStart + nOffset + sizeof(sal_uInt32) <=  
static_cast(t->fsize))
+tag = GetUInt32(t->ptr + nStart, nOffset);
+else
+tag = static_cast(-1);
 switch( tag ) {
 case T_maxp: nIndex = O_maxp; break;
 case T_glyf: nIndex = O_glyf; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 vcl/source/outdev/text.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit c83d2ac99dc3da4ef85b193543a93e02e3858844
Author: Xisco Fauli 
Date:   Mon Feb 5 16:51:59 2018 +0100

tdf#112990: Hack-around: Do not crash on mac with opengl enabled

Change-Id: Id8d1ffe593fa42b7e37e26e8d66ffad87d6685c1
Reviewed-on: https://gerrit.libreoffice.org/49251
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index a17b6306d88a..d2ada019fef7 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -863,6 +864,14 @@ void OutputDevice::DrawText( const Point& rStartPt, const 
OUString& rStr,
 if(mpFontInstance->mpConversion)
 pLayoutCache = nullptr;
 
+#ifdef MACOSX
+// FIXME: tdf#112990
+// Cache text layout crashes on mac with OpenGL enabled
+// Force it to not use the cache
+if(OpenGLHelper::isVCLOpenGLEnabled())
+pLayoutCache = nullptr;
+#endif
+
 // without cache
 if(!pLayoutCache)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: fpicker/source include/fpicker include/sfx2 include/svtools offapi/com sc/inc sc/source sfx2/source vcl/inc vcl/unx

[Samuel Mehrbrodt]

 fpicker/source/aqua/ControlHelper.hxx   |1 
 fpicker/source/aqua/ControlHelper.mm|9 +
 fpicker/source/aqua/SalAquaFilePicker.mm|3 
 fpicker/source/aqua/resourceprovider.mm |1 
 fpicker/source/office/OfficeControlAccess.cxx   |4 
 fpicker/source/office/OfficeFilePicker.cxx  |4 
 fpicker/source/office/fpdialogbase.hxx  |3 
 fpicker/source/office/iodlg.cxx |   20 
 fpicker/source/office/iodlgimp.cxx  |2 
 fpicker/source/office/iodlgimp.hxx  |3 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx |9 +
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |   16 +++
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx |1 
 fpicker/source/win32/misc/resourceprovider.cxx  |1 
 include/fpicker/strings.hrc |1 
 include/sfx2/opengrf.hxx|7 +
 include/svtools/helpids.h   |1 
 offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl |2 
 offapi/com/sun/star/ui/dialogs/TemplateDescription.idl  |   12 ++
 sc/inc/strings.hrc  |3 
 sc/source/ui/drawfunc/fuins1.cxx|   50 
--
 sfx2/source/appl/opengrf.cxx|   23 +++-
 sfx2/source/dialog/filedlghelper.cxx|   25 +++--
 vcl/inc/strings.hrc |1 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx|   11 ++
 vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx|1 
 vcl/unx/gtk/fpicker/resourceprovider.cxx|1 
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx  |   12 ++
 vcl/unx/kde4/KDE4FilePicker.cxx |   12 ++
 29 files changed, 218 insertions(+), 21 deletions(-)

New commits:
commit 38774ce79b4b24628c3a73f387489bf2498363f1
Author: Samuel Mehrbrodt 
Date:   Tue Feb 6 17:48:51 2018 +0100

tdf#86739 Option to set image anchor type in image insert dialog

This adds the selectbox to (hopefully) all filepickers:
- LO native
- GTK/GTK3
- KDE4
- KDE5
- Windows
- macOS

Change-Id: I01bd42b1ca18e0f691b879647a6cb1b62177d3ce
Reviewed-on: https://gerrit.libreoffice.org/49311
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/fpicker/source/aqua/ControlHelper.hxx 
b/fpicker/source/aqua/ControlHelper.hxx
index a657104c4ba3..227e5472f6af 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -82,6 +82,7 @@ public:
 VERSION,
 TEMPLATE,
 IMAGE_TEMPLATE,
+IMAGE_ANCHOR,
 LIST_LAST
 };
 
diff --git a/fpicker/source/aqua/ControlHelper.mm 
b/fpicker/source/aqua/ControlHelper.mm
index 0c459e23cee8..54af583b3338 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -205,6 +205,11 @@ void ControlHelper::initialize( sal_Int16 nTemplateId )
 m_bToggleVisibility[PREVIEW] = true;
 m_bListVisibility[IMAGE_TEMPLATE] = true;
 break;
+case FILEOPEN_LINK_PREVIEW_IMAGE_ANCHOR:
+m_bToggleVisibility[LINK] = true;
+m_bToggleVisibility[PREVIEW] = true;
+m_bListVisibility[IMAGE_ANCHOR] = true;
+break;
 case FILEOPEN_READONLY_VERSION:
 m_bToggleVisibility[READONLY] = true;
 m_bListVisibility[VERSION] = true;
@@ -539,6 +544,7 @@ void ControlHelper::createControls()
 MAP_LIST_(VERSION);
 MAP_LIST_(TEMPLATE);
 MAP_LIST_(IMAGE_TEMPLATE);
+MAP_LIST_(IMAGE_ANCHOR);
 }
 
 m_aActiveControls.push_back(m_pListControls[i]);
@@ -612,6 +618,7 @@ int ControlHelper::getControlElementName(const Class 
aClazz, const int nControlI
 LIST_ELEMENT( VERSION );
 LIST_ELEMENT( TEMPLATE );
 LIST_ELEMENT( IMAGE_TEMPLATE );
+LIST_ELEMENT( IMAGE_ANCHOR );
 }
 }
 
@@ -730,9 +737,11 @@ case ExtendedFilePickerElementIds::LISTBOX_##elem##_LABEL: 
\
 MAP_LIST( VERSION );
 MAP_LIST( TEMPLATE );
 MAP_LIST( IMAGE_TEMPLATE );
+MAP_LIST( IMAGE_ANCHOR );
 MAP_LIST_LABEL( VERSION );
 MAP_LIST_LABEL( TEMPLATE );
 MAP_LIST_LABEL( IMAGE_TEMPLATE );
+MAP_LIST_LABEL( IMAGE_ANCHOR );
 default:
 SAL_INFO("fpicker.aqua","Handle unknown control " << nControlId);
 break;
diff --git a/fpicker/source/aq

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

[Michael Stahl]

 svx/source/svdraw/svdobjplusdata.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8bd6f83741a44509921b9b0fd14611815f6a4dc6
Author: Michael Stahl 
Date:   Thu Feb 8 16:50:21 2018 +0100

svx: fix crash caused by SdrEdgeObj::Notify() not noticing dying object

This can be reproduced by exporting tdf97737-2.odt to DOCX.

Change-Id: I710f8961568aeb5a64fb39eff7c1e3540cbf4976

diff --git a/svx/source/svdraw/svdobjplusdata.cxx 
b/svx/source/svdraw/svdobjplusdata.cxx
index 0cfaba0fd043..c7a74a5cc4c9 100644
--- a/svx/source/svdraw/svdobjplusdata.cxx
+++ b/svx/source/svdraw/svdobjplusdata.cxx
@@ -24,7 +24,10 @@ SdrObjPlusData::SdrObjPlusData():
 
 SdrObjPlusData::~SdrObjPlusData()
 {
-pBroadcast.reset();
+// HACK: the SdrObject::GetBroadcaster() is called during the destructor
+// in SdrEdgeObj::Notify() so delete first, then clear the pointer
+delete pBroadcast.get();
+(void) pBroadcast.release();
 pUserDataList.reset();
 pGluePoints.reset();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 vcl/unx/generic/window/salframe.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 275c1e0a05c1d31c9d83a246082a59db3119059d
Author: Samuel Mehrbrodt 
Date:   Thu Feb 8 11:45:55 2018 +0100

Disable NET_WM_PING for all debug builds

To allow debugging under Gnome 3

Change-Id: I75e3a3fe797c4973072b46f9ee58270fd0e366c5
Reviewed-on: https://gerrit.libreoffice.org/49417
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/vcl/unx/generic/window/salframe.cxx 
b/vcl/unx/generic/window/salframe.cxx
index 044fe8ba17d1..8f2528c8d4e2 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -698,7 +698,11 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, 
SalX11Screen nXScreen
 int  n = 0;
 a[n++] = pDisplay_->getWMAdaptor()->getAtom( 
WMAdaptor::WM_DELETE_WINDOW );
 
-#ifndef DBG_UTIL
+// LibreOffice advertises NET_WM_PING atom, so mutter rightfully warns of an 
unresponsive application during debugging.
+// Hack that out unconditionally for debug builds, as per 
https://bugzilla.redhat.com/show_bug.cgi?id=981149
+// upstream refuses to make this configurable in any way.
+// NOTE: You need to use the 'gen' backend for this to work 
(SAL_USE_VCLPLUGIN=gen)
+#ifndef OSL_DEBUG_LEVEL
 if( pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING ) )
 a[n++] = pDisplay_->getWMAdaptor()->getAtom( 
WMAdaptor::NET_WM_PING );
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 3 commits - sc/source sw/qa

[Thorsten Behrens]

 sc/source/core/data/sortparam.cxx|4 ++--
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   12 
 sw/qa/extras/rtfimport/rtfimport.cxx |5 ++---
 3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit d2c07c22309224b6f0ee8701b4c8f83eb38aa251
Author: Thorsten Behrens 
Date:   Thu Feb 8 14:06:43 2018 +0100

Pull in corresponding changes from master's ooxmlexport10.cxx

Fixup for 4b282dc07884f39d31edffb256e608e91eb266b3

This is probably c829e01e973ac32fb625925ce83f843ad30d94db and
893698741a78e56d74b87caff24f67742ddd892b from master.

Change-Id: I21b8de56c0b8fd1ebf20452e2cc018ef0176f3f5

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f7190f0d77e0..7c7b284cab6a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3029,14 +3029,18 @@ DECLARE_OOXMLIMPORT_TEST(testTdf60351, "tdf60351.docx")
 
 DECLARE_OOXMLIMPORT_TEST(testTdf97417, "section_break_numbering.docx")
 {
+uno::Reference xProps(getParagraph(1), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("1st page: first paragraph erroneous numbering",
+!xProps->getPropertyValue("NumberingRules").hasValue());
 // paragraph with numbering and section break was removed by writerfilter
 // but its numbering was copied to all following paragraphs
-CPPUNIT_ASSERT_MESSAGE("first paragraph missing numbering",
-getProperty>(getParagraph(1), 
"NumberingRules").is());
-uno::Reference const xProps(getParagraph(2), 
uno::UNO_QUERY_THROW);
-CPPUNIT_ASSERT_MESSAGE("second paragraph erroneous numbering",
+CPPUNIT_ASSERT_MESSAGE("2nd page: first paragraph missing numbering",
+getProperty>(getParagraph(2), 
"NumberingRules").is());
+xProps = uno::Reference(getParagraph(3), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("2nd page: second paragraph erroneous numbering",
 !xProps->getPropertyValue("NumberingRules").hasValue());
 
+CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
 DECLARE_OOXMLIMPORT_TEST(testTdf95970, "tdf95970.docx")
commit 04fbef2cfd7ced957454c60f32d0f8e3c8c7827f
Author: Thorsten Behrens 
Date:   Thu Feb 8 14:07:39 2018 +0100

Pull in rest of master fix for tdf#72942

This is the part of deaa16bd24fba4a3a6b072ab2b94542a7dbd41c6 that
touched sw/qa/extras/rtfexport/rtfexport2.cxx

Change-Id: If27eb46b0acc48dfb368775224a72a8bbe63d96b

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2d1b1b4b32cb..ded9c987929a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1591,9 +1591,8 @@ DECLARE_RTFIMPORT_TEST(testFdo69384, "hello.rtf")
 uno::Reference xEnd = xText->getEnd();
 paste("fdo69384-paste.rtf", xEnd);
 
-// Import got interrupted in the middle of style sheet table import,
-// resulting in missing styles and text.
-getStyles("ParagraphStyles")->getByName("Text body justified");
+// During insert of the RTF document we do not insert new styles
+CPPUNIT_ASSERT(!getStyles("ParagraphStyles")->hasByName("Text body 
justified"));
 }
 
 DECLARE_RTFIMPORT_TEST(testFdo70221, "fdo70221.rtf")
commit 6a656eae1aad3f7692b70073707ac4932edbde8a
Author: Thorsten Behrens 
Date:   Thu Feb 8 14:05:20 2018 +0100

sc: fix WaE

Followup to f92fd273e0319b18ab9b453b5ce753b865b37a1f
tdf#98931 Add option to sort boundary image-only columns

Backport broke order of initialisation

Change-Id: I20d3934578cffcda58ed2bf17383ee794acb1fdc

diff --git a/sc/source/core/data/sortparam.cxx 
b/sc/source/core/data/sortparam.cxx
index f55fc42b86ca..c8c46882f1e9 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -35,8 +35,8 @@ ScSortParam::ScSortParam()
 ScSortParam::ScSortParam( const ScSortParam& r ) :
 
nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex),
 bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),
-
bNaturalSort(r.bNaturalSort),bUserDef(r.bUserDef),bIncludeGraphicObjects(r.bIncludeGraphicObjects),
-bIncludePattern(r.bIncludePattern),bInplace(r.bInplace),
+
bNaturalSort(r.bNaturalSort),bIncludeGraphicObjects(r.bIncludeGraphicObjects),
+
bUserDef(r.bUserDef),bIncludePattern(r.bIncludePattern),bInplace(r.bInplace),
 nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
 maKeyState( r.maKeyState ),
 aCollatorLocale( r.aCollatorLocale ), aCollatorAlgorithm( 
r.aCollatorAlgorithm ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 svtools/source/brwbox/brwbox1.cxx  |   12 +--
 svtools/source/config/extcolorcfg.cxx  |   21 ++---
 svtools/source/contnr/svtabbx.cxx  |8 +-
 svtools/source/control/calendar.cxx|   18 ++--
 svtools/source/control/ctrlbox.cxx |8 +-
 svtools/source/control/inettbc.cxx |8 --
 svtools/source/control/roadmap.cxx |   57 +-
 svtools/source/control/toolbarmenuacc.cxx  |   37 +++--
 svtools/source/control/valueacc.cxx|   38 -
 svtools/source/dialogs/addresstemplate.cxx |   50 +---
 svtools/source/dialogs/roadmapwizard.cxx   |   52 +
 svtools/source/edit/editsyntaxhighlighter.cxx  |5 -
 svtools/source/graphic/grfcache.cxx|   64 ++--
 svtools/source/misc/dialogcontrolling.cxx  |7 -
 svtools/source/misc/openfiledroptargetlistener.cxx |   12 +--
 svtools/source/misc/stringtransfer.cxx |7 -
 svtools/source/misc/transfer2.cxx  |   11 +-
 svtools/source/table/defaultinputhandler.cxx   |   11 +-
 svtools/source/table/tablecontrol_impl.cxx |   30 ++-
 svtools/source/uno/statusbarcontroller.cxx |   29 ++-
 svtools/source/uno/toolboxcontroller.cxx   |   38 +++--
 svtools/source/uno/unocontroltablemodel.cxx|   81 ++---
 svtools/source/uno/unoimap.cxx |8 --
 23 files changed, 230 insertions(+), 382 deletions(-)

New commits:
commit 0fb4ae8767fa5ff791cd42934b4215011a269eb0
Author: Julien Nabet 
Date:   Thu Feb 8 11:09:15 2018 +0100

Modernize a bit svtools

by using for-range loops
+ use empty() instead of comparing begin and end iterator

Change-Id: I41c3ae0c9032d6349afb113d457cb78862ae9dcf
Reviewed-on: https://gerrit.libreoffice.org/49416
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index 8f53a16e506b..519c4ccc1b07 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -220,11 +220,8 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
 #if OSL_DEBUG_LEVEL > 0
 OSL_ENSURE( ColCount() == 0 || pCols[0]->GetId() != HandleColumnId , 
"BrowseBox::InsertHandleColumn: there is already a handle column" );
 {
-BrowserColumns::iterator iCol = pCols.begin();
-const BrowserColumns::iterator colsEnd = pCols.end();
-if ( iCol != colsEnd )
-for (++iCol; iCol != colsEnd; ++iCol)
-OSL_ENSURE( (*iCol)->GetId() != HandleColumnId, 
"BrowseBox::InsertHandleColumn: there is a non-Handle column with handle ID" );
+for (auto const col : pCols)
+OSL_ENSURE( col->GetId() != HandleColumnId, 
"BrowseBox::InsertHandleColumn: there is a non-Handle column with handle ID" );
 }
 #endif
 
@@ -253,9 +250,8 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const 
OUString& rText,
 
 #if OSL_DEBUG_LEVEL > 0
 {
-const BrowserColumns::iterator colsEnd = pCols.end();
-for (BrowserColumns::iterator iCol = pCols.begin(); iCol != colsEnd; 
++iCol)
-OSL_ENSURE( (*iCol)->GetId() != nItemId, 
"BrowseBox::InsertDataColumn: duplicate column Id" );
+for (auto const& col : pCols)
+OSL_ENSURE( col->GetId() != nItemId, "BrowseBox::InsertDataColumn: 
duplicate column Id" );
 }
 #endif
 
diff --git a/svtools/source/config/extcolorcfg.cxx 
b/svtools/source/config/extcolorcfg.cxx
index 6f360bf82aae..945299289555 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -392,30 +392,27 @@ void ExtendedColorConfig_Impl::ImplCommit()
+ m_sLoadedScheme;
 const OUString s_sSep("/");
 
-TComponents::iterator aIter = m_aConfigValues.begin();
-TComponents::iterator aEnd = m_aConfigValues.end();
-for( ;aIter != aEnd;++aIter )
+for (auto const& configValue : m_aConfigValues)
 {
-if ( ConfigItem::AddNode(sBase, aIter->first) )
+if ( ConfigItem::AddNode(sBase, configValue.first) )
 {
 OUString sNode = sBase
+ s_sSep
-   + aIter->first
+   + configValue.first
 //ConfigItem::AddNode(sNode, sColorEntries);
+ s_sSep
+ sColorEntries;
 
-uno::Sequence < beans::PropertyValue > 
aPropValues(aIter->second.first.size());
+uno::Sequence < beans::PropertyValue > 
aPropValues(configValue.second.first.size());
 beans::PropertyValue* pPropValues = aPropValues.getArray();
-TConfigValues::iterator aConIter = aIter->second.first.begin();
-TConfigValues::iterator aConEnd  = aIter->second.first.end();
-for (; aCo

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Caolan, Thorsten, Miklos, Sophie, Stephan, Heiko, Eike, Christian,
  Kendy, Michael S, Michael M, Xisco, Jmux

* Completed Action Items:
+ Check availability of people for GSOC / UI mentoring (Heiko) 
[ asked people and updated as explained ]

* Pending Action Items:
+ come up with a list of retiring committers to mail (Norbert)

* Release Engineering update (Christian)
   + 6.0.0 retrospective ?
  + crashes on windows quite a lot.
   + 6.0.1.1
  + tagged a build quickly here before release, and it does fix crashers.
  + test build for en_US on pre-release server
  + release builds available later today/tomorrow
  + starting a flatpak build too (Stephan)
  + will push to download pages without blocking on QA.
  + seems to fix the known crashes (Xisco)
 + thanks to V. Stuart & Buovjaga for testing.
   + 6.0.2 – at the time of what was 6.0.1 before this & renumber upwards.
  + keeping the schedule intact.
   + 5.4.5.1
  + releasing this as final – no fixes for RC2 anyway
  + pushing this as of now on the download page.
   + thanks to Caolan & team @ RedHat
  + will update pages on release.
   + Android
  + Beta version appears to have solved all the top crashes
  + need to check how many are using the beta. (260 as of today)
   + Online

* Documentation (Olivier)
   + assumed in the air.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
249(249) (topicUI) bugs open, 320(320) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  7(4) 17(3) 34(2)  111(2)  
 commented 63(18)   211(35)   492(-3)2078(8)  
   removed  0(0)  0(0)  2(0)   15(0)  
  resolved  3(-2)15(1) 47(-5) 220(-3) 
+ top 10 contributors:
  Tietze, Heiko made 86 changes in 1 month, and 908 changes in 1 year
  Philips, Yousuf made 44 changes in 1 month, and 792 changes in 1 year
  Thomas Lendo made 35 changes in 1 month, and 435 changes in 1 year
  Xisco Faulí made 26 changes in 1 month, and 418 changes in 1 year
  Cor Nouws made 24 changes in 1 month, and 195 changes in 1 year
  Foote, V Stuart made 21 changes in 1 month, and 318 changes in 1 year
  Budea, Áron made 18 changes in 1 month, and 61 changes in 1 year
  Thomas Linard made 18 changes in 1 month, and 64 changes in 1 year
  Telesto made 14 changes in 1 month, and 80 changes in 1 year
  Dieter Praas made 13 changes in 1 month, and 93 changes in 1 year

   + Trouble with announced but missing features 
+ table styles depend on user settings
+ have to delete the user-directory to enable it.
+ special character was a decision
+ introduced a new button which is hidden, new one
  with floating widget is not visible.
+ some discussion on horizontal space here.
   + design people wanted to keep it.

   + Paragraph break
+ https://bugs.documentfoundation.org/show_bug.cgi?id=68271
→ keep current state – the old way

   + Bypassing import dialogs
+ https://bugs.documentfoundation.org/show_bug.cgi?id=74580
→ want a fast/default case for CSV import. Dropped needs-ux

   + ‘100 paper cuts’ GSoC project suggestion
+ ask on the design ML to submit their own top-10 cuts.
+ some sort of voting, to see what are relevant
+ get a prioritised list of student-solve-able topics.
+ some may be harder than easy-hacks.

* Crash Hunting (Caolan)
+ 0(-18) import failure, 1(+1) export failures
+ calc issues gone with different default
+ Dennis’ implicit intersection work ongoing.
+ can dig the docs out of previous crash-testing results.
   + using the BZ markup (Caolan)
   + should be there for some months.
+ mst has a fix for the 1 export issue. 
+ 4 (+0) coverity
+ 44 fuzzers * 3 sanitizers+engine combos (asan+libfuzzer,
ubsan+libfuzzer, asan+afl), writer html last added
working on embedded font parsing
+ busy funding the same issues that crash-testing find.
+ fun font parsing bits ongoing.

* Crash Reporter (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.3.6.1
+ 951 (last 7 days) (-)
+ http://crashreport.libreoffice.org/stats/version/5.3.7.2
+ 1451 (last 7 days) (-)
+ http://crashreport.libreoffice.org/stats/version/5.4.3.2
  + 2098 (last 7 days) (-)
+ http://crashreport.libreoffice.org/stats/version/5.4.4.2
  + 1529 (last 7 days) (-)
+ http://crashreport.libreoffice.org/stats/version/5.4.5.1
  + 7 (last 7 days) (-)
+ http://crashreport.libreoffice.org/stats/version/6.0.0.3
  + 7966 (last 7 days) (up)
   

[Libreoffice-commits] online.git: 2 commits - common/Unit.hpp net/Socket.hpp test/Makefile.am test/UnitWOPIDocumentConflict.cpp test/WopiTestServer.hpp wsd/LOOLWSD.cpp

[Pranav Kant]

 common/Unit.hpp   |4 -
 net/Socket.hpp|2 
 test/Makefile.am  |   10 ++
 test/UnitWOPIDocumentConflict.cpp |  136 ++
 test/WopiTestServer.hpp   |   53 +-
 wsd/LOOLWSD.cpp   |2 
 6 files changed, 196 insertions(+), 11 deletions(-)

New commits:
commit 39f11ab4f7be708acc5e913d62e99321d8675357
Author: Pranav Kant 
Date:   Fri Feb 9 00:21:54 2018 +0530

document conflict: unit test

Change-Id: I4ea310fe5adb198bc7b5e083f6bd4b0431c0cdef

diff --git a/common/Unit.hpp b/common/Unit.hpp
index 97db1c39..5844cc3b 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -29,6 +29,8 @@ class WebSocketHandler;
 // Forward declaration to avoid pulling the world here.
 namespace Poco
 {
+class MemoryInputStream;
+
 namespace Net
 {
 class HTTPServerRequest;
@@ -117,7 +119,7 @@ public:
 }
 
 /// Custom response to a http request.
-virtual bool handleHttpRequest(const Poco::Net::HTTPRequest& /*request*/, 
std::shared_ptr& /*socket*/)
+virtual bool handleHttpRequest(const Poco::Net::HTTPRequest& /*request*/, 
Poco::MemoryInputStream& /*message*/,std::shared_ptr& /*socket*/)
 {
 return false;
 }
diff --git a/net/Socket.hpp b/net/Socket.hpp
index da34b5e3..7e5035b4 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -501,7 +501,7 @@ public:
 } while (rc == -1 && errno == EINTR);
 
 if (rc == -1 && errno != EAGAIN && errno != EWOULDBLOCK)
-LOG_SYS("wakeup socket #" << fd << " is closd at wakeup?");
+LOG_SYS("wakeup socket #" << fd << " is closed at wakeup?");
 }
 
 /// Wakeup the main polling loop in another thread
diff --git a/test/Makefile.am b/test/Makefile.am
index 1184f31f..b417a857 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -18,7 +18,8 @@ noinst_LTLIBRARIES = \
unit-admin.la unit-tilecache.la \
unit-fuzz.la unit-oob.la unit-oauth.la \
unit-wopi.la unit-wopi-saveas.la \
-   unit-wopi-ownertermination.la unit-wopi-versionrestore.la
+   unit-wopi-ownertermination.la unit-wopi-versionrestore.la \
+   unit-wopi-documentconflict.la
 
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
@@ -89,6 +90,8 @@ unit_wopi_ownertermination_la_SOURCES = 
UnitWopiOwnertermination.cpp
 unit_wopi_ownertermination_la_LIBADD = $(CPPUNIT_LIBS)
 unit_wopi_versionrestore_la_SOURCES = UnitWOPIVersionRestore.cpp
 unit_wopi_versionrestore_la_LIBADD = $(CPPUNIT_LIBS)
+unit_wopi_documentconflict_la_SOURCES = UnitWOPIDocumentConflict.cpp
+unit_wopi_documentconflict_la_LIBADD = $(CPPUNIT_LIBS)
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -102,7 +105,10 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
-TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la unit-oauth.la 
unit-wopi.la unit-wopi-saveas.la unit-wopi-ownertermination.la 
unit-wopi-versionrestore.la
+TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la \
+unit-oauth.la unit-wopi.la unit-wopi-saveas.la \
+unit-wopi-ownertermination.la unit-wopi-versionrestore.la \
+unit-wopi-documentconflict.la
 # TESTS = unit-client.la
 # TESTS += unit-admin.la
 # TESTS += unit-storage.la
diff --git a/test/UnitWOPIDocumentConflict.cpp 
b/test/UnitWOPIDocumentConflict.cpp
new file mode 100644
index ..0b1cbb8e
--- /dev/null
+++ b/test/UnitWOPIDocumentConflict.cpp
@@ -0,0 +1,136 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "config.h"
+
+#include "WopiTestServer.hpp"
+#include "Log.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include "helpers.hpp"
+
+#include 
+#include 
+
+/**
+ * This test asserts that the unsaved changes in the opened document are
+ * discarded in case document is changed in storage behind our back. We don't
+ * want to overwrite the document which is in storage when the user asks us to
+ * do so.
+ */
+class UnitWOPIDocumentConflict : public WopiTestServer
+{
+enum class Phase
+{
+Load,
+ModifyAndChangeStorageDoc,
+LoadNewDocument,
+Polling
+} _phase;
+
+enum class DocLoaded
+{
+   Doc1,
+   Doc2
+} _docLoaded;
+
+const std::string _testName = "UnitWOPIDocumentConflict";
+
+public:
+UnitWOPIDocumentConflict() :
+_phase(Phase::Load)
+{
+}
+
+void assertGetFileRequest(const Poco::Net::HTTPRequest& /*request*/) 
override
+{
+  

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b738bbdd6f795b328219079c3706f96d4ce7d7fb
Author: Ilmari Lauhakangas 
Date:   Thu Feb 8 13:18:55 2018 +0200

Updated core
Project: help  b6bc8c1cfecc55bebff8dc64fddb63e3edc109b5

tdf#115255 and auto-expand contents per subitem

JavaScript stuff moved from online_transform.xsl to help.js.
Simplified bookmarks markup.
Span elements with class "input" and length more than 3 characters
can be copied to clipboard by mouse click.
Bubli's feature request for auto-expanding contents per subitem
is also implemented.
Logic for adding headings to index list was reimplemented.

Change-Id: I87b6f189a040a73a1ab9dda1ec9cd790b06da202
Reviewed-on: https://gerrit.libreoffice.org/49421
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fd1e80bca4d0..b6bc8c1cfecc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fd1e80bca4d05e1dac45fb226dff318e87b81ead
+Subproject commit b6bc8c1cfecc55bebff8dc64fddb63e3edc109b5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/default.css help3xsl/get_bookmark.xsl help3xsl/help.js help3xsl/localized.xsl help3xsl/online_transform.xsl help3xsl/paginathing.js help3x

[Ilmari Lauhakangas]

 CustomTarget_html.mk  |2 
 help3xsl/default.css  |  109 ---
 help3xsl/get_bookmark.xsl |6 -
 help3xsl/help.js  |  144 --
 help3xsl/localized.xsl|8 ++
 help3xsl/online_transform.xsl |   87 ++---
 help3xsl/paginathing.js   |   22 +++---
 help3xsl/xhp2html.sh  |2 
 8 files changed, 243 insertions(+), 137 deletions(-)

New commits:
commit b6bc8c1cfecc55bebff8dc64fddb63e3edc109b5
Author: Ilmari Lauhakangas 
Date:   Thu Feb 8 13:18:55 2018 +0200

tdf#115255 and auto-expand contents per subitem

JavaScript stuff moved from online_transform.xsl to help.js.
Simplified bookmarks markup.
Span elements with class "input" and length more than 3 characters
can be copied to clipboard by mouse click.
Bubli's feature request for auto-expanding contents per subitem
is also implemented.
Logic for adding headings to index list was reimplemented.

Change-Id: I87b6f189a040a73a1ab9dda1ec9cd790b06da202
Reviewed-on: https://gerrit.libreoffice.org/49421
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index e39c8384e..ae56ebd07 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -114,7 +114,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.js :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,2)
$(call gb_Helper_abbreviate_dirs,\
( \
-   echo 'document.getElementsByClassName( "list" 
)[0].innerHTML='"'"'\' \
+   echo 'document.getElementsByClassName( "index" 
)[0].innerHTML='"'"'\' \
&& cat $(filter %.part,$^) \
&& echo "'" \
) > $@ \
diff --git a/help3xsl/default.css b/help3xsl/default.css
index debcf99aa..dc2a19972 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -40,9 +40,49 @@ h6,
 .listitem,
 .listitemintable,
 .tablecontent,
-.tablecontentintable {
+.input {
 font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", 
"Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif;
 }
+.input {
+transition-property: background-color;
+transition-duration: 150ms;
+}
+[data-tooltip]{
+  position:relative;
+}
+[data-tooltip]::before {
+content: "";
+position: absolute;
+top:-6px;
+left:50%;
+transform: translateX(-50%);
+border-width: 4px 6px 0 6px;
+border-style: solid;
+border-color: rgba(0,0,0,0.7) transparent transparent transparent;
+z-index: 100;
+opacity: 0;
+pointer-events: none;
+}
+[data-tooltip]::after {
+content: attr(data-tooltip);
+position: absolute;
+left:50%;
+top:-6px;
+transform: translateX(-50%)   translateY(-100%);
+background: rgba(0,0,0,0.7);
+text-align: center;
+color: #fff;
+padding:4px 2px;
+font-size: 12px;
+min-width: 80px;
+border-radius: 5px;
+opacity: 0;
+pointer-events: none;
+}
+[data-tooltip]:hover:before, [data-tooltip]:hover:after {
+opacity: 1;
+pointer-events: auto;
+}
 body {
 margin: 0;
 line-height: normal;
@@ -108,6 +148,9 @@ h1 {
 border-bottom: 3px solid #18A303;
 padding-bottom: 6px;
 }
+h1 a {
+text-decoration: none;
+}
 h2 {
 font-size: 1.5rem;
 }
@@ -282,41 +325,6 @@ footer {
 footer p {
 font-size: 1rem;
 }
-.breadcrumbs ul {
-list-style-type: none;
-margin: 0;
-padding: 0;
-color: #333;
-}
-.breadcrumbs li {
-display: inline-block;
-position: relative;
-padding-right: 24px;
-margin: 0;
-}
-.breadcrumbs li:after {
-content: '>';
-position: absolute;
-display: inline-block;
-right: 0;
-width: 24px;
-text-align: center;
-}
-.breadcrumbs li:last-child {
-font-weight: bold;
-}
-.breadcrumbs li:last-child:after {
-content: '';
-}
-.breadcrumbs a {
-text-decoration: none;
-display: inline-block;
-color: #333;
-white-space: nowrap;
-}
-.breadcrumbs a:hover {
-text-decoration: underline;
-}
 .gsc-control-cse {
 border-color: transparent !important;
 background-color: transparent !important;
@@ -356,14 +364,13 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 padding-left: 20px;
 margin: 20px 0 0 0;
 }
-#Index {
+#Index, .index {
 margin-top: 10px;
 }
-.list {
+.index {
 padding-left: 15px;
 }
-.list li {
-list-style: none;
+.index a {
 font-size: 16px;
 margin-bottom: 5px;
 }
@@ -375,63 +382,63 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 font-weight: bold;
 color: #18A303;
 }
-#writer::before {
+#WRITER::before {
 content: "WRITER";
 display: block;
 font-size: 22px;
 font-weight: bold;
 color: #18A303;
 }
-#calc::before {
+#CALC::before {
 content: "CALC";
 display: b

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sal/textenc

[Caolán McNamara]

 sal/textenc/tcvtkr6.tab |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b2dff7114d0be7ff1c9a9176c2f3bff1d52d84d1
Author: Caolán McNamara 
Date:   Thu Feb 8 17:05:11 2018 +

ofz#6112 wrong start off sets for korean KSC5601 table

Change-Id: If986352478f34f54015f1969c97c26e2ef05c06c
Reviewed-on: https://gerrit.libreoffice.org/49445
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index 6c83292b50c4..1685963408c3 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -401,13 +401,13 @@ static ImplUniToDBCSHighTab const 
aKSC5601DBCSHighTab[256] =
 { 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_6A },   /* 0x6A */
 { 0x04, 0xEC, aImplUniToDBCSTab_KSC5601_6B },   /* 0x6B */
 { 0x08, 0xF3, aImplUniToDBCSTab_KSC5601_6C },   /* 0x6C */
-{ 0x03, 0xFB, aImplUniToDBCSTab_KSC5601_6D },   /* 0x6D */
+{ 0x0B, 0xFB, aImplUniToDBCSTab_KSC5601_6D },   /* 0x6D */
 { 0x17, 0xFF, aImplUniToDBCSTab_KSC5601_6E },   /* 0x6E */
 { 0x01, 0xFE, aImplUniToDBCSTab_KSC5601_6F },   /* 0x6F */
 { 0x01, 0xFD, aImplUniToDBCSTab_KSC5601_70 },   /* 0x70 */
 { 0x04, 0xFF, aImplUniToDBCSTab_KSC5601_71 },   /* 0x71 */
 { 0x00, 0xFD, aImplUniToDBCSTab_KSC5601_72 },   /* 0x72 */
-{ 0x02, 0xFE, aImplUniToDBCSTab_KSC5601_73 },   /* 0x73 */
+{ 0x0A, 0xFE, aImplUniToDBCSTab_KSC5601_73 },   /* 0x73 */
 { 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_74 },   /* 0x74 */
 { 0x01, 0xFC, aImplUniToDBCSTab_KSC5601_75 },   /* 0x75 */
 { 0x00, 0xFE, aImplUniToDBCSTab_KSC5601_76 },   /* 0x76 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sal/textenc

[Caolán McNamara]

 sal/textenc/tcvtkr6.tab |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a704756d92d0dcb4822e7115a293192378151859
Author: Caolán McNamara 
Date:   Thu Feb 8 17:05:11 2018 +

ofz#6112 wrong start off sets for korean KSC5601 table

Change-Id: If986352478f34f54015f1969c97c26e2ef05c06c
Reviewed-on: https://gerrit.libreoffice.org/49446
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index fab6c6131a5f..776c15dbcf5e 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -401,13 +401,13 @@ static ImplUniToDBCSHighTab const 
aKSC5601DBCSHighTab[256] =
 { 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_6A },   /* 0x6A */
 { 0x04, 0xEC, aImplUniToDBCSTab_KSC5601_6B },   /* 0x6B */
 { 0x08, 0xF3, aImplUniToDBCSTab_KSC5601_6C },   /* 0x6C */
-{ 0x03, 0xFB, aImplUniToDBCSTab_KSC5601_6D },   /* 0x6D */
+{ 0x0B, 0xFB, aImplUniToDBCSTab_KSC5601_6D },   /* 0x6D */
 { 0x17, 0xFF, aImplUniToDBCSTab_KSC5601_6E },   /* 0x6E */
 { 0x01, 0xFE, aImplUniToDBCSTab_KSC5601_6F },   /* 0x6F */
 { 0x01, 0xFD, aImplUniToDBCSTab_KSC5601_70 },   /* 0x70 */
 { 0x04, 0xFF, aImplUniToDBCSTab_KSC5601_71 },   /* 0x71 */
 { 0x00, 0xFD, aImplUniToDBCSTab_KSC5601_72 },   /* 0x72 */
-{ 0x02, 0xFE, aImplUniToDBCSTab_KSC5601_73 },   /* 0x73 */
+{ 0x0A, 0xFE, aImplUniToDBCSTab_KSC5601_73 },   /* 0x73 */
 { 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_74 },   /* 0x74 */
 { 0x01, 0xFC, aImplUniToDBCSTab_KSC5601_75 },   /* 0x75 */
 { 0x00, 0xFE, aImplUniToDBCSTab_KSC5601_76 },   /* 0x76 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/WopiTestServer.hpp

[Pranav Kant]

 test/WopiTestServer.hpp |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 40a56e31ddc6a470d81a410f102e41938516f043
Author: Pranav Kant 
Date:   Fri Feb 9 01:14:18 2018 +0530

Unbreak some wopi tests; use fractional fractional iso8601

And we read the "LastModifiedTime" from the JSON payload in PutFile
response, not from the headers. Change that so that wsd now reads the
correct time.

Change-Id: Ic930ef4cfb2744367d04ba460fa1cbeb045b7356

diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index 5013d8af..6b2fbf92 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -111,7 +111,7 @@ protected:
 fileInfo->set("UserFriendlyName", "test");
 fileInfo->set("UserCanWrite", "true");
 fileInfo->set("PostMessageOrigin", "localhost");
-fileInfo->set("LastModifiedTime", 
Poco::DateTimeFormatter::format(_fileLastModifiedTime, 
Poco::DateTimeFormat::ISO8601_FORMAT));
+fileInfo->set("LastModifiedTime", 
Poco::DateTimeFormatter::format(Poco::DateTime(_fileLastModifiedTime), 
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT));
 fileInfo->set("EnableOwnerTermination", "true");
 
 std::ostringstream jsonStream;
@@ -189,6 +189,7 @@ protected:
 std::string wopiTimestamp = request.get("X-LOOL-WOPI-Timestamp");
 if (!wopiTimestamp.empty())
 {
+
 const std::string fileModifiedTime =
 
Poco::DateTimeFormatter::format(Poco::DateTime(_fileLastModifiedTime),
 
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT);
@@ -198,7 +199,7 @@ protected:
 oss << "HTTP/1.1 409 Conflict\r\n"
 << "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
 << "\r\n"
-<< "{\"LOOLStatusCode\":" << 
LOOLStatusCode::DocChanged << "}";
+<< "{\"LOOLStatusCode\":" << 
static_cast(LOOLStatusCode::DocChanged) << "}";
 
 socket->send(oss.str());
 socket->shutdown();
@@ -215,9 +216,9 @@ protected:
 
 std::ostringstream oss;
 oss << "HTTP/1.1 200 OK\r\n"
-<< "Last-Modified: " << 
Poco::DateTimeFormatter::format(_fileLastModifiedTime, 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
 << "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
-<< "\r\n";
+<< "\r\n"
+<< "{\"LastModifiedTime\": \"" << 
Poco::DateTimeFormatter::format(_fileLastModifiedTime, 
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT) << "\" }";
 
 socket->send(oss.str());
 socket->shutdown();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/inc/sft.hxx   |   16 
 vcl/source/fontsubset/sft.cxx |   79 --
 2 files changed, 95 deletions(-)

New commits:
commit e3caecb5a33288dd46a80b2ffcc47a2288305052
Author: Khaled Hosny 
Date:   Thu Feb 8 14:31:34 2018 +0200

Removed unused code for reading kern table

Change-Id: I66b17dbee0a04e61b99e23933a7fed4be30f3a93
Reviewed-on: https://gerrit.libreoffice.org/49426
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 696e267d547b..0edec67ac376 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -101,13 +101,6 @@ namespace vcl
 FWIDTH_ULTRA_EXPANDED = 9   /**< 200% of normal
 */
 };
 
-/** Type of the 'kern' table, stored in TrueTypeFont::kerntype */
-enum KernType {
-KT_NONE = 0,/**< no kern table 
 */
-KT_APPLE_NEW= 1,/**< new Apple kern table  
 */
-KT_MICROSOFT= 2 /**< Microsoft table   
 */
-};
-
 /** Composite glyph flags definition */
 enum CompositeFlags {
 ARG_1_AND_2_ARE_WORDS = 1,
@@ -189,12 +182,6 @@ namespace vcl
 #define TYPEFLAG_COPYRIGHT_MASK 0x00E
 #define TYPEFLAG_PS_OPENTYPE0x001
 
-/** Structure used by KernGlyphs()  */
-typedef struct {
-int x;/**< positive: right, negative: left 
   */
-int y;/**< positive: up, negative: down
   */
-} KernData;
-
 /** ControlPoint structure used by GetTTGlyphPoints() */
 typedef struct {
 sal_uInt32 flags; /**<   e000  
*/
@@ -485,8 +472,6 @@ namespace vcl
 sal_uInt32 (*mapper)(const sal_uInt8 *, sal_uInt32, sal_uInt32); /* 
character to glyphID translation function  */
 const sal_uInt8   **tables;/* array of 
pointers to raw subtables in SFNT file*/
 sal_uInt32  *tlens;/* array of table 
lengths */
-sal_uInt32  nkern; /* number of kern 
subtables   */
-const sal_uInt8** kerntables;  /* array of 
pointers to kern subtables*/
 };
 
 /* indexes into TrueTypeFont::tables[] and TrueTypeFont::tlens[] */
@@ -502,7 +487,6 @@ namespace vcl
 #define O_vmtx 9 /* 'vmtx' */
 #define O_OS2  10/* 'OS/2' */
 #define O_post 11/* 'post' */
-#define O_kern 12/* 'kern' */
 #define O_cvt  13/* 'cvt_' - only used in TT->TT generation */
 #define O_prep 14/* 'prep' - only used in TT->TT generation */
 #define O_fpgm 15/* 'fpgm' - only used in TT->TT generation */
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index c61c74b672dd..70b52fa1298d 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -119,7 +119,6 @@ static const sal_uInt32 T_otto = 0x4f54544f;/* 
'OTTO' */
 #define T_vmtx 0x766D7478
 #define T_OS2  0x4F532F32
 #define T_post 0x706F7374
-#define T_kern 0x6B65726E
 #define T_cvt  0x63767420
 #define T_prep 0x70726570
 #define T_fpgm 0x6670676D
@@ -1339,81 +1338,6 @@ static void FindCmap(TrueTypeFont *ttf)
 }
 }
 
-static void GetKern(TrueTypeFont *ttf)
-{
-const sal_uInt8* table = getTable(ttf, O_kern);
-int nTableSize = getTableSize(ttf, O_kern);
-const sal_uInt8 *ptr;
-
-if( !table )
-goto badtable;
-
-if (nTableSize >= 4 && GetUInt16(table, 0) == 0) { /* Traditional 
Microsoft style table with sal_uInt16 version and nTables fields */
-ttf->nkern = GetUInt16(table, 2);
-ptr = table + 4;
-
-const sal_uInt32 remaining_table_size = nTableSize-4;
-const sal_uInt32 nMinRecordSize = 2;
-const sal_uInt32 nMaxRecords = remaining_table_size / nMinRecordSize;
-if (ttf->nkern > nMaxRecords)
-{
-SAL_WARN("vcl.fonts", "Parsing error in " << 
OUString::createFromAscii(ttf->fname) <<
- ": " << nMaxRecords << " max possible entries, but " <<
- ttf->nkern << " claimed, truncating");
-ttf->nkern = nMaxRecords;
-}
-
-ttf->kerntables = static_cast(calloc(ttf->nkern, 
sizeof(sal_uInt8 *)));
-assert(ttf->kerntables != nullptr);
-
-for( unsigned i = 0; i < ttf->nkern; ++i) {
-ttf->kerntables[i] = ptr;
-ptr += GetUInt16(ptr, 2);
-/* sanity check */
-if( ptr > ttf->ptr+ttf->fsize )
-{
-free( ttf->kerntables );
-goto badtable;
-}
-}
-return;
-}
-
-if (nTableSize >= 8 && GetUInt32(t

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

[Khaled Hosny]

 vcl/source/gdi/embeddedfontshelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6f39e81ef0615323833270fa434451801e3b21d
Author: Khaled Hosny 
Date:   Thu Feb 8 14:40:35 2018 +0200

Use a more direct link to the relevant part

Change-Id: I0659643041a4ec79d0753ed5f3711e57f51688d8
Reviewed-on: https://gerrit.libreoffice.org/49425
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index 405b13f2e726..8ed0295c3736 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -194,7 +194,7 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* 
data, long size, Font
 TTGlobalFontInfo info;
 GetTTGlobalFontInfo( font, &info );
 CloseTTFont( font );
-// http://www.microsoft.com/typography/tt/ttf_spec/ttch02.doc
+// https://www.microsoft.com/typography/otspec/os2.htm#fst
 int copyright = info.typeFlags & TYPEFLAG_COPYRIGHT_MASK;
 switch( rights )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/inc/sft.hxx|6 +-
 vcl/source/fontsubset/sft.cxx  |2 --
 vcl/source/gdi/embeddedfontshelper.cxx |2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 59e1fced2b4115a882ffc1ac31a66f8d8e8793ff
Author: Khaled Hosny 
Date:   Thu Feb 8 14:41:51 2018 +0200

Remove unused macros

TYPEFLAG_PS_OPENTYPE is set but never used, and dropping it means we no
longer need TYPEFLAG_COPYRIGHT_MASK either.

Change-Id: Iefb45b32f53a806f2477ce54b7062b5846a6a806
Reviewed-on: https://gerrit.libreoffice.org/49427
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 0edec67ac376..e184ff164291 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -174,14 +174,10 @@ namespace vcl
 int   winDescent; /**< descender metric for Windows
*/
 bool  symbolEncoded;  /**< true: MS symbol encoded */
 sal_uInt8  panose[10];/**< PANOSE classification number
*/
-sal_uInt32 typeFlags; /**< type flags (copyright bits + 
PS-OpenType flag)   */
+sal_uInt32 typeFlags; /**< type flags (copyright bits) 
*/
 sal_uInt16 fsSelection;   /**< OS/2 fsSelection */
 } TTGlobalFontInfo;
 
-#define TYPEFLAG_INVALID0x800
-#define TYPEFLAG_COPYRIGHT_MASK 0x00E
-#define TYPEFLAG_PS_OPENTYPE0x001
-
 /** ControlPoint structure used by GetTTGlyphPoints() */
 typedef struct {
 sal_uInt32 flags; /**<   e000  
*/
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 70b52fa1298d..cae835510712 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2392,8 +2392,6 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, 
TTGlobalFontInfo *info)
 }
 memcpy(info->panose, table + 32, 10);
 info->typeFlags = GetUInt16( table, 8 );
-if( getTable(ttf, O_CFF) )
-info->typeFlags |= TYPEFLAG_PS_OPENTYPE;
 }
 
 table = getTable(ttf, O_post);
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx 
b/vcl/source/gdi/embeddedfontshelper.cxx
index 8ed0295c3736..ca744e70d850 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -195,7 +195,7 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* 
data, long size, Font
 GetTTGlobalFontInfo( font, &info );
 CloseTTFont( font );
 // https://www.microsoft.com/typography/otspec/os2.htm#fst
-int copyright = info.typeFlags & TYPEFLAG_COPYRIGHT_MASK;
+int copyright = info.typeFlags;
 switch( rights )
 {
 case FontRights::ViewingAllowed:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 xmloff/source/text/txtflde.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e102432173c257cbbb7e368d784a54a1667bd622
Author: László Németh 
Date:   Thu Feb 8 15:35:44 2018 +0100

tdf#115319 use loext namespace for reference-language

attribute of alternative reference fields with Hungarian articles

Change-Id: I19578bc0d5cb5633cf2619e9aea81da946a13f3e
Reviewed-on: https://gerrit.libreoffice.org/49437
Tested-by: Jenkins 
Reviewed-by: László Németh 

diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index b39772a82e46..26c261d24e65 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1607,7 +1607,7 @@ void XMLTextFieldExport::ExportFieldHelper(
 {
 // export text:reference-language attribute, if not empty
 ProcessString(XML_REFERENCE_LANGUAGE,
-GetStringProperty(sPropertyReferenceFieldLanguage, 
rPropSet), true);
+GetStringProperty(sPropertyReferenceFieldLanguage, 
rPropSet), true, XML_NAMESPACE_LO_EXT);
 }
 ExportElement(
 MapReferenceSource(
@@ -1629,7 +1629,7 @@ void XMLTextFieldExport::ExportFieldHelper(
 {
 // export text:reference-language attribute, if not empty
 ProcessString(XML_REFERENCE_LANGUAGE,
-  GetStringProperty(sPropertyReferenceFieldLanguage, 
rPropSet), true);
+  GetStringProperty(sPropertyReferenceFieldLanguage, 
rPropSet), true, XML_NAMESPACE_LO_EXT);
 }
 ExportElement(
 MapReferenceSource(GetInt16Property(
@@ -1654,7 +1654,7 @@ void XMLTextFieldExport::ExportFieldHelper(
 {
 // export text:reference-language attribute, if not empty
 ProcessString(XML_REFERENCE_LANGUAGE,
-  GetStringProperty(sPropertyReferenceFieldLanguage, 
rPropSet), true);
+  GetStringProperty(sPropertyReferenceFieldLanguage, 
rPropSet), true, XML_NAMESPACE_LO_EXT);
 }
 ExportElement(
 MapReferenceSource(GetInt16Property(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 cui/source/dialogs/colorpicker.cxx |  135 -
 1 file changed, 59 insertions(+), 76 deletions(-)

New commits:
commit 7116b9cc2f3ee28b540d0c14183b9bd17968
Author: Noel Grandin 
Date:   Thu Feb 8 17:03:10 2018 +0200

replace Bitmap usage with VirtualDevice in ColorSliderControl

So we can move more Bitmap*Access stuff inside vcl/.

Change-Id: I3520f61483f84ac30ffd9059ed4112c9c074f195
Reviewed-on: https://gerrit.libreoffice.org/49405
Reviewed-by: Michael Meeks 
Tested-by: Noel Grandin 

diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs/colorpicker.cxx
index d6e0269b39b4..e049d7283b44 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -625,7 +626,7 @@ private:
 Link maModifyHdl;
 Color maColor;
 ColorMode meMode;
-Bitmap* mpBitmap;
+VclPtr mxBitmap;
 sal_Int16 mnLevel;
 double mdValue;
 };
@@ -633,7 +634,6 @@ private:
 ColorSliderControl::ColorSliderControl( vcl::Window* pParent, WinBits nStyle )
 : Control( pParent, nStyle )
 , meMode( DefaultMode )
-, mpBitmap( nullptr )
 , mnLevel( 0 )
 , mdValue( -1.0 )
 {
@@ -647,8 +647,7 @@ ColorSliderControl::~ColorSliderControl()
 
 void ColorSliderControl::dispose()
 {
-delete mpBitmap;
-mpBitmap = nullptr;
+mxBitmap.disposeAndClear();
 Control::dispose();
 }
 
@@ -658,84 +657,73 @@ void ColorSliderControl::UpdateBitmap()
 {
 Size aSize(1, GetOutputSizePixel().Height());
 
-if (mpBitmap && mpBitmap->GetSizePixel() != aSize)
-{
-delete mpBitmap;
-mpBitmap = nullptr;
-}
-
-if (!mpBitmap)
-mpBitmap = new Bitmap(aSize, 24);
+if (mxBitmap && mxBitmap->GetOutputSizePixel() == aSize)
+return;
 
-BitmapWriteAccess* pWriteAccess = mpBitmap->AcquireWriteAccess();
+mxBitmap.disposeAndClear();
+mxBitmap->SetOutputSizePixel(aSize);
 
-if (pWriteAccess)
-{
-const long nY = aSize.Height() - 1;
+const long nY = aSize.Height() - 1;
 
-BitmapColor aBitmapColor(maColor);
+Color aBitmapColor(maColor);
 
-sal_uInt16 nHue, nSat, nBri;
-maColor.RGBtoHSB(nHue, nSat, nBri);
+sal_uInt16 nHue, nSat, nBri;
+maColor.RGBtoHSB(nHue, nSat, nBri);
 
-// this has been unlooped for performance reason, please do not merge 
back!
+// this has been unlooped for performance reason, please do not merge back!
 
-switch (meMode)
+switch (meMode)
+{
+case HUE:
+nSat = 100;
+nBri = 100;
+for (long y = 0; y <= nY; y++)
 {
-case HUE:
-nSat = 100;
-nBri = 100;
-for (long y = 0; y <= nY; y++)
-{
-nHue = static_cast((359 * y) / nY);
-aBitmapColor = BitmapColor(Color(Color::HSBtoRGB(nHue, nSat, 
nBri)));
-pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
-}
-break;
-
-case SATURATION:
-nBri = std::max(sal_uInt16(32), nBri);
-for (long y = 0; y <= nY; y++)
-{
-nSat = static_cast((100 * y) / nY);
-pWriteAccess->SetPixel(nY - y, 0, 
BitmapColor(Color(Color::HSBtoRGB(nHue, nSat, nBri;
-}
-break;
+nHue = static_cast((359 * y) / nY);
+mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, 
nSat, nBri)));
+}
+break;
 
-case BRIGHTNESS:
-for (long y = 0; y <= nY; y++)
-{
-nBri = static_cast((100 * y) / nY);
-pWriteAccess->SetPixel(nY - y, 0, 
BitmapColor(Color(Color::HSBtoRGB(nHue, nSat, nBri;
-}
-break;
+case SATURATION:
+nBri = std::max(sal_uInt16(32), nBri);
+for (long y = 0; y <= nY; y++)
+{
+nSat = static_cast((100 * y) / nY);
+mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, 
nSat, nBri)));
+}
+break;
 
-case RED:
-for (long y = 0; y <= nY; y++)
-{
-aBitmapColor.SetRed(sal_uInt8((long(255) * y) / nY));
-pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
-}
-break;
+case BRIGHTNESS:
+for (long y = 0; y <= nY; y++)
+{
+nBri = static_cast((100 * y) / nY);
+mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, 
nSat, nBri)));
+}
+break;
 
-case GREEN:
-for (long y = 0; y <= nY; y++)
-{
-aBitmapColor.SetGreen(sal_uInt8((long(255) * y) / nY));
-pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
-}
-break;
+case RED:
+for (long y = 0; y <= nY; y++)
+

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |   24 ++--
 lotuswordpro/source/filter/lwpdoc.hxx |1 +
 2 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit faef7e6f89da31040c3a1f51cfa2356e8711935f
Author: Caolán McNamara 
Date:   Thu Feb 8 11:34:15 2018 +

infinite regress

Change-Id: I7f716d2273115284769d580165fbfa21c1db541b
Reviewed-on: https://gerrit.libreoffice.org/49422
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 27db9a01978d..7a0165191daf 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -74,6 +74,7 @@ LwpDocument::LwpDocument(LwpObjectHeader const & objHdr, 
LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
 , m_pOwnedFoundry(nullptr)
 , m_bGettingFirstDivisionWithContentsThatIsNotOLE(false)
+, m_bGettingPreviousDivisionWithContents(false)
 , m_nFlags(0)
 , m_nPersistentFlags(0)
 , m_pLnOpts(nullptr)
@@ -526,17 +527,20 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 /**
  * @descrGet previous division which has contents, copy from lwp source 
code
  */
- LwpDocument* LwpDocument::GetPreviousDivisionWithContents()
+LwpDocument* LwpDocument::GetPreviousDivisionWithContents()
 {
-if(GetPreviousDivision())
-{
-LwpDocument* pDoc = 
GetPreviousDivision()->GetLastDivisionWithContents();
-if (pDoc)
-return pDoc;
-}
-if(GetParentDivision())
-return GetParentDivision()->GetPreviousDivisionWithContents();
-return nullptr;
+if (m_bGettingPreviousDivisionWithContents)
+throw std::runtime_error("recursion in page divisions");
+m_bGettingPreviousDivisionWithContents = true;
+LwpDocument* pRet = nullptr;
+
+if (GetPreviousDivision())
+pRet = GetPreviousDivision()->GetLastDivisionWithContents();
+if (!pRet && GetParentDivision())
+pRet = GetParentDivision()->GetPreviousDivisionWithContents();
+
+m_bGettingPreviousDivisionWithContents = false;
+return pRet;
 }
  /**
  * @descrGet last division which has contents, copy from lwp source code
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index 03b7c143afc6..4f9b8f9ac56f 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -85,6 +85,7 @@ public:
 private:
 LwpFoundry* m_pOwnedFoundry;
 bool m_bGettingFirstDivisionWithContentsThatIsNotOLE;
+bool m_bGettingPreviousDivisionWithContents;
 
 //Data members in file format
 LwpObjectID m_DocSockID;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/textenc

[Caolán McNamara]

 sal/textenc/tcvtkr6.tab |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 17adc2f8ebe48a3b7dd394269b09240967fc5995
Author: Caolán McNamara 
Date:   Thu Feb 8 17:05:11 2018 +

ofz#6112 wrong start off sets for korean KSC5601 table

Change-Id: If986352478f34f54015f1969c97c26e2ef05c06c
Reviewed-on: https://gerrit.libreoffice.org/49444
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index 6c83292b50c4..1685963408c3 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -401,13 +401,13 @@ static ImplUniToDBCSHighTab const 
aKSC5601DBCSHighTab[256] =
 { 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_6A },   /* 0x6A */
 { 0x04, 0xEC, aImplUniToDBCSTab_KSC5601_6B },   /* 0x6B */
 { 0x08, 0xF3, aImplUniToDBCSTab_KSC5601_6C },   /* 0x6C */
-{ 0x03, 0xFB, aImplUniToDBCSTab_KSC5601_6D },   /* 0x6D */
+{ 0x0B, 0xFB, aImplUniToDBCSTab_KSC5601_6D },   /* 0x6D */
 { 0x17, 0xFF, aImplUniToDBCSTab_KSC5601_6E },   /* 0x6E */
 { 0x01, 0xFE, aImplUniToDBCSTab_KSC5601_6F },   /* 0x6F */
 { 0x01, 0xFD, aImplUniToDBCSTab_KSC5601_70 },   /* 0x70 */
 { 0x04, 0xFF, aImplUniToDBCSTab_KSC5601_71 },   /* 0x71 */
 { 0x00, 0xFD, aImplUniToDBCSTab_KSC5601_72 },   /* 0x72 */
-{ 0x02, 0xFE, aImplUniToDBCSTab_KSC5601_73 },   /* 0x73 */
+{ 0x0A, 0xFE, aImplUniToDBCSTab_KSC5601_73 },   /* 0x73 */
 { 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_74 },   /* 0x74 */
 { 0x01, 0xFC, aImplUniToDBCSTab_KSC5601_75 },   /* 0x75 */
 { 0x00, 0xFE, aImplUniToDBCSTab_KSC5601_76 },   /* 0x76 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Gabriele Ponzo]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit badbdb41acf69e3eba4ca7253ec0218dc1e63d0a
Author: Gabriele Ponzo 
Date:   Tue Feb 6 11:12:57 2018 +0100

tdf#108224: rename insert author menu entry

The Insert Author menu entry does not insert the author field but the
"DocInformation:Created" field.

Change-Id: I6dadbf17d5cd3cd2c7b652c1b1c28996c1148a8c
Reviewed-on: https://gerrit.libreoffice.org/49281
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1f4fe350ce11..d1f08c272834 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -828,7 +828,7 @@
   
   
 
-  ~Author
+  First ~Author
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Xisco Fauli]

 vcl/source/outdev/text.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 392206f0449f9baa987d28cf509eccfa33700330
Author: Xisco Fauli 
Date:   Mon Feb 5 16:51:59 2018 +0100

tdf#112990: Hack-around: Do not crash on mac with opengl enabled

Change-Id: Id8d1ffe593fa42b7e37e26e8d66ffad87d6685c1
Reviewed-on: https://gerrit.libreoffice.org/49251
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 
(cherry picked from commit c83d2ac99dc3da4ef85b193543a93e02e3858844)
Reviewed-on: https://gerrit.libreoffice.org/49442
Reviewed-by: Markus Mohrhard 

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 1d93f7730aae..5694a8165b58 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -861,6 +862,14 @@ void OutputDevice::DrawText( const Point& rStartPt, const 
OUString& rStr,
 if(mpFontInstance->mpConversion)
 pLayoutCache = nullptr;
 
+#ifdef MACOSX
+// FIXME: tdf#112990
+// Cache text layout crashes on mac with OpenGL enabled
+// Force it to not use the cache
+if(OpenGLHelper::isVCLOpenGLEnabled())
+pLayoutCache = nullptr;
+#endif
+
 // without cache
 if(!pLayoutCache)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 pyuno/source/loader/pyuno_loader.cxx |   25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 42e2c4af310deb7660b07c6307459c9d2a42bb8b
Author: Michael Stahl 
Date:   Thu Feb 1 13:52:00 2018 +0100

tdf#114815 pyuno: avoid 2 threads initing python in parallel

According to the crash reports, it's possible for the grammar checking
thread to call GetGrammarChecker, instantiating lightproof, at the same
time as the main thread instantiates LngSvcMgr, which also instantiates
(some?) (all?) grammar checkers.

Ensure that pyuno_loader::CreateInstance() initialises Python only
once with a C++11 thread safe static.

For the backport, use rtl::Static instead, because on the 5.4 branch
MSVC does not have HAVE_THREADSAFE_STATICS enabled.

Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf
(cherry picked from commit 5357ca82846ea7147ad61e9340f25647a5934eb0)
Reviewed-on: https://gerrit.libreoffice.org/49116
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 362b0c521c1c58dc8ea5e87ecbb482d5bdc073f4)
Reviewed-on: https://gerrit.libreoffice.org/49298
Reviewed-by: Michael Meeks 
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index adbf6c88e098..0408af0f4043 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -176,11 +177,10 @@ static void prependPythonPath( const OUString & 
pythonPathBootstrap )
 osl_setEnvironment(envVar.pData, envValue.pData);
 }
 
-Reference< XInterface > CreateInstance( const Reference< XComponentContext > & 
ctx )
+struct PythonInit
 {
-Reference< XInterface > ret;
-
-if( ! Py_IsInitialized() )
+PythonInit() {
+if (! Py_IsInitialized()) // may be inited by getComponentContext() already
 {
 OUString pythonPath;
 OUString pythonHome;
@@ -236,9 +236,26 @@ Reference< XInterface > CreateInstance( const Reference< 
XComponentContext > & c
 // PyThreadAttach below.
 PyThreadState_Delete(tstate);
 }
+}
+};
+
+namespace {
+struct thePythonInit : public rtl::Static {};
+}
+
+Reference CreateInstance(const Reference & ctx)
+{
+// tdf#114815 thread-safe static to init python only once
+thePythonInit::get();
+
+Reference< XInterface > ret;
 
 PyThreadAttach attach( PyInterpreterState_Head() );
 {
+// note: this can't race against getComponentContext() because
+// either (in soffice.bin) CreateInstance() must be called before
+// getComponentContext() can be called, or (in python.bin) the other
+// way around
 if( ! Runtime::isInitialized() )
 {
 Runtime::initialize( ctx );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sfx2/source/doc/objstor.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit df30a561499305a1da6c5fb578315feefe873881
Author: Justin Luth 
Date:   Fri Feb 2 14:53:40 2018 +0300

init known ExtraLanguages before document loads

Extensions can add RegisterOnTheFly languages for spell checkers.
A late initialization of the LanguageTable resulted in the inability
to recognize the available spell checker.

So, if a .doc file had an onTheFly language inside, and it was
the first document that LibreOffice opened, then the spell checking
extension was disabled for any other document opened while LibreOffice
was living, including docx and odt files.  (Starting with a blank
document, or a .docx or .odt file seems to initialize OK - and
then subsequent .doc files are also ok in those sessions.)

Ensuring that the static LanguageTable is intialized early in the process
avoids this headache.

In my case, .doc was failing with:
LanguageTag::registerOnTheFly: not cross-inserted
0x7e0 for 'kbo' have 'en-US'

but with this patch now matches .odt/docx with:

LanguageTag::registerOnTheFly: cross-inserted
0x7e0 for 'kbo' [have 'kbo']

This fixes .ods .odg, odp,
   .xls .xlsx .ppt, pptx
   .doc and likely many others

Change-Id: Ie6dcbfd73e063eef4573016c3c62d29cf8ad43ca
Reviewed-on: https://gerrit.libreoffice.org/49142
Reviewed-by: Martin Hosken 
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 427c0804cd4aecde1cadb7cb3c4f3487991bd573)
Reviewed-on: https://gerrit.libreoffice.org/49171
Reviewed-by: Justin Luth 
(cherry picked from commit d51c01846afb9bea5a39fd48fbb30b9fd02c2870)
Reviewed-on: https://gerrit.libreoffice.org/49449
Reviewed-by: Markus Mohrhard 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 759cc16b987c..b295345ca46e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -73,6 +73,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -655,6 +656,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 pImpl->nLoadedFlags = SfxLoadedFlags::NONE;
 pImpl->bModelInitialized = false;
 
+// initialize static language table so language-related extensions are 
learned before the document loads
+(void)SvtLanguageTable::GetLanguageEntryCount();
+
 //TODO/LATER: make a clear strategy how to handle "UsesStorage" etc.
 bool bOwnStorageFormat = IsOwnStorageFormat( *pMedium );
 bool bHasStorage = IsPackageStorageFormat_Impl( *pMedium );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sfx2/source/control/bindings.cxx |1 +
 sfx2/source/control/statcach.cxx |7 ++-
 sfx2/source/inc/statcach.hxx |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit d09bdaaa660c40df241e6e1c0b8a3e905db85420
Author: Maxim Monastirsky 
Date:   Thu Feb 8 13:04:27 2018 +0200

tdf#115430 BindDispatch_Impl needs a disposal method

The dtor will never be called otherwise, because the
dispatcher is holding a reference to us, so
removeStatusListener is needed first.

Regression of a5dbe5a8a9e98f2d79f2c535182fc557b561ed0f
("use rtl::Reference in svl,sfx2")

Change-Id: I52da6152f0ddb0030d7354f7201e969d5a1f11cf
Reviewed-on: https://gerrit.libreoffice.org/49423
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 87197d045ea5..ea900d2f6145 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1604,6 +1604,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, 
std::unique_ptrremoveStatusListener( xBind.get(), aURL );
+xBind->Release();
 xBind.clear();
 if ( bDeleteCache )
 DELETEZ( pCache );
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 1ec54f2fd1c3..0d6d5b6b08fa 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -145,13 +145,14 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const 
css::frame::FeatureStateE
 }
 }
 
-BindDispatch_Impl::~BindDispatch_Impl()
+void BindDispatch_Impl::Release()
 {
 if ( xDisp.is() )
 {
 xDisp->removeStatusListener( 
static_cast(this), aURL );
 xDisp.clear();
 }
+pCache = nullptr;
 }
 
 
@@ -197,6 +198,8 @@ SfxStateCache::~SfxStateCache()
 DBG_ASSERT( pController == nullptr && pInternalController == nullptr, 
"there are still Controllers registered" );
 if ( !IsInvalidItem(pLastItem) )
 delete pLastItem;
+if ( mxDispatch.is() )
+mxDispatch->Release();
 }
 
 
@@ -208,6 +211,8 @@ void SfxStateCache::Invalidate( bool bWithMsg )
 {
 bSlotDirty = true;
 aSlotServ.SetSlot( nullptr );
+if ( mxDispatch.is() )
+mxDispatch->Release();
 mxDispatch.clear();
 }
 }
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index ef09b5dd51c4..58ddc1766889 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -46,13 +46,13 @@ public:
 const css::uno::Reference< 
css::frame::XDispatch > & rDisp,
 const css::util::URL& rURL,
 SfxStateCache* pStateCache, const SfxSlot* 
pSlot );
-~BindDispatch_Impl() override;
 
 virtual void SAL_CALL   statusChanged( const 
css::frame::FeatureStateEvent& Event ) override;
 virtual void SAL_CALL   disposing( const css::lang::EventObject& Source ) 
override;
 
 const css::frame::FeatureStateEvent& GetStatus() const { return aStatus;}
 sal_Int16   Dispatch( const css::uno::Sequence < 
css::beans::PropertyValue >& aProps, bool bForceSynchron );
+voidRelease();
 };
 
 class SfxStateCache
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 vcl/unx/gtk/gtksalframe.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9c8f2511e3b07427f1d13ac198adf46f073c9685
Author: Maxim Monastirsky 
Date:   Thu Feb 8 23:37:18 2018 +0200

Sync the fix with Muffin upstream changes

See:

https://github.com/linuxmint/muffin/commit/f3fce7898ba8aa82c4c82a50af2bb44c0ff79ddf

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

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 81e8eecb9a2d..c376bb03eb18 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1051,8 +1051,7 @@ void GtkSalFrame::InitCommon()
 
 static void lcl_set_accept_focus( GtkWindow* pWindow )
 {
-if 
(GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWindowManagerName().startsWith("Metacity")
 ||
-
GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWindowManagerName().endsWith("Muffin)")
 )
+if 
(GetGtkSalData()->GetGtkDisplay()->getWMAdaptor()->getWindowManagerName().startsWith("Metacity"))
 {
/*  Metacity considers a toolbar type window as should not
 *  have focus on mapping, yet it believes it should unfocus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[heiko tietze]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 
+++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7f8936e7db018664d6074caa9bd6a82972cb4923
Author: heiko tietze 
Date:   Thu Feb 8 10:28:45 2018 +0100

tdf#115470 - Name of the "Cycle Case" is too long

Long text moved into a tooltip

Change-Id: I981970c6e1fa16397264ea852fcd9bc480a41980
Reviewed-on: https://gerrit.libreoffice.org/49413
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 09e73efd9241..b6bb6b9108eb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2638,11 +2638,11 @@
   
   
 
-  Cycle Case (Title Case, UPPERCASE, 
lowercase)
-
-
   Cycle Case
 
+
+  Cycle Case (Title Case, UPPERCASE, 
lowercase)
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/inc/jumpmatrix.hxx  |4 +++-
 sc/source/core/tool/interpr1.cxx   |   16 +++-
 sc/source/core/tool/interpr4.cxx   |2 +-
 sc/source/core/tool/jumpmatrix.cxx |3 ++-
 4 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit e0a94ded5d1635fa2a2d9e222bfcfa0a2289a01f
Author: Eike Rathke 
Date:   Thu Feb 8 22:48:56 2018 +0100

Resolves: tdf#115493 use matrix as result of jump command, tdf#58874 related


{=SUM(IF(EXACT(OFFSET(A7,0,0):OFFSET(A7,2,0),A$1),OFFSET(A7,0,1):OFFSET(A7,2,1),0))}
shall be the same as
{=SUM(IF(EXACT(A7:A9,A$1),B7:B9,0))}

Change-Id: Id503ef41140d1e9c4aeabbec08d1199dd6dd8593

diff --git a/sc/source/core/inc/jumpmatrix.hxx 
b/sc/source/core/inc/jumpmatrix.hxx
index cbc1a1d0671c..084f5a91f4bb 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -67,6 +67,7 @@ class ScJumpMatrix
 SCSIZE  nCurRow;
 SCSIZE  nResMatCols;
 SCSIZE  nResMatRows;
+OpCode  meOp;
 boolbStarted;
 
 // Buffer result ranges to be able to set a range of identically typed
@@ -96,7 +97,7 @@ class ScJumpMatrix
 ScJumpMatrix& operator=( const ScJumpMatrix& ) = delete;
 
 public:
-ScJumpMatrix( SCSIZE nColsP, SCSIZE nRowsP );
+ScJumpMatrix( OpCode eOp, SCSIZE nColsP, SCSIZE nRowsP );
 ~ScJumpMatrix();
 void GetDimensions( SCSIZE& rCols, SCSIZE& rRows ) const;
 void SetJump( SCSIZE nCol, SCSIZE nRow, double fBool, short nStart, short 
nNext );
@@ -111,6 +112,7 @@ public:
 void GetResMatDimensions( SCSIZE& rCols, SCSIZE& rRows );
 void SetNewResMat( SCSIZE nNewCols, SCSIZE nNewRows );
 ScRefList& GetRefList();
+OpCode GetOpCode() const { return meOp; }
 
 void PutResultDouble( double fVal, SCSIZE nC, SCSIZE nR );
 void PutResultString( const svl::SharedString& rStr, SCSIZE nC, SCSIZE nR 
);
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 70f2ae8c1805..89823f7eb352 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -110,7 +110,8 @@ void ScInterpreter::ScIfJump()
 xNew = (*aMapIter).second;
 else
 {
-std::shared_ptr pJumpMat( 
std::make_shared( nCols, nRows ) );
+std::shared_ptr pJumpMat( 
std::make_shared(
+pCur->GetOpCode(), nCols, nRows));
 for ( SCSIZE nC=0; nC < nCols; ++nC )
 {
 for ( SCSIZE nR=0; nR < nRows; ++nR )
@@ -339,7 +340,8 @@ void ScInterpreter::ScIfError( bool bNAonly )
 else
 {
 const ScMatrix* pMatPtr = pMat.get();
-std::shared_ptr pJumpMat( 
std::make_shared( nCols, nRows ) );
+std::shared_ptr pJumpMat( 
std::make_shared(
+pCur->GetOpCode(), nCols, nRows));
 // Init all jumps to no error to save single calls. Error
 // is the exceptional condition.
 const double fFlagResult = CreateDoubleError( 
FormulaError::JumpMatHasResult);
@@ -430,7 +432,8 @@ void ScInterpreter::ScChooseJump()
 xNew = (*aMapIter).second;
 else
 {
-std::shared_ptr pJumpMat( 
std::make_shared( nCols, nRows ) );
+std::shared_ptr pJumpMat( 
std::make_shared(
+pCur->GetOpCode(), nCols, nRows));
 for ( SCSIZE nC=0; nC < nCols; ++nC )
 {
 for ( SCSIZE nR=0; nR < nRows; ++nR )
@@ -799,8 +802,11 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
 {   // We're done with it, throw away jump matrix, keep result.
 // For an intermediate result of Reference use the array of references,
 // else (also for a final result of Reference) use the matrix.
-formula::ParamClass eReturnType = 
ScParameterClassification::GetParameterType( pCur, SAL_MAX_UINT16);
-if (eReturnType == ParamClass::Reference && aCode.PeekNextOperator())
+// Treat the result of a jump command as final and use the matrix (see
+// tdf#115493 for why).
+if (!FormulaCompiler::IsOpCodeJumpCommand( pJumpMatrix->GetOpCode()) &&
+ScParameterClassification::GetParameterType( pCur, 
SAL_MAX_UINT16) == ParamClass::Reference &&
+aCode.PeekNextOperator())
 {
 FormulaTokenRef xRef = new ScRefListToken(true);
 *(xRef->GetRefList()) = pJumpMatrix->GetRefList();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f08c09ce69eb..942911d29ff2 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1574,7 +1574,7 @@ bool ScInterpreter::ConvertMa

[Libreoffice-commits] core.git: basic/source vbahelper/source

[Tor Lillqvist]

 basic/source/classes/sbxmod.cxx   |5 -
 vbahelper/source/vbahelper/vbaapplicationbase.cxx |8 ++--
 vbahelper/source/vbahelper/vbahelper.cxx  |8 +++-
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 73256b918119e378c762f6a3d79d04f311a075cc
Author: Tor Lillqvist 
Date:   Thu Feb 8 19:31:20 2018 +0200

Decrease fragility in odd use cases with no current document

Change-Id: I9966166561d4c6e577f3f7e8e04572f97a0b295e
Reviewed-on: https://gerrit.libreoffice.org/49450
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f0ee0f7f7f56..97fe73dbface 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -409,7 +409,10 @@ uno::Reference< vba::XVBACompatibility > 
getVBACompatibility( const uno::Referen
 
 bool getDefaultVBAMode( StarBASIC* pb )
 {
-uno::Reference< vba::XVBACompatibility > xVBACompat = getVBACompatibility( 
getDocumentModel( pb ) );
+uno::Reference< frame::XModel > xModel( getDocumentModel( pb ) );
+if (!xModel.is())
+return false;
+uno::Reference< vba::XVBACompatibility > xVBACompat = getVBACompatibility( 
xModel );
 return xVBACompat.is() && xVBACompat->getVBACompatibilityMode();
 }
 
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx 
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 753a389e5bb6..25e91647694b 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -184,7 +184,9 @@ VbaApplicationBase::~VbaApplicationBase()
 sal_Bool SAL_CALL
 VbaApplicationBase::getScreenUpdating()
 {
-uno::Reference< frame::XModel > xModel( getCurrentDocument(), 
uno::UNO_QUERY_THROW );
+uno::Reference< frame::XModel > xModel = getCurrentDocument();
+if (!xModel.is())
+return false;
 return !xModel->hasControllersLocked();
 }
 
@@ -238,7 +240,9 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool 
bDisplayStatusBar)
 
 sal_Bool SAL_CALL VbaApplicationBase::getInteractive()
 {
-uno::Reference< frame::XModel > xModel( getCurrentDocument(), 
uno::UNO_QUERY_THROW );
+uno::Reference< frame::XModel > xModel = getCurrentDocument();
+if (!xModel.is())
+return false;
 uno::Reference< frame::XFrame > xFrame( 
xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
 uno::Reference< awt::XWindow2 > xWindow( xFrame->getContainerWindow(), 
uno::UNO_QUERY_THROW );
 
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx 
b/vbahelper/source/vbahelper/vbahelper.cxx
index 2471add85ce5..b7432c59935c 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -277,7 +277,13 @@ getCurrentWordDoc( const uno::Reference< 
uno::XComponentContext >& xContext )
 }
 catch (const uno::Exception&)
 {
-xModel = getThisWordDoc( xContext );
+try
+{
+xModel = getThisWordDoc( xContext );
+}
+catch (const uno::Exception&)
+{
+}
 }
 return xModel;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/inc/sft.hxx   |   18 
 vcl/source/fontsubset/sft.cxx |   85 --
 2 files changed, 103 deletions(-)

New commits:
commit f0416352ba0290087ad20f4e3a84c34fe7212a21
Author: Khaled Hosny 
Date:   Thu Feb 8 14:31:34 2018 +0200

Removed unused code for reading kern table

Reviewed-on: https://gerrit.libreoffice.org/49426
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit e3caecb5a33288dd46a80b2ffcc47a2288305052)

Change-Id: I66b17dbee0a04e61b99e23933a7fed4be30f3a93
Reviewed-on: https://gerrit.libreoffice.org/49452
Reviewed-by: Khaled Hosny 
Tested-by: Jenkins 

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 17efc970fa9b..bca8054b6875 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -102,13 +102,6 @@ namespace vcl
 FWIDTH_ULTRA_EXPANDED = 9   /**< 200% of normal
 */
 };
 
-/** Type of the 'kern' table, stored in TrueTypeFont::kerntype */
-enum KernType {
-KT_NONE = 0,/**< no kern table 
 */
-KT_APPLE_NEW= 1,/**< new Apple kern table  
 */
-KT_MICROSOFT= 2 /**< Microsoft table   
 */
-};
-
 /** Composite glyph flags definition */
 enum CompositeFlags {
 ARG_1_AND_2_ARE_WORDS = 1,
@@ -197,12 +190,6 @@ namespace vcl
 #define TYPEFLAG_COPYRIGHT_MASK 0x00E
 #define TYPEFLAG_PS_OPENTYPE0x001
 
-/** Structure used by KernGlyphs()  */
-typedef struct {
-int x;/**< positive: right, negative: left 
   */
-int y;/**< positive: up, negative: down
   */
-} KernData;
-
 /** ControlPoint structure used by GetTTGlyphPoints() */
 typedef struct {
 sal_uInt32 flags; /**<   e000  
*/
@@ -495,10 +482,6 @@ namespace vcl
 sal_uInt32 (*mapper)(const sal_uInt8 *, sal_uInt32, sal_uInt32); /* 
character to glyphID translation function  */
 const sal_uInt8   **tables;/* array of 
pointers to raw subtables in SFNT file*/
 sal_uInt32  *tlens;/* array of table 
lengths */
-int kerntype;  /* Defined in the 
KernType enum   */
-sal_uInt32  nkern; /* number of kern 
subtables   */
-const sal_uInt8** kerntables;  /* array of 
pointers to kern subtables*/
-void*pGSubstitution;   /* info provided by 
GSUB for UseGSUB()*/
 };
 
 /* indexes into TrueTypeFont::tables[] and TrueTypeFont::tlens[] */
@@ -514,7 +497,6 @@ namespace vcl
 #define O_vmtx 9 /* 'vmtx' */
 #define O_OS2  10/* 'OS/2' */
 #define O_post 11/* 'post' */
-#define O_kern 12/* 'kern' */
 #define O_cvt  13/* 'cvt_' - only used in TT->TT generation */
 #define O_prep 14/* 'prep' - only used in TT->TT generation */
 #define O_fpgm 15/* 'fpgm' - only used in TT->TT generation */
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 966393fa4fe3..f968c9c092d9 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -123,7 +123,6 @@ static const sal_uInt32 T_otto = 0x4f54544f;/* 
'OTTO' */
 #define T_vmtx 0x766D7478
 #define T_OS2  0x4F532F32
 #define T_post 0x706F7374
-#define T_kern 0x6B65726E
 #define T_cvt  0x63767420
 #define T_prep 0x70726570
 #define T_fpgm 0x6670676D
@@ -1345,86 +1344,6 @@ static void FindCmap(TrueTypeFont *ttf)
 }
 }
 
-static void GetKern(TrueTypeFont *ttf)
-{
-const sal_uInt8* table = getTable(ttf, O_kern);
-int nTableSize = getTableSize(ttf, O_kern);
-const sal_uInt8 *ptr;
-
-if( !table )
-goto badtable;
-
-if (nTableSize >= 4 && GetUInt16(table, 0) == 0) { /* Traditional 
Microsoft style table with sal_uInt16 version and nTables fields */
-ttf->nkern = GetUInt16(table, 2);
-ttf->kerntype = KT_MICROSOFT;
-ptr = table + 4;
-
-const sal_uInt32 remaining_table_size = nTableSize-4;
-const sal_uInt32 nMinRecordSize = 2;
-const sal_uInt32 nMaxRecords = remaining_table_size / nMinRecordSize;
-if (ttf->nkern > nMaxRecords)
-{
-SAL_WARN("vcl.fonts", "Parsing error in " << 
OUString::createFromAscii(ttf->fname) <<
- ": " << nMaxRecords << " max possible entries, but " <<
- ttf->nkern << " claimed, truncating");
-ttf->nkern = nMaxRecords;
-}
-
-ttf->kerntab

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/inc vcl/source

[Khaled Hosny]

 vcl/inc/sft.hxx   |   16 
 vcl/source/fontsubset/sft.cxx |   79 --
 2 files changed, 95 deletions(-)

New commits:
commit cf3c1bd0b91fe68682a7a3c3cb34066e1fb8d17c
Author: Khaled Hosny 
Date:   Thu Feb 8 14:31:34 2018 +0200

Removed unused code for reading kern table

Change-Id: I66b17dbee0a04e61b99e23933a7fed4be30f3a93
Reviewed-on: https://gerrit.libreoffice.org/49426
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit e3caecb5a33288dd46a80b2ffcc47a2288305052)
Reviewed-on: https://gerrit.libreoffice.org/49451
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 3dc6cb77b21f..2577166cc3f1 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -102,13 +102,6 @@ namespace vcl
 FWIDTH_ULTRA_EXPANDED = 9   /**< 200% of normal
 */
 };
 
-/** Type of the 'kern' table, stored in TrueTypeFont::kerntype */
-enum KernType {
-KT_NONE = 0,/**< no kern table 
 */
-KT_APPLE_NEW= 1,/**< new Apple kern table  
 */
-KT_MICROSOFT= 2 /**< Microsoft table   
 */
-};
-
 /** Composite glyph flags definition */
 enum CompositeFlags {
 ARG_1_AND_2_ARE_WORDS = 1,
@@ -190,12 +183,6 @@ namespace vcl
 #define TYPEFLAG_COPYRIGHT_MASK 0x00E
 #define TYPEFLAG_PS_OPENTYPE0x001
 
-/** Structure used by KernGlyphs()  */
-typedef struct {
-int x;/**< positive: right, negative: left 
   */
-int y;/**< positive: up, negative: down
   */
-} KernData;
-
 /** ControlPoint structure used by GetTTGlyphPoints() */
 typedef struct {
 sal_uInt32 flags; /**<   e000  
*/
@@ -486,8 +473,6 @@ namespace vcl
 sal_uInt32 (*mapper)(const sal_uInt8 *, sal_uInt32, sal_uInt32); /* 
character to glyphID translation function  */
 const sal_uInt8   **tables;/* array of 
pointers to raw subtables in SFNT file*/
 sal_uInt32  *tlens;/* array of table 
lengths */
-sal_uInt32  nkern; /* number of kern 
subtables   */
-const sal_uInt8** kerntables;  /* array of 
pointers to kern subtables*/
 };
 
 /* indexes into TrueTypeFont::tables[] and TrueTypeFont::tlens[] */
@@ -503,7 +488,6 @@ namespace vcl
 #define O_vmtx 9 /* 'vmtx' */
 #define O_OS2  10/* 'OS/2' */
 #define O_post 11/* 'post' */
-#define O_kern 12/* 'kern' */
 #define O_cvt  13/* 'cvt_' - only used in TT->TT generation */
 #define O_prep 14/* 'prep' - only used in TT->TT generation */
 #define O_fpgm 15/* 'fpgm' - only used in TT->TT generation */
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 7c35d3207e0d..1bf9b9003de5 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -119,7 +119,6 @@ static const sal_uInt32 T_otto = 0x4f54544f;/* 
'OTTO' */
 #define T_vmtx 0x766D7478
 #define T_OS2  0x4F532F32
 #define T_post 0x706F7374
-#define T_kern 0x6B65726E
 #define T_cvt  0x63767420
 #define T_prep 0x70726570
 #define T_fpgm 0x6670676D
@@ -1339,81 +1338,6 @@ static void FindCmap(TrueTypeFont *ttf)
 }
 }
 
-static void GetKern(TrueTypeFont *ttf)
-{
-const sal_uInt8* table = getTable(ttf, O_kern);
-int nTableSize = getTableSize(ttf, O_kern);
-const sal_uInt8 *ptr;
-
-if( !table )
-goto badtable;
-
-if (nTableSize >= 4 && GetUInt16(table, 0) == 0) { /* Traditional 
Microsoft style table with sal_uInt16 version and nTables fields */
-ttf->nkern = GetUInt16(table, 2);
-ptr = table + 4;
-
-const sal_uInt32 remaining_table_size = nTableSize-4;
-const sal_uInt32 nMinRecordSize = 2;
-const sal_uInt32 nMaxRecords = remaining_table_size / nMinRecordSize;
-if (ttf->nkern > nMaxRecords)
-{
-SAL_WARN("vcl.fonts", "Parsing error in " << 
OUString::createFromAscii(ttf->fname) <<
- ": " << nMaxRecords << " max possible entries, but " <<
- ttf->nkern << " claimed, truncating");
-ttf->nkern = nMaxRecords;
-}
-
-ttf->kerntables = static_cast(calloc(ttf->nkern, 
sizeof(sal_uInt8 *)));
-assert(ttf->kerntables != nullptr);
-
-for( unsigned i = 0; i < ttf->nkern; ++i) {
-ttf->kerntables[i] = ptr;
-ptr += GetUInt16(ptr, 2);
-/* sanity check */
-if( ptr > ttf->ptr+

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

[Tor Lillqvist]

 stoc/source/invocation/invocation.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d56128654457bfc859217c23a957d1712fd6e1c
Author: Tor Lillqvist 
Date:   Thu Feb 8 21:36:07 2018 +0200

Fix exception message: add colon between function name and the word 
"expected"

Change-Id: I80eadaa097afdbe4394aceca9f40b9753792f30b

diff --git a/stoc/source/invocation/invocation.cxx 
b/stoc/source/invocation/invocation.cxx
index f564425c4202..82dfbac5a417 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -590,7 +590,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, 
const Sequence&
 {
 throw IllegalArgumentException(
 "incorrect number of parameters passed invoking function " + 
FunctionName +
-"expected " + OUString::number(nFParamsLen) + ", got " + 
OUString::number(InParams.getLength()),
+": expected " + OUString::number(nFParamsLen) + ", got " + 
OUString::number(InParams.getLength()),
 static_cast(this), sal_Int16(1) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 6 commits - sc/inc sc/Library_sc.mk sc/source

[Eike Rathke]

 sc/Library_sc.mk  |1 
 sc/inc/document.hxx   |8 +-
 sc/inc/documentlinkmgr.hxx|6 -
 sc/source/core/data/conditio.cxx  |6 +
 sc/source/core/data/documen2.cxx  |2 
 sc/source/core/data/documen8.cxx  |   23 ++
 sc/source/core/data/formulacell.cxx   |7 -
 sc/source/core/inc/webservicelink.hxx |   49 +
 sc/source/core/tool/interpr2.cxx  |8 +-
 sc/source/core/tool/interpr7.cxx  |  102 +---
 sc/source/core/tool/rangenam.cxx  |8 +-
 sc/source/core/tool/webservicelink.cxx|  106 ++
 sc/source/filter/excel/excform.cxx|1 
 sc/source/filter/excel/excform8.cxx   |1 
 sc/source/filter/excel/impop.cxx  |1 
 sc/source/filter/excel/xicontent.cxx  |6 +
 sc/source/filter/excel/xiname.cxx |3 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sc/source/filter/oox/defnamesbuffer.cxx   |2 
 sc/source/filter/oox/formulabuffer.cxx|4 +
 sc/source/ui/docshell/docsh4.cxx  |4 -
 sc/source/ui/docshell/documentlinkmgr.cxx |   20 -
 sc/source/ui/view/tabvwsh4.cxx|2 
 23 files changed, 326 insertions(+), 46 deletions(-)

New commits:
commit 74eb6ea470a5889e1d932c6d80d4cbde9ad700e1
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 7626e16ae5f6..d147b101de61 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -199,6 +204,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index d09661503c6b..8decfc00e8e0 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 9de5851e3978..586511d1d25a 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -39,6 +39,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -339,6 +340,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must be reset.
 sal_uInt16 nErr = pArray->GetCodeError();
 aCompiler.CompileTokenArray();
+getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
 pArray->DelRPN();
 pArray->SetCodeError(nErr);
 
commit 3bf429fe899553c8b9cb8ed6bb5ef68d5e643f77
Author: Eike Rathke 
Date:   Thu Jan 25 13:20:

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 6 commits - sc/inc sc/Library_sc.mk sc/source

[Eike Rathke]

 sc/Library_sc.mk  |1 
 sc/inc/document.hxx   |8 +-
 sc/inc/documentlinkmgr.hxx|6 -
 sc/source/core/data/conditio.cxx  |6 +
 sc/source/core/data/documen2.cxx  |2 
 sc/source/core/data/documen8.cxx  |   23 ++
 sc/source/core/data/formulacell.cxx   |7 -
 sc/source/core/inc/webservicelink.hxx |   49 +
 sc/source/core/tool/interpr2.cxx  |8 +-
 sc/source/core/tool/interpr7.cxx  |  102 +---
 sc/source/core/tool/rangenam.cxx  |8 +-
 sc/source/core/tool/webservicelink.cxx|  106 ++
 sc/source/filter/excel/excform.cxx|1 
 sc/source/filter/excel/excform8.cxx   |1 
 sc/source/filter/excel/impop.cxx  |1 
 sc/source/filter/excel/xicontent.cxx  |6 +
 sc/source/filter/excel/xiname.cxx |3 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sc/source/filter/oox/defnamesbuffer.cxx   |2 
 sc/source/filter/oox/formulabuffer.cxx|4 +
 sc/source/ui/docshell/docsh4.cxx  |4 -
 sc/source/ui/docshell/documentlinkmgr.cxx |   20 -
 sc/source/ui/view/tabvwsh4.cxx|2 
 23 files changed, 326 insertions(+), 46 deletions(-)

New commits:
commit b52a2ef18c5999599af29bd989cac4477e2b736d
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 7626e16ae5f6..d147b101de61 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -199,6 +204,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index d09661503c6b..8decfc00e8e0 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 9de5851e3978..586511d1d25a 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -39,6 +39,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -339,6 +340,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must be reset.
 sal_uInt16 nErr = pArray->GetCodeError();
 aCompiler.CompileTokenArray();
+getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
 pArray->DelRPN();
 pArray->SetCodeError(nErr);
 
commit b49f0757e60eba41f079b897f1005699aaa0ad8a
Author: Eike Rathke 
Date:   Thu Jan 25 13:20:

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - 28 commits - compilerplugins/clang cui/source dbaccess/source icon-themes/galaxy instsetoo_native/inc_common instsetoo_native/util

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit b53c154e64306749525359e8dde5861aabc91399
Author: Katarina Behrens 
Date:   Wed Feb 10 14:42:18 2016 +0100

Branded images for msi installer

The sizes are 122 x 234, 374 x 44 installed units respectively, according to

http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx

it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still 
looks pixelated,
but it's as good as it gets.

For better results, we need different graphics, with less fine details 
given the very limited
space

Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index e267d49ab73e..471eea4c22e6 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index b824ddf35d9d..2703670952bd 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit 16499723d69c9ab7cada60aec61e0e2b174b0b75
Author: Katarina Behrens 
Date:   Tue Feb 9 11:09:30 2016 +0100

Branded application icons

sadly, this doesn't replace Windows taskbar icon, that must be living 
somewhere
else. It works on Linux though.

 Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png

Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b

diff --git a/icon-themes/galaxy/res/main128.png 
b/icon-themes/galaxy/res/main128.png
index 2779337e7b0a..818b7330c25b 100644
Binary files a/icon-themes/galaxy/res/main128.png and 
b/icon-themes/galaxy/res/main128.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16.png 
b/icon-themes/galaxy/res/mainapp_16.png
old mode 100755
new mode 100644
index 4a96735b6bb6..13945eeadfd4
Binary files a/icon-themes/galaxy/res/mainapp_16.png and 
b/icon-themes/galaxy/res/mainapp_16.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16_8.png 
b/icon-themes/galaxy/res/mainapp_16_8.png
index 94abb952996b..13945eeadfd4 100644
Binary files a/icon-themes/galaxy/res/mainapp_16_8.png and 
b/icon-themes/galaxy/res/mainapp_16_8.png differ
diff --git a/icon-themes/galaxy/res/mainapp_32.png 
b/icon-themes/galaxy/res/mainapp_32.png
index 88e4e1c8f18f..c653935c0c6b 100755
Binary files a/icon-themes/galaxy/res/mainapp_32.png and 
b/icon-themes/galaxy/res/mainapp_32.png differ
diff --git a/icon-themes/galaxy/res/mainapp_32_8.png 
b/icon-themes/galaxy/res/mainapp_32_8.png
index 2c8a21fbcf3b..c653935c0c6b 100644
Binary files a/icon-themes/galaxy/res/mainapp_32_8.png and 
b/icon-themes/galaxy/res/mainapp_32_8.png differ
diff --git a/icon-themes/galaxy/res/mainapp_48_8.png 
b/icon-themes/galaxy/res/mainapp_48_8.png
index cdebedf6a051..562ea23e89c2 100644
Binary files a/icon-themes/galaxy/res/mainapp_48_8.png and 
b/icon-themes/galaxy/res/mainapp_48_8.png differ
commit 39dbed1b4e185b5d631c7f3cec5ca3fc92388abc
Author: Katarina Behrens 
Date:   Tue Feb 9 10:38:29 2016 +0100

Point to CIB helpdesk

it's pretty mean, b/c German translation (which I can't change) says the 
site
is in English, while CIB site is in German only and can't be switched to 
other
lang

 Conflicts:
sfx2/source/appl/appserv.cxx

Change-Id: Ifbbb9e9d2bbee40998c07d1c68b61cd20d77dbc3

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d6424c2d06ef..9d2ff11b0b4f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -498,8 +498,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 case SID_SEND_FEEDBACK:
 {
 OUString module = SfxHelp::GetCurrentModuleIdentifier();
-OUString 
sURL("http://hub.libreoffice.org/send-feedback/?LOversion="; + 
utl::ConfigManager::getAboutBoxProductVersion() +
-"&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" 
+ module.copy(module.lastIndexOf('.') + 1 )  );
+OUString sURL("http://libreoffice.cib.de/support";);
 sfx2::openUriExternally(sURL, false);
 break;
 }
commit ee4c28eb96248810f4fd9fb38802471f13633875
Author: Katarina Behrens 
Date:   Tue Feb 9 10:00:30 2016 +0100

Point to CIB website

this idiotic postprocess script hard-codes libreoffice.org for some reason, 
grr

Change-Id: Ide1f19d4da9a43

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-3' - 6 commits - sc/inc sc/Library_sc.mk sc/qa sc/source

[Eike Rathke]

 sc/Library_sc.mk  |1 
 sc/inc/document.hxx   |8 +-
 sc/inc/documentlinkmgr.hxx|6 -
 sc/qa/unit/ucalc.cxx  |2 
 sc/source/core/data/conditio.cxx  |6 +
 sc/source/core/data/documen2.cxx  |2 
 sc/source/core/data/documen8.cxx  |   23 ++
 sc/source/core/data/formulacell.cxx   |7 -
 sc/source/core/inc/webservicelink.hxx |   49 +
 sc/source/core/tool/interpr2.cxx  |8 +-
 sc/source/core/tool/interpr7.cxx  |  106 ++
 sc/source/core/tool/rangenam.cxx  |8 +-
 sc/source/core/tool/webservicelink.cxx|  106 ++
 sc/source/filter/excel/excform.cxx|1 
 sc/source/filter/excel/excform8.cxx   |1 
 sc/source/filter/excel/impop.cxx  |1 
 sc/source/filter/excel/xicontent.cxx  |6 +
 sc/source/filter/excel/xiname.cxx |3 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sc/source/filter/oox/defnamesbuffer.cxx   |2 
 sc/source/filter/oox/formulabuffer.cxx|4 +
 sc/source/ui/docshell/docsh4.cxx  |4 -
 sc/source/ui/docshell/documentlinkmgr.cxx |   20 -
 sc/source/ui/view/tabvwsh4.cxx|2 
 24 files changed, 329 insertions(+), 49 deletions(-)

New commits:
commit e8fd1f19bb2662b36e21ec5cb4d87550a255cedd
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 908854a7b281454332af434be9468ec45d420030)

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index eae117c08434..18cbabb1cd93 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -199,6 +204,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index 7189c2a0a2f2..efc181921091 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 79457ab57e5f..a1d10906c687 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -38,6 +38,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -334,6 +335,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must be reset.
 FormulaError nErr = pArray->GetCodeError();
 aCompiler.CompileTokenArray();
+getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
 pArray->DelRPN();
 

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 6 commits - sc/inc sc/Library_sc.mk sc/source

[Eike Rathke]

 sc/Library_sc.mk  |1 
 sc/inc/document.hxx   |8 +-
 sc/inc/documentlinkmgr.hxx|6 -
 sc/source/core/data/conditio.cxx  |6 +
 sc/source/core/data/documen2.cxx  |2 
 sc/source/core/data/documen8.cxx  |   23 ++
 sc/source/core/data/formulacell.cxx   |7 -
 sc/source/core/inc/webservicelink.hxx |   49 +
 sc/source/core/tool/interpr2.cxx  |8 +-
 sc/source/core/tool/interpr7.cxx  |  102 +---
 sc/source/core/tool/rangenam.cxx  |8 +-
 sc/source/core/tool/webservicelink.cxx|  106 ++
 sc/source/filter/excel/excform.cxx|1 
 sc/source/filter/excel/excform8.cxx   |1 
 sc/source/filter/excel/impop.cxx  |1 
 sc/source/filter/excel/xicontent.cxx  |6 +
 sc/source/filter/excel/xiname.cxx |3 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sc/source/filter/oox/defnamesbuffer.cxx   |2 
 sc/source/filter/oox/formulabuffer.cxx|4 +
 sc/source/ui/docshell/docsh4.cxx  |4 -
 sc/source/ui/docshell/documentlinkmgr.cxx |   20 -
 sc/source/ui/view/tabvwsh4.cxx|2 
 23 files changed, 326 insertions(+), 46 deletions(-)

New commits:
commit feb6f545261ad6b420469f3b7d4e8660dd83898a
Author: Eike Rathke 
Date:   Mon Jan 29 18:19:33 2018 +0100

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 7626e16ae5f6..d147b101de61 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
 mnMaxCol(-1)
 {
 if (!rSymbol.isEmpty())
-CompileRangeData( rSymbol, pDoc->IsImportingXML());
+{
 // Let the compiler set an error on unknown names for a subsequent
 // CompileUnresolvedXML().
+const bool bImporting = pDoc->IsImportingXML();
+CompileRangeData( rSymbol, bImporting);
+if (bImporting)
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+}
 else
 {
 // #i63513#/#i65690# don't leave pCode as NULL.
@@ -199,6 +204,7 @@ void ScRangeData::CompileUnresolvedXML( 
sc::CompileFormulaContext& rCxt )
 // Don't let the compiler set an error for unknown names on final
 // compile, errors are handled by the interpreter thereafter.
 CompileRangeData( aSymbol, false);
+rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
 }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index d09661503c6b..8decfc00e8e0 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
 }
 }
 if (pData)
+{
+GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
 mpScData = pData;   // cache for later use
+}
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 9de5851e3978..586511d1d25a 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -39,6 +39,7 @@
 #include "tokenarray.hxx"
 #include "tokenuno.hxx"
 #include "compiler.hxx"
+#include "document.hxx"
 
 namespace oox {
 namespace xls {
@@ -339,6 +340,7 @@ std::unique_ptr DefinedName::getScTokens(
 // after, a resulting error must be reset.
 sal_uInt16 nErr = pArray->GetCodeError();
 aCompiler.CompileTokenArray();
+getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
 pArray->DelRPN();
 pArray->SetCodeError(nErr);
 
commit cca367b0c6ba5a907a60faf70049df2e4a435266
Author: Eike Rathke 
Date:   Thu Jan 25 13:20: