[Libreoffice-commits] core.git: basctl/sdi basctl/source include/sfx2 officecfg/registry sfx2/sdi

[tagezi]

 basctl/sdi/baside.sdi |   27 +-
 basctl/source/basicide/basides1.cxx   |  125 
+++---
 basctl/source/basicide/iderdll.cxx|6 
 basctl/source/basicide/iderdll2.hxx   |5 
 basctl/source/inc/basidesh.hxx|   32 +-
 include/sfx2/sfxsids.hrc  |1 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |5 
 sfx2/sdi/sfx.sdi  |   18 +
 8 files changed, 154 insertions(+), 65 deletions(-)

New commits:
commit 3322661414a558d29146c40c0cd5e9db0a7b21dd
Author: tagezi 
Date:   Wed Mar 28 21:25:33 2018 +0300

tdf#94498 add repeat search in Basic IDE by shortcut

additionally deduplicate code and remove unnecessary abstraction

Change-Id: Ib826b5cac74e95ce4ae8d02368b0983eb4942b29
Reviewed-on: https://gerrit.libreoffice.org/52027
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-by: Mike Kaganski 

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 180cdf2caa6a..5c413f89e6c4 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -99,30 +99,45 @@ shell basctl_Shell
 StateMethod = GetState;
 ]
 
-SID_SEARCH_OPTIONS
+SID_GOTOLINE
 [
 ExecMethod  = ExecuteCurrent;
 StateMethod = GetState;
 ]
 
-SID_SEARCH_ITEM
+
+// Search in IDE Basic
+
+SID_SEARCH_OPTIONS
 [
-ExecMethod  = ExecuteCurrent;
+ExecMethod  = ExecuteSearch;
 StateMethod = GetState;
 ]
 
-SID_GOTOLINE
+SID_SEARCH_ITEM
 [
-ExecMethod  = ExecuteCurrent;
+ExecMethod  = ExecuteSearch;
 StateMethod = GetState;
 ]
 
 FID_SEARCH_NOW
 [
-ExecMethod  = ExecuteCurrent;
+ExecMethod  = ExecuteSearch;
 StateMethod = GetState;
 ]
 
+SID_BASICIDE_REPEAT_SEARCH
+[
+ExecMethod  = ExecuteSearch;
+StateMethod = GetState;
+]
+
+FID_SEARCH_ON // status()
+[
+ExecMethod = ExecuteSearch;
+Export = FALSE;
+]
+
 FID_SEARCH_OFF
 [
 ExecMethod  = ExecuteCurrent;
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 95025f859bf9..da1c86f1872d 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -58,40 +57,56 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
-void Shell::ExecuteCurrent( SfxRequest& rReq )
+void Shell::ExecuteSearch( SfxRequest& rReq )
 {
 if ( !pCurWin )
 return;
 
-switch ( rReq.GetSlot() )
+const SfxItemSet* pArgs = rReq.GetArgs();
+sal_uInt16 nSlot = rReq.GetSlot();
+
+// if searching has not been done before this time
+if (nSlot == SID_BASICIDE_REPEAT_SEARCH && !mpSearchItem)
 {
-case SID_BASICIDE_HIDECURPAGE:
-{
-pCurWin->StoreData();
-RemoveWindow( pCurWin, false );
-}
-break;
-case SID_BASICIDE_RENAMECURRENT:
-{
-pTabBar->StartEditMode( pTabBar->GetCurPageId() );
-}
-break;
+rReq.SetReturnValue(SfxBoolItem(nSlot, false));
+nSlot = 0;
+}
+
+switch ( nSlot )
+{
+case SID_SEARCH_OPTIONS:
+break;
+case SID_SEARCH_ITEM:
+mpSearchItem.reset( static_cast( 
pArgs->Get(SID_SEARCH_ITEM).Clone() ));
+break;
+case FID_SEARCH_ON:
+mbJustOpened = true;
+GetViewFrame()->GetBindings().Invalidate(SID_SEARCH_ITEM);
+break;
+case SID_BASICIDE_REPEAT_SEARCH:
 case FID_SEARCH_NOW:
 {
 if (!pCurWin->HasActiveEditor())
 break;
-DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
-SfxItemSet const& rArgs = *rReq.GetArgs();
-// unfortunately I don't know the ID:
-sal_uInt16 nWhich = rArgs.GetWhichByPos( 0 );
-DBG_ASSERT( nWhich, "Which for SearchItem?" );
-SfxPoolItem const& rItem = rArgs.Get(nWhich);
-DBG_ASSERT(dynamic_cast(&rItem), "no 
searchitem!");
-SvxSearchItem const& rSearchItem = static_cast(rItem);
-// memorize item because of the adjustments...
-GetExtraData()->SetSearchItem(rSearchItem);
+
+// If it is a repeat searching
+if ( nSlot == SID_BASICIDE_REPEAT_SEARCH )
+{
+if( !mpSearchItem )
+mpSearchItem.reset( new SvxSearchItem( SID_SEARCH_ITEM ));
+}
+else
+{
+// Get SearchItem fro

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

[Muhammet Kara]

 cui/source/customize/CommandCategoryListBox.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit e82eeca67688a809317a0edeecf7d7b3fdf3a216
Author: Muhammet Kara 
Date:   Fri Apr 20 17:48:54 2018 +0300

tdf#112323: Sort the category list alphabetically in the Customize dialog

And add multiple separators as per the Design Team's request

Change-Id: I8dd692207fc85d75d585dc486d2c8723444f8a5e
Reviewed-on: https://gerrit.libreoffice.org/53216
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 4d83f1147215..e68ad9ec0211 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -46,7 +46,7 @@
 #include  //for SaveInData
 
 CommandCategoryListBox::CommandCategoryListBox(vcl::Window* pParent)
-: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
+: ListBox( pParent, WB_BORDER | WB_DROPDOWN | WB_SORT )
 , pStylesInfo( nullptr )
 {
 SetDropDownLineCount(25);
@@ -144,6 +144,9 @@ void CommandCategoryListBox::Init(
 SetEntryData( nEntryPos, m_aGroupInfo.back().get() );
 }
 
+// Separate the "All commands"category from the actual categories
+AddSeparator( 0 );
+
 // Add the actual categories
 for (sal_Int32 i = 0; i < nGroupsLength; ++i)
 {
@@ -169,8 +172,10 @@ void CommandCategoryListBox::Init(
 }
 
 // Separate regular commands from styles and macros
-if (nEntryPos)
-SetSeparatorPos(nEntryPos);
+AddSeparator( GetEntryCount() - 1 );
+
+// Stop sorting, and add Macros and Styles to the end of the list
+SetStyle(GetStyle() & ~WB_SORT);
 
 // Add macros category
 OUString sMacros( CuiResId(RID_SVXSTR_MACROS) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/Library_dbu.mk dbaccess/source editeng/source include/svx include/vcl reportdesign/inc sc/inc sc/source sd/source sfx2/source svx/inc svx/source sw/inc sw/sour

[Noel Grandin]

 dbaccess/Library_dbu.mk |1 
 dbaccess/source/ui/dlg/DriverSettings.cxx   |   91 ---
 dbaccess/source/ui/dlg/DriverSettings.hxx   |   10 --
 editeng/source/editeng/editundo.hxx |1 
 include/svx/svdmodel.hxx|1 
 include/svx/svdpage.hxx |1 
 include/svx/txencbox.hxx|   25 -
 include/vcl/bitmap.hxx  |3 
 include/vcl/bitmapex.hxx|8 -
 include/vcl/slider.hxx  |2 
 reportdesign/inc/RptPage.hxx|2 
 sc/inc/chartlis.hxx |2 
 sc/source/core/tool/chartlis.cxx|7 -
 sd/source/ui/dlg/docprev.cxx|   22 
 sd/source/ui/inc/docprev.hxx|1 
 sfx2/source/appl/fileobj.cxx|   41 
 sfx2/source/appl/fileobj.hxx|1 
 svx/inc/sdr/contact/viewcontactofgraphic.hxx|3 
 svx/source/dialog/txencbox.cxx  |   63 -
 svx/source/sdr/contact/viewcontactofgraphic.cxx |   11 --
 svx/source/svdraw/svdpage.cxx   |7 -
 sw/inc/ndgrf.hxx|   43 -
 sw/source/core/graphic/ndgrf.cxx|  112 
 vcl/inc/BitmapFastScaleFilter.hxx   |5 -
 vcl/source/control/slider.cxx   |9 -
 vcl/source/gdi/bitmapex.cxx |5 -
 26 files changed, 477 deletions(-)

New commits:
commit 94acabe8d0cb555e76635c4bceeb48a14bd16a2b
Author: Noel Grandin 
Date:   Fri Apr 20 13:39:38 2018 +0200

loplugin:unusedmethods

Change-Id: I9dc6e81149eae3ba2284fa7fe608dd9252503dce
Reviewed-on: https://gerrit.libreoffice.org/53197
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index d1b5a53599bb..b8ff06ecbf7f 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -132,7 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/ui/dlg/dlgattr \
 dbaccess/source/ui/dlg/dlgsave \
 dbaccess/source/ui/dlg/dlgsize \
-dbaccess/source/ui/dlg/DriverSettings \
 dbaccess/source/ui/dlg/dsselect \
 dbaccess/source/ui/dlg/finteraction \
 dbaccess/source/ui/dlg/generalpage \
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx 
b/dbaccess/source/ui/dlg/DriverSettings.cxx
deleted file mode 100644
index ba388a60c734..
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include "DriverSettings.hxx"
-#include 
-
-#include 
-#include 
-
-#include 
-
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::beans::NamedValue;
-
-using namespace dbaui;
-void ODriversSettings::getSupportedIndirectSettings( const OUString& 
_sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& 
_xContext, std::vector< sal_Int32>& _out_rDetailsIds )
-{
-// for a number of settings, we do not need to use hard-coded here, but 
can ask a
-// central DataSourceUI instance.
-DataSourceMetaData aMeta( _sURLPrefix );
-const FeatureSet& rFeatures( aMeta.getFeatureSet() );
-for (auto const& feature : rFeatures)
-{
-_out_rDetailsIds.push_back(feature);
-}
-
-// the rest is configuration-based
-// TODO: that's not really true: *everything* is configuration-based 
nowadays, even the FeatureSet obtained
-// from the DataSourceMetaData has been initialized from the 
configuration. So in fact, we could consolidate
-// the two blocks.
-// The best approach would be to extend the FeatureSet to contain *all* 
known data source features, not only
-// the ones from the "Advanced settings" UI.
-
-::connectivity::DriversConfig aDriverConfig(_xContext);
-const ::comphelper::NamedValueCollection& aProperties = 
aDriverConfig.getProperties(_sURLPrefix);
-typedef std::pair TProperties;

[Libreoffice-commits] core.git: vcl/Library_vcl.mk

[Chris Sherlock]

 vcl/Library_vcl.mk |  166 ++---
 1 file changed, 83 insertions(+), 83 deletions(-)

New commits:
commit 9374352f242d2dcfd39a3a6f0504efbaf1abb2dc
Author: Chris Sherlock 
Date:   Fri Apr 20 23:07:19 2018 +1000

vcl: get rid of tabs in vcl/Library_vcl.mk

Change-Id: I2c48efdf82e6433847f90ac0309935cb442b01b5
Reviewed-on: https://gerrit.libreoffice.org/53207
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index cfd5da379ab3..dc3b8a3318c6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -45,10 +45,10 @@ $(eval $(call gb_Library_set_include,vcl,\
 $(eval $(call gb_Library_add_defs,vcl,\
 -DVCL_DLLIMPLEMENTATION \
 -DDLLIMPLEMENTATION_UITEST \
-   -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,cui))\" \
-   -DDESKTOP_DETECTOR_DLL_NAME=\"$(call 
gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,desktop_detector))\" \
-   -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,tk))\" \
-   -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
+-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,cui))\" \
+-DDESKTOP_DETECTOR_DLL_NAME=\"$(call 
gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,desktop_detector))\" \
+-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,tk))\" \
+-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
 ))
 
 ifeq ($(SYSTEM_GLM),TRUE)
@@ -60,18 +60,18 @@ endif
 $(eval $(call gb_Library_use_sdk_api,vcl))
 
 $(eval $(call gb_Library_use_custom_headers,vcl,\
-   officecfg/registry \
+officecfg/registry \
 ))
 
 $(eval $(call gb_Library_use_externals,vcl,\
-   libjpeg \
-   libeot \
-   $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
+libjpeg \
+libeot \
+$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
 
 $(eval $(call gb_Library_use_libraries,vcl,\
 $(call gb_Helper_optional,BREAKPAD, \
-   crashreport) \
+crashreport) \
 svl \
 tl \
 utl \
@@ -112,15 +112,15 @@ $(eval $(call gb_Library_use_libraries,vcl,\
 endif
 
 $(eval $(call gb_Library_use_externals,vcl,\
-   boost_headers \
-   gio \
-   glm_headers \
-   graphite \
-   harfbuzz \
-   icu_headers \
-   icuuc \
-   lcms2 \
-   mdds_headers \
+boost_headers \
+gio \
+glm_headers \
+graphite \
+harfbuzz \
+icu_headers \
+icuuc \
+lcms2 \
+mdds_headers \
 ))
 ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,vcl,\
@@ -318,7 +318,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/bitmap/BitmapColorizeFilter \
 vcl/source/bitmap/bitmappaint \
 vcl/source/bitmap/BitmapGaussianSeparableBlurFilter \
-   vcl/source/bitmap/BitmapFastScaleFilter \
+vcl/source/bitmap/BitmapFastScaleFilter \
 vcl/source/bitmap/BitmapScaleSuperFilter \
 vcl/source/bitmap/BitmapScaleConvolutionFilter \
 vcl/source/bitmap/BitmapSymmetryCheck \
@@ -346,10 +346,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/app/dndhelp \
 vcl/source/app/help \
 vcl/source/app/i18nhelp \
-   vcl/source/app/idle \
-   vcl/source/app/salusereventlist \
+vcl/source/app/idle \
+vcl/source/app/salusereventlist \
 vcl/source/app/salvtables \
-   vcl/source/app/scheduler \
+vcl/source/app/scheduler \
 vcl/source/app/session \
 vcl/source/app/settings \
 vcl/source/app/IconThemeInfo \
@@ -447,7 +447,7 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
 ))
 
 $(eval $(call gb_Library_add_defs,vcl,\
-   -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
+-DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
@@ -455,7 +455,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 ))
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
-   ApplicationServices \
+ApplicationServices \
 ))
 
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
@@ -537,9 +537,9 @@ endif
 vcl_headless_code= \
 vcl/headless/svpframe \
 $(if $(filter-out IOS,$(OS)), \
-   vcl/headless/svpbmp \
-   vcl/headless/svpgdi \
-   vcl/headless/svpdata) \
+vcl/headless/svpbmp \
+vcl/headless/svpgdi \
+vcl/headless/svpdata) \
 vcl/headless/svpdummies \
 vcl/headless/svpinst \
 vcl/headless/svpvd \
@@ -580,7 +580,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 $(if $(filter TRUE,$(ENABLE_CUPS)),\
 vcl/unx/generic/printer/cupsmgr \
 vcl/unx/generic/printer/printerinfomanager \
-   , \
+, \
 vcl/null/printerinfomanager \
 ) \
 $(vcl_headless_code) \
@@ -588,12 +588,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 24 commits - cppcanvas/source hwpfilter/source oox/source package/source sc/qa sc/source sw/qa sw/source vcl/source vcl

[Caolán McNamara]

 cppcanvas/source/mtfrenderer/emfplus.cxx |   16 
 hwpfilter/source/hcode.cxx   |   30 
 hwpfilter/source/hwpfile.h   |2 
 oox/source/ole/vbacontrol.cxx|   10 
 package/source/zipapi/MemoryByteGrabber.hxx  |2 
 package/source/zipapi/ZipFile.cxx|   10 
 sc/qa/unit/data/xls/fail/forcepoint-group-range-1.xls|binary
 sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls|binary
 sc/source/core/data/column3.cxx  |4 
 sc/source/filter/excel/xichart.cxx   |   23 
 sc/source/filter/xml/xmlcelli.cxx|2 
 sc/source/ui/inc/viewdata.hxx|4 
 sc/source/ui/view/viewdata.cxx   |   12 
 sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt   |binary
 sw/qa/core/data/rtf/fail/forcepoint-7.rtf|  517 +++
 sw/qa/core/data/rtf/pass/forcepoint-1.rtf|  193 +
 sw/source/core/txtnode/fntcache.cxx  |3 
 sw/source/filter/xml/xmlimp.cxx  |5 
 sw/source/filter/xml/xmltbli.cxx |7 
 vcl/source/gdi/pdfwriter_impl2.cxx   |   27 
 vcl/source/helper/strhelper.cxx  |9 
 vcl/unx/generic/printer/jobdata.cxx  |   14 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   13 
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |1 
 writerfilter/source/dmapper/TableManager.cxx |2 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx  |2 
 xmloff/source/draw/ximpcustomshape.cxx   |2 
 xmloff/source/text/txtparai.cxx  |   15 
 28 files changed, 859 insertions(+), 66 deletions(-)

New commits:
commit 7cd81af8ad169ba36defcec1dcce9cdec02141a7
Author: Caolán McNamara 
Date:   Mon Mar 26 12:49:54 2018 +0100

forcepoint #33 ensure payload is a EMFPPath

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

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4a7bf06e631a..3e041557ee96 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1986,7 +1986,7 @@ namespace cppcanvas
 
 SAL_INFO("cppcanvas.emf", "EMF+ FillPath slot: " 
<< index);
 
-EMFPPath* path = 
static_cast(aObjects[index]);
+EMFPPath* path = 
dynamic_cast(aObjects[index]);
 if (path)
 EMFPPlusFillPolygon(path->GetPolygon (*this), 
rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
 else
@@ -2113,7 +2113,7 @@ namespace cppcanvas
 SAL_INFO("cppcanvas.emf", "EMF+ DrawPath");
 SAL_INFO("cppcanvas.emf", "EMF+\tpen: " << 
penIndex);
 
-EMFPPath* path = static_cast( aObjects 
[flags & 0xff] );
+EMFPPath* path = dynamic_cast( aObjects 
[flags & 0xff] );
 if (path)
 EMFPPlusDrawPolygon(path->GetPolygon (*this), 
rFactoryParms, rState, rCanvas, penIndex);
 else
commit 0c250f3d7cd6525989e3ce01fccd5073abbda576
Author: Caolán McNamara 
Date:   Mon Mar 26 13:44:31 2018 +0100

forcepoint #34 survive missing autostyles

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

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 4670aed7b050..3d7c2eb15a87 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -389,6 +389,8 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, 
sal_Int32 nEnd, cons
 sal_Int32 nEntryCount = xMapper->GetEntryCount();
 
 SvXMLStylesContext* pAutoStyles = GetImport().GetAutoStyles();
+if (!pAutoStyles)
+return;
 
 // Style name for text span corresponds with the name of an automatic 
style.
 const XMLPropStyleContext* pStyle = dynamic_cast(
commit c84b280184a9e1912461ba326f07ab466c32e168
Author: Caolán McNamara 
Date:   Mon Mar 26 12:59:14 2018 +0100

forcepoint #32 survive missing value range

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

diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index adff4074cf62..1ab405d0524a 100644
--- a/sc/

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild solenv/inc

[Don Lewis]

 solenv/gbuild/platform/freebsd.mk |8 
 solenv/inc/unxfbsdi.mk|8 
 2 files changed, 16 insertions(+)

New commits:
commit 6a278b92d1822a0e7dfde8fd87d005f00a855e54
Author: Don Lewis 
Date:   Fri Apr 20 23:17:21 2018 +

Work around a bug in clang versions 3.6.x and 3.7.x on 32-bit Intel.

Using -Os optimization causes clang to generate bad DWARF CFI which
is needed for stack unwinding during exception handling.  See:

Instead of using -Os, optimize using "-O2 -fno-unroll-loops" as a
reasonably close substitute.

diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index d519cb8c2386..5f4bc943186e 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -146,7 +146,15 @@ ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 gb_COMPILEROPT1FLAGS := -O0
 else
+# Clang versions 3.6.x and 3.7.x generate bad DWARF CFI for stack unwinding
+# on 32-bit Intel when compiling with -Os optimization.  See
+# 
+# Work around this by using "-O2 -fno-unroll-loops" instead.
+ifeq ($(COM)$(CPUNAME)$(shell expr $(CCNUMVER) '>=' 00030006 '&' 
$(CCNUMVER) '<' 00030008),CLANGINTEL1)
+gb_COMPILEROPTFLAGS := -O2 -fno-unroll-loops
+else
 gb_COMPILEROPTFLAGS := -Os
+endif
 gb_COMPILEROPT1FLAGS := -O1
 endif
 
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 21703817605f..5d99f051c835 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -33,7 +33,15 @@ ARCH_FLAGS*=-mtune=pentiumpro
 
 # Compiler flags for enabling optimizations
 .IF "$(PRODUCT)"!=""
+# Clang versions 3.6.x and 3.7.x generate bad DWARF CFI for stack unwinding
+# on 32-bit Intel when compiling with -Os optimization.  See
+# 
+# Work around this by using "-O2 -fno-unroll-loops" instead.
+.IF "$(COM)"=="CLANG" && "$(CCNUMVER)">="00030006" && 
"$(CCNUMVER)"<="00030007"
+CFLAGSOPT=-O2 -fno-unroll-loops -fno-strict-aliasing   # optimizing for 
products
+.ELSE
 CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ENDIF
 .ELSE  # "$(PRODUCT)"!=""
 CFLAGSOPT= # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
___
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' - 2 commits - sot/source sw/source

[Caolán McNamara]

 sot/source/sdstor/stgstrms.cxx  |4 ++--
 sw/source/filter/ww8/ww8toolbar.cxx |4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1883d5d365fe7021ae5366fdb0dbc15169b4858e
Author: Caolán McNamara 
Date:   Fri Feb 9 10:49:39 2018 +

ofz#6173 check index before use

Change-Id: I09d15ab324af0a8b3566f11868eb3266a68c4afe
Reviewed-on: https://gerrit.libreoffice.org/49500
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit e355d7d691cfe9719b06e15129d86ec22a2bd7a4)

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx 
b/sw/source/filter/ww8/ww8toolbar.cxx
index 056839aae6e9..abdc9458f212 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -166,7 +166,9 @@ bool SwCTBWrapper::Read( SvStream& rS )
 std::vector< sal_Int16 >::iterator it_end = dropDownMenuIndices.end();
 for ( std::vector< sal_Int16 >::iterator it = dropDownMenuIndices.begin(); 
it != it_end; ++it )
 {
-rCustomizations[ *it ].bIsDroppedMenuTB = true;
+if (*it < 0 || static_cast(*it) >= rCustomizations.size())
+continue;
+rCustomizations[*it].bIsDroppedMenuTB = true;
 }
 return rS.good();
 }
commit 38962e0dfede9087f0a53caf8a06ad5129a77fcc
Author: Caolán McNamara 
Date:   Sat Jan 27 19:38:12 2018 +

ofz#5747 short->sal_Int32 like in StgDataStrm

Change-Id: I254c00b1142d7187beabe5d18532efec036de494
Reviewed-on: https://gerrit.libreoffice.org/48757
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 59cf6c6128f67d807de58fae2d7fae2b4909ad68)

diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 4f749486c1cc..212949d546d2 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1047,7 +1047,7 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n )
 // small stream is likely to be < 64 KBytes.
 if( ( m_nPos + n ) > m_nSize )
 n = m_nSize - m_nPos;
-short nDone = 0;
+sal_Int32 nDone = 0;
 while( n )
 {
 short nBytes = m_nPageSize - m_nOffset;
@@ -1078,7 +1078,7 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, 
sal_Int32 n )
 {
 // you can safely assume that reads are not huge, since the
 // small stream is likely to be < 64 KBytes.
-short nDone = 0;
+sal_Int32 nDone = 0;
 if( ( m_nPos + n ) > m_nSize )
 {
 sal_Int32 nOld = m_nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 solenv/sanitizers/ui/modules/schart.suppr |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a8ff284befa4c4bb8ca29361fac8766b9de382d2
Author: Thorsten Behrens 
Date:   Sat Apr 21 01:36:31 2018 +0200

fix build

The chart2/uiconfig/ui/sidebarelements.ui had this missing since
day one, so let's exclude it for the moment.

Change-Id: Ieef66f15cb05a89548a7a9c02efa6bebceb15ca5

diff --git a/solenv/sanitizers/ui/modules/schart.suppr 
b/solenv/sanitizers/ui/modules/schart.suppr
index 31c5cd5f8bce..59bbd1918e4f 100644
--- a/solenv/sanitizers/ui/modules/schart.suppr
+++ b/solenv/sanitizers/ui/modules/schart.suppr
@@ -4,3 +4,4 @@ 
chart2/uiconfig/ui/tp_DataSource.ui://GtkButton[@id='IMB_RANGE_MAIN'] button-no-
 chart2/uiconfig/ui/tp_DataSource.ui://GtkLabel[@id='FT_DATALABELS'] 
orphan-label
 chart2/uiconfig/ui/tp_DataSource.ui://GtkButton[@id='IMB_RANGE_CAT'] 
button-no-label
 chart2/uiconfig/ui/tp_ErrorBars.ui://GtkRadioButton[@id='RB_FUNCTION'] 
button-no-label
+chart2/uiconfig/ui/sidebarelements.ui://GtkCheckButton[@id='checkbutton_legend']
 button-no-label
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in solenv/gbuild

[Samuel Thibault]

 Makefile.in |3 +++
 solenv/gbuild/Helper.mk |3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 77b09e7f921c42c41171e431813652db6de54679
Author: Samuel Thibault 
Date:   Wed Mar 14 13:37:31 2018 +0100

gbuild: add target rules for all modules

This allows to run e.g. make UIConfig to automatically run make
UIConfig_ for all modules.

Change-Id: Idc2c3a61fd38b486435366164031b4d51f68eebc
Reviewed-on: https://gerrit.libreoffice.org/51274
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/Makefile.in b/Makefile.in
index f149a7ee79b4..3cce173bcdf0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,6 +165,9 @@ gbuild_TARGETS := AllLangHelp \
 $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach 
module,$(gbuild_modules),$(target)_$(module)/%)) UIConfig_modules/% %.genpatch: 
bootstrap fetch
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
 
+$(gbuild_TARGETS):
+   $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
+
 #
 # Clean
 #
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 688f5963a1f5..2aa0fc8d65b2 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -88,7 +88,8 @@ endef
 #
 # gb_Helper_make_userfriendly_targets target class build-target? clean-target?
 define gb_Helper_make_userfriendly_targets
-.PHONY: $(2)_$(1) $(2)_$(1).clean
+.PHONY: $(2) $(2)_$(1) $(2)_$(1).clean
+$(2): $(2)_$(1)
 $(2)_$(1) : $(if $(3),$(3),$(call gb_$(2)_get_target,$(1)))
 $(2)_$(1).clean : $(if $(4),$(4),$(call gb_$(2)_get_clean_target,$(1)))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Thibault]

 bin/gla11y |   58 +++---
 1 file changed, 43 insertions(+), 15 deletions(-)

New commits:
commit 9ebe4dec48a3677fced23ede58e31057b5db1df3
Author: Samuel Thibault 
Date:   Wed Mar 21 14:28:35 2018 +0100

Update gla11y

This updates the gla11y tool

- mnemonic-widget is actually an alias for mnemonic_widget
- ditto for tooltip-text vs tooltip_text
- ditto for placeholder-text vs placeholder_text
- glade introduced a notation for specifying the role of a widget, which can
  be used to make a label static for instance (thus not orphan).
- --help is fixed to use the standard formatting.
- Remove the documentation of unexisting -i option
- Add the documentation of -P option
- Add --help/-h and --version options for completeness.

Change-Id: I8510ba9c5a877c05edd3af305b4e7fe1f105acd5
Reviewed-on: https://gerrit.libreoffice.org/52973
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/bin/gla11y b/bin/gla11y
index 8b2746fb4a98..f18e2f48c960 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -244,6 +244,7 @@ widgets_labels = [
 # GtkPrinterOptionWidget ?
 # GtkStackCombo ?
 # GtkStackSidebar ?
+# GtkStackSwitcher ?
 
 progname = os.path.basename(sys.argv[0])
 
@@ -629,7 +630,8 @@ def is_orphan_label(filename, tree, root, obj, orphan_root, 
doprint = False):
 return True
 
 # mnemonic_widget
-mnemonic_for = obj.findall("property[@name='mnemonic_widget']")
+mnemonic_for = obj.findall("property[@name='mnemonic_widget']") + \
+   obj.findall("property[@name='mnemonic-widget']")
 for rel in mnemonic_for:
 target = rel.text
 l = mnemonic_for_elm[target]
@@ -649,6 +651,17 @@ def is_orphan_label(filename, tree, root, obj, 
orphan_root, doprint = False):
 # Oh, a labelled label, probably not to be labelling anything
 return False
 
+# explicit role?
+roles = [x.text for x in 
obj.findall("child[@internal-child='accessible']/object[@class='AtkObject']/property[@name='AtkObject::accessible-role']")]
+roles += [x.attrib.get("type") for x in obj.findall("accessibility/role")]
+if len(roles) > 1 and doprint:
+err(filename, tree, obj, "multiple-role", "has multiple "
+"%s" % elms_lines(children))
+for role in roles:
+if role == 'static' or role == 'ATK_ROLE_STATIC':
+# This is static text, not meant to label anything
+return False
+
 parent = elm_parent(root, obj)
 if parent is not None:
 childtype = parent.attrib.get('type')
@@ -739,14 +752,16 @@ def is_orphan_widget(filename, tree, root, obj, orphan, 
orphan_root, doprint = F
 return False
 
 # Case 5: Has a 
-tooltips = obj.findall("property[@name='tooltip_text']")
+tooltips = obj.findall("property[@name='tooltip_text']") + \
+   obj.findall("property[@name='tooltip-text']")
 if len(tooltips) > 1 and doprint:
 err(filename, tree, obj, "multiple-tooltip", "has multiple 
tooltip_text properties")
-if len(tooltips) >= 1:
+if len(tooltips) >= 1 and klass != 'GtkCheckButton':
 return False
 
 # Case 6: Has a 
-placeholders = obj.findall("property[@name='placeholder_text']")
+placeholders = obj.findall("property[@name='placeholder_text']") + \
+   obj.findall("property[@name='placeholder-text']")
 if len(placeholders) > 1 and doprint:
 err(filename, tree, obj, "multiple-placeholder", "has multiple 
placeholder_text properties")
 if len(placeholders) >= 1:
@@ -887,7 +902,7 @@ def check_props(filename, tree, root, elm, forward):
 """
 Check the given list of relation properties
 """
-props = elm.findall("property[@name='mnemonic_widget']")
+props = elm.findall("property[@name='" + forward + "']")
 for prop in props:
 if prop.text not in ids:
 err(filename, tree, elm, "undeclared-target", forward + " uses 
undeclared target '%s'" % prop.text)
@@ -972,7 +987,8 @@ def check_a11y_relation(filename, tree):
 
 # Labels special case
 if klass in widgets_labels:
-properties = check_props(filename, tree, root, obj, 
"mnemonic_widget")
+properties = check_props(filename, tree, root, obj, 
"mnemonic_widget") + \
+ check_props(filename, tree, root, obj, 
"mnemonic-widget")
 if len(properties) > 1:
 err(filename, tree, obj, "multiple-mnemonic", "has multiple 
mnemonic_widgets properties"
 "%s" % elms_lines(properties))
@@ -1025,7 +1041,8 @@ def check_a11y_relation(filename, tree):
 else:
 label_for_elm[target].append(obj)
 
-mnemonic_for = obj.findall("property[@name='mnemonic_widget']")
+mnemonic_for = obj.findall("property[@name='mnemonic_widget']") + \
+   obj.findall("property[@n

[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_bitmap_render_test.mk vcl/Module_vcl.mk vcl/qa

[Vasily Melenchuk]

 vcl/CppunitTest_vcl_bitmap_render_test.mk|   43 ++
 vcl/Module_vcl.mk|3 
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |   96 +++
 vcl/qa/cppunit/bitmaprender/data/tdf104141.gif   |binary
 vcl/qa/cppunit/bitmaprender/data/tdf113918.png   |binary
 5 files changed, 141 insertions(+), 1 deletion(-)

New commits:
commit eb5c0ccd47330fc726f4b4f854cf4cc518ac21cd
Author: Vasily Melenchuk 
Date:   Mon Mar 26 10:57:59 2018 +0300

Unittests for bugs with 1bit images rendering problems

Fix was done in 25cd843664919974f0d21ca7a0b02cc43e9eeabb and has
impact on tdf104141, tdf113918, tdf115297 and some others.

Change-Id: I8868dc1463b6f30b871a4f1b3129657f5bcb38f3
Reviewed-on: https://gerrit.libreoffice.org/51855
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/CppunitTest_vcl_bitmap_render_test.mk 
b/vcl/CppunitTest_vcl_bitmap_render_test.mk
new file mode 100644
index ..1d66e6a5aae4
--- /dev/null
+++ b/vcl/CppunitTest_vcl_bitmap_render_test.mk
@@ -0,0 +1,43 @@
+# -*- 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_CppunitTest_CppunitTest,vcl_bitmap_render_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_bitmap_render_test, \
+vcl/qa/cppunit/bitmaprender/BitmapRenderTest \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_bitmap_render_test, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   svt \
+   test \
+   tl \
+   unotest \
+   vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_bitmap_render_test))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_bitmap_render_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_bitmap_render_test))
+
+$(eval $(call 
gb_CppunitTest_use_externals,vcl_bitmap_render_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_components,vcl_bitmap_render_test,\
+configmgr/source/configmgr \
+i18npool/util/i18npool \
+ucb/source/core/ucb1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_bitmap_render_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 59e5b9c2045f..bfd6bdf09c8e 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -191,7 +191,8 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_jpeg_read_write_test \
CppunitTest_vcl_svm_test \
CppunitTest_vcl_pdfexport \
-CppunitTest_vcl_errorhandler \
+   CppunitTest_vcl_errorhandler \
+   CppunitTest_vcl_bitmap_render_test \
 ))
 
 
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx 
b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
new file mode 100644
index ..2ee32a812d55
--- /dev/null
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+class BitmapRenderTest : public test::BootstrapFixture
+{
+OUString maDataUrl;
+
+OUString getFullUrl(const OUString& sFileName)
+{
+return m_directories.getURLFromSrc(maDataUrl) + sFileName;
+}
+
+public:
+BitmapRenderTest()
+: BootstrapFixture(true, false)
+, maDataUrl("/vcl/qa/cppunit/bitmaprender/data/")
+{
+}
+
+void testTdf104141();
+void testTdf113918();
+
+CPPUNIT_TEST_SUITE(BitmapRenderTest);
+CPPUNIT_TEST(testTdf104141);
+CPPUNIT_TEST(testTdf113918);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void BitmapRenderTest::testTdf104141()
+{
+ScopedVclPtrInstance pVDev;
+pVDev->SetOutputSizePixel(Size(400, 400));
+pVDev->SetBackground(Wallpaper(COL_GREEN));
+pVDev->Erase();
+
+// Load animated GIF and draw it on green background
+GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+Graphic aGraphic;
+const OUString aURL(getFullUrl("tdf104141.gif"));
+SvFileStream aFileStream(aURL, StreamMode::READ);
+ErrCode bResult = rFilter.ImportGraphic(aGraphic, aURL, aFileStream);
+CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
+BitmapEx aBitmap = aGraphic.GetBitmapEx();
+pVDev->DrawBitmapEx(Point(20, 20), aBitmap);
+
+// Check drawing resuts: ensure that it contains transparent (green) pixels
+#if !defined MACOSX //TODO: on Mac colors are drifted, so exact compare fails
+C

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

[Jim Raykowski]

 sw/source/uibase/utlui/content.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0fab443fc5016d3088e485210a13f121a1ec1ee9
Author: Jim Raykowski 
Date:   Thu Apr 19 00:53:38 2018 -0800

tdf#117024 Make Navigator Drawing objects scroll

Change-Id: I6ef690306e1988a4de1d9407fe9ae9f2ea1736b1
Reviewed-on: https://gerrit.libreoffice.org/53142
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 40477f01982a..a4932d34a7eb 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3473,6 +3473,9 @@ void SwContentTree::GotoContent(SwContent* pCnt)
 if( pPV )
 {
 pDrawView->MarkObj( pTemp, pPV );
+m_pActiveShell->EnterStdMode();
+bSel = true;
+break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild solenv/sanitizers

[Samuel Thibault]

 solenv/gbuild/UIConfig.mk   |2 -
 solenv/sanitizers/ui/cui.suppr  |   41 
 solenv/sanitizers/ui/dbaccess.suppr |   14 +
 solenv/sanitizers/ui/formula.suppr  |7 
 solenv/sanitizers/ui/fps.suppr  |3 ++
 solenv/sanitizers/ui/modules/dbreport.suppr |4 ++
 solenv/sanitizers/ui/modules/scanner.suppr  |3 ++
 solenv/sanitizers/ui/modules/schart.suppr   |6 
 solenv/sanitizers/ui/modules/simpress.suppr |9 ++
 solenv/sanitizers/ui/modules/swriter.suppr  |   33 ++
 solenv/sanitizers/ui/svt.suppr  |1 
 solenv/sanitizers/ui/svx.suppr  |2 +
 solenv/sanitizers/ui/vcl.suppr  |3 ++
 13 files changed, 127 insertions(+), 1 deletion(-)

New commits:
commit 79391d92df7a474651e02980f238eac4781305ce
Author: Samuel Thibault 
Date:   Mon Apr 16 13:52:38 2018 +0200

gla11y: Enable button labelling warnings

Change-Id: Ie6a45060e252e75b76fb6222d02403de6d4bccfd
Reviewed-on: https://gerrit.libreoffice.org/52968
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 36ffdeb0d511..1d9ede0986d1 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -165,7 +165,7 @@ gb_UIConfig_gla11y_PARAMETERS += --enable-type 
missing-label-for
 gb_UIConfig_gla11y_PARAMETERS += --enable-type missing-labelled-by
 
 # These are often buttons with only an image
-#gb_UIConfig_gla11y_PARAMETERS += --enable-type button-no-label
+gb_UIConfig_gla11y_PARAMETERS += --enable-type button-no-label
 # These are often doubtful
 #gb_UIConfig_gla11y_PARAMETERS += --enable-type duplicate-mnemonic 
--enable-type labelled-by-and-mnemonic
 
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 598c7a600ae3..3cf4f506104c 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -1,3 +1,5 @@
+cui/uiconfig/ui/comment.ui://GtkButton[@id='previous'] button-no-label
+cui/uiconfig/ui/comment.ui://GtkButton[@id='next'] button-no-label
 cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='incrementslider'] 
no-labelled-by
 cui/uiconfig/ui/gradientpage.ui://GtkLabel[@id='centerft'] orphan-label
 cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='borderslider'] no-labelled-by
@@ -6,3 +8,42 @@ cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='angleft'] 
orphan-label
 cui/uiconfig/ui/hatchpage.ui://GtkScale[@id='angleslider'] no-labelled-by
 cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='linetypeft'] orphan-label
 cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='linecolorft'] orphan-label
+cui/uiconfig/ui/hyphenate.ui://GtkLabel[@id='label1'] orphan-label
+cui/uiconfig/ui/hyphenate.ui://GtkButton[@id='left'] button-no-label
+cui/uiconfig/ui/hyphenate.ui://GtkButton[@id='right'] button-no-label
+cui/uiconfig/ui/optemailpage.ui://GtkLabel[@id='browsetitle'] orphan-label
+cui/uiconfig/ui/optemailpage.ui://GtkLabel[@id='suppress'] orphan-label
+cui/uiconfig/ui/optemailpage.ui://GtkCheckButton[@id='suppressHidden'] 
button-no-label
+cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='always'] orphan-label
+cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='screenonly'] orphan-label
+cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='font'] orphan-label
+cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='replacewith'] orphan-label
+cui/uiconfig/ui/optfontspage.ui://GtkButton[@id='apply'] button-no-label
+cui/uiconfig/ui/optfontspage.ui://GtkButton[@id='delete'] button-no-label
+cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default1'] 
button-no-label
+cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default2'] 
button-no-label
+cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default3'] 
button-no-label
+cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='applied_theme'] 
orphan-label
+cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='extensions_label'] 
orphan-label
+cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='persona_preview'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='suggestion1'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='suggestion2'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='suggestion3'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='suggestion4'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='suggestion5'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='suggestion6'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result1'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result2'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result3'] 
button-no-label
+cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result4'] 
button-no-label
+cui/u

[Libreoffice-commits] online.git: Branch 'private/mmeeks/renamed' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/mmeeks/thinjail' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'private/mmeeks/monitoring'

[Michael Meeks]

New branch 'private/mmeeks/monitoring' available with the following commits:
commit 1396145855a9852d7f1787f90ed462e4bbe9ef06
Author: Michael Meeks 
Date:   Wed Apr 18 19:20:54 2018 +0100

Allow a 'monitor' to be connected to remotely if configured.

So far monitors have the access an permissions of an
authenticated admin.

Change-Id: I59dfa8a646a60584a5c113ee0521e9afba4f6b76

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source oox/source sw/CppunitTest_sw_ww8import.mk sw/qa vcl/source

[Miklos Vajna]

 filter/source/msfilter/msdffimp.cxx |9 -
 oox/source/helper/graphichelper.cxx |7 +--
 sw/CppunitTest_sw_ww8import.mk  |1 +
 sw/qa/extras/ww8import/data/image-lazy-read.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx|8 
 vcl/source/filter/graphicfilter.cxx |1 +
 vcl/source/graphic/UnoGraphicProvider.cxx   |6 +++---
 7 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit b11188835d3b87cd9d2a8cdb3da204cfda5d3e6e
Author: Miklos Vajna 
Date:   Fri Apr 20 17:58:09 2018 +0200

DOC import: lazy-read images

At least JPEG files are now only loaded when the user scrolls to the
relevant page.

Also fix the root cause of the EMF lazy-read problem and remove the
previous workarounds.

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index f2fbc026c16d..3e80858d9275 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6545,7 +6545,14 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& 
rBLIPStream, Graphic& rData, tool
 else
 {   // and unleash our filter
 GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
-nRes = rGF.ImportGraphic( rData, "", *pGrStream );
+Graphic aGraphic = rGF.ImportUnloadedGraphic(*pGrStream);
+if (aGraphic)
+{
+rData = aGraphic;
+nRes = ERRCODE_NONE;
+}
+else
+nRes = rGF.ImportGraphic( rData, "", *pGrStream );
 
 // SJ: I40472, sometimes the aspect ratio (aMtfSize100) does not 
match and we get scaling problems,
 // then it is better to use the prefsize that is stored within the 
metafile. Bug #72846# for what the
diff --git a/oox/source/helper/graphichelper.cxx 
b/oox/source/helper/graphichelper.cxx
index 002d54b946b5..073cfe6d694f 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -244,7 +244,7 @@ Reference< XGraphic > GraphicHelper::importGraphic( const 
Reference< XInputStrea
 aArgs[ 1 ].Name = "LazyRead";
 aArgs[ 1 ].Value <<= true;
 
-if ( pExtHeader )
+if ( pExtHeader && pExtHeader->mapMode > 0 )
 {
 aArgs.realloc( aArgs.getLength() + 1 );
 Sequence< PropertyValue > aFilterData( 3 );
@@ -341,11 +341,6 @@ Reference< XGraphic > 
GraphicHelper::importEmbeddedGraphic( const OUString& rStr
 EmbeddedGraphicMap::const_iterator aIt = maEmbeddedGraphics.find( 
rStreamName );
 if( aIt == maEmbeddedGraphics.end() )
 {
-// TODO make lazy-load work for EMF as well.
-WmfExternal aHeader;
-if (rStreamName.endsWith(".emf") && !pExtHeader)
-pExtHeader = &aHeader;
-
 xGraphic = importGraphic(mxStorage->openInputStream(rStreamName), 
pExtHeader);
 if( xGraphic.is() )
 maEmbeddedGraphics[ rStreamName ] = xGraphic;
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 7e40c058e722..b7102196a27f 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \
 sal \
 test \
 unotest \
+vcl \
 sfx \
 sw \
utl \
diff --git a/sw/qa/extras/ww8import/data/image-lazy-read.doc 
b/sw/qa/extras/ww8import/data/image-lazy-read.doc
new file mode 100644
index ..95017d2ac80e
Binary files /dev/null and b/sw/qa/extras/ww8import/data/image-lazy-read.doc 
differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 907fe47ebcff..de16cfe253e6 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -116,6 +116,14 @@ DECLARE_WW8IMPORT_TEST( testTdf105570, "tdf105570.doc" )
 CPPUNIT_ASSERT_EQUAL( sal_uInt16(0), 
pTableNd->GetTable().GetRowsToRepeat() );
 }
 
+DECLARE_OOXMLIMPORT_TEST(testImageLazyRead, "image-lazy-read.doc")
+{
+auto xGraphic = 
getProperty>(getShape(1), "Graphic");
+Graphic aGraphic(xGraphic);
+// This failed, import loaded the graphic, it wasn't lazy-read.
+CPPUNIT_ASSERT(!aGraphic.isAvailable());
+}
+
 DECLARE_WW8IMPORT_TEST(testTdf106799, "tdf106799.doc")
 {
 sal_Int32 const nCellWidths[3][4] = { { 9530, 0, 0, 0 },{ 2382, 2382, 
2382, 2384 },{ 2382, 2382, 2382, 2384 } };
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 023c07ecb9a2..43feef35e5e2 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1572,6 +1572,7 @@ Graphic GraphicFilter::ImportUnloadedGraphic(SvStrea

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

[Noel Grandin]

 sc/source/ui/miscdlgs/delcodlg.cxx |2 +-
 sc/source/ui/miscdlgs/inscodlg.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 40edbce3988946d0ffceb9554de42e1e469edd92
Author: Noel Grandin 
Date:   Fri Apr 20 15:20:43 2018 +0200

fix for "drop IS_SET macro"

regression from

commit 8c9c1b852ce0ebc6bd19437e9e583ef4226cf685
Date:   Wed Apr 18 14:12:06 2018 +0200
drop IS_SET macro

Jochen Nitschke: InsertDeleteFlags::ATTRIB sets 2 bits, before it
checked both bits and now it's true if only one of them is set.

Change-Id: I169ffae10d219063ce378257e95fbb4f863ca525
Reviewed-on: https://gerrit.libreoffice.org/53211
Tested-by: Jenkins 
Reviewed-by: Jochen Nitschke 

diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx 
b/sc/source/ui/miscdlgs/delcodlg.cxx
index 36b9e3f4062b..19d098994c76 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -51,7 +51,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* 
pParent, InsertDeleteFlag
 m_xBtnDelDateTime->set_active( bool(InsertDeleteFlags::DATETIME & 
ScDeleteContentsDlg::nPreviousChecks) );
 m_xBtnDelFormulas->set_active( bool(InsertDeleteFlags::FORMULA & 
ScDeleteContentsDlg::nPreviousChecks) );
 m_xBtnDelNotes->set_active( bool(InsertDeleteFlags::NOTE & 
ScDeleteContentsDlg::nPreviousChecks) );
-m_xBtnDelAttrs->set_active( bool(InsertDeleteFlags::ATTRIB & 
ScDeleteContentsDlg::nPreviousChecks) );
+m_xBtnDelAttrs->set_active( (InsertDeleteFlags::ATTRIB & 
ScDeleteContentsDlg::nPreviousChecks) == InsertDeleteFlags::ATTRIB );
 m_xBtnDelObjects->set_active( bool(InsertDeleteFlags::OBJECTS & 
ScDeleteContentsDlg::nPreviousChecks) );
 
 DisableChecks( m_xBtnDelAll->get_active() );
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx 
b/sc/source/ui/miscdlgs/inscodlg.cxx
index 1c8c62c79608..52935098d96e 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -81,7 +81,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*   
pParent,
 mpBtnInsDateTime->Check( bool(InsertDeleteFlags::DATETIME & 
ScInsertContentsDlg::nPreviousChecks) );
 mpBtnInsFormulas->Check( bool(InsertDeleteFlags::FORMULA & 
ScInsertContentsDlg::nPreviousChecks) );
 mpBtnInsNotes->Check   ( bool(InsertDeleteFlags::NOTE & 
ScInsertContentsDlg::nPreviousChecks) );
-mpBtnInsAttrs->Check   ( bool(InsertDeleteFlags::ATTRIB & 
ScInsertContentsDlg::nPreviousChecks) );
+mpBtnInsAttrs->Check   ( (InsertDeleteFlags::ATTRIB & 
ScInsertContentsDlg::nPreviousChecks) == InsertDeleteFlags::ATTRIB );
 mpBtnInsObjects->Check ( bool(InsertDeleteFlags::OBJECTS & 
ScInsertContentsDlg::nPreviousChecks) );
 
 switch( ScInsertContentsDlg::nPreviousFormulaChecks )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 oox/source/helper/graphichelper.cxx|   15 +++
 sw/qa/extras/ooxmlimport/data/image-lazy-read.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |8 
 vcl/source/filter/graphicfilter2.cxx   |9 -
 vcl/source/gdi/impgraph.cxx|   16 ++--
 vcl/source/graphic/UnoGraphicProvider.cxx  |   19 +--
 6 files changed, 58 insertions(+), 9 deletions(-)

New commits:
commit edda1e5fc8113aa4744e32f97c96a3cc311485ca
Author: Miklos Vajna 
Date:   Fri Apr 20 16:32:00 2018 +0200

DOCX import: lazy-read images without external headers

So that similar to ODT, images are not loaded on file open, only when
the user scrolls there.

Notes:

1) GraphicDescriptor::ImpDetectJPG() would try to calculate the logic
size before the pixel size is available, so the logic size would be 0x0.
Also, ImpGraphic::ImplSetPrepared() would always work with a pixel map
mode. Any of these two would result in a failure of
testDMLShapeFillBitmapCrop in CppunitTest_sw_ooxmlexport6.

2) Lazy-loading seems to (at the moment) not recognize EMF files, so
don't lazy-load in case an external header is provided. This probably
has to be revisited, since the ODF import doesn't go via
GraphicProvider::queryGraphic().

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

diff --git a/oox/source/helper/graphichelper.cxx 
b/oox/source/helper/graphichelper.cxx
index 7f4262de787c..002d54b946b5 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -238,11 +238,13 @@ Reference< XGraphic > GraphicHelper::importGraphic( const 
Reference< XInputStrea
 Reference< XGraphic > xGraphic;
 if( rxInStrm.is() && mxGraphicProvider.is() ) try
 {
-Sequence< PropertyValue > aArgs( 1 );
+Sequence< PropertyValue > aArgs( 2 );
 aArgs[ 0 ].Name = "InputStream";
 aArgs[ 0 ].Value <<= rxInStrm;
+aArgs[ 1 ].Name = "LazyRead";
+aArgs[ 1 ].Value <<= true;
 
-if ( pExtHeader && pExtHeader->mapMode > 0 )
+if ( pExtHeader )
 {
 aArgs.realloc( aArgs.getLength() + 1 );
 Sequence< PropertyValue > aFilterData( 3 );
@@ -252,8 +254,8 @@ Reference< XGraphic > GraphicHelper::importGraphic( const 
Reference< XInputStrea
 aFilterData[ 1 ].Value <<= pExtHeader->yExt;
 aFilterData[ 2 ].Name = "ExternalMapMode";
 aFilterData[ 2 ].Value <<= pExtHeader->mapMode;
-aArgs[ 1 ].Name = "FilterData";
-aArgs[ 1 ].Value <<= aFilterData;
+aArgs[ 2 ].Name = "FilterData";
+aArgs[ 2 ].Value <<= aFilterData;
 }
 
 xGraphic = mxGraphicProvider->queryGraphic( aArgs );
@@ -339,6 +341,11 @@ Reference< XGraphic > 
GraphicHelper::importEmbeddedGraphic( const OUString& rStr
 EmbeddedGraphicMap::const_iterator aIt = maEmbeddedGraphics.find( 
rStreamName );
 if( aIt == maEmbeddedGraphics.end() )
 {
+// TODO make lazy-load work for EMF as well.
+WmfExternal aHeader;
+if (rStreamName.endsWith(".emf") && !pExtHeader)
+pExtHeader = &aHeader;
+
 xGraphic = importGraphic(mxStorage->openInputStream(rStreamName), 
pExtHeader);
 if( xGraphic.is() )
 maEmbeddedGraphics[ rStreamName ] = xGraphic;
diff --git a/sw/qa/extras/ooxmlimport/data/image-lazy-read.docx 
b/sw/qa/extras/ooxmlimport/data/image-lazy-read.docx
new file mode 100644
index ..faf80e41dcd6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/image-lazy-read.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 439658a63b39..7b60b191df67 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1422,6 +1422,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108714, "tdf108714.docx")
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testImageLazyRead, "image-lazy-read.docx")
+{
+auto xGraphic = 
getProperty>(getShape(1), "Graphic");
+Graphic aGraphic(xGraphic);
+// This failed, import loaded the graphic, it wasn't lazy-read.
+CPPUNIT_ASSERT(!aGraphic.isAvailable());
+}
+
 DECLARE_OOXMLIMPORT_TEST(testTdf108995, "xml_space.docx")
 {
 CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
diff --git a/vcl/source/filter/graphicfilter2.cxx 
b/vcl/source/filter/graphicfilter2.cxx
index f35ac1c37c81..4439c2ab8b50 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -262,6 +262,7 @@ bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  bool 
bExtendedInfo )
 
 bool bScanFailure = false;
 

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

[Muhammet Kara]

 include/vcl/lstbox.hxx |   13 +
 vcl/inc/listbox.hxx|   37 ++---
 vcl/source/control/imp_listbox.cxx |   29 +
 vcl/source/control/listbox.cxx |5 +
 4 files changed, 77 insertions(+), 7 deletions(-)

New commits:
commit e9c52f55f0cc7155d6883e4d2abf14f1638b03b3
Author: Muhammet Kara 
Date:   Thu Apr 19 21:36:08 2018 +0300

towards solving tdf#112323: Allow multiple separators in listboxes

Change-Id: I40e2d9faa4121ad99e28cbae0d8eea8e46bc1e9a
Reviewed-on: https://gerrit.libreoffice.org/53174
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 5c8c6d29938e..62ad36283adc 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -202,9 +202,22 @@ public:
 sal_Int32   GetSavedValue() const { return mnSaveValue; }
 boolIsValueChangedFromSaved() const { return mnSaveValue 
!= GetSelectedEntryPos(); }
 
+/**
+ * Removes existing separators, and sets the position of the
+ * one and only separator.
+ */
 voidSetSeparatorPos( sal_Int32 n );
+/**
+ * Gets the position of the separator which was added first.
+ * Returns LISTBOX_ENTRY_NOTFOUND if there is no separator.
+ */
 sal_Int32   GetSeparatorPos() const;
 
+/**
+ * Adds a new separator at the given position n.
+ */
+voidAddSeparator( sal_Int32 n );
+
 boolIsTravelSelect() const;
 boolIsInDropDown() const;
 voidToggleDropDown();
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index cea25b5cfeb0..313ff8cbd047 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -182,7 +183,7 @@ private:
 sal_Int32   mnCurrentPos;///< Position (Focus)
 sal_Int32   mnTrackingSaveSelection; ///< Selection before Tracking();
 
-sal_Int32   mnSeparatorPos; ///< Separator
+std::set< sal_Int32 > maSeparators; ///< Separator positions
 
 sal_Int32   mnUserDrawEntry;
 
@@ -289,8 +290,25 @@ public:
 voidAllowGrabFocus( bool b ){ mbGrabFocus = b; }
 boolIsGrabFocusAllowed() const  { return mbGrabFocus; }
 
-voidSetSeparatorPos( sal_Int32  n ) { mnSeparatorPos = n; }
-sal_Int32   GetSeparatorPos() const { return mnSeparatorPos; }
+/**
+ * Removes existing separators, and sets the position of the
+ * one and only separator.
+ */
+voidSetSeparatorPos( sal_Int32  n );
+/**
+ * Gets the position of the separator which was added first.
+ * Returns LISTBOX_ENTRY_NOTFOUND if there is no separator.
+ */
+sal_Int32   GetSeparatorPos() const;
+
+/**
+ * Adds a new separator at the given position n.
+ */
+voidAddSeparator( sal_Int32 n ) { maSeparators.insert( n 
); }
+/**
+ * Checks if the given number n is an element of the separator positions 
set.
+ */
+boolisSeparator( const sal_Int32 &n ) const;
 
 voidSetTravelSelect( bool bTravelSelect ) { mbTravelSelect = 
bTravelSelect; }
 boolIsTravelSelect() const  { return mbTravelSelect; }
@@ -409,9 +427,22 @@ public:
 boolProcessKeyInput( const KeyEvent& rKEvt ){ return 
maLBWindow->ProcessKeyInput( rKEvt ); }
 boolHandleWheelAsCursorTravel( const CommandEvent& rCEvt );
 
+/**
+ * Removes existing separators, and sets the position of the
+ * one and only separator.
+ */
 voidSetSeparatorPos( sal_Int32  n ) { 
maLBWindow->SetSeparatorPos( n ); }
+/**
+ * Gets the position of the separator which was added first.
+ * Returns LISTBOX_ENTRY_NOTFOUND if there is no separator.
+ */
 sal_Int32   GetSeparatorPos() const { return 
maLBWindow->GetSeparatorPos(); }
 
+/**
+ * Adds a new separator at the given position n.
+ */
+voidAddSeparator( sal_Int32 n ) { 
maLBWindow->AddSeparator( n ); }
+
 voidSetTopEntry( sal_Int32  nTop )  { 
maLBWindow->SetTopEntry( nTop ); }
 sal_Int32   GetTopEntry() const { return 
maLBWindow->GetTopEntry(); }
 voidShowProminentEntry( sal_Int32  nPos ) { 
maLBWindow->ShowProminentEntry( nPos ); }
diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index 171b75afd151..7dbabad9934a 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -491,7 +491,6 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, 
WinBits nWinStyle )
 
 mnCurrentPos= LISTBOX_ENTRY_NOTFOUND;
 mnTrackingSaveSelection = LISTBOX_ENTRY_

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

[David Tardon]

 configure.ac |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit f1451fb7742bba9da298027e3ab79390acb196d9
Author: David Tardon 
Date:   Sun Feb 4 09:35:10 2018 +0100

drop pointless check for bzip2

There are many .tar.bz2 (or .tar.xz) tarballs in the bundled projects.
It doesn't make sense to check for bzip2 just for one of them.

diff --git a/configure.ac b/configure.ac
index 6f9b2dc7fc90..f52b0b2b0310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8256,13 +8256,6 @@ internal)
 if test "$HOME" = ""; then
 export HOME=""
 fi
-# bz2 tarball and bzip2 is not standard
-if test -z "$BZIP2"; then
-AC_PATH_PROG( BZIP2, bzip2)
-if test -z "$BZIP2"; then
-AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need 
bzip2])
-fi
-fi
 ;;
 no)
 DISABLE_PYTHON=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Sophia Schröder]

 source/text/shared/01/06140400.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 179f2229a0cddb93cccffe04b0c511da73b452fe
Author: Sophia Schröder 
Date:   Thu Apr 19 18:43:24 2018 +0100

Fixing wrong help text

it is the other way around, no?

left arrow button <-> right arrow button

Change-Id: I2af8aae09f2e9a70daeee062be7cb72b315c6336
Reviewed-on: https://gerrit.libreoffice.org/53172
Tested-by: Jenkins 
Reviewed-by: dennisroczek 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/06140400.xhp 
b/source/text/shared/01/06140400.xhp
index bb5a437ef..92110b7c9 100644
--- a/source/text/shared/01/06140400.xhp
+++ b/source/text/shared/01/06140400.xhp
@@ -55,10 +55,10 @@
 Remove
 Click 
on the remove button to delete the toolbar.
 You can only delete 
custom toolbar and custom toolbar entries.
-Left Arrow button
-Click 
on the left arrow button to select a function on the left display box and copy 
to the right display box. This will add the function to the selected 
toolbar.
-Right Arrow button
-Click 
on the right arrow button to remove the selected command from the current 
toolbar.
+Right Arrow button
+Click 
on the right arrow button to select a function on the left display box and copy 
to the right display box. This will add the function to the selected 
toolbar.
+Left Arrow button
+Click 
on the left arrow button to remove the selected command from the current 
toolbar.
 Up and Down Arrow buttons
 Click 
on the Up or Down arrows on the right to move the selected command upward or 
downward in the list of displayed toolbar commands.
 You can drag 
and drop the selected command to move it to the position you want.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Sophia Schröder]

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

New commits:
commit 3d8bbd690e6dd9f72c2d5fe53b8df7369b9f80ce
Author: Sophia Schröder 
Date:   Thu Apr 19 18:43:24 2018 +0100

Updated core
Project: help  179f2229a0cddb93cccffe04b0c511da73b452fe

Fixing wrong help text

it is the other way around, no?

left arrow button <-> right arrow button

Change-Id: I2af8aae09f2e9a70daeee062be7cb72b315c6336
Reviewed-on: https://gerrit.libreoffice.org/53172
Tested-by: Jenkins 
Reviewed-by: dennisroczek 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fe257ad7f55c..179f2229a0cd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fe257ad7f55c500237bbeba8c6e13d7aa682fc22
+Subproject commit 179f2229a0cddb93cccffe04b0c511da73b452fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vitaliy Anderson]

 sw/source/core/text/itrform2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0be3db28a4db4d2c81a5cb2edd48711eec55b51b
Author: Vitaliy Anderson 
Date:   Mon Feb 19 12:43:09 2018 +0300

tdf#115067: We need to differentiate NBSP blank portions

regression from commit 1c1747ac13a9d895df0fcba2fbb1bd266dccd74b
  tdf#104668 remove the difference between MSO and LO text alignment

Change-Id: I9516340a488f5e1d060dbe5f510eb85030d75ddc
Reviewed-on: https://gerrit.libreoffice.org/49972
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
old mode 100644
new mode 100755
index f05a5f872509..3e32430d1c36
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1309,7 +1309,8 @@ SwLinePortion *SwTextFormatter::NewPortion( 
SwTextFormatInfo &rInf )
 pPor = new SwSoftHyphPortion; break;
 
 case CHAR_HARDBLANK:// no-break space
-pPor = new SwBlankPortion( ' ' ); break;
+// Please check tdf#115067 if you want to edit the char
+pPor = new SwBlankPortion( cChar ); break;
 
 case CHAR_HARDHYPHEN:   // non-breaking hyphen
 pPor = new SwBlankPortion( '-' ); 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/cp-5.3' - chart2/source vcl/source

[Marco Cecchetti]

 chart2/source/controller/main/ChartController_Window.cxx |   14 ++
 vcl/source/window/floatwin.cxx   |   11 +++
 2 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit fc409bae21ff400736278294ab6a82a5f3cedfa7
Author: Marco Cecchetti 
Date:   Wed Apr 18 18:31:00 2018 +0200

lok: charts context menu was misplaced + wrong LogicToLogic conversion

Chart context menu was misplaced since the context menu expects a
position related to the document window not to the chart window.
Moreover map mode is not enabled for chart window, that leads to use
the LogicToLogic routine which unfortunately provides a wrong pixel to
twips conversion. In fact we gets a 20 twips per pixel conversion
since LogicToLogic uses a fixed 72 dpi value, instead of a correctly
computed output device real dpi or at least the most commonly used 96
dpi value.

Change-Id: Idb4220d03fddd4b6d643c1c0fb52754bafed7e36
Reviewed-on: https://gerrit.libreoffice.org/53118
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index 58f7206554ec..6bf0446cc24c 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -63,6 +63,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1238,6 +1239,19 @@ void ChartController::execute_Command( const 
CommandEvent& rCEvt )
 {
 PopupMenu* pPopupMenu = 
static_cast(VCLXMenu::GetImplementation(xPopupMenu)->GetMenu());
 pPopupMenu->SetLOKNotifier(SfxViewShell::Current());
+
+// the context menu expects a position related to the document 
window,
+// not to the chart window
+SfxInPlaceClient* pIPClient = 
SfxViewShell::Current()->GetIPClient();
+if (pIPClient)
+{
+vcl::Window* pRootWin = pIPClient->GetEditWin();
+if (pRootWin)
+{
+Point aOffset = 
m_pChartWindow->GetOffsetPixelFrom(*pRootWin);
+aPos += aOffset;
+}
+}
 }
 
 xPopupController->setPopupMenu( xPopupMenu );
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 2a9b7aab26cf..302703bf4e8a 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -445,10 +445,13 @@ Point FloatingWindow::ImplCalcPos(vcl::Window* pWindow,
 
 if (bLOKActive && pLOKTwipsPos)
 {
-if (pW->IsMapModeEnabled())
-*pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip));
-else
-*pLOKTwipsPos = pW->LogicToLogic(aPos, pW->GetMapMode(), 
MapMode(MapUnit::MapTwip));
+// if we use pW->LogicToLogic(aPos, pW->GetMapMode(), 
MapMode(MapUnit::MapTwip)),
+// when map mode is not enabled, we gets a 20 twips per pixel 
conversion
+// since LogicToLogic uses a fixed 72 dpi value, instead of a correctly
+// computed output device dpi or at least the most commonly used 96 dpi
+// value; and anyway the following is what we already do in
+// ScGridWindow::LogicInvalidate when map mode is not enabled.
+*pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip));
 }
 
 // caller expects coordinates relative to top-level win
___
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' - editeng/qa editeng/source

[Szymon Kłos]

 editeng/qa/unit/core-test.cxx   |2 +-
 editeng/source/editeng/impedit3.cxx |   11 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit e449872333d0c0664eeecb5bb15331d397c1f011
Author: Szymon Kłos 
Date:   Fri Mar 23 19:51:37 2018 +0100

tdf#116536 Fix bullet position with linespacing > 100

Change-Id: I862246d9c69e754bdd883787fe42c7d61a1a53d3
Reviewed-on: https://gerrit.libreoffice.org/51790
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/52290
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 01d51eb271d3..b362a9db19ca 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -200,7 +200,7 @@ void Test::testLineSpacing()
 
 // Check the first line
 ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0);
-CPPUNIT_ASSERT_EQUAL(sal_uInt16(311), aInfo2.nFirstLineMaxAscent);
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(337), aInfo2.nFirstLineMaxAscent);
 CPPUNIT_ASSERT_EQUAL(sal_uInt16(382), 
static_cast(aEditEngine.GetLineHeight(0)));
 }
 
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 01050ab5d3c8..cb14f5ba94de 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1416,14 +1416,11 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, 
sal_uInt32 nStartPosY )
 else if ( rLSItem.GetPropLineSpace() && ( 
rLSItem.GetPropLineSpace() != 100 ) )
 {
 sal_uInt16 nTxtHeight = pLine->GetHeight();
-sal_Int32 nTxtHeightProp = nTxtHeight * 
rLSItem.GetPropLineSpace() / 100;
-sal_Int32 nHeightProp = pLine->GetHeight() * 
rLSItem.GetPropLineSpace() / 100;
+sal_Int32 nPropTextHeight = nTxtHeight * 
rLSItem.GetPropLineSpace() / 100;
 // The Ascent has to be adjusted for the difference:
-long nDiff = ( pLine->GetHeight() - nTxtHeightProp ) * 4 / 
5;
-if ( nDiff > pLine->GetMaxAscent() )
-nDiff = pLine->GetMaxAscent() * 4 / 5;
-pLine->SetMaxAscent( static_cast( 
pLine->GetMaxAscent() - nDiff ) ); // 80%
-pLine->SetHeight( static_cast( nHeightProp ), 
nTxtHeightProp );
+long nDiff = pLine->GetHeight() - nPropTextHeight;
+pLine->SetMaxAscent( static_cast( 
pLine->GetMaxAscent() - nDiff ) );
+pLine->SetHeight( static_cast( nPropTextHeight 
), nTxtHeight );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Tamás Zolnai]

 loleaflet/src/control/Control.LokDialog.js |4 
 1 file changed, 4 insertions(+)

New commits:
commit 83f200b41bd48d850aea68e22b1637e13882c52a
Author: Tamás Zolnai 
Date:   Tue Apr 17 20:06:13 2018 +0200

Mouse hover effect for context menu

Change-Id: I305704a9da0634367922ab9c29e2956b3ead9624
Reviewed-on: https://gerrit.libreoffice.org/53103
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 2c2c7bf72..aea8d2699 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -292,6 +292,10 @@ L.Control.LokDialog = L.Control.extend({
this._createDialogCursor(strDlgId);
var dlgInput = this._createDialogInput(strDlgId);
 
+   L.DomEvent.on(dialogCanvas, 'mousemove', function(e) {
+   if (!this._dialogs[this._currentId].title) // For 
context menu
+   this._postWindowMouseEvent('move', 
this._toRawDlgId(strDlgId), e.offsetX, e.offsetY, 1, 0, 0);
+   }, this);
L.DomEvent.on(dialogCanvas, 'mousedown mouseup', function(e) {
L.DomEvent.stopPropagation(e);
var buttons = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 loleaflet/src/control/Control.LokDialog.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 835f7c2d50c5f21ab02e39e27755d2038dc55a6d
Author: Tamás Zolnai 
Date:   Tue Apr 17 20:06:13 2018 +0200

Mouse hover effect for context menu

Change-Id: I305704a9da0634367922ab9c29e2956b3ead9624
Reviewed-on: https://gerrit.libreoffice.org/53059
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 5766458c8..48dacd53d 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -290,8 +290,10 @@ L.Control.LokDialog = L.Control.extend({
var dlgInput = this._createDialogInput(strDlgId);
 
L.DomEvent.on(dialogCanvas, 'contextmenu', 
L.DomEvent.preventDefault);
-   L.DomEvent.on(dialogCanvas, 'mousemove', function() {
+   L.DomEvent.on(dialogCanvas, 'mousemove', function(e) {
this._map.lastActiveTime = Date.now();
+   if (!this._dialogs[this._currentId].title) // For 
context menu
+   this._postWindowMouseEvent('move', 
this._toRawDlgId(strDlgId), e.offsetX, e.offsetY, 1, 0, 0);
}, this);
L.DomEvent.on(dialogCanvas, 'mousedown mouseup', function(e) {
L.DomEvent.stopPropagation(e);
___
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-6.0' - include/sfx2 sfx2/source sw/inc sw/source

[Tamás Zolnai]

 include/sfx2/shell.hxx   |8 
 sfx2/source/control/dispatch.cxx |   18 +-
 sfx2/source/control/shell.cxx|   15 +++
 sw/inc/view.hxx  |2 ++
 sw/source/uibase/uiview/view2.cxx|   15 +++
 sw/source/uibase/uiview/viewstat.cxx |2 +-
 6 files changed, 42 insertions(+), 18 deletions(-)

New commits:
commit eded8ebec2961de705a0177b7422a4c8d2513ac8
Author: Tamás Zolnai 
Date:   Thu Apr 19 12:10:52 2018 +0200

sw lok: Accept / reject change is always enabled in the context menu

Use conditional fastcall for allow executing these two uno commands
even if there is no tracked changes at the cursor position instead of
enable the menu slots unconditionally.

See also:
b6011f07254f8003929320ad842d8d09daca0e09

Change-Id: Iaf8a8082961cd174c038fc021d2c41fb7cb97bff
Reviewed-on: https://gerrit.libreoffice.org/53148
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 67919621cb0b95074c4401bdfced9d87b230cc2f)
Reviewed-on: https://gerrit.libreoffice.org/53180
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 41d65d3e134b..597e3cd56b4c 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -482,6 +482,14 @@ public:
 
 /**
 
+This method determines whether we need to execute without checking
+the disabled state of the slot. This is used for dynamic conditions
+while you can use SfxSlotMode::FASTCALL for a specific slotid in 
general.
+*/
+virtual bool IsConditionalFastCall( const SfxRequest &rReq );
+
+/**
+
 This method controls the activation of SfxShell instance. First, by 
calling
 the virtual method  which gives the 
subclass the
 opportunity to respond to the event.
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index b4606a7401ca..5ea2ca744ea9 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -312,22 +312,6 @@ bool SfxDispatcher::IsAppDispatcher() const
 return !xImp->pFrame;
 }
 
-/// Decides if the request is FASTCALL or not, depending on arguments.
-bool lcl_IsConditionalFastCall(SfxRequest const &rReq)
-{
-sal_uInt16 nId = rReq.GetSlot();
-bool bRet = false;
-
-if (nId == SID_UNDO || nId == SID_REDO)
-{
-const SfxItemSet* pArgs = rReq.GetArgs();
-if (pArgs && pArgs->HasItem(SID_REPAIRPACKAGE))
-bRet = true;
-}
-
-return bRet;
-}
-
 /** Helper function to check whether a slot can be executed and
 check the execution itself
 */
@@ -336,7 +320,7 @@ void SfxDispatcher::Call_Impl(SfxShell& rShell, const 
SfxSlot &rSlot, SfxRequest
 SFX_STACK(SfxDispatcher::Call_Impl);
 
 // The slot may be called (meaning enabled)
-if ( rSlot.IsMode(SfxSlotMode::FASTCALL) || 
rShell.CanExecuteSlot_Impl(rSlot) || lcl_IsConditionalFastCall(rReq))
+if ( rSlot.IsMode(SfxSlotMode::FASTCALL) || 
rShell.CanExecuteSlot_Impl(rSlot) || rShell.IsConditionalFastCall(rReq))
 {
 if ( GetFrame() )
 {
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index c6c34ca14667..91d0685da5ca 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -388,6 +388,21 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 return aSet.GetItemState(nId) != SfxItemState::DISABLED;
 }
 
+bool SfxShell::IsConditionalFastCall( const SfxRequest &rReq )
+{
+sal_uInt16 nId = rReq.GetSlot();
+bool bRet = false;
+
+if (nId == SID_UNDO || nId == SID_REDO)
+{
+const SfxItemSet* pArgs = rReq.GetArgs();
+if (pArgs && pArgs->HasItem(SID_REPAIRPACKAGE))
+bRet = true;
+}
+return bRet;
+}
+
+
 void ShellCall_Impl( void* pObj, void* pArg )
 {
 static_cast(pObj)->ExecuteSlot( *static_cast(pArg) 
);
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a1dc5bcf9359..0e0f57fe10b2 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -501,6 +501,8 @@ public:
 voidExecSearch(SfxRequest&);
 voidExecViewOptions(SfxRequest &);
 
+virtual boolIsConditionalFastCall( const SfxRequest &rReq ) override;
+
 voidStateViewOptions(SfxItemSet &);
 voidStateSearch(SfxItemSet &);
 voidGetState(SfxItemSet&);
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 4cb021a90f3c..add13e4312c2 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -116,6 +116,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1216,6 +1217,20 @@ void SwView::Execute(SfxRequest &rReq)
 rReq.Done();
 }
 
+bool SwView::IsConditionalFastCall( const SfxRequest &rReq )
+{
+sal_uInt16 nId = rReq.GetSlot();
+bool bRet = false;
+

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

[Tamás Zolnai]

 include/sfx2/shell.hxx   |8 
 sfx2/source/control/dispatch.cxx |   18 +-
 sfx2/source/control/shell.cxx|   15 +++
 sw/inc/view.hxx  |2 ++
 sw/source/uibase/uiview/view2.cxx|   15 +++
 sw/source/uibase/uiview/viewstat.cxx |2 +-
 6 files changed, 42 insertions(+), 18 deletions(-)

New commits:
commit faf9d81f0406038b2fddd0a85d64e4a39edf3196
Author: Tamás Zolnai 
Date:   Thu Apr 19 12:10:52 2018 +0200

sw lok: Accept / reject change is always enabled in the context menu

Use conditional fastcall for allow executing these two uno commands
even if there is no tracked changes at the cursor position instead of
enable the menu slots unconditionally.

See also:
b6011f07254f8003929320ad842d8d09daca0e09

Reviewed-on: https://gerrit.libreoffice.org/53148
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 67919621cb0b95074c4401bdfced9d87b230cc2f)

Change-Id: Iaf8a8082961cd174c038fc021d2c41fb7cb97bff
Reviewed-on: https://gerrit.libreoffice.org/53181
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 4c7d12fd7049..00f48e1f882b 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -488,6 +488,14 @@ public:
 
 /**
 
+This method determines whether we need to execute without checking
+the disabled state of the slot. This is used for dynamic conditions
+while you can use SfxSlotMode::FASTCALL for a specific slotid in 
general.
+*/
+virtual bool IsConditionalFastCall( const SfxRequest &rReq );
+
+/**
+
 This method controls the activation of SfxShell instance. First, by 
calling
 the virtual method  which gives the 
subclass the
 opportunity to respond to the event.
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 93394c368512..fdb3073ef1f0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -312,22 +312,6 @@ bool SfxDispatcher::IsAppDispatcher() const
 return !xImp->pFrame;
 }
 
-/// Decides if the request is FASTCALL or not, depending on arguments.
-bool lcl_IsConditionalFastCall(SfxRequest &rReq)
-{
-sal_uInt16 nId = rReq.GetSlot();
-bool bRet = false;
-
-if (nId == SID_UNDO || nId == SID_REDO)
-{
-const SfxItemSet* pArgs = rReq.GetArgs();
-if (pArgs && pArgs->HasItem(SID_REPAIRPACKAGE))
-bRet = true;
-}
-
-return bRet;
-}
-
 /** Helper function to check whether a slot can be executed and
 check the execution itself
 */
@@ -336,7 +320,7 @@ void SfxDispatcher::Call_Impl(SfxShell& rShell, const 
SfxSlot &rSlot, SfxRequest
 SFX_STACK(SfxDispatcher::Call_Impl);
 
 // The slot may be called (meaning enabled)
-if ( rSlot.IsMode(SfxSlotMode::FASTCALL) || 
rShell.CanExecuteSlot_Impl(rSlot) || lcl_IsConditionalFastCall(rReq))
+if ( rSlot.IsMode(SfxSlotMode::FASTCALL) || 
rShell.CanExecuteSlot_Impl(rSlot) || rShell.IsConditionalFastCall(rReq))
 {
 if ( GetFrame() )
 {
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 4703f7921972..48c78a3dde78 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -400,6 +400,21 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 return aSet.GetItemState(nId) != SfxItemState::DISABLED;
 }
 
+bool SfxShell::IsConditionalFastCall( const SfxRequest &rReq )
+{
+sal_uInt16 nId = rReq.GetSlot();
+bool bRet = false;
+
+if (nId == SID_UNDO || nId == SID_REDO)
+{
+const SfxItemSet* pArgs = rReq.GetArgs();
+if (pArgs && pArgs->HasItem(SID_REPAIRPACKAGE))
+bRet = true;
+}
+return bRet;
+}
+
+
 void ShellCall_Impl( void* pObj, void* pArg )
 {
 static_cast(pObj)->ExecuteSlot( *static_cast(pArg) 
);
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a2321ce13531..15f3d4e6b5c8 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -503,6 +503,8 @@ public:
 voidExecSearch(SfxRequest&);
 voidExecViewOptions(SfxRequest &);
 
+virtual boolIsConditionalFastCall( const SfxRequest &rReq ) override;
+
 voidStateViewOptions(SfxItemSet &);
 voidStateSearch(SfxItemSet &);
 voidGetState(SfxItemSet&);
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 512658ca9ac9..5aed6dc097cd 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -123,6 +123,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1249,6 +1250,20 @@ void SwView::Execute(SfxRequest &rReq)
 rReq.Done();
 }
 
+bool SwView::IsConditionalFastCall( const SfxRequest &rReq )
+{
+sal_uInt16 nId = rReq.GetSlot();
+bool bRet = false;
+
+

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

[Jan-Marek Glogowski]

 sfx2/source/doc/docfile.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 547dfbaa533242c19dec83cfd410fd28584cd877
Author: Jan-Marek Glogowski 
Date:   Tue Sep 19 17:29:07 2017 +0200

Don't crash when opening templates via WebDAV

When loading a ODT template via HTTP, it crashes LO with an
lang::IllegalArgumentException in LockFileCommon::ResolveLinks.
This happens when closing the loaded template, as LO tries to
remove a not-existing lock. aDocURL at this point is empty, so
HasError() is true.

As stated in the comment, we don't need a lock for documents
created from templates, as this opens an internal copy of the
document, so don't mark the teplate document as locked.

Change-Id: Ide60020b6287aa67861dbcc8ec1b94f37896b7ef
Reviewed-on: https://gerrit.libreoffice.org/42485
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit f95e7ef38e0bf79fa9662bfd50de612d50ef71de)
Reviewed-on: https://gerrit.libreoffice.org/53194
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 54bbc8159c1e..311dc88b8041 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1057,15 +1057,16 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
 try
 {
 bool bResult = pImpl->m_bLocked;
+bool bIsTemplate = false;
 // so, this is webdav stuff...
 if ( !bResult )
 {
 // no read-write access is necessary on loading if the 
document is explicitly opened as copy
 const SfxBoolItem* pTemplateItem = 
SfxItemSet::GetItem(GetItemSet(), SID_TEMPLATE, false);
-bResult = ( bLoading && pTemplateItem && 
pTemplateItem->GetValue() );
+bIsTemplate = ( bLoading && pTemplateItem && 
pTemplateItem->GetValue() );
 }
 
-if ( !bResult && !IsReadOnly() )
+if ( !bIsTemplate && !bResult && !IsReadOnly() )
 {
 ShowLockResult bUIStatus = ShowLockResult::NoLock;
 do
___
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-6.0' - desktop/inc desktop/source

[Tamás Zolnai]

 desktop/inc/app.hxx   |2 -
 desktop/source/app/app.cxx|2 -
 desktop/source/app/check_ext_deps.cxx |   13 
+++---
 desktop/source/deployment/registry/configuration/dp_configuration.cxx |5 +-
 desktop/source/lib/init.cxx   |   20 
+-
 5 files changed, 31 insertions(+), 11 deletions(-)

New commits:
commit 6008269b9bcc6e1d6de01a5205e4884a076ff4ee
Author: Tamás Zolnai 
Date:   Mon Apr 2 22:52:46 2018 +0200

lok: Make the bundled dictionaries work.

Create the user directory temporary in the temp directory and
use that to load the dictionaries (bundled extensions).

Co-author; Jan Holesovsky 

Change-Id: I5c7c824b68571048ce870fd5218cb47a333f3ad8
Reviewed-on: https://gerrit.libreoffice.org/49495
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit ecfd40a1bcc1fc8cdc40bdd27ea1f00ba652707e)
Reviewed-on: https://gerrit.libreoffice.org/52506
Tested-by: Jan Holesovsky 

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 53f4eba57829..672229683144 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -117,7 +117,7 @@ class Desktop : public Application
 // first-start (ever) related methods
 static bool CheckExtensionDependencies();
 
-voidSynchronizeExtensionRepositories();
+static void SynchronizeExtensionRepositories(bool 
bCleanedExtensionCache, Desktop* pDesktop = nullptr);
 voidSetSplashScreenText( const OUString& rText );
 voidSetSplashScreenProgress( sal_Int32 );
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 687597eec6cc..8d1ad7dcb084 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1459,7 +1459,7 @@ int Desktop::Main()
 // Check if bundled or shared extensions were added /removed
 // and process those extensions (has to be done before checking
 // the extension dependencies!
-SynchronizeExtensionRepositories();
+SynchronizeExtensionRepositories(m_bCleanedExtensionCache, this);
 bool bAbort = CheckExtensionDependencies();
 if ( bAbort )
 return EXIT_FAILURE;
diff --git a/desktop/source/app/check_ext_deps.cxx 
b/desktop/source/app/check_ext_deps.cxx
index 0fb8a9aa60bd..d5b2876779f7 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -114,7 +114,8 @@ SilentCommandEnv::SilentCommandEnv(
 
 SilentCommandEnv::~SilentCommandEnv()
 {
-mpDesktop->SetSplashScreenText( OUString() );
+if (mpDesktop)
+mpDesktop->SetSplashScreenText(OUString());
 }
 
 
@@ -184,7 +185,7 @@ void SilentCommandEnv::push( uno::Any const & rStatus )
 OUString sText;
 mnLevel += 1;
 
-if ( rStatus.hasValue() && ( rStatus >>= sText) )
+if (mpDesktop && rStatus.hasValue() && (rStatus >>= sText))
 {
 if ( mnLevel <= 3 )
 mpDesktop->SetSplashScreenText( sText );
@@ -197,7 +198,7 @@ void SilentCommandEnv::push( uno::Any const & rStatus )
 void SilentCommandEnv::update( uno::Any const & rStatus )
 {
 OUString sText;
-if ( rStatus.hasValue() && ( rStatus >>= sText) )
+if (mpDesktop && rStatus.hasValue() && (rStatus >>= sText))
 {
 mpDesktop->SetSplashScreenText( sText );
 }
@@ -407,13 +408,13 @@ bool Desktop::CheckExtensionDependencies()
 return false;
 }
 
-void Desktop::SynchronizeExtensionRepositories()
+void Desktop::SynchronizeExtensionRepositories(bool bCleanedExtensionCache, 
Desktop* pDesktop)
 {
 uno::Reference< uno::XComponentContext > context(
 comphelper::getProcessComponentContext());
 uno::Reference< ucb::XCommandEnvironment > silent(
-new SilentCommandEnv(context, this));
-if (m_bCleanedExtensionCache) {
+new SilentCommandEnv(context, pDesktop));
+if (bCleanedExtensionCache) {
 
deployment::ExtensionManager::get(context)->reinstallDeployedExtensions(
 true, "user", Reference(), silent);
 #if !HAVE_FEATURE_MACOSX_SANDBOX
diff --git 
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx 
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 5739d3f444c0..0393e934e343 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -708,8 +709,8 @@ void BackendImpl::PackageImpl::processPackage_(
 }
 //No need for live-deployment for bundled extension, because OOo
 //restarts after installation
-if (that->m_eCon

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

[Jan Holesovsky]

 loleaflet/src/core/Socket.js |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 29bb6be15bd916c398c95a9d3b44684e2ed95bc1
Author: Jan Holesovsky 
Date:   Thu Apr 12 16:30:32 2018 +0200

loleaflet: More friendly message when the websocket creation goes wrong.

Change-Id: Iaf7be5895c7baede7d72114dea9fb93550ccac7e
Reviewed-on: https://gerrit.libreoffice.org/53218
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 85fcfe9a4..edf143af6 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -32,10 +32,13 @@ L.Socket = L.Class.extend({
wopiSrc = '?WOPISrc=' + map.options.wopiSrc + 
'&compat=/ws';
}
 
+   var websocketURI = map.options.server + '/lool/' + 
encodeURIComponent(map.options.doc + '?' + $.param(map.options.docParams)) + 
'/ws' + wopiSrc;
try {
-   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws' + wopiSrc);
+   this.socket = new WebSocket(websocketURI);
} catch (e) {
-   this._map.fire('error', {msg: _('Oops, there is a 
problem connecting to LibreOffice Online : ').replace('LibreOffice Online', 
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice 
Online')) + e, cmd: 'socket', kind: 'failed', id: 3});
+   this._map.fire('error', {msg: _('Oops, there is a 
problem connecting to LibreOffice Online : ').replace('LibreOffice Online', 
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice 
Online')) + _('Cannot create websocket, please restart your browser.'), cmd: 
'socket', kind: 'failed', id: 3});
+   console.log('Failed to create websocket: ' + 
websocketURI);
+   console.log('Due to an exception: ' + e);
return;
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 editeng/source/items/itemtype.cxx   |5 -
 include/editeng/itemtype.hxx|1 -
 sw/source/uibase/utlui/attrdesc.cxx |9 +
 sw/source/uibase/utlui/uiitems.cxx  |4 +++-
 4 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit ef7f8c263fcb2bac596aa0247f1e54ff375c3146
Author: Gabor Kelemen 
Date:   Thu Apr 19 00:12:33 2018 +0200

Drop GetSvxString l10n wrapper from editeng

This was a wrapper above the usual EditResId call
without any added value.

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

diff --git a/editeng/source/items/itemtype.cxx 
b/editeng/source/items/itemtype.cxx
index 1fd3d600933b..78b31841869a 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -134,11 +134,6 @@ OUString GetMetricText( long nVal, MapUnit eSrcUnit, 
MapUnit eDestUnit, const In
 return sRet.makeStringAndClear();
 }
 
-OUString GetSvxString(const char* pId)
-{
-return EditResId(pId);
-}
-
 OUString GetColorString( const Color& rCol )
 {
 if (rCol == COL_AUTO)
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 586e29a6361c..25525490ca69 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -31,7 +31,6 @@ class IntlWrapper;
 
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-EDITENG_DLLPUBLIC OUString GetSvxString(const char* pId);
 EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit 
eDestUnit, const IntlWrapper * pIntl );
 OUString GetColorString( const Color& rCol );
 EDITENG_DLLPUBLIC const char* GetMetricId(MapUnit eUnit);
diff --git a/sw/source/uibase/utlui/attrdesc.cxx 
b/sw/source/uibase/utlui/attrdesc.cxx
index a329e5a280fd..2295146d2db2 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -24,6 +24,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -236,7 +237,7 @@ bool SwFormatFrameSize::GetPresentation
 else
 {
 rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, 
&rIntl ) +
-" " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
+" " + ::EditResId( ::GetMetricId( ePresUnit ) );
 }
 if ( ATT_VAR_SIZE != GetHeightSizeType() )
 {
@@ -251,7 +252,7 @@ bool SwFormatFrameSize::GetPresentation
 else
 {
 rText = ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, &rIntl 
) +
-" " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
+" " + EditResId( ::GetMetricId( ePresUnit ) );
 }
 }
 return true;
@@ -351,7 +352,7 @@ bool SwFormatVertOrient::GetPresentation
 {
 rText = rText + SwResId( STR_POS_Y ) + " " +
 ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) +
-" " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
+" " + EditResId( ::GetMetricId( ePresUnit ) );
 }
 break;
 case text::VertOrientation::TOP:
@@ -397,7 +398,7 @@ bool SwFormatHoriOrient::GetPresentation
 {
 rText = rText + SwResId( STR_POS_X ) + " " +
 ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) +
-" " + ::GetSvxString( ::GetMetricId( ePresUnit ) );
+" " + EditResId( ::GetMetricId( ePresUnit ) );
 }
 break;
 case text::HoriOrientation::RIGHT:
diff --git a/sw/source/uibase/utlui/uiitems.cxx 
b/sw/source/uibase/utlui/uiitems.cxx
index 1e370d9d26be..8c7c515796af 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
@@ -66,7 +68,7 @@ bool SwPageFootnoteInfoItem::GetPresentation
 {
 rText = SwResId( STR_MAX_FTN_HEIGHT ) + " " +
 ::GetMetricText( nHght, eCoreUnit, ePresUnit, &rIntl ) + " " +
-::GetSvxString( ::GetMetricId( ePresUnit ) );
+EditResId( ::GetMetricId( ePresUnit ) );
 }
 return true;
 }
___
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/gov-5.3-47'

[Andras Timar]

Tag 'gov-5.3-47' created by Andras Timar  at 
2018-04-20 15:16 +

gov-5.3-47

Changes since co-5.3-46-1:
---
 0 files changed
---
___
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' - configure.ac

[Andras Timar]

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

New commits:
commit 64211812ee5c3454c64c34ed2295b8015635b057
Author: Andras Timar 
Date:   Fri Apr 20 17:13:47 2018 +0200

Bump version to 5.3-47

Change-Id: I81158b8cdc2c53b6369e84a44e786ecf5d3baa83

diff --git a/configure.ac b/configure.ac
index 8b300a3791c7..888ab58f94ab 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.46],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.47],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
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/co-5.3-47'

[Andras Timar]

Tag 'co-5.3-47' created by Andras Timar  at 
2018-04-20 15:15 +

co-5.3-47

Changes since co-5.3-46-1:
---
 0 files changed
---
___
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' - solenv/flatpak-manifest.in

[Stephan Bergmann]

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

New commits:
commit d1407aac59f3f218a311452fc7dcb7692fdf5285
Author: Stephan Bergmann 
Date:   Fri Apr 20 14:58:57 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst change

...58433a8b88537a1a0883d107972de5c5fad59d4a "Upgrade to
language-subtag-registry-2018-03-30"

Change-Id: Ic58160a56e739d8850566bf67eaed5c981109eb1
(cherry picked from commit 6ea4b982fada0bbca957dfa0729e2c3225c8a460)
Reviewed-on: https://gerrit.libreoffice.org/53210
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 52b4c163c207..2134b139c7d6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -266,10 +266,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";,
-"sha256": 
"0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";,
+"sha256": 
"b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2017-12-14.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2018-03-30.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
___
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' - solenv/flatpak-manifest.in

[Stephan Bergmann]

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

New commits:
commit e395b177ef34843e6f60e5802d640cb79aa8afae
Author: Stephan Bergmann 
Date:   Fri Apr 20 08:56:47 2018 +0200

Merge in Flatpak improvements

...from :

commit 715fbcfb4e5c51d40387998932984e54639476a1
Author: Robert McQueen 
Date:   Tue Apr 17 10:26:32 2018 +0100

edit .desktop files to add X-Endless-Alias with original names

Endless OS uses this to update icon grids & taskbar pins if the 
original files
have been removed. (Happy to update this to a more standardised key if a
consensus emerges.)

Change-Id: I646350090c38d84d1930c5afbec0ee500b60d0fb
(cherry picked from commit a161e41439fc6f9093c212a523154e5146bb1502)
Reviewed-on: https://gerrit.libreoffice.org/53198
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 679ffa773872..52b4c163c207 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -577,7 +577,9 @@
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = 
aarch64; then printf %s --disable-pdfium; fi)",
 "make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
-"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
+"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
+"desktop-file-edit --set-key=X-Endless-Alias 
--set-value=libreoffice-startcenter 
/app/share/applications/org.libreoffice.LibreOffice.desktop",
+"for i in base calc draw impress math writer xsltfilter; do 
desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-$i 
/app/share/applications/org.libreoffice.LibreOffice-$i.desktop; done"
 ]
 }
 ],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 6ea4b982fada0bbca957dfa0729e2c3225c8a460
Author: Stephan Bergmann 
Date:   Fri Apr 20 14:58:57 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst change

...58433a8b88537a1a0883d107972de5c5fad59d4a "Upgrade to
language-subtag-registry-2018-03-30"

Change-Id: Ic58160a56e739d8850566bf67eaed5c981109eb1

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a069424a04fd..fe7b3bf919e3 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -266,10 +266,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";,
-"sha256": 
"0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";,
+"sha256": 
"b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2017-12-14.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2018-03-30.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 077ba37de54abcf9cbe6c6dcb276fd42c194786f
Author: Stephan Bergmann 
Date:   Fri Apr 20 15:04:12 2018 +0200

Updated core
Project: help  64bb1203851bc92fd5ee2acaf0d4c4babf7a6180

Avoid name clash between Package and GeneratedPackage htmlcontent2_html

...by renaming the latter to htmlcontent2_html_generated.  The name clash
happened to not cause trouble yet, but would once these packages are added 
to
installation sets (i.e., once both would want to occur in
gb_Helper_register_packages_for_install lists in Repository.mk).

(Also do some minor syntactic clean up.)

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

diff --git a/helpcontent2 b/helpcontent2
index f10b89e1d34a..64bb1203851b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f10b89e1d34ab5faca7c4121dc9d1389617d1ba5
+Subproject commit 64bb1203851bc92fd5ee2acaf0d4c4babf7a6180
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: GeneratedPackage_html_media.mk

[Stephan Bergmann]

 GeneratedPackage_html_media.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fe257ad7f55c500237bbeba8c6e13d7aa682fc22
Author: Stephan Bergmann 
Date:   Fri Apr 20 15:14:44 2018 +0200

Syntactic clean-up in GeneratedPackage_html_media.mk

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

diff --git a/GeneratedPackage_html_media.mk b/GeneratedPackage_html_media.mk
index 5ff4521c4..9e483738a 100644
--- a/GeneratedPackage_html_media.mk
+++ b/GeneratedPackage_html_media.mk
@@ -9,11 +9,11 @@
 #
 $(eval $(call 
gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_media,$(SRCDIR)))
 
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 $(HELP_ONLINE),$(PRODUCTVERSION),)/media/icon-themes,icon-themes/galaxy))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if
 $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,icon-themes/galaxy))
 
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/helpimg,helpcontent2/source/media/helpimg))
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/navigation,helpcontent2/source/media/navigation))
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/screenshots,helpcontent2/source/media/screenshots))
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/files,helpcontent2/source/media/files))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if
 
$(HELP_ONLINE),/$(PRODUCTVERSION))/media/helpimg,helpcontent2/source/media/helpimg))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if
 
$(HELP_ONLINE),/$(PRODUCTVERSION))/media/navigation,helpcontent2/source/media/navigation))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if
 
$(HELP_ONLINE),/$(PRODUCTVERSION))/media/screenshots,helpcontent2/source/media/screenshots))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if
 
$(HELP_ONLINE),/$(PRODUCTVERSION))/media/files,helpcontent2/source/media/files))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 59a6cf627d6d6b512e3e357920348a0627bca58d
Author: Stephan Bergmann 
Date:   Fri Apr 20 15:14:44 2018 +0200

Updated core
Project: help  fe257ad7f55c500237bbeba8c6e13d7aa682fc22

Syntactic clean-up in GeneratedPackage_html_media.mk

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

diff --git a/helpcontent2 b/helpcontent2
index 64bb1203851b..fe257ad7f55c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 64bb1203851bc92fd5ee2acaf0d4c4babf7a6180
+Subproject commit fe257ad7f55c500237bbeba8c6e13d7aa682fc22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/vcl/weld.hxx   |1 -
 sfx2/source/appl/fileobj.cxx   |7 +--
 sfx2/source/appl/fileobj.hxx   |2 --
 svtools/source/control/inettbc.cxx |   16 +++-
 4 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit e75e6b850a8791237dca6654b526831f1b0c7bc6
Author: Noel Grandin 
Date:   Fri Apr 20 11:01:28 2018 +0200

loplugin:unusedfields

Change-Id: I9c80805788d49b13552c168a36fdf395da19df26
Reviewed-on: https://gerrit.libreoffice.org/53196
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 116e7c182f07..ae9931eb2b0c 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -393,7 +393,6 @@ class VCL_DLLPUBLIC Scale : virtual public Widget
 {
 protected:
 Link m_aValueChangedHdl;
-Link m_aOutputHdl;
 
 void signal_value_changed() { m_aValueChangedHdl.Call(*this); }
 
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 371d8839f75a..d785cec58fa8 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -56,10 +56,8 @@ SvFileObject::SvFileObject()
 , bWaitForData(false)
 , bInNewData(false)
 , bDataReady(false)
-, bNativFormat(false)
 , bClearMedium(false)
 , bStateChangeCalled(false)
-, bInCallDownload(false)
 {
 }
 
@@ -175,9 +173,7 @@ bool SvFileObject::LoadFile_Impl()
 bWaitForData = true;
 
 tools::SvRef xTmpMed = xMed;
-bInCallDownload = true;
 xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) );
-bInCallDownload = false;
 
 bClearMedium = !xMed.is();
 if( bClearMedium )
@@ -210,7 +206,7 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, 
SvStream* pStream )
 
 // To avoid that a native link is created
 if( !rGrf.IsGfxLink() &&
-!rGrf.GetContext() && !bNativFormat )
+!rGrf.GetContext() )
 rGrf.SetGfxLink( GfxLink() );
 
 if( !pStream )
@@ -370,7 +366,6 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, 
void )
 // When we come form here there it can not be an error no more.
 bLoadError = false;
 bWaitForData = false;
-bInCallDownload = false;
 
 if( !bInNewData && !bDataReady )
 {
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index f55e7885713d..86219ef5a1d5 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -44,10 +44,8 @@ class SvFileObject : public sfx2::SvLinkSource
 bool bWaitForData : 1;
 bool bInNewData : 1;
 bool bDataReady : 1;
-bool bNativFormat : 1;
 bool bClearMedium : 1;
 bool bStateChangeCalled : 1;
-bool bInCallDownload : 1;
 
 bool GetGraphic_Impl( Graphic&, SvStream* pStream );
 bool LoadFile_Impl();
diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index 28377622e183..0ba4aaa20ba8 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -128,10 +128,8 @@ class MatchContext_Impl: public salhelper::Thread
 std::vector   aCompletions;
 std::vector   aURLs;
 svtools::AsynchronLink  aLink;
-OUStringaBaseURL;
 OUStringaText;
 URLBox* pBox;
-boolbOnlyDirectories;
 
 osl::Mutex mutex_;
 bool stopped_;
@@ -492,10 +490,8 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& 
rURL,
 MatchContext_Impl::MatchContext_Impl(URLBox* pBoxP, const OUString& rText)
 : Thread( "MatchContext_Impl" )
 , aLink( LINK( this, MatchContext_Impl, Select_Impl ) )
-, aBaseURL( pBoxP->aBaseURL )
 , aText( rText )
 , pBox( pBoxP )
-, bOnlyDirectories( false )
 , stopped_(false)
 , commandId_(0)
 {
@@ -703,8 +699,6 @@ void MatchContext_Impl::ReadFolder( const OUString& rURL,
 {
 uno::Reference< XDynamicResultSet > xDynResultSet;
 ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS;
-if ( bOnlyDirectories )
-eInclude = INCLUDE_FOLDERS_ONLY;
 
 xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
 
@@ -1150,8 +1144,8 @@ void MatchContext_Impl::doExecute()
 
 OUString aMatch;
 INetProtocol eProt = INetURLObject::CompareProtocolScheme( aText );
-INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( aBaseURL );
-if ( aBaseURL.isEmpty() )
+INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( 
pBox->aBaseURL );
+if ( pBox->aBaseURL.isEmpty() )
 eBaseProt = INetURLObject::CompareProtocolScheme( 
SvtPathOptions().GetWorkPath() );
 INetProtocol eSmartProt = INetProtocol::NotValid;
 
@@ -1164,7 +1158,7 @@ void MatchContext_Impl::doExecute()
 if( schedule() )
 {
 if ( eProt == INetProtocol::NotValid )
-aMatch = SvtURLBox::Par

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

[Michael Stahl]

 configure.ac |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 40d38c2140ddd172433e68e3fa59bc184597ac15
Author: Michael Stahl 
Date:   Fri Apr 20 14:13:19 2018 +0200

configure: find icecream GCC wrappers on Fedora

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

diff --git a/configure.ac b/configure.ac
index 5f14c5b99baa..6f9b2dc7fc90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2618,8 +2618,13 @@ if test "$_os" != "WINNT"; then
 if test "$enable_icecream" = "yes"; then
 if test -d "/usr/lib/icecc/bin"; then
 GCC_HOME="/usr/lib/icecc/"
-else
+elif test -d "/usr/libexec/icecc/bin"; then
+GCC_HOME="/usr/libexec/icecc/"
+elif test -d "/opt/icecream/bin"; then
 GCC_HOME="/opt/icecream/"
+else
+AC_MSG_ERROR([Could not figure out the location of icecream 
GCC wrappers, manually use --with-gcc-home])
+
 fi
 else
 GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: GeneratedPackage_html_generated.mk GeneratedPackage_html.mk Module_helpcontent2.mk

[Stephan Bergmann]

 GeneratedPackage_html_generated.mk |6 +++---
 Module_helpcontent2.mk |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 64bb1203851bc92fd5ee2acaf0d4c4babf7a6180
Author: Stephan Bergmann 
Date:   Fri Apr 20 15:04:12 2018 +0200

Avoid name clash between Package and GeneratedPackage htmlcontent2_html

...by renaming the latter to htmlcontent2_html_generated.  The name clash
happened to not cause trouble yet, but would once these packages are added 
to
installation sets (i.e., once both would want to occur in
gb_Helper_register_packages_for_install lists in Repository.mk).

(Also do some minor syntactic clean up.)

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

diff --git a/GeneratedPackage_html.mk b/GeneratedPackage_html_generated.mk
similarity index 65%
rename from GeneratedPackage_html.mk
rename to GeneratedPackage_html_generated.mk
index 36b4e6edf..04e59c285 100644
--- a/GeneratedPackage_html.mk
+++ b/GeneratedPackage_html_generated.mk
@@ -7,12 +7,12 @@
 # # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # #
 #
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html,$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)))
+$(eval $(call 
gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_generated,$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)))
 
-$(eval $(call 
gb_GeneratedPackage_use_customtarget,helpcontent2_html,helpcontent2/help3xsl))
+$(eval $(call 
gb_GeneratedPackage_use_customtarget,helpcontent2_html_generated,helpcontent2/help3xsl))
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),\
-$(call 
gb_GeneratedPackage_add_dir,helpcontent2_html,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 $(HELP_ONLINE),$(PRODUCTVERSION),)/$(lang)/text,$(lang)/text) \
+$(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_generated,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if
 $(HELP_ONLINE),/$(PRODUCTVERSION))/$(lang)/text,$(lang)/text) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk
index 8ff89344f..3e69742f9 100644
--- a/Module_helpcontent2.mk
+++ b/Module_helpcontent2.mk
@@ -18,7 +18,7 @@ ifeq ($(ENABLE_HTMLHELP),TRUE)
 $(eval $(call gb_Module_add_targets,helpcontent2,\
CustomTarget_html \
GeneratedPackage_html_media \
-   GeneratedPackage_html \
+   GeneratedPackage_html_generated \
Package_html_static \
Package_html \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot]

 sd/qa/unit/data/odp/tdf116266.odp   |binary
 sd/qa/unit/data/odp/tdf116266_chart.svg |   99 
 sd/qa/unit/import-tests.cxx |   12 +++
 3 files changed, 110 insertions(+), 1 deletion(-)

New commits:
commit 805da078eca4db1f54d39186f43d5dbd56b7a84b
Author: Serge Krot 
Date:   Wed Apr 4 14:06:00 2018 +0200

tdf#116266 Add unit test

The bug appeared only in libreoffice-6-0, but the unit test
is useful for master anyway.

Change-Id: I884ae18939b6def683bb318260c4e195da5bb252
Reviewed-on: https://gerrit.libreoffice.org/52375
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/53192

diff --git a/sd/qa/unit/data/odp/tdf116266.odp 
b/sd/qa/unit/data/odp/tdf116266.odp
new file mode 100755
index ..17ce46ea59a9
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf116266.odp differ
diff --git a/sd/qa/unit/data/odp/tdf116266_chart.svg 
b/sd/qa/unit/data/odp/tdf116266_chart.svg
new file mode 100755
index ..3a3ef2d0eca5
--- /dev/null
+++ b/sd/qa/unit/data/odp/tdf116266_chart.svg
@@ -0,0 +1,99 @@
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+http://www.w3.org/2000/svg"; stroke-width="28.222" 
stroke-linejoin="round" xml:space="preserve">
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 1950
+ 1970
+ 1990
+ 2010
+ 0
+ 100
+ 200
+ 300
+ 400
+ 500
+ 600
+ 700
+ Data
+ 
+ 2016 vs 2006 ≙- 
0,23 %/a
+
\ No newline at end of file
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 39129f2540a3..c92ef5f7782c 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -181,6 +181,7 @@ public:
 void testTdf51340();
 void testTdf115639();
 void testTdf77747();
+void testTdf116266();
 
 bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, 
std::vector& rExpected);
 void testPatternImport();
@@ -263,6 +264,7 @@ public:
 CPPUNIT_TEST(testTdf51340);
 CPPUNIT_TEST(testTdf115639);
 CPPUNIT_TEST(testTdf77747);
+CPPUNIT_TEST(testTdf116266);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -2487,7 +2489,6 @@ void SdImportTest::testTdf51340()
 xDocShRef->DoClose();
 }
 
-
 void SdImportTest::testTdf115639()
 {
 // Check whether the new compatibility option is loaded correctly
@@ -2533,6 +2534,15 @@ void SdImportTest::testTdf77747()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testTdf116266()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf116266.odp"), ODP);
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+sfx2::LinkManager* rLinkManager = pDoc->GetLinkManager();
+// The document contains one SVG stored as a link.
+CPPUNIT_ASSERT_EQUAL(size_t(1), rLinkManager->GetLinks().size());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Niveda license statement

[Niveda T S]

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan-Marek Glogowski]

 sfx2/source/doc/docfile.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5d53afc54e0b94f95176b1be7044f556927c1b13
Author: Jan-Marek Glogowski 
Date:   Tue Sep 19 17:29:07 2017 +0200

Don't crash when opening templates via WebDAV

When loading a ODT template via HTTP, it crashes LO with an
lang::IllegalArgumentException in LockFileCommon::ResolveLinks.
This happens when closing the loaded template, as LO tries to
remove a not-existing lock. aDocURL at this point is empty, so
HasError() is true.

As stated in the comment, we don't need a lock for documents
created from templates, as this opens an internal copy of the
document, so don't mark the teplate document as locked.

Change-Id: Ide60020b6287aa67861dbcc8ec1b94f37896b7ef
Reviewed-on: https://gerrit.libreoffice.org/42485
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit f95e7ef38e0bf79fa9662bfd50de612d50ef71de)
Reviewed-on: https://gerrit.libreoffice.org/53195
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index bf637cbb1bfe..0ce5ef0ec930 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1055,15 +1055,16 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
 try
 {
 bool bResult = pImpl->m_bLocked;
+bool bIsTemplate = false;
 // so, this is webdav stuff...
 if ( !bResult )
 {
 // no read-write access is necessary on loading if the 
document is explicitly opened as copy
 const SfxBoolItem* pTemplateItem = 
SfxItemSet::GetItem(GetItemSet(), SID_TEMPLATE, false);
-bResult = ( bLoading && pTemplateItem && 
pTemplateItem->GetValue() );
+bIsTemplate = ( bLoading && pTemplateItem && 
pTemplateItem->GetValue() );
 }
 
-if ( !bResult && !IsReadOnly() )
+if ( !bIsTemplate && !bResult && !IsReadOnly() )
 {
 ShowLockResult bUIStatus = ShowLockResult::NoLock;
 do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basegfx/source include/basegfx include/registry include/svx include/tools registry/source sal/rtl sdext/source sd/source svx/source sw/inc sw/qa sw/source

[Noel Grandin]

 basctl/source/basicide/moduldl2.cxx |2 
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx|   26 ---
 basegfx/source/polygon/b2dpolygontools.cxx  |   18 --
 basegfx/source/polygon/b2dpolypolygontools.cxx  |5 
 include/basegfx/polygon/b2dpolygoncutandtouch.hxx   |3 
 include/basegfx/polygon/b2dpolygontools.hxx |6 
 include/registry/reader.hxx |2 
 include/registry/typereg_reader.hxx |   15 -
 include/svx/galmisc.hxx |2 
 include/svx/passwd.hxx  |3 
 include/tools/urlobj.hxx|4 
 registry/source/reflread.cxx|   10 -
 sal/rtl/alloc_arena.cxx |6 
 sal/rtl/alloc_arena.hxx |2 
 sal/rtl/strimp.cxx  |2 
 sd/source/ui/inc/SlideSorter.hxx|1 
 sd/source/ui/slidesorter/shell/SlideSorter.cxx  |4 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx   |   36 +---
 svx/source/dialog/passwd.cxx|   13 -
 svx/source/gallery2/galmisc.cxx |3 
 svx/source/gallery2/galtheme.cxx|2 
 sw/inc/IDocumentContentOperations.hxx   |4 
 sw/inc/editsh.hxx   |2 
 sw/inc/swunohelper.hxx  |5 
 sw/qa/extras/uiwriter/uiwriter.cxx  |6 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   11 -
 sw/source/core/edit/eddel.cxx   |2 
 sw/source/core/edit/edfcol.cxx  |7 
 sw/source/core/edit/editsh.cxx  |2 
 sw/source/core/inc/DocumentContentOperationsManager.hxx |4 
 sw/source/core/unocore/swunohelper.cxx  |4 
 sw/source/core/unocore/unoframe.cxx |4 
 sw/source/uibase/misc/glosdoc.cxx   |2 
 tools/source/fsys/urlobj.cxx|  121 +++-
 34 files changed, 137 insertions(+), 202 deletions(-)

New commits:
commit 56775815a39c2ee4a0f711738947d2fb234c4923
Author: Noel Grandin 
Date:   Fri Apr 20 10:20:00 2018 +0200

loplugin:constantparam

Change-Id: Ia58d8950b3b9e48bbe9f075b9fe1eed62d9abf0d
Reviewed-on: https://gerrit.libreoffice.org/53188
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 56a490a7721b..0722118559be 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -659,7 +659,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
 bool const bProtected = xPasswd->isLibraryPasswordProtected( 
aLibName );
 
 // change password dialog
-SvxPasswordDialog aDlg(GetFrameWeld(), true, !bProtected);
+SvxPasswordDialog aDlg(GetFrameWeld(), !bProtected);
 aDlg.SetCheckPasswordHdl(LINK(this, LibPage, 
CheckPasswordHdl));
 
 if (aDlg.run() == RET_OK)
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx 
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index d99b246b8ad6..f34c7bb3a4a2 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -861,7 +861,7 @@ namespace basegfx
 }
 }
 
-B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& 
rCandidate, bool bSelfIntersections)
+B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& 
rCandidate)
 {
 const sal_uInt32 nCount(rCandidate.count());
 
@@ -871,16 +871,8 @@ namespace basegfx
 
 if(nCount == 1)
 {
-if(bSelfIntersections)
-{
-// remove self intersections
-
aRetval.append(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(0)));
-}
-else
-{
-// copy source
-aRetval = rCandidate;
-}
+// remove self intersections
+
aRetval.append(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(0)));
 }
 else
 {
@@ -890,16 +882,8 @@ namespace basegfx
 
 for(a = 0; a < nCount; a++)
 {
-if(bSelfIntersections)
-{
-// use polygons with solved self intersections
-
pTempData[a].setPolygon(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(a)));
- 

Crash test update

[Crashtest VM]

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


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] help.git: help3xsl/default.css help3xsl/online_transform.xsl

[Olivier Hallot]

 help3xsl/default.css  |5 +
 help3xsl/online_transform.xsl |   22 --
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit f10b89e1d34ab5faca7c4121dc9d1389617d1ba5
Author: Olivier Hallot 
Date:   Thu Apr 19 19:26:46 2018 -0300

New Help: Improve table head rendering

Add class to parent  of 

Change-Id: Ifb9caf4d4ac3ab5e4c750b5bd96260e2dcb298e1
Reviewed-on: https://gerrit.libreoffice.org/53179
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Olivier Hallot 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 8d6d3df2d..c37684477 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -123,6 +123,11 @@ pre,
 background: #CCF4C6;
 text-align: center;
 }
+.tableheadcell {
+background: #CCF4C6;
+vertical-align:top;
+}
+
 .howtogetheader {
 font-weight: bold;
 border: 1px solid #99;
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 34838a517..e6d6838b7 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -777,9 +777,27 @@
 
 
 
-
+
+
+
+
+
+
+
+
+
+
 
-
+
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit fe851316be45b891468fdab4d8b8f23fdf869e5e
Author: Olivier Hallot 
Date:   Thu Apr 19 19:26:46 2018 -0300

Updated core
Project: help  f10b89e1d34ab5faca7c4121dc9d1389617d1ba5

New Help: Improve table head rendering

Add class to parent  of 

Change-Id: Ifb9caf4d4ac3ab5e4c750b5bd96260e2dcb298e1
Reviewed-on: https://gerrit.libreoffice.org/53179
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 5de2306da7f9..f10b89e1d34a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5de2306da7f9dea5231c0fd1bfd91491cceb646f
+Subproject commit f10b89e1d34ab5faca7c4121dc9d1389617d1ba5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/msfilter/msdffimp.cxx  |   21 ++---
 include/filter/msfilter/msdffimp.hxx |   17 +++--
 sw/source/filter/ww8/ww8graf.cxx |5 ++---
 sw/source/filter/ww8/ww8par.cxx  |2 +-
 4 files changed, 28 insertions(+), 17 deletions(-)

New commits:
commit 9887cd14e2777eed019aacfd0ac75554686c6b79
Author: Caolán McNamara 
Date:   Thu Apr 19 14:43:40 2018 +0100

use a map to avoid looping on every obj delete

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 6e1726c9785c..f2fbc026c16d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5030,14 +5030,18 @@ void SvxMSDffManager::GetGroupAnchors( const 
DffRecordHeader& rHd, SvStream& rSt
 
 SvxMSDffImportRec* SvxMSDffImportData::find(const SdrObject* pObj)
 {
-for (const auto& it : *this)
-{
-if (it->pObj == pObj)
-return it.get();
-}
+auto it = m_ObjToRecMap.find(pObj);
+if (it != m_ObjToRecMap.end())
+return it->second;
 return nullptr;
 }
 
+void SvxMSDffImportData::insert(SvxMSDffImportRec* pImpRec)
+{
+m_ObjToRecMap[pImpRec->pObj] = pImpRec;
+m_Records.insert(std::unique_ptr(pImpRec));
+}
+
 void SvxMSDffManager::NotifyFreeObj(void* pData, SdrObject* pObj)
 {
 if (SdrObjGroup* pGroup = dynamic_cast(pObj))
@@ -5050,7 +5054,10 @@ void SvxMSDffManager::NotifyFreeObj(void* pData, 
SdrObject* pObj)
 
 SvxMSDffImportData& rImportData = *static_cast(pData);
 if (SvxMSDffImportRec* pRecord = rImportData.find(pObj))
+{
+rImportData.unmap(pObj);
 pRecord->pObj = nullptr;
+}
 }
 
 void SvxMSDffManager::FreeObj(void* pData, SdrObject* pObj)
@@ -5543,7 +5550,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
 if( pOrgObj )
 {
 pImpRec->pObj = pOrgObj;
-
rImportData.m_Records.insert(std::unique_ptr(pImpRec));
+rImportData.insert(pImpRec);
 bDeleteImpRec = false;
 if (pImpRec == pTextImpRec)
 bDeleteTextImpRec = false;
@@ -5554,7 +5561,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
 // Modify ShapeId (must be unique)
 pImpRec->nShapeId |= 0x800;
 pTextImpRec->pObj = pTextObj;
-
rImportData.m_Records.insert(std::unique_ptr(pTextImpRec));
+rImportData.insert(pTextImpRec);
 bDeleteTextImpRec = false;
 if (pTextImpRec == pImpRec)
 bDeleteImpRec = false;
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 022994a51873..5c0742a39f0a 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -262,16 +262,18 @@ private:
 SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) = delete;
 };
 
-/** list of all SvxMSDffImportRec instances of/for a group */
-typedef std::set,
-comphelper::UniquePtrValueLess> MSDffImportRecords;
-
 /** block of parameters for import/export for a single call of
 ImportObjAtCurrentStreamPos() */
-struct MSFILTER_DLLPUBLIC SvxMSDffImportData
+class MSFILTER_DLLPUBLIC SvxMSDffImportData
 {
+private:
+/** list of all SvxMSDffImportRec instances of/for a group */
+typedef std::set,
+comphelper::UniquePtrValueLess> 
MSDffImportRecords;
 MSDffImportRecords  m_Records;  ///< Shape pointer, Shape ids and private 
data
-tools::Rectangle   aParentRect;///< Rectangle of the surrounding 
groups,
+std::map m_ObjToRecMap;
+public:
+tools::RectangleaParentRect;///< Rectangle of the surrounding groups,
 ///< which might have been provided 
externally
 
 explicit SvxMSDffImportData(const tools::Rectangle& rParentRect);
@@ -279,6 +281,9 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportData
 SvxMSDffImportData( SvxMSDffImportData const & ) = delete; // MSVC2015 
workaround
 ~SvxMSDffImportData();
 bool empty() const { return m_Records.empty(); }
+void insert(SvxMSDffImportRec* pImpRec);
+void unmap(const SdrObject* pObj) { m_ObjToRecMap.erase(pObj); }
+SvxMSDffImportRec* front() { return m_Records.begin()->get(); }
 size_t size() const { return m_Records.size(); }
 SvxMSDffImportRec* find(const SdrObject* pObj);
 MSDffImportRecords::const_iterator begin() const { return 
m_Records.begin();  }
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index d16d16cfa4af..53a3c3289f71 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2753,10 +2753,9 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer

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

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ffe50e47aa04154e2643d9157760c83552ac0449
Author: Eike Rathke 
Date:   Wed Apr 18 12:46:47 2018 +0200

Upgrade to language-subtag-registry-2018-03-30

Change-Id: I0cc3104cfccebe5d7e3fcafdb71d73a9d8d5e3d8
(cherry picked from commit 58433a8b88537a1a0883d107972de5c5fad59d4a)
Reviewed-on: https://gerrit.libreoffice.org/53095
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index e1020cb52a3d..871ac10df6b5 100644
--- a/download.lst
+++ b/download.lst
@@ -130,8 +130,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.2.tar.gz
-export LANGTAGREG_SHA256SUM := 
0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362
-export LANGTAGREG_TARBALL := language-subtag-registry-2017-12-14.tar.bz2
+export LANGTAGREG_SHA256SUM := 
b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854
+export LANGTAGREG_TARBALL := language-subtag-registry-2018-03-30.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/source/core/crsr/trvltbl.cxx |   54 
 1 file changed, 28 insertions(+), 26 deletions(-)

New commits:
commit f5a9fb18b2b523e517ab425948c4488fe19e39a8
Author: Noel Grandin 
Date:   Thu Apr 19 16:27:40 2018 +0200

remove unnecessary braces in GotoNextTable

and comment the flow a little, it can be confusing

Change-Id: I22fb11896a6d7e3b2007d822021b791b06caa1de
Reviewed-on: https://gerrit.libreoffice.org/53185
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index ccc648dfe248..1763af7216cc 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -590,41 +590,43 @@ bool GotoNextTable( SwPaM& rCurrentCursor, 
SwMoveFnCollection const & fnPosTable
 continue;
 }
 
-if( pTableNd )  // should never be nullptr
+assert( pTableNd );  // coverity, should never be nullptr
+
+if( &fnPosTable == &fnMoveForward ) // at the beginning?
 {
-if( &fnPosTable == &fnMoveForward ) // at the beginning?
+if( !lcl_FindNextCell( aIdx, bInReadOnly ))
 {
-if( !lcl_FindNextCell( aIdx, bInReadOnly ))
-{
-// skip table
-aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
-continue;
-}
+// skip table
+aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
+continue;
 }
-else
+}
+else
+{
+aIdx = *aIdx.GetNode().EndOfSectionNode();
+// check protected cells
+if( !lcl_FindNextCell( aIdx, bInReadOnly ))
 {
-aIdx = *aIdx.GetNode().EndOfSectionNode();
-// check protected cells
-if( !lcl_FindNextCell( aIdx, bInReadOnly ))
-{
-// skip table
-aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
-continue;
-}
+// skip table
+aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
+continue;
 }
+}
 
-SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
-if ( pTextNode )
-{
-rCurrentCursor.GetPoint()->nNode = *pTextNode;
-rCurrentCursor.GetPoint()->nContent.Assign( pTextNode, 
&fnPosTable == &fnMoveBackward ?
-  pTextNode->Len() :
-  0 );
-}
-return true;
+SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+if ( pTextNode )
+{
+rCurrentCursor.GetPoint()->nNode = *pTextNode;
+rCurrentCursor.GetPoint()->nContent.Assign( pTextNode, &fnPosTable 
== &fnMoveBackward ?
+  pTextNode->Len() :
+  0 );
 }
+return true;
+
 } while( true );
 
+// the flow is such that it is not possible to get there
+
 return false;
 }
 
___
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' - sd/qa xmloff/source

[Serge Krot]

 sd/qa/unit/data/odp/tdf116266.odp  |binary
 sd/qa/unit/data/odp/tdf116266_chart.svg|   99 +
 sd/qa/unit/import-tests.cxx|   11 +++
 xmloff/source/core/xmlmultiimagehelper.cxx |7 --
 4 files changed, 111 insertions(+), 6 deletions(-)

New commits:
commit cb7851d105af419209e2f10073bc7b1688b6484b
Author: Serge Krot 
Date:   Wed Apr 4 14:06:00 2018 +0200

tdf#116266: Take into account file extension when image type is unknown

For external images there is no always exists image type,
we need to take into account the file extension to determine
its mime type.

Added unit test.

Reviewed-on: https://gerrit.libreoffice.org/52375
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit bc906ec69d47ecde13ddf63cf3d366ec89055cfe)

 Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: I884ae18939b6def683bb318260c4e195da5bb252

diff --git a/sd/qa/unit/data/odp/tdf116266.odp 
b/sd/qa/unit/data/odp/tdf116266.odp
new file mode 100755
index ..17ce46ea59a9
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf116266.odp differ
diff --git a/sd/qa/unit/data/odp/tdf116266_chart.svg 
b/sd/qa/unit/data/odp/tdf116266_chart.svg
new file mode 100755
index ..3a3ef2d0eca5
--- /dev/null
+++ b/sd/qa/unit/data/odp/tdf116266_chart.svg
@@ -0,0 +1,99 @@
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+http://www.w3.org/2000/svg"; stroke-width="28.222" 
stroke-linejoin="round" xml:space="preserve">
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 1950
+ 1970
+ 1990
+ 2010
+ 0
+ 100
+ 200
+ 300
+ 400
+ 500
+ 600
+ 700
+ Data
+ 
+ 2016 vs 2006 ≙- 
0,23 %/a
+
\ No newline at end of file
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 4794de11a76c..5c098d4dc6bf 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -139,6 +139,7 @@ public:
 void testTdf104201();
 void testTdf104445();
 void testTdf114488();
+void testTdf116266();
 
 CPPUNIT_TEST_SUITE(SdImportTest);
 
@@ -198,6 +199,7 @@ public:
 CPPUNIT_TEST(testTdf104201);
 CPPUNIT_TEST(testTdf104445);
 CPPUNIT_TEST(testTdf114488);
+CPPUNIT_TEST(testTdf116266);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -1712,6 +1714,15 @@ void SdImportTest::testTdf114488()
 CPPUNIT_ASSERT_EQUAL(OUString("image/x-wmf"), sMimeType);
 }
 
+void SdImportTest::testTdf116266()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf116266.odp"), ODP);
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+sfx2::LinkManager* rLinkManager = pDoc->GetLinkManager();
+// The document contains one SVG stored as a link.
+CPPUNIT_ASSERT_EQUAL(size_t(1), rLinkManager->GetLinks().size());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx 
b/xmloff/source/core/xmlmultiimagehelper.cxx
index f4acb53456bb..06383283f542 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -33,17 +33,12 @@ namespace
 {
 sMimeType = 
comphelper::GraphicMimeTypeHelper::GetMimeTypeForImageUrl(rString);
 }
-else if (rString.startsWith("vnd.sun.star.Package"))
+else // if (rString.startsWith("vnd.sun.star.Package"))
 {
 sMimeType
 = 
comphelper::GraphicMimeTypeHelper::GetMimeTypeForExtension(OUStringToOString(
 rString.copy(rString.lastIndexOf(".") + 1), 
RTL_TEXTENCODING_ASCII_US));
 }
-else
-{
-SAL_WARN("xmloff", "Unknown image source: " << rString);
-return 0;
-}
 
 // pixel formats first
 if(sMimeType == "image/bmp")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 sc/source/ui/view/output.cxx |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 0185e65bcd73dbad2205a39369e1e06b33a2ca51
Author: Armin Le Grand 
Date:   Thu Apr 19 18:56:55 2018 +0200

tdf#115582 Correct coordinate usage for sc's ::Array

In ScOutputData::SetCellRotations() eventually existing
CellRotations are added to the svx::frame::Array data
that gets created for repaint. This used the wrong coordinate
calculation, thus in some cases the repaint of rotated
Cells failed.

Change-Id: Ib5df8576e8c9404d717d5dcc5662aa04b82cf959
Reviewed-on: https://gerrit.libreoffice.org/53171
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index ea98954c..842f42212778 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -657,13 +657,22 @@ void ScOutputData::SetCellRotations()
 // Needed for CellInfo internal decisions (bg fill, 
...)
 pInfo->nRotateDir = nDir;
 
-// add rotation info to Array information
-const long 
nAttrRotate(pPattern->GetRotateVal(pCondSet));
-const SvxRotateMode 
eRotMode(pPattern->GetItem(ATTR_ROTATE_MODE, pCondSet).GetValue());
-const double fOrient((bLayoutRTL ? -1.0 : 1.0) * 
nAttrRotate * F_PI18000); // 1/100th degrees -> [0..2PI]
-svx::frame::Array& rArray = mrTabInfo.maArray;
+// create target coordinates
+const SCCOL nTargetX(nX - nVisX1 + 1);
+const SCROW nTargetY(nY - nVisY1 + 1);
 
-rArray.SetCellRotation(nX+1, nY+1, eRotMode, fOrient);
+// Check for values - below in SetCellRotation these 
will
+// be converted to size_t and thus may not be negative
+if(nTargetX >= 0 && nTargetY >= 0)
+{
+// add rotation info to Array information
+const long 
nAttrRotate(pPattern->GetRotateVal(pCondSet));
+const SvxRotateMode 
eRotMode(pPattern->GetItem(ATTR_ROTATE_MODE, pCondSet).GetValue());
+const double fOrient((bLayoutRTL ? -1.0 : 1.0) * 
nAttrRotate * F_PI18000); // 1/100th degrees -> [0..2PI]
+svx::frame::Array& rArray = mrTabInfo.maArray;
+
+rArray.SetCellRotation(nTargetX, nTargetY, 
eRotMode, fOrient);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[Stephan Bergmann]

 config_host.mk.in |1 -
 configure.ac  |3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 40180e56ff33c2217e333244607a7ac47552b533
Author: Stephan Bergmann 
Date:   Fri Apr 20 10:16:02 2018 +0200

Remove unused HELP_COMMON_ONLY

Unused ever since its introduction in 
b70d4ad13b909265c54a9ff55f07224a14e9feb2
"add --with-help=common parameter to the configure option".  (Whether
--with-help=common is also unused is a different question that needs to be
addressed separately.)

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 8f9fb90c98e7..a031f962a3da 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -252,7 +252,6 @@ export HAVE_GPGCONF_SOCKETDIR=@HAVE_GPGCONF_SOCKETDIR@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
-export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@
 export HELP_ONLINE=@HELP_ONLINE@
 export HOST_PLATFORM=@host@
 export HSQLDB_JAR=@HSQLDB_JAR@
diff --git a/configure.ac b/configure.ac
index 458f9f3c2735..5f14c5b99baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4701,13 +4701,11 @@ fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
 AC_MSG_CHECKING([whether to build help])
-HELP_COMMON_ONLY=FALSE
 if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != 
Android; then
 BUILD_TYPE="$BUILD_TYPE HELP"
 GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
 case "$with_help" in
 "common")
-HELP_COMMON_ONLY=TRUE
 AC_MSG_RESULT([common only])
 ;;
 "html")
@@ -4728,7 +4726,6 @@ else
 AC_MSG_RESULT([no])
 fi
 AC_SUBST([ENABLE_HTMLHELP])
-AC_SUBST(HELP_COMMON_ONLY)
 AC_SUBST([HELP_ONLINE])
 
 dnl Test whether to include MySpell dictionaries
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/dialogs/hangulhanjadlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e385ead86ea44573401d113812dc3cffb5ed77c
Author: Caolán McNamara 
Date:   Fri Apr 20 09:03:04 2018 +0100

bump the MAXNUM_SUGGESTIONS comparision

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

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index 64be36bab3da..cba5add90558 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1750,7 +1750,7 @@ namespace svx
 m_aDeletePB->SetClickHdl( LINK( this, HangulHanjaEditDictDialog, 
DeletePBPushHdl ) );
 m_aDeletePB->Enable( false );
 
-static_assert(MAXNUM_SUGGESTIONS > 5, "number of suggestions should 
not under-run the value of 5");
+static_assert(MAXNUM_SUGGESTIONS >= 5, "number of suggestions should 
not under-run the value of 5");
 
 Link  aScrLk( LINK( this, HangulHanjaEditDictDialog, 
ScrollHdl ) );
 m_aScrollSB->SetScrollHdl( aScrLk );
___
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-6.0' - comphelper/source desktop/source editeng/source include/comphelper include/LibreOfficeKit include/sfx2 libreofficekit/source sfx2/sou

[Tamás Zolnai]

 comphelper/source/misc/lok.cxx |   12 +++
 desktop/source/lib/init.cxx|2 
 editeng/source/editeng/impedit.cxx |3 
 include/LibreOfficeKit/LibreOfficeKitEnums.h   |8 +-
 include/comphelper/lok.hxx |6 +
 include/sfx2/lokhelper.hxx |2 
 libreofficekit/source/gtk/lokdocview.cxx   |   17 +++-
 sfx2/source/view/lokhelper.cxx |   16 
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   97 -
 sw/source/core/crsr/crsrsh.cxx |2 
 sw/source/core/crsr/viscrs.cxx |6 +
 11 files changed, 163 insertions(+), 8 deletions(-)

New commits:
commit 19a2c9ca42bab45f1e4e258d1023b62557f8f1fe
Author: Tamás Zolnai 
Date:   Thu Apr 5 22:23:28 2018 +0200

sw lok: View jumps to cursor position even if it is moved by an other view.

Scrolling is done twice. Once in SwCursorShell::UpdateCursor() by
SCROLLWIN flag. Here we can check the actual viewid and avoid scrolling
if the cursor is move by an other user.
The second instance in the LO online code, for it we need to pass the
viewid identifying the view which moved the cursor.

Change-Id: I033274f88ce41acbb632e2aeb0d986ab11cd2d52
Reviewed-on: https://gerrit.libreoffice.org/52220
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 83b7bfc0efefb3c77e5c59553320e98539250c62)

sw lok: followup commit for change about scrolling to visible cursor

Revert small part of this commit:
83b7bfc0efefb3c77e5c59553320e98539250c62

Thanks Jan Holesovsky to catching it.

Change-Id: I885c9f3da622052685d1e46f6358783fc7f8cb9a
Reviewed-on: https://gerrit.libreoffice.org/52684
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 508013d799358bb1c92b5cfea5257fe53c695cee)
Reviewed-on: https://gerrit.libreoffice.org/53178
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 589f57b61bce..05a991dad074 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -29,6 +29,8 @@ static bool g_bTiledAnnotations(true);
 
 static bool g_bRangeHeaders(false);
 
+static bool g_bViewIdForVisCursorInvalidation(false);
+
 static bool g_bLocalRendering(false);
 
 static LanguageTag g_aLanguageTag("en-US", true);
@@ -88,6 +90,16 @@ void setRangeHeaders(bool bRangeHeaders)
 g_bRangeHeaders = bRangeHeaders;
 }
 
+void setViewIdForVisCursorInvalidation(bool bViewIdForVisCursorInvalidation)
+{
+g_bViewIdForVisCursorInvalidation = bViewIdForVisCursorInvalidation;
+}
+
+bool isViewIdForVisCursorInvalidation()
+{
+return g_bViewIdForVisCursorInvalidation;
+}
+
 bool isRangeHeaders()
 {
 return g_bRangeHeaders;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 862022863885..5e00b5d09ea0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3521,6 +3521,8 @@ static void lo_setOptionalFeatures(LibreOfficeKit* pThis, 
unsigned long long con
 comphelper::LibreOfficeKit::setTiledAnnotations(false);
 if (features & LOK_FEATURE_RANGE_HEADERS)
 comphelper::LibreOfficeKit::setRangeHeaders(true);
+if (features & LOK_FEATURE_VIEWID_IN_VISCURSOR_INVALIDATION_CALLBACK)
+comphelper::LibreOfficeKit::setViewIdForVisCursorInvalidation(true);
 }
 
 static void lo_setDocumentPassword(LibreOfficeKit* pThis,
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 884f6e99327b..8e5c8c71540f 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1120,7 +1121,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 }
 else
 {
-
mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, 
sRect.getStr());
+SfxLokHelper::notifyVisCursorInvalidation(mpViewShell, sRect);
 
mpViewShell->NotifyOtherViews(LOK_CALLBACK_INVALIDATE_VIEW_CURSOR, "rectangle", 
sRect);
 }
 }
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 0c223463fdb8..767a0bb04366 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -84,7 +84,13 @@ typedef enum
 /**
  * Enable range based header data
  */
-LOK_FEATURE_RANGE_HEADERS = (1ULL << 4)
+LOK_FEATURE_RANGE_HEADERS = (1ULL << 4),
+
+/**
+ * Request to have the active view's Id as the 1st value in the
+ * LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR payload.
+ */
+LOK_FEATURE_VIEWID_IN_VISCURSO

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit fbbfcf1eeaf9d47e615519928fc07e1f1842bcb8
Author: Stephan Bergmann 
Date:   Fri Apr 20 11:13:03 2018 +0200

Updated core
Project: help  5de2306da7f9dea5231c0fd1bfd91491cceb646f

Clean up Package_html_static.mk

For ONLINE_HELP, apparently the source helpcontent2/help3xsl/index.html 
goes to
instdir/help/index.html while the source helpcontent2/help3xsl/index2.html 
goes
to instdir/help/$PRODUCTVERSION/index.html.

And for !ONLINE_HELP, apparently both source files (index.html and 
index2.html)
went to instdir/help/index.html, and the second one (index2.html) apparently
happened to win.  Cleaned that up, so that only the source
helpcontent2/help3xsl/index2.html goes to instdir/help/index.html.

Whether that's all as intended, or some of that is junk, I don't know.

(Also sorted list of files lexicographically, for easier comparison with 
`ls`
output.)

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

diff --git a/helpcontent2 b/helpcontent2
index d9211d6ba5b3..5de2306da7f9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d9211d6ba5b3b5d46e2d4be8f8aa623372233394
+Subproject commit 5de2306da7f9dea5231c0fd1bfd91491cceb646f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Package_html_static.mk

[Stephan Bergmann]

 Package_html_static.mk |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5de2306da7f9dea5231c0fd1bfd91491cceb646f
Author: Stephan Bergmann 
Date:   Fri Apr 20 11:13:03 2018 +0200

Clean up Package_html_static.mk

For ONLINE_HELP, apparently the source helpcontent2/help3xsl/index.html 
goes to
instdir/help/index.html while the source helpcontent2/help3xsl/index2.html 
goes
to instdir/help/$PRODUCTVERSION/index.html.

And for !ONLINE_HELP, apparently both source files (index.html and 
index2.html)
went to instdir/help/index.html, and the second one (index2.html) apparently
happened to win.  Cleaned that up, so that only the source
helpcontent2/help3xsl/index2.html goes to instdir/help/index.html.

Whether that's all as intended, or some of that is junk, I don't know.

(Also sorted list of files lexicographically, for easier comparison with 
`ls`
output.)

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

diff --git a/Package_html_static.mk b/Package_html_static.mk
index 79c0be172..e5041642d 100644
--- a/Package_html_static.mk
+++ b/Package_html_static.mk
@@ -10,19 +10,19 @@
 $(eval $(call 
gb_Package_Package,helpcontent2_html_static,$(SRCDIR)/helpcontent2/help3xsl))
 
 $(eval $(call 
gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER),\
-   index.html \
help.html \
+   $(if $(HELP_ONLINE),index.html) \
 )) 
 
-$(eval $(call 
gb_Package_add_file,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(if 
$(HELP_ONLINE),$(PRODUCTVERSION),'')/index.html,index2.html))
+$(eval $(call 
gb_Package_add_file,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)$(if 
$(HELP_ONLINE),/$(PRODUCTVERSION))/index.html,index2.html))
 
-$(eval $(call 
gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(if 
$(HELP_ONLINE),$(PRODUCTVERSION),''),\
+$(eval $(call 
gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(if 
$(HELP_ONLINE),/$(PRODUCTVERSION)),\
+   default.css \
+   fuse.js \
help.js \
help2.js \
-   fuse.js \
-   paginathing.js \
normalize.css \
-   default.css \
+   paginathing.js \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format writerperfect/astyle.options writerperfect/inc writerperfect/qa writerperfect/README writerperfect/source

[Miklos Vajna]

 solenv/clang-format/blacklist   |  124 
 writerperfect/README|6 
 writerperfect/astyle.options|   12 
 writerperfect/inc/DirectoryStream.hxx   |   19 
 writerperfect/inc/DocumentHandler.hxx   |   14 
 writerperfect/inc/DocumentHandlerFor.hxx|5 
 writerperfect/inc/DocumentHandlerForOdg.hxx |5 
 writerperfect/inc/DocumentHandlerForOdp.hxx |5 
 writerperfect/inc/DocumentHandlerForOds.hxx |5 
 writerperfect/inc/DocumentHandlerForOdt.hxx |5 
 writerperfect/inc/ImportFilter.hxx  |   90 +--
 writerperfect/inc/WPFTEncodingDialog.hxx|   23 
 writerperfect/inc/WPFTResMgr.hxx|5 
 writerperfect/inc/WPXSvInputStream.hxx  |   14 
 writerperfect/qa/unit/DirectoryStreamTest.cxx   |9 
 writerperfect/qa/unit/DrawingImportTest.cxx |   43 -
 writerperfect/qa/unit/EPUBExportTest.cxx|  244 
+
 writerperfect/qa/unit/ImportTest.cxx|   20 
 writerperfect/qa/unit/PresentationImportTest.cxx|   44 -
 writerperfect/qa/unit/SpreadsheetImportTest.cxx |   40 -
 writerperfect/qa/unit/TextImportTest.cxx|   43 -
 writerperfect/qa/unit/WPXSvStreamTest.cxx   |   32 -
 writerperfect/qa/unit/WpftCalcFilterTest.cxx|   28 -
 writerperfect/qa/unit/WpftDrawFilterTest.cxx|   53 +-
 writerperfect/qa/unit/WpftFilterFixture.cxx |2 
 writerperfect/qa/unit/WpftFilterFixture.hxx |   30 -
 writerperfect/qa/unit/WpftFilterTestBase.cxx|   12 
 writerperfect/qa/unit/WpftFilterTestBase.hxx|   20 
 writerperfect/qa/unit/WpftImpressFilterTest.cxx |   38 -
 writerperfect/qa/unit/WpftLoader.cxx|   50 --
 writerperfect/qa/unit/WpftLoader.hxx|   33 -
 writerperfect/qa/unit/WpftWriterFilterTest.cxx  |   58 +-
 writerperfect/qa/unit/wpftimport.cxx|3 
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx   |  249 
+-
 writerperfect/source/calc/MSWorksCalcImportFilter.hxx   |   22 
 writerperfect/source/calc/MWAWCalcImportFilter.cxx  |  101 ++--
 writerperfect/source/calc/MWAWCalcImportFilter.hxx  |   17 
 writerperfect/source/calc/NumbersImportFilter.cxx   |   34 -
 writerperfect/source/calc/NumbersImportFilter.hxx   |   17 
 writerperfect/source/calc/StarOfficeCalcImportFilter.cxx|   54 +-
 writerperfect/source/calc/StarOfficeCalcImportFilter.hxx|   18 
 writerperfect/source/common/DirectoryStream.cxx |   77 +--
 writerperfect/source/common/DocumentHandler.cxx |  184 
+++
 writerperfect/source/common/WPFTEncodingDialog.cxx  |  146 
++---
 writerperfect/source/common/WPXSvInputStream.cxx|  234 
-
 writerperfect/source/draw/CDRImportFilter.cxx   |   23 
 writerperfect/source/draw/CDRImportFilter.hxx   |   11 
 writerperfect/source/draw/CMXImportFilter.cxx   |   19 
 writerperfect/source/draw/CMXImportFilter.hxx   |   11 
 writerperfect/source/draw/FreehandImportFilter.cxx  |   23 
 writerperfect/source/draw/FreehandImportFilter.hxx  |   11 
 writerperfect/source/draw/MSPUBImportFilter.cxx |   23 
 writerperfect/source/draw/MSPUBImportFilter.hxx |   11 
 writerperfect/source/draw/MWAWDrawImportFilter.cxx  |   83 +--
 writerperfect/source/draw/MWAWDrawImportFilter.hxx  |   17 
 writerperfect/source/draw/PageMakerImportFilter.cxx |   19 
 writerperfect/source/draw/PageMakerImportFilter.hxx |   12 
 writerperfect/source/draw/QXPImportFilter.cxx   |   18 
 writerperfect/source/draw/QXPImportFilter.hxx   |   11 
 writerperfect/source/draw/StarOfficeDrawImportFilter.cxx|   52 +-
 writerperfect/source/draw/StarOfficeDrawImportFilter.hxx|   18 
 writerperfect/source/draw/VisioImportFilter.cxx |   23 
 writerperfect/source/draw/VisioImportFilter.hxx |   11 
 writerperfect/source/draw/WPGImportFilter.cxx

[Libreoffice-commits] help.git: Package_html.mk

[Stephan Bergmann]

 Package_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d9211d6ba5b3b5d46e2d4be8f8aa623372233394
Author: Stephan Bergmann 
Date:   Fri Apr 20 11:06:07 2018 +0200

Syntactic clean-up in Package_html.mk

Change-Id: Ibc0f5773714f0e0df0f5bcdf0d52a482dcdbb4a7
Reviewed-on: https://gerrit.libreoffice.org/53189
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/Package_html.mk b/Package_html.mk
index 680b6829c..32e649d8c 100644
--- a/Package_html.mk
+++ b/Package_html.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Package_Package,helpcontent2_html,$(call 
gb_CustomTarget_get_wo
 
 $(eval $(call 
gb_Package_use_customtarget,helpcontent2_html,helpcontent2/help3xsl))
 
-$(eval $(call 
gb_Package_add_files,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)/$(if 
$(HELP_ONLINE),$(PRODUCTVERSION),),\
+$(eval $(call 
gb_Package_add_files,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)$(if 
$(HELP_ONLINE),/$(PRODUCTVERSION)),\
hid2file.js \
 ))
 
-$(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)/$(if 
$(HELP_ONLINE),$(PRODUCTVERSION),),\
+$(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)$(if 
$(HELP_ONLINE),/$(PRODUCTVERSION)),\
$(foreach lang,$(gb_HELP_LANGS),\
$(lang)/bookmarks.js \
$(lang)/contents.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 66c02d16dd078613e754dcc775f366413fad13f0
Author: Stephan Bergmann 
Date:   Fri Apr 20 11:06:07 2018 +0200

Updated core
Project: help  d9211d6ba5b3b5d46e2d4be8f8aa623372233394

Syntactic clean-up in Package_html.mk

Change-Id: Ibc0f5773714f0e0df0f5bcdf0d52a482dcdbb4a7
Reviewed-on: https://gerrit.libreoffice.org/53189
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index 23665d6b0482..d9211d6ba5b3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 23665d6b04829ac2b949c88de261c6f7b2de8baa
+Subproject commit d9211d6ba5b3b5d46e2d4be8f8aa623372233394
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Anybody using --with-help=common?

[Tomáš Chvátal]

2018-04-20 10:26 GMT+02:00 Stephan Bergmann :

> ...as was introduced with  libreoffice/core/commit/?id=b70d4ad13b909265c54a9ff55f07224a14e9feb2>:
>
> commit b70d4ad13b909265c54a9ff55f07224a14e9feb2
>> Author: Petr Mladek 
>> Date:   Wed Aug 28 16:09:39 2013 +0200
>>
>> add --with-help=common parameter to the configure option
>> It allows to build only the common parts of the help, e.g.
>> bundle the helpcontent-related icons.
>> It is useful when the build content is built separately. For
>> example,
>> it is used to speed up the build of the main package in openSUSE
>> Build Service.
>>
>
openSUSE is no longer using it, so from our PoV it can be killed :)

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

Anybody using --with-help=common?

[Stephan Bergmann]

...as was introduced with 
:



commit b70d4ad13b909265c54a9ff55f07224a14e9feb2
Author: Petr Mladek 
Date:   Wed Aug 28 16:09:39 2013 +0200

add --with-help=common parameter to the configure option

It allows to build only the common parts of the help, e.g.

bundle the helpcontent-related icons.

It is useful when the build content is built separately. For example,

it is used to speed up the build of the main package in openSUSE
Build Service.

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

Re: [Libreoffice-qa] HSQLDB to Firebird migration

[Xisco Fauli]

Hello Florian,


El 19/04/18 a les 20:06, Florian Reisinger ha escrit:
> Hello everyone,
>
> Based on
> https://bugs.documentfoundation.org/show_bug.cgi?id=116944#c42 a list
> of TODO items for the migration:
>
> I was told discussing this bug both on QA and DEV ML is okay.
>
> Some TODO items / things I had in mind :)
>
> - Converting HSQLDB databases from HSQLDB to Firebird should not be
> enabled by default in 6.1 -> Should be an experimental option.
> - Expert configuration entry should be added to force / ask / delay
> upgrade
> - In "RELEASE CONFIGURATION" builds default should be "delay", in
> others "ask".

Personally I would wait a bit longer to take that decision.
The hard code freeze for 6.1 is on week 29, in 13 weeks from now. I
guess we can always put it back to experimental mode if its state isn't
good enough to be the default one.
In 6.0, we did something similar with the threading feature

Regards

-- 
Xisco Faulí
Libreoffice QA Team
IRC: x1sc0


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

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

[Andrea Gelmini]

 sc/uiconfig/scalc/ui/notebookbar.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ffa6c70deb054c0dff4aab5a6ba5a03d0225d32d
Author: Andrea Gelmini 
Date:   Wed Apr 18 08:53:44 2018 +0200

Fix typos

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 1e1e5ee4fb69..7df3beab5f0d 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -7652,7 +7652,7 @@
   
 
 
-  
+  
 True
 False
 
@@ -7851,7 +7851,7 @@
 center
 True
 
-  
+  
 True
 False
 center
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/envelp/labfmt.cxx|   67 ++
 sw/source/ui/envelp/labfmt.hxx|   24 ++
 sw/uiconfig/swriter/ui/savelabeldialog.ui |   26 +--
 3 files changed, 58 insertions(+), 59 deletions(-)

New commits:
commit 2448d6d7126cdbe73c1f56d6703f390f9f88216b
Author: Caolán McNamara 
Date:   Thu Apr 19 15:24:43 2018 +0100

weld SwSaveLabelDlg

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

diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 82a5b754f9c7..90672ac0fd10 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -574,10 +574,10 @@ IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl, Button*, void)
 aRec.m_nPWidth  = static_cast< long >(GETFLDVAL(*m_pPWidthField ));
 aRec.m_nPHeight = static_cast< long >(GETFLDVAL(*m_pPHeightField));
 aRec.m_bCont = aItem.m_bCont;
-ScopedVclPtrInstance< SwSaveLabelDlg > pSaveDlg(this, aRec);
-pSaveDlg->SetLabel(aItem.m_aLstMake, aItem.m_aLstType);
-pSaveDlg->Execute();
-if(pSaveDlg->GetLabel(aItem))
+SwSaveLabelDlg aSaveDlg(this, aRec);
+aSaveDlg.SetLabel(aItem.m_aLstMake, aItem.m_aLstType);
+aSaveDlg.run();
+if (aSaveDlg.GetLabel(aItem))
 {
 bModified = false;
 const std::vector& rMan = 
GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers();
@@ -592,60 +592,47 @@ IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl, Button*, void)
 }
 
 SwSaveLabelDlg::SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec)
-: ModalDialog(pParent, "SaveLabelDialog",
-"modules/swriter/ui/savelabeldialog.ui")
+: GenericDialogController(pParent->GetFrameWeld(), 
"modules/swriter/ui/savelabeldialog.ui", "SaveLabelDialog")
 , bSuccess(false)
 , pLabPage(pParent)
 , rLabRec(rRec)
+, m_xMakeCB(m_xBuilder->weld_combo_box_text("brand"))
+, m_xTypeED(m_xBuilder->weld_entry("type"))
+, m_xOKPB(m_xBuilder->weld_button("ok"))
 {
-get(m_pMakeCB, "brand");
-get(m_pTypeED, "type");
-get(m_pOKPB, "ok");
-
-m_pOKPB->SetClickHdl(LINK(this, SwSaveLabelDlg, OkHdl));
-Link aLk(LINK(this, SwSaveLabelDlg, ModifyHdl));
-m_pMakeCB->SetModifyHdl(aLk);
-m_pTypeED->SetModifyHdl(aLk);
+m_xOKPB->connect_clicked(LINK(this, SwSaveLabelDlg, OkHdl));
+m_xMakeCB->connect_changed(LINK(this, SwSaveLabelDlg, ModifyComboHdl));
+m_xTypeED->connect_changed(LINK(this, SwSaveLabelDlg, ModifyEntryHdl));
 
 SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig();
 const std::vector& rMan = rCfg.GetManufacturers();
 for (const auto & i : rMan)
 {
-m_pMakeCB->InsertEntry(i);
+m_xMakeCB->append_text(i);
 }
 }
 
 SwSaveLabelDlg::~SwSaveLabelDlg()
 {
-disposeOnce();
-}
-
-void SwSaveLabelDlg::dispose()
-{
-m_pMakeCB.clear();
-m_pTypeED.clear();
-m_pOKPB.clear();
-pLabPage.clear();
-ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl, Button*, void)
+IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl, weld::Button&, void)
 {
 SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig();
-OUString sMake(m_pMakeCB->GetText());
-OUString sType(m_pTypeED->GetText());
+OUString sMake(m_xMakeCB->get_active_text());
+OUString sType(m_xTypeED->get_text());
 if(rCfg.HasLabel(sMake, sType))
 {
 if ( rCfg.IsPredefinedLabel(sMake, sType) )
 {
 SAL_WARN( "sw.envelp", "label is predefined and cannot be 
overwritten" );
-std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), 
"modules/swriter/ui/cannotsavelabeldialog.ui"));
+std::unique_ptr 
xBuilder(Application::CreateBuilder(m_xDialog.get(), 
"modules/swriter/ui/cannotsavelabeldialog.ui"));
 std::unique_ptr 
xBox(xBuilder->weld_message_dialog("CannotSaveLabelDialog"));
 xBox->run();
 return;
 }
 
-std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), 
"modules/swriter/ui/querysavelabeldialog.ui"));
+std::unique_ptr 
xBuilder(Application::CreateBuilder(m_xDialog.get(), 
"modules/swriter/ui/querysavelabeldialog.ui"));
 std::unique_ptr 
xQuery(xBuilder->weld_message_dialog("QuerySaveLabelDialog"));
 xQuery->set_primary_text(xQuery->get_primary_text().
 replaceAll("%1", sMake).replaceAll("%2", sType));
@@ -658,20 +645,30 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl, Button*, void)
 rLabRec.m_aType = sType;
 rCfg.SaveLabel(sMake, sType, rLabRec);
 bSuccess = true;
-EndDialog(RET_OK);
+m_xDialog->response(RET_OK);
+}
+
+void SwSaveLabelDlg::Modify()
+{
+m_xOKPB->set_sensitive(!m_xMakeCB->get_active_text().isEmpty() && 
!m_xTypeED->get_text().isEmpty());
+}
+
+IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyCombo

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |8 +---
 sw/source/filter/ww8/ww8par.hxx  |4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 30d7feeb88ea77632fede1b20cd8610b22e3773c
Author: Caolán McNamara 
Date:   Thu Apr 19 13:45:05 2018 +0100

MungeTextIntoDrawBox 1st arg is member of 2nd arg

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

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index a57ccc46b3ac..d16d16cfa4af 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2759,7 +2759,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long 
nGrafAnchorCp )
 pRecord = it->get();
 if (pRecord->pObj && pRecord->aTextId.nTxBxS)
 { // #i52825# pRetFrameFormat can be NULL
-pRetFrameFormat = MungeTextIntoDrawBox(pRecord->pObj,
+pRetFrameFormat = MungeTextIntoDrawBox(
 pRecord, nGrafAnchorCp, pRetFrameFormat);
 }
 }
@@ -2796,9 +2796,11 @@ SwFrameFormat 
*SwWW8ImplReader::AddAutoAnchor(SwFrameFormat *pFormat)
 return pFormat;
 }
 
-SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
-SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat* 
pRetFrameFormat)
+SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SvxMSDffImportRec 
*pRecord,
+long nGrafAnchorCp, SwFrameFormat* pRetFrameFormat)
 {
+SdrObject* pTrueObject = pRecord->pObj;
+
 SdrTextObj* pSdrTextObj;
 
 // check for group object (e.g. two parentheses)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 7092131a87ea..68e4063217a1 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1606,8 +1606,8 @@ private:
 SwFlyFrameFormat *ConvertDrawTextToFly( SdrObject* &rpObject,
 SdrObject* &rpOurNewObject, SvxMSDffImportRec const * pRecord,
 RndStdIds eAnchor, WW8_FSPA const *pF, SfxItemSet &rFlySet );
-SwFrameFormat* MungeTextIntoDrawBox(SdrObject* pTrueObject,
-SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat 
*pRetFrameFormat);
+SwFrameFormat* MungeTextIntoDrawBox(SvxMSDffImportRec *pRecord,
+long nGrafAnchorCp, SwFrameFormat *pRetFrameFormat);
 
 void GrafikCtor();
 void GrafikDtor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/msfilter/msdffimp.cxx  |   37 ++-
 filter/source/msfilter/svdfppt.cxx   |3 --
 include/filter/msfilter/msdffimp.hxx |   11 +++---
 include/filter/msfilter/svdfppt.hxx  |3 +-
 sw/source/filter/ww8/ww8graf.cxx |   11 --
 5 files changed, 48 insertions(+), 17 deletions(-)

New commits:
commit 9f0fdb491cb128d3a5afb9c1f5907dfc31f6b197
Author: Caolán McNamara 
Date:   Tue Apr 17 09:26:55 2018 +0100

forcepoint#38 notify that obj in group was deleted

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 4eaf3205e437..6e1726c9785c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5028,8 +5028,34 @@ void SvxMSDffManager::GetGroupAnchors( const 
DffRecordHeader& rHd, SvStream& rSt
 }
 }
 
-void SvxMSDffManager::FreeObj(void* /*pData*/, SdrObject* pObj)
+SvxMSDffImportRec* SvxMSDffImportData::find(const SdrObject* pObj)
 {
+for (const auto& it : *this)
+{
+if (it->pObj == pObj)
+return it.get();
+}
+return nullptr;
+}
+
+void SvxMSDffManager::NotifyFreeObj(void* pData, SdrObject* pObj)
+{
+if (SdrObjGroup* pGroup = dynamic_cast(pObj))
+{
+SdrObjList* pSubList = pGroup->GetSubList();
+size_t nObjCount = pSubList->GetObjCount();
+for (size_t i = 0; i < nObjCount; ++i)
+NotifyFreeObj(pData, pSubList->GetObj(i));
+}
+
+SvxMSDffImportData& rImportData = *static_cast(pData);
+if (SvxMSDffImportRec* pRecord = rImportData.find(pObj))
+pRecord->pObj = nullptr;
+}
+
+void SvxMSDffManager::FreeObj(void* pData, SdrObject* pObj)
+{
+NotifyFreeObj(pData, pObj);
 SdrObject::Free(pObj);
 }
 
@@ -7471,4 +7497,13 @@ SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 
nShapeId )
 return aIter != maShapeIdContainer.end() ? (*aIter).second : nullptr;
 }
 
+SvxMSDffImportData::SvxMSDffImportData(const tools::Rectangle& rParentRect)
+: aParentRect(rParentRect)
+{
+}
+
+SvxMSDffImportData::~SvxMSDffImportData()
+{
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 5758ca606a1b..c9e26c9e64c6 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -710,7 +710,7 @@ sal_uLong DffPropSet::SanitizeEndPos(SvStream &rIn, 
sal_uLong nEndRecPos)
 return nEndRecPos;
 }
 
-void SdrEscherImport::FreeObj(void* pData, SdrObject* pObj)
+void SdrEscherImport::NotifyFreeObj(void* pData, SdrObject* pObj)
 {
 ProcessData& rData = *static_cast(pData);
 PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
@@ -726,7 +726,6 @@ void SdrEscherImport::FreeObj(void* pData, SdrObject* pObj)
 pPtr->pCObj = nullptr;
 }
 }
-SvxMSDffManager::FreeObj(pData, pObj);
 }
 
 /* ProcessObject is called from ImplSdPPTImport::ProcessObj to handle all 
application specific things,
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index fedce1b33112..022994a51873 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -268,15 +268,19 @@ typedef std::set,
 
 /** block of parameters for import/export for a single call of
 ImportObjAtCurrentStreamPos() */
-struct SvxMSDffImportData
+struct MSFILTER_DLLPUBLIC SvxMSDffImportData
 {
 MSDffImportRecords  m_Records;  ///< Shape pointer, Shape ids and private 
data
 tools::Rectangle   aParentRect;///< Rectangle of the surrounding 
groups,
 ///< which might have been provided 
externally
 
-explicit SvxMSDffImportData( const tools::Rectangle& rParentRect ) : 
aParentRect( rParentRect ) {}
+explicit SvxMSDffImportData(const tools::Rectangle& rParentRect);
+SvxMSDffImportData& operator=( SvxMSDffImportData const & ) = delete; // 
MSVC2015 workaround
+SvxMSDffImportData( SvxMSDffImportData const & ) = delete; // MSVC2015 
workaround
+~SvxMSDffImportData();
 bool empty() const { return m_Records.empty(); }
 size_t size() const { return m_Records.size(); }
+SvxMSDffImportRec* find(const SdrObject* pObj);
 MSDffImportRecords::const_iterator begin() const { return 
m_Records.begin();  }
 MSDffImportRecords::const_iterator end() const { return m_Records.end();  }
 };
@@ -499,7 +503,8 @@ protected:
void* pData,
tools::Rectangle& rTextRect,
SdrObject* pObj);
-virtual void FreeObj(void* pData, SdrObject* pObj);
+virtual void NotifyFreeObj(void* pData, SdrObject* pObj);
+void FreeObj(void* pData, SdrObje

Re: Compiling --enable-pdfium fails

[Miklos Vajna]

Hi,

On Fri, Apr 20, 2018 at 09:34:23AM +0200, Stephan Bergmann 
 wrote:
> And note that your issue is with LO's bundled external/pdfium, not core LO
> code, building against system jpeg.  Arguably, whatever missing configure
> checks are missing from pdfium's configure; so if you come up with a fix for
> that, that should probably go to the pdfium upstream.

pdfium has its unhelpful own build system inherited from Chromium, so we
don't use that, instead we just build their code with gbuild.

But otherwise sure, if changes to pdfium itself are necessary, it's good
to upstream that, I've already sent a number of patches upstream in the
recent past and it was a pleasure to work with the maintainers, so it's
not wasted effort.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Compiling --enable-pdfium fails

[Stephan Bergmann]

On 19/04/18 17:45, Дилян Палаузов wrote:
--with-system-jpeg was indeed the problem.  What libjpeg has to be 
installed in order for this to work?  Are libturbo-jpeg and jpeg-9c.zip 
interchangable, as they both provide libjpeg.so?  Can I use jpeg-9b 
instead of jpeg-9c and why doesn't ./configure fail in such cases?


LO should work with bot libjpeg and libjpeg-turbo.  And given that 
there's zero checking for specific details in LO's configure.ac for the 
--with-system-jpeg case, I'd assume that various jpeg-9* would all work. 
 But you'd need to check; configure checks are typically only added 
once somebody ran into a non-working combination.


And note that your issue is with LO's bundled external/pdfium, not core 
LO code, building against system jpeg.  Arguably, whatever missing 
configure checks are missing from pdfium's configure; so if you come up 
with a fix for that, that should probably go to the pdfium upstream.

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

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

[Tomaž Vajngerl]

 include/svx/svdograf.hxx   |4 
 include/vcl/GraphicObject.hxx  |   23 --
 include/vcl/gfxlink.hxx|   10 -
 include/vcl/graph.hxx  |3 
 include/vcl/graphicfilter.hxx  |3 
 include/vcl/salctype.hxx   |3 
 sc/qa/extras/anchor.cxx|   10 -
 sc/qa/unit/subsequent_export-test.cxx  |2 
 sd/qa/unit/data/xml/fdo64586_0.xml |4 
 sd/qa/unit/data/xml/n758621_0.xml  |4 
 sd/qa/unit/data/xml/n758621_1.xml  |4 
 sd/qa/unit/data/xml/n819614_0.xml  |2 
 sd/qa/unit/export-tests.cxx|4 
 svx/source/svdraw/svdograf.cxx |6 
 svx/source/xml/xmlgrhlp.cxx|   15 +
 sw/qa/extras/globalfilter/globalfilter.cxx |5 
 vcl/inc/graphic/Manager.hxx|2 
 vcl/inc/impgraph.hxx   |   15 +
 vcl/source/filter/graphicfilter.cxx|  227 +
 vcl/source/gdi/gfxlink.cxx |   65 
 vcl/source/gdi/graph.cxx   |   10 +
 vcl/source/gdi/impgraph.cxx|  165 +
 vcl/source/graphic/GraphicObject.cxx   |   55 +++
 vcl/source/graphic/Manager.cxx |   21 +-
 24 files changed, 526 insertions(+), 136 deletions(-)

New commits:
commit 7b355669c6ddeab2e6cec692d6afdff41c61d0fb
Author: Tomaž Vajngerl 
Date:   Sat Apr 14 15:13:05 2018 +0900

Function to load graphic swapped out (loaded on demand)

When a document is loaded it takes a lot of time and memory to
load the graphic that are in the documet, so avoid that and just
store the compressed graphic into a temporary file (handeled by
GfxLink) and load when we really need to show the graphic.

GraphicObject cached some attributes from Graphic, but this
attributes now aren't available immediately so this attributes
are removed form GraphicObject and now delegate to the Graphic
itself. GetSizeBytes attribute however was removed as it is
only used in some tests.

GfxLink initial values were moved to the constructor and are
not set in the header file anymore (as it is the recommended
way to do it).

The SdImportTest::testDocumentLayout failed as it looks like the
dump sometimes didn't include the width and height of the null
bitmap (which is set to 32x32) of the FillBitmap in some
situations, but then in other situations it did include this
attributes. With this change the width and height are always
included for the FillBitmap which looks like it is more correct.

Change-Id: Ia1218f93b1735402b7828404f65660e2d4acf32f
Reviewed-on: https://gerrit.libreoffice.org/53016
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index f3b0b1946564..9b1a4631b376 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -156,8 +156,8 @@ public:
 bool IsEPS() const;
 bool IsSwappedOut() const;
 
-const MapMode&  GetGrafPrefMapMode() const;
-const Size& GetGrafPrefSize() const;
+MapMode  GetGrafPrefMapMode() const;
+Size GetGrafPrefSize() const;
 
 voidSetGrafStreamURL( const OUString& 
rGraphicStreamURL );
 OUString const &GetGrafStreamURL() const;
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index 140ea7402540..d9f60e49598d 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -172,19 +172,9 @@ class VCL_DLLPUBLIC GraphicObject
 private:
 Graphic maGraphic;
 GraphicAttr maAttr;
-SizemaPrefSize;
-MapMode maPrefMapMode;
-sal_uLong   mnSizeBytes;
-GraphicType meType;
 OUStringmaUserData;
 std::unique_ptr mxSimpleCache;
-sal_uInt32  mnAnimationLoopCount;
 
-boolmbTransparent   : 1;
-boolmbAnimated  : 1;
-boolmbEPS   : 1;
-
-voidVCL_DLLPRIVATE ImplAssignGraphicData();
 boolVCL_DLLPRIVATE ImplGetCropParams(
 OutputDevice const * pOut,
 Point& rPt,
@@ -342,13 +332,12 @@ public:
 
 OString GetUniqueID() const;
 
-GraphicType GetType() const { return meType; }
-const Size& GetPrefSize() const { return maPrefSize; }
-const MapMode&  GetPrefMapMode() const { return maPrefMapMode; }
-sal_uLong   GetSizeBytes() const { return mnSizeBytes; }
-boolIsTransparent() const { return mbTransparent; }
-boolIsAnimated() const { return mbAnimated; }
-  

[Libreoffice-commits] core.git: accessibility/inc desktop/source fpicker/source include/svtools oox/source sd/source sfx2/source svtools/source sw/source uui/source

[Gabor Kelemen]

 accessibility/inc/extended/textwindowaccessibility.hxx |1 -
 desktop/source/deployment/gui/dp_gui_dialog2.cxx   |1 -
 fpicker/source/office/PlacesListBox.cxx|1 -
 fpicker/source/office/iodlg.cxx|1 -
 include/svtools/foldertree.hxx |2 --
 oox/source/ppt/pptimport.cxx   |1 -
 sd/source/ui/func/fuinsert.cxx |1 -
 sfx2/source/appl/appbas.cxx|1 -
 sfx2/source/appl/appinit.cxx   |1 -
 sfx2/source/appl/appquit.cxx   |1 -
 sfx2/source/appl/newhelp.cxx   |1 -
 sfx2/source/doc/objcont.cxx|1 -
 sfx2/source/doc/objxtor.cxx|1 -
 sfx2/source/doc/sfxbasemodel.cxx   |1 -
 svtools/source/brwbox/editbrowsebox.cxx|2 --
 svtools/source/contnr/svimpbox.cxx |2 --
 svtools/source/java/javacontext.cxx|1 -
 svtools/source/misc/embedhlp.cxx   |2 --
 sw/source/uibase/docvw/HeaderFooterWin.cxx |2 --
 uui/source/iahndl-errorhandler.cxx |1 -
 20 files changed, 25 deletions(-)

New commits:
commit 663fd3d6e1f93ec989dc289e688d5dbfe434cbca
Author: Gabor Kelemen 
Date:   Thu Apr 19 01:05:02 2018 +0200

tdf#42949 Remove unnecessary localization headers of svtools

Found by searching for the header names and the localization function:
git grep -l -e \ -e \ | xargs 
grep -c SvtResId | grep :0$ | grep -v /pch

Change-Id: I861fed778660412dc73616da29503538b3fe9ccb
Reviewed-on: https://gerrit.libreoffice.org/53136
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx 
b/accessibility/inc/extended/textwindowaccessibility.hxx
index 7299b3954a9f..59d92208dbea 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -49,7 +49,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 38072271b33c..9330789548e4 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
diff --git a/fpicker/source/office/PlacesListBox.cxx 
b/fpicker/source/office/PlacesListBox.cxx
index 1bcd4fc2a198..aa5bc591f303 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -11,7 +11,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #define COLUMN_NAME 1
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index e4e840b0fbd8..ca7cc591db3f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -43,7 +43,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "asyncfilepicker.hxx"
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 51a180c6729b..f6ab259fd815 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -17,8 +17,6 @@
 #include 
 
 #include 
-#include 
-#include 
 #include 
 
 #include 
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index d98551eb51b1..41733e1f2825 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index ad22e00dc71b..d334d8908455 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 8ed394cb99f0..42c7f848e392 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -63,7 +63,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 1c2d49d0f230..cb3bbcb066fc 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 007f954b5856..35a7c152af34 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -53,7 +53,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using ::basic::BasicManagerRepository;
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index

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

[Noel Grandin]

 filter/source/msfilter/msdffimp.cxx  |1 -
 include/svx/svdobj.hxx   |1 -
 include/svx/svdotext.hxx |1 -
 svx/source/sidebar/SelectionAnalyzer.cxx |3 ---
 svx/source/svdraw/svdcrtv.cxx|4 ++--
 svx/source/svdraw/svdedxv.cxx|3 +--
 svx/source/svdraw/svdobj.cxx |1 -
 svx/source/svdraw/svdorect.cxx   |4 ++--
 sw/source/uibase/utlui/content.cxx   |3 ---
 9 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 73584b2342b4e527b5329b4bf779171c4fc2d4ce
Author: Noel Grandin 
Date:   Thu Apr 19 16:30:01 2018 +0200

OBJ_TEXTEXT is dead

with
commit dfefe448c41921f2f1e54d3f69b8b9e89031d055
Date:   Thu Mar 1 15:54:32 2018 +0100
SOSAW080: Added first bunch of basic changes to helpers

Change-Id: Ib0dc816a62f36966f0d61b16916a49f11007b413
Reviewed-on: https://gerrit.libreoffice.org/53169
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 2e842b106f78..4eaf3205e437 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -472,7 +472,6 @@ void SvxMSDffManager::SolveSolver( const 
SvxMSDffSolverContainer& rSolver )
 case OBJ_RECT :
 case OBJ_TEXT :
 case OBJ_PAGE :
-case OBJ_TEXTEXT :
 case OBJ_TITLETEXT :
 case OBJ_OUTLINETEXT :
 {
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 618b6b37495a..df6d42f2233f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -124,7 +124,6 @@ enum SdrObjKind {
 OBJ_SPLNLINE   =14,  /// natural cubic Spline  (ni)
 OBJ_SPLNFILL   =15,  /// periodic cubic Spline (ni)
 OBJ_TEXT   =16,  /// text object
-OBJ_TEXTEXT=17,  /// text extension frame  (ni)
 OBJ_TITLETEXT  =20,  /// TitleText, special text object for StarDraw
 OBJ_OUTLINETEXT=21,  /// OutlineText, special text object for StarDraw
 OBJ_GRAF   =22,  /// foreign graphic (StarView Graphic)
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index f7a577404d6c..8cae87d87af2 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -195,7 +195,6 @@ protected:
 
 // Possible values for eTextKind are:
 // OBJ_TEXT regular text frame
-// OBJ_TEXTEXT  text continuation frame
 // OBJ_TITLETEXTTitleText for presentations
 // OBJ_OUTLINETEXT  OutlineText for presentations
 // eTextKind only has meaning when bTextFrame=sal_True, since otherwise
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx 
b/svx/source/sidebar/SelectionAnalyzer.cxx
index f39fbc217b81..ea4fb5db2d7f 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -205,7 +205,6 @@ EnumContext::Context 
SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt
 case OBJ_TITLETEXT:
 case OBJ_OUTLINETEXT:
 case OBJ_TEXT:
-case OBJ_TEXTEXT:
 case OBJ_MEASURE:
 case OBJ_RECT:
 case OBJ_CIRC:
@@ -272,7 +271,6 @@ EnumContext::Context 
SelectionAnalyzer::GetContextForObjectId_SD (
 case OBJ_TITLETEXT:
 case OBJ_OUTLINETEXT:
 case OBJ_TEXT:
-case OBJ_TEXTEXT:
 return EnumContext::Context::TextObject;
 
 case OBJ_GRAF:
@@ -468,7 +466,6 @@ bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 
nType)
 switch(nType)
 {
 case OBJ_TEXT:
-case OBJ_TEXTEXT:
 case OBJ_TITLETEXT:
 case OBJ_OUTLINETEXT:
 return true;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 673c03ec72b3..c015fe69a848 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -330,7 +330,7 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, 
vcl::Window* pWin)
 
 bool SdrCreateView::IsTextTool() const
 {
-return meEditMode==SdrViewEditMode::Create && 
nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_TEXT || 
nCurrentIdent==OBJ_TEXTEXT || nCurrentIdent==OBJ_TITLETEXT || 
nCurrentIdent==OBJ_OUTLINETEXT);
+return meEditMode==SdrViewEditMode::Create && 
nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_TEXT || 
nCurrentIdent==OBJ_TITLETEXT || nCurrentIdent==OBJ_OUTLINETEXT);
 }
 
 bool SdrCreateView::IsEdgeTool() const
@@ -449,7 +449,7 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, 
sal_uInt16 nIdent, cons
 
 pCurrentCreate->SetMergedItemSet(aSet);
 }
-if (mpModel && nInvent==SdrInventor::Default && 
(nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT ||
+if (mpMo

[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang include/sfx2 include/svx include/vcl sfx2/source svx/source sw/inc sw/source

[Noel Grandin]

 compilerplugins/clang/singlevalfields.results|   72 ++-
 compilerplugins/clang/unnecessaryvirtual.results |   50 ++-
 include/sfx2/charwin.hxx |1 
 include/svx/svdograf.hxx |1 
 include/svx/svdpage.hxx  |2 
 include/vcl/GraphicObject.hxx|4 -
 sfx2/source/control/charwin.cxx  |3 
 svx/source/svdraw/svdograf.cxx   |7 --
 sw/inc/tblenum.hxx   |1 
 sw/source/core/doc/tblrwcl.cxx   |7 --
 sw/source/core/docnode/ndtbl.cxx |1 
 sw/source/core/frmedt/fetab.cxx  |4 -
 sw/source/core/undo/untbl.cxx|1 
 13 files changed, 46 insertions(+), 108 deletions(-)

New commits:
commit a0fd9001801bf29ac4154edfd914dc930ffecd72
Author: Noel Grandin 
Date:   Thu Apr 19 16:20:09 2018 +0200

loplugin:unusedenumconstants

TableChgWidthHeightType::RowTop is dead with

   commit 2d5ce0e1b233c83f91481cd6b9306ac8de7f5ff8
   Date:   Mon Mar 26 13:08:54 2018 +0200
   tdf#116452 Remove "3 seconds to add/delete col/row" functions

Change-Id: I2fa82822b70457673419bd90ae82016c796acaa8
Reviewed-on: https://gerrit.libreoffice.org/53167
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index 057f232ea4ef..140ea7402540 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -34,13 +34,11 @@ enum class GraphicManagerDrawFlags
 CACHED  = 0x01,
 SMOOTHSCALE = 0x02,
 USE_DRAWMODE_SETTINGS   = 0x04,
-SUBSTITUTE  = 0x08,
-NO_SUBSTITUTE   = 0x10,
 STANDARD= (CACHED|SMOOTHSCALE),
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 // AutoSwap defines
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index bf9570f17fec..dd0504f80016 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -26,7 +26,6 @@ enum class TableChgWidthHeightType : sal_uInt16
 {
 ColLeft  = 0,
 ColRight = 1,
-RowTop   = 2,
 RowBottom= 3,
 CellLeft = 4,
 CellRight= 5,
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 5544487788a2..d1dd34c0a5da 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -201,8 +201,7 @@ struct CR_SetLineHeight
 : pTableNd( pTNd ), pUndo( nullptr ),
 nMaxSpace( 0 ), nMaxHeight( 0 )
 {
-bTop = TableChgWidthHeightType::RowTop == extractPosition( eType ) ||
-   TableChgWidthHeightType::CellTop == extractPosition( eType );
+bTop = TableChgWidthHeightType::CellTop == extractPosition( eType );
 bBigger = bool(eType & TableChgWidthHeightType::BiggerMode );
 if( eType & TableChgWidthHeightType::InsertDeleteMode )
 bBigger = !bBigger;
@@ -4118,8 +4117,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, 
TableChgWidthHeightType eTy
 SwTableSortBoxes aTmpLst;   // for Undo
 bool bBigger,
 bRet = false,
-bTop = TableChgWidthHeightType::RowTop == extractPosition( eType ) ||
-   TableChgWidthHeightType::CellTop == extractPosition( eType ),
+bTop = TableChgWidthHeightType::CellTop == extractPosition( eType ),
 bInsDel = bool(eType & TableChgWidthHeightType::InsertDeleteMode );
 sal_uInt16 nBaseLinePos = GetTabLines().GetPos( pBaseLine );
 sal_uLong nBoxIdx = rCurrentBox.GetSttIdx();
@@ -4150,7 +4148,6 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, 
TableChgWidthHeightType eTy
 pBaseLine = pLine;
 SAL_FALLTHROUGH;
 
-case TableChgWidthHeightType::RowTop:
 case TableChgWidthHeightType::RowBottom:
 {
 if( bInsDel && !bBigger )   // By how much does it get higher?
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4fc498d41cb8..3edfcdf51310 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3968,7 +3968,6 @@ bool SwDoc::SetColRowWidthHeight( SwTableBox& 
rCurrentBox, TableChgWidthHeightTy
 bUndo ? &pUndo : nullptr );
 }
 break;
-case TableChgWidthHeightType::RowTop:
 case TableChgWidthHeightType::RowBottom:
 case TableChgWidthHeightType::CellTop:
 case TableChgWidthHeightType::CellBottom:
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 4f4f64453f93..0e04ad50b980 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2212,9 +2212,6 @@ void SwFEShell::SetColRowWidthHeight( 
TableChgWidthHeightType eType, sal_uInt16
 // deleting the cells