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

[Noel Grandin (via logerrit)]

 sc/inc/address.hxx  |   12 -
 sc/inc/compiler.hxx |1 
 sc/inc/refdata.hxx  |   27 +--
 sc/inc/reftokenhelper.hxx   |6 
 sc/inc/sharedformula.hxx|2 
 sc/inc/table.hxx|2 
 sc/inc/token.hxx|   10 -
 sc/qa/unit/mark_test.cxx|   12 -
 sc/qa/unit/ucalc.cxx|   14 -
 sc/qa/unit/ucalc_formula.cxx|   18 +-
 sc/qa/unit/ucalc_sharedformula.cxx  |2 
 sc/source/core/data/colorscale.cxx  |   12 -
 sc/source/core/data/column.cxx  |2 
 sc/source/core/data/column4.cxx |8 -
 sc/source/core/data/conditio.cxx|4 
 sc/source/core/data/documen4.cxx|   12 -
 sc/source/core/data/documentimport.cxx  |6 
 sc/source/core/data/formulacell.cxx |  115 ---
 sc/source/core/data/formulaiter.cxx |8 -
 sc/source/core/data/grouptokenconverter.cxx |4 
 sc/source/core/data/table7.cxx  |2 
 sc/source/core/tool/address.cxx |2 
 sc/source/core/tool/chartlis.cxx|6 
 sc/source/core/tool/compiler.cxx|  197 ++-
 sc/source/core/tool/consoli.cxx |4 
 sc/source/core/tool/detfunc.cxx |2 
 sc/source/core/tool/doubleref.cxx   |   13 +
 sc/source/core/tool/interpr1.cxx|   18 +-
 sc/source/core/tool/interpr2.cxx|   12 -
 sc/source/core/tool/interpr4.cxx|   22 +--
 sc/source/core/tool/rangenam.cxx|   24 +--
 sc/source/core/tool/refdata.cxx |   96 +++--
 sc/source/core/tool/reftokenhelper.cxx  |   20 +-
 sc/source/core/tool/refupdat.cxx|4 
 sc/source/core/tool/sharedformula.cxx   |   12 -
 sc/source/core/tool/token.cxx   |  202 ++--
 sc/source/filter/excel/excform8.cxx |4 
 sc/source/filter/excel/xeformula.cxx|2 
 sc/source/filter/lotus/lotform.cxx  |3 
 sc/source/ui/app/inputhdl.cxx   |8 -
 sc/source/ui/docshell/arealink.cxx  |2 
 sc/source/ui/docshell/dbdocfun.cxx  |4 
 sc/source/ui/docshell/dbdocimp.cxx  |2 
 sc/source/ui/docshell/docfunc.cxx   |   10 -
 sc/source/ui/docshell/docsh3.cxx|8 -
 sc/source/ui/docshell/docsh4.cxx|2 
 sc/source/ui/docshell/impex.cxx |8 -
 sc/source/ui/formdlg/formula.cxx|2 
 sc/source/ui/miscdlgs/anyrefdg.cxx  |6 
 sc/source/ui/unoobj/chart2uno.cxx   |   31 ++--
 sc/source/ui/view/gridwin.cxx   |8 -
 sc/source/ui/view/gridwin4.cxx  |2 
 sc/source/ui/view/select.cxx|4 
 sc/source/ui/view/tabview2.cxx  |   16 +-
 sc/source/ui/view/tabview3.cxx  |   12 -
 sc/source/ui/view/tabview4.cxx  |8 -
 sc/source/ui/view/tabvwsh3.cxx  |2 
 sc/source/ui/view/viewdata.cxx  |   32 ++--
 sc/source/ui/view/viewfun2.cxx  |2 
 sc/source/ui/view/viewfun3.cxx  |6 
 sc/source/ui/view/viewfun6.cxx  |8 -
 sc/source/ui/view/viewutil.cxx  |2 
 62 files changed, 551 insertions(+), 556 deletions(-)

New commits:
commit 5bcdbf03012e9d2754c3eb166bd5a01201406d9b
Author: Noel Grandin 
AuthorDate: Fri Dec 13 20:45:33 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Dec 14 06:57:53 2019 +0100

sc: rowcol: tdf#50916 convert Valid* methods

which means we end up passing around ScDocument*
__everywhere__

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

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 5a1f7d91f2ab..2109d582f67b 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -88,13 +88,13 @@ const SCCOL SC_TABSTART_NONE  = SCCOL_MAX;
 
 const SCROW MAXROW_30 = 8191;
 
-[[nodiscard]] inline bool ValidCol( SCCOL nCol, SCCOL nMaxCol = MAXCOL )
+[[nodiscard]] inline bool ValidCol( SCCOL nCol, SCCOL nMaxCol )
 {
 assert(nMaxCol == MAXCOL); // temporary to debug jumbo sheets work
 return nCol >= 0 && nCol <= nMaxCol;
 }
 
-[[nodiscard]] inline bool ValidRow( SCROW nRow, SCROW nMaxRow = MAXROW)
+[[nodiscard]] inline bool ValidRow( SCROW nRow, SCROW nMaxRow)
 {
 assert(nMaxRow == MAXROW); // temporary to debug jumbo sheets work
 return nRow >= 0 && nRow <= nMaxRow;
@@ -110,25 +110,25 @@ const SCROW MAXROW_30 = 8191;
 return nTab >= 0 && nTab <= nMaxTab;
 }
 
-[[nodiscard]] inline bool ValidColRow( SCCOL nCol, SCROW nRow, SCCOL nMaxCol = 
MAXCOL, SCROW nMaxRow = MAXROW )
+[[nodiscard]] inline bool ValidColRow( SCCOL nC

Re: [libreoffice-design] Minutes from the UX/design meeting 2019-DEC-12

[Kaganski Mike]

Dear Paul,

12 дек. 2019 г. 17:30 пользователь paul hofseth  написал:

Sirs,

please do not waste scarce coding resources on thoroughly trivial
matters like colours and signage, but rather on making the programs more
practical to use -  such as for instance having the choice of typeface
as a sdeparate item, not hidden inside the multiple format choices.
Risking ostracism fro monotounous suggestions, I repeat my wish for
sequential views of single pages with as little jumbling as possible of
text and illsustrations when proofreading long documents

Please do not waste scarce coding resources on thoroughly trivial
matters like telling others what to do, but rather on making the programs more
practical to use!

Why do I write this rather harsh statement? Not in the hope that you would 
start doing what I wrote, but to show you one important aspect that you seem to 
overlook. What would you do if you actually be denied of a way to contribute by 
expressing your opinions and wishes, and demanded to do something entirely 
different for the project? For most, such requirement would not mean they 
started contributing differently; that would mean they stopped contributing at 
all. Most people here contribute for one of two reasons: either being paid for 
the work by their employers/customers, or doing things they *can* for own 
enjoyment. Not everyone here likes or is able to do what you'd want them to do 
to fix your pet bug; and your expectation that if you deny someone of doing 
what *you* consider "trivial" would free the resources for a different task, 
are just plain wrong: instead of improving the areas you are interested in, we 
would simply loose those who love and able to contribute in areas *others* are 
interested in, nothing else.

By the way, I actually deem the importance of *your* contriburion (expressing 
your opinion about LibreOffice and its future, feeling for it, and proposing 
something) wery high. So please don't take the initial statement seriously, but 
just as a way to illustrate my point.

Best regards,

Mike Kaganski

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

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

[Mike Kaganski (via logerrit)]

 sw/source/uibase/docvw/FloatingTableButton.cxx |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit d170b73a6d75545ccb45ca58808573d03a1b0bec
Author: Mike Kaganski 
AuthorDate: Wed Dec 4 20:26:49 2019 +0300
Commit: Aron Budea 
CommitDate: Sat Dec 14 02:58:58 2019 +0100

tdf#129176: clear "TablePosition" grab bag when unfloating table

The operation explicitly changes the table to be not floating; this will
change its position; yet when saving back to DOCX, saved values from the
grab bag were used, incorrectly restoring table floating state.

Change-Id: I19c185849443dc1a8b5ac974e09349c206b0506b
Reviewed-on: https://gerrit.libreoffice.org/84446
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/84679
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/source/uibase/docvw/FloatingTableButton.cxx 
b/sw/source/uibase/docvw/FloatingTableButton.cxx
index e35c0de5f951..c18b6d485b52 100644
--- a/sw/source/uibase/docvw/FloatingTableButton.cxx
+++ b/sw/source/uibase/docvw/FloatingTableButton.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -35,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define TEXT_PADDING 3
 #define BOX_DISTANCE 3
@@ -108,6 +111,25 @@ void FloatingTableButton::MouseButtonDown(const 
MouseEvent& /*rMEvt*/)
 
 SwDoc& rDoc = *pTextFrame->GetTextNodeFirst()->GetDoc();
 
+// tdf#129176: clear "TablePosition" grab bag, since we explicitly change 
the position here
+// See DomainMapperTableHandler::endTableGetTableStyle, where the grab bag 
is filled, and
+// DocxAttributeOutput::TableDefinition that uses it on export
+SwFrameFormat* pTableFormat = pTableFrame->GetTable()->GetFrameFormat();
+assert(pTableFormat);
+if (const SfxGrabBagItem* pGrabBagItem = 
pTableFormat->GetAttrSet().GetItem(RES_FRMATR_GRABBAG))
+{
+SfxGrabBagItem aGrabBagItem(*pGrabBagItem); // Editable copy
+if (aGrabBagItem.GetGrabBag().erase("TablePosition"))
+{
+css::uno::Any aVal;
+aGrabBagItem.QueryValue(aVal);
+const auto xTable = SwXTextTable::CreateXTextTable(pTableFormat);
+const css::uno::Reference xSet(xTable, 
css::uno::UNO_QUERY);
+assert(xSet);
+xSet->setPropertyValue(UNO_NAME_TABLE_INTEROP_GRAB_BAG, aVal);
+}
+}
+
 // When we move the table before the first text node, we need to clear 
RES_PAGEDESC attribute
 // of the text node otherwise LO will create a page break after the table
 if (pTextFrame->GetTextNodeFirst())
___
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' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/uibase/docvw/FloatingTableButton.cxx |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit 40f6268c2a50d29e782a0bbdc828d4dfa9136c70
Author: Mike Kaganski 
AuthorDate: Wed Dec 4 20:26:49 2019 +0300
Commit: Aron Budea 
CommitDate: Sat Dec 14 02:58:43 2019 +0100

tdf#129176: clear "TablePosition" grab bag when unfloating table

The operation explicitly changes the table to be not floating; this will
change its position; yet when saving back to DOCX, saved values from the
grab bag were used, incorrectly restoring table floating state.

Change-Id: I19c185849443dc1a8b5ac974e09349c206b0506b
Reviewed-on: https://gerrit.libreoffice.org/84446
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/84680
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/source/uibase/docvw/FloatingTableButton.cxx 
b/sw/source/uibase/docvw/FloatingTableButton.cxx
index 598fc547d9aa..364611fbf80b 100644
--- a/sw/source/uibase/docvw/FloatingTableButton.cxx
+++ b/sw/source/uibase/docvw/FloatingTableButton.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -35,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define TEXT_PADDING 3
 #define BOX_DISTANCE 3
@@ -108,6 +111,25 @@ void FloatingTableButton::MouseButtonDown(const 
MouseEvent& /*rMEvt*/)
 
 SwDoc& rDoc = *pTextFrame->GetTextNode()->GetDoc();
 
+// tdf#129176: clear "TablePosition" grab bag, since we explicitly change 
the position here
+// See DomainMapperTableHandler::endTableGetTableStyle, where the grab bag 
is filled, and
+// DocxAttributeOutput::TableDefinition that uses it on export
+SwFrameFormat* pTableFormat = pTableFrame->GetTable()->GetFrameFormat();
+assert(pTableFormat);
+if (const SfxGrabBagItem* pGrabBagItem = 
pTableFormat->GetAttrSet().GetItem(RES_FRMATR_GRABBAG))
+{
+SfxGrabBagItem aGrabBagItem(*pGrabBagItem); // Editable copy
+if (aGrabBagItem.GetGrabBag().erase("TablePosition"))
+{
+css::uno::Any aVal;
+aGrabBagItem.QueryValue(aVal);
+const auto xTable = SwXTextTable::CreateXTextTable(pTableFormat);
+const css::uno::Reference xSet(xTable, 
css::uno::UNO_QUERY);
+assert(xSet);
+xSet->setPropertyValue(UNO_NAME_TABLE_INTEROP_GRAB_BAG, aVal);
+}
+}
+
 // When we move the table before the first text node, we need to clear 
RES_PAGEDESC attribute
 // of the text node otherwise LO will create a page break after the table
 if (pTextFrame->GetTextNode())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Benchmark results on mdds::multi_type_vector

[Kohei Yoshida]

On 13.12.2019 08:06, Kohei Yoshida wrote:

Hi Michael,

On 13.12.2019 03:32, Michael Meeks wrote:


Given the large wins, what would you think of the idea of pushing to
get this released early ? ;-)


Sure, I'm onboard with that. :-)  I just need to tie a few loose ends,
but once that's done, I can release a new version with this change in
& get it integrated.


I'll hold on to this for now.  See the other thread for the reasons.  We 
should at least discuss this more.


Kohei

--
Kohei Yoshida, LibreOffice Calc volunteer hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Benchmark results on mdds::multi_type_vector

[Kohei Yoshida]

On 13.12.2019 05:43, Luboš Luňák wrote:

On Friday 13 of December 2019, Kohei Yoshida wrote:

I just finished my benchmark testing on mdds::multi_type_vector, and
summarized my results in this blog post:

http://kohei.us/2019/12/12/benchmark-results-on-mdds-multi_type_vector/

Hopefully my findings and intepretations make sense.  In short, the
numbers look great.  The overhead of block shifting is a concern, but
I'm optimistic that this is going to be a non-issue for the most part.


 I'd really like to see benchmarks of Calc with this new mdds, 
especially to
see how many regressions there will be, as I'm concerned whether it 
really

would be worth it in reality.


Sure, I do share your concern, which is why I spent time designing and 
implementing the benchmark I did so that I can get some answers for my 
concern.


 You say that the vast majority of Calc
performance problems are with updating cell values without shifting, 
but that

makes sense because that's where the current bottleneck is. Once the
bottleneck moves to shifting of cells, we may get a whole new slew of
bugreports about that.


Sure, but that's just as much of a speculation as my own interpretation. 
 To be fair, it is possible that you are right, and I am wrong.  But I 
did provide my own interpretations of those numbers based on my own 
experience and educated guesses.  I'm not claiming that I'm right, but 
I'm claiming that what I concluded in my post is my truly honest, 
hopefully reasonably researched opinions.


E.g. copy&paste of a column is very likely to hit a
problem there, IIRC it internally results in a lot of shifting of 
cells.


Yes, which is why I ran the benchmarks to get some numbers to get more 
clarity.




 One interpretation of the graphs may be that the change helps a lot at 
the
cost of a regression in one place, but other possible interpretation is 
that
the change brings an improvement that can already be mostly achieved 
using
hints at the expense of a cost that cannot be alleviated. Moreover we 
did go
over all the reported performance problems related to mdds some months 
back
and fixed all of them (at least I'm not aware of any pending ones). So 
the
real question for me is how many of real-world cases will be improved 
and
worsened by this, which is why I'd like to see non-artifical 
benchmarks.


So, I'm a bit concerned about your use of the word "artificial" to 
describe my benchmark, because that word implies that I somehow made 
those numbers up.  Those are real numbers.  Now, the numbers will of 
course be quite different if you measure the entire Calc operations 
which include a whole bunch of other operations, and I believe this is 
what you are alluding to.  I do share your concern there.  But I thought 
it was reasonable to draw the conclusions that I did, given that the I/O 
with mdds::multi_type_vector do constitute a large part of Calc's cell 
I/O's.  Also, keep in mind that the rest of the Calc operations are 
constant, and the only variable is the mdds portion.  On this point, I 
believe it's not unreasonable to draw *some* conclusions based on the 
numbers on mdds alone.


Having said that, you are of course free to draw your own, different 
conclusions.


 BTW, I have you considered using vector operations like SSE for the 
updates

(either checking whether the compiler can employ them automatically or
hand-writing them)?


Yes.  For one, I did look into e.g. OpenMP's auto SIMD support.  But its 
support appeared to be very limited, and MSVC did not seem to support 
it.  I also thought about hand-writing SIMD directly, and I am still 
considering that as one of my future possibilities (note that I'm not 
entirely done with this work).  But I couldn't think of a good one to 
use, especially when multi_type_vector uses array of structures (AoS).  
SIMD intrinsics I know of are mostly not suitable for AoS.  If you know 
of good SIMD instinsics that may work for multi_type_vector, I would be 
interested.


I've done some SIMD coding in orcus to speed up XML and JSON parsing, 
but I can't say I'm expert at it, and I did not always manage to get the 
code to run faster with SIMD.


Alright, since now one person is raising objection on hastily 
integrating this piece, I should hold on to integrating this piece for 
now, and let the discussion continue.


And, while I would love to craft another benchmark test involving the 
entire Calc piece, I'm afraid I won't have enough bandwidth to do that.  
Even running this benchmark on mdds alone took me one month to do it 
end-to-end.  It would be nice to have someone else chip in and conduct 
another, more through and satisfactory benchmark test, if anybody is 
interested.


Thanks,

Kohei

--
Kohei Yoshida, LibreOffice Calc volunteer hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Fw: benchmark of Excel, Calc, Google Docs

[Aditya Parameswaran]

Michael,

We'd love to meet and discuss!  Unfortunately, a lot of us are off for
break starting next week so it might be best to sync up early next year.
Would week of the 6th work for you? 8am PT/10am CT/4pm GMT any day should
work!

> We started by having the relational database be a simple persistent
> > storage layer, when coupled with an index to retrieve data by position,
> > can allow us to scroll through large datasets of billions of rows at
> > ease. We developed a new positional index to handle insertions and
> > deletions in O(log(n)) -- https://arxiv.org/pdf/1708.06712.pdf. I agree
> > that pushing the computation to the relational database does have
> > overheads; but at the same time, it allows for scaling to arbitrarily
> > large datasets.
>
> Ooh - nice paper. Your crawled data-set looks quite interesting
> too, we
> run wide-scale crash-testing on the LibreOffice code-base across ~100k
> files and enlarging our corpus there: or better, getting some
> statistical view of which OOXML attributes (and thus features) are most
> used out there would be extremely useful to us as we develop the core.
>
> I like the data on spreadsheet and formula shape - that is very
> useful.
> Do you have data on the geometry of formulae - as in rows vs. columns ?
> [ we switched to columnar storage based mostly on experience rather than
> hard data ;-].
>
> It is also interesting to have access to very large (1.3m row)
> data-sets that can have useful analysis done on them - would love to see
> the source data there.
>

Again, this is something that we'd be happy to share; this might just take
a bit more work since it's an older codebase.
I believe we did use the geometry of the formulae to determine the best
storage representation, so it's there somewhere :-)

Sounds good, cf. above - if we can't make that - early in the new
> year
> would be great.
>
> I look forward to talking,
>

Likewise!

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

Re: Benchmark results on mdds::multi_type_vector

[Luboš Luňák]

On Friday 13 of December 2019, Kohei Yoshida wrote:
> I just finished my benchmark testing on mdds::multi_type_vector, and
> summarized my results in this blog post:
>
> http://kohei.us/2019/12/12/benchmark-results-on-mdds-multi_type_vector/
>
> Hopefully my findings and intepretations make sense.  In short, the
> numbers look great.  The overhead of block shifting is a concern, but
> I'm optimistic that this is going to be a non-issue for the most part.

 I'd really like to see benchmarks of Calc with this new mdds, especially to 
see how many regressions there will be, as I'm concerned whether it really 
would be worth it in reality. You say that the vast majority of Calc 
performance problems are with updating cell values without shifting, but that 
makes sense because that's where the current bottleneck is. Once the 
bottleneck moves to shifting of cells, we may get a whole new slew of 
bugreports about that. E.g. copy&paste of a column is very likely to hit a 
problem there, IIRC it internally results in a lot of shifting of cells.

 One interpretation of the graphs may be that the change helps a lot at the 
cost of a regression in one place, but other possible interpretation is that 
the change brings an improvement that can already be mostly achieved using 
hints at the expense of a cost that cannot be alleviated. Moreover we did go 
over all the reported performance problems related to mdds some months back 
and fixed all of them (at least I'm not aware of any pending ones). So the 
real question for me is how many of real-world cases will be improved and 
worsened by this, which is why I'd like to see non-artifical benchmarks.

 BTW, I have you considered using vector operations like SSE for the updates 
(either checking whether the compiler can employ them automatically or 
hand-writing them)?

-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [libreoffice-design] Minutes from the UX/design meeting 2019-DEC-12

[paul hofseth]

Sirs,

please do not waste scarce coding resources on thoroughly trivial 
matters like colours and signage, but rather on making the programs more 
practical to use -  such as for instance having the choice of typeface 
as a sdeparate item, not hidden inside the multiple format choices. 
Risking ostracism fro monotounous suggestions, I repeat my wish for 
sequential views of single pages with as little jumbling as possible of 
text and illsustrations when proofreading long documents


yours

ph
---
Paul Hofseth

Vestgrensa 11
Oslo
N 0851

t: +47 90890521

Den 2019-12-12 14:37, skrev Heiko Tietze:

Present: Heiko
Comments from: Dieter, Bogdan, Mike, Stuart

Tickets

 * Repeat shortcut (Ctrl+Shift+Y) is too far for short-finger users
using en (qwerty) keyboard
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129058
   + WFM (Heiko)
   + perhaps alt+Y (Stuart)
   + I always use TWO hands for that keyboard shortcuts =) (Roman)
   + keyboard issue for English, see also bug 115052 for other than 
English
   + Excel (or all MSO) uses F4 (or ctrl+Y) for "repeat last action" 
(but the

 same key also for redo)
   + shift+ctrl+r - cannot press it without hurting myself, ctrl+at+r 
works

   + alt+ should be reserved for hotkeys
   + keep it - common, usable (maybe not for everyone), consistent 
(Heiko)

   + more opinions needed (Roman)
   => no further input, WF

 * Page sidebar: "Same Content" on header/footer sections is
absolutely illogical
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129200
   + make it similar to the page dialog with checkboxes (Dieter)
   => go for it

 * PRINTING: Change The Color of Print Preview Active Page Border
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129235
   + greenish background, triangles or printer icons in the background,
 light blue frame, different shadow...
   => let's try

 * Draw menu entry: Shape or Shapes?
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129288
   + -1 (Heiko, Bogdan)
   + +1 (Stuart)
 + Shape --> Shapes, Sheet --> Sheets, Form --> Forms, Page 
(singular)

 + change all singular at once
   => trust the native speaker and do as Stuart suggest

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

Re: what jdk for build?

[Stephan Bergmann]

On 13/12/2019 19:48, Terrence Enger wrote:

I have accumulated a confusing number of jdk's, to the extent that I
am reduced to trying things at random.  I think that it would be good
to straighten these out before I ask about my failure building
LibreOffice Viewer.

My build for Linux has been working with
 --with-jdk-home=/usr/lib/jvm/default-java
which points to
 java-1.11.0-openjdk-amd64
which I believe simply comes with debian buster.

An early attempt to build Viewer for Android required a 32-bit jdk, so
I installed debian package
 openjdk-11-jdk:i386

Places on my system with bin/java which configure has accepted without
explicit error message as values for --with-jdk-home are
 /usr/lib/jvm/java-11-openjdk-amd64
 /usr/lib/jvm/java-11-openjdk-i386
 /usr/local/android-studio/jre

Advice welcome.


You appear to wonder whether you should be able to point --with-jdk-home 
to a 32-bit Java installation for a 64-bit LO build (on Linux).  No.  At 
least some tests run during the LO build would want to load libjvm.so 
from the specified --with-jdk-home (propagated via JAVA_HOME environment 
variable and UNO_JAVA_JFW_ENV_JREHOME bootstrap variable) into a 64-bit 
process, and fail.


I guess configure.ac doesn't check that a Java installation specified 
via --with-jdk-home matches the bitness of the LO build.  If that's the 
case, feel free to improve that if you see a need for it.


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit f12c5078facde462343ddfa2c8ed4edb0f5626c9
Author: Muhammet Kara 
AuthorDate: Fri Dec 13 16:02:17 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Dec 13 21:15:15 2019 +0100

tdf#129056: No need for catastrophe

We can continue working without hurting others
in case of an invalid reference.

Putting in a warning so that it doesn't become
a black hole which silences errors.

Change-Id: I6d75edeba227a4293b0ae16217811e49ae336a6b
Reviewed-on: https://gerrit.libreoffice.org/85111
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
(cherry picked from commit e290c3f3e233f03a0b13d19553c637f0a7070fbf)
Reviewed-on: https://gerrit.libreoffice.org/85130

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 32763beb02e7..31808b1a292b 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -72,8 +72,19 @@ ChartColorWrapper::ChartColorWrapper(
 
 void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor)
 {
+if (!mxModel.is())
+{
+SAL_WARN("chart2", "Invalid reference to mxModel");
+return;
+}
+
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
-assert(xPropSet.is());
+
+if (!xPropSet.is())
+{
+SAL_WARN("chart2", "Invalid reference to xPropSet");
+return;
+}
 
 xPropSet->setPropertyValue(maPropertyName, 
css::uno::makeAny(rColor.first));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/uiconfig

[andreas kainz (via logerrit)]

 sd/uiconfig/sdraw/ui/notebookbar.ui|  185 +-
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui|  183 +-
 sd/uiconfig/simpress/ui/notebookbar.ui |  175 +
 sd/uiconfig/simpress/ui/notebookbar_compact.ui |  761 +++--
 4 files changed, 974 insertions(+), 330 deletions(-)

New commits:
commit df42f27f3d455451e46a15d60e39e924a8d57ff7
Author: andreas kainz 
AuthorDate: Tue Dec 10 22:00:00 2019 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 13 21:02:30 2019 +0100

Draw/Impress add Extension support to Tabbed NB

Change-Id: I44ab4107a826ed14bec770a4367cfb8eee09d316
Reviewed-on: https://gerrit.libreoffice.org/84900
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit d755b2d4a3340f42a90d15d4795cc947a0b18e4a)
Reviewed-on: https://gerrit.libreoffice.org/85088

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index ff79272ca427..af2f48afa31b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -82,6 +82,30 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+AddonCommand
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+
+  
   
 True
 False
@@ -17298,7 +17322,7 @@
   
 
 
-  
+  
 True
 True
 end
@@ -18076,6 +18100,145 @@
 False
   
 
+
+  
+True
+False
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+  
+  
+False
+True
+1
+  
+
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
+end
+center
+True
+
+  
+True
+False
+center
+True
+vertical
+
+  
+E_xtension
+True
+True
+False
+False
+end
+center
+True
+none
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+end
+True
+both-horiz
+False
+1
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+False
+end
+1
+  
+
+
+  
+True
+False
+end
+5
+5
+vertical
+  
+   

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-4' - source/sl

[Andras Timar (via logerrit)]

 source/sl/cui/messages.po  |  462 
+-
 source/sl/desktop/messages.po  |   14 
 source/sl/helpcontent2/source/text/sbasic/shared/02.po |   28 
 source/sl/helpcontent2/source/text/scalc.po|6 
 source/sl/helpcontent2/source/text/scalc/01.po |   42 
 source/sl/helpcontent2/source/text/scalc/02.po |6 
 source/sl/helpcontent2/source/text/schart/02.po|   21 
 source/sl/helpcontent2/source/text/shared/00.po|   26 
 source/sl/helpcontent2/source/text/shared/01.po|   84 -
 source/sl/helpcontent2/source/text/shared/02.po|   40 
 source/sl/helpcontent2/source/text/shared/05.po|   10 
 source/sl/helpcontent2/source/text/simpress/01.po  |   26 
 source/sl/helpcontent2/source/text/simpress/02.po  |   50 -
 source/sl/helpcontent2/source/text/simpress/guide.po   |   10 
 source/sl/helpcontent2/source/text/swriter/01.po   |   66 -
 source/sl/helpcontent2/source/text/swriter/02.po   |   62 -
 source/sl/instsetoo_native/inc_openoffice/windows/msi_languages.po |   22 
 source/sl/sc/messages.po   |  164 +--
 source/sl/sd/messages.po   |   56 -
 source/sl/sfx2/messages.po |   18 
 source/sl/svx/messages.po  |   62 -
 source/sl/sw/messages.po   |   80 +
 22 files changed, 721 insertions(+), 634 deletions(-)

New commits:
commit 261aaf988574dc6cefcd5945c4051afafe8d1e87
Author: Andras Timar 
AuthorDate: Fri Dec 13 21:00:07 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 21:00:07 2019 +0100

Updated Slovenian translation

Change-Id: I5ff1a25ab9c71a0aba27f28b6d84e728a2872bed

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index f3c57e69fd9..f8cb01847ce 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2019-12-08 16:52+0100\n"
-"PO-Revision-Date: 2019-12-08 18:49+0200\n"
+"POT-Creation-Date: 2019-12-13 11:22+0100\n"
+"PO-Revision-Date: 2019-12-13 18:19+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -1780,1089 +1780,1119 @@ msgstr "S programom %PRODUCTNAME lahko ustvarite 
hibridne dokumente PDF, ki jih
 
 #: cui/inc/tipoftheday.hrc:51
 msgctxt "RID_CUI_TIPOFTHEDAY"
+msgid "Explore the ten different functions in the status bar (at the bottom of 
the document window). Place the cursor over each field for an explanation. If 
not visible, use View > Status Bar."
+msgstr "Raziščite deset različnih funkcij vrstice stanja (na dnu okna 
dokumenta). Postavite kazalec nad vsako polje in izpiše se pojasnilo. Če 
vrstice ni tam, uporabite ukaz Pogled > Vrstica stanja."
+
+#: cui/inc/tipoftheday.hrc:52
+msgctxt "RID_CUI_TIPOFTHEDAY"
 msgid "Want to sum a cell through several sheets? Refer to the range of sheets 
e.g. =SUM(Sheet1.A1:Sheet3.A1)."
 msgstr "Želite povzeti celico prek več delovnih listov? Glejte obseg delovnih 
listov, npr. =SUM(DelovniList1.A1:DelovniList3.A1)."
 
-#: cui/inc/tipoftheday.hrc:52
+#: cui/inc/tipoftheday.hrc:53
 msgctxt "RID_CUI_TIPOFTHEDAY"
 msgid "Create fillable form documents (even PDF's) with %PRODUCTNAME."
 msgstr "Z LibreOffice lahko izdelate dokumente kot obrazce, ki jih je moč 
izpolnjevati (tudi tovrstne PDF-je)."
 
-#: cui/inc/tipoftheday.hrc:53
+#: cui/inc/tipoftheday.hrc:54
 msgctxt "RID_CUI_TIPOFTHEDAY"
 msgid "Can't see all the text in a cell? Expand the input line in the formula 
bar and you can scroll."
 msgstr "Ne vidite vsega besedila celice? Razširite vnosno vrstico v vrstici za 
formulo in potem lahko drsite po vsebini."
 
-#: cui/inc/tipoftheday.hrc:54
+#: cui/inc/tipoftheday.hrc:55
 msgctxt "RID_CUI_TIPOFTHEDAY"
 msgid "You can easily optimize your table per Table > Size > Distribute Rows / 
Columns Evenly."
 msgstr "Svojo tabelo lahko enostavno optimizirate z ukazoma Tabela > Velikost 
> Enakomerno porazdeli vrstice/stolpce."
 
-#: cui/inc/tipoftheday.hrc:55
+#: cui/inc/tipoftheday.hrc:56
 msgctxt "RID_CUI_TIPOFTHEDAY"
 msgid "Find all expressions in brackets per Edit > Find & Replace > Find > 
\\([^)]+\\) (check ‘Regular expressions’)"
 msgstr "Vse izraze v oklepajih poiščete z Uredi > Najdi in zamenjaj > Najdi > 
\\([^)]+\\) (potrdite polje »Regularni izrazi«)."
 
-#: cui/inc/tipoftheday.hrc:56
+#: cui/inc/tipoftheday.hrc:57
 msgctxt "RID_CUI_TIPOFTHEDAY"
 msgid "Select a different icon set from Tools > Options

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

[Andras Timar (via logerrit)]

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

New commits:
commit 836007c3b5576096063bc836ec18293bd07775e7
Author: Andras Timar 
AuthorDate: Fri Dec 13 21:00:07 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Dec 13 21:00:15 2019 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-4'
  - Updated Slovenian translation

Change-Id: I5ff1a25ab9c71a0aba27f28b6d84e728a2872bed

diff --git a/translations b/translations
index f1d112cb4e51..261aaf988574 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f1d112cb4e51ad0e84d299b6e0afa2b8d60d004a
+Subproject commit 261aaf988574dc6cefcd5945c4051afafe8d1e87
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1ae9096cf5de023e8644484070efe472e2b255b
Author: Tamás Zolnai 
AuthorDate: Fri Dec 13 19:22:33 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Dec 13 20:11:34 2019 +0100

Impress: Slide is partly covered by the keyboard (on mobile)

This behavior was added in:
dd9aefd5d81839e5c9e2c6b8cc926fcf74380ba6

It was added to avoid zoom change when the mobile keyboard
comes up. We keep this behavior for Writer, but in case of
Impress we do a relayout when the keyboard is displayed, to
keep the slide centered.

Change-Id: I0d0f23824ff04afd0fd5f8919ccfaea7911551d2
Reviewed-on: https://gerrit.libreoffice.org/85132
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index af8a24fda..26afa6c71 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3047,7 +3047,7 @@ L.TileLayer = L.GridLayer.extend({
if (isNaN(this._docWidthTwips)) { return; }
var oldSize = e ? e.oldSize : this._map.getSize();
var newSize = e ? e.newSize : this._map.getSize();
-   if (newSize.x - oldSize.x === 0) { return; }
+   if (this._docType !== 'presentation' && newSize.x - oldSize.x 
=== 0) { return; }
 
var widthTwips = newSize.x * this._map.options.tileWidthTwips / 
this._tileSize;
var ratio = widthTwips / this._docWidthTwips;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

what jdk for build?

[Terrence Enger]

Hi,

I have accumulated a confusing number of jdk's, to the extent that I
am reduced to trying things at random.  I think that it would be good
to straighten these out before I ask about my failure building
LibreOffice Viewer.

My build for Linux has been working with
--with-jdk-home=/usr/lib/jvm/default-java
which points to 
java-1.11.0-openjdk-amd64
which I believe simply comes with debian buster.

An early attempt to build Viewer for Android required a 32-bit jdk, so
I installed debian package
openjdk-11-jdk:i386

Places on my system with bin/java which configure has accepted without
explicit error message as values for --with-jdk-home are
/usr/lib/jvm/java-11-openjdk-amd64
/usr/lib/jvm/java-11-openjdk-i386
/usr/local/android-studio/jre

Advice welcome.

I have not seen--or I have forgotten--direction about this on the
development wiki.  Is there a place where it should be?

Thank you for your attention,
Terry.


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

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

[Noel Grandin (via logerrit)]

 sc/inc/address.hxx |6 ++
 sc/inc/compiler.hxx|8 +--
 sc/inc/document.hxx|   44 
 sc/inc/token.hxx   |7 +-
 sc/inc/tokenarray.hxx  |8 ++-
 sc/qa/unit/ucalc.hxx   |2 
 sc/qa/unit/ucalc_formula.cxx   |   20 +++
 sc/source/core/data/documen2.cxx   |8 +--
 sc/source/core/tool/compiler.cxx   |   66 -
 sc/source/core/tool/interpr2.cxx   |6 +-
 sc/source/core/tool/interpr4.cxx   |   14 ++---
 sc/source/core/tool/reftokenhelper.cxx |8 +--
 sc/source/core/tool/token.cxx  |   86 ++---
 sc/source/ui/unoobj/chart2uno.cxx  |   10 +--
 14 files changed, 177 insertions(+), 116 deletions(-)

New commits:
commit 113444f59dc7690850919155b9b164b1a686bbe7
Author: Noel Grandin 
AuthorDate: Fri Dec 13 15:59:51 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 13 19:41:59 2019 +0100

sc: rowcol: tdf#50916 create ScSheetLimits to hold by rtl::Reference

ScTokenArray sometimes outlives the ScDocument that created it, which
means it accesses dead data when it tries to validate columns and rows.

So create the ScSheetLimits class, which ScTokenArray can hold by
reference counted pointer.

Change-Id: Ic5771734fe4962d12f024fc1b29232124c14208a
Reviewed-on: https://gerrit.libreoffice.org/85117
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 1d6680cb8ebf..5a1f7d91f2ab 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -90,11 +90,13 @@ const SCROW MAXROW_30 = 8191;
 
 [[nodiscard]] inline bool ValidCol( SCCOL nCol, SCCOL nMaxCol = MAXCOL )
 {
+assert(nMaxCol == MAXCOL); // temporary to debug jumbo sheets work
 return nCol >= 0 && nCol <= nMaxCol;
 }
 
 [[nodiscard]] inline bool ValidRow( SCROW nRow, SCROW nMaxRow = MAXROW)
 {
+assert(nMaxRow == MAXROW); // temporary to debug jumbo sheets work
 return nRow >= 0 && nRow <= nMaxRow;
 }
 
@@ -110,21 +112,25 @@ const SCROW MAXROW_30 = 8191;
 
 [[nodiscard]] inline bool ValidColRow( SCCOL nCol, SCROW nRow, SCCOL nMaxCol = 
MAXCOL, SCROW nMaxRow = MAXROW )
 {
+assert(nMaxRow == MAXROW); // temporary to debug jumbo sheets work
 return ValidCol(nCol,nMaxCol) && ValidRow(nRow,nMaxRow);
 }
 
 [[nodiscard]] inline bool ValidColRowTab( SCCOL nCol, SCROW nRow, SCTAB nTab, 
SCCOL nMaxCol = MAXCOL, SCROW nMaxRow = MAXROW )
 {
+assert(nMaxRow == MAXROW); // temporary to debug jumbo sheets work
 return ValidCol(nCol,nMaxCol) && ValidRow(nRow,nMaxRow) && ValidTab( nTab);
 }
 
 [[nodiscard]] inline SCCOL SanitizeCol( SCCOL nCol, SCCOL nMaxCol = MAXCOL )
 {
+assert(nMaxCol == MAXCOL); // temporary to debug jumbo sheets work
 return nCol < 0 ? 0 : (nCol > nMaxCol ? nMaxCol : nCol);
 }
 
 [[nodiscard]] inline SCROW SanitizeRow( SCROW nRow, SCROW nMaxRow = MAXROW )
 {
+assert(nMaxRow == MAXROW); // temporary to debug jumbo sheets work
 return nRow < 0 ? 0 : (nRow > nMaxRow ? nMaxRow : nRow);
 }
 
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index dce569c2b68a..623f94945943 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -39,6 +39,8 @@
 
 #include 
 
+struct ScSheetLimits;
+
 // constants and data types also for external modules (ScInterpreter et al)
 
 #define MAXSTRLEN1024   /* maximum length of input string of one symbol */
@@ -167,7 +169,7 @@ public:
  */
 bool IsValidReference(const ScDocument* pDoc) const;
 
-formula::FormulaToken* CreateToken(const ScDocument* pDoc) const;   // 
create typified token
+formula::FormulaToken* CreateToken(ScSheetLimits& rLimits) const;   // 
create typified token
 };
 
 class SC_DLLPUBLIC ScCompiler : public formula::FormulaCompiler
@@ -189,7 +191,7 @@ public:
 virtual ~Convention();
 
 virtual void makeRefStr(
-const ScDocument* pDoc,
+ScSheetLimits& rLimits,
 OUStringBuffer& rBuffer,
 formula::FormulaGrammar::Grammar eGram,
 const ScAddress& rPos,
@@ -220,7 +222,7 @@ public:
 const OUString& rTabName, const ScSingleRefData& rRef ) const = 0;
 
 virtual void makeExternalRefStr(
-const ScDocument* pDoc,
+ScSheetLimits& rLimits,
 OUStringBuffer& rBuffer, const ScAddress& rPos,
 sal_uInt16 nFileId, const OUString& rFileName, const 
std::vector& rTabNames,
 const OUString& rTabName, const ScComplexRefData& rRef ) const = 0;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e160c8d4b735..94c9b2820c17 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_INC_DOCUMENT_HXX
 #define INCLUDED_SC_INC_DOCUMENT_HXX
 
+#include 
 #include 
 #include 
 #include 
@@ -280,6 +281,25 @@ const sal_uInt8 SC_DDE

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5f7987cef5133d7207b09c0c523289bff06f6241
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 12:47:54 2019 +
Commit: Xisco Faulí 
CommitDate: Fri Dec 13 19:24:22 2019 +0100

Resolves: tdf#129346 if nothing currently selected, select something

in the slidesorter

Change-Id: I66853ba56eab93dfb18de7496212eb64e97cd2bf
Reviewed-on: https://gerrit.libreoffice.org/85109
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index 0d4b23ff8dfe..bacf5fdf0323 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -112,7 +112,7 @@ void SelectionObserver::EndObservation()
 PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector());
 PageSelector::UpdateLock aUpdateLock (mrSlideSorter);
 rSelector.DeselectAllPages();
-if ( ! maInsertedPages.empty())
+if (!maInsertedPages.empty())
 {
 // Select the inserted pages.
 for (const auto& rpPage : maInsertedPages)
@@ -121,6 +121,12 @@ void SelectionObserver::EndObservation()
 }
 maInsertedPages.clear();
 }
+else
+{
+// tdf#129346 nothing currently selected, select something, if possible
+if (rSelector.GetPageCount())
+rSelector.SelectPage(0);
+}
 
 aUpdateLock.Release();
 
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/solvrdlg.hxx  |2 +
 sc/source/ui/miscdlgs/solvrdlg.cxx |   49 +
 2 files changed, 20 insertions(+), 31 deletions(-)

New commits:
commit a54b3e8b8b7bf063117eaed19a590ce6c8a14e07
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 13:31:57 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 17:51:33 2019 +0100

Resolves: tdf#128077 cancel goalseek subdialogs on forced removal

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

diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 3fcadd881e0a..66a031fbd041 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -72,6 +72,8 @@ private:
 std::unique_ptr m_xBtnOk;
 std::unique_ptr m_xBtnCancel;
 
+std::shared_ptr m_xMessageBox;
+
 voidInit();
 boolCheckTargetValue( const OUString& rStrVal );
 voidRaiseError( ScSolverErr eError );
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx 
b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 6608ea8e9488..729d73fee034 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -31,17 +31,6 @@
 #include 
 #include 
 
-namespace
-{
-void lclErrorDialog(weld::Window* pParent, const OUString& rString, const 
std::function& func)
-{
-std::shared_ptr 
xBox(Application::CreateMessageDialog(pParent,
-  VclMessageType::Warning, 
VclButtonsType::Ok,
-  rString));
-xBox->runAsync(xBox, func);
-}
-}
-
 ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* 
pParent,
   ScDocument* pDocument,
   const ScAddress& aCursorPos )
@@ -76,6 +65,9 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pP
 
 ScSolverDlg::~ScSolverDlg()
 {
+if (m_xMessageBox)
+m_xMessageBox->response(RET_CANCEL);
+assert(!m_xMessageBox);
 }
 
 void ScSolverDlg::Init()
@@ -152,36 +144,31 @@ void ScSolverDlg::SetReference( const ScRange& rRef, 
ScDocument& rDocP )
 
 void ScSolverDlg::RaiseError( ScSolverErr eError )
 {
-switch ( eError )
+OUString sMessage;
+
+switch (eError)
 {
 case SOLVERR_NOFORMULA:
-lclErrorDialog(m_xDialog.get(), errMsgNoFormula,
-[this](sal_Int32 /*nResult*/) {
-m_xEdFormulaCell->GrabFocus();
-});
+sMessage = errMsgNoFormula;
 break;
-
 case SOLVERR_INVALID_FORMULA:
-lclErrorDialog(m_xDialog.get(), errMsgInvalidForm,
-[this](sal_Int32 /*nResult*/) {
-m_xEdFormulaCell->GrabFocus();
-});
+sMessage = errMsgInvalidForm;
 break;
-
 case SOLVERR_INVALID_VARIABLE:
-lclErrorDialog(m_xDialog.get(), errMsgInvalidVar,
-[this](sal_Int32 /*nResult*/) {
-m_xEdVariableCell->GrabFocus();
-});
+sMessage = errMsgInvalidVar;
 break;
-
 case SOLVERR_INVALID_TARGETVALUE:
-lclErrorDialog(m_xDialog.get(), errMsgInvalidVal,
-[this](sal_Int32 /*nResult*/) {
-m_xEdTargetVal->grab_focus();
-});
+sMessage = errMsgInvalidVal;
 break;
 }
+
+m_xMessageBox.reset(Application::CreateMessageDialog(m_xDialog.get(),
+ 
VclMessageType::Warning, VclButtonsType::Ok,
+ sMessage));
+m_xMessageBox->runAsync(m_xMessageBox, [this](sal_Int32 /*nResult*/) {
+m_xEdTargetVal->grab_focus();
+m_xMessageBox.reset();
+});
 }
 
 bool ScSolverDlg::IsRefInputMode() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/source/ui/dlg/PaneChildWindows.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 418b6589752525a9937089a73f0e116109b27657
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 14:31:33 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 17:51:18 2019 +0100

Resolves: tdf#129347 ensure impress docking window has enabled input

the default inputmode is taken from the parent, if the templates dialog is 
open
when the sidebar is created then the template dialog has set the toplevel
window disabled-input

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

diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx 
b/sd/source/ui/dlg/PaneChildWindows.cxx
index d4d4bab39d5d..b44e128823bf 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -50,7 +50,9 @@ PaneChildWindow::PaneChildWindow (
 pParentWindow,
 SdResId(pTitleBarResId)));
 SetAlignment(SfxChildAlignment::LEFT);
-static_cast(GetWindow())->Initialize(pInfo);
+SfxDockingWindow* pDockingWindow = 
static_cast(GetWindow());
+pDockingWindow->EnableInput();
+pDockingWindow->Initialize(pInfo);
 SetHideNotDelete(true);
 
 ViewShellBase* pBase = 
ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/map/handler/Map.Keyboard.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 31730de94731ad1aa8e55633129e80aded63ed62
Author: Tor Lillqvist 
AuthorDate: Fri Dec 13 16:51:05 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 13 16:47:20 2019 +0100

Improve comments what some keyCode values actually mean

67, 88, 99, and 120 are simply the code points of the 'C', 'X', 'c',
and 'x' letters in decimal.

Change-Id: I3428bb44a3d41b3ff774ac963ea85c3a2e11a4b6
Reviewed-on: https://gerrit.libreoffice.org/85123
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index c5f7fc4f6..4c9e8e9b2 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -488,10 +488,10 @@ L.Map.Keyboard = L.Handler.extend({
return true;
}
return false;
-   case 67: // c
-   case 88: // x
-   case 99: // c (Safari)
-   case 120: // x (Safari)
+   case 67: // 'C'
+   case 88: // 'X'
+   case 99: // 'c'
+   case 120: // 'x'
case 91: // Left Cmd (Safari)
case 93: // Right Cmd (Safari)
// we prepare for a copy or cut event
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Menubar.js  |2 +-
 loleaflet/src/control/Toolbar.js  |2 +-
 loleaflet/src/core/Socket.js  |3 ++-
 loleaflet/src/layer/tile/TileLayer.js |   24 +++-
 loleaflet/src/map/Map.js  |3 ++-
 loleaflet/src/map/handler/Map.Keyboard.js |   15 +++
 6 files changed, 36 insertions(+), 13 deletions(-)

New commits:
commit a985664f713331f2a2c534b55f2318ef66d549e3
Author: Tor Lillqvist 
AuthorDate: Fri Dec 13 17:05:25 2019 +0200
Commit: Michael Meeks 
CommitDate: Fri Dec 13 16:47:43 2019 +0100

tdf#129328 Try to make Copy/Paste work sanely in the iOS app again

We don't want any of the stuff in loleaflet/src/map/Clipboard.js to be
involved at all. On iOS we have an interface to the system clipboard
in core. Just use that. No need to keep any local cached clipboard in
the Javascript. No "download" involved. Just let .uno:Cut etc do their
job. Keep the _clip attribute property of the L.Map object undefined
on iOS, and check if before trying to use it.

As such I couldn't exactly reproduce the problem in the bug report,
but hopefully this works.

Change-Id: I2623221b87e729bb60e34f40ed42d5f499c4c25f
Reviewed-on: https://gerrit.libreoffice.org/85124
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 2b8af4510..d5d990095 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1173,7 +1173,7 @@ L.Control.Menubar = L.Control.extend({
// Toggle between showing master page and closing it.
unoCommand = ($(item).hasClass('lo-menu-item-checked') 
? '.uno:CloseMasterView' : '.uno:SlideMasterPage');
}
-   else if (this._map._clip.filterExecCopyPaste(unoCommand)) {
+   else if (this._map._clip && 
this._map._clip.filterExecCopyPaste(unoCommand)) {
return;
}
 
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 1a353ff67..1dd4b37f3 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -442,7 +442,7 @@ L.Map.include({
if (this.hyperlinkUnderCursor && this.hyperlinkUnderCursor.text 
&& this.hyperlinkUnderCursor.link) {
text = this.hyperlinkUnderCursor.text;
link = this.hyperlinkUnderCursor.link;
-   } else if (this._clip._selectionType == 'text') {
+   } else if (this._clip && this._clip._selectionType == 'text') {
text = 
this.extractContent(this._clip._selectionContent);
}
 
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 38c175d57..706234980 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -311,7 +311,8 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('clipboardkey: ')) {
var key = textMsg.substring('clipboardkey: '.length);
-   this._map._clip.setKey(key);
+   if (this._map._clip)
+   this._map._clip.setKey(key);
}
else if (textMsg.startsWith('perm:')) {
var perm = textMsg.substring('perm:'.length);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 491d14731..af8a24fda 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -595,7 +595,8 @@ L.TileLayer = L.GridLayer.extend({
this._onTextSelectionMsg(textMsg);
}
else if (textMsg.startsWith('textselectioncontent:')) {
-   
this._map._clip.setTextSelectionHTML(textMsg.substr(22));
+   if (this._map._clip)
+   
this._map._clip.setTextSelectionHTML(textMsg.substr(22));
}
else if (textMsg.startsWith('textselectionend:')) {
this._onTextSelectionEndMsg(textMsg);
@@ -610,7 +611,8 @@ L.TileLayer = L.GridLayer.extend({
this._onCellAutoFillAreaMsg(textMsg);
}
else if (textMsg.startsWith('complexselection:')) {
-   
this._map._clip.onComplexSelection(textMsg.substr('complexselection:'.length));
+   if (this._map._clip)
+   
this._map._clip.onComplexSelection(textMsg.substr('complexselection:'.length));
}
else if (textMsg.startsWith('tile:')) {
this._onTileMsg(textMsg, img);
@@ -730,7 +732,7 @@ L.TileLayer = L.GridLayer.extend({

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

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit e290c3f3e233f03a0b13d19553c637f0a7070fbf
Author: Muhammet Kara 
AuthorDate: Fri Dec 13 16:02:17 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Dec 13 16:43:07 2019 +0100

tdf#129056: No need for catastrophe

We can continue working without hurting others
in case of an invalid reference.

Putting in a warning so that it doesn't become
a black hole which silences errors.

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

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 32763beb02e7..31808b1a292b 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -72,8 +72,19 @@ ChartColorWrapper::ChartColorWrapper(
 
 void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor)
 {
+if (!mxModel.is())
+{
+SAL_WARN("chart2", "Invalid reference to mxModel");
+return;
+}
+
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
-assert(xPropSet.is());
+
+if (!xPropSet.is())
+{
+SAL_WARN("chart2", "Invalid reference to xPropSet");
+return;
+}
 
 xPropSet->setPropertyValue(maPropertyName, 
css::uno::makeAny(rColor.first));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/toolbar.css |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a62e26a35b0e710657358ca37f484f750c43bbc4
Author: Pedro Pinto Silva 
AuthorDate: Fri Dec 13 16:10:07 2019 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Fri Dec 13 16:12:21 2019 +0100

toolbarstatus:language:w2ui-tb-caption: Reset float that was causing 
misalignment

Change-Id: I23ff1c44a2a110d84a0899b982b1cee566011ad3
Reviewed-on: https://gerrit.libreoffice.org/85126
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 1b3ea4c13..485a8dfb0 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -30,6 +30,9 @@
 #tb_actionbar_item_LanguageStatus table table td:first-of-type{
min-width: max-content !important;
 }
+#tb_actionbar_item_LanguageStatus .w2ui-tb-caption{
+   float: none;
+}
 #document-signing-bar {
background-color: #ef324e;;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit a0b6524fb369c11b5684b37f3328ef6efe5e07ba
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 11 19:32:55 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 16:08:24 2019 +0100

Revert "Enable/Disable of children shouldn't be necessary"

This currently breaks the child sensitivity handling of frames
used in the PDF export, when toggling the form export check box.
I also tried to add a set_sensitive to SalInstanceContainer,
but that didn't work.

I found this while debugging tdf#127493, but I'm don't know, this
is the correct fix wrt welding.

This reverts commit 1d69cf32a73c0720882731ebf3eb5d2f07fce246.

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 920e8e7765e9..133ddca2ed6c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -315,7 +315,7 @@ public:
 
 virtual void set_sensitive(bool sensitive) override
 {
-m_xWidget->Enable(sensitive, false);
+m_xWidget->Enable(sensitive);
 }
 
 virtual bool get_sensitive() const override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

 wsd/DocumentBroker.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 97ee22a8ffb17030fea9b094f13ffdc7d5a3b4e5
Author: Andras Timar 
AuthorDate: Fri Dec 13 16:03:26 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 16:05:52 2019 +0100

fix error: declaration of ‘load’ shadows a member of 'this' [-Werror=shadow]

Change-Id: I4bd4fb3ae6f01c0d03d622f90e1dfb872c396494

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 77204dd69..fecea32bc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2244,8 +2244,8 @@ bool ConvertToBroker::startConversion(SocketDisposition 
&disposition, const std:
  // Load the document manually and request saving in the 
target format.
  std::string encodedFrom;
  Poco::URI::encode(docBroker->getPublicUri().getPath(), 
"", encodedFrom);
- const std::string load = "load url=" + encodedFrom;
- std::vector loadRequest(load.begin(), load.end());
+ const std::string _load = "load url=" + encodedFrom;
+ std::vector loadRequest(_load.begin(), _load.end());
  docBroker->_clientSession->handleMessage(true, 
WSOpCode::Text, loadRequest);
 
  // Save is done in the setLoaded
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4.2.0-1'

[Andras Timar (via logerrit)]

Tag 'CODE-4.2.0-1' created by Andras Timar  at 
2019-12-13 15:05 +

CODE-4.2.0-1

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - wsd/DocumentBroker.cpp

[Andras Timar (via logerrit)]

 wsd/DocumentBroker.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 141baf6f6a0242f3e21f37f8a8b3aea21d25448e
Author: Andras Timar 
AuthorDate: Fri Dec 13 16:03:26 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 16:03:26 2019 +0100

fix error: declaration of ‘load’ shadows a member of 'this' [-Werror=shadow]

Change-Id: I4bd4fb3ae6f01c0d03d622f90e1dfb872c396494

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 77204dd69..fecea32bc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2244,8 +2244,8 @@ bool ConvertToBroker::startConversion(SocketDisposition 
&disposition, const std:
  // Load the document manually and request saving in the 
target format.
  std::string encodedFrom;
  Poco::URI::encode(docBroker->getPublicUri().getPath(), 
"", encodedFrom);
- const std::string load = "load url=" + encodedFrom;
- std::vector loadRequest(load.begin(), load.end());
+ const std::string _load = "load url=" + encodedFrom;
+ std::vector loadRequest(_load.begin(), _load.end());
  docBroker->_clientSession->handleMessage(true, 
WSOpCode::Text, loadRequest);
 
  // Save is done in the setLoaded
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'refs/tags/CODE-4.2.0-1' - 0 commits -

[(via logerrit)]

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

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

[Jan Holesovsky (via logerrit)]

 android/app/build.gradle   
|1 
 android/app/src/main/AndroidManifest.xml   
|   10 +
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |   18 +-
 android/app/src/main/res/values/strings.xml
|2 +
 android/app/src/main/res/xml/provider_paths.xml
|5 ++
 5 files changed, 27 insertions(+), 9 deletions(-)

New commits:
commit 468595e949118cb894d12cc3c210ff70f3d970db
Author: Jan Holesovsky 
AuthorDate: Fri Dec 13 15:47:37 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Dec 13 15:53:04 2019 +0100

tdf#129192: Implement sharing from the shell.

The old code cannot work on newer Android.

Partially based on work by Kaishu Sahu, thank you!

Change-Id: I15e3f583572285642bc47595c21f4469f5a544a1
Reviewed-on: https://gerrit.libreoffice.org/85121
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 6e8ebc5f87e62a391cfca0429c6c4bea7f6ccbfb)
Reviewed-on: https://gerrit.libreoffice.org/85122

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 158ea2ddf..2a8c7e2e1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -58,6 +58,7 @@ repositories {
 dependencies {
 implementation fileTree(dir: 'libs', include: ['*.jar'])
 implementation 'androidx.appcompat:appcompat:1.0.2'
+implementation 'androidx.core:core:1.0.2'
 implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 implementation 'androidx.recyclerview:recyclerview:1.0.0'
 implementation 'com.google.android.material:material:1.1.0-alpha04'
diff --git a/android/app/src/main/AndroidManifest.xml 
b/android/app/src/main/AndroidManifest.xml
index fb584befd..8a501c8a0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -126,6 +126,16 @@
 android:name=".SettingsActivity"
 android:label="@string/app_name_settings"
 android:theme="@style/Theme.AppCompat.Light" />
+
+
+
+
 
 
 
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 167ae17c1..60273b622 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -92,6 +92,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 import androidx.core.view.ViewCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -730,7 +731,6 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 }
 
 private void share(int position) {
-
 new AsyncTask() {
 @Override
 protected File doInBackground(IFile... document) {
@@ -755,14 +755,14 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 @Override
 protected void onPostExecute(File file) {
 if (file != null) {
-Intent sharingIntent = new 
Intent(android.content.Intent.ACTION_SEND);
-Uri uri = Uri.fromFile(file);
-
sharingIntent.setType(FileUtilities.getMimeType(file.getName()));
-
sharingIntent.putExtra(android.content.Intent.EXTRA_STREAM, uri);
-
sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT,
-file.getName());
-startActivity(Intent.createChooser(sharingIntent,
-getString(R.string.share_via)));
+Intent intentShareFile = new Intent(Intent.ACTION_SEND);
+Uri finalDocUri = 
FileProvider.getUriForFile(LibreOfficeUIActivity.this,
+
LibreOfficeUIActivity.this.getApplicationContext().getPackageName() + 
".fileprovider",
+file);
+intentShareFile.putExtra(Intent.EXTRA_STREAM, finalDocUri);
+
intentShareFile.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+intentShareFile.setDataAndType(finalDocUri, 
LibreOfficeUIActivity.this.getContentResolver().getType(finalDocUri));
+
LibreOfficeUIActivity.this.startActivity(Intent.createChooser(intentShareFile, 
LibreOfficeUIActivity.this.getString(R.string.share_document)));
 }
 }
 }.execute(filePaths.get(position));
diff -

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - android/app

[Jan Holesovsky (via logerrit)]

 android/app/build.gradle   
|1 
 android/app/src/main/AndroidManifest.xml   
|   10 +
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |   18 +-
 android/app/src/main/res/values/strings.xml
|2 +
 android/app/src/main/res/xml/provider_paths.xml
|5 ++
 5 files changed, 27 insertions(+), 9 deletions(-)

New commits:
commit 6e8ebc5f87e62a391cfca0429c6c4bea7f6ccbfb
Author: Jan Holesovsky 
AuthorDate: Fri Dec 13 15:47:37 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Dec 13 15:50:54 2019 +0100

tdf#129192: Implement sharing from the shell.

The old code cannot work on newer Android.

Partially based on work by Kaishu Sahu, thank you!

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 158ea2ddf..2a8c7e2e1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -58,6 +58,7 @@ repositories {
 dependencies {
 implementation fileTree(dir: 'libs', include: ['*.jar'])
 implementation 'androidx.appcompat:appcompat:1.0.2'
+implementation 'androidx.core:core:1.0.2'
 implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 implementation 'androidx.recyclerview:recyclerview:1.0.0'
 implementation 'com.google.android.material:material:1.1.0-alpha04'
diff --git a/android/app/src/main/AndroidManifest.xml 
b/android/app/src/main/AndroidManifest.xml
index fb584befd..8a501c8a0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -126,6 +126,16 @@
 android:name=".SettingsActivity"
 android:label="@string/app_name_settings"
 android:theme="@style/Theme.AppCompat.Light" />
+
+
+
+
 
 
 
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 167ae17c1..60273b622 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -92,6 +92,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 import androidx.core.view.ViewCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -730,7 +731,6 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 }
 
 private void share(int position) {
-
 new AsyncTask() {
 @Override
 protected File doInBackground(IFile... document) {
@@ -755,14 +755,14 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 @Override
 protected void onPostExecute(File file) {
 if (file != null) {
-Intent sharingIntent = new 
Intent(android.content.Intent.ACTION_SEND);
-Uri uri = Uri.fromFile(file);
-
sharingIntent.setType(FileUtilities.getMimeType(file.getName()));
-
sharingIntent.putExtra(android.content.Intent.EXTRA_STREAM, uri);
-
sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT,
-file.getName());
-startActivity(Intent.createChooser(sharingIntent,
-getString(R.string.share_via)));
+Intent intentShareFile = new Intent(Intent.ACTION_SEND);
+Uri finalDocUri = 
FileProvider.getUriForFile(LibreOfficeUIActivity.this,
+
LibreOfficeUIActivity.this.getApplicationContext().getPackageName() + 
".fileprovider",
+file);
+intentShareFile.putExtra(Intent.EXTRA_STREAM, finalDocUri);
+
intentShareFile.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+intentShareFile.setDataAndType(finalDocUri, 
LibreOfficeUIActivity.this.getContentResolver().getType(finalDocUri));
+
LibreOfficeUIActivity.this.startActivity(Intent.createChooser(intentShareFile, 
LibreOfficeUIActivity.this.getString(R.string.share_document)));
 }
 }
 }.execute(filePaths.get(position));
diff --git a/android/app/src/main/res/values/strings.xml 
b/android/app/src/main/res/values/strings.xml
index 033ae98c2..12f65fc11 10

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/optsolver.hxx  |4 
 sc/source/ui/inc/solveroptions.hxx  |6 ++
 sc/source/ui/miscdlgs/optsolver.cxx |   12 
 sc/source/ui/miscdlgs/solveroptions.cxx |   28 ++--
 4 files changed, 36 insertions(+), 14 deletions(-)

New commits:
commit dff70ffce88b69a1d75036abb6a9e28cfd51c315
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 13:04:43 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 15:44:09 2019 +0100

cancel solver subdialogs on forced removal

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

diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 3208416989a4..d5586172c0fa 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -86,6 +86,8 @@ public:
 { return maProperties; }
 };
 
+class ScSolverOptionsDialog;
+
 class ScOptSolverDlg : public ScAnyRefDlgController
 {
 public:
@@ -179,6 +181,8 @@ private:
 std::unique_ptr m_xResultFT;
 std::unique_ptr m_xContents;
 
+std::shared_ptr m_xOptDlg;
+
 voidInit(const ScAddress& rCursorPos);
 boolCallSolver();
 voidReadConditions();
diff --git a/sc/source/ui/inc/solveroptions.hxx 
b/sc/source/ui/inc/solveroptions.hxx
index 41875a07b7d5..3ad4891d7a02 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -52,6 +52,9 @@ public:
 void  SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = 
nNew; }
 };
 
+class ScSolverIntegerDialog;
+class ScSolverValueDialog;
+
 class ScSolverOptionsDialog : public weld::GenericDialogController
 {
 css::uno::Sequence maImplNames;
@@ -65,6 +68,9 @@ class ScSolverOptionsDialog : public 
weld::GenericDialogController
 std::unique_ptr m_xLbSettings;
 std::unique_ptr m_xBtnEdit;
 
+std::shared_ptr m_xIntDialog;
+std::shared_ptr m_xValDialog;
+
 DECL_LINK( EngineSelectHdl, weld::ComboBox&, void );
 DECL_LINK( SettingsSelHdl, weld::TreeView&, void );
 DECL_LINK( SettingsDoubleClickHdl, weld::TreeView&, bool );
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index c1e7c5a22b2a..ec69d43f0eb8 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -425,6 +425,9 @@ void ScOptSolverDlg::EnableButtons()
 
 void ScOptSolverDlg::Close()
 {
+if (m_xOptDlg)
+m_xOptDlg->response(RET_CANCEL);
+assert(!m_xOptDlg);
 DoClose( ScOptSolverDlgWrapper::GetChildWindowId() );
 }
 
@@ -533,13 +536,14 @@ IMPL_LINK(ScOptSolverDlg, BtnHdl, weld::Button&, rBtn, 
void)
 else if (&rBtn == m_xBtnOpt.get())
 {
 //! move options dialog to UI lib?
-auto xOptDlg = 
std::make_shared(m_xDialog.get(), maImplNames, 
maDescriptions, maEngine, maProperties);
-weld::DialogController::runAsync(xOptDlg, [xOptDlg, this](sal_Int32 
nResult){
+m_xOptDlg = std::make_shared(m_xDialog.get(), 
maImplNames, maDescriptions, maEngine, maProperties);
+weld::DialogController::runAsync(m_xOptDlg, [this](sal_Int32 nResult){
 if (nResult == RET_OK)
 {
-maEngine = xOptDlg->GetEngine();
-maProperties = xOptDlg->GetProperties();
+maEngine = m_xOptDlg->GetEngine();
+maProperties = m_xOptDlg->GetProperties();
 }
+m_xOptDlg.reset();
 });
 }
 }
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx 
b/sc/source/ui/miscdlgs/solveroptions.cxx
index cb86ce10c31c..14914cdebc29 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -112,6 +112,12 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window* 
pParent,
 
 ScSolverOptionsDialog::~ScSolverOptionsDialog()
 {
+if (m_xIntDialog)
+m_xIntDialog->response(RET_CANCEL);
+assert(!m_xIntDialog);
+if (m_xValDialog)
+m_xValDialog->response(RET_CANCEL);
+assert(!m_xValDialog);
 }
 
 const uno::Sequence& 
ScSolverOptionsDialog::GetProperties()
@@ -242,13 +248,13 @@ void ScSolverOptionsDialog::EditOption()
 
 if (pStringItem->IsDouble())
 {
-auto xValDialog = 
std::make_shared(m_xDialog.get());
-xValDialog->SetOptionName(pStringItem->GetText());
-xValDialog->SetValue(pStringItem->GetDoubleValue());
-weld::DialogController::runAsync(xValDialog, [xValDialog, nEntry, 
pStringItem, this](sal_Int32 nResult){
+m_xValDialog = std::make_shared(m_xDialog.get());
+m_xValDialog->SetOptionName(pStringItem->GetText());
+m_xValDialog->SetValue(pStringItem->GetDoubleValue());
+weld::DialogController::runAsync(m_xValDialog, [nEntry, pStringItem, 
this](sal_Int32 nResult){
 if 

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/miscdlgs/optsolver.cxx |   15 +-
 sc/source/ui/miscdlgs/solveroptions.cxx |   48 +---
 2 files changed, 34 insertions(+), 29 deletions(-)

New commits:
commit 63e36e30beeaef36d5071cc94c7a3424ccfd48fd
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 12:57:27 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 15:43:16 2019 +0100

use runAsync for dialog inside another runAsync dialog

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

diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index b3531383a206..c1e7c5a22b2a 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -148,7 +148,6 @@ ScOptSolverSave::ScOptSolverSave( const OUString& 
rObjective, bool bMax, bool bM
 {
 }
 
-
 ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB, SfxChildWindow* pCW, 
weld::Window* pParent,
ScDocShell* pDocSh, const ScAddress& aCursorPos)
 : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/solverdlg.ui", 
"SolverDialog")
@@ -534,12 +533,14 @@ IMPL_LINK(ScOptSolverDlg, BtnHdl, weld::Button&, rBtn, 
void)
 else if (&rBtn == m_xBtnOpt.get())
 {
 //! move options dialog to UI lib?
-ScSolverOptionsDialog aOptDlg(m_xDialog.get(), maImplNames, 
maDescriptions, maEngine, maProperties);
-if (aOptDlg.run() == RET_OK)
-{
-maEngine = aOptDlg.GetEngine();
-maProperties = aOptDlg.GetProperties();
-}
+auto xOptDlg = 
std::make_shared(m_xDialog.get(), maImplNames, 
maDescriptions, maEngine, maProperties);
+weld::DialogController::runAsync(xOptDlg, [xOptDlg, this](sal_Int32 
nResult){
+if (nResult == RET_OK)
+{
+maEngine = xOptDlg->GetEngine();
+maProperties = xOptDlg->GetProperties();
+}
+});
 }
 }
 
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx 
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 9e6333db4679..cb86ce10c31c 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -242,35 +242,39 @@ void ScSolverOptionsDialog::EditOption()
 
 if (pStringItem->IsDouble())
 {
-ScSolverValueDialog aValDialog(m_xDialog.get());
-aValDialog.SetOptionName( pStringItem->GetText() );
-aValDialog.SetValue( pStringItem->GetDoubleValue() );
-if (aValDialog.run() == RET_OK)
-{
-pStringItem->SetDoubleValue( aValDialog.GetValue() );
+auto xValDialog = 
std::make_shared(m_xDialog.get());
+xValDialog->SetOptionName(pStringItem->GetText());
+xValDialog->SetValue(pStringItem->GetDoubleValue());
+weld::DialogController::runAsync(xValDialog, [xValDialog, nEntry, 
pStringItem, this](sal_Int32 nResult){
+if (nResult == RET_OK)
+{
+pStringItem->SetDoubleValue(xValDialog->GetValue());
 
-OUString sTxt(pStringItem->GetText() + ": ");
-sTxt += rtl::math::doubleToUString(pStringItem->GetDoubleValue(),
-rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true );
+OUString sTxt(pStringItem->GetText() + ": ");
+sTxt += 
rtl::math::doubleToUString(pStringItem->GetDoubleValue(),
+rtl_math_StringFormat_Automatic, 
rtl_math_DecimalPlaces_Max,
+ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true );
 
-m_xLbSettings->set_text(nEntry, sTxt, 1);
-}
+m_xLbSettings->set_text(nEntry, sTxt, 1);
+}
+});
 }
 else
 {
-ScSolverIntegerDialog aIntDialog(m_xDialog.get());
-aIntDialog.SetOptionName( pStringItem->GetText() );
-aIntDialog.SetValue( pStringItem->GetIntValue() );
-if (aIntDialog.run() == RET_OK)
-{
-pStringItem->SetIntValue(aIntDialog.GetValue());
+auto xIntDialog = 
std::make_shared(m_xDialog.get());
+xIntDialog->SetOptionName( pStringItem->GetText() );
+xIntDialog->SetValue( pStringItem->GetIntValue() );
+weld::DialogController::runAsync(xIntDialog, [xIntDialog, nEntry, 
pStringItem, this](sal_Int32 nResult){
+if (nResult == RET_OK)
+{
+pStringItem->SetIntValue(xIntDialog->GetValue());
 
-OUString sTxt(pStringItem->GetText() + ": ");
-sTxt += OUString::number(pStringItem->GetIntValue());
+OUString sTxt(pStringItem->GetText() + ": ");
+sTxt += OUString::number(pStringItem->GetIntValue());
 
-m_xLbSettings->set_text(nEntry, sTxt, 1);
-}
+  

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

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 4134b2cfb80d0b04204863789e72303f60712ba1
Author: Muhammet Kara 
AuthorDate: Fri Dec 13 16:02:17 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Dec 13 15:19:28 2019 +0100

tdf#129056: No need for catastrophe

We can continue working without hurting others
in case of an invalid reference.

Putting in a warning so that it doesn't become
a black hole which silences errors.

Change-Id: I6d75edeba227a4293b0ae16217811e49ae336a6b
Reviewed-on: https://gerrit.libreoffice.org/85110
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 6c9744ffee02..49a3cf5b9eba 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -70,8 +70,19 @@ ChartColorWrapper::ChartColorWrapper(
 
 void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor)
 {
+if (!mxModel.is())
+{
+SAL_WARN("chart2", "Invalid reference to mxModel");
+return;
+}
+
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
-assert(xPropSet.is());
+
+if (!xPropSet.is())
+{
+SAL_WARN("chart2", "Invalid reference to xPropSet");
+return;
+}
 
 xPropSet->setPropertyValue(maPropertyName, 
css::uno::makeAny(rColor.first));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara (via logerrit)]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 5f76964e52860330bd840184f310010f8f1f0faf
Author: Muhammet Kara 
AuthorDate: Tue Nov 26 14:56:17 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Dec 13 15:02:31 2019 +0100

Enable edit chart button on desktop and web

Change-Id: Iad98ff3e0b7f3cc6608a119134ce3595dd921e58
Reviewed-on: https://gerrit.libreoffice.org/83755
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/85092
Tested-by: Jenkins

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 036ce3fad157..0dfc8a5b0c07 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -276,7 +276,6 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowAngle = false;
 bool bShowFlip = false;
 bool bShowEditChart = false;
-bool bIsMobile = comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 
 switch (maContext.GetCombinedContext_DI())
 {
@@ -303,15 +302,13 @@ void PosSizePropertyPanel::HandleContextChange(
 break;
 
 case CombinedEnumContext(Application::WriterVariants, Context::OLE):
-if (bIsMobile)
-bShowEditChart = true;
+bShowEditChart = true;
 break;
 
 case CombinedEnumContext(Application::Calc, Context::OLE):
 case CombinedEnumContext(Application::DrawImpress, Context::OLE):
 bShowPosition = true;
-if (bIsMobile)
-bShowEditChart = true;
+bShowEditChart = true;
 break;
 
 case CombinedEnumContext(Application::Calc, Context::Chart):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 13dfaa3c3704a5a963f9e1e5d45796472f43c80e
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 12:47:54 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 14:35:29 2019 +0100

Resolves: tdf#129346 if nothing currently selected, select something

in the slidesorter

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

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index 0d4b23ff8dfe..bacf5fdf0323 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -112,7 +112,7 @@ void SelectionObserver::EndObservation()
 PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector());
 PageSelector::UpdateLock aUpdateLock (mrSlideSorter);
 rSelector.DeselectAllPages();
-if ( ! maInsertedPages.empty())
+if (!maInsertedPages.empty())
 {
 // Select the inserted pages.
 for (const auto& rpPage : maInsertedPages)
@@ -121,6 +121,12 @@ void SelectionObserver::EndObservation()
 }
 maInsertedPages.clear();
 }
+else
+{
+// tdf#129346 nothing currently selected, select something, if possible
+if (rSelector.GetPageCount())
+rSelector.SelectPage(0);
+}
 
 aUpdateLock.Release();
 
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   63 +++
 1 file changed, 19 insertions(+), 44 deletions(-)

New commits:
commit dcd3b5a52b343aa82933ba27be3396f46ee465ee
Author: Luboš Luňák 
AuthorDate: Fri Dec 13 12:20:43 2019 +0100
Commit: Luboš Luňák 
CommitDate: Fri Dec 13 14:13:42 2019 +0100

use SkCanvas::clipPath() as the real solution

SkCanvas::clipRegion() is buggy and may be removed in future
(https://bugs.chromium.org/p/skia/issues/detail?id=9580).

Change-Id: I7070d3616e579ec8ce795f6a4bdef66b1ca1c493
Reviewed-on: https://gerrit.libreoffice.org/85102
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 532f819080a4..25980de0cc60 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -343,40 +343,6 @@ void SkiaSalGraphicsImpl::checkSurface()
 }
 }
 
-static SkIRect toSkIRect(const tools::Rectangle& rectangle)
-{
-return SkIRect::MakeXYWH(rectangle.Left(), rectangle.Top(), 
rectangle.GetWidth(),
- rectangle.GetHeight());
-}
-
-static SkRegion toSkRegion(const vcl::Region& region)
-{
-if (region.IsEmpty())
-return SkRegion();
-if (region.IsRectangle())
-return SkRegion(toSkIRect(region.GetBoundRect()));
-// Prefer rectangles to polygons (simpler and also see the 
addPolygonToPath() comment).
-if (region.getRegionBand())
-{
-SkRegion skRegion;
-RectangleVector rectangles;
-region.GetRegionRectangles(rectangles);
-for (const tools::Rectangle& rect : rectangles)
-skRegion.op(toSkIRect(rect), SkRegion::kUnion_Op);
-return skRegion;
-}
-else
-{
-assert(region.HasPolyPolygonOrB2DPolyPolygon());
-SkPath path;
-addPolyPolygonToPath(region.GetAsB2DPolyPolygon(), path);
-path.setFillType(SkPathFillType::kEvenOdd);
-SkRegion skRegion;
-skRegion.setPath(path, SkRegion(path.getBounds().roundOut()));
-return skRegion;
-}
-}
-
 bool SkiaSalGraphicsImpl::setClipRegion(const vcl::Region& region)
 {
 if (mClipRegion == region)
@@ -393,34 +359,23 @@ bool SkiaSalGraphicsImpl::setClipRegion(const 
vcl::Region& region)
 assert(canvas->getSaveCount() == 2); // = there is just one save()
 canvas->restore();
 canvas->save();
-#if 1
-// TODO
-// SkCanvas::clipRegion() is buggy with Vulkan, use SkCanvas::clipPath().
-// https://bugs.chromium.org/p/skia/issues/detail?id=9580
-// This is further complicated by rectangle->polygon area conversions
-// being problematic (see addPolygonToPath() comment), so handle rectangles
-// first before resorting to polygons.
+SkPath path;
+// Handle polygons last, since rectangle->polygon area conversions
+// are problematic (see addPolygonToPath() comment).
 if (region.getRegionBand())
 {
 RectangleVector rectangles;
 region.GetRegionRectangles(rectangles);
-SkPath path;
 for (const tools::Rectangle& rectangle : rectangles)
 path.addRect(SkRect::MakeXYWH(rectangle.getX(), rectangle.getY(), 
rectangle.GetWidth(),
   rectangle.GetHeight()));
-path.setFillType(SkPathFillType::kEvenOdd);
-canvas->clipPath(path);
 }
-else if (!region.IsEmpty() && !region.IsRectangle())
+else if (!region.IsEmpty())
 {
-SkPath path;
 addPolyPolygonToPath(region.GetAsB2DPolyPolygon(), path);
-path.setFillType(SkPathFillType::kEvenOdd);
-canvas->clipPath(path);
 }
-else
-#endif
-canvas->clipRegion(toSkRegion(region));
+path.setFillType(SkPathFillType::kEvenOdd);
+canvas->clipPath(path);
 return true;
 }
 
commit fe8ca52b1265e5da0e1ef645f364296cf9ee8b12
Author: Luboš Luňák 
AuthorDate: Thu Dec 12 16:33:04 2019 +0100
Commit: Luboš Luňák 
CommitDate: Fri Dec 13 14:13:29 2019 +0100

fix off-by-one with rectangle->polygon Skia clipping (tdf#129211)

This appears to be yet another case of

https://lists.freedesktop.org/archives/libreoffice/2019-November/083709.html,
where converting rectangles to polygons for areas has unexpected results
for the right and bottom edge pixels.

Change-Id: I819f3eb1a739ac8fd18d792b7031b82fe52e4b4c
Reviewed-on: https://gerrit.libreoffice.org/85061
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index ff700c5f0362..532f819080a4 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -38,7 +38,11 @@
 namespace
 {
 // Create Skia Path from B2DPolygon
-// TODO - use this for all Polygon / PolyPolygon needs
+// Note that polygons generally have the complication that when used
+// for area (fill) operations they usually miss the right-most and
+// bottom-most line of pixels of the bounding rectangle (see
+// 
https://lists.freedes

[Libreoffice-commits] core.git: Changes to 'refs/tags/CODE-4.2.0-1'

[Tomaž Vajngerl (via logerrit)]

Tag 'CODE-4.2.0-1' created by Andras Timar  at 
2019-12-13 13:12 +

CODE-4.2.0-1

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4.2.0-1'

[Tor Lillqvist (via logerrit)]

Tag 'CODE-4.2.0-1' created by Andras Timar  at 
2019-12-13 13:10 +

CODE-4.2.0-1

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

Re: Benchmark results on mdds::multi_type_vector

[Kohei Yoshida]

Hi Michael,

On 13.12.2019 03:32, Michael Meeks wrote:


Given the large wins, what would you think of the idea of pushing to
get this released early ? ;-)


Sure, I'm onboard with that. :-)  I just need to tie a few loose ends, 
but once that's done, I can release a new version with this change in & 
get it integrated.


I cannot commit to a specific date due to time constraints, but I can 
get to it hopefully soon.


Kohei

--
Kohei Yoshida, LibreOffice Calc volunteer hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - 4 commits - loleaflet/css loleaflet/html loleaflet/images loleaflet/src

[Tor Lillqvist (via logerrit)]

 loleaflet/css/vex.css  |   14 +++--
 loleaflet/html/loleaflet-help.html |   58 ++---
 loleaflet/images/help/en/area-dialog.png   |binary
 loleaflet/images/help/en/cell-comment.png  |binary
 loleaflet/images/help/en/chart-wizard.png  |binary
 loleaflet/images/help/en/data-validation.png   |binary
 loleaflet/images/help/en/information-bar.png   |binary
 loleaflet/images/help/en/insert-table.png  |binary
 loleaflet/images/help/en/manage-changes-filter.png |binary
 loleaflet/images/help/en/manage-changes.png|binary
 loleaflet/images/help/en/page-style.png|binary
 loleaflet/images/help/en/paragraph-dialog.png  |binary
 loleaflet/images/help/en/repair-document.png   |binary
 loleaflet/images/help/en/slide-layouts.png |binary
 loleaflet/images/help/en/special-character.png |binary
 loleaflet/images/help/en/status-bar.png|binary
 loleaflet/images/help/en/thesaurus.png |binary
 loleaflet/images/help/en/word-count.png|binary
 loleaflet/src/control/Control.Toolbar.js   |2 
 19 files changed, 41 insertions(+), 33 deletions(-)

New commits:
commit be3a03436730f1ea7c0d9c74135b3b611f5838c5
Author: Tor Lillqvist 
AuthorDate: Fri Dec 13 13:17:06 2019 +0200
Commit: Andras Timar 
CommitDate: Fri Dec 13 14:01:21 2019 +0100

The uppercase SAVE thing is Android-only

(See c6f36965cfc1bd68fdb88b01d493163b5d176bcc.)

Avoid a mysterious and extremely misleading pop-up in the iOS app
saying "The server encountered a unknown error while parsing the SAVE
command".

Change-Id: Ia9047f7dfa038864f3994002b42979062f0174d4
Reviewed-on: https://gerrit.libreoffice.org/85105
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 7c5586c3f..2cb0b5289 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -2149,7 +2149,7 @@ function onCommandResult(e) {
postMessageObj['result'] = e.result && e.result.value;
}
 
-   if (window.ThisIsAMobileApp) {
+   if (window.ThisIsTheAndroidApp) {
window.postMobileMessage('SAVE ' + 
JSON.stringify(postMessageObj));
} else {
map.fire('postMessage', {msgId: 'Action_Save_Resp', 
args: postMessageObj});
commit 5581ddcbdb1f594c27cc0d8059d04f645582d135
Author: Andras Timar 
AuthorDate: Fri Dec 13 13:19:36 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 14:01:15 2019 +0100

remove screenshot dimensions from help in order to avoid distorsions with 
updated/translated images

Change-Id: I9aae794531b6e89ef463723c5c1b3202b37678d4

diff --git a/loleaflet/html/loleaflet-help.html 
b/loleaflet/html/loleaflet-help.html
index 6221cfe7a..99192f165 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -259,7 +259,7 @@
 Context menus: On clicking with the right 
mouse button, a menu appears with commands associated with the underlying 
object.
 The toolbar: The toolbar contains the most 
used options for daily editing. Toolbar buttons are dynamic, meaning that their 
state (on or off) depends on different factors.
 The status bar: The status bar is shown in the 
bottom, and contains several useful options and features.
-
+
 The search bar: Searching starts automatically 
when content is inserted in the search box, and the document window 
automatically moves to the first occurrence found. Searching is not 
case-sensitive. There are three buttons right next to the search box:
 
   Search backwards
@@ -270,7 +270,7 @@
 Text, charts, shapes and svg images will stay sharp, when zooming in, 
you will only see pixels appear at inserted images, such as jpg’s or png’s.
 Using the browser zoom affects the document and user interface 
areas.
 The information bar: At the right of the 
search bar, a set of information on the on the document is displayed. The 
actual information depends on the nature of the document.
-
+
 
 Opening, closing, saving, printing and downloading documents
 Your documents are stored and managed in the cloud storage that is 
integrated with %productName.
@@ -288,11 +288,11 @@
 Document repair
 When multiple people edit the same document concurrently, it is 
possible for their changes to conflict and this can cause some confusion. The 
Document Repair function allows users to undo other editor’s changes to the 
document to a previous state.
 To jump back to the selected state, select it with the mouse and hit 
Jump to state.
-
+
 This is particularly useful – say when a colleague inadvertently 
selected all text in the document with Ctrl + A and pr

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/hlinettp.cxx  |9 +
 cui/source/inc/hlinettp.hxx  |1 +
 cui/uiconfig/ui/hyperlinkinternetpage.ui |2 ++
 3 files changed, 12 insertions(+)

New commits:
commit 4a6041235d923755eda3b3f5e54f6ae5a5436072
Author: Caolán McNamara 
AuthorDate: Fri Dec 13 09:28:10 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 13:48:58 2019 +0100

size group is ignoring hidden widgets, leading to labels overlapping entries


https://developer.gnome.org/gtk3/stable/GtkSizeGroup.html#gtk-size-group-set-ignore-hidden

"Measuring the size of hidden widgets ...  they will report a size of 0
nowadays, and thus, their size will not affect the other size group members"

Which is unfortunate. So before we hide any labels, take the size group 
width
and set it as explicit preferred size.

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

diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 18df910f6054..fda37be4a3cd 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -40,12 +40,21 @@ 
SvxHyperlinkInternetTp::SvxHyperlinkInternetTp(weld::Container* pParent,
 , m_xRbtLinktypInternet(xBuilder->weld_radio_button("linktyp_internet"))
 , m_xRbtLinktypFTP(xBuilder->weld_radio_button("linktyp_ftp"))
 , m_xCbbTarget(new SvxHyperURLBox(xBuilder->weld_combo_box("target")))
+, m_xFtTarget(xBuilder->weld_label("target_label"))
 , m_xFtLogin(xBuilder->weld_label("login_label"))
 , m_xEdLogin(xBuilder->weld_entry("login"))
 , m_xFtPassword(xBuilder->weld_label("password_label"))
 , m_xEdPassword(xBuilder->weld_entry("password"))
 , m_xCbAnonymous(xBuilder->weld_check_button("anonymous"))
 {
+// gtk_size_group_set_ignore_hidden, "Measuring the size of hidden widgets
+// ...  they will report a size of 0 nowadays, and thus, their size will
+// not affect the other size group members", which is unfortunate. So here
+// before we hide the labels, take the size group width and set it as
+// explicit preferred size on a label that won't be hidden
+auto nLabelWidth = m_xFtTarget->get_preferred_size().Width();
+m_xFtTarget->set_size_request(nLabelWidth, -1);
+
 m_xCbbTarget->SetSmartProtocol(INetProtocol::Http);
 
 InitStdControls();
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 88020df12c54..115e1e428a47 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -39,6 +39,7 @@ private:
 std::unique_ptr m_xRbtLinktypInternet;
 std::unique_ptr m_xRbtLinktypFTP;
 std::unique_ptr m_xCbbTarget;
+std::unique_ptr m_xFtTarget;
 std::unique_ptr m_xFtLogin;
 std::unique_ptr m_xEdLogin;
 std::unique_ptr m_xFtPassword;
diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui 
b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index 4780a73829f9..40eda2174082 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -399,7 +399,9 @@
   
   
   
+  
   
+  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3237432d919b6bb65d0f4c9c957dd1254f250a2
Author: Tor Lillqvist 
AuthorDate: Fri Dec 13 13:17:06 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 13 13:46:28 2019 +0100

The uppercase SAVE thing is Android-only

(See c6f36965cfc1bd68fdb88b01d493163b5d176bcc.)

Avoid a mysterious and extremely misleading pop-up in the iOS app
saying "The server encountered a unknown error while parsing the SAVE
command".

Change-Id: Ia9047f7dfa038864f3994002b42979062f0174d4
Reviewed-on: https://gerrit.libreoffice.org/85105
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 7c5586c3f..2cb0b5289 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -2149,7 +2149,7 @@ function onCommandResult(e) {
postMessageObj['result'] = e.result && e.result.value;
}
 
-   if (window.ThisIsAMobileApp) {
+   if (window.ThisIsTheAndroidApp) {
window.postMobileMessage('SAVE ' + 
JSON.stringify(postMessageObj));
} else {
map.fire('postMessage', {msgId: 'Action_Save_Resp', 
args: postMessageObj});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

 loleaflet/html/loleaflet-help.html |   56 ++---
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 21102496b741a9672c21168ebb1bc2ec95ff2b27
Author: Andras Timar 
AuthorDate: Fri Dec 13 13:19:36 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 13:19:36 2019 +0100

remove screenshot dimensions from help in order to avoid distorsions with 
updated/translated images

Change-Id: I9aae794531b6e89ef463723c5c1b3202b37678d4

diff --git a/loleaflet/html/loleaflet-help.html 
b/loleaflet/html/loleaflet-help.html
index 6221cfe7a..99192f165 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -259,7 +259,7 @@
 Context menus: On clicking with the right 
mouse button, a menu appears with commands associated with the underlying 
object.
 The toolbar: The toolbar contains the most 
used options for daily editing. Toolbar buttons are dynamic, meaning that their 
state (on or off) depends on different factors.
 The status bar: The status bar is shown in the 
bottom, and contains several useful options and features.
-
+
 The search bar: Searching starts automatically 
when content is inserted in the search box, and the document window 
automatically moves to the first occurrence found. Searching is not 
case-sensitive. There are three buttons right next to the search box:
 
   Search backwards
@@ -270,7 +270,7 @@
 Text, charts, shapes and svg images will stay sharp, when zooming in, 
you will only see pixels appear at inserted images, such as jpg’s or png’s.
 Using the browser zoom affects the document and user interface 
areas.
 The information bar: At the right of the 
search bar, a set of information on the on the document is displayed. The 
actual information depends on the nature of the document.
-
+
 
 Opening, closing, saving, printing and downloading documents
 Your documents are stored and managed in the cloud storage that is 
integrated with %productName.
@@ -288,11 +288,11 @@
 Document repair
 When multiple people edit the same document concurrently, it is 
possible for their changes to conflict and this can cause some confusion. The 
Document Repair function allows users to undo other editor’s changes to the 
document to a previous state.
 To jump back to the selected state, select it with the mouse and hit 
Jump to state.
-
+
 This is particularly useful – say when a colleague inadvertently 
selected all text in the document with Ctrl + A and proceeded to type over it destroying it – while you 
were concurrently editing.
 Inactive document
 When %productName detects that there 
has not been any activity in the browser for a while, it puts the document in 
an “Inactive” state. The document is shown with a transparent gray overlay, 
with the message “Inactive document – please click to resume editing”.
-
+
 To continue editing, click on the document and the layover and message 
disappear. Any changes that may have been made by other users – while 
collaboratively editing the document – are re-loaded.
 Pasting
 When you paste content copied from within the same document, the format 
and elements are maintained. If you copy from another document, in another tab 
or browser window, of from outside of the browser, the pasted content will 
preserve rich text.
@@ -308,11 +308,11 @@
   Select a table in text document, a range in a spreadsheet or a 
table in a presentation.
   
 Choose Insert → Charts. Customize your chart on the sidebar:
-
+
   
   If no table or range was selected, a prototype chart is 
displayed.
 
-
+
 Chart editing: Double click the chart to 
select. Use context menus to add chart elements such as title, axis, and other. 
Choose Data Range and Chart 
Type to edit chart data and select chart type.
 Chart formatting: The same context menu brings 
you to chart data table and chart type selection.
 Data series formatting: Open the context menu 
and choose Format data series.
@@ -323,11 +323,11 @@
 Images can be resized, rotated and anchored. Text can be wrapped around 
the image. Select the image and open the context menu. Use the images handles 
to resize the image with the mouse.
 Comments in documents
 Insert comments in %productName in 
places that need special reader attention. Comments are displayed on the right 
and carry the name and date of the issuer.
-
+
 Click on the submenu () icon to reply, move and delete comments.
 Spellchecking
 %productName can check spelling in 
text documents, spreadsheets and presentations. A red wavy underline indicates 
misspelled words. Click on the right mouse button to open a context menu with 
suggested misspelling corrections.
-
+
 To systematically spell-check the whole document use the Tools menu’s Spelling option.
 
 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/sfx2 sfx2/source sw/inc sw/source

[Samuel Mehrbrodt (via logerrit)]

 include/sfx2/infobar.hxx   |   10 ++
 include/sfx2/objsh.hxx |9 +
 sfx2/source/doc/objmisc.cxx|   19 +++
 sfx2/source/doc/objxtor.cxx|1 +
 sfx2/source/inc/objshimp.hxx   |3 +++
 sfx2/source/view/viewfrm.cxx   |   14 ++
 sw/inc/strings.hrc |2 ++
 sw/source/core/text/inftxt.cxx |   15 ---
 8 files changed, 70 insertions(+), 3 deletions(-)

New commits:
commit c434fc0d181f098a179c6dc9d1506fa806d579f1
Author: Samuel Mehrbrodt 
AuthorDate: Tue Nov 19 09:18:11 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Dec 13 13:07:21 2019 +0100

tdf#128191 Show infobar when hyphenation info for text language is missing

During doc loading it's too early to add infobars,
thus add a mechanism to display infobars once view is ready

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

diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index a0dcdbd00f1d..80f4c0a0506c 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -26,6 +26,16 @@ enum class InfobarType {
 DANGER = 3
 };
 
+class InfobarData
+{
+public:
+OUString msId;
+OUString msPrimaryMessage;
+OUString msSecondaryMessage;
+InfobarType maInfobarType;
+bool mbShowCloseButton;
+};
+
 /** SfxChildWindow for positioning the InfoBar in the view.
   */
 class SFX2_DLLPUBLIC SfxInfoBarContainerChild final : public SfxChildWindow
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index d9d184383430..0352f2f1ac2a 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -62,9 +62,11 @@ class OutputDevice;
 class Color;
 class Fraction;
 class SvGlobalName;
+class InfobarData;
 
 enum class SfxModelFlags;
 enum class SfxEventHintId;
+enum class InfobarType;
 
 // These values presumably must match exactly the corresponding
 // css::embed::Aspects ones (in offapi/com/sun/star/embed/Aspects.idl)
@@ -651,6 +653,13 @@ public:
 
 static bool IsOwnStorageFormat(const SfxMedium &);
 
+/** Append Infobar once the frame is ready.
+Useful when you want to register an Infobar before the doc/frame is 
fully loaded. */
+void AppendInfoBarWhenReady(const OUString& sId, const OUString& 
sPrimaryMessage,
+const OUString& sSecondaryMessage, InfobarType 
aInfobarType,
+bool bShowCloseButton = true);
+std::vector& getPendingInfobars();
+
 SAL_DLLPRIVATE std::shared_ptr 
CreatePreviewMetaFile_Impl(bool bFullContent) const;
 
 SAL_DLLPRIVATE static bool IsPackageStorageFormat_Impl(const SfxMedium &);
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 5af5ddfdf2f0..3254eb18d7b0 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -112,6 +112,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "objstor.hxx"
@@ -202,6 +203,24 @@ void SfxObjectShell::FlushDocInfo()
  (delay > 0) || !url.isEmpty() );
 }
 
+void SfxObjectShell::AppendInfoBarWhenReady(const OUString& sId, const 
OUString& sPrimaryMessage,
+  const OUString& sSecondaryMessage,
+  InfobarType aInfobarType, bool 
bShowCloseButton)
+{
+InfobarData aInfobarData;
+aInfobarData.msId = sId;
+aInfobarData.msPrimaryMessage = sPrimaryMessage;
+aInfobarData.msSecondaryMessage = sSecondaryMessage;
+aInfobarData.maInfobarType = aInfobarType;
+aInfobarData.mbShowCloseButton = bShowCloseButton;
+Get_Impl()->m_aPendingInfobars.emplace_back(aInfobarData);
+}
+
+std::vector& SfxObjectShell::getPendingInfobars()
+{
+return Get_Impl()->m_aPendingInfobars;
+}
+
 void SfxObjectShell::SetError(ErrCode lErr)
 {
 if (pImpl->lErr==ERRCODE_NONE)
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 1f1ead6642ed..510c35daf59f 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -99,6 +99,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index d52ee83d9a3c..3d7b0b69c945 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -131,6 +131,9 @@ struct SfxObjectShell_Impl : public 
::sfx2::IMacroDocumentAccess
 bool m_bSavingForSigning;
 bool m_bAllowModifiedBackAfterSigning;
 
+/// Holds Infobars until View is fully loaded
+std::vector m_aPendingInfobars;
+
 SfxObjectShell_Impl( SfxObjectShell& _rDocShell );
 virtual ~SfxObjectShell_Impl();
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3264a1c9497a..6029bdc341e3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1432,

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

[Andras Timar (via logerrit)]

 loleaflet/po/templates/loleaflet-help.pot |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f507ec510198a156db8686bb49a72a026dbbb26
Author: Andras Timar 
AuthorDate: Fri Dec 13 13:00:56 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 13:00:56 2019 +0100

Update help pot

Change-Id: Ic8150dede9d71ce29279141d7e4d505b42d3f465

diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index c7c6d2624..899781961 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-13 12:22+0200\n"
+"POT-Creation-Date: 2019-12-13 13:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -1344,7 +1344,7 @@ msgstr ""
 #: html/loleaflet-help.html%2Bdiv.ol.li.p:310-9
 msgid ""
 "Choose Insert → Charts. "
-"Follow the chart wizard to customize the chart."
+"Customize your chart on the sidebar:"
 msgstr ""
 
 #: html/loleaflet-help.html%2Bdiv.ol.li.p:313-11
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/html loleaflet/images

[Pedro Pinto Silva (via logerrit)]

 loleaflet/html/loleaflet-help.html |2 +-
 loleaflet/images/help/en/area-dialog.png   |binary
 loleaflet/images/help/en/cell-comment.png  |binary
 loleaflet/images/help/en/chart-wizard.png  |binary
 loleaflet/images/help/en/data-validation.png   |binary
 loleaflet/images/help/en/information-bar.png   |binary
 loleaflet/images/help/en/insert-table.png  |binary
 loleaflet/images/help/en/manage-changes-filter.png |binary
 loleaflet/images/help/en/manage-changes.png|binary
 loleaflet/images/help/en/page-style.png|binary
 loleaflet/images/help/en/paragraph-dialog.png  |binary
 loleaflet/images/help/en/repair-document.png   |binary
 loleaflet/images/help/en/slide-layouts.png |binary
 loleaflet/images/help/en/special-character.png |binary
 loleaflet/images/help/en/status-bar.png|binary
 loleaflet/images/help/en/thesaurus.png |binary
 loleaflet/images/help/en/word-count.png|binary
 17 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbc6b44dd3a3c9d1262f90291cfdff1804f5eeef
Author: Pedro Pinto Silva 
AuthorDate: Fri Dec 13 12:56:13 2019 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Fri Dec 13 12:56:49 2019 +0100

Fix help text and add updated screenshots

Change-Id: Ie7fe56ae1a9db2de04706712a3a16a70bcf394f0
Reviewed-on: https://gerrit.libreoffice.org/85103
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/html/loleaflet-help.html 
b/loleaflet/html/loleaflet-help.html
index 0a79367b8..6221cfe7a 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -307,7 +307,7 @@
 
   Select a table in text document, a range in a spreadsheet or a 
table in a presentation.
   
-Choose Insert → Charts. Follow the chart wizard to customize the chart.
+Choose Insert → Charts. Customize your chart on the sidebar:
 
   
   If no table or range was selected, a prototype chart is 
displayed.
diff --git a/loleaflet/images/help/en/area-dialog.png 
b/loleaflet/images/help/en/area-dialog.png
index 5394f9044..89c285d91 100644
Binary files a/loleaflet/images/help/en/area-dialog.png and 
b/loleaflet/images/help/en/area-dialog.png differ
diff --git a/loleaflet/images/help/en/cell-comment.png 
b/loleaflet/images/help/en/cell-comment.png
index e59d8f6e7..54585023b 100644
Binary files a/loleaflet/images/help/en/cell-comment.png and 
b/loleaflet/images/help/en/cell-comment.png differ
diff --git a/loleaflet/images/help/en/chart-wizard.png 
b/loleaflet/images/help/en/chart-wizard.png
index f3c4333dc..5a6f62ee6 100644
Binary files a/loleaflet/images/help/en/chart-wizard.png and 
b/loleaflet/images/help/en/chart-wizard.png differ
diff --git a/loleaflet/images/help/en/data-validation.png 
b/loleaflet/images/help/en/data-validation.png
index 765e32302..3bb22bafa 100644
Binary files a/loleaflet/images/help/en/data-validation.png and 
b/loleaflet/images/help/en/data-validation.png differ
diff --git a/loleaflet/images/help/en/information-bar.png 
b/loleaflet/images/help/en/information-bar.png
index 6998fec9e..e72564d81 100644
Binary files a/loleaflet/images/help/en/information-bar.png and 
b/loleaflet/images/help/en/information-bar.png differ
diff --git a/loleaflet/images/help/en/insert-table.png 
b/loleaflet/images/help/en/insert-table.png
index 0b770c484..c0157607c 100644
Binary files a/loleaflet/images/help/en/insert-table.png and 
b/loleaflet/images/help/en/insert-table.png differ
diff --git a/loleaflet/images/help/en/manage-changes-filter.png 
b/loleaflet/images/help/en/manage-changes-filter.png
new file mode 100644
index 0..dd15f2922
Binary files /dev/null and b/loleaflet/images/help/en/manage-changes-filter.png 
differ
diff --git a/loleaflet/images/help/en/manage-changes.png 
b/loleaflet/images/help/en/manage-changes.png
index 245ce0bfd..9f6b2c107 100644
Binary files a/loleaflet/images/help/en/manage-changes.png and 
b/loleaflet/images/help/en/manage-changes.png differ
diff --git a/loleaflet/images/help/en/page-style.png 
b/loleaflet/images/help/en/page-style.png
index 7fc259bcc..498e4a4f6 100644
Binary files a/loleaflet/images/help/en/page-style.png and 
b/loleaflet/images/help/en/page-style.png differ
diff --git a/loleaflet/images/help/en/paragraph-dialog.png 
b/loleaflet/images/help/en/paragraph-dialog.png
index 87da1eafd..a14f9a611 100644
Binary files a/loleaflet/images/help/en/paragraph-dialog.png and 
b/loleaflet/images/help/en/paragraph-dialog.png differ
diff --git a/loleaflet/images/help/en/repair-document.png 
b/loleaflet/images/help/en/repair-document.png
index 13e964372..a416c89b7 100644
Binary files a/loleaflet/images/help/en/repair-document.png and 
b/loleaflet/images/help/en/repair-document.png differ
diff --git a/loleaflet/images/help/en/slide-layouts.png 
b/loleaflet/images/help/en/slide-layouts.png
index 951008897..1d01a3d7

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756b' - 2 commits - configure.ac framework/source

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit f5976846c02cd9c0d25e2d53dd9520500360542d
Author: Thorsten Behrens 
AuthorDate: Mon Dec 9 12:48:08 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 13 12:41:19 2019 +0100

Release LibreOffice 6.3.0.4.1 with crypto changes

Builds are here:

https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x64_en-US_it_de_es_ru_build-9.msi

https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x64_sdk_build-9.msi

https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x86_en-US_it_de_es_ru_build-9.msi

https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x86_sdk_build-9.msi

Change-Id: I3c3cad95f810fa3c2cbcfe7fb2f425096eb752d1

diff --git a/configure.ac b/configure.ac
index 1511013e9bd7..98671a75b4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.0.4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.0.4.1],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit aaf91e7c4833689dc11d0b7f3e9f707a9ce206d5
Author: Thorsten Behrens 
AuthorDate: Fri Dec 13 03:01:28 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 13 12:41:19 2019 +0100

Don't autosave encrypted documents

As we cannot generally make sure they stay encrypted.

Change-Id: I15ed41fabcc553608e418608ad1166a951daa4b6

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index d58883e83fe3..056e2bce3f38 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2384,7 +2384,10 @@ void AutoRecovery::implts_registerDocument(const 
css::uno::Reference< css::frame
 
 // check if this document must be ignored for recovery !
 // Some use cases don't wish support for AutoSave/Recovery ... as e.g. 
OLE-Server / ActiveX Control etcpp.
-bool bNoAutoSave = 
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), 
false);
+bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_NOAUTOSAVE(), false)
+|| lDescriptor.getValue(
+utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue();
 if (bNoAutoSave)
 return;
 
@@ -2802,7 +2805,10 @@ bool 
lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo const & rInf
 return true;
 
 utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
-bool bNoAutoSave = 
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), 
false);
+bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_NOAUTOSAVE(), false)
+|| lDescriptor.getValue(
+utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue();
 
 return bNoAutoSave;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh scripts/downloadpootle.sh

[Andras Timar (via logerrit)]

 docker/l10n-docker-nightly.sh |2 --
 scripts/downloadpootle.sh |   10 --
 2 files changed, 12 deletions(-)

New commits:
commit bc608f41d5b719a94039e7b568284a73d18cf426
Author: Andras Timar 
AuthorDate: Fri Dec 13 12:27:55 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 12:29:31 2019 +0100

With switch to Weblate, downloadpootle.sh script became obsolete

Change-Id: I85447800a2547d2e9142b59ce60ee3c242e7234d

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index d4f4c2cef..c877cbb5c 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -82,8 +82,6 @@ cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice
 # build
 ( cd online && ./autogen.sh ) || exit 1
 ( cd online && ./configure --prefix=/usr --sysconfdir=/etc 
--localstatedir=/var --enable-silent-rules 
--with-lokit-path="$BUILDDIR"/libreoffice/include 
--with-lo-path=/opt/libreoffice $ONLINE_EXTRA_BUILD_OPTIONS) || exit 1
-( cd online/loleaflet/po && ../../scripts/downloadpootle.sh )
-( cd online/loleaflet && make l10n) || exit 1
 ( cd online && scripts/locorestrings.py "$BUILDDIR"/online 
"$BUILDDIR"/libreoffice/translations )
 ( cd online && scripts/unocommands.py --update "$BUILDDIR"/online 
"$BUILDDIR"/libreoffice )
 ( cd online && scripts/unocommands.py --translate "$BUILDDIR"/online 
"$BUILDDIR"/libreoffice/translations )
diff --git a/scripts/downloadpootle.sh b/scripts/downloadpootle.sh
deleted file mode 100755
index 18dcaaf52..0
--- a/scripts/downloadpootle.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-for i in ab af am an ar as ast az be bg bn bn_IN bo br brx bs ca cs cy da de 
dgo dsb dz el en_GB en_ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hsb hu 
id is it ja jv ka kk kl km kn ko kok ks ky lb lo lt lv mai mk ml mn mni mr my 
nb ne nl nn nr nso oc om or pa_IN pl pt pt_BR ro ru rw sah sa_IN sat sd si sid 
sk sl sq sr ss st sv sw_TZ ta te tg th ti tn tr ts tt ug uk ur uz ve vec vi xh 
zh_CN zh_TW zu;
-do
-wget --prefer-family=IPv4 -O $i.zip 
https://translations.documentfoundation.org/export/?path=/$i/libo_online/
-unzip -o -j $i.zip
-rm $i.zip
-mv loleaflet-ui-$i.po ui-$i.po
-mv loleaflet-help-$i.po help-$i.po
-done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

 loleaflet/po/templates/ios.pot   |4 
 loleaflet/po/templates/loleaflet-help.pot|2 
 loleaflet/po/templates/loleaflet-ui.pot  |  359 ---
 loleaflet/src/control/Control.JSDialogBuilder.js |6 
 4 files changed, 205 insertions(+), 166 deletions(-)

New commits:
commit f83433ee2970334c282e96eaea6788cb9cf9e8d7
Author: Andras Timar 
AuthorDate: Fri Dec 13 12:24:37 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 12:24:37 2019 +0100

loleaflet: update pot files

Change-Id: Ib179d6f07234cf7cb693043a30e651c6555eb8cf

diff --git a/loleaflet/po/templates/ios.pot b/loleaflet/po/templates/ios.pot
index a1704a001..b366301b2 100644
--- a/loleaflet/po/templates/ios.pot
+++ b/loleaflet/po/templates/ios.pot
@@ -1,11 +1,11 @@
 #. /* A single strings file, whose title is specified in your preferences 
schema. The strings files provide the localized content to display to the user 
for each of your preferences. */
-#. extracted from 
/home/timar/AMX-help/online/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
+#. extracted from 
/home/timar/online/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-02 22:37+0200\n"
+"POT-Creation-Date: 2019-12-13 12:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index ee94debde..c7c6d2624 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-07 13:01+0200\n"
+"POT-Creation-Date: 2019-12-13 12:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 4446e924c..4a6ab9687 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-06 23:29+0100\n"
+"POT-Creation-Date: 2019-12-13 12:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -117,8 +117,8 @@ msgstr ""
 msgid "Network Graph"
 msgstr ""
 
-#: admin/admin.strings.js:31 src/layer/marker/Annotation.js:249
-#: src/layer/tile/TileLayer.js:377
+#: admin/admin.strings.js:31 src/layer/marker/Annotation.js:251
+#: src/layer/tile/TileLayer.js:383
 msgid "Save"
 msgstr ""
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: admin/src/AdminSocketBase.js:46
+#: admin/src/AdminSocketBase.js:54
 msgid "Connection error"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid "The server encountered a %0 error while parsing the %1 command."
 msgstr ""
 
-#: src/control/Control.ContextMenu.js:172
+#: src/control/Control.ContextMenu.js:234
 msgid "Paste Special"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
-#: src/control/Control.DocumentRepair.js:48 src/layer/tile/TileLayer.js:273
+#: src/control/Control.DocumentRepair.js:48 src/layer/tile/TileLayer.js:279
 msgid "Comment"
 msgstr ""
 
@@ -266,7 +266,7 @@ msgstr ""
 msgid "Jump to state"
 msgstr ""
 
-#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2351
+#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2442
 msgid "You"
 msgstr ""
 
@@ -290,70 +290,118 @@ msgstr ""
 msgid "No color"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:413
-msgid "\""
+#: src/control/Control.JSDialogBuilder.js:150
+msgid "Linear"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:415
-msgid "%"
+#: src/control/Control.JSDialogBuilder.js:153
+msgid "Axial"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:533
+#: src/control/Control.JSDialogBuilder.js:156
+msgid "Radial"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:159
+msgid "Elipsoid"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:163
+msgid "Quadratic"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:166
+msgid "Square"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:169
+msgid "Fixed size"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:734
+#: src/control/Control.Toolbar.js:1577
+msgid "None"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:737
+msgid "Color"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:740
+msgid "Gradient"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:743
+msgid "Hatching"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:747
+msgid "Pattern"
+msgstr ""
+
+#: src/control/Control.JSDialogBuilder.js:880
+

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

[Pranam Lashkari (via logerrit)]

 loleaflet/css/vex.css |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit d249e6a7137c1f4e9b33f1c520ada1f5a25eb1dd
Author: Pranam Lashkari 
AuthorDate: Thu Dec 12 05:23:47 2019 +0530
Commit: Andras Timar 
CommitDate: Fri Dec 13 11:56:07 2019 +0100

Resolved: Keyboard shortcut help window won't scroll

Help usually don't fit in the resulting popup window,
but wasn't possible to scroll.

Change-Id: Iff14620730ba9cee6e679e4b6b69e84342019cd1
Reviewed-on: https://gerrit.libreoffice.org/84998
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index ec9b7a67b..dc7a9d660 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -37,7 +37,6 @@
 }
 
 .vex.vex-theme-plain{
-   position: relative;
z-index: 2001 !important;
 }
 
@@ -48,13 +47,22 @@
 }
 
 .vex-closing {
--webkit-animation: vex-fadeout .25s forwards;
-animation: vex-fadeout .25s forwards;
+   -webkit-animation: vex-fadeout .25s forwards;
+   animation: vex-fadeout .25s forwards;
 }
 .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input select, 
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input textarea, 
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="date"], 
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime"], 
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input 
input[type="datetime-local"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="email"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="month"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="number"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="password"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="search"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="tel"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="text"], .vex.vex-theme-plain .vex-dialog-form 
.vex-dialog-input input[type="time"], .vex.vex
 -theme-plain .vex-dialog-form .vex-dialog-input input[type="url"], 
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="week"]{
width: 95% !important;
 }
 
+.vex {
+   position: fixed;
+   overflow: auto;
+   left: 0;
+   right: 0;
+   top: 0;
+   bottom: 0;
+}
+
 /*mobile*/
 @media (max-width: 767px), (max-device-height: 767px) {
.vex-open .loleaflet-user-idle {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 sfx2/source/doc/docmacromode.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0b5fea74963d499be5d59acee29ba89137f9f0cd
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 11 11:51:45 2019 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Dec 13 11:27:06 2019 +0100

Correctly set the macro security auto confirm mode

The code of adjustMacroMode() has one major problem: (almost)
everything is handled by the single nMacroExecutionMode variable,
which is even changed based on its initial setting.

I don't know if this fixed functionality breaks something, but it
doesn't look like it, as the enum AutoConfirmation is just used
and defined locally.

Change-Id: Iac305e9ec0020a11fd53b4bb87cc782686a247ac
Reviewed-on: https://gerrit.libreoffice.org/85055
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 13954b06f6d8..ef5123a2c39d 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -166,6 +166,12 @@ namespace sfx2
 ||  ( nMacroExecutionMode == 
MacroExecMode::USE_CONFIG_APPROVE_CONFIRMATION )
 )
 {
+// check confirm first, as nMacroExecutionMode is always 
overwritten by the GetMacroSecurityLevel() switch
+if (nMacroExecutionMode == 
MacroExecMode::USE_CONFIG_REJECT_CONFIRMATION)
+eAutoConfirm = eAutoConfirmReject;
+else if (nMacroExecutionMode == 
MacroExecMode::USE_CONFIG_APPROVE_CONFIRMATION)
+eAutoConfirm = eAutoConfirmApprove;
+
 SvtSecurityOptions aOpt;
 switch ( aOpt.GetMacroSecurityLevel() )
 {
@@ -185,11 +191,6 @@ namespace sfx2
 OSL_FAIL( "DocumentMacroMode::adjustMacroMode: unexpected 
macro security level!" );
 nMacroExecutionMode = MacroExecMode::NEVER_EXECUTE;
 }
-
-if ( nMacroExecutionMode == 
MacroExecMode::USE_CONFIG_REJECT_CONFIRMATION )
-eAutoConfirm = eAutoConfirmReject;
-else if ( nMacroExecutionMode == 
MacroExecMode::USE_CONFIG_APPROVE_CONFIRMATION )
-eAutoConfirm = eAutoConfirmApprove;
 }
 
 if ( nMacroExecutionMode == MacroExecMode::NEVER_EXECUTE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-4' - source/sl

[Andras Timar (via logerrit)]

 source/sl/accessibility/messages.po   |3 
 source/sl/chart2/messages.po  |5 
 source/sl/cui/messages.po |  644 ++--
 source/sl/dbaccess/messages.po|4 
 source/sl/desktop/messages.po |7 
 source/sl/editeng/messages.po |4 
 source/sl/extensions/messages.po  |3 
 source/sl/filter/messages.po  |   12 
 source/sl/fpicker/messages.po |   65 
 source/sl/helpcontent2/source/auxiliary.po|8 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |  100 
 source/sl/helpcontent2/source/text/scalc.po   |   18 
 source/sl/helpcontent2/source/text/scalc/01.po|  602 +++
 source/sl/helpcontent2/source/text/scalc/02.po|   26 
 source/sl/helpcontent2/source/text/shared/00.po   |   68 
 source/sl/helpcontent2/source/text/shared/01.po   | 1520 +-
 source/sl/helpcontent2/source/text/shared/02.po   |   24 
 source/sl/helpcontent2/source/text/shared/06.po   |   60 
 source/sl/helpcontent2/source/text/shared/guide.po|   16 
 source/sl/helpcontent2/source/text/shared/optionen.po |   12 
 source/sl/helpcontent2/source/text/simpress/00.po |   72 
 source/sl/helpcontent2/source/text/simpress/01.po |   12 
 source/sl/helpcontent2/source/text/simpress/02.po |8 
 source/sl/helpcontent2/source/text/swriter.po |   10 
 source/sl/helpcontent2/source/text/swriter/01.po  |   44 
 source/sl/helpcontent2/source/text/swriter/04.po  |   18 
 source/sl/helpcontent2/source/text/swriter/guide.po   |   68 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   16 
 source/sl/sc/messages.po  |  298 -
 source/sl/scaddins/messages.po|   18 
 source/sl/sd/messages.po  |  504 +--
 source/sl/sfx2/messages.po|   19 
 source/sl/svtools/messages.po |7 
 source/sl/svx/messages.po |8 
 source/sl/sw/messages.po  |  234 -
 source/sl/vcl/messages.po |   49 
 36 files changed, 2796 insertions(+), 1790 deletions(-)

New commits:
commit f1d112cb4e51ad0e84d299b6e0afa2b8d60d004a
Author: Andras Timar 
AuthorDate: Fri Dec 13 11:19:12 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 13 11:19:12 2019 +0100

Updated Slovenian translation

Change-Id: I58c99049344a8ee6aaaceec08d41bf3dd2c503d4

diff --git a/source/sl/accessibility/messages.po 
b/source/sl/accessibility/messages.po
index e80adca0bcc..20477591ed0 100644
--- a/source/sl/accessibility/messages.po
+++ b/source/sl/accessibility/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.3\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2019-03-19 13:50+0100\n"
+"POT-Creation-Date: 2019-12-04 13:47+0100\n"
 "PO-Revision-Date: 2017-03-10 19:03+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
@@ -58,7 +58,6 @@ msgid "Please press enter to go into child control for more 
operations"
 msgstr "Pritisnite vnašalko za vstop v kontrolnik nižje ravni za dodatne 
operacije"
 
 #: accessibility/inc/strings.hrc:33
-#, c-format
 msgctxt "RID_STR_ACC_COLUMN_NUM"
 msgid "Column %COLUMNNUMBER"
 msgstr "Stolpec %COLUMNNUMBER"
diff --git a/source/sl/chart2/messages.po b/source/sl/chart2/messages.po
index 31fd7a88b0b..6e82a2193b1 100644
--- a/source/sl/chart2/messages.po
+++ b/source/sl/chart2/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2019-11-11 21:27+0100\n"
+"POT-Creation-Date: 2019-12-04 13:47+0100\n"
 "PO-Revision-Date: 2019-10-04 12:47+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
@@ -173,7 +173,6 @@ msgid "Asian Typography"
 msgstr "Azijska tipografija"
 
 #: chart2/inc/strings.hrc:51
-#, c-format
 msgctxt "STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS"
 msgid "Mean value line with value %AVERAGE_VALUE and standard deviation 
%STD_DEVIATION"
 msgstr "Črta srednje vrednosti z vrednostjo %AVERAGE_VALUE in standardnim 
odklonom %STD_DEVIATION"
@@ -419,7 +418,6 @@ msgid "Drawing Object"
 msgstr "Risani predmet"
 
 #: chart2/inc/strings.hrc:100
-#, c-format
 msgctxt "STR_TIP_DATASERIES"

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

[Andras Timar (via logerrit)]

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

New commits:
commit 72e0d12c39faceda2e84d3321e0a11880d3b8593
Author: Andras Timar 
AuthorDate: Fri Dec 13 11:19:12 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Dec 13 11:19:19 2019 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-4'
  - Updated Slovenian translation

Change-Id: I58c99049344a8ee6aaaceec08d41bf3dd2c503d4

diff --git a/translations b/translations
index de3cae9560ff..f1d112cb4e51 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit de3cae9560ff5a54b8f168e1cd8dc92aed9ce31b
+Subproject commit f1d112cb4e51ad0e84d299b6e0afa2b8d60d004a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/hyperlinkinternetpage.ui |   82 +--
 1 file changed, 47 insertions(+), 35 deletions(-)

New commits:
commit 04a28f1c3c657338fefd61ea926357d3fad23325
Author: Heiko Tietze 
AuthorDate: Fri Dec 13 09:51:44 2019 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 13 10:58:32 2019 +0100

Resolves tdf#129295 - Hyperlink Text below URL

Added also an a11y label for the protocol web/ftp

Change-Id: I962de691156386e86707fdbd5a4198ca4bf45929
Reviewed-on: https://gerrit.libreoffice.org/85093
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui 
b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index e3921b9b2260..4780a73829f9 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -6,7 +6,6 @@
 True
 False
 True
-True
 6
 vertical
 12
@@ -20,6 +19,7 @@
   
 True
 False
+False
 6
 12
 
@@ -27,7 +27,6 @@
 True
 False
 True
-True
 6
 12
 
@@ -103,7 +102,7 @@
   
   
 0
-2
+3
   
 
 
@@ -118,7 +117,7 @@
   
   
 0
-3
+4
   
 
 
@@ -130,7 +129,7 @@
   
   
 1
-2
+3
   
 
 
@@ -142,7 +141,7 @@
   
   
 1
-3
+4
   
 
 
@@ -157,7 +156,7 @@
   
   
 1
-4
+5
   
 
 
@@ -179,7 +178,44 @@
   
 
 
-  
+  
+True
+False
+Te_xt:
+True
+indication
+0
+  
+  
+0
+2
+  
+
+
+  
+True
+True
+True
+  
+  
+1
+2
+  
+
+
+  
+lbProtocol
+True
+False
+Proto_col:
+True
+linktyp_internet
+0
+  
+  
+0
+0
+  
 
 
   
@@ -241,21 +277,6 @@
 0
   
 
-
-  
-True
-False
-start
-Te_xt:
-True
-indication
-0
-  
-  
-0
-1
-  
-
 
   
 True
@@ -268,17 +289,6 @@
   
   
 0
-2
-  
-
-
-  
-True
-True
-True
-  
-  
-1
 1
   
 
@@ -290,7 +300,7 @@
   
   
 1
-2
+1
   
 
 
@@ -389,6 +399,8 @@
   
   
   
+  
+  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara (via logerrit)]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   34 ++
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |4 +
 svx/uiconfig/ui/sidebarpossize.ui   |   62 +---
 3 files changed, 65 insertions(+), 35 deletions(-)

New commits:
commit 376cd2ceaeedd12a8050c5acd142cd9b9d5e731a
Author: Muhammet Kara 
AuthorDate: Wed Nov 20 15:30:01 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Dec 13 10:40:05 2019 +0100

Add Edit Chart button for online's mobile view

To improve UX by providing mobile viewers a way to
enter into edit mode of a chart via single tap

Change-Id: I3cfb82df166c571a401f195a7f7c806fd6df604e
Reviewed-on: https://gerrit.libreoffice.org/83614
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/85091
Tested-by: Jenkins

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index abbb315b9ffd..036ce3fad157 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -48,6 +49,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace css;
 using namespace css::uno;
@@ -106,6 +108,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 get( mpDial,  "orientationcontrol" );
 get( mpFtFlip,"fliplabel" );
 get( mpFlipTbx,   "selectrotationtype" );
+get( mpBtnEditChart,   "btnEditChart" );
 Initialize();
 
 mpBindings->Update( SID_ATTR_METRIC );
@@ -135,6 +138,7 @@ void PosSizePropertyPanel::dispose()
 mpDial.clear();
 mpFtFlip.clear();
 mpFlipTbx.clear();
+mpBtnEditChart.clear();
 
 maTransfPosXControl.dispose();
 maTransfPosYControl.dispose();
@@ -204,6 +208,8 @@ void PosSizePropertyPanel::Initialize()
 //flip:
 mpFlipTbx->SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) );
 
+mpBtnEditChart->SetClickHdl( LINK( this, PosSizePropertyPanel, 
ClickChartEditHdl ) );
+
 mpMtrAngle->InsertValue(0, FieldUnit::CUSTOM);
 mpMtrAngle->InsertValue(4500, FieldUnit::CUSTOM);
 mpMtrAngle->InsertValue(9000, FieldUnit::CUSTOM);
@@ -269,6 +275,8 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowPosition = false;
 bool bShowAngle = false;
 bool bShowFlip = false;
+bool bShowEditChart = false;
+bool bIsMobile = comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 
 switch (maContext.GetCombinedContext_DI())
 {
@@ -294,14 +302,24 @@ void PosSizePropertyPanel::HandleContextChange(
 bShowFlip = true;
 break;
 
+case CombinedEnumContext(Application::WriterVariants, Context::OLE):
+if (bIsMobile)
+bShowEditChart = true;
+break;
+
+case CombinedEnumContext(Application::Calc, Context::OLE):
+case CombinedEnumContext(Application::DrawImpress, Context::OLE):
+bShowPosition = true;
+if (bIsMobile)
+bShowEditChart = true;
+break;
+
 case CombinedEnumContext(Application::Calc, Context::Chart):
 case CombinedEnumContext(Application::Calc, Context::Form):
 case CombinedEnumContext(Application::Calc, Context::Media):
-case CombinedEnumContext(Application::Calc, Context::OLE):
 case CombinedEnumContext(Application::Calc, Context::MultiObject):
 case CombinedEnumContext(Application::DrawImpress, Context::Media):
 case CombinedEnumContext(Application::DrawImpress, Context::Form):
-case CombinedEnumContext(Application::DrawImpress, Context::OLE):
 case CombinedEnumContext(Application::DrawImpress, 
Context::ThreeDObject):
 case CombinedEnumContext(Application::DrawImpress, 
Context::MultiObject):
 bShowPosition = true;
@@ -323,6 +341,9 @@ void PosSizePropertyPanel::HandleContextChange(
 mpFtFlip->Show(bShowFlip);
 mpFlipTbx->Show(bShowFlip);
 
+// Edit Chart
+mpBtnEditChart->Show(bShowEditChart);
+
 if (mxSidebar.is())
 mxSidebar->requestLayout();
 }
@@ -497,6 +518,15 @@ IMPL_LINK( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, 
void )
 }
 }
 
+IMPL_STATIC_LINK_NOARG( PosSizePropertyPanel, ClickChartEditHdl, Button*, void 
)
+{
+SfxViewShell* pCurSh = SfxViewShell::Current();
+if ( pCurSh)
+{
+pCurSh->DoVerb( -1 );
+}
+}
+
 
 void PosSizePropertyPanel::NotifyItemUpdate(
 sal_uInt16 nSID,
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 2ac505428c36..3bc3f96f4151 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -107,6 +107,9 @@ private:
 VclPtr  

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - 2 commits - android/app loleaflet/po

[Weblate (via logerrit)]

 android/app/src/main/locale/template.pot |  444 ---
 loleaflet/po/ui-de.po|   15 -
 2 files changed, 8 insertions(+), 451 deletions(-)

New commits:
commit 9789a9f88c9ddfc32e8bbd16dfc51120ca6cc42b
Author: Weblate 
AuthorDate: Thu Dec 12 12:26:45 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Dec 13 10:24:51 2019 +0100

LibreOffice Online/loleaflet-ui (German)

Currently translated at 86.0% (234 of 272 strings)

Change-Id: I9843207435a850a10efea642289af471b13d6aee

LibreOffice Online/loleaflet-ui (German)

Currently translated at 85.7% (233 of 272 strings)

Change-Id: I6bd193e80e48a8253aadc800a6a0a00088906f44
Reviewed-on: https://gerrit.libreoffice.org/85045
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/po/ui-de.po b/loleaflet/po/ui-de.po
index c50bbe39b..81711964a 100644
--- a/loleaflet/po/ui-de.po
+++ b/loleaflet/po/ui-de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-29 11:18+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
+"PO-Revision-Date: 2019-12-12 11:26+\n"
+"Last-Translator: Christian Lohmaier \n"
+"Language-Team: German 
\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.2.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 "X-Pootle-Path: /de/libo_online/loleaflet-ui-de.po\n"
 "X-Pootle-Revision: 3937733\n"
 
@@ -172,7 +173,7 @@ msgstr "Server herunterfahren"
 
 #: admin/admin.strings.js:43
 msgid "Server uptime"
-msgstr ""
+msgstr "Betriebszeit"
 
 #: admin/src/AdminSocketAnalytics.js:219
 msgid "Received"
@@ -277,7 +278,7 @@ msgstr "Sie"
 
 #: src/control/Control.DownloadProgress.js:36
 msgid "Start download"
-msgstr ""
+msgstr "Download starten"
 
 #: src/control/Control.DownloadProgress.js:51
 msgid "Confirm copy to clipboard"
commit 3c6116e76165ba26973a7fb5dc1e70dbf5564c14
Author: Andras Timar 
AuthorDate: Thu Dec 12 12:49:08 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Dec 13 10:24:51 2019 +0100

Revert "android: add pot file for localization"

We'll use Weblate and it handles strings.xml directly

This reverts commit d6e55afc4b1238a8f2baf0f80c6d827ffccfe634.

Change-Id: I44ced10d7da37feffdd222a9a63a33545362b306

diff --git a/android/app/src/main/locale/template.pot 
b/android/app/src/main/locale/template.pot
deleted file mode 100644
index 336305881..0
--- a/android/app/src/main/locale/template.pot
+++ /dev/null
@@ -1,444 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2019.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-11 11:07+\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.7.0\n"
-
-#. string name="app_name" definition is deliberately missing here, it is filled
-#. in in build.gradle.
-msgctxt "app_name_settings"
-msgid "Settings"
-msgstr ""
-
-#, c-format
-msgctxt "app_version"
-msgid "Version: %1$s, Build ID: %2$s"
-msgstr ""
-
-msgctxt "app_description"
-msgid ""
-"$APP_NAME is a modern, easy-to-use, open source productivity suite for "
-"word processing, spreadsheets, presentations and more."
-msgstr ""
-
-msgctxt "app_vendor"
-msgid "This release was supplied by $VENDOR."
-msgstr ""
-
-msgctxt "no_recent_items"
-msgid "No recent items"
-msgstr ""
-
-msgctxt "no_items"
-msgid "No items"
-msgstr ""
-
-msgctxt "temp_file_saving_disabled"
-msgid "This file is read-only, saving is disabled."
-msgstr ""
-
-msgctxt "file_exists_warning"
-msgid "A file with this name already exists, and will be overwritten."
-msgstr ""
-
-msgctxt "file_creation_failed"
-msgid "File creation failed"
-msgstr ""
-
-msgctxt "storage_permission_required"
-msgid "Storage permission is required"
-msgstr ""
-
-msgctxt "failed_to_load_file"
-msgid "Failed to determine the file to load"
-msgstr ""
-
-msgctxt "list_view"
-msgid "List"
-msgstr ""
-
-msgctxt "grid_view"
-msgid "Grid"
-msgstr ""
-
-msgctxt "pref_category_explorer"
-msgid "File Explorer Settings"
-msgstr ""
-
-msgctxt "pref_show_hidden_files"
-msgid "Hidden Files/Folders"
-msgstr ""
-
-msgctxt "pref_show_hidden_files_summary"
-msgid "Enable to show hidden files/folders"
-msgstr ""
-
-msgctxt "pref_sort_summary"
-msgid "Select how to order files: A-Z, by size or by d

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

[Jan Holesovsky (via logerrit)]

 android/app/src/main/res/values/strings.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 513c6ec8c566de690a86a11393f6a52ca3020e4b
Author: Jan Holesovsky 
AuthorDate: Fri Dec 13 10:21:56 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Dec 13 10:24:14 2019 +0100

android: Kill unnecessary capitalization.

Thanks to Adolfo Jayme Barrientos for spotting this.

Change-Id: I1104db134e60081cc1fac19b7e43997ea1738041
Reviewed-on: https://gerrit.libreoffice.org/85095
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 1c43e7fd68e9000f332800dba4df61adcef9a870)
Reviewed-on: https://gerrit.libreoffice.org/85096

diff --git a/android/app/src/main/res/values/strings.xml 
b/android/app/src/main/res/values/strings.xml
index 082374b38..033ae98c2 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -74,9 +74,9 @@
 Remote server
 USB connected, configure your 
device.
 
-Cannot connect to the Cloud 
server. Check your configuration.
-Cannot log into the Cloud server. 
Check your configuration.
-Unspecified error connecting to 
the Cloud server. Check your configuration and/or try later.
+Cannot connect to the cloud 
server. Check your configuration.
+Cannot log in to the cloud server. 
Check your configuration.
+Unspecified error connecting to 
the cloud server. Check your configuration and/or try later.
 
 Invalid root file. Check your 
sd card configuration.
 Invalid root file. Check your OTG device 
and/or configuration.
@@ -93,7 +93,7 @@
 OTG device path
 Experimental Feature: Use only if OTG device is 
writable.
 Server URL
-URL and port of the Cloud 
server.
+URL and port of the cloud 
server.
 User name
 Password
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - android/app

[Jan Holesovsky (via logerrit)]

 android/app/src/main/res/values/strings.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1c43e7fd68e9000f332800dba4df61adcef9a870
Author: Jan Holesovsky 
AuthorDate: Fri Dec 13 10:21:56 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Dec 13 10:23:42 2019 +0100

android: Kill unnecessary capitalization.

Thanks to Adolfo Jayme Barrientos for spotting this.

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

diff --git a/android/app/src/main/res/values/strings.xml 
b/android/app/src/main/res/values/strings.xml
index 082374b38..033ae98c2 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -74,9 +74,9 @@
 Remote server
 USB connected, configure your 
device.
 
-Cannot connect to the Cloud 
server. Check your configuration.
-Cannot log into the Cloud server. 
Check your configuration.
-Unspecified error connecting to 
the Cloud server. Check your configuration and/or try later.
+Cannot connect to the cloud 
server. Check your configuration.
+Cannot log in to the cloud server. 
Check your configuration.
+Unspecified error connecting to 
the cloud server. Check your configuration and/or try later.
 
 Invalid root file. Check your 
sd card configuration.
 Invalid root file. Check your OTG device 
and/or configuration.
@@ -93,7 +93,7 @@
 OTG device path
 Experimental Feature: Use only if OTG device is 
writable.
 Server URL
-URL and port of the Cloud 
server.
+URL and port of the cloud 
server.
 User name
 Password
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Ribbon UI for extensions

[Harish Kumar]

Hello Libre Office Team,

I see that Libre Office supports Microsoft excel like UI Tabbed View for
Ribbon.
I am developing an extension for Libreoffice. Though i am able to load my
extension in Menu Bar it doesnt come under Tabbed UI.
Is there a way i can implement this UI for my extension also.
Please help.

-- 
Best Regards,
Harish Kumar.B
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Benchmark results on mdds::multi_type_vector

[Michael Meeks]

Hi Kohei,

On 13/12/2019 03:01, Kohei Yoshida wrote:
> I just finished my benchmark testing on mdds::multi_type_vector, and
> summarized my results in this blog post:
> 
> http://kohei.us/2019/12/12/benchmark-results-on-mdds-multi_type_vector/

Wow - that's wonderful work =) I guess any theoretical difference
between binary & interpolation search is moot there too - given how
close it is to the hinted version.

> Hopefully my findings and intepretations make sense.  In short, the
> numbers look great.  The overhead of block shifting is a concern, but
> I'm optimistic that this is going to be a non-issue for the most part.

Really encouraging; of course - in theory 6.4 is frozen & all that, but
- I'd love to get this into master ASAP and see what the crash tests /
Calc regression tests say (if anything). AFAIR you have amazing ~100%
unit-test coverage of each branch in mdds.

Given the large wins, what would you think of the idea of pushing to
get this released early ? ;-)

Thanks !

Michael.

-- 
michael.me...@collabora.com <><, GM Collabora Productivity
Hangout: mejme...@gmail.com, Skype: mmeeks
(M) +44 7795 666 147 - timezone usually UK / Europe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice