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

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |  105 +++
 1 file changed, 24 insertions(+), 81 deletions(-)

New commits:
commit 3dd8364056fc0cf5625c44b688e9cbf58e95e90b
Author: Samuel Mehrbrodt 
AuthorDate: Fri Jul 19 16:10:28 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Jul 24 07:43:17 2019 +0200

Font list empty in some cases

The list of font sizes was taken from the font info. This causes
problems when the document uses a font which is not available on the system.

As there is no obvious reason, why the list of font sizes should depend on 
the font
(and update with every font change), remove this dependency and just 
populate
the list of fonts once.
If the document uses a font size which is not in the list, it still will be 
added to
the font size list.

Change-Id: I4d434244b341c8e782138e5a6df85a50ddad3df5
Reviewed-on: https://gerrit.libreoffice.org/75959
Reviewed-by: Michael Meeks 
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 6931c48e2..1e302892b 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -673,7 +673,6 @@ function hideTooltip(toolbar, id) {
 
 var stylesSelectValue;
 var fontsSelectValue;
-var fontsizesSelectValue;
 
 // mobile:false means hide it both for normal Online used from a mobile 
browser, and in a mobile app
 // mobilebrowser:false means hide it for normal Online used from a mobile 
browser, but don't hide it in a mobile app
@@ -724,7 +723,7 @@ function initNormalToolbar() {
}
}, mobile: false},
{type: 'html',   id: 'fontsizes',
-   html: '14',
+   html: '',
onRefresh: function (edata) {
if (!edata.item.html) {
edata.isCancelled = true;
@@ -1193,23 +1192,6 @@ function onDocumentNameFocus() {
map._onLostFocus();
 }
 
-function sortFontSizes() {
-   var oldVal = $('.fontsizes-select').val();
-   var selectList = $('.fontsizes-select option');
-   selectList.sort(function (a, b) {
-   a = parseFloat($(a).text() * 1);
-   b = parseFloat($(b).text() * 1);
-   if (a > b) {
-   return 1;
-   } else if (a < b) {
-   return -1;
-   }
-   return 0;
-   });
-   $('.fontsizes-select').html(selectList);
-   $('.fontsizes-select').val(oldVal).trigger('change');
-}
-
 function onStyleSelect(e) {
var style = e.target.value;
if (style.startsWith('.uno:')) {
@@ -1227,56 +1209,14 @@ function onStyleSelect(e) {
map.focus();
 }
 
-function updateFontSizeList(font) {
-   var oldSize = $('.fontsizes-select').val();
-   var found = false;
-   $('.fontsizes-select').find('option').remove();
-   var data = [''];
-   data = 
data.concat(map.getToolbarCommandValues('.uno:CharFontName')[font]);
-   $('.fontsizes-select').select2({
-   data: data,
-   placeholder: ' ',
-   //Allow manually entered font size.
-   createTag: function(query) {
-   return {
-   id: query.term,
-   text: query.term,
-   tag: true
-   };
-   },
-   tags: true
-   });
-   $('.fontsizes-select option').each(function (i, e) {
-   if ($(e).text() === oldSize) {
-   $('.fontsizes-select').val(oldSize).trigger('change');
-   found = true;
-   return;
-   }
-   });
-   if (!found) {
-   // we need to add the size
-   $('.fontsizes-select')
-   .append($('')
-   .text(oldSize));
-   }
-   $('.fontsizes-select').val(oldSize).trigger('change');
-   sortFontSizes();
-}
-
 function onFontSelect(e) {
var font = e.target.value;
-   updateFontSizeList(font);
map.applyFont(font);
map.focus();
 }
 
 function onFontSizeSelect(e) {
-   var size = e.target.value;
-   var command = {};
-   
$(e.target).find('option[data-select2-tag]').removeAttr('data-select2-tag');
-   map.applyFontSize(size);
-   var fontcolor = map.getDocType() === 'text' ? 'FontColor' : 'Color';
-   command[fontcolor] = {};
+   map.applyFontSize(e.target.value);
map.focus();
 }
 
@@ -1573,6 +1513,26 @@ function onDocLayerInit() {
if (el)
el.resize();
}
+
+   var data = [6, 7, 8, 9, 10, 10.5, 11, 12, 13, 14, 15, 16, 18, 20,
+   

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

[Mike Kaganski (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29fbb2512c741bc34221b7d13b9958c832f0a3f7
Author: Mike Kaganski 
AuthorDate: Wed Jul 24 04:21:42 2019 +0200
Commit: Mike Kaganski 
CommitDate: Wed Jul 24 05:18:45 2019 +0200

Redundant condition

Change-Id: I1c67cde8401106a7e9d7ecd5fd3e0b4925ab47d4
Reviewed-on: https://gerrit.libreoffice.org/76212
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5a908f2dd8f6..f9ed2bdc76a8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2197,7 +2197,7 @@ static void doc_iniUnoCommands ()
 SfxViewFrame* pViewFrame = pViewShell? pViewShell->GetViewFrame(): nullptr;
 
 // check if Frame-Controller were created.
-if (!pViewShell && !pViewFrame)
+if (!pViewFrame)
 {
 SAL_WARN("lok", "iniUnoCommands: No Frame-Controller created.");
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 desktop/source/lib/init.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit f1fda07e126ddb1333ecbd2429ede8098ac9f1c0
Author: Mike Kaganski 
AuthorDate: Wed Jul 24 04:10:04 2019 +0200
Commit: Mike Kaganski 
CommitDate: Wed Jul 24 05:18:23 2019 +0200

Drop unneeded initialization

Change-Id: Ieac1a0acb97664f3b86e2524cab79fd278f42e0e
Reviewed-on: https://gerrit.libreoffice.org/76210
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b553ba6b8b17..5a908f2dd8f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2216,15 +2216,12 @@ static void doc_iniUnoCommands ()
 
 for (const auto & sUnoCommand : sUnoCommands)
 {
-const SfxSlot* pSlot = nullptr;
-
 aCommandURL.Complete = sUnoCommand;
 xParser->parseStrict(aCommandURL);
-pSlot = rSlotPool.GetUnoSlot(aCommandURL.Path);
 
 // when null, this command is not supported by the given component
 // (like eg. Calc does not have ".uno:DefaultBullet" etc.)
-if (pSlot)
+if (const SfxSlot* pSlot = rSlotPool.GetUnoSlot(aCommandURL.Path))
 {
 // Initialize slot to dispatch .uno: Command.
 pViewFrame->GetBindings().GetDispatch(pSlot, aCommandURL, false);
___
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' - 2 commits - bin/gen-boost-headers external/boost sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 bin/gen-boost-headers  |1 
 external/boost/include/boost/algorithm/string.hpp  |1 
 external/boost/include/boost/algorithm/string/case_conv.hpp|1 
 external/boost/include/boost/algorithm/string/classification.hpp   |1 
 external/boost/include/boost/algorithm/string/predicate.hpp|1 
 external/boost/include/boost/algorithm/string/split.hpp|1 
 external/boost/include/boost/any.hpp   |1 
 external/boost/include/boost/archive/iterators/base64_from_binary.hpp  |1 
 external/boost/include/boost/archive/iterators/binary_from_base64.hpp  |1 
 external/boost/include/boost/archive/iterators/remove_whitespace.hpp   |1 
 external/boost/include/boost/archive/iterators/transform_width.hpp |1 
 external/boost/include/boost/asio.hpp  |1 
 external/boost/include/boost/assign.hpp|1 
 external/boost/include/boost/bind.hpp  |1 
 external/boost/include/boost/cast.hpp  |1 
 external/boost/include/boost/circular_buffer.hpp   |1 
 external/boost/include/boost/config.hpp|1 
 external/boost/include/boost/container/deque.hpp   |1 
 external/boost/include/boost/cstdint.hpp   |1 
 external/boost/include/boost/current_function.hpp  |1 
 external/boost/include/boost/date_time.hpp |1 
 external/boost/include/boost/date_time/posix_time/posix_time.hpp   |1 
 external/boost/include/boost/enable_shared_from_this.hpp   |1 
 external/boost/include/boost/exception/diagnostic_information.hpp  |1 
 external/boost/include/boost/filesystem.hpp|1 
 external/boost/include/boost/filesystem/path.hpp   |1 
 external/boost/include/boost/foreach.hpp   |1 
 external/boost/include/boost/format.hpp|1 
 external/boost/include/boost/function.hpp  |1 
 external/boost/include/boost/functional/hash.hpp   |1 
 external/boost/include/boost/fusion/adapted/std_pair.hpp   |1 
 external/boost/include/boost/fusion/include/adapt_struct.hpp   |1 
 external/boost/include/boost/intrusive/circular_list_algorithms.hpp|1 
 external/boost/include/boost/intrusive_ptr.hpp |1 
 external/boost/include/boost/io/ios_state.hpp  |1 
 external/boost/include/boost/iostreams/device/file_descriptor.hpp  |1 
 external/boost/include/boost/iostreams/filter/gzip.hpp |1 
 external/boost/include/boost/iostreams/filtering_stream.hpp|1 
 external/boost/include/boost/iterator/iterator_facade.hpp  |1 
 external/boost/include/boost/lexical_cast.hpp  |1 
 external/boost/include/boost/locale.hpp|1 
 external/boost/include/boost/locale/gnu_gettext.hpp|1 
 external/boost/include/boost/logic/tribool.hpp |1 
 external/boost/include/boost/make_shared.hpp   |1 
 external/boost/include/boost/math/common_factor_rt.hpp |1 
 external/boost/include/boost/math/constants/constants.hpp  |1 
 external/boost/include/boost/math/special_functions/expm1.hpp  |1 
 external/boost/include/boost/math/special_functions/log1p.hpp  |1 
 external/boost/include/boost/math/special_functions/sinc.hpp   |1 
 external/boost/include/boost/multi_array.hpp   |1 
 external/boost/include/boost/multi_index/composite_key.hpp |1 
 external/boost/include/boost/multi_index/identity.hpp  |1 
 external/boost/include/boost/multi_index/mem_fun.hpp   |1 
 external/boost/include/boost/multi_index/ordered_index.hpp |1 
 external/boost/include/boost/multi_index/random_access_index.hpp   |1 
 external/boost/include/boost/multi_index_container.hpp |1 
 external/boost/include/boost/noncopyable.hpp   |1 
 external/boost/include/boost/none.hpp  |1 
 external/boost/include/boost/numeric/conversion/cast.hpp   |1 
 external/boost/include/boost/operators.hpp |1 
 external/boost/include/boost/optional.hpp  |1 
 external/boost/include/boost/optional/optional.hpp |1 
 

[Libreoffice-commits] libvisio.git: src/lib src/test

[Libreoffice Gerrit user]

 src/lib/VSDContentCollector.cpp |  126 +++-
 src/test/data/Visio11FormatLine.vsd |binary
 src/test/importtest.cpp |   80 +++---
 3 files changed, 164 insertions(+), 42 deletions(-)

New commits:
commit d6205a23ff36b1ab1f876cebfd41ad1acf19aac5
Author: Bartosz Kosiorek 
AuthorDate: Sat Jul 13 07:32:03 2019 +0200
Commit: Bartosz Kosiorek 
CommitDate: Wed Jul 24 02:17:08 2019 +0200

tdf#126402 Fix line formating issue

With this commit, I have implemented more Visio arrow styles
and I have added support importing Center Line Ending.

As a result many import issues of Visio diagrams was resolved.

Change-Id: I5284e3e53b9d5174ab49e841c66be58e06060760
Reviewed-on: https://gerrit.libreoffice.org/75635
Tested-by: Bartosz Kosiorek 
Reviewed-by: Bartosz Kosiorek 

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 37881bb..dab4782 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -157,15 +157,17 @@ const char 
*libvisio::VSDContentCollector::_linePropertiesMarkerViewbox(unsigned
 return "0 0 20 10";
   case 8:
 return "0 0 20 18";
-  case 3:
+  case 3: // Short line Arrow
+return "0 0 3000 3000";
   case 4:
   case 5:
   case 6:
-  case 11:
   case 16:
   case 17:
   case 18:
 return "0 0 20 20";
+  case 11: // Centered square filled
+return "0 0 10 10";
   case 12:
   case 13:
   case 14:
@@ -173,8 +175,8 @@ const char 
*libvisio::VSDContentCollector::_linePropertiesMarkerViewbox(unsigned
   case 22:
   case 39:
 return "0 0 20 40";
-  case 21:
-return "0 0 30 30";
+  case 21: // Centered square unfilled
+return "0 0 300 300";
   case 10:
 return "0 0 1131 1131";
   default:
@@ -184,50 +186,108 @@ const char 
*libvisio::VSDContentCollector::_linePropertiesMarkerViewbox(unsigned
 
 const char *libvisio::VSDContentCollector::_linePropertiesMarkerPath(unsigned 
marker)
 {
+  // Information how to draw path
+  // https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/d
+
+  /*
+  SVG defines 6 types of path commands, for a total of 20 commands:
+
+  MoveTo: M, m
+  LineTo: L, l, H, h, V, v
+  Cubic Bézier Curve: C, c, S, s
+  Quadratic Bézier Curve: Q, q, T, t
+  Elliptical Arc Curve: A, a
+  ClosePath: Z, z
+  */
   switch (marker)
   {
-  case 1:
-return "m10 -4l-14 14l4 4l10 -10l10 10l4 -4z";
-  case 2:
+  case 1: // TODO
+return "M1500 0l1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 
2392h-114v-211z";
+  case 2: //
 return "m10 0-10 10h20z";
-  case 3:
-return "m10 -8l-14 28l6 3l8 -16l8 16l6 -3z";
-  case 4:
+  case 3: // Short line arrow, Copied from LO
+return "M1500 0l1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 
2392h-114v-211z";
+  case 4: // Filled equilateral triangle
 return "m10 0-10 20h20z";
-  case 5:
+  case 5: // Arrow concave
 return "m10 0-10 20q10,-5 20,0z";
-  case 6:
+  case 6: //
 return "m10 0-10 20q10,5 20,0z";
-  case 8:
+  case 7: // TODO
 return "m10 0q-2.6,13.4 -10,18q10,-5 20,0q-7.4,-4.6 -10,-18";
-  case 9:
-return "m-2 -8l4 -4l20 20l-4 4z";
-  case 10: // Copied from what LO exports when using the "circle" marker
-return "m462 1118-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 
29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 
102 29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z";
-  case 11:
-return "m0 0v10h10v-10z";
-  case 12:
-return "m10 -12l-14 42l9 3l5 -15l5 15l9 -3z";
+  case 8: // filled arrow
+return "m10 0q-2.6,13.4 -10,18q10,-5 20,0q-7.4,-4.6 -10,-18";
+  case 9:  // Centered line
+return "M1 2l1 -1l20 20l-1 1zM11 11v12h1v-10z";//
+  case 10: // Centered Filled circle
+  case 42: // Filled circle, Copied from LO
+return "m462 1118-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 
29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 
102 29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z";//
+  case 11: // Centered square filled, Copied from LO
+return "M0 0h10v10h-10z";
+  case 12: // TODO
+return "M1500 0l1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 
2392h-114v-211z";
   case 13:
 return "m10 0-10 30h20z";
   case 14:
 return "m10 0-10 30h20z m0 12l-5 15h10z";
   case 15:
-return "m10 0-10 10h20z m0 3l-5 5h10z";
+return "m10 0-10 10h20z m0 1l-8 8h16z";
   case 16:
 return "m10 0-10 20h20z m0 7l-5 10h10z";
   case 17:
 return "m10 0-10 20q10,-5 20,0z m0 7l-4 8q4,-2 8,0z";
   case 18:
 return "m10 0-10 20q10,5 20,0z m0 7l-5 10q5,2 10,0z";
-  case 21:
-return "m0 0v30h30v-30z m10 10v10h10v-10z";
-  case 22:
-return "m10 0-10 20l10 20l10 -20z m0 8l-6 12l6 12l6 -12z";
-  case 39:
-return "m10 0-10 20h20z m0 20-10 20h20z";
-  default:
-return "m10 0-10 30h20z";
+  case 19: // TODO
+return "m10 0q-2.6,13.4 

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
36 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1452004:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1452004:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/uibase/app/docstyle.cxx: 465 in 
SwDocStyleSheet::SwDocStyleSheet(SwDoc &, SwDocStyleSheetPool &)()
459 pFrameFormat(nullptr),
460 pDesc(nullptr),
461 pNumRule(nullptr),
462 pTableFormat(nullptr),
463 pBoxFormat(nullptr),
464 rDoc(rDocument),
>>> CID 1452004:  Null pointer dereferences  (FORWARD_NULL)
>>> Passing null pointer "this->GetPool()" to "GetPool", which dereferences 
>>> it.
465 aCoreSet(
466 GetPool()->GetPool(),
467 svl::Items<
468 RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
469 RES_PARATR_BEGIN, RES_FRMATR_END - 1,
470 RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1,



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB73RtgzoPcQtNNP5dkHLuV1E-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy9cIYTntn8C-2FB5AiVSxQbRHsHb6tT0TSQvxGGaHoF6lvP01J9hBlZdQYdt92wZXDWlirYkNBH05br4KWWonqqkSb2BdeaQCaPw0LgHJi3jg7-2Fx24tMyjN933UuSOMZLC2nfhSiHmbXc46Ja4-2BMIyf5WcGMsx4cDTpp-2B612ecLWXc-3D

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

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

[Arkadiy Illarionov (via logerrit)]

 starmath/source/cfgitem.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 1ba34e905f717f15afabb514d9740d53c85e4af4
Author: Arkadiy Illarionov 
AuthorDate: Tue Jul 23 22:20:47 2019 +0300
Commit: Arkadiy Illarionov 
CommitDate: Tue Jul 23 23:32:46 2019 +0200

Optimize names transforming

Remove lambda and one extra begin() call.
6ffdc88e79904882e319bdd0b901e7491abae0b3 follow-up

Change-Id: Ieb427704112f4d52c044147a5162921448f0590d
Reviewed-on: https://gerrit.libreoffice.org/76205
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-by: Arkadiy Illarionov 

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 5b6b900e051c..4636df044b08 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -373,9 +373,8 @@ void SmMathConfig::ReadSymbol( SmSym ,
 sal_Int32 nProps = aNames.getLength();
 
 OUString aDelim( "/" );
-std::transform(aNames.begin(), aNames.end(), aNames.begin(),
-[, , ](const OUString& rName) -> OUString 
{
-return rBaseNode + aDelim + rSymbolName + aDelim + rName; });
+for (auto& rName : aNames)
+rName = rBaseNode + aDelim + rSymbolName + aDelim + rName;
 
 const Sequence< Any > aValues = 
const_cast(this)->GetProperties(aNames);
 
@@ -580,9 +579,8 @@ void SmMathConfig::ReadFontFormat( SmFontFormat 
,
 sal_Int32 nProps = aNames.getLength();
 
 OUString aDelim( "/" );
-std::transform(aNames.begin(), aNames.end(), aNames.begin(),
-[, , ](const OUString& rName) -> OUString 
{
-return rBaseNode + aDelim + rSymbolName + aDelim + rName; });
+for (auto& rName : aNames)
+rName = rBaseNode + aDelim + rSymbolName + aDelim + rName;
 
 const Sequence< Any > aValues = 
const_cast(this)->GetProperties(aNames);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang offapi/com

[Andrea Gelmini (via logerrit)]

 compilerplugins/clang/referencecasting.cxx |2 +-
 offapi/com/sun/star/accessibility/AccessibleEventId.idl|6 +++---
 offapi/com/sun/star/accessibility/AccessibleRole.idl   |4 ++--
 offapi/com/sun/star/accessibility/AccessibleStateType.idl  |2 +-
 offapi/com/sun/star/accessibility/XAccessibleEventListener.idl |2 +-
 offapi/com/sun/star/accessibility/XAccessibleText.idl  |2 +-
 offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl |2 +-
 offapi/com/sun/star/awt/ImagePosition.idl  |2 +-
 offapi/com/sun/star/awt/UnoControlEditModel.idl|2 +-
 offapi/com/sun/star/awt/XDisplayConnection.idl |4 ++--
 offapi/com/sun/star/awt/tree/TreeControlModel.idl  |2 +-
 offapi/com/sun/star/chart2/DataPointProperties.idl |2 +-
 offapi/com/sun/star/chart2/FillBitmap.idl  |2 +-
 offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl  |2 +-
 offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl  |4 ++--
 offapi/com/sun/star/configuration/AccessRootElement.idl|2 +-
 offapi/com/sun/star/configuration/AdministrationProvider.idl   |2 +-
 offapi/com/sun/star/configuration/ConfigurationRegistry.idl|4 ++--
 18 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit d29bd2ac60bcb6ad15d9746303e0d54747eca4b1
Author: Andrea Gelmini 
AuthorDate: Tue Jul 23 19:51:26 2019 +0200
Commit: Andrea Gelmini 
CommitDate: Tue Jul 23 22:20:26 2019 +0200

Fix typos

It passed "make check"

Change-Id: I055017a7616ed4d9725c66a387c040b55e22751f
Reviewed-on: https://gerrit.libreoffice.org/76202
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/compilerplugins/clang/referencecasting.cxx 
b/compilerplugins/clang/referencecasting.cxx
index e60177f4effb..ef11b0b5b942 100644
--- a/compilerplugins/clang/referencecasting.cxx
+++ b/compilerplugins/clang/referencecasting.cxx
@@ -375,7 +375,7 @@ static int derivedFromCount(QualType qt, const 
CXXRecordDecl* baseRecord)
 */
 static bool isDerivedFrom(const CXXRecordDecl* subtypeRecord, const 
CXXRecordDecl* baseRecord)
 {
-// if there is more than one case, then we have an ambigous conversion, 
and we can't change the code
+// if there is more than one case, then we have an ambiguous conversion, 
and we can't change the code
 // to use the upcasting constructor.
 return derivedFromCount(subtypeRecord, baseRecord) == 1;
 }
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl 
b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 99739211663b..c7f5b488bde2 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -86,7 +86,7 @@ constants AccessibleEventId
 /** This event indicates a change of the bounding rectangle of an
 accessible object with respect only to its size or relative
 position.  If the absolute position changes but not the relative
-position then its is not necessary to send an event.
+position then it is not necessary to send an event.
 
 Use this event rather than the
 VISIBLE_DATA_EVENT when really only the
@@ -117,7 +117,7 @@ constants AccessibleEventId
 reference to this object and
 AccessibleEventObject::NewValue remains empty.
 
-If a child has been added and a another one has been removed
+If a child has been added and another one has been removed
 don't set both fields at the same.  Send separate events
 instead.
 
@@ -385,7 +385,7 @@ constants AccessibleEventId
 */
 const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34;
 
-/** An item in a container has been added to a already present selection
+/** An item in a container has been added to an already present selection
 
 Example: a second list item has been selected in a listbox.
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl 
b/offapi/com/sun/star/accessibility/AccessibleRole.idl
index a21ce06f6e6d..9cf23aecde51 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRole.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl
@@ -705,7 +705,7 @@ constants AccessibleRole
 */
 const short COMMENT_END = 82;
 
-/** View of an presentation document.
+/** View of a presentation document.
 
 It's an specific variation of DOCUMENT for presentations.
 
@@ -721,7 +721,7 @@ constants AccessibleRole
 */
 const short DOCUMENT_SPREADSHEET = 84;
 
-/** View of an text document.
+/** View of a text document.
 
 It's an specific variation of DOCUMENT for text.
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleStateType.idl 
b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
index c8c6e9f79ea2..7f64a6380cbb 100644
--- 

[Libreoffice-commits] core.git: onlineupdate/source oox/inc oox/README oox/source opencl/source package/qa qadevOOo/runner qadevOOo/tests

[Andrea Gelmini (via logerrit)]

 onlineupdate/source/libmar/src/mar_read.c   |2 
+-
 oox/README  |2 
+-
 oox/inc/drawingml/chart/chartdrawingfragment.hxx|2 
+-
 oox/source/export/chartexport.cxx   |2 
+-
 oox/source/export/preset-definitions-to-shape-types.pl  |2 
+-
 oox/source/ole/axcontrol.cxx|2 
+-
 opencl/source/opencl_device.cxx |2 
+-
 package/qa/ofopxmlstorages/TestHelper.java  |2 
+-
 package/qa/storages/TestHelper.java |4 
++--
 qadevOOo/runner/util/DesktopTools.java  |2 
+-
 qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java |2 
+-
 qadevOOo/tests/java/ifc/frame/_XFrame.java  |4 
++--
 qadevOOo/tests/java/ifc/frame/_XFrameLoader.java|2 
+-
 qadevOOo/tests/java/ifc/i18n/_XNumberFormatCode.java|2 
+-
 qadevOOo/tests/java/ifc/i18n/_XTransliteration.java |2 
+-
 qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java|2 
+-
 qadevOOo/tests/java/ifc/sdb/_XResultSetAccess.java  |2 
+-
 qadevOOo/tests/java/ifc/sdbc/_XResultSetMetaDataSupplier.java   |2 
+-
 qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java|2 
+-
 qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java|2 
+-
 20 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 650a836d00360ffd0b0c5a97bbaf9fe5513bbf32
Author: Andrea Gelmini 
AuthorDate: Tue Jul 23 20:39:25 2019 +0200
Commit: Andrea Gelmini 
CommitDate: Tue Jul 23 22:19:26 2019 +0200

Fix typos

Change-Id: Iea3bd498b1c8934f37085bdf6df71b073e4a871c
Reviewed-on: https://gerrit.libreoffice.org/76203
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/onlineupdate/source/libmar/src/mar_read.c 
b/onlineupdate/source/libmar/src/mar_read.c
index 2815d12e7ccb..2a6238ca23fc 100644
--- a/onlineupdate/source/libmar/src/mar_read.c
+++ b/onlineupdate/source/libmar/src/mar_read.c
@@ -269,7 +269,7 @@ int get_mar_file_info_fp(FILE *fp,
 
   /* Skip to the first index entry past the index size field
  We do it in 2 calls because offsetToIndex + sizeof(uint32_t)
- could oerflow in theory. */
+ could overflow in theory. */
   if (fseek(fp, offsetToIndex, SEEK_SET)) {
 return -1;
   }
diff --git a/oox/README b/oox/README
index d20d3349e789..7f127b617981 100644
--- a/oox/README
+++ b/oox/README
@@ -175,7 +175,7 @@ FUTURE WORK: because we have to make sure that all the 
roundtrips
 like PPTX --> ODP --> PPTX work correctly and doesn't lose data.
 the only problematic part is probably saving custom shapes (ie. not
 presets) to PPTX. that part of code predates work on custom shapes
-and is unable to export general custom shapes yet. it will need a bit
+and is unable to export general custom shapes yet. It will need a bit
 of work as LO has more complex equations than DrawingML. other parts
 should work OK, PPTX --> ODP should work and don't lose any
 data. presets should already survive PPTX --> ODP --> PPTX roundtrip
diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx 
b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
index 9b49c35226d7..897ea60fb7a8 100644
--- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
@@ -57,7 +57,7 @@ public:
 
 /** Imports the absolute anchor size from the cdr:ext element. */
 voidimportExt( const AttributeList& rAttribs );
-/** Sets an the relative anchor position from the cdr:from or cdr:to 
element. */
+/** Sets the relative anchor position from the cdr:from or cdr:to element. 
*/
 voidsetPos( sal_Int32 nElement, sal_Int32 nParentContext, 
const OUString& rValue );
 
 /** Calculates the resulting shape anchor in EMUs. */
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 1acf1795373c..dd9d19651e29 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3884,7 +3884,7 @@ void ChartExport::exportView3D()
 if(eChartType == chart::TYPEID_PIE)
 {
 /* In OOXML we get value in 0..90 range for pie chart X rotation , 
whereas we expect it to be in -90..90 range,
-   so we conver that during import. It  is modified in 
View3DConverter::convertFromModel()
+   so we convert that during import. It is modified in 
View3DConverter::convertFromModel()
here we convert it back to 0..90 as we received in import */
nRotationX += 90;  // X rotation (map Chart2 

Aditya Priyam license statement

[Aditya Priyam]

I Aditya Priyam, hereby declare that all of my past and future
contributions to LibreOffice maybe 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: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/ftnfrm.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3782a36382af0609aed73caa8334b6f1c55dc93c
Author: Caolán McNamara 
AuthorDate: Tue Jul 23 10:31:29 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 21:08:21 2019 +0200

crashtesting: failure on 
swfootnoteframe_colunlock_heap_use_after_free.sample

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

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 4560ded12942..89f52716e4f0 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2269,7 +2269,7 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const 
SwTwips nDeadLine, const boo
   
*(pCnt->FindPageFrame()) ) )
 {
 // restart format with first content
-pCnt = pFootnote->ContainsAny();
+pCnt = pFootnote ? pFootnote->ContainsAny() : 
nullptr;
 if (!pCnt)
 bMore = false;
 continue;
@@ -2287,6 +2287,8 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const 
SwTwips nDeadLine, const boo
 pLastFootnoteFrame = nullptr;
 pFootnoteFrame->Cut();
 SwFrame::DestroyFrame(pFootnoteFrame);
+if (pFootnote == pFootnoteFrame)
+pFootnote = nullptr;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/i18nutil/unicode.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3fe1049acee148c7bf7669ef9a6d39f319230c0b
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:32 2019 +
Commit: Andrea Gelmini 
CommitDate: Tue Jul 23 20:14:35 2019 +0200

Fix typo

Change-Id: I1881e2c8cdccf9c020ed52d2e90689e6a02791b5
Reviewed-on: https://gerrit.libreoffice.org/75561
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index c0b20a33cba8..f0db87095f71 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -51,7 +51,7 @@ public:
 
 @param nCode  A Unicode code point.
 
-@return  True if code is an Unicode variation sequence selector.
+@return  True if code is a Unicode variation sequence selector.
  */
 static bool isIVSSelector(sal_uInt32 nCode)
 {
@@ -63,7 +63,7 @@ public:
 
 @param nCode  A Unicode code point.
 
-@return  True if code is an Unicode base character part of CJK IVS
+@return  True if code is a Unicode base character part of CJK IVS
  */
 static bool isCJKIVSCharacter(sal_uInt32 nCode)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 framework/inc/xml/imagesconfiguration.hxx |   19 -
 framework/inc/xml/imagesdocumenthandler.hxx   |   11 +--
 framework/source/uiconfiguration/imagemanagerimpl.cxx |   25 ++-
 framework/source/xml/imagesconfiguration.cxx  |4 -
 framework/source/xml/imagesdocumenthandler.cxx|   59 +++---
 5 files changed, 31 insertions(+), 87 deletions(-)

New commits:
commit 35614ba0eb64e40ec37f1c28e59b7fc04b88
Author: Noel Grandin 
AuthorDate: Tue Jul 23 09:53:18 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 23 19:52:33 2019 +0200

simplify framework image manager load/save code

most of this stuff is unused, and we only ever have one image-list

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

diff --git a/framework/inc/xml/imagesconfiguration.hxx 
b/framework/inc/xml/imagesconfiguration.hxx
index 983a16d66c9b..1e3ec096e7f7 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -39,20 +39,7 @@ struct ImageItemDescriptor
 OUString  aCommandURL;// URL command to dispatch
 };
 
-typedef std::vector > 
ImageItemListDescriptor;
-
-struct ImageListItemDescriptor
-{
-std::unique_ptr
-pImageItemList;   // an array of 
ImageItemDescriptors that describes every image
-};
-
-typedef std::vector > 
ImageListDescriptor;
-
-struct ImageListsDescriptor
-{
-std::unique_ptr pImageList;
-};
+typedef std::vector ImageItemDescriptorList;
 
 class ImagesConfiguration
 {
@@ -60,12 +47,12 @@ class ImagesConfiguration
 static bool LoadImages(
 const css::uno::Reference< css::uno::XComponentContext >& 
rxContext,
 const css::uno::Reference< css::io::XInputStream >& rInputStream,
-ImageListsDescriptor& rItems );
+ImageItemDescriptorList& rItems );
 
 static bool StoreImages(
 const css::uno::Reference< css::uno::XComponentContext >& 
rxContext,
 const css::uno::Reference< css::io::XOutputStream >& rOutputStream,
-const ImageListsDescriptor& rItems );
+const ImageItemDescriptorList& rItems );
 };
 
 } // namespace framework
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx 
b/framework/inc/xml/imagesdocumenthandler.hxx
index 720071d0632e..2df23a205cd3 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -62,7 +62,7 @@ class OReadImagesDocumentHandler : public 
::cppu::WeakImplHelper< css::xml::sax:
 IMG_NS_XLINK
 };
 
-OReadImagesDocumentHandler( ImageListsDescriptor& aItems );
+OReadImagesDocumentHandler( ImageItemDescriptorList& aItems );
 virtual ~OReadImagesDocumentHandler() override;
 
 // XDocumentHandler
@@ -101,8 +101,7 @@ class OReadImagesDocumentHandler : public 
::cppu::WeakImplHelper< css::xml::sax:
 sal_Int32   
m_nHashMaskModeBitmap;
 sal_Int32   
m_nHashMaskModeColor;
 ImageHashMapm_aImageMap;
-ImageListsDescriptor&   m_aImageList;
-ImageListItemDescriptor*m_pImages;
+ImageItemDescriptorList&m_rImageList;
 css::uno::Reference< css::xml::sax::XLocator >  m_xLocator;
 };
 
@@ -110,7 +109,7 @@ class OWriteImagesDocumentHandler final
 {
 public:
 OWriteImagesDocumentHandler(
-const ImageListsDescriptor& aItems,
+const ImageItemDescriptorList& aItems,
 css::uno::Reference< css::xml::sax::XDocumentHandler > const &
 rWriteDocumentHandler);
 ~OWriteImagesDocumentHandler();
@@ -122,13 +121,13 @@ class OWriteImagesDocumentHandler final
 private:
 /// @throws css::xml::sax::SAXException
 /// @throws css::uno::RuntimeException
-void WriteImageList( const ImageListItemDescriptor* );
+void WriteImageList( const ImageItemDescriptorList* );
 
 /// @throws css::xml::sax::SAXException
 /// @throws css::uno::RuntimeException
 void WriteImage( const ImageItemDescriptor* );
 
-const ImageListsDescriptor&   
m_aImageListsItems;
+const ImageItemDescriptorList&
m_rImageItemList;
 css::uno::Reference< css::xml::sax::XDocumentHandler >
m_xWriteDocumentHandler;
 css::uno::Reference< css::xml::sax::XAttributeList >  m_xEmptyList;
 OUString  
m_aXMLXlinkNS;
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 

Re: Problem with Calc 6.2 Multiple Operations

[Eike Rathke]

Hi Steve,

On Tuesday, 2019-07-23 13:20:09 +, Steve Fanning wrote:

> https://www.excel-easy.com/examples/excel-files/data-tables.xlsx. I opened
> this file in LO 6.2 and all seemed well, so I re-saved it from LO as an
> Excel file. Unfortunately Excel generated errors when opening this version
> of the file and the resulting spreadsheet appeared to just contain numeric
> values rather than a proper Excel Data Table structure.
> 
> Should this process work or am I doing something stupid?

No to both ;-P

The original file for cell B13 contains an element

  

which expresses the table "formula" as a dataTable type.

Calc when saving stores TABLE() formulas in the involved cells instead,
which apparently was the correct way to do in the binary .xls format but
not in OOXML .xlsx

Please open a bug for this.

Thanks
  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   22 +--
 sw/qa/extras/uiwriter/data2/redline-para-join.docx |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx|   29 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |6 ++--
 4 files changed, 44 insertions(+), 13 deletions(-)

New commits:
commit 5ab9cbe7f8d0c0bfd6a2fe1de2e14dfe201d008b
Author: László Németh 
AuthorDate: Tue Jul 23 11:51:58 2019 +0200
Commit: László Németh 
CommitDate: Tue Jul 23 17:57:10 2019 +0200

tdf#126516 DOCX change tracking: fix paragraph style rejection

by keeping paragraph-level ParagraphFormat redlines.

(regression from commit a5abe0fc4d435d3a7a7de8bf55ec74087fdd299a
"tdf#125546 DOCX import: fix overgrowth of change tracking entries")

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

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4799a44db8c4..f90d894b0f1e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -960,11 +960,13 @@ DECLARE_OOXMLIMPORT_TEST(testBnc821804, "bnc821804.docx")
 CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(4), 1), "RedlineType"));
 
CPPUNIT_ASSERT_EQUAL(OUString("Insert"),getProperty(getRun(getParagraph(4),
 1), "RedlineType"));
 CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(4), 1), 
"IsStart"));
-CPPUNIT_ASSERT(!hasProperty(getRun(getParagraph(4), 2), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(OUString("Inserted and formatted"), 
getRun(getParagraph(4),2)->getString());
-CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(4), 3), "RedlineType"));
-
CPPUNIT_ASSERT_EQUAL(OUString("Insert"),getProperty(getRun(getParagraph(4),
 3), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(false,getProperty(getRun(getParagraph(4), 3), 
"IsStart"));
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(4), 2), "RedlineType"));
+
CPPUNIT_ASSERT_EQUAL(OUString("ParagraphFormat"),getProperty(getRun(getParagraph(4),
 2), "RedlineType"));
+CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(4), 2), 
"IsStart"));
+CPPUNIT_ASSERT_EQUAL(OUString("Inserted and formatted"), 
getRun(getParagraph(4),3)->getString());
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(4), 4), "RedlineType"));
+
CPPUNIT_ASSERT_EQUAL(OUString("Insert"),getProperty(getRun(getParagraph(4),
 4), "RedlineType"));
+CPPUNIT_ASSERT_EQUAL(false,getProperty(getRun(getParagraph(4), 4), 
"IsStart"));
 CPPUNIT_ASSERT_EQUAL(OUString(" and this is only formatted"), 
getRun(getParagraph(4),5)->getString());
 CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(4), 6), "RedlineType"));
 
CPPUNIT_ASSERT_EQUAL(OUString("ParagraphFormat"),getProperty(getRun(getParagraph(4),
 6), "RedlineType"));
@@ -1024,11 +1026,13 @@ DECLARE_OOXMLIMPORT_TEST(testBnc821804, 
"bnc821804.docx")
 CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(8), 1), "RedlineType"));
 
CPPUNIT_ASSERT_EQUAL(OUString("Delete"),getProperty(getRun(getParagraph(8),
 1), "RedlineType"));
 CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(8), 1), 
"IsStart"));
-CPPUNIT_ASSERT(!hasProperty(getRun(getParagraph(8), 2), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(OUString("Deleted and formatted"), 
getRun(getParagraph(8),2)->getString());
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(8), 2), "RedlineType"));
+
CPPUNIT_ASSERT_EQUAL(OUString("ParagraphFormat"),getProperty(getRun(getParagraph(8),
 2), "RedlineType"));
+CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(8), 1), 
"IsStart"));
+CPPUNIT_ASSERT_EQUAL(OUString("Deleted and formatted"), 
getRun(getParagraph(8),3)->getString());
 CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(8), 4), "RedlineType"));
-
CPPUNIT_ASSERT_EQUAL(OUString("ParagraphFormat"),getProperty(getRun(getParagraph(8),
 4), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(8), 4), 
"IsStart"));
+
CPPUNIT_ASSERT_EQUAL(OUString("Delete"),getProperty(getRun(getParagraph(8),
 4), "RedlineType"));
+CPPUNIT_ASSERT_EQUAL(false,getProperty(getRun(getParagraph(8), 4), 
"IsStart"));
 CPPUNIT_ASSERT_EQUAL(OUString(" and this is only formatted"), 
getRun(getParagraph(8),5)->getString());
 
CPPUNIT_ASSERT_EQUAL(OUString("ParagraphFormat"),getProperty(getRun(getParagraph(8),
 6), "RedlineType"));
 CPPUNIT_ASSERT_EQUAL(false,getProperty(getRun(getParagraph(8), 6), 
"IsStart"));
diff --git a/sw/qa/extras/uiwriter/data2/redline-para-join.docx 
b/sw/qa/extras/uiwriter/data2/redline-para-join.docx
new file mode 100644
index ..c1ed90f801fb
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/redline-para-join.docx 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 

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

[Caolán McNamara (via logerrit)]

 cppcanvas/source/mtfrenderer/textaction.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit ff706aa45cc41fb71b31a8c648b08cf3f1669c7e
Author: Caolán McNamara 
AuthorDate: Tue Jul 23 10:36:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 17:16:38 2019 +0200

rhbz#1728763 black bg seen in renderer emfs

back in 5-4 series FWIW, since...

commit a3c95ec45397b146c86a3fa5c763de99d3a3
Author: Caolán McNamara 
Date:   Mon Jun 11 09:00:46 2018 +0100

rhbz#1589029 tdf#93789 impress not showing text highlight in 
presentation mode

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

diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx 
b/cppcanvas/source/mtfrenderer/textaction.cxx
index 04f37560bfad..066cbb60f242 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -755,6 +755,7 @@ namespace cppcanvas
   const ::Color& rReliefColor,
   const ::basegfx::B2DSize&  rShadowOffset,
   const ::Color& rShadowColor,
+  const ::Color& rTextFillColor,
   const OUString& rText,
   sal_Int32  nStartPos,
   sal_Int32  nLen,
@@ -767,6 +768,7 @@ namespace cppcanvas
   const ::Color&
rReliefColor,
   const ::basegfx::B2DSize& 
rShadowOffset,
   const ::Color&
rShadowColor,
+  const ::Color&
rTextFillColor,
   const OUString&rText,
   sal_Int32 nStartPos,
   sal_Int32 nLen,
@@ -822,6 +824,7 @@ namespace cppcanvas
 const ::Color& 
rReliefColor,
 const ::basegfx::B2DSize&  
rShadowOffset,
 const ::Color& 
rShadowColor,
+const ::Color& 
rTextFillColor,
 const OUString& rText,
 sal_Int32  
nStartPos,
 sal_Int32  
nLen,
@@ -839,6 +842,7 @@ namespace cppcanvas
 maReliefColor( rReliefColor ),
 maShadowOffset( rShadowOffset ),
 maShadowColor( rShadowColor ),
+maTextFillColor( rTextFillColor ),
 maTextDirection( rState.textDirection )
 {
 const double nLineWidth(getLineWidth( rVDev, rState, 
maStringContext ));
@@ -861,6 +865,7 @@ namespace cppcanvas
 const ::Color& 
 rReliefColor,
 const ::basegfx::B2DSize&  
 rShadowOffset,
 const ::Color& 
 rShadowColor,
+const ::Color& 
 rTextFillColor,
 const OUString&  rText,
 sal_Int32  
 nStartPos,
 sal_Int32  
 nLen,
@@ -879,6 +884,7 @@ namespace cppcanvas
 maReliefColor( rReliefColor ),
 maShadowOffset( rShadowOffset ),
 maShadowColor( rShadowColor ),
+maTextFillColor( rTextFillColor ),
 maTextDirection( rState.textDirection )
 {
 const double nLineWidth( getLineWidth( rVDev, rState, 
maStringContext ) );
@@ -2181,7 +2187,8 @@ namespace cppcanvas
 !rState.textUnderlineStyle &&
 !rState.textStrikeoutStyle &&
 rReliefColor == aEmptyColor &&
-rShadowColor == aEmptyColor )
+rShadowColor == aEmptyColor &&
+rTextFillColor == aEmptyColor )
 {
 // nope
 if( rParms.maTextTransformation.is_initialized() )
@@ -2216,6 +2223,7 @@ namespace cppcanvas
 rReliefColor,
   

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 04b7fdb5677315d191c191ba381cc48dff183765
Author: Stephan Bergmann 
AuthorDate: Sat Jun 22 00:09:02 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 23 16:26:12 2019 +0200

Avoid overflowing conversion from double to sal_Int32

...by clamping the value to the sal_Int32 range.  An alternative would be to
instead print nAdjustment as a real value (which the PDF standard apparently
supports, without giving limits to such real values), as had been 
implemented at
, but that was deemed 
unnecessarily
complex, as no sane document should require nAdjustment values outside the
sal_Int32 range.

`--convert-to pdf 
caolan/drawinglayer_emfphelperdata_heap_use_after_free.sample`
(from the crashtestdata files) has cases where

  double fAdvance = aThisPos.X() - aPrevPos.X();

gets rather large (whether or not that's faithful to the input document, or 
a
consequence of an earlier import error), so failed with

> vcl/source/gdi/pdfwriter_impl.cxx:6078:66: runtime error: -5.83192e+09 is 
outside the range of representable values of type 'int'
>  #0 in 
vcl::PDFWriterImpl::drawHorizontalGlyphs(std::__debug::vector > const&, rtl::OStringBuffer&, 
Point const&, bool, double, double, double, int, int) at 
vcl/source/gdi/pdfwriter_impl.cxx:6078:66
>  #1 in vcl::PDFWriterImpl::drawLayout(SalLayout&, rtl::OUString const&, 
bool) at vcl/source/gdi/pdfwriter_impl.cxx:6404:17
>  #2 in vcl::PDFWriterImpl::drawTextArray(Point const&, rtl::OUString 
const&, long const*, int, int) at vcl/source/gdi/pdfwriter_impl.cxx:6621:9
>  #3 in vcl::PDFWriter::DrawTextArray(Point const&, rtl::OUString const&, 
long const*, int, int) at vcl/source/gdi/pdfwriter.cxx:87:22
>  #4 in vcl::PDFWriterImpl::playMetafile(GDIMetaFile const&, 
vcl::PDFExtOutDevData*, vcl::PDFWriter::PlayMetafileContext const&, 
VirtualDevice*) at vcl/source/gdi/pdfwriter_impl2.cxx:878:34
[...]

In the original compuation of sal_Int32 nAdjustment, the "+ 0.5" was 
presumably
intended to round to the nearest integer, even though it would have rounded
towards zero for negative values (as conversion to integer truncates).  So 
use
std::round to always round to the nearest integer, including for negative
values.

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 6515344d0644..a00fe2767f9e 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6100,7 +6100,12 @@ void PDFWriterImpl::drawHorizontalGlyphs(
 const Point aPrevPos = aMat.transform( rGlyphs[nPos-1].m_aPos );
 double fAdvance = aThisPos.X() - aPrevPos.X();
 fAdvance *= 1000.0 / nPixelFontHeight;
-const sal_Int32 nAdjustment = 
static_cast(rGlyphs[nPos-1].m_nNativeWidth - fAdvance + 0.5);
+const double fAdjustment = rGlyphs[nPos-1].m_nNativeWidth - 
fAdvance + 0.5;
+SAL_WARN_IF(
+fAdjustment < SAL_MIN_INT32 || fAdjustment > SAL_MAX_INT32, 
"vcl.pdfwriter",
+"adjustment " << fAdjustment << " outside 32-bit int");
+const sal_Int32 nAdjustment = static_cast(
+std::clamp(fAdjustment, double(SAL_MIN_INT32), 
double(SAL_MAX_INT32)));
 if( nAdjustment != 0 )
 {
 // apply individual glyph positioning
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice ESC call, Thur - 16:00 central European (local) time

[Michael Meeks]

Hi everyone,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week, I'll not be around this Thursday.

https://demo.collaboracloudsuite.com/tdf/

For now we continue using the public jitsi server:

https://meet.jit.si/tdfesc

ATB,

Michael.

* Completed Action Items:
+ welcome Andrea as committer with scope of comments for now (Kendy)

* Pending Action Items:
+ add an alias configure switch & rename KDE backend (Jan-Marek)
   [ another patch depends on this one, needs tweaking (Michael W)]
+ upgrade Android reqs to NDK19 (Kendy)
   [ patch needs pushing ]

* Release Engineering update (Christian)
+ 6.2.6 rc1
+ 6.3.0 rc3
  + UI freeze, 1 review needed on libreoffice-6-3 from now on
+ Remotes
+ Android viewer
+ Online

* Documentation

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
239(239) (topicUI) bugs open, 218(218) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months  
 added  8(1) 17(0)  38(2)   81(1)  
 commented 58(16)   159(-15)   431(15)1439(13) 
   removed  1(-1) 2(0)   2(0)   20(0)  
  resolved  7(6) 10(3)  28(3)  134(4)  
+ top 10 contributors:
  Heiko Tietze made 75 changes in 1 month, and 133 changes in 1 year
  Xisco Faulí made 35 changes in 1 month, and 277 changes in 1 year
  Foote, V Stuart made 33 changes in 1 month, and 227 changes in 1 year
  kompilainenn made 31 changes in 1 month, and 241 changes in 1 year
  Kainz, Andreas made 30 changes in 1 month, and 213 changes in 1 year
  Timur made 28 changes in 1 month, and 72 changes in 1 year
  Budea, Áron made 13 changes in 1 month, and 29 changes in 1 year
  Dieter Praas made 10 changes in 1 month, and 125 changes in 1 year
  Cor Nouws made 10 changes in 1 month, and 117 changes in 1 year
* Crash Testing (Caolan)
+ 6(+0) import failure, 11(+0) export failures
+ ??? 322 (+20, -81) coverity issues
+ Google / ossfuzz
+ ?? ran over the last week, found only 2 minor issues
+ CVE issues
* Crash Reporting (Xisco)
  + https://crashreport.libreoffice.org/stats/version/6.1.5.2
+ (-74) 1026 1100 1034 1236 1113 1274 1460 1705 1558
  + https://crashreport.libreoffice.org/stats/version/6.1.6.3
+ (-3) 700 703 776 760 571 424 293 277 215 68

  + https://crashreport.libreoffice.org/stats/version/6.2.3.2
+ (-85) 1002 1087 1234 1600 1645 2183 2428 2872 2401
  + https://crashreport.libreoffice.org/stats/version/6.2.4.2
+ (-489) 2333 2822 2733 2615 2039 1586 929 119 0
  + https://crashreport.libreoffice.org/stats/version/6.2.5.2
+ (+748) 748 0

* Hackfests & Events (Sophie)
  + Dresden Hackfest (Thorsten)
+ not heard anything from EU hackfest bits
+ tentatively end of October, talking to FSFE people there
   + not confirmed, working on that
+ Google Mentor summit happening in Europe end of October
   + could be a fall-back for European meetup
   + Cafe Netzwerk / CIB office or something.
  + hope to have one each quarter.

* Conference (Sophie)
   + around 85 papers submitted, CfP closed.

* GSOC 2019 (Thorsten/Xisco/Moggi/Heiko)
   + Project page:
 https://summerofcode.withgoogle.com/organizations/5557591040589824/ 
   + Mentors, please make sure students are active & communicating!
  + weekly reports are not optional, number decreasing!
   + next deadline:
 + Second Evaluations: July 22 - 26, 2019
 + Shubham/Gagandeep/Sumit please send missing reports
   + increasingly missing weekly reports (Thorsten)
 + strongly suggest mentors to chase their students & get them in.

* mentoring/easyhack update
  committer...   1 week  1 month  3 months 12 months
  open   59(-87)166(-21)  171(-21) 179(-21) 
   reviews 1744(-13)   5343(-113)   15495(498)   53381(245) 
merged  446(147)   1361(147) 4400(707)   15948(1135)
 abandoned   15(1)   98(17)   246(40)  816(77)  
   own commits  361(160)   1028(264) 3357(633)   14745(1119)
review commits   63(-45)361(-21) 1176(-8) 4055(-3)  
contributor...   1 week  1 month 3 months12 months
  open  67(28)  90(22)  91(23)   92(23)   
   reviews 142(-187)   542(33) 854(32) 2402(2)
merged  16(-47) 59(-158)   189(-501)945(-999) 
 abandoned   4(-7)  19(-20) 64(-36) 254(-73)  
   own commits  14(-49) 54(-162)   204(-507)993(-1028)
review commits   0(0)0(0)0(0) 0(0)
+ easyHack statistics:
   

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

[Mike Kaganski (via logerrit)]

 comphelper/source/misc/lok.cxx |6 ++
 desktop/source/lib/init.cxx|3 +++
 include/comphelper/lok.hxx |   10 ++
 sc/source/ui/view/gridwin4.cxx |9 ++---
 4 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 91a3f58ec3ac7998688cab665322d26d5aa3b015
Author: Mike Kaganski 
AuthorDate: Fri Jul 12 20:01:57 2019 +1000
Commit: Mike Kaganski 
CommitDate: Tue Jul 23 15:54:48 2019 +0200

Don't draw gridlines and document background in Online server process

... see https://gerrit.libreoffice.org/72417
They will be drawn client-side. Borders and explicit cell background are
still drawn in core. This mode is activated using "sc_no_grid_bg" option
in SAL_LOK_OPTIONS environment variable.

Change-Id: Ie10e7770b8168ec648d44ae5af0a0a0602d89ee6
Reviewed-on: https://gerrit.libreoffice.org/75484
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 0ea263f20885..0c43c3fc0822 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -35,6 +35,8 @@ static bool g_bViewIdForVisCursorInvalidation(false);
 
 static bool g_bLocalRendering(false);
 
+static Compat g_eCompatFlags(Compat::none);
+
 static LanguageTag g_aLanguageTag("en-US", true);
 
 /// Scaling of the cairo or CoreGraphics canvas painting for HiDPI or zooming 
in Calc.
@@ -130,6 +132,10 @@ bool isLocalRendering()
 return g_bLocalRendering;
 }
 
+void setCompatFlag(Compat flag) { g_eCompatFlags = 
static_cast(g_eCompatFlags | flag); }
+
+bool isCompatFlagSet(Compat flag) { return (g_eCompatFlags & flag) == flag; }
+
 void setLanguageTag(const LanguageTag& languageTag)
 {
 if (g_aLanguageTag != languageTag)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1a18e296a092..b553ba6b8b17 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4909,6 +4909,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 bUnipoll = true;
 else if (it == "profile_events")
 bProfileZones = true;
+else if (it == "sc_no_grid_bg")
+comphelper::LibreOfficeKit::setCompatFlag(
+comphelper::LibreOfficeKit::Compat::scNoGridBackground);
 }
 }
 
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 5f132f9d15f8..aaa3b48e6ae0 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -72,6 +72,16 @@ COMPHELPER_DLLPUBLIC void setRangeHeaders(bool 
bTiledAnnotations);
 /// Check if range based header data is enabled
 COMPHELPER_DLLPUBLIC bool isRangeHeaders();
 
+enum Compat : sal_uInt32
+{
+none = 0,
+scNoGridBackground = 1,
+};
+/// Set compatibility flags
+COMPHELPER_DLLPUBLIC void setCompatFlag(Compat flag);
+/// Get compatibility flags
+COMPHELPER_DLLPUBLIC bool isCompatFlagSet(Compat flag);
+
 
 /// Check whether clients want viewId in visible cursor invalidation payload.
 COMPHELPER_DLLPUBLIC bool isViewIdForVisCursorInvalidation();
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 5e1280cbd98f..8fc6391a665e 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -527,6 +527,9 @@ void ScGridWindow::DrawContent(OutputDevice , const 
ScTableInfo& rTableI
 ScDocument& rDoc = *pViewData->GetDocument();
 const ScViewOptions& rOpts = pViewData->GetOptions();
 bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
+bool bNoBackgroundAndGrid = bIsTiledRendering
+&& comphelper::LibreOfficeKit::isCompatFlagSet(
+   
comphelper::LibreOfficeKit::Compat::scNoGridBackground);
 
 SCTAB nTab = aOutputData.nTab;
 SCCOL nX1 = aOutputData.nX1;
@@ -710,16 +713,16 @@ void ScGridWindow::DrawContent(OutputDevice , 
const ScTableInfo& rTableI
 DrawRedraw( aOutputData, SC_LAYER_BACK );
 }
 else
-aOutputData.SetSolidBackground(true);
+aOutputData.SetSolidBackground(!bNoBackgroundAndGrid);
 
 aOutputData.DrawDocumentBackground();
 
-if ( bGridFirst && ( bGrid || bPage ) )
+if (bGridFirst && (bGrid || bPage) && !bNoBackgroundAndGrid)
 aOutputData.DrawGrid(*pContentDev, bGrid, bPage);
 
 aOutputData.DrawBackground(*pContentDev);
 
-if ( !bGridFirst && ( bGrid || bPage ) )
+if (!bGridFirst && (bGrid || bPage) && !bNoBackgroundAndGrid)
 aOutputData.DrawGrid(*pContentDev, bGrid, bPage);
 
 pContentDev->SetMapMode(MapMode(MapUnit::MapPixel));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adrien Ollier (via logerrit)]

 writerfilter/source/rtftok/rtfsprm.cxx |   28 ++--
 1 file changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 347b26ae3e332c206724fe5ec9d46fef38798281
Author: Adrien Ollier 
AuthorDate: Mon Jul 22 20:16:05 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 23 15:45:52 2019 +0200

better implementation of RTFSprms::find

if not bFirst, then it is more efficient
to start the search from the end.

Change-Id: I89bcb3b70ada7746ab983878f2868f58b89f37a5
Signed-off-by: Adrien Ollier 
Reviewed-on: https://gerrit.libreoffice.org/76126
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/writerfilter/source/rtftok/rtfsprm.cxx 
b/writerfilter/source/rtftok/rtfsprm.cxx
index b50d9b166344..109dd20474e5 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -59,20 +59,28 @@ std::string RTFSprm::toString() const
 
 RTFValue::Pointer_t RTFSprms::find(Id nKeyword, bool bFirst, bool bForWrite)
 {
-RTFValue::Pointer_t pValue;
-
 if (bForWrite)
 ensureCopyBeforeWrite();
 
-for (auto& rSprm : *m_pSprms)
-if (rSprm.first == nKeyword)
-{
-if (bFirst)
-return rSprm.second;
+auto cmp = [](const std::pair& raPair) 
-> bool {
+return raPair.first == nKeyword;
+};
 
-pValue = rSprm.second;
-}
-return pValue;
+if (bFirst)
+{
+auto it = std::find_if(m_pSprms->begin(), m_pSprms->end(), cmp);
+if (it != m_pSprms->end())
+return it->second;
+}
+else
+// find last
+{
+auto rit = std::find_if(m_pSprms->rbegin(), m_pSprms->rend(), cmp);
+if (rit != m_pSprms->rend())
+return rit->second;
+}
+
+return RTFValue::Pointer_t{};
 }
 
 void RTFSprms::set(Id nKeyword, const RTFValue::Pointer_t& pValue, 
RTFOverwrite eOverwrite)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Problem with Calc 6.2 Multiple Operations

[Steve Fanning]

All,

Can anybody help me please? I have been working within the LO 
Documentation Team updating Chapter 9 (Data Analysis) of the Calc Guide.


I have hit a particular problem with the Multiple Operations tool and 
have been unable to successfully save a LO spreadsheet containing 
multiple operations into an Excel file. (I have tried placing the 
relevant formula in the top left cell!)


By way of an example you can find a suitable Excel spreadsheet on the 
site called www.excel-easy.com, at a download address of 
https://www.excel-easy.com/examples/excel-files/data-tables.xlsx. I 
opened this file in LO 6.2 and all seemed well, so I re-saved it from LO 
as an Excel file. Unfortunately Excel generated errors when opening this 
version of the file and the resulting spreadsheet appeared to just 
contain numeric values rather than a proper Excel Data Table structure.


Should this process work or am I doing something stupid?

Regards,

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

[Libreoffice-bugs] [Bug 121784] FILEOPEN DOCX Footnote and endnote changes are not opened as change in change control

[bugzilla-daemon]

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

--- Comment #17 from Dieter Praas  ---
(In reply to Gabor Kelemen from comment #16)
> Which original file is that? The one in comment #3 has only two paragraphs
> with one footnote and one endnote each.

I created a new file (in order to verify the bug) and started record changes
from the beginning (so reject all changes also deletes the text and not only
the footnote end endnote number). Sorry, I don't want to produce confusion.

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

[Libreoffice-bugs] [Bug 126256] FORMATTING, FILEOPEN: Plain text document in (codepage 437) with commercial font displays incorrectly

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Status|REOPENED|NEEDINFO

--- Comment #7 from V Stuart Foote  ---
Sorry, I am not intentionally being negative in setting this NAB, there just is
no way to put it that does not point to incorrect usage of the os/DE and
LibreOffice features for import of this type of text document.

(In reply to robert from comment #5)
> 
> Completely irrelevant reply. I open it like I would with Word. LO should
> allow me to follow exactly the same steps!

Sorry, but it would if you make a file association for an .h-c file extension
in the os/DE or change the extension. But you'd still have to select the
encoding.

(In reply to robert from comment #6)
> 
> Nice to be so negative, calling it 'document'. It's plain text, one
> paragraph per line and a monospace font. Is that not a format?

When imported via the "Text - Choose Encoding (.txt)" filter after selecting
its encoding, LibreOffice will assign defaults for the 'Preformatted text'
style laid out on the default 'Page' style. 

And if you adjust those style defaults (either in advance, or after import) the
document will be correctly laid out with no need to select content and apply
direct formatting.

That includes making an assignment of the mono spaced Cubiculum font mentioned
for use as the 'Preformatted text' style if prefered to default Liberation
Mono. 

Or you could select other common monospaced fonts Noto Mono, Courier New,
Consolas, etc.  The allignment of the Box line drawing glyphs would be
controlled by each font's metrics--so always some potential for gaps.

All of these are usage issues.

LibreOffice is doing the correct thing on import of the text with correct
filter.

Would you please clearly state what you think the issue is.

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

[Libreoffice-bugs] [Bug 121784] FILEOPEN DOCX Footnote and endnote changes are not opened as change in change control

[bugzilla-daemon]

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

--- Comment #16 from Gabor Kelemen  ---
(In reply to Dieter Praas from comment #15)
> (In reply to Gabor Kelemen from comment #14)
> > Hi Dieter!
> > 
> > Thanks for verifying this one.
> > Could you elaborate how do you see empty paragraphs?
> 
> In the original file I have one paragraph with footnote, two empty
> paragraphs one paragraph with endnote and one empty paragraph. When I reject
> all changes I can see 5 empty paragraphs (formatting marks) in docx, but
> only one in odt-file.

Which original file is that? The one in comment #3 has only two paragraphs with
one footnote and one endnote each.

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

[Libreoffice-bugs] [Bug 125609] radiobutton receives item status changed event after listbox value selection

[bugzilla-daemon]

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

--- Comment #17 from Justin L  ---
Created attachment 152960
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152960=edit
test_itemStatusChangedEvent_tabstop_no_basic_simple_lo61_noMacro.ods: crash
sample

(In reply to Justin L from comment #13)
This commit could cause a crash loop, so a proposed patch for that is at
/gerrit.libreoffice.org/76186

By attaching the example document to bugzilla, the document will eventually
find it's way as a sample file in the crash-testing unit tests. That is much
nicer than actually adding it to the sc/qa tests which everyone runs...

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

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

[Noel Grandin (via logerrit)]

 framework/dtd/image.dtd   |4 
 framework/inc/xml/imagesconfiguration.hxx |   28 -
 framework/inc/xml/imagesdocumenthandler.hxx   |9 
 framework/source/uiconfiguration/imagemanagerimpl.cxx |3 
 framework/source/xml/imagesdocumenthandler.cxx|  344 --
 5 files changed, 5 insertions(+), 383 deletions(-)

New commits:
commit d367ee2f8c204f351072c0eb10259fd7aa497770
Author: Noel Grandin 
AuthorDate: Tue Jul 23 08:15:20 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 23 14:49:04 2019 +0200

Simplify framework image manager

various bits are no longer used since

commit ca00697e3dae9a03573d11281fc8d9a4ee391d3d
Date:   Tue Sep 8 04:57:32 2009 +
CWS-TOOLING: integrate CWS oj18

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

diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd
index 44e2f5315646..59b0f3f92f08 100644
--- a/framework/dtd/image.dtd
+++ b/framework/dtd/image.dtd
@@ -31,13 +31,13 @@
 
 
 
 
 
 
diff --git a/framework/inc/xml/imagesconfiguration.hxx 
b/framework/inc/xml/imagesconfiguration.hxx
index 330c023707da..983a16d66c9b 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -34,52 +34,24 @@
 namespace framework
 {
 
-enum ImageMaskMode
-{
-ImageMaskMode_Color,
-ImageMaskMode_Bitmap
-};
-
 struct ImageItemDescriptor
 {
-ImageItemDescriptor() : nIndex( -1 ) {}
-
 OUString  aCommandURL;// URL command to dispatch
-long  nIndex; // index of the bitmap inside the 
bitmaplist
-};
-
-struct ExternalImageItemDescriptor
-{
-OUString  aCommandURL;// URL command to dispatch
-OUString  aURL;   // a URL to an external bitmap
 };
 
 typedef std::vector > 
ImageItemListDescriptor;
 
-typedef std::vector > 
ExternalImageItemListDescriptor;
-
 struct ImageListItemDescriptor
 {
-ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ) {}
-
-OUStringaURL;   // a URL to a bitmap with 
several images inside
-Color   aMaskColor; // a color used as 
transparent
-OUStringaMaskURL;   // a URL to an optional 
bitmap used as a mask
-ImageMaskMode   nMaskMode;// an enum to describe 
the current mask mode
 std::unique_ptr
 pImageItemList;   // an array of 
ImageItemDescriptors that describes every image
-OUStringaHighContrastURL;   // a URL to an 
optional high contrast bitmap with several images inside
-OUStringaHighContrastMaskURL;   // a URL to an 
optional high contrast bitmap as a mask
 };
 
 typedef std::vector > 
ImageListDescriptor;
 
 struct ImageListsDescriptor
 {
-ImageListsDescriptor() {}
-
 std::unique_ptr pImageList;
-std::unique_ptr pExternalImageList;
 };
 
 class ImagesConfiguration
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx 
b/framework/inc/xml/imagesdocumenthandler.hxx
index cd41974d51e8..720071d0632e 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -103,7 +103,6 @@ class OReadImagesDocumentHandler : public 
::cppu::WeakImplHelper< css::xml::sax:
 ImageHashMapm_aImageMap;
 ImageListsDescriptor&   m_aImageList;
 ImageListItemDescriptor*m_pImages;
-ExternalImageItemListDescriptor*m_pExternalImages;
 css::uno::Reference< css::xml::sax::XLocator >  m_xLocator;
 };
 
@@ -127,16 +126,8 @@ class OWriteImagesDocumentHandler final
 
 /// @throws css::xml::sax::SAXException
 /// @throws css::uno::RuntimeException
-void WriteExternalImageList( const ExternalImageItemListDescriptor* );
-
-/// @throws css::xml::sax::SAXException
-/// @throws css::uno::RuntimeException
 void WriteImage( const ImageItemDescriptor* );
 
-/// @throws css::xml::sax::SAXException
-/// @throws css::uno::RuntimeException
-void WriteExternalImage( const ExternalImageItemDescriptor* );
-
 const ImageListsDescriptor&   
m_aImageListsItems;
 css::uno::Reference< css::xml::sax::XDocumentHandler >
m_xWriteDocumentHandler;
 css::uno::Reference< css::xml::sax::XAttributeList >  m_xEmptyList;
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index ff53261f56b8..fc6a54d3d2c2 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ 

[Libreoffice-bugs] [Bug 122514] Tango themed ODF MIME type icons with white background need redesign for better appearance on Windows and macOS with dark mode DE

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||6518

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

[Libreoffice-bugs] [Bug 126518] Redesign MIME type icons

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

Summary|app icon update |Redesign MIME type icons
   Severity|normal  |enhancement
 Status|UNCONFIRMED |NEW
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||2514
 CC||libreoffice-ux-advise@lists
   ||.freedesktop.org,
   ||will...@gathoye.be
URL||https://wiki.documentfounda
   ||tion.org/Design/Mimetype_Ic
   ||ons/Proposals
  Component|Writer  |UI
 Ever confirmed|0   |1

--- Comment #1 from Heiko Tietze  ---
This should also be discussed within a TDF vs. LibreOffice context where we
need on the one hand a clear recognizability of the brand and a distinction
between project and product. 

The task is filed here https://redmine.documentfoundation.org/issues/2910 based
on
https://apple.stackexchange.com/questions/338849/libreoffice-doesnt-have-an-icon.
And we also need to keep social media where the community want to modify the
brand; see https://redmine.documentfoundation.org/issues/2908 and
https://listarchives.libreoffice.org/global/design/msg09118.html

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

[Libreoffice-ux-advise] [Bug 126518] Redesign MIME type icons

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

Summary|app icon update |Redesign MIME type icons
   Severity|normal  |enhancement
 Status|UNCONFIRMED |NEW
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||2514
 CC||libreoffice-ux-advise@lists
   ||.freedesktop.org,
   ||will...@gathoye.be
URL||https://wiki.documentfounda
   ||tion.org/Design/Mimetype_Ic
   ||ons/Proposals
  Component|Writer  |UI
 Ever confirmed|0   |1

--- Comment #1 from Heiko Tietze  ---
This should also be discussed within a TDF vs. LibreOffice context where we
need on the one hand a clear recognizability of the brand and a distinction
between project and product. 

The task is filed here https://redmine.documentfoundation.org/issues/2910 based
on
https://apple.stackexchange.com/questions/338849/libreoffice-doesnt-have-an-icon.
And we also need to keep social media where the community want to modify the
brand; see https://redmine.documentfoundation.org/issues/2908 and
https://listarchives.libreoffice.org/global/design/msg09118.html

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

[Libreoffice-bugs] [Bug 126462] UI: 'autocorrect replacement table' bottom buttons positions have been changed

[bugzilla-daemon]

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

--- Comment #5 from tommy27  ---
I preferred the old order... but that's it.
It seems I'll have to cope with the new one.

Thanks for clarifications.

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

[Libreoffice-commits] online.git: android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |   31 
+-
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 68b33ba7f28dff5d5a315638dad91b2ecc303caf
Author: Jan Holesovsky 
AuthorDate: Tue Jul 23 14:17:34 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Jul 23 14:20:25 2019 +0200

android: Load the document only after we've got the permission.

Without this, the first start was failing, there was only a black screen
and the request for permission.

Change-Id: I7929048ca51b044dcb574f48bd2b7bc9a27e0ec8

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index ce1243348..2258a78a2 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -86,6 +86,7 @@ public class LOActivity extends AppCompatActivity {
 
 private boolean isDocEditable = false;
 private boolean isDocDebuggable = BuildConfig.DEBUG;
+private boolean documentLoaded = false;
 
 private ClipboardManager clipboardManager;
 private ClipData clipData;
@@ -218,19 +219,8 @@ public class LOActivity extends AppCompatActivity {
 
 setContentView(R.layout.lolib_activity_main);
 
-AssetManager assetManager = getResources().getAssets();
-
 isDocDebuggable = sPrefs.getBoolean(KEY_ENABLE_SHOW_DEBUG_INFO, false) 
&& BuildConfig.DEBUG;
 
-ApplicationInfo applicationInfo = getApplicationInfo();
-String dataDir = applicationInfo.dataDir;
-Log.i(TAG, String.format("Initializing LibreOfficeKit, dataDir=%s\n", 
dataDir));
-
-//redirectStdio(true);
-
-String cacheDir = getApplication().getCacheDir().getAbsolutePath();
-String apkFile = getApplication().getPackageResourcePath();
-
 if (getIntent().getData() != null) {
 
 if 
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
@@ -274,8 +264,6 @@ public class LOActivity extends AppCompatActivity {
 finish();
 }
 
-createLOOLWSD(dataDir, cacheDir, apkFile, assetManager, urlToLoad);
-
 mWebView = findViewById(R.id.browser);
 
 WebSettings webSettings = mWebView.getSettings();
@@ -421,7 +409,8 @@ public class LOActivity extends AppCompatActivity {
 Log.d(TAG, "onPause() - hinting to save, we might need to return to 
the doc");
 
 // A Save similar to an autosave
-postMobileMessageNative("save dontTerminateEdit=true 
dontSaveIfUnmodified=true");
+if (documentLoaded)
+postMobileMessageNative("save dontTerminateEdit=true 
dontSaveIfUnmodified=true");
 }
 
 @Override
@@ -445,6 +434,18 @@ public class LOActivity extends AppCompatActivity {
 }
 
 private void loadDocument() {
+// setup the LOOLWSD
+ApplicationInfo applicationInfo = getApplicationInfo();
+String dataDir = applicationInfo.dataDir;
+Log.i(TAG, String.format("Initializing LibreOfficeKit, dataDir=%s\n", 
dataDir));
+
+String cacheDir = getApplication().getCacheDir().getAbsolutePath();
+String apkFile = getApplication().getPackageResourcePath();
+AssetManager assetManager = getResources().getAssets();
+
+createLOOLWSD(dataDir, cacheDir, apkFile, assetManager, urlToLoad);
+
+// trigger the load of the document
 String finalUrlToLoad = 
"file:///android_asset/dist/loleaflet.html?file_path=" +
 urlToLoad + "=1";
 if (isDocEditable) {
@@ -456,6 +457,8 @@ public class LOActivity extends AppCompatActivity {
 finalUrlToLoad += "=true";
 }
 mWebView.loadUrl(finalUrlToLoad);
+
+documentLoaded = true;
 }
 
 static {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 42949] accelerating compile times by removing unnecessary header #include - See Comment 57

[bugzilla-daemon]

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

--- Comment #270 from Commit Notification 
 ---
Gabor Kelemen committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/+/bfe225b7003d119ff214cbaa771289de105c48d5%5E%21

tdf#42949 Fix IWYU warnings in include/test

It will be available in 6.4.0.

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

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

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

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

[Gabor Kelemen (via logerrit)]

 include/test/container/xnameaccess.hxx   |1 -
 include/test/drawing/xshapedescriptor.hxx|1 -
 include/test/helper/form.hxx |1 -
 include/test/helper/shape.hxx|1 -
 include/test/helper/transferable.hxx |1 -
 include/test/lang/xcomponent.hxx |1 -
 include/test/lang/xserviceinfo.hxx   |1 -
 include/test/sheet/cellarealink.hxx  |1 -
 include/test/sheet/functiondescription.hxx   |1 -
 include/test/sheet/xprintareas.hxx   |2 +-
 include/test/sheet/xsheetannotation.hxx  |1 -
 include/test/sheet/xsheetoutline.hxx |3 +--
 include/test/sheet/xsheetpagebreak.hxx   |3 +--
 include/test/sheet/xspreadsheetdocument.hxx  |1 -
 include/test/sheet/xsubtotalcalculatable.hxx |1 -
 include/test/table/xcellrange.hxx|1 -
 include/test/table/xtablecolumns.hxx |2 --
 include/test/testinteractionhandler.hxx  |2 +-
 include/test/text/baseindex.hxx  |2 ++
 include/test/text/textdocumentindex.hxx  |3 +--
 include/test/text/textprintersettings.hxx|3 +--
 include/test/text/textsettings.hxx   |4 
 include/test/text/xsimpletext.hxx|2 +-
 include/test/text/xtext.hxx  |2 +-
 include/test/util/xsearchable.hxx|2 ++
 test/source/sheet/xsheetoutline.cxx  |1 +
 26 files changed, 17 insertions(+), 27 deletions(-)

New commits:
commit bfe225b7003d119ff214cbaa771289de105c48d5
Author: Gabor Kelemen 
AuthorDate: Sun Jul 7 23:10:31 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jul 23 14:16:09 2019 +0200

tdf#42949 Fix IWYU warnings in include/test

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.

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

diff --git a/include/test/container/xnameaccess.hxx 
b/include/test/container/xnameaccess.hxx
index 6ff525917380..960cf67822b9 100644
--- a/include/test/container/xnameaccess.hxx
+++ b/include/test/container/xnameaccess.hxx
@@ -14,7 +14,6 @@
 
 #include 
 
-#include 
 #include 
 
 namespace apitest
diff --git a/include/test/drawing/xshapedescriptor.hxx 
b/include/test/drawing/xshapedescriptor.hxx
index cb7c37e3a5ba..2c99e7e9c197 100644
--- a/include/test/drawing/xshapedescriptor.hxx
+++ b/include/test/drawing/xshapedescriptor.hxx
@@ -14,7 +14,6 @@
 #include 
 
 #include 
-#include 
 
 namespace apitest
 {
diff --git a/include/test/helper/form.hxx b/include/test/helper/form.hxx
index d84794cc5b6d..0fbcd2c7b06a 100644
--- a/include/test/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -15,7 +15,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/test/helper/shape.hxx b/include/test/helper/shape.hxx
index e4322bec1357..341a9fad93fc 100644
--- a/include/test/helper/shape.hxx
+++ b/include/test/helper/shape.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_TEST_HELPER_SHAPE_HXX
 #define INCLUDED_TEST_HELPER_SHAPE_HXX
 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/test/helper/transferable.hxx 
b/include/test/helper/transferable.hxx
index 280b28ad5006..d0454bc6e410 100644
--- a/include/test/helper/transferable.hxx
+++ b/include/test/helper/transferable.hxx
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/test/lang/xcomponent.hxx b/include/test/lang/xcomponent.hxx
index fdbeccc6cf7b..9314749fbc52 100644
--- a/include/test/lang/xcomponent.hxx
+++ b/include/test/lang/xcomponent.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_TEST_LANG_XCOMPONENT_HXX
 #define INCLUDED_TEST_LANG_XCOMPONENT_HXX
 
-#include 
 #include 
 #include 
 
diff --git a/include/test/lang/xserviceinfo.hxx 
b/include/test/lang/xserviceinfo.hxx
index 86a92480d970..14ce4e61 100644
--- a/include/test/lang/xserviceinfo.hxx
+++ b/include/test/lang/xserviceinfo.hxx
@@ -16,7 +16,6 @@
 
 #include 
 
-#include 
 #include 
 
 namespace apitest
diff --git a/include/test/sheet/cellarealink.hxx 
b/include/test/sheet/cellarealink.hxx
index 6eff944ae7be..eb3a13547c0a 100644
--- a/include/test/sheet/cellarealink.hxx
+++ b/include/test/sheet/cellarealink.hxx
@@ -15,7 +15,6 @@
 #include 
 
 #include 
-#include 
 
 namespace apitest
 {
diff --git a/include/test/sheet/functiondescription.hxx 
b/include/test/sheet/functiondescription.hxx
index 4e3128bcaaaf..bfe719bc5972 100644
--- a/include/test/sheet/functiondescription.hxx
+++ b/include/test/sheet/functiondescription.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_TEST_SHEET_FUNCTIONDESCRIPTION_HXX
 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/include/test/sheet/xprintareas.hxx 
b/include/test/sheet/xprintareas.hxx

[Libreoffice-bugs] [Bug 126138] -fsanitize=dynamic-type-mismatch in SwTabFrame::FindLastContent (SwTabFrame vs. SwContentFrame) during --convert-to pdf

[bugzilla-daemon]

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

--- Comment #1 from Stephan Bergmann  ---
(In reply to Stephan Bergmann from comment #0)
> At least on recent master built with UBSan, `--headless --convert-to pdf
> doc/fdo53816-2.doc` as obtained by bin/get-bugzilla-attachments-by-mimetype
> (i.e., attachment 65809 [details] at bug 53816 comment 1) fails with

same issue with doc/fdo70612-1.doc (i.e., attachment 87816 at bug 70612 comment
0)

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

[Libreoffice-bugs] [Bug 83660] VIEWING: In slide show windows taskbar doesnt disappear

[bugzilla-daemon]

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

--- Comment #18 from abma  ---
happens for me too with:

Version: 6.2.5.2 (x64) on windows server 2008R2

as workarround i changed the setting inside the template:

"menu Slide show > Slide show settings > check 'presentation always on top'"

so at least for new presentations the issue is gone for me.

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

[Libreoffice-commits] core.git: compilerplugins/clang solenv/CompilerTest_compilerplugins_clang.mk sw/qa

[Noel Grandin (via logerrit)]

 compilerplugins/clang/referencecasting.cxx |  385 +
 compilerplugins/clang/store/referencecasting.cxx   |  195 
 compilerplugins/clang/store/referencecasting.hxx   |   33 -
 compilerplugins/clang/test/referencecasting.cxx|  150 ++
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 sw/qa/extras/accessibility/accessible_relation_set.cxx |2 
 sw/qa/extras/globalfilter/globalfilter.cxx |8 
 sw/qa/extras/mailmerge/mailmerge.cxx   |8 
 sw/qa/extras/odfexport/odfexport.cxx   |   22 
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   45 -
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |6 
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |   40 -
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx  |   14 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   18 
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx  |5 
 sw/qa/extras/rtfimport/rtfimport.cxx   |   61 +-
 sw/qa/extras/uiwriter/uiwriter.cxx |   51 +-
 sw/qa/extras/uiwriter/uiwriter2.cxx|8 
 sw/qa/extras/unowriter/unowriter.cxx   |   14 
 sw/qa/extras/ww8export/ww8export.cxx   |   48 +-
 sw/qa/extras/ww8export/ww8export2.cxx  |   88 +--
 sw/qa/extras/ww8export/ww8export3.cxx  |2 
 22 files changed, 744 insertions(+), 460 deletions(-)

New commits:
commit c4bce5dafdfcb97586fab4bc3834daa6a27fec4c
Author: Noel Grandin 
AuthorDate: Thu Jul 18 14:57:37 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 23 13:51:18 2019 +0200

resurrect and improve loplugin:referencecasting

Improve the plugin to avoid generating false+ with the special case of
querying XInterface (what the code calls normalisation).

Also ignore places where the querying is dealing with ambiguous base
classes.

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

diff --git a/compilerplugins/clang/referencecasting.cxx 
b/compilerplugins/clang/referencecasting.cxx
new file mode 100644
index ..e60177f4effb
--- /dev/null
+++ b/compilerplugins/clang/referencecasting.cxx
@@ -0,0 +1,385 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include 
+
+/*
+This is a compile-time checker.
+
+Check for cases where we have
+ - two IDL interfaces A and B,
+ - B extends A
+ - we are converting a Reference to a Reference using UNO_QUERY
+
+This makes the code simpler and cheaper, because UNO_QUERY can be surprisingly 
expensive if used a lot.
+
+*/
+
+class ReferenceCasting : public loplugin::FilteringPlugin
+{
+public:
+explicit ReferenceCasting(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
+}
+void run() override
+{
+std::string fn(handler.getMainFileName());
+loplugin::normalizeDotDotInFilePath(fn);
+// macros
+if (fn == SRCDIR "/dbaccess/source/ui/browser/formadapter.cxx")
+return;
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+bool VisitCXXConstructExpr(const CXXConstructExpr* cce);
+bool VisitCXXMemberCallExpr(const CXXMemberCallExpr* mce);
+
+private:
+bool CheckForUnnecessaryGet(const Expr*);
+};
+
+static const RecordType* extractTemplateType(const clang::Type*);
+static bool isDerivedFrom(const CXXRecordDecl* subtypeRecord, const 
CXXRecordDecl* baseRecord);
+
+bool ReferenceCasting::VisitCXXConstructExpr(const CXXConstructExpr* cce)
+{
+// don't bother processing anything in the Reference.h file. Makes my life 
easier when debugging this.
+StringRef aFileName = getFileNameOfSpellingLoc(
+compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(cce)));
+if (loplugin::isSamePathname(aFileName, SRCDIR 
"/include/com/sun/star/uno/Reference.h"))
+return true;
+if (loplugin::isSamePathname(aFileName, SRCDIR 
"/include/com/sun/star/uno/Reference.hxx"))
+return true;
+
+// look for calls to the Reference(x, UNO_something) constructor
+auto constructorClass = cce->getConstructor()->getParent();
+if (!constructorClass->getIdentifier() || constructorClass->getName() != 
"Reference")
+return true;
+
+if (cce->getNumArgs() != 2)
+return true;
+
+if (CheckForUnnecessaryGet(cce->getArg(0)))
+report(DiagnosticsEngine::Warning, "unnecessary get() call", 
compat::getBeginLoc(cce))
+<< cce->getSourceRange();
+
+// ignore the 

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/rtfexport/data/tab-stop-fill-chars.rtf |   14 
 sw/qa/extras/rtfexport/rtfexport4.cxx   |   23 
 writerfilter/source/rtftok/rtfdispatchflag.cxx  |7 +-
 3 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit 413956ae4c1e833d7ecb6e3695bcdec92533c2ce
Author: Miklos Vajna 
AuthorDate: Mon Jul 22 21:14:50 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jul 23 13:48:53 2019 +0200

RTF import: add tests for RTF_TLMDOT/HYPH/TH/EQ

lcov points out these were not covered previously. Also, Word maps TH to
underline and EQ to nothing, so do the same.

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

diff --git a/sw/qa/extras/rtfexport/data/tab-stop-fill-chars.rtf 
b/sw/qa/extras/rtfexport/data/tab-stop-fill-chars.rtf
new file mode 100644
index ..f1fc4e8e2284
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tab-stop-fill-chars.rtf
@@ -0,0 +1,14 @@
+{\rtf1
+\pard \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\tlmdot\tx2520\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1061119
 
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1061119 \tab 
\hich\af37\dbch\af37\loch\f37 tlmdot
+\par }
+\pard \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\tlhyph\tx2520\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1061119
 
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1061119 \tab 
\hich\af37\dbch\af37\loch\f37 tlhyph
+\par }
+\pard \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\tlth\tx2520\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1061119
 
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1061119 \tab 
\hich\af37\dbch\af37\loch\f37 tlth
+\par }
+\pard \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\tleq\tx2520\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1061119
 
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1061119 \tab 
\hich\af37\dbch\af37\loch\f37 tleq
+\par }
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx 
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index 0d86a00df960..6b75eda278fd 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -105,6 +105,29 @@ DECLARE_RTFEXPORT_TEST(testCjklist34, "cjklist34.rtf")
 CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH_TW, numFormat);
 }
 
+DECLARE_RTFIMPORT_TEST(testTabStopFillChars, "tab-stop-fill-chars.rtf")
+{
+// tlmdot
+auto aTabstops = 
getProperty>(getParagraph(1), "ParaTabStops");
+CPPUNIT_ASSERT(aTabstops.hasElements());
+CPPUNIT_ASSERT_EQUAL(u'·', aTabstops[0].FillChar);
+
+// tlhyph
+aTabstops = getProperty>(getParagraph(2), 
"ParaTabStops");
+CPPUNIT_ASSERT(aTabstops.hasElements());
+CPPUNIT_ASSERT_EQUAL(u'-', aTabstops[0].FillChar);
+
+// tlth
+aTabstops = getProperty>(getParagraph(3), 
"ParaTabStops");
+CPPUNIT_ASSERT(aTabstops.hasElements());
+CPPUNIT_ASSERT_EQUAL(u'_', aTabstops[0].FillChar);
+
+// tleq
+aTabstops = getProperty>(getParagraph(4), 
"ParaTabStops");
+CPPUNIT_ASSERT(aTabstops.hasElements());
+CPPUNIT_ASSERT_EQUAL(u' ', aTabstops[0].FillChar);
+}
+
 DECLARE_RTFEXPORT_TEST(testCjklist38, "cjklist38.rtf")
 {
 sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx 
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 32de52c40b32..c8f65d57369f 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -150,14 +150,11 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword 
nKeyword)
 nParam = NS_ooxml::LN_Value_ST_TabTlc_hyphen;
 break;
 case RTF_TLUL:
+case RTF_TLTH:
 nParam = NS_ooxml::LN_Value_ST_TabTlc_underscore;
 break;
-case RTF_TLTH:
-nParam = NS_ooxml::LN_Value_ST_TabTlc_hyphen;
-break; // thick line is not supported by dmapper, this is just a 
hack
 case RTF_TLEQ:
-nParam = NS_ooxml::LN_Value_ST_TabTlc_none;
-break; // equal sign isn't, either
+break;
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 99568] EDITING: Dictionary context menu non-persistent if the cursor snaps to a misspelled word when right-clicking

[bugzilla-daemon]

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

Harald Koester  changed:

   What|Removed |Added

   See Also|https://bugs.documentfounda |
   |tion.org/show_bug.cgi?id=11 |
   |8419|

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

[Libreoffice-bugs] [Bug 118419] Wrong Context Menu Before Misspelt Word

[bugzilla-daemon]

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

Harald Koester  changed:

   What|Removed |Added

   See Also|https://bugs.documentfounda |
   |tion.org/show_bug.cgi?id=99 |
   |568 |

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

[Libreoffice-bugs] [Bug 99568] EDITING: Dictionary context menu non-persistent if the cursor snaps to a misspelled word when right-clicking

[bugzilla-daemon]

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

Harald Koester  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE
 CC||harald.koes...@mail.de

--- Comment #3 from Harald Koester  ---


*** This bug has been marked as a duplicate of bug 118419 ***

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

[Libreoffice-bugs] [Bug 118419] Wrong Context Menu Before Misspelt Word

[bugzilla-daemon]

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

Harald Koester  changed:

   What|Removed |Added

 CC||fiendi...@gmail.com

--- Comment #13 from Harald Koester  ---
*** Bug 99568 has been marked as a duplicate of this bug. ***

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

[Libreoffice-bugs] [Bug 126256] FORMATTING, FILEOPEN: Plain text document in (codepage 437) with commercial font displays incorrectly

[bugzilla-daemon]

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

rob...@prino.org changed:

   What|Removed |Added

 Ever confirmed|0   |1
 Status|RESOLVED|REOPENED
 Resolution|NOTABUG |---

--- Comment #6 from rob...@prino.org ---
Comments are(In reply to V Stuart Foote from comment #4)
> removing the Font-substitution meta -- bug 103342 as this is a usage issue. 
> 
> Modifying the style(s) and applying it will replace all references to the
> not present "Cubiculum" font for the ODF document embedded into the 'hybrid'
> PDF. Potentially an issue in the PDF export filter if you chose to embed the
> fonts which does not appear to be the case as the File -> Properties -> Font
> tab of the hybrid PDF's document shows the font embedding not enabled.
> 
> The orginal 'document' has no assigned font or layout, just its encoding.
> 
> With that LibreOffice does the correct thing with appropriate import filter.

Nice to be so negative, calling it 'document'. It's plain text, one paragraph
per line and a monospace font. Is that not a format?

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

[Libreoffice-bugs] [Bug 118419] Wrong Context Menu Before Misspelt Word

[bugzilla-daemon]

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

--- Comment #12 from Harald Koester  ---
Bug still exists with version 6.2.5 (64 bit, win10).

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

[Libreoffice-bugs] [Bug 126256] FORMATTING, FILEOPEN: Plain text document in (codepage 437) with commercial font displays incorrectly

[bugzilla-daemon]

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

--- Comment #5 from rob...@prino.org ---
(In reply to V Stuart Foote from comment #3)
> You mistakenly had not selected the document to open in Writer (via the os
> FilePicker and all files *.*) and are then trying to assign the import
> filter to use.
> 
> The file picker is provided by the os/DE, the import filters are provided by
> LibreOffice.
> 
> Of course if you want the file to appear when not first selecting it--change
> its file type extension from ".h-c" to simply ".txt".
> 
> On selection of the file, applying the 'Text - Choose Encoding (.txt)'
> filter, and making the selection from the 'ASCII Filter Options' dialog, the
> text of the document is brought into LibreOffice and assigned a style of
> "Preformatted Text" on the "Default" page styles.
> 
> No selection of text/paragraph is necessary.
> 
> Rather, you should modify both styles (Paragraph, Page) to apply them to the
> imported text. Save to .ott template--useful if you have multiple instances
> of this format to import--and load its styles in advance.

Completely irrelevant reply. I open it like I would with Word. LO should allow
me to follow exactly the same steps!

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-4.0.5-6'

[Aron Budea (via logerrit)]

Tag 'cd-4.0.5-6' created by Jan Holesovsky  at 2019-07-23 
11:27 +

cd-4.0.5-6

Changes since cd-4.0.5-5-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 126518] app icon update

[bugzilla-daemon]

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

andreas_k  changed:

   What|Removed |Added

 CC||kain...@gmail.com
   Keywords||needsUXEval

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

[Libreoffice-bugs] [Bug 126518] New: app icon update

[bugzilla-daemon]

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

Bug ID: 126518
   Summary: app icon update
   Product: LibreOffice
   Version: 6.4.0.0.alpha0+ Master
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: kain...@gmail.com

Created attachment 152959
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152959=edit
writer app icon

the existing app icons of libreoffice get an update with 6.1 but in general the
app icons are similar to the mimetype icons.

The problem is not that the existing app icons look bad it's more that on dark
toolbars or dark window frames so where the icon size is between 16 - 32 px the
thin boarder are to thin and the white background is to much in the focus.

So attached is my proposal for an updated writer app icon. Other proposals are
here https://wiki.documentfoundation.org/Design/Mimetype_Icons/Proposals

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/itiff/itiff.cxx |   53 +---
 1 file changed, 40 insertions(+), 13 deletions(-)

New commits:
commit fda86dd781a80703f06ae1b6056439bafed190a8
Author: Caolán McNamara 
AuthorDate: Mon Jul 22 15:44:12 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Jul 23 13:17:13 2019 +0200

Resolves: tdf#126460 implement reading grayscale+alpha tiff format

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

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 7509777b6122..0e1241a9484a 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1144,15 +1144,34 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 }
 }
 else if ( ( nSamplesPerPixel == 2 ) && ( nBitsPerSample == 8 ) &&
-( nPlanarConfiguration == 1 ) && aColorMap.empty() )   // 
grayscale
+( nPlanarConfiguration == 1 ) && aColorMap.empty() )   // 
grayscale + alpha
 {
 if ( nMaxSampleValue > nMinSampleValue )
 {
-sal_uInt32 nMinMax = ( ( 1 << 8 /*nDstBitsPerPixel*/ ) - 1 ) / ( 
nMaxSampleValue - nMinSampleValue );
-sal_uInt8*  pt = getMapData(0);
-for (sal_Int32 nx = 0; nx < nImageWidth; nx++, pt += 2 )
+sal_uInt8* pt = getMapData(0);
+
+if (nPredictor == 2)
 {
-SetPixel(nY, nx, static_cast( 
(static_cast(*pt) - nMinSampleValue) * nMinMax));
+sal_uInt8 nLastPixel = 0;
+sal_uInt8 nLastAlpha = 0;
+for (sal_Int32 nx = 0; nx < nImageWidth; nx++, pt += 2)
+{
+nLastPixel = (nLastPixel + pt[0]) & 0xFF;
+SetPixel(nY, nx, nLastPixel);
+
+nLastAlpha = (nLastAlpha + pt[1]) & 0xFF;
+SetPixelAlpha(nY, nx, ~nLastAlpha);
+}
+}
+else
+{
+sal_uInt32 nMinMax = ( ( 1 << 8 /*nDstBitsPerPixel*/ ) - 1 ) / 
( nMaxSampleValue - nMinSampleValue );
+for (sal_Int32 nx = 0; nx < nImageWidth; nx++, pt += 2)
+{
+SetPixel(nY, nx, static_cast( 
(static_cast(pt[0]) - nMinSampleValue) * nMinMax ));
+sal_uInt8 nAlpha = static_cast( 
(static_cast(pt[1]) - nMinSampleValue) * nMinMax );
+SetPixelAlpha(nY, nx, ~nAlpha);
+}
 }
 }
 }
@@ -1235,13 +1254,21 @@ void TIFFReader::ReadHeader()
 bool TIFFReader::HasAlphaChannel() const
 {
 /*There are undoubtedly more variants we could support, but keep it simple 
for now*/
-return (
- nDstBitsPerPixel == 24 &&
- nBitsPerSample == 8 &&
- nSamplesPerPixel >= 4 &&
- nPlanes == 1 &&
- nPhotometricInterpretation == 2
-   );
+bool bRGBA = nDstBitsPerPixel == 24 &&
+ nBitsPerSample == 8 &&
+ nSamplesPerPixel >= 4 &&
+ nPlanes == 1 &&
+ nPhotometricInterpretation == 2;
+if (bRGBA)
+return true;
+
+// additionally support the format used in tdf#126460
+bool bGrayScaleAlpha = nDstBitsPerPixel == 8 &&
+   nBitsPerSample == 8 &&
+   nSamplesPerPixel == 2 &&
+   nPlanarConfiguration == 1;
+
+return bGrayScaleAlpha;
 }
 
 namespace
@@ -1619,7 +1646,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 {
 for (sal_Int32 nX = 0; nX < nImageWidth; ++nX)
 {
-auto p = maBitmap.data() + 
((maBitmapPixelSize.Width() * nY + nX) * 3);
+auto p = maBitmap.data() + 
((maBitmapPixelSize.Width() * nY + nX) * (HasAlphaChannel() ? 4 : 3));
 auto c = SanitizePaletteIndex(*p, mvPalette);
 *p = c.GetRed();
 p++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 sw/source/ui/dbui/mmresultdialogs.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fad14c70bec997bf99818ee3c08e83ba968c1b0f
Author: Michael Weghorn 
AuthorDate: Fri Jul 19 08:16:54 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 23 13:07:22 2019 +0200

tdf#126471 Apply selected MM printer on dialog open

Calling 'PrinterChangeHdl_Impl' in
'SwMMResultPrintDialog::FillInPrinterSettings' makes
sure that a preselected printer is actually taken
into account (i.e. 'm_pTempPrinter' set accordingly
etc.) as soon as the dialog is created, not only when
explicitly selecting another printer.

Since 'PrinterChangeHdl_Impl' is now called initially
and every time another printer is selected, there's no
more need to do so in 'PrinterSetupHdl_Impl' any more.

This fixes the issue that printout would always
happen on default printer instead of the preselected one
when SwMMResultPrintDialog was opened a second time.

Change-Id: I5c930ed56d1025a7e94cc98fb70c01612bda0d22
Reviewed-on: https://gerrit.libreoffice.org/75933
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 0f0adc34889ff68da584cea97a9de649174b0333)
Reviewed-on: https://gerrit.libreoffice.org/75966
Reviewed-by: Michael Stahl 

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx 
b/sw/source/ui/dbui/mmresultdialogs.cxx
index edecaf648028..54d498d3cc93 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -342,6 +342,7 @@ void SwMMResultPrintDialog::FillInPrinterSettings()
 {
 m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter());
 }
+PrinterChangeHdl_Impl(*m_xPrinterLB);
 
 sal_Int32 count = xConfigItem->GetMergedDocumentCount();
 m_xToNF->set_value(count);
@@ -783,8 +784,6 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, PrintHdl_Impl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(SwMMResultPrintDialog, PrinterSetupHdl_Impl, weld::Button&, 
void)
 {
-if (!m_pTempPrinter)
-PrinterChangeHdl_Impl(*m_xPrinterLB);
 if (m_pTempPrinter)
 m_pTempPrinter->Setup(m_xDialog.get());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 126488] How shall we react if we encounter a crash report?

[bugzilla-daemon]

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

--- Comment #11 from himajin100...@gmail.com ---
Hmmm, I guess:

* Official RELEASE builds uses options specified in the appropriate conf files.
https://opengrok.libreoffice.org/xref/core/distro-configs/

And they contains --enable-breakpad

* However, for example, Nightlies and Beta versions do not use these options,
and 
in your first post, "Thank you for your help in improving *LibreOfficeDev*.",
which indicates you are using those versions.

* if we don't have that option when the program is built, writeCommonInfo will
not run, so there will be no dump.ini
https://opengrok.libreoffice.org/xref/core/desktop/source/app/app.cxx?r=2ec1c7a6#2086

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

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

[Michael Weghorn (via logerrit)]

 sw/source/ui/dbui/mmresultdialogs.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9711e8ed4c7353e453aa5a9b59187f6cd31f24f1
Author: Michael Weghorn 
AuthorDate: Fri Jul 19 08:16:54 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 23 13:07:29 2019 +0200

tdf#126471 Apply selected MM printer on dialog open

Calling 'PrinterChangeHdl_Impl' in
'SwMMResultPrintDialog::FillInPrinterSettings' makes
sure that a preselected printer is actually taken
into account (i.e. 'm_pTempPrinter' set accordingly
etc.) as soon as the dialog is created, not only when
explicitly selecting another printer.

Since 'PrinterChangeHdl_Impl' is now called initially
and every time another printer is selected, there's no
more need to do so in 'PrinterSetupHdl_Impl' any more.

This fixes the issue that printout would always
happen on default printer instead of the preselected one
when SwMMResultPrintDialog was opened a second time.

Change-Id: I5c930ed56d1025a7e94cc98fb70c01612bda0d22
Reviewed-on: https://gerrit.libreoffice.org/75933
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 0f0adc34889ff68da584cea97a9de649174b0333)
Reviewed-on: https://gerrit.libreoffice.org/75968
Reviewed-by: Michael Stahl 

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx 
b/sw/source/ui/dbui/mmresultdialogs.cxx
index b7b55baca56c..d102faec4103 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -341,6 +341,7 @@ void SwMMResultPrintDialog::FillInPrinterSettings()
 {
 m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter());
 }
+PrinterChangeHdl_Impl(*m_xPrinterLB);
 
 sal_Int32 count = xConfigItem->GetMergedDocumentCount();
 m_xToNF->set_value(count);
@@ -782,8 +783,6 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, PrintHdl_Impl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(SwMMResultPrintDialog, PrinterSetupHdl_Impl, weld::Button&, 
void)
 {
-if (!m_pTempPrinter)
-PrinterChangeHdl_Impl(*m_xPrinterLB);
 if (m_pTempPrinter)
 m_pTempPrinter->Setup(m_xDialog.get());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 117480] Mailmerge crash when saving merged document ( only the first time the connection is done )

[bugzilla-daemon]

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

--- Comment #25 from Commit Notification 
 ---
Szymon Kłos committed a patch related to this issue.
It has been pushed to "libreoffice-6-2":

https://git.libreoffice.org/core/+/4bba6c122c3bb3468bccd69d53d70d00fd00bdcc%5E%21

tdf#117480 fix crash in mailmerge

It will be available in 6.2.6.

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

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

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

[Libreoffice-bugs] [Bug 117480] Mailmerge crash when saving merged document ( only the first time the connection is done )

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:6.3.0|target:6.3.0 target:6.2.6

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

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

[Szymon Kłos (via logerrit)]

 sw/source/uibase/dbui/dbmgr.cxx |  738 
 1 file changed, 374 insertions(+), 364 deletions(-)

New commits:
commit 4bba6c122c3bb3468bccd69d53d70d00fd00bdcc
Author: Szymon Kłos 
AuthorDate: Wed Jan 2 19:03:25 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Jul 23 13:01:26 2019 +0200

tdf#117480 fix crash in mailmerge

Catch exceptions and hide progress dialog.

Change-Id: Ie63c8d7e001c90f40cf7504fd8248a6742e9d244
Reviewed-on: https://gerrit.libreoffice.org/65815
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/72280
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f9a05ad5a87d..ae3e12610985 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1273,454 +1273,464 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 vcl::Window *pSourceWindow = nullptr;
 std::shared_ptr xProgressDlg;
 
-if( !bIsMergeSilent )
+try
 {
-// construct the process dialog
-pSourceWindow = >GetView().GetEditWin();
-if (!bMT_PRINTER)
-xProgressDlg.reset(new 
CreateMonitor(pSourceWindow->GetFrameWeld()));
-else
+if( !bIsMergeSilent )
 {
-xProgressDlg.reset(new 
PrintMonitor(pSourceWindow->GetFrameWeld()));
-static_cast(xProgressDlg.get())->set_title(
-pSourceDocSh->GetTitle(22));
-}
-weld::DialogController::runAsync(xProgressDlg, [this, 
](sal_Int32 nResult){
-if (nResult == RET_CANCEL)
-MergeCancel();
-xProgressDlg.reset();
-});
-
-Application::Reschedule( true );
-}
-
-if( bCreateSingleFile && !pTargetView )
-{
-// create a target docshell to put the merged document into
-xTargetDocShell = lcl_CreateWorkingDocument( WorkingDocType::TARGET,
-*pSourceShell, bMT_SHELL ? pSourceWindow : nullptr,
-nullptr, , ,  );
+// construct the process dialog
+pSourceWindow = >GetView().GetEditWin();
+if (!bMT_PRINTER)
+xProgressDlg.reset(new 
CreateMonitor(pSourceWindow->GetFrameWeld()));
+else
+{
+xProgressDlg.reset(new 
PrintMonitor(pSourceWindow->GetFrameWeld()));
+static_cast(xProgressDlg.get())->set_title(
+pSourceDocSh->GetTitle(22));
+}
+weld::DialogController::runAsync(xProgressDlg, [this, 
](sal_Int32 nResult){
+if (nResult == RET_CANCEL)
+MergeCancel();
+xProgressDlg.reset();
+});
 
-// import current print settings
-const SwPrintData  = 
pSourceShell->getIDocumentDeviceAccess().getPrintData();
-pTargetDoc->getIDocumentDeviceAccess().setPrintData(rPrintData);
+Application::Reschedule( true );
+}
 
-if (nMaxDumpDocs)
-lcl_SaveDebugDoc( xTargetDocShell.get(), "MergeDoc" );
-}
-else if( pTargetView )
-{
-pTargetShell = pTargetView->GetWrtShellPtr();
-pTargetDoc = pTargetShell->GetDoc();
-xTargetDocShell = pTargetView->GetDocShell();
-}
+if( bCreateSingleFile && !pTargetView )
+{
+// create a target docshell to put the merged document into
+xTargetDocShell = lcl_CreateWorkingDocument( 
WorkingDocType::TARGET,
+*pSourceShell, bMT_SHELL ? pSourceWindow : nullptr,
+nullptr, , ,  );
 
-if( bCreateSingleFile )
-{
-// determine the page style and number used at the start of the source 
document
-pSourceShell->SttEndDoc(true);
-nStartingPageNo = pSourceShell->GetVirtPageNum();
-}
+// import current print settings
+const SwPrintData  = 
pSourceShell->getIDocumentDeviceAccess().getPrintData();
+pTargetDoc->getIDocumentDeviceAccess().setPrintData(rPrintData);
 
-// Progress, to prohibit KeyInputs
-SfxProgress aProgress(pSourceDocSh, ::aEmptyOUStr, 1);
+if (nMaxDumpDocs)
+lcl_SaveDebugDoc( xTargetDocShell.get(), "MergeDoc" );
+}
+else if( pTargetView )
+{
+pTargetShell = pTargetView->GetWrtShellPtr();
+pTargetDoc = pTargetShell->GetDoc();
+xTargetDocShell = pTargetView->GetDocShell();
+}
 
-// lock all dispatchers
-SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst(pSourceDocSh);
-while (pViewFrame)
-{
-pViewFrame->GetDispatcher()->Lock(true);
-pViewFrame = SfxViewFrame::GetNext(*pViewFrame, pSourceDocSh);
-}
+if( bCreateSingleFile )
+{
+// determine the page style and number used at the start of the 
source document
+

[Libreoffice-bugs] [Bug 121784] FILEOPEN DOCX Footnote and endnote changes are not opened as change in change control

[bugzilla-daemon]

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

--- Comment #15 from Dieter Praas  ---
(In reply to Gabor Kelemen from comment #14)
> Hi Dieter!
> 
> Thanks for verifying this one.
> Could you elaborate how do you see empty paragraphs?

In the original file I have one paragraph with footnote, two empty paragraphs
one paragraph with endnote and one empty paragraph. When I reject all changes I
can see 5 empty paragraphs (formatting marks) in docx, but only one in
odt-file.

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-4' - debian/changelog

[Aron Budea (via logerrit)]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 1acb82920db73e2dd171a9e109f107040739ff2d
Author: Aron Budea 
AuthorDate: Tue Jul 23 12:53:47 2019 +0200
Commit: Aron Budea 
CommitDate: Tue Jul 23 12:53:47 2019 +0200

Bump package version to 4.0.5-6

Change-Id: Icbed0745aadd42f17fc3c7b83e5be3fb1f1b94f7

diff --git a/debian/changelog b/debian/changelog
index febedc676..9fb2ac5eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.5-6) unstable; urgency=medium
+
+  * see the git log: http://col.la/coolcd4
+
+ -- Andras Timar   Tue, 23 Jul 2019 13:00:00 +0200
+
 loolwsd (4.0.5-5) unstable; urgency=medium
 
   * see the git log: http://col.la/coolcd4
___
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.2' - sw/qa writerfilter/source

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/ooxmlexport/data/date_field_in_shape.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper.cxx   |9 +
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit d9ed1f1ee34951f02985ec891b25a294b7e5d6c5
Author: Tamás Zolnai 
AuthorDate: Mon Jul 22 11:12:47 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Jul 23 12:34:56 2019 +0200

MSForms: DOCX filter: fix crash when the date field is inside a shape

Change-Id: Ida6ff48e6e743e41dd793e31c11065f870e8959b
Reviewed-on: https://gerrit.libreoffice.org/76117
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit d163b651dc3dd017cdb3327d87a7cf88003238e9)

diff --git a/sw/qa/extras/ooxmlexport/data/date_field_in_shape.docx 
b/sw/qa/extras/ooxmlexport/data/date_field_in_shape.docx
new file mode 100644
index ..ff3c637c34f3
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/date_field_in_shape.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 84b38fc0a26a..dc59f5a384eb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -704,6 +704,11 @@ DECLARE_OOXMLEXPORT_TEST( testTdf66401, "tdf66401.docx")
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST( testDateFieldInShape, "date_field_in_shape.docx" )
+{
+// This was crashed on export.
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 95bd864fc63a..6a0095651ffd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3248,11 +3248,12 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 m_pImpl->m_pSdtHelper->getLocale().truncate();
 return;
 }
-if((m_pImpl->hasTableManager() && 
m_pImpl->getTableManager().isInTable()) ||
-m_pImpl->m_nTableDepth > 0)
+bool bIsInTable = (m_pImpl->hasTableManager() && 
m_pImpl->getTableManager().isInTable()) ||
+  (m_pImpl->m_nTableDepth > 0);
+if(bIsInTable || m_pImpl->IsInShape())
 {
-// Inside a table we need to import date field earlier
-m_pImpl->m_pSdtHelper->createDateContentControl(true);
+// Inside an object we need to import date field earlier
+m_pImpl->m_pSdtHelper->createDateContentControl(bIsInTable);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/core/crsr/findtxt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25cf4dad747c506ef7cd25f6aaffac627d8fd0f5
Author: Caolán McNamara 
AuthorDate: Mon Jul 22 12:19:49 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 12:43:18 2019 +0200

cid#1448493 Dereference after null check

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

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index def2a7529d72..75f49de135c3 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -266,7 +266,7 @@ lcl_CleanStr(const SwTextNode& rNd,
 
 if ( bNewHint )
 {
-if (pNextHint->HasDummyChar() && (nStart <= nStt))
+if (pNextHint && pNextHint->HasDummyChar() && (nStart <= nStt))
 {
 switch (pNextHint->Which())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - android/app android/lib

[Jan Holesovsky (via logerrit)]

 android/app/src/main/AndroidManifest.xml   
|6 +--
 android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java  
|4 +-
 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java 
|   17 --
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |   10 ++---
 android/app/src/main/res/layout/activity_show_html.xml 
|2 -
 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java   
|   10 ++---
 6 files changed, 17 insertions(+), 32 deletions(-)

New commits:
commit 1d549fa9dd423d91cba23ea10acc2d8a36ef5122
Author: Jan Holesovsky 
AuthorDate: Tue Jul 23 12:38:41 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Jul 23 12:40:09 2019 +0200

android: Obviously we need to request for writing, not only reading.

Change-Id: I68927593bd17a6ee6de0c1d879d6b05372c1350e

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 3d6838a12..ce1243348 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -64,7 +64,7 @@ public class LOActivity extends AppCompatActivity {
 final static String TAG = "LOActivity";
 
 private static final String ASSETS_EXTRACTED_PREFS_KEY = 
"ASSETS_EXTRACTED";
-private static final int PERMISSION_READ_EXTERNAL_STORAGE = 777;
+private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 777;
 private static final String KEY_ENABLE_SHOW_DEBUG_INFO = 
"ENABLE_SHOW_DEBUG_INFO";
 
 private static final String KEY_PROVIDER_ID = "providerID";
@@ -327,11 +327,11 @@ public class LOActivity extends AppCompatActivity {
 }
 });
 
-if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.READ_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
+if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
 Log.i(TAG, "asking for read storage permission");
 ActivityCompat.requestPermissions(this,
-new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
-PERMISSION_READ_EXTERNAL_STORAGE);
+new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+PERMISSION_WRITE_EXTERNAL_STORAGE);
 } else {
 loadDocument();
 }
@@ -352,7 +352,7 @@ public class LOActivity extends AppCompatActivity {
 @Override
 public void onRequestPermissionsResult(int requestCode, @NonNull String[] 
permissions, @NonNull int[] grantResults) {
 switch (requestCode) {
-case PERMISSION_READ_EXTERNAL_STORAGE:
+case PERMISSION_WRITE_EXTERNAL_STORAGE:
 if (permissions.length > 0 && grantResults[0] == 
PackageManager.PERMISSION_GRANTED) {
 loadDocument();
 } else {
commit a04ed68104b3091ebac767fdd5f4157596135a87
Author: Jan Holesovsky 
AuthorDate: Tue Jul 23 09:46:04 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Jul 23 12:40:09 2019 +0200

android: No need for the extra wrapper, use the LOActivity directly.

Change-Id: Ie4afaedcc3b255c83c570acea02101d284e85653

diff --git a/android/app/src/main/AndroidManifest.xml 
b/android/app/src/main/AndroidManifest.xml
index 8a776f3be..ae17c0878 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
 android:supportsRtl="true"
 android:theme="@style/LibreOfficeTheme">
 
-
 
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
@@ -128,4 +128,4 @@
 android:theme="@style/Theme.AppCompat.Light" />
 
 
-
\ No newline at end of file
+
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java 
b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
index 397cde677..d101c2914 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
@@ -25,6 +25,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
+import org.libreoffice.androidlib.LOActivity;
+
 public class AboutDialogFragment extends DialogFragment {
 
 private static final String DEFAULT_DOC_PATH = "/assets/example.odt";
@@ -103,7 +105,7 @@ public class AboutDialogFragment extends DialogFragment {
 .setNeutralButton(R.string.about_moreinfo, new 
DialogInterface.OnClickListener() {
 @Override

[Libreoffice-bugs] [Bug 101224] VIEWING Cell view not updated with split screen and macros

[bugzilla-daemon]

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

Miklos Vajna  changed:

   What|Removed |Added

   Keywords|bisected|

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

[Libreoffice-bugs] [Bug 101224] VIEWING Cell view not updated with split screen and macros

[bugzilla-daemon]

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

Miklos Vajna  changed:

   What|Removed |Added

 CC||tobias.madl@gmail.com,
   ||vmik...@collabora.com
 Blocks|118739  |

--- Comment #8 from Miklos Vajna  ---
Reverting the above commit doesn't fix the problem for me, so I re-bisected
this, which lead to the scheduler rewrite in 4.4 -> 5.0 timeframe. The core.git
commit range is
1028643bc7d294e4c32b4ccea288d90088abae53..01f406bc28f53acc5a2734af637aa8074a5d1813,
but I could not bisect further as the code doesn't build.

Adding Cc: to Tobias Madl; Could you possibly take a look at this one?

And removing from the "List-Combobox-RenderContext-regressions" tracker.


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=118739
[Bug 118739] [META] Refactor ListBox/ComboBox to use RenderContext regressions
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 118739] [META] Refactor ListBox/ComboBox to use RenderContext regressions

[bugzilla-daemon]

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

Miklos Vajna  changed:

   What|Removed |Added

 Depends on|101224  |


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=101224
[Bug 101224] VIEWING Cell view not updated with split screen and macros
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 121784] FILEOPEN DOCX Footnote and endnote changes are not opened as change in change control

[bugzilla-daemon]

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

--- Comment #14 from Gabor Kelemen  ---
(In reply to Dieter Praas from comment #13)
> Verified with
> 
> Version: 6.4.0.0.alpha0+ (x64)
> Build ID: 8f98a7c4e5b1f0b249c026577805a378b8a533d5
> CPU threads: 4; OS: Windows 10.0; UI render: GL; VCL: win; 
> TinderBox: Win-x86_64@42, Branch:master, Time: 2019-07-23_00:30:19
> Locale: de-DE (de_DE); UI-Language: en-US
> Calc: threaded
> 
> One little problem remains: If you reject all changes in docx-file, empty
> paragraphes remain (that's not the case with odt-file). But pershaps that's
> another bug.

Hi Dieter!

Thanks for verifying this one.
Could you elaborate how do you see empty paragraphs?

I tried to reject footnote/endnote changes from the attached example file and
from a newly created one, but nothing remained in this recent master build:

Version: 6.4.0.0.alpha0+ (x86)
Build ID: 382aceb80d3c0f420d51762e1f88eee2334ff11b
CPU threads: 4; OS: Windows 6.3; UI render: GL; VCL: win; 
TinderBox: Win-x86@42, Branch:master, Time: 2019-07-21_23:45:18
Locale: hu-HU (hu_HU); UI-Language: en-US
Calc: CL

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

[Libreoffice-bugs] [Bug 101756] [META] Table styles bugs and enhancements

[bugzilla-daemon]

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

Harald Koester  changed:

   What|Removed |Added

 Depends on||126517


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=126517
[Bug 126517] Table Style “Default Style” is not Highlighted in Styles Deck of
Sidebar
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 126517] New: Table Style “Default Style” is not Highlighted in Styles Deck of Sidebar

[bugzilla-daemon]

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

Bug ID: 126517
   Summary: Table Style “Default Style” is not Highlighted in
Styles Deck of Sidebar
   Product: LibreOffice
   Version: 6.2.5.2 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: harald.koes...@mail.de
Blocks: 101756

In order to reproduce the bug:

[1] Open new text document.
[2] Insert table with table style Default Style: 
(a) Menu: Table > Insert Table… The Insert Table dialogue is displayed. In the
style list Default Style is highlighted. This is already the wanted style.
(b) Click Insert. An empty 2x2 table with the style Default Style is inserted.
[3] Click into table.
[4] Display styles deck of sidebar: F11.
[5] Select Table Styles. All table styles are displayed but no one is
highlighted. Expected: Style Default Style should be highlighted. At this point
a user is not able to identify which style is used.
[6] Insert another table with a different table style. In this case the correct
style is displayed in the sidebar.

The correct style of the first table is also displayed if you go on with:

[7] Click into first table.
[8] Display AutoFormat dialogue: “Table > AutoFormat Styles...” The table style
is displayed correctly here. Then OK. Now the table style is also displayed
correctly in the sidebar.

The table styles in the sidebar are introduced with version 5.3.0. This bug was
also introduced with this version.


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=101756
[Bug 101756] [META] Table styles bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 115709] [META] DOCX (OOXML) Tracking changes-related issues

[bugzilla-daemon]

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

NISZ LibreOffice Team  changed:

   What|Removed |Added

 Depends on||126516


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=126516
[Bug 126516] FILEOPEN DOCX Rejecting multi-paragraph deletion destroys change
tracking of formatting
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125546] FILEOPEN DOCX Style changes result in multiple change tracking entries

[bugzilla-daemon]

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

NISZ LibreOffice Team  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||6516

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

[Libreoffice-bugs] [Bug 126516] FILEOPEN DOCX Rejecting multi-paragraph deletion destroys change tracking of formatting

[bugzilla-daemon]

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

NISZ LibreOffice Team  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||5546
 Blocks||115709
 CC||kelem...@ubuntu.com,
   ||nem...@numbertext.org


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=115709
[Bug 115709] [META] DOCX (OOXML) Tracking changes-related issues
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 126516] FILEOPEN DOCX Rejecting multi-paragraph deletion destroys change tracking of formatting

[bugzilla-daemon]

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

--- Comment #1 from NISZ LibreOffice Team  ---
Created attachment 152957
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152957=edit
Example file from Word

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

[Libreoffice-bugs] [Bug 126516] FILEOPEN DOCX Rejecting multi-paragraph deletion destroys change tracking of formatting

[bugzilla-daemon]

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

--- Comment #2 from NISZ LibreOffice Team  ---
Created attachment 152958
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152958=edit
Screenshot of the original document side by side in Word and Writer after
rejecting changes

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

[Libreoffice-bugs] [Bug 126516] New: FILEOPEN DOCX Rejecting multi-paragraph deletion destroys change tracking of formatting

[bugzilla-daemon]

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

Bug ID: 126516
   Summary: FILEOPEN DOCX Rejecting multi-paragraph deletion
destroys change tracking of formatting
   Product: LibreOffice
   Version: 6.4.0.0.alpha0+ Master
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: libreoff...@nisz.hu

Description:
Attached Word document has change tracked paragraph formatting set to multiple
paragraphs, then parts of these paragraphs was deleted. 
Rejecting the deletion in Writer causes the formatting to stay only in the
third paragraph instead of the second and third.


Steps to Reproduce:
1.  Open attached file
2.  Reject the text deletion change
3.  Reject the formatting change


Actual Results:
Formatting of the third paragraph is restored to Heading 3, but Heading 1 is
unchanged in the second paragraph.

Expected Results:
In Word rejecting the deletion then rejecting the formatting change restores
the second paragraphs formatting to Heading 2 and the third paragraphs to
Heading 3.


Reproducible: Always


User Profile Reset: No



Additional Info:
LibreOffice details:
Version: 6.4.0.0.alpha0+ (x86)
Build ID: 382aceb80d3c0f420d51762e1f88eee2334ff11b
CPU threads: 4; OS: Windows 6.3; UI render: GL; VCL: win; 
TinderBox: Win-x86@42, Branch:master, Time: 2019-07-21_23:45:18
Locale: hu-HU (hu_HU); UI-Language: en-US
Calc: CL

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

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/docedt.cxx|3 ++-
 sw/source/core/txtnode/ndtxt.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 680c4eac7a39b7e039d7828a3cac839395b9a36e
Author: Michael Stahl 
AuthorDate: Mon Jul 22 19:27:11 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 11:58:30 2019 +0200

tdf#126340 sw_redlinehide: only move merged frames in JoinPrev

The problem was that the first and second node were not actually merged
by a redline, so moving the frames doesn't make sense.

(regression from 41d8ca9686c7c184f586e99674b443c34bfd4f33)

Change-Id: Ib401e4b0b2b207666f65c038ab5c346807bfea92
Reviewed-on: https://gerrit.libreoffice.org/76125
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 91b344b0346347ac40d2d6fa03a03e92d2e9f252)
Reviewed-on: https://gerrit.libreoffice.org/76149
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 1388bdc1b53a..fad87aec561f 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -465,7 +465,8 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
 }
 // delete the Node, at last!
 SwNode::Merge const 
eOldMergeFlag(pOldTextNd->GetRedlineMergeFlag());
-if (eOldMergeFlag == SwNode::Merge::First)
+if (eOldMergeFlag == SwNode::Merge::First
+&& !pTextNd->IsCreateFrameWhenHidingRedlines())
 {
 sw::MoveDeletedPrevFrames(*pOldTextNd, *pTextNd);
 }
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 691c20f6490b..cced7186d49e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1126,7 +1126,8 @@ void SwTextNode::JoinPrev()
 pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, true );
 }
 SwNode::Merge const eOldMergeFlag(pTextNode->GetRedlineMergeFlag());
-if (eOldMergeFlag == SwNode::Merge::First)
+if (eOldMergeFlag == SwNode::Merge::First
+&& !IsCreateFrameWhenHidingRedlines())
 {
 sw::MoveDeletedPrevFrames(*pTextNode, *this);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 0324ad6d99650eccb01729f18f95c2f7f4b3ce68
Author: Caolán McNamara 
AuthorDate: Mon Jul 22 21:37:32 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 11:57:19 2019 +0200

async modal dialogs need to inc/dec parent frame modality

like sync ones do, so vcl knows those frames are modal-locked,
so e.g. a blank calc document with a modal async dialog open,
e.g. page dialog, is not considered a candidate for reuse
if soffice is instructed, e.g. via command line pipe, to
open another calc document

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 0094a2cd1627..af20ca70ca06 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3180,6 +3180,8 @@ public:
 m_xDialogController = rDialogController;
 m_aFunc = func;
 
+if (get_modal())
+m_aDialogRun.inc_modal_count();
 show();
 
 m_nResponseSignalId = g_signal_connect(m_pDialog, "response", 
G_CALLBACK(signalAsyncResponse), this);
@@ -3198,6 +3200,8 @@ public:
 m_xRunAsyncSelf = rxSelf;
 m_aFunc = func;
 
+if (get_modal())
+m_aDialogRun.inc_modal_count();
 show();
 
 m_nResponseSignalId = g_signal_connect(m_pDialog, "response", 
G_CALLBACK(signalAsyncResponse), this);
@@ -4847,6 +4851,8 @@ void GtkInstanceDialog::asyncresponse(gint ret)
 return;
 }
 
+if (get_modal())
+m_aDialogRun.dec_modal_count();
 hide();
 m_aFunc(GtkToVcl(ret));
 m_aFunc = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 119976] Allow scrolling with mouse wheel while LibreOffice doesn't have focus (KDE with GTK3)

[bugzilla-daemon]

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

--- Comment #19 from Fabio Rossi  ---
(In reply to Gunter Ohrner from comment #18)
> (In reply to Jan-Marek Glogowski from comment #16)
> > Can you retest with current master?
> > I can't reproduce here it here.
> > 
> > This was probably fixed for kde5 when I fixed bug 125201. If it's fixed for
> > kde5, remove the KDE block, as gtk3_kde5 just uses the KDE5 file picker and
> > is otherwise gtk3 code.
> 
> Mouse wheel scrolling without focus works for me in KDE Neon (Ubuntu
> 18.04-based) with LibreOffice 6.2.5.2 and kde5-VCL:
> 
> Version: 6.2.5.2
> Build-ID: 1:6.2.5-0ubuntu0.18.04.1~lo1
> CPU-Threads: 8; BS: Linux 4.18; UI-Render: GL; VCL: kde5; 
> Gebietsschema: de-DE (de_DE.UTF-8); UI-Sprache: de-DE
> Calc: threaded

here 6.2.5.2 built from sources as indicated in comment #14 still doesn't work
on my system:

Version: 6.2.5.2
Build ID: Gentoo official package
CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: gtk3; 
Locale: it-IT (it_IT.UTF-8); UI-Language: en-US
Calc: threaded

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

[Libreoffice-bugs] [Bug 103100] [META] Writer table bugs

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Depends on||126500


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=126500
[Bug 126500] High CPU utilization after stretching a table embedded in a table
in Writer
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 126500] High CPU utilization after stretching a table embedded in a table in Writer

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Blocks||103100

--- Comment #1 from Roman Kuznetsov <79045_79...@mail.ru> ---
can't repro in

Version: 6.4.0.0.alpha0+ (x86)
Build ID: c738be4de6886a0c96b7d10df7e78c8b2964c135
CPU threads: 4; OS: Windows 6.1; UI render: default; VCL: win; 
Locale: ru-RU (ru_RU); UI-Language: en-US
Calc: threaded


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103100
[Bug 103100] [META] Writer table bugs
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112535] FILESAVE: DOC: Image got distorted after RT

[bugzilla-daemon]

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

Miklos Vajna  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |vmik...@collabora.com
   |desktop.org |

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

[Libreoffice-bugs] [Bug 126506] Tab label too low within macro editor

[bugzilla-daemon]

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

--- Comment #4 from Roman Kuznetsov <79045_79...@mail.ru> ---
Created attachment 152956
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152956=edit
Comparison between Calc tabs and macro editor tabs

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

[Libreoffice-bugs] [Bug 126506] Tab label too low within macro editor

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #3 from Roman Kuznetsov <79045_79...@mail.ru> ---
Confirm in

Version: 6.4.0.0.alpha0+ (x86)
Build ID: c738be4de6886a0c96b7d10df7e78c8b2964c135
CPU threads: 4; OS: Windows 6.1; UI render: default; VCL: win; 
Locale: ru-RU (ru_RU); UI-Language: en-US
Calc: threaded

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

[Libreoffice-bugs] [Bug 124572] tabs in calc (for sheets) and draw (for layer) style

[bugzilla-daemon]

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

andreas_k  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #32 from andreas_k  ---
thanks for your work Tomaz

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

[Libreoffice-bugs] [Bug 113113] [META] Sheet tabs bar bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113113
Bug 113113 depends on bug 124572, which changed state.

Bug 124572 Summary: tabs in calc (for sheets) and draw (for layer) style
https://bugs.documentfoundation.org/show_bug.cgi?id=124572

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-bugs] [Bug 126506] Tab label too low within macro editor

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Blocks||124891
 OS|Mac OS X (All)  |All


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=124891
[Bug 124891] [META] Basic IDE bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 124891] [META] Basic IDE bugs and enhancements

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Depends on||126506


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=126506
[Bug 126506] Tab label too low within macro editor
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 126506] Tab label too low within macro editor

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||4572

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

[Libreoffice-bugs] [Bug 106234] EDITING: centered tabulator not effective in justified paragraph with line breaks

[bugzilla-daemon]

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

Gabor Kelemen  changed:

   What|Removed |Added

   See Also||https://bz.apache.org/ooo/s
   ||how_bug.cgi?id=45491

--- Comment #8 from Gabor Kelemen  ---
So I just found that setting the Options - Writer - Compatibility - "Expand
word space on lines with manual line breaks in justified paragraphs" option to
false solves this issue.
I guess we can set this in our default config.

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

[Libreoffice-bugs] [Bug 124572] tabs in calc (for sheets) and draw (for layer) style

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=12
   ||6506

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

[Libreoffice-bugs] [Bug 126508] Crash and document recovery on option change of view -> icon style

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Blocks||110746


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=110746
[Bug 110746] [META] Options dialog's View settings bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 110746] [META] Options dialog's View settings bugs and enhancements

[bugzilla-daemon]

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

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Depends on||126508


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=126508
[Bug 126508] Crash and document recovery on option change of view -> icon style
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 126515] FILEOPEN: Cannot open XML (Excel) with style parent ref.

[bugzilla-daemon]

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

--- Comment #1 from i...@scito.ch ---
Created attachment 152955
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152955=edit
Modified file where offending part is removed

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

[Libreoffice-bugs] [Bug 126515] New: FILEOPEN: Cannot open XML (Excel) with style parent ref.

[bugzilla-daemon]

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

Bug ID: 126515
   Summary: FILEOPEN: Cannot open XML (Excel) with style parent
ref.
   Product: LibreOffice
   Version: 6.3.0.2 rc
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: i...@scito.ch

Created attachment 152954
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152954=edit
Original file from ark.intel.com

It is not possible to open an XML (Excel) file having a Style tag with Parent
attribute. The error message "General Error. General input/output Error." is
shown while opening the file in LibreOffice Calc.

My file was generated by ark.intel.com about processor information:
https://ark.intel.com/content/www/us/en/ark/products/75460/intel-core-i7-4500u-processor-4m-cache-up-to-3-00-ghz.html
I exported the file by clicking the "Export specifications" link.

After removing

I could open the file.

Steps to reproduce:
1. Open Intel_ARK_ComparisonChart_2019_07_23_original.xml in LO Calc
--> "General Error. General input/output Error."
2. Open Intel_ARK_ComparisonChart_2019_07_23_modified.xml where the offending
Style tag was removed
--> File is opened

Actual Result:
An error message is shown and the original file cannot be opened.

Expected result:
The original file opens without error in LO Calc.

Versions
I tested it on LO 6.2.5.2 Linux and LO 6.3.0.2 Windows.

File type of XML (Excel) file:


I do not know if this Style tag having a Parent attribute is valid or not for
the above file type.

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

[Libreoffice-bugs] [Bug 126152] [META] Images-TIFF

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=126152
Bug 126152 depends on bug 126460, which changed state.

Bug 126460 Summary: Wrong rendering with Greyscale TIF with no / transparent 
background
https://bugs.documentfoundation.org/show_bug.cgi?id=126460

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-bugs] [Bug 126488] How shall we react if we encounter a crash report?

[bugzilla-daemon]

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

--- Comment #10 from Adalbert Hanßen  ---
(In reply to himajin10 from comment #7)
> oops, the filename wasn't dumprc, dump.ini is the correct one.
> 
> as there is no  SAL_CONFIGFILE("dump")
> https://opengrok.libreoffice.org/xref/core/desktop/source/app/crashreport.
> cxx?r=6f50961e#154

On my whole Linux computer, there is no file named dumprc and no file named
dump.ini.

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

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

[Roman Kuznetsov (via logerrit)]

 cui/inc/tipoftheday.hrc |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fef4dc459fd242549d791a47fc1fb5fc28b9193b
Author: Roman Kuznetsov 
AuthorDate: Sun Jul 7 21:12:31 2019 +0200
Commit: Roman Kuznetsov 
CommitDate: Tue Jul 23 11:07:36 2019 +0200

Improve some tip_of_the_day strings

Change-Id: I5177b41aa3be91f1b5003e49a729757405eae4d5
Reviewed-on: https://gerrit.libreoffice.org/75184
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index a8ec4ff5929c..e5991d646839 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -106,7 +106,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and xml filters?"), 
"http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html;,
 ""},
 
  { NC_("RID_CUI_TIPOFTHEDAY", "Easily convert your documents to PDF with 
one click by clicking on the PDF icon in the toolbar."), "", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools > 
Options > %PRODUCTNAME > View > User Interface > Icon size and style."), "", 
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools > 
Options > %PRODUCTNAME > View > User Interface > Icon style."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use font embedding for greater 
interoperability with other office suites at  File > Properties > Font."), "", 
""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents 
with the exact format, image compression, comments, access rights, password, 
etc., via File > Export as PDF."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use Data > Statistics for sampling, 
descriptive statistics, analysis of variance, correlation, and much more in 
%PRODUCTNAME Calc."), "", "tipoftheday_c.png"},
@@ -118,7 +118,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Batch convert your MS Office documents to 
OpenDocument format by the Document Converter wizard in menu File > Wizards > 
Document converter."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Uncheck Tools > Options > %PRODUCTNAME Calc 
> View > Zoom: 'Synchronize sheets' so that each sheet in Calc has its own zoom 
factor."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the 
current spreadsheet via Sheet > Sheet from file."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to move a Writer table? Table > Select 
> Table and Insert > Frame… and move where you want."), "", 
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to move a Writer table? Table > Select 
> Table and Insert > Frame > Frame and move where you want."), "", 
"tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Draw to change the 0/0 
point of the rulers, drag the intersection of the two rulers in the top left 
corner into the workspace."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Hold down Ctrl and turn the mouse wheel to 
change the zoom factor."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Edit > Find & Replace lets you insert 
special characters directly: right click in input fields or press 
Shift+Ctrl+S."), "", ""},
@@ -140,7 +140,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to see, but not print, an object in 
Draw? Draw it on a layer for which the ‘Printable’ flag is not set (right click 
on the tab and ‘Modify Layer’)."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to print two portrait pages on a 
landscape one (reducing A4 to A5)? File > Print and select 2 at ‘Pages per 
sheet’."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "To get the ‘Vertical Text’ tool in the 
Drawing toolbar, check Tools > Options > Language Settings > Languages > 
Default languages > Asian (and make the button visible with right click)."), 
"", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to add many shapes in Draw/Impress? 
Double-click a tool in the drawing toolbar to use it for repeated tasks."), "", 
"tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to add many of the same shapes in 
Draw/Impress? Double-click a tool in the drawing toolbar to use it for repeated 
tasks."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in 
a spreadsheet? Select menu Data > AutoFilter, click the drop-down arrow, and 
chose ‘Top10’."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Unable to modify or delete a custom cell 
style? Check all sheets, none should be protected."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to know how many days there are in the 
current month? Use the DAYSINMONTH(TODAY()) function."), "", 
"tipoftheday_c.png"},
@@ -164,7 +164,7 @@ const std::tuple 

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

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/itiff/itiff.cxx |   53 +---
 1 file changed, 40 insertions(+), 13 deletions(-)

New commits:
commit 09ad0e78129d4f85fd1b847b35409fd5440ed23c
Author: Caolán McNamara 
AuthorDate: Mon Jul 22 15:44:12 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 11:05:59 2019 +0200

Resolves: tdf#126460 implement reading grayscale+alpha tiff format

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

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 15a4fe3d3b43..31f91c10eb3e 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1148,15 +1148,34 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 }
 }
 else if ( ( nSamplesPerPixel == 2 ) && ( nBitsPerSample == 8 ) &&
-( nPlanarConfiguration == 1 ) && aColorMap.empty() )   // 
grayscale
+( nPlanarConfiguration == 1 ) && aColorMap.empty() )   // 
grayscale + alpha
 {
 if ( nMaxSampleValue > nMinSampleValue )
 {
-sal_uInt32 nMinMax = ( ( 1 << 8 /*nDstBitsPerPixel*/ ) - 1 ) / ( 
nMaxSampleValue - nMinSampleValue );
-sal_uInt8*  pt = getMapData(0);
-for (sal_Int32 nx = 0; nx < nImageWidth; nx++, pt += 2 )
+sal_uInt8* pt = getMapData(0);
+
+if (nPredictor == 2)
 {
-SetPixel(nY, nx, static_cast( 
(static_cast(*pt) - nMinSampleValue) * nMinMax));
+sal_uInt8 nLastPixel = 0;
+sal_uInt8 nLastAlpha = 0;
+for (sal_Int32 nx = 0; nx < nImageWidth; nx++, pt += 2)
+{
+nLastPixel = (nLastPixel + pt[0]) & 0xFF;
+SetPixel(nY, nx, nLastPixel);
+
+nLastAlpha = (nLastAlpha + pt[1]) & 0xFF;
+SetPixelAlpha(nY, nx, ~nLastAlpha);
+}
+}
+else
+{
+sal_uInt32 nMinMax = ( ( 1 << 8 /*nDstBitsPerPixel*/ ) - 1 ) / 
( nMaxSampleValue - nMinSampleValue );
+for (sal_Int32 nx = 0; nx < nImageWidth; nx++, pt += 2)
+{
+SetPixel(nY, nx, static_cast( 
(static_cast(pt[0]) - nMinSampleValue) * nMinMax ));
+sal_uInt8 nAlpha = static_cast( 
(static_cast(pt[1]) - nMinSampleValue) * nMinMax );
+SetPixelAlpha(nY, nx, ~nAlpha);
+}
 }
 }
 }
@@ -1239,13 +1258,21 @@ void TIFFReader::ReadHeader()
 bool TIFFReader::HasAlphaChannel() const
 {
 /*There are undoubtedly more variants we could support, but keep it simple 
for now*/
-return (
- nDstBitsPerPixel == 24 &&
- nBitsPerSample == 8 &&
- nSamplesPerPixel >= 4 &&
- nPlanes == 1 &&
- nPhotometricInterpretation == 2
-   );
+bool bRGBA = nDstBitsPerPixel == 24 &&
+ nBitsPerSample == 8 &&
+ nSamplesPerPixel >= 4 &&
+ nPlanes == 1 &&
+ nPhotometricInterpretation == 2;
+if (bRGBA)
+return true;
+
+// additionally support the format used in tdf#126460
+bool bGrayScaleAlpha = nDstBitsPerPixel == 8 &&
+   nBitsPerSample == 8 &&
+   nSamplesPerPixel == 2 &&
+   nPlanarConfiguration == 1;
+
+return bGrayScaleAlpha;
 }
 
 namespace
@@ -1623,7 +1650,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 {
 for (sal_Int32 nX = 0; nX < nImageWidth; ++nX)
 {
-auto p = maBitmap.data() + 
((maBitmapPixelSize.Width() * nY + nX) * 3);
+auto p = maBitmap.data() + 
((maBitmapPixelSize.Width() * nY + nX) * (HasAlphaChannel() ? 4 : 3));
 auto c = SanitizePaletteIndex(*p, mvPalette);
 *p = c.GetRed();
 p++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 126340] Crash when removing entry in bullet list (change tracking involved)

[bugzilla-daemon]

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

Michael Stahl (CIB)  changed:

   What|Removed |Added

 Resolution|--- |FIXED
   Assignee|libreoffice-b...@lists.free |michael.st...@cib.de
   |desktop.org |
 Status|NEW |RESOLVED

--- Comment #5 from Michael Stahl (CIB)  ---
fixed on master

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

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/docedt.cxx|3 ++-
 sw/source/core/txtnode/ndtxt.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 91b344b0346347ac40d2d6fa03a03e92d2e9f252
Author: Michael Stahl 
AuthorDate: Mon Jul 22 19:27:11 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 23 10:57:32 2019 +0200

tdf#126340 sw_redlinehide: only move merged frames in JoinPrev

The problem was that the first and second node were not actually merged
by a redline, so moving the frames doesn't make sense.

(regression from 41d8ca9686c7c184f586e99674b443c34bfd4f33)

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

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 1388bdc1b53a..fad87aec561f 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -465,7 +465,8 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
 }
 // delete the Node, at last!
 SwNode::Merge const 
eOldMergeFlag(pOldTextNd->GetRedlineMergeFlag());
-if (eOldMergeFlag == SwNode::Merge::First)
+if (eOldMergeFlag == SwNode::Merge::First
+&& !pTextNd->IsCreateFrameWhenHidingRedlines())
 {
 sw::MoveDeletedPrevFrames(*pOldTextNd, *pTextNd);
 }
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 691c20f6490b..cced7186d49e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1126,7 +1126,8 @@ void SwTextNode::JoinPrev()
 pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, true );
 }
 SwNode::Merge const eOldMergeFlag(pTextNode->GetRedlineMergeFlag());
-if (eOldMergeFlag == SwNode::Merge::First)
+if (eOldMergeFlag == SwNode::Merge::First
+&& !IsCreateFrameWhenHidingRedlines())
 {
 sw::MoveDeletedPrevFrames(*pTextNode, *this);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 126340] Crash when removing entry in bullet list (change tracking involved)

[bugzilla-daemon]

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

--- Comment #4 from Commit Notification 
 ---
Michael Stahl committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/+/91b344b0346347ac40d2d6fa03a03e92d2e9f252%5E%21

tdf#126340 sw_redlinehide: only move merged frames in JoinPrev

It will be available in 6.4.0.

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

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

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

[Libreoffice-bugs] [Bug 126340] Crash when removing entry in bullet list (change tracking involved)

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:6.4.0

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

[Libreoffice-bugs] [Bug 126462] UI: 'autocorrect replacement table' bottom buttons positions have been changed

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

 CC||heiko.tietze@documentfounda
   ||tion.org
 Status|NEW |RESOLVED
 Resolution|--- |NOTABUG
   Keywords|needsUXEval |

--- Comment #4 from Heiko Tietze  ---
(In reply to Telesto from comment #3)
> Repro, but as far I'm concerned by design. The button order was incoherent
> previously and in line with any gui guidance for Windows. See bug 126036

Yes, this dialog was "welded" for 6.2 in patch
https://gerrit.libreoffice.org/#/c/64507/ and thereby the button order
corrected.

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

[Libreoffice-bugs] [Bug 121784] FILEOPEN DOCX Footnote and endnote changes are not opened as change in change control

[bugzilla-daemon]

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

Dieter Praas  changed:

   What|Removed |Added

 Status|RESOLVED|VERIFIED

--- Comment #13 from Dieter Praas  ---
Verified with

Version: 6.4.0.0.alpha0+ (x64)
Build ID: 8f98a7c4e5b1f0b249c026577805a378b8a533d5
CPU threads: 4; OS: Windows 10.0; UI render: GL; VCL: win; 
TinderBox: Win-x86_64@42, Branch:master, Time: 2019-07-23_00:30:19
Locale: de-DE (de_DE); UI-Language: en-US
Calc: threaded

One little problem remains: If you reject all changes in docx-file, empty
paragraphes remain (that's not the case with odt-file). But pershaps that's
another bug.

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