date:20171209

[Libreoffice-bugs] [Bug 114380] New: Some simple calc results using SUM and MIN are in error

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114380
   Summary: Some simple calc results using SUM and MIN are in
error
   Product: LibreOffice
   Version: unspecified
  Hardware: x86-64 (AMD64)
OS: Mac OS X (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: dush...@spinn.net

Created attachment 138339
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138339=edit
LO Calc spreadsheet showing calc errors

LO versions 5.4.3.2 and 5.3.7.2 both produce this error.  A sample spreadsheet
portion is attached.  Column O calculates the result of SUM(dX:nX)-MIN(dX:nX)
for row numbers X=3 to X=24.  Four of the results, in rows 5, 12, 16, and 18
(in blue), are incorrect.  The correct ones are shown in column P.  Except for
row 16, the error is the value in column D: it seems to be ignored.

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

[Libreoffice-bugs] [Bug 98114] Printing does not honor the orientation in page properties in Linux/Mac

2017-12-09 Thread bugzilla-daemon

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

--- Comment #32 from Jon K.  ---
See
https://ask.libreoffice.org/en/question/121393/libreoffice-540-writer-portrait-document-prints-as-landscape/
which gives a workaround of resizing the document (say 8.51 x 11.00). 

I see this problem with Writer, Epson Artisan 530, Mac OS 10.13.2 High Sierra,
LibreOffice 5.4.3.2 and 5.4.4.1 (pre-release).

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

[Libreoffice-bugs] [Bug 107107] Breeze inactive icons are not really visible

2017-12-09 Thread bugzilla-daemon

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

--- Comment #6 from Adolfo Jayme  ---
The issue is not in the Breeze icon theme; it’s that LibreOffice sucks at
creating semi-transparent versions of its icons,

I was hoping that the “nativealpha” branch would help with this, but it was
abandoned a year ago:
https://gerrit.libreoffice.org/gitweb?p=core.git;a=shortlog;h=refs/heads/feature/nativealpha

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

[Libreoffice-bugs] [Bug 96987] The icon for .uno: DisplayMode is too pale. It looks like inactive.

2017-12-09 Thread bugzilla-daemon

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

Adolfo Jayme  changed:

   What|Removed |Added

 CC||f...@libreoffice.org,
   ||kain...@gmail.com

--- Comment #4 from Adolfo Jayme  ---
@Andreas, can you help me out with this? I’m AFK at the moment.

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

[Libreoffice-bugs] [Bug 93208] Breeze toolbar icons are hard to make out on OSX due to insufficient contrast w / background

2017-12-09 Thread bugzilla-daemon

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

--- Comment #3 from Adolfo Jayme  ---
I think we should remove the patch for bug 69358 and mark that as WONTFIX,
given that 1) it was never fixed to show just one gradient instead of two, and
2) it contributes to an inconsistent user experience, as it’s excluded from App
Store builds owing to its use of private macOS API.

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

[Libreoffice-bugs] [Bug 95492] LibreOffice 5 branding graphics issues with OS X builds: logos in start center too bright, "5" logo in empty start center has white shadow (summary comment 15) and " Abo

2017-12-09 Thread bugzilla-daemon

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

Adolfo Jayme  changed:

   What|Removed |Added

   Assignee|f...@libreoffice.org|libreoffice-b...@lists.free
   ||desktop.org

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

[Libreoffice-bugs] [Bug 114248] LOCALHELP Terminology change: "Rename t-test to paired t-test "

2017-12-09 Thread bugzilla-daemon

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

Adolfo Jayme  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Blocks||107601
 Ever confirmed|0   |1


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=107601
[Bug 107601] Rename Data > Statistics > "t-test" to "paired t-test"
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 114379] New: : Request close program on opening screen from screensaver

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114379
   Summary: : Request close program on opening screen from
screensaver
   Product: LibreOffice
   Version: 5.4.3.2 release
  Hardware: Other
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: jtlenag...@hotmail.co.uk

Put

'10th December 2017

A test document to test the installation of the word processor at 05:28:37 on
Sunday 10th December 2017.

1. 05:28:37[a test piece of text]
2. 05:28:37'...a suggested thought that otherwise would not have occurred
but for the new installation of the word processor...'?
3. '

in Writer under Times New Roman waited until the screensaver blanked screen and
pressed any key to open screen from screensaver to be greeted with new window
with request to close program. Been happening for months. Latest after the
newest Windows update and LibreOffice update!

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

[Libreoffice-bugs] [Bug 114221] Calc corrupts password-protected XLS on save (Save as works)

2017-12-09 Thread bugzilla-daemon

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

Aron Budea  changed:

   What|Removed |Added

Summary|Calc changes .XLS password  |Calc corrupts
   |on save (Save as works) |password-protected XLS on
   ||save (Save as works)

--- Comment #14 from Aron Budea  ---
This also means the file actually becomes corrupted, it's not just a changed
password.

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

[Libreoffice-bugs] [Bug 114221] Calc changes .XLS password on save (Save as works)

2017-12-09 Thread bugzilla-daemon

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

Aron Budea  changed:

   What|Removed |Added

 Attachment #138338|application/x-ole-storage   |application/vnd.ms-excel
  mime type||

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

[Libreoffice-bugs] [Bug 114221] Calc changes .XLS password on save (Save as works)

2017-12-09 Thread bugzilla-daemon

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

--- Comment #13 from Aron Budea  ---
Created attachment 138338
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138338=edit
File with bug - recovered

(In reply to francis-marylene from comment #10)
> What about the file which is corrupted (CA2017)? I really would like to open
> it again. Do you have a way to recover it?
I have good news for you, the file is recoverable, I'm attaching it, it's
unencrypted now.

When the user simply saves the file, it saves as an unencrypted file, but sets
encryption mode for it, thus it fails decryption. I could open the bad file by
setting a breakpoint at the following line, and skipping to the end of the
function:

rStrm.SetDecrypter( xDecr );
https://opengrok.libreoffice.org/xref/core/sc/source/filter/excel/xicontent.cxx#1247

Then the file could be saved, and is saved unencrypted.

The bug only affects files having this newer encryption (>= MS Office 2013),
when they are saved (via save as, since that works), the scheme reverts to the
older one, opening and saving those files keeps the format and encryption.

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

[Libreoffice-bugs] [Bug 114378] OpenGL and Hardware acceleration Issues in Windows 10

2017-12-09 Thread bugzilla-daemon

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

--- Comment #1 from perie_...@hotmail.com ---
Created attachment 138337
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138337=edit
after disabling the OpenGL and enabling the hardware acceleration

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

[Libreoffice-bugs] [Bug 114378] New: OpenGL and Hardware acceleration Issues in Windows 10

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114378
   Summary: OpenGL and Hardware acceleration Issues in Windows 10
   Product: LibreOffice
   Version: 6.0.0.0.beta2
  Hardware: x86-64 (AMD64)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: perie_...@hotmail.com

Created attachment 138336
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138336=edit
Default Libreoffice setting screenshot

I cannot enable both libreoffice features. By default, OpenGL is checked and
the hardware acceleration is disbabled, however, this setup has some
performance issues so I need to diable OpenGL and restart the application so
that I can enable the hardware acceleration feature.

This issue is exclusive only to windows 10. 



Version: 6.0.0.0.beta2
Build ID: 13edaaa12f25de343fce136064e27da66c1c4fa4
CPU threads: 4; OS: Windows 10.0; UI render: default; 
Locale: en-US (en_US); Calc: CL

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

[Libreoffice-bugs] [Bug 114377] Crash if pasting/copying calc cells with comments (5000 lines )

2017-12-09 Thread bugzilla-daemon

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

perie_...@hotmail.com changed:

   What|Removed |Added

Version|unspecified |6.0.0.0.beta2

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

[Libreoffice-bugs] [Bug 114377] Crash if pasting/copying calc cells with comments (5000 lines )

2017-12-09 Thread bugzilla-daemon

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

--- Comment #1 from perie_...@hotmail.com ---
Version: 6.0.0.0.beta2
Build ID: 13edaaa12f25de343fce136064e27da66c1c4fa4
CPU threads: 4; OS: Windows 10.0; UI render: default; 
Locale: en-US (en_US); Calc: CL

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

[Libreoffice-bugs] [Bug 114377] New: Crash if pasting/copying calc cells with comments ( 5000 lines)

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114377
   Summary: Crash if pasting/copying calc cells with comments
(5000 lines)
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: perie_...@hotmail.com

Description:
I tried to post a cell with comments and spreadsheet wasn't able to finish it.

Steps to Reproduce:
1.Type "a" to a cell and insert a comment "test" 
2.Copy the cell with comment from column A to G
3.Copy the Rows A to G of row 1 and paste it from row 2 to 5000.

Actual Results:  
libreoffice is not usable 

Expected Results:
Cells A1 to G5000 should have a text value of "a" with comments.


Reproducible: Always


User Profile Reset: Yes



Additional Info:
I have tried posting from row 1 to 100, and it took roughly 20 sec to finish.
For 1000 lines, roughly 30 sec to post everything. For 5000 lines, I have to
close the spreadsheet application by force.


User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:57.0) Gecko/20100101
Firefox/57.0

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

[Libreoffice-bugs] [Bug 98114] Printing does not honor the orientation in page properties in Linux/Mac

2017-12-09 Thread bugzilla-daemon

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

--- Comment #31 from Kevin  ---
(In reply to Timur from comment #30)
> Since Bug 92190 is fixed in 5.4.4 please test this one again with that
> version.

The latest Ubuntu just has 5.4.2, and I don't usually replace what comes with
the system, as I get confused real quickly about what's on which machine. 
Maybe some of the other subscribers can check this.

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

Manuj Vashist License Statement

2017-12-09 Thread Manuj Vashist

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

[Libreoffice-bugs] [Bug 76324] CALC becomes very slow with 5000+ comments

2017-12-09 Thread bugzilla-daemon

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

perie_...@hotmail.com changed:

   What|Removed |Added

   Hardware|Other   |All

--- Comment #58 from perie_...@hotmail.com ---


I have tried to copy 5 cells with comments to 8000 lines and libreoffice calc
crashed. 

Product Details  
Version: 5.4.4.1 (x64)
Build ID: da790616461e15a10c95a80eb8ef8ee7b726c114
CPU threads: 4; OS: Windows 6.19; UI render: default; 
Locale: en-US (en_US); Calc: CL

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

[Libreoffice-bugs] [Bug 114376] New: Grey Spaces Created When I Press SpaceBar While Typing With Biblical Hebrew - Tiro Keyboard In LibreOffice 5.3.3.2

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114376
   Summary: Grey Spaces Created When I Press SpaceBar While Typing
With Biblical Hebrew - Tiro Keyboard In LibreOffice
5.3.3.2
   Product: LibreOffice
   Version: 5.3.3.2 release
  Hardware: Other
OS: other
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: jonah.r...@gmail.com

Description:
For my professional work, I require the ability to type advanced Hebrew
diacritical marks offered in the input source of Biblical Hebrew - Tiro. I have
installed ( downloadable as
http://www.sbl-site.org/Fonts/BiblicalHebrewKeyboardsInstallerOSX.zip ; and
found at http://opensiddur.org/help/typing/ at the words "keyboard layout and
install") the input source keyboard of Biblical Hebrew - Tiro onto my MacBook
Pro High Sierra 10.13.2. Whenever I type what should just be a regular space
with the Biblical Hebrew - Tiro keyboard, I end up with a grey quadrangle in
between the Biblical Hebrew words I am typing.
I have posted an example of this error at
https://www.facebook.com/photo.php?fbid=10103610833158202=p.10103610833158202=3
Please correct such that the Unicode of whatever the spacebar's character is on
the Biblical Hebrew - Tiro keyboard can be read by LibreOffice as a regular
space.
http://www.fileformat.info/info/unicode/char/search.htm?q=%C2%A0=entity
seems to believe that the space is supposed to be just a regular space.

Steps to Reproduce:
1. Install Biblical Hebrew - tiro.
2. Open word document in LibreOffice.
3. After selecting Biblical Hebrew - tiro as the input source language in
LibreOffice, type space.
4. See what happens.

Actual Results:  
Grey space.

Expected Results:
Just a plain old space: U+00A0 or something of that sort.


Reproducible: Always


User Profile Reset: No



Additional Info:
This is very important to me and to my work, and I value your work too. I am
going to make a donation quite shortly to LibreOffice because I am amazed by
this word processor. The company (DavkaCorp) behind my favorite Hebrew word
processor is closing this month, and I anticipate that their DavkaWriter
program will soon no longer work after just a few more system updates. I am
trying to learn how to use LibreOffice fast and efficiently to continue the
work that I do, and I have been very impressed so far--with the exception of
this space feature. I look forward to the bug being fixed. Thank you so much.


User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36

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

[Libreoffice-bugs] [Bug 82795] fix the bug for inverted arrow key behavior in left to right vertical text

2017-12-09 Thread bugzilla-daemon

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

--- Comment #16 from Volga  ---
Is it possible to move the patch into Gerrit server?

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

[Libreoffice-bugs] [Bug 112648] (Japanese) Buttons and tooltips on chart property pane are not localized

2017-12-09 Thread bugzilla-daemon

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

Naruhiko Ogasawara  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #2 from Naruhiko Ogasawara  ---
confirmed, I'll translate it.

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

[Libreoffice-commits] core.git: Branch 'private/kohei/excel-2003-xml-orcus-filter' - 438 commits - avmedia/source basctl/source basegfx/source basic/qa basic/source bin/find-unused-defines.awk bin/fin

2017-12-09 Thread Kohei Yoshida

Rebased ref, commits from common ancestor:
commit dea1b3ebb9ba5f4d2b2b8ea032a8455c398c6e70
Author: Kohei Yoshida 
Date:   Sat Dec 9 14:32:30 2017 -0500

Handle per-cell settings of cell formats.

Change-Id: I500d01921d436643499a24d375d40a607d8fd576

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index d858ddc4ac0a..87ac4f89d0e8 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -638,9 +638,13 @@ void ScOrcusSheet::set_date_time(
 cellInserted();
 }
 
-void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t 
xf_index)
+void ScOrcusSheet::set_format(os::row_t row, os::col_t col, size_t xf_index)
 {
 SAL_INFO("sc.orcus.style", "set format: " << xf_index);
+
+ScPatternAttr aPattern(mrDoc.getDoc().GetPool());
+mrStyles.applyXfToItemSet(aPattern.GetItemSet(), xf_index);
+mrDoc.getDoc().ApplyPattern(col, row, mnTab, aPattern);
 }
 
 void ScOrcusSheet::set_format(os::row_t row_start, os::col_t col_start,
commit 465d845e36203da9168622969a95a083aca15313
Author: Kohei Yoshida 
Date:   Sat Dec 9 13:38:27 2017 -0500

Implement a reference resolver for orcus.

Orcus uses this to resolve cell addresses for some ops.

Change-Id: I6ee9667ad994fb830e545ba3368004866a048c25

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index af5020c8ace4..b869e0bc43a4 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -47,6 +47,8 @@ class XStatusIndicator;
 class ScOrcusGlobalSettings : public 
orcus::spreadsheet::iface::import_global_settings
 {
 ScDocumentImport& mrDoc;
+formula::FormulaGrammar::Grammar meCalcGrammar;
+orcus::spreadsheet::formula_grammar_t meOrcusGrammar;
 
 public:
 ScOrcusGlobalSettings(ScDocumentImport& rDoc);
@@ -55,6 +57,23 @@ public:
 
 virtual void 
set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) 
override;
 virtual orcus::spreadsheet::formula_grammar_t 
get_default_formula_grammar() const override;
+
+formula::FormulaGrammar::Grammar getCalcGrammar() const
+{
+return meCalcGrammar;
+}
+};
+
+class ScOrcusRefResolver : public 
orcus::spreadsheet::iface::import_reference_resolver
+{
+const ScDocumentImport& mrDoc;
+const ScOrcusGlobalSettings& mrGlobalSettings;
+
+public:
+ScOrcusRefResolver( const ScDocumentImport& rDoc, const 
ScOrcusGlobalSettings& rGS );
+
+orcus::spreadsheet::address_t resolve_address(const char* p, size_t n);
+orcus::spreadsheet::range_t resolve_range(const char* p, size_t n);
 };
 
 class ScOrcusSharedStrings : public 
orcus::spreadsheet::iface::import_shared_strings
@@ -202,7 +221,7 @@ class ScOrcusSheet : public 
orcus::spreadsheet::iface::import_sheet
 public:
 ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory);
 
-virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() 
override { return  }
+virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() 
override;
 virtual orcus::spreadsheet::iface::import_table* get_table() override;
 virtual orcus::spreadsheet::iface::import_sheet_properties* 
get_sheet_properties() override;
 virtual orcus::spreadsheet::iface::import_conditional_format* 
get_conditional_format() override;
@@ -497,6 +516,7 @@ class ScOrcusFactory : public 
orcus::spreadsheet::iface::import_factory
 
 StringCellCaches maStringCells;
 ScOrcusGlobalSettings maGlobalSettings;
+ScOrcusRefResolver maRefResolver;
 ScOrcusSharedStrings maSharedStrings;
 std::vector< std::unique_ptr > maSheets;
 ScOrcusStyles maStyles;
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index ec93824093a2..d858ddc4ac0a 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -58,20 +58,97 @@ using namespace com::sun::star;
 
 namespace os = orcus::spreadsheet;
 
-ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc) : 
mrDoc(rDoc) {}
+namespace {
+
+formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( 
os::formula_grammar_t grammar )
+{
+formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_ODFF;
+switch(grammar)
+{
+case orcus::spreadsheet::formula_grammar_t::ods:
+eGrammar = formula::FormulaGrammar::GRAM_ODFF;
+break;
+case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
+case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
+eGrammar = formula::FormulaGrammar::GRAM_OOXML;
+break;
+case orcus::spreadsheet::formula_grammar_t::gnumeric:
+eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
+break;
+case orcus::spreadsheet::formula_grammar_t::xls_xml:
+

[Libreoffice-bugs] [Bug 114368] Libre office not showing diagramms right if copy pasted out of calc

2017-12-09 Thread bugzilla-daemon

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

m.a.riosv  changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 CC||miguelangelrv@libreoffice.o
   ||rg
 Resolution|--- |DUPLICATE

--- Comment #2 from m.a.riosv  ---


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

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

[Libreoffice-bugs] [Bug 63025] Copying chart to Writer looses data/ changes diagram type

2017-12-09 Thread bugzilla-daemon

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

m.a.riosv  changed:

   What|Removed |Added

 CC||falschrichtig999000@gmail.c
   ||om

--- Comment #10 from m.a.riosv  ---
*** Bug 114368 has been marked as a duplicate of this bug. ***

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

CppCheck Report Update

2017-12-09 Thread cppcheck.libreoff...@gmail.com


A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2017-10-12_02:20:38 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh


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

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

2017-12-09 Thread Tor Lillqvist

 include/svl/itemset.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit ce652a7f0d2745143a3e1078607a72695ce124f9
Author: Tor Lillqvist 
Date:   Fri Dec 8 14:47:48 2017 +0200

Bin two comments that say the same as the names of the functions they are 
for

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

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index c3715177810c..ca944d282ad4 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -174,10 +174,8 @@ public:
 return nullptr;
 }
 
-// Get Which-value of the item at position nPos
 sal_uInt16  GetWhichByPos(sal_uInt16 nPos) const;
 
-// Get item-status
 SfxItemStateGetItemState(   sal_uInt16 nWhich,
 bool bSrchInParent = true,
 const SfxPoolItem **ppItem = 
nullptr ) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 114375] New: FILESAVE: LibreOffice Calc won' t save AVERAGE when it contains 31 cells or data (.xls file)

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114375
   Summary: FILESAVE: LibreOffice Calc won't save AVERAGE when it
contains 31 cells or data (.xls file)
   Product: LibreOffice
   Version: 5.1.6.2 release
  Hardware: All
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: gat...@grrlz.net

Description:
LibreOffice Calc won't save AVERAGE when it contains 31 cells or data.

When I calculate an average which contains 31 cells or data, I save the file in
a .xls format and reopen the file, the average is not in cell where I put it,
instead I see the expression #N/A and in the input line =NA(). Please, note
that each data with which it was calculated is also another average of another
data.

I attach the corresponding file with the data set. You can see the sell with
the average that is failing at Q26

I am on Linux Mint 18.2, Sonya (Ubuntu 16.04, Xenial), 64 bits, KDE 5.8.8,  and
I use LibreOffice 5.1.6.2 Build ID: 1:5.1.6~rc2-0ubuntu1~xenial2

File:

https://yadi.sk/i/IIFJ3azQ3QUEdF



Steps to Reproduce:
1.Open the file
2.In any cell, in its Input line, put the following:
=AVERAGE(P25,P49,P73,P97,P121,P145,P169,P193,P217,P241,P265,P289,P313,P337,P361,P385,P409,P433,P457,P481,P505,P529,P505,P553,P577,P601,P625,P649,P673,P697,P721).
Each of these cells are, at the same time, averages of data
3.Save
4.Open the file again
5.You will see at the cell #N/A and in the input line =NA()

Actual Results:  
LibreOffice Calc won't save averages with 31 or more data that is, at the same
time, another average of another data, in .xls files

Expected Results:
LibreOffice Calc save averages with 31 or more data that is, at the same time,
another average of another data, in .xls files


Reproducible: Always


User Profile Reset: No


OpenGL enabled: Yes

Additional Info:
[Information automatically included from LibreOffice]
Locale: en-US
Module: SpreadsheetDocument
[Information guessed from browser]
OS: Linux (All)
OS is 64bit: yes

Terminal output by opening the file, saving the changes and exiting:

$ LC_ALL=C libreoffice
javaldx: Could not find a Java Runtime Environment!
Warning: failed to read path from javaldx

(soffice:17210): Gtk-WARNING **: Unable to locate theme engine in module_path:
"adwaita",

(soffice:17210): Gtk-WARNING **: Unable to locate theme engine in module_path:
"adwaita",

(soffice:17210): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

(soffice:17210): Gdk-WARNING **: gdk_window_set_icon_list: icons too large
W: Unknown node under /registry/extlang: deprecated
W: Unknown node under /registry/grandfathered: comments
W: Unknown node under /registry/grandfathered: comments

** (soffice:17210): WARNING **: Invalidate all children called


** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 36

** (soffice:17210): WARNING **: Unknown event notification 34

** (soffice:17210): WARNING **: Unknown event notification 36

Terminal output by reopening the file:

$ LC_ALL=C libreoffice
javaldx: Could not find a Java Runtime Environment!
Warning: failed to read path from javaldx

(soffice:17381): Gtk-WARNING **: Unable to locate theme engine in module_path:
"adwaita",

(soffice:17381): Gtk-WARNING **: Unable to locate theme engine in module_path:
"adwaita",

(soffice:17381): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

(soffice:17381): Gdk-WARNING **: gdk_window_set_icon_list: icons too large
W: Unknown node under /registry/extlang: deprecated
W: Unknown node under /registry/grandfathered: comments
W: Unknown node under /registry/grandfathered: comments

Re: Updating Spanish dictionary in Gerrit

2017-12-09 Thread Adolfo Jayme Barrientos

2017-12-09 8:07 GMT-06:00 Ricardo Palomares Martínez
:
> As usual, I've forgotten to rebase my local copy of the repository
> until I've tried to push the changes and got the error message. In
> order to update our wiki, which is the right moment to run git rebase?
> Would it be best to run it right after pulling the changes from the
> master repository and before committing the new changes, or just
> before trying to push upstream?

I’d say the former. That way, you minimize the risk of conflicts.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-bugs] [Bug 109130] LibreOffice freezes and becomes unusable

2017-12-09 Thread bugzilla-daemon

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

Judith M Vander Wege  changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

--- Comment #2 from Judith M Vander Wege  ---
My Libre office seems frozen and unusable.

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

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

2017-12-09 Thread Kohei Yoshida

 sc/source/filter/inc/orcusinterface.hxx |2 +-
 sc/source/filter/orcus/interface.cxx|   26 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 05bc203c3aa15ec01cc71a18ff8928c62e06eb9e
Author: Kohei Yoshida 
Date:   Sat Dec 9 15:23:12 2017 -0500

Fix inconsistent naming of a variable.

Change-Id: I769d95a9800919b2241d48de246bee7fdbaa7996
Reviewed-on: https://gerrit.libreoffice.org/46170
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index 465014b0caf4..af5020c8ace4 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -296,7 +296,7 @@ private:
 {
 struct border_line
 {
-SvxBorderLineStyle mestyle;
+SvxBorderLineStyle meStyle;
 Color maColor;
 double mnWidth;
 
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 50b009cae3b9..4a2f5567f583 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -863,7 +863,7 @@ ScOrcusStyles::border::border():
 }
 
 ScOrcusStyles::border::border_line::border_line():
-mestyle(SvxBorderLineStyle::SOLID),
+meStyle(SvxBorderLineStyle::SOLID),
 maColor(COL_WHITE),
 mnWidth(0)
 {
@@ -907,17 +907,17 @@ void ScOrcusStyles::border::applyToItemSet(SfxItemSet& 
rSet) const
 
 if (current_border_line.first == 
orcus::spreadsheet::border_direction_t::diagonal_tl_br)
 {
-editeng::SvxBorderLine aLine(_border_line.second.maColor, 
current_border_line.second.mnWidth, current_border_line.second.mestyle);
+editeng::SvxBorderLine aLine(_border_line.second.maColor, 
current_border_line.second.mnWidth, current_border_line.second.meStyle);
 aDiagonal_TLBR.SetLine();
 }
 else if (current_border_line.first == 
orcus::spreadsheet::border_direction_t::diagonal_bl_tr)
 {
-editeng::SvxBorderLine aLine(_border_line.second.maColor, 
current_border_line.second.mnWidth, current_border_line.second.mestyle);
+editeng::SvxBorderLine aLine(_border_line.second.maColor, 
current_border_line.second.mnWidth, current_border_line.second.meStyle);
 aDiagonal_BLTR.SetLine();
 }
 else
 {
-editeng::SvxBorderLine aLine(_border_line.second.maColor, 
current_border_line.second.mnWidth, current_border_line.second.mestyle);
+editeng::SvxBorderLine aLine(_border_line.second.maColor, 
current_border_line.second.mnWidth, current_border_line.second.meStyle);
 aBoxItem.SetLine(, eDir);
 }
 }
@@ -1305,32 +1305,32 @@ void ScOrcusStyles::set_border_style(
 case orcus::spreadsheet::border_style_t::medium:
 case orcus::spreadsheet::border_style_t::thick:
 case orcus::spreadsheet::border_style_t::thin:
-current_line.mestyle = SvxBorderLineStyle::SOLID;
+current_line.meStyle = SvxBorderLineStyle::SOLID;
 break;
 case orcus::spreadsheet::border_style_t::dash_dot:
-current_line.mestyle = SvxBorderLineStyle::DASH_DOT;
+current_line.meStyle = SvxBorderLineStyle::DASH_DOT;
 break;
 case orcus::spreadsheet::border_style_t::dash_dot_dot:
-current_line.mestyle = SvxBorderLineStyle::DASH_DOT_DOT;
+current_line.meStyle = SvxBorderLineStyle::DASH_DOT_DOT;
 break;
 case orcus::spreadsheet::border_style_t::dashed:
-current_line.mestyle = SvxBorderLineStyle::DASHED;
+current_line.meStyle = SvxBorderLineStyle::DASHED;
 break;
 case orcus::spreadsheet::border_style_t::dotted:
-current_line.mestyle = SvxBorderLineStyle::DOTTED;
+current_line.meStyle = SvxBorderLineStyle::DOTTED;
 break;
 case orcus::spreadsheet::border_style_t::double_border:
-current_line.mestyle = SvxBorderLineStyle::DOUBLE;
+current_line.meStyle = SvxBorderLineStyle::DOUBLE;
 break;
 case orcus::spreadsheet::border_style_t::medium_dash_dot:
 case orcus::spreadsheet::border_style_t::slant_dash_dot:
-current_line.mestyle = SvxBorderLineStyle::DASH_DOT;
+current_line.meStyle = SvxBorderLineStyle::DASH_DOT;
 break;
 case orcus::spreadsheet::border_style_t::medium_dash_dot_dot:
-current_line.mestyle = SvxBorderLineStyle::DASH_DOT_DOT;
+current_line.meStyle = SvxBorderLineStyle::DASH_DOT_DOT;
 break;
 case orcus::spreadsheet::border_style_t::medium_dashed:
-current_line.mestyle = SvxBorderLineStyle::DASHED;
+current_line.meStyle =

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

2017-12-09 Thread Szymon Kłos

 sw/source/core/edit/edfcol.cxx |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit cfa177e84de5b04be6ca9dadf62519fac5ed392f
Author: Szymon KÅos 
Date:   Fri Dec 8 22:15:21 2017 +0100

tdf#114338 don't crash on watermark insert w/ existing header

Change-Id: I63abaf48c33d6660f1829b7d503de295e4a57f9c
Reviewed-on: https://gerrit.libreoffice.org/46126
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 
Reviewed-on: https://gerrit.libreoffice.org/46156
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index ce41b3e7a064..913fec92c2de 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -118,8 +118,10 @@ bool lcl_hasField(const uno::Reference& 
xText, const OUString& rSer
 }
 
 /// Search for a frame with WATERMARK_NAME in name of type rServiceName in 
xText. Returns found name in rShapeName.
-uno::Reference lcl_getWatermark(const 
uno::Reference& xText, const OUString& rServiceName, OUString& 
rShapeName)
+uno::Reference lcl_getWatermark(const 
uno::Reference& xText,
+const OUString& rServiceName, OUString& rShapeName, bool& bSuccess)
 {
+bSuccess = false;
 uno::Reference 
xParagraphEnumerationAccess(xText, uno::UNO_QUERY);
 uno::Reference xParagraphs = 
xParagraphEnumerationAccess->createEnumeration();
 while (xParagraphs->hasMoreElements())
@@ -128,6 +130,8 @@ uno::Reference lcl_getWatermark(const 
uno::Reference xTextPortions = 
xTextPortionEnumerationAccess->createEnumeration();
 while (xTextPortions->hasMoreElements())
 {
@@ -316,7 +320,8 @@ SfxWatermarkItem SwEditShell::GetWatermark()
 
 OUString aShapeServiceName = "com.sun.star.drawing.CustomShape";
 OUString sWatermark = "";
-uno::Reference xWatermark = 
lcl_getWatermark(xHeaderText, aShapeServiceName, sWatermark);
+bool bSuccess = false;
+uno::Reference xWatermark = 
lcl_getWatermark(xHeaderText, aShapeServiceName, sWatermark, bSuccess);
 
 if (xWatermark.is())
 {
@@ -350,10 +355,14 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 const uno::Reference& 
xPageStyle,
 const uno::Reference& xHeaderText)
 {
+if (!xHeaderText.is())
+return;
+
 uno::Reference xMultiServiceFactory(xModel, 
uno::UNO_QUERY);
 OUString aShapeServiceName = "com.sun.star.drawing.CustomShape";
 OUString sWatermark = WATERMARK_NAME;
-uno::Reference xWatermark = lcl_getWatermark(xHeaderText, 
aShapeServiceName, sWatermark);
+bool bSuccess = false;
+uno::Reference xWatermark = lcl_getWatermark(xHeaderText, 
aShapeServiceName, sWatermark, bSuccess);
 
 bool bDeleteWatermark = rWatermark.GetText().isEmpty();
 if (xWatermark.is())
@@ -387,7 +396,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 }
 }
 
-if (!xWatermark.is() && !bDeleteWatermark)
+if (bSuccess && !xWatermark.is() && !bDeleteWatermark)
 {
 OUString sFont = rWatermark.GetFont();
 sal_Int16 nAngle = rWatermark.GetAngle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Maxim Monastirsky

 cui/source/customize/SvxConfigPageHelper.cxx |5 -
 cui/source/inc/cfg.hxx   |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 202f46bfdeca9110ee37a06c848c505a05739a8f
Author: Maxim Monastirsky 
Date:   Sat Dec 9 22:17:44 2017 +0200

tdf#114261 Retain toolbar:style after customization

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

diff --git a/cui/source/customize/SvxConfigPageHelper.cxx 
b/cui/source/customize/SvxConfigPageHelper.cxx
index 0a182e13ec1b..18da75eb2c6e 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -412,7 +412,7 @@ css::uno::Sequence< css::beans::PropertyValue > 
SvxConfigPageHelper::ConvertSvxC
 css::uno::Sequence< css::beans::PropertyValue > 
SvxConfigPageHelper::ConvertToolbarEntry(
 const SvxConfigEntry* pEntry )
 {
-css::uno::Sequence< css::beans::PropertyValue > aPropSeq( 4 );
+css::uno::Sequence< css::beans::PropertyValue > aPropSeq( 5 );
 
 aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
 aPropSeq[0].Value <<= pEntry->GetCommand();
@@ -436,6 +436,9 @@ css::uno::Sequence< css::beans::PropertyValue > 
SvxConfigPageHelper::ConvertTool
 aPropSeq[3].Name = ITEM_DESCRIPTOR_ISVISIBLE;
 aPropSeq[3].Value <<= pEntry->IsVisible();
 
+aPropSeq[4].Name = ITEM_DESCRIPTOR_STYLE;
+aPropSeq[4].Value <<= static_cast(pEntry->GetStyle());
+
 return aPropSeq;
 }
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 5e65de3a830a..b8bf3fcd7020 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -330,7 +330,7 @@ public:
 const css::uno::Reference< css::graphic::XGraphic >& GetBackupGraphic()
 { return xBackupGraphic; }
 
-sal_Int32   GetStyle() { return nStyle; }
+sal_Int32   GetStyle() const { return nStyle; }
 voidSetStyle( sal_Int32 style ) { nStyle = style; }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 114261] Modifying a toolbar entry with a set toolbar: style attribute causes the attribute to be removed

2017-12-09 Thread bugzilla-daemon

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

Maxim Monastirsky  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
   Assignee|libreoffice-b...@lists.free |momonas...@gmail.com
   |desktop.org |

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

[Libreoffice-bugs] [Bug 103238] [META] Customize dialog bugs and enhancements

2017-12-09 Thread bugzilla-daemon

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

Bug 114261 Summary: Modifying a toolbar entry with a set toolbar:style 
attribute causes the attribute to be removed
https://bugs.documentfoundation.org/show_bug.cgi?id=114261

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - dictionaries

2017-12-09 Thread Ricardo Palomares

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

New commits:
commit f9374883408621aee6aeb4ec788451d573e46af3
Author: Ricardo Palomares 
Date:   Sat Dec 9 14:42:02 2017 +0100

Updated core
Project: dictionaries  2337501ba43545e9c80ffe4bc3d90ea49a2e9b31

Bring shipped Spanish dictionary up to version 2.2

Change-Id: Ia877b81fa5ecd021315643b1db49cfadebcdde1e
Reviewed-on: https://gerrit.libreoffice.org/46142
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68)
Reviewed-on: https://gerrit.libreoffice.org/46172
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit ec302d7b361ed202139a9bee1e2d0094ff7792b4)
Reviewed-on: https://gerrit.libreoffice.org/46173

diff --git a/dictionaries b/dictionaries
index 892f74a64037..2337501ba435 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 892f74a64037216393f34e543ded93e0ed16eea7
+Subproject commit 2337501ba43545e9c80ffe4bc3d90ea49a2e9b31
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Ricardo Palomares

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

New commits:
commit 5cd00e541da4eca2065ea16f5145a462dee4b5b1
Author: Ricardo Palomares 
Date:   Sat Dec 9 14:42:02 2017 +0100

Updated core
Project: dictionaries  ec302d7b361ed202139a9bee1e2d0094ff7792b4

Bring shipped Spanish dictionary up to version 2.2

Change-Id: Ia877b81fa5ecd021315643b1db49cfadebcdde1e
Reviewed-on: https://gerrit.libreoffice.org/46142
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68)
Reviewed-on: https://gerrit.libreoffice.org/46172
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index 15e706c82725..ec302d7b361e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 15e706c827258d471dfff9a88096a5c10ed7a9c9
+Subproject commit ec302d7b361ed202139a9bee1e2d0094ff7792b4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-0' - es/description.xml es/es_ANY.aff es/es_ANY.dic

2017-12-09 Thread Ricardo Palomares

 es/description.xml |2 -
 es/es_ANY.aff  |   21 ++-
 es/es_ANY.dic  |   70 +
 3 files changed, 69 insertions(+), 24 deletions(-)

New commits:
commit ec302d7b361ed202139a9bee1e2d0094ff7792b4
Author: Ricardo Palomares 
Date:   Sat Dec 9 14:42:02 2017 +0100

Bring shipped Spanish dictionary up to version 2.2

Change-Id: Ia877b81fa5ecd021315643b1db49cfadebcdde1e
Reviewed-on: https://gerrit.libreoffice.org/46142
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68)
Reviewed-on: https://gerrit.libreoffice.org/46172
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/es/description.xml b/es/description.xml
index 703d1fc..21c5f24 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
 
-
+
 
 
 
diff --git a/es/es_ANY.aff b/es/es_ANY.aff
index 51f4ef0..af86543 100644
--- a/es/es_ANY.aff
+++ b/es/es_ANY.aff
@@ -1,4 +1,5 @@
 SET UTF-8
+FLAG UTF-8
 TRY 
aeroinsctldumpbgfvhzÃ³ÃjÃ¡qÃ©Ã±xyÃºÃ¼kwAEROINSCTLDUMPBGFVHZÃÃJÃQÃÃXYÃÃKW
 REP 20
 REP Ã¡s az
@@ -105,6 +106,8 @@ PFX u e tras e[^s]
 PFX v Y 2
 PFX v 0 contra [^r]
 PFX v 0 contrar r
+PFX w Y 1
+PFX w 0 ex  .
 SFX A Y 9
 SFX A r ciÃ³n/S ar
 SFX A er iciÃ³n/S [^cn]er
@@ -3449,7 +3452,7 @@ SFX Ã uzar Ãºzalas uzar
 SFX Ã uzar Ãºzala uzar
 SFX Ã uzar Ãºzalos uzar
 SFX Ã uzar Ãºzalo uzar
-SFX Ã Y 168
+SFX Ã Y 170
 SFX Ã abar Ã¡bame abar
 SFX Ã abar Ã¡banos abar
 SFX Ã r me r
@@ -3566,6 +3569,8 @@ SFX Ã obrar Ã³brame obrar
 SFX Ã obrar Ã³branos obrar
 SFX Ã ocar Ã³came ocar
 SFX Ã ocar Ã³canos ocar
+SFX Ã ocer Ã³ceme ocer
+SFX Ã ocer Ã³cenos ocer
 SFX Ã oger Ã³geme oger
 SFX Ã oger Ã³genos oger
 SFX Ã ojar Ã³jame ojar
@@ -3705,7 +3710,7 @@ SFX Ã untar Ãºntales untar
 SFX Ã untar Ãºntale untar
 SFX Ã uscar Ãºscales uscar
 SFX Ã uscar Ãºscale uscar
-SFX Ã Y 312
+SFX Ã Y 324
 SFX Ã adir Ã¡demela adir
 SFX Ã adir Ã¡demelas adir
 SFX Ã adir Ã¡demelo adir
@@ -3790,6 +3795,18 @@ SFX Ã ancar Ã¡ncasela ancar
 SFX Ã ancar Ã¡ncaselas ancar
 SFX Ã ancar Ã¡ncaselo ancar
 SFX Ã ancar Ã¡ncaselos ancar
+SFX Ã andar Ã¡ndamela andar
+SFX Ã andar Ã¡ndamelas andar
+SFX Ã andar Ã¡ndamelo andar
+SFX Ã andar Ã¡ndamelos andar
+SFX Ã andar Ã¡ndanosla andar
+SFX Ã andar Ã¡ndanoslas andar
+SFX Ã andar Ã¡ndanoslo andar
+SFX Ã andar Ã¡ndanoslos andar
+SFX Ã andar Ã¡ndasela andar
+SFX Ã andar Ã¡ndaselas andar
+SFX Ã andar Ã¡ndaselo andar
+SFX Ã andar Ã¡ndaselos andar
 SFX Ã antar Ã¡ntamela antar
 SFX Ã antar Ã¡ntamelas antar
 SFX Ã antar Ã¡ntamelo antar
diff --git a/es/es_ANY.dic b/es/es_ANY.dic
index d390378..f041479 100644
--- a/es/es_ANY.dic
+++ b/es/es_ANY.dic
@@ -1,4 +1,4 @@
-58918
+58946
 a
 ababa/S
 ababillar/RED
@@ -9906,6 +9906,7 @@ calefactorio/S
 caleidoscÃ³pico/GS
 caleidoscopio/S
 calendario/S
+calendarizar/REDA
 calentador/GS
 calentador/S
 calentado/S
@@ -10521,6 +10522,7 @@ capacidad/kS
 capacitaciÃ³n/S
 capacitador/GS
 capacitar/REDÃÃÃÃ±
+capacitor/S
 capadocio/GS
 capador/S
 capadura/S
@@ -13744,7 +13746,7 @@ combar/RED
 comba/S
 combate/S
 combatidor/S
-combatiente/S
+combatiente/wS
 combatir/REDÃÃÃÃÃ±T
 combatividad/S
 combativo/SG
@@ -14123,8 +14125,10 @@ comÃºnmente
 comÃºn/S
 con
 conato/S
+concadenadamente
 concadenar/RED
 concatenaciÃ³n/S
+concatenadamente
 concatenar/RED
 cÃ³ncava/S
 cÃ³ncavo/GS
@@ -14140,7 +14144,8 @@ concelebrar/RED
 concentraciÃ³n/S
 concentrador/GS
 concentrado/S
-concentrar/REDÃÃÃÃÃ±Ã²Ã´Ã¸T
+concentrar/hpREDÃÃÃÃÃ±Ã²Ã´Ã¸T
+concÃ©ntricamente
 ConcepciÃ³n
 concepcionista/S
 concepciÃ³n/S
@@ -14555,7 +14560,7 @@ connotativo/SG
 connumerar
 conocedor/GS
 conocedor/hSGp
-conocer/IRDÃÃÃÃÃÃÃÃ±Ã²Ãµ
+conocer/IÃRDÃÃÃÃÃÃÃÃ±Ã²Ãµ
 conocible/Sp
 conocida/hp
 conocidamente
@@ -16078,6 +16083,7 @@ cuaresmal/S
 cuaresmar
 cuaresmario/S
 cuaresma/S
+cuark/S
 Cuart
 cuartago/S
 cuartal/S
@@ -16457,6 +16463,7 @@ CuritÃ
 currar/REDÃÃ
 curricular/S
 currÃculo/S
+currÃculum
 curro/GS
 curro/S
 curruca/S
@@ -17137,6 +17144,7 @@ demora/S
 demoroso/GS
 demos
 demo/S
+dÃ©moselo
 demosofÃa/S
 demÃ³stenes
 demostrable/kS
@@ -17199,10 +17207,6 @@ denotativo/GS
 densa/fS
 densar
 dense
-dÃ©nsela
-dÃ©nselas
-dÃ©nselo
-dÃ©nselos
 densidad/S
 densificar/RED
 denso/GS
@@ -17334,6 +17338,7 @@ dermatitis
 dermatoesqueleto/S
 dermatosis
 dermesto/S
+dÃ©rmico/GS
 dermis
 dermitis
 derogador/GS
@@ -19600,6 +19605,7 @@ diestro/GS
 dietario/S
 dietar/RED
 dieta/S
+dietÃ©tico/GS
 DÃez
 diezmar/RED
 diezma/S
@@ -20542,6 +20548,7 @@ driblar/RED
 dril/S
 drino/iS
 driza/S

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-4' - es/description.xml es/es_ANY.aff es/es_ANY.dic

2017-12-09 Thread Ricardo Palomares

 es/description.xml |2 -
 es/es_ANY.aff  |   21 ++-
 es/es_ANY.dic  |   70 +
 3 files changed, 69 insertions(+), 24 deletions(-)

New commits:
commit 2337501ba43545e9c80ffe4bc3d90ea49a2e9b31
Author: Ricardo Palomares 
Date:   Sat Dec 9 14:42:02 2017 +0100

Bring shipped Spanish dictionary up to version 2.2

Change-Id: Ia877b81fa5ecd021315643b1db49cfadebcdde1e
Reviewed-on: https://gerrit.libreoffice.org/46142
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68)
Reviewed-on: https://gerrit.libreoffice.org/46172
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit ec302d7b361ed202139a9bee1e2d0094ff7792b4)
Reviewed-on: https://gerrit.libreoffice.org/46173

diff --git a/es/description.xml b/es/description.xml
index 703d1fc..21c5f24 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
 
-
+
 
 
 
diff --git a/es/es_ANY.aff b/es/es_ANY.aff
index 51f4ef0..af86543 100644
--- a/es/es_ANY.aff
+++ b/es/es_ANY.aff
@@ -1,4 +1,5 @@
 SET UTF-8
+FLAG UTF-8
 TRY 
aeroinsctldumpbgfvhzÃ³ÃjÃ¡qÃ©Ã±xyÃºÃ¼kwAEROINSCTLDUMPBGFVHZÃÃJÃQÃÃXYÃÃKW
 REP 20
 REP Ã¡s az
@@ -105,6 +106,8 @@ PFX u e tras e[^s]
 PFX v Y 2
 PFX v 0 contra [^r]
 PFX v 0 contrar r
+PFX w Y 1
+PFX w 0 ex  .
 SFX A Y 9
 SFX A r ciÃ³n/S ar
 SFX A er iciÃ³n/S [^cn]er
@@ -3449,7 +3452,7 @@ SFX Ã uzar Ãºzalas uzar
 SFX Ã uzar Ãºzala uzar
 SFX Ã uzar Ãºzalos uzar
 SFX Ã uzar Ãºzalo uzar
-SFX Ã Y 168
+SFX Ã Y 170
 SFX Ã abar Ã¡bame abar
 SFX Ã abar Ã¡banos abar
 SFX Ã r me r
@@ -3566,6 +3569,8 @@ SFX Ã obrar Ã³brame obrar
 SFX Ã obrar Ã³branos obrar
 SFX Ã ocar Ã³came ocar
 SFX Ã ocar Ã³canos ocar
+SFX Ã ocer Ã³ceme ocer
+SFX Ã ocer Ã³cenos ocer
 SFX Ã oger Ã³geme oger
 SFX Ã oger Ã³genos oger
 SFX Ã ojar Ã³jame ojar
@@ -3705,7 +3710,7 @@ SFX Ã untar Ãºntales untar
 SFX Ã untar Ãºntale untar
 SFX Ã uscar Ãºscales uscar
 SFX Ã uscar Ãºscale uscar
-SFX Ã Y 312
+SFX Ã Y 324
 SFX Ã adir Ã¡demela adir
 SFX Ã adir Ã¡demelas adir
 SFX Ã adir Ã¡demelo adir
@@ -3790,6 +3795,18 @@ SFX Ã ancar Ã¡ncasela ancar
 SFX Ã ancar Ã¡ncaselas ancar
 SFX Ã ancar Ã¡ncaselo ancar
 SFX Ã ancar Ã¡ncaselos ancar
+SFX Ã andar Ã¡ndamela andar
+SFX Ã andar Ã¡ndamelas andar
+SFX Ã andar Ã¡ndamelo andar
+SFX Ã andar Ã¡ndamelos andar
+SFX Ã andar Ã¡ndanosla andar
+SFX Ã andar Ã¡ndanoslas andar
+SFX Ã andar Ã¡ndanoslo andar
+SFX Ã andar Ã¡ndanoslos andar
+SFX Ã andar Ã¡ndasela andar
+SFX Ã andar Ã¡ndaselas andar
+SFX Ã andar Ã¡ndaselo andar
+SFX Ã andar Ã¡ndaselos andar
 SFX Ã antar Ã¡ntamela antar
 SFX Ã antar Ã¡ntamelas antar
 SFX Ã antar Ã¡ntamelo antar
diff --git a/es/es_ANY.dic b/es/es_ANY.dic
index d390378..f041479 100644
--- a/es/es_ANY.dic
+++ b/es/es_ANY.dic
@@ -1,4 +1,4 @@
-58918
+58946
 a
 ababa/S
 ababillar/RED
@@ -9906,6 +9906,7 @@ calefactorio/S
 caleidoscÃ³pico/GS
 caleidoscopio/S
 calendario/S
+calendarizar/REDA
 calentador/GS
 calentador/S
 calentado/S
@@ -10521,6 +10522,7 @@ capacidad/kS
 capacitaciÃ³n/S
 capacitador/GS
 capacitar/REDÃÃÃÃ±
+capacitor/S
 capadocio/GS
 capador/S
 capadura/S
@@ -13744,7 +13746,7 @@ combar/RED
 comba/S
 combate/S
 combatidor/S
-combatiente/S
+combatiente/wS
 combatir/REDÃÃÃÃÃ±T
 combatividad/S
 combativo/SG
@@ -14123,8 +14125,10 @@ comÃºnmente
 comÃºn/S
 con
 conato/S
+concadenadamente
 concadenar/RED
 concatenaciÃ³n/S
+concatenadamente
 concatenar/RED
 cÃ³ncava/S
 cÃ³ncavo/GS
@@ -14140,7 +14144,8 @@ concelebrar/RED
 concentraciÃ³n/S
 concentrador/GS
 concentrado/S
-concentrar/REDÃÃÃÃÃ±Ã²Ã´Ã¸T
+concentrar/hpREDÃÃÃÃÃ±Ã²Ã´Ã¸T
+concÃ©ntricamente
 ConcepciÃ³n
 concepcionista/S
 concepciÃ³n/S
@@ -14555,7 +14560,7 @@ connotativo/SG
 connumerar
 conocedor/GS
 conocedor/hSGp
-conocer/IRDÃÃÃÃÃÃÃÃ±Ã²Ãµ
+conocer/IÃRDÃÃÃÃÃÃÃÃ±Ã²Ãµ
 conocible/Sp
 conocida/hp
 conocidamente
@@ -16078,6 +16083,7 @@ cuaresmal/S
 cuaresmar
 cuaresmario/S
 cuaresma/S
+cuark/S
 Cuart
 cuartago/S
 cuartal/S
@@ -16457,6 +16463,7 @@ CuritÃ
 currar/REDÃÃ
 curricular/S
 currÃculo/S
+currÃculum
 curro/GS
 curro/S
 curruca/S
@@ -17137,6 +17144,7 @@ demora/S
 demoroso/GS
 demos
 demo/S
+dÃ©moselo
 demosofÃa/S
 demÃ³stenes
 demostrable/kS
@@ -17199,10 +17207,6 @@ denotativo/GS
 densa/fS
 densar
 dense
-dÃ©nsela
-dÃ©nselas
-dÃ©nselo
-dÃ©nselos
 densidad/S
 densificar/RED
 denso/GS
@@ -17334,6 +17338,7 @@ dermatitis
 dermatoesqueleto/S
 dermatosis
 dermesto/S
+dÃ©rmico/GS
 dermis
 dermitis
 derogador/GS
@@ -19600,6 +19605,7 @@ diestro/GS
 dietario/S
 dietar/RED

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

2017-12-09 Thread Szymon Kłos

 filter/source/msfilter/msdffimp.cxx   |   42 ++
 sw/qa/extras/ww8export/data/tdf114308.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx |8 +
 3 files changed, 34 insertions(+), 16 deletions(-)

New commits:
commit 8ee1c7526a30c12c944ba35d8cef8d20dee63754
Author: Szymon KÅos 
Date:   Fri Dec 8 19:31:02 2017 +0100

tdf#114308 DOC import correctly watermark without padding

Change-Id: If44eb4d1354386f66c697206db9ab4d7f2be374d
Reviewed-on: https://gerrit.libreoffice.org/46110
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 
Reviewed-on: https://gerrit.libreoffice.org/46155
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 62908ffad094..d50f799d4e0e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4411,24 +4411,34 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 aSet.Put(makeSdrTextAutoGrowHeightItem(false));
 aSet.Put(makeSdrTextAutoGrowWidthItem(false));
 
-double fRatio = 0;
-VclPtr pDevice = 
VclPtr::Create();
-vcl::Font aFont = pDevice->GetFont();
-aFont.SetFamilyName( aFontName );
-aFont.SetFontSize( Size( 0, 96 ) );
-pDevice->SetFont( aFont );
-
-auto nTextWidth = pDevice->GetTextWidth( aObjectText );
-OUString aObjName = GetPropertyString( 
DFF_Prop_wzName, rSt );
-if ( nTextWidth && aObjData.eShapeType == 
mso_sptTextPlainText
-&& aObjName.match( "PowerPlusWaterMarkObject" ) )
+bool bWithPadding = !( ngtextFStrikethrough & 
use_gtextFBestFit
+&& ngtextFStrikethrough & 
use_gtextFShrinkFit
+&& ngtextFStrikethrough & 
use_gtextFStretch
+&& ngtextFStrikethrough & 
gtextFBestFit
+&& ngtextFStrikethrough & 
gtextFShrinkFit
+&& ngtextFStrikethrough & 
gtextFStretch );
+
+if ( bWithPadding )
 {
-fRatio = (double)pDevice->GetTextHeight() / 
nTextWidth;
-sal_Int32 nNewHeight = fRatio * 
aObjData.aBoundRect.getWidth();
-sal_Int32 nPaddingY = 
aObjData.aBoundRect.getHeight() - nNewHeight;
+// trim, remove additional space
+VclPtr pDevice = 
VclPtr::Create();
+vcl::Font aFont = pDevice->GetFont();
+aFont.SetFamilyName( aFontName );
+aFont.SetFontSize( Size( 0, 96 ) );
+pDevice->SetFont( aFont );
+
+auto nTextWidth = pDevice->GetTextWidth( 
aObjectText );
+OUString aObjName = GetPropertyString( 
DFF_Prop_wzName, rSt );
+if ( nTextWidth && aObjData.eShapeType == 
mso_sptTextPlainText
+&& aObjName.match( "PowerPlusWaterMarkObject" 
) )
+{
+double fRatio = 
(double)pDevice->GetTextHeight() / nTextWidth;
+sal_Int32 nNewHeight = fRatio * 
aObjData.aBoundRect.getWidth();
+sal_Int32 nPaddingY = 
aObjData.aBoundRect.getHeight() - nNewHeight;
 
-if ( nPaddingY > 0 )
-aObjData.aBoundRect.setHeight( nNewHeight );
+if ( nPaddingY > 0 )
+aObjData.aBoundRect.setHeight( nNewHeight 
);
+}
 }
 }
 pRet->SetMergedItemSet( aSet );
diff --git a/sw/qa/extras/ww8export/data/tdf114308.doc 
b/sw/qa/extras/ww8export/data/tdf114308.doc
new file mode 100755
index ..36e6c7ec6999
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf114308.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 0f2ed521d6d0..388fe8164656 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -116,6 +116,14 @@ DECLARE_WW8EXPORT_TEST(testTdf91687, "tdf91687.doc")
 CPPUNIT_ASSERT_EQUAL((sal_Int32)18105, xWatermark->getSize().Width);
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf114308,

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - filter/source include/oox include/svx oox/source sw/qa sw/source

2017-12-09 Thread Szymon Kłos

 filter/source/msfilter/escherex.cxx  |4 +
 filter/source/msfilter/msdffimp.cxx  |6 --
 include/oox/vml/vmlformatting.hxx|1 
 include/svx/msdffdef.hxx |2 
 oox/source/export/vmlexport.cxx  |3 +
 oox/source/vml/vmlformatting.cxx |   27 ++
 oox/source/vml/vmlshape.cxx  |   69 ---
 oox/source/vml/vmlshapecontext.cxx   |1 
 sw/qa/extras/ooxmlexport/data/tdf114308.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   21 ++--
 sw/qa/extras/ww8export/ww8export2.cxx|6 --
 sw/source/core/edit/edfcol.cxx   |   17 +-
 sw/source/filter/ww8/wrtw8esh.cxx|   10 ---
 13 files changed, 59 insertions(+), 108 deletions(-)

New commits:
commit 1aca81256407be27fd4a7e027e27c51486c2dc31
Author: Szymon KÅos 
Date:   Thu Dec 7 16:09:47 2017 +0100

tdf#114308 Export Watermark size as is

* refactoring
* removed size hack
* export/import "trim" attribute
* DOC: export set of parameters to fit shape & frame

Change-Id: Ib00654626ae1e10ac5110d22eada7528e03357e7
Reviewed-on: https://gerrit.libreoffice.org/46036
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 
Reviewed-on: https://gerrit.libreoffice.org/46154
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index d315b41323e9..74fed8f9f290 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3495,7 +3495,9 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 }
 
 // Use gtextFStretch for Watermark like MSO does
-nTextPathFlags |= use_gtextFStretch | gtextFStretch;
+nTextPathFlags |= use_gtextFBestFit | gtextFBestFit
+| use_gtextFStretch | gtextFStretch
+| use_gtextFShrinkFit | 
gtextFShrinkFit;
 
 if ( nTextPathFlags != nTextPathFlagsOrg )
 AddOpt( DFF_Prop_gtextFStrikethrough, 
nTextPathFlags );
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index b32c3d926f90..62908ffad094 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4428,13 +4428,7 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 sal_Int32 nPaddingY = 
aObjData.aBoundRect.getHeight() - nNewHeight;
 
 if ( nPaddingY > 0 )
-{
-// Remember that value because original size 
have to be exported
-aSet.Put( SdrMetricItem( 
SDRATTR_TEXT_UPPERDIST, nPaddingY ) );
 aObjData.aBoundRect.setHeight( nNewHeight );
-}
-else
-aSet.Put( SdrMetricItem( 
SDRATTR_TEXT_UPPERDIST, 0 ) );
 }
 }
 pRet->SetMergedItemSet( aSet );
diff --git a/include/oox/vml/vmlformatting.hxx 
b/include/oox/vml/vmlformatting.hxx
index 7ec10d42b4ff..491cf994734e 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -242,6 +242,7 @@ struct OOX_DLLPUBLIC TextpathModel
 {
 OptValue moString;  ///< Specifies the string of 
the textpath.
 OptValue moStyle;   ///< Specifies the style of 
the textpath.
+OptValue moTrim;///< Specifies whether extra 
space is removed above and below the text
 
 TextpathModel();
 
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 01c033c915b1..6809cdfc120c 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -848,8 +848,10 @@ enum MSO_SYSCOLORINDEX {
 
 enum MSO_TextGeometryProperties {
 use_gtextFBestFit   = 0x0100,
+use_gtextFShrinkFit = 0x0200,
 use_gtextFStretch   = 0x0400,
 gtextFBestFit   = 0x0100,
+gtextFShrinkFit = 0x0200,
 gtextFStretch   = 0x0400
 };
 
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index bc2f377f0fd5..48e6fde5fe22 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -864,6 +864,9 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, 
const Rectangle& rRect
 OUString aSize = OUString::number(nSizeF);
 aStyle += ";font-size:" + aSize + "pt";
 }
+

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

2017-12-09 Thread Andras Timar

 include/vcl/cursor.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ffe4d766a0bd9f3b936d6e742d26ca0f1e6554b4
Author: Andras Timar 
Date:   Sat Dec 9 23:13:35 2017 +0100

add missing include

Change-Id: Ic087db6656a49314ebecc9219e0f40306bd2cbf9

diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index be6dd45c56c4..28de400e2b10 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_CURSOR_HXX
 #define INCLUDED_VCL_CURSOR_HXX
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 114374] New: FORMATTING: EDITING: Libreoffice Writer crash after removing all styles of footer of a page

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114374
   Summary: FORMATTING: EDITING: Libreoffice Writer crash after
removing all styles of footer of a page
   Product: LibreOffice
   Version: 5.1.6.2 release
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: gat...@grrlz.net

Description:
Libreoffice Writer crash after removing all styles of footer of a page.

The file, with a .docx format, is a very edited and manipulated one, using MS
Office on Windows and MAC, and LibreOffice Writer on GNU/Linux. So, when I open
the file in this latter program, on that latter operative system, I see that
all pages have all styles of footer (Default Style, and Converted from 1 to 6),
I know it by seeing Insert > Header and Footer > Footer, all the options are
marked as active.

I am on Linux Mint 18.2, Sonya (Ubuntu 16.04, Xenial), 64 bits, KDE 5.8.8,  and
I use LibreOffice 5.1.6.2 Build ID: 1:5.1.6~rc2-0ubuntu1~xenial2

I post a link with the file.

https://yadi.sk/i/ajePdGgY3QUDEh

Thanks so much.


Steps to Reproduce:
1. Open the file
2. Click on any page
3. Click on Insert > Header and Footer > Footer > All
4. The program will ask for deleting the footer (Are you sure you want to
delete the footer? All contents of the footer will be deleted and can not be
restored.) 
5. Click on Yes
6. LibreOffice Writer will crash

If you can't reproduce the crash, try on another page (step 2).

Actual Results:  
LibreOffice crash

Expected Results:
Remove the styles of footer and not crash


Reproducible: Always


User Profile Reset: No


OpenGL enabled: Yes

Additional Info:
The terminal output, reproducing the crash, is this:

$ LC_ALL=C libreoffice
javaldx: Could not find a Java Runtime Environment!
Warning: failed to read path from javaldx

(soffice:10835): Gtk-WARNING **: Unable to locate theme engine in module_path:
"adwaita",

(soffice:10835): Gtk-WARNING **: Unable to locate theme engine in module_path:
"adwaita",

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large
W: Unknown node under /registry/extlang: deprecated
W: Unknown node under /registry/grandfathered: comments
W: Unknown node under /registry/grandfathered: comments

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

** (soffice:10835): WARNING **: Invalid borders specified for theme pixmap:
/usr/share/themes/Breeze/gtk-2.0/../assets/line-h.png,
borders don't fit within the image

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

** (soffice:10835): WARNING **: invalid source position for vertical gradient

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large

(soffice:10835): Gdk-WARNING **: gdk_window_set_icon_list: icons too large


User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:57.0) Gecko/20100101
Firefox/57.0

-- 
You are receiving this mail because:
You are the assignee for the

[Libreoffice-bugs] [Bug 72942] importing .docx file overwrites all global properties

2017-12-09 Thread bugzilla-daemon

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

Horst  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #10 from Horst  ---
Tested it with the attached files.
1) Page style is ok /not overwritten.
2) Default Style Font still overwritten with Calibri 11 instead of Arial 13
3) Document language is set to German (Switzerland) overwriting English(USA)

Only one out of 3 bugs fixed. Resetting status to NEW.

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

[Libreoffice-bugs] [Bug 104520] [META] DOCX (OOXML) bug tracker

2017-12-09 Thread bugzilla-daemon

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

Bug 72942 Summary: importing .docx file overwrites all global properties
https://bugs.documentfoundation.org/show_bug.cgi?id=72942

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

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

2017-12-09 Thread Kohei Yoshida

 sc/qa/unit/helper/qahelper.cxx|3 ---
 sc/source/filter/inc/orcusfiltersimpl.hxx |1 -
 sc/source/filter/inc/orcusinterface.hxx   |2 --
 sc/source/ui/dataprovider/csvdataprovider.cxx |5 -
 sc/source/ui/docshell/datastream.cxx  |4 
 sc/source/ui/inc/dataprovider.hxx |4 
 6 files changed, 19 deletions(-)

New commits:
commit c7755e615918c1a0cb3245f75334ba08f69ac226
Author: Kohei Yoshida 
Date:   Fri Dec 8 21:08:29 2017 -0500

Remove __ORCUS_STATIC_LIB defines.

Since orcus is now integrated as dynamic shared libraries, we don't
need these defines (in theory).

Change-Id: I33ea2e862ecc23becf5d01173d3fb31c03797159
Reviewed-on: https://gerrit.libreoffice.org/46166
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index b53c8377e1a0..117c4d21e9e8 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -23,9 +23,6 @@
 #include 
 #include 
 
-#if defined(_WIN32)
-#define __ORCUS_STATIC_LIB
-#endif
 #include 
 
 #include 
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx 
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index 27604fbd7a19..ee69df00b552 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -12,7 +12,6 @@
 
 #include 
 
-#define __ORCUS_STATIC_LIB
 #include 
 
 class ScOrcusFiltersImpl : public ScOrcusFilters
diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index c19cf038ee7b..465014b0caf4 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#define __ORCUS_STATIC_LIB
 #include 
 
 #include 
@@ -182,7 +181,6 @@ public:
 
 virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) 
override;
 
-
 virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& 
range) override;
 };
 
diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx 
b/sc/source/ui/dataprovider/csvdataprovider.cxx
index 1d61996f7a6e..a6850edec3de 100644
--- a/sc/source/ui/dataprovider/csvdataprovider.cxx
+++ b/sc/source/ui/dataprovider/csvdataprovider.cxx
@@ -11,11 +11,6 @@
 #include 
 #include 
 
-#if defined(_WIN32)
-#if !defined __ORCUS_STATIC_LIB // avoid -Werror,-Wunused-macros
-#define __ORCUS_STATIC_LIB
-#endif
-#endif
 #include 
 
 namespace {
diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index f74feb7a7d06..eea81a1f41ae 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -29,10 +29,6 @@
 
 #include 
 
-
-#if defined(_WIN32)
-#define __ORCUS_STATIC_LIB
-#endif
 #include 
 
 #include 
diff --git a/sc/source/ui/inc/dataprovider.hxx 
b/sc/source/ui/inc/dataprovider.hxx
index 14637a49703f..61d1e112f14f 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/dataprovider.hxx
@@ -33,10 +33,6 @@
 
 #include 
 
-#if defined(_WIN32)
-#define __ORCUS_STATIC_LIB
-#endif
-
 #include 
 
 class SvStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 103859] [META] EMF/WMF (Enhanced/Windows Metafile) bugs and enhancements

2017-12-09 Thread bugzilla-daemon

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

Bug 114197 Summary: Handling large EMF document stalls LO for several minutes
https://bugs.documentfoundation.org/show_bug.cgi?id=114197

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

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

[Libreoffice-bugs] [Bug 114197] Handling large EMF document stalls LO for several minutes

2017-12-09 Thread bugzilla-daemon

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

Buovjaga  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #15 from Buovjaga  ---
Yep, let's dupe to it.

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

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

[Libreoffice-bugs] [Bug 45820] insanely slow wmf import (complex clipping and basegfx::tools: :findCuts)

2017-12-09 Thread bugzilla-daemon

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

Buovjaga  changed:

   What|Removed |Added

 CC||slash@free.fr

--- Comment #17 from Buovjaga  ---
*** Bug 114197 has been marked as a duplicate of this bug. ***

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

[Libreoffice-bugs] [Bug 61484] FILEOPEN: Very slow open XLS with complex table structure and conditional formatting

2017-12-09 Thread bugzilla-daemon

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

--- Comment #14 from Buovjaga  ---
Created attachment 138335
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138335=edit
Callgrind output from master

Arch Linux 64-bit
Version: 6.1.0.0.alpha0+
Build ID: d4a54ec92674773bc0f9358a3d9090915a3c8fb0
CPU threads: 8; OS: Linux 4.14; UI render: default; VCL: kde4; 
Locale: fi-FI (fi_FI.UTF-8); Calc: group threaded
Built on December 9th 2017

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

[Libreoffice-bugs] [Bug 114261] Modifying a toolbar entry with a set toolbar: style attribute causes the attribute to be removed

2017-12-09 Thread bugzilla-daemon

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

--- Comment #2 from Maxim Monastirsky  ---
https://gerrit.libreoffice.org/46169/

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

[Libreoffice-bugs] [Bug 114342] Crash while opening a document

2017-12-09 Thread bugzilla-daemon

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

--- Comment #6 from Julien Nabet  ---
It's a stack overflow.
After having found that UseThreadedCalculationForFormulaGroups returned 1, I
used this patch just for the test:
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 955be80b4c59..9d4c3a97cd40 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4344,7 +4344,7 @@ bool ScFormulaCell::InterpretFormulaGroup()

 if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() &&
 pCode->GetVectorState() == FormulaVectorEnabledForThreading &&
-   
officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get())
+   
officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get()
&& false)
 {
 // iterate over code in the formula ...
 // ensure all input is pre-calculated -

I could open the file.

Now I don't know how to fix this.

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

[Libreoffice-bugs] [Bug 114373] New: LO DRAW: selected object jumps to screen edge when using arrow keys to move object

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114373
   Summary: LO DRAW: selected object jumps to screen edge when
using arrow keys to move object
   Product: LibreOffice
   Version: 5.4.3.2 release
  Hardware: x86 (IA32)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Draw
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: garypitt...@gmail.com

Description:
Using arrow keys to move an object causes the page position to jump so the
selected object is at the screen edge *if* the zoom level is such that part of
the selected object is off screen. Draw previously did not behave this way,
moving an object did not cause the page position to move. This bug was
introduced several versions (a couple years now) ago. Moving an object with
arrow keys (or alt-arrow for nudging) to align the object with a target object
is extremely common, not it is nearly impossible.

Steps to Reproduce:
1. Place a 3"x3" square (no fill color) near the center of the page, this will
be the target object.
2. Place a vertical line 5" long inside the square near the left side. The line
will be the object to move with arrow keys.
3. Zoom in enough so that part of the vertical line is off screen above (or
below) the screen, but the left side of the square remains onscreen. Select the
line, use left (or alt-left) arrow key to move the line so that it aligns with
the side of the target box.

Actual Results:  
When using the left arrow key (or alt-left arrow) the page position jumps to
the right such that the selected line is at the left edge of the screen. The
target object (left side of the square) is now off screen.

Expected Results:
The page position on the screen should not move at all. The side of the square,
the target object, should not move. Only the selected object that we want to
move should actually move.


Reproducible: Always


User Profile Reset: Yes


OpenGL enabled: Yes

Additional Info:
This behavior happens with all object types that I've tried, all sizes, in all
directions (left, right, up, down). Nudging objects into position at high zoom
levels has been extremely useful on earlier versions, now it is unusable.

Important note: if the zoom level is such that all of the selected object is on
screen, the page does not move. Only when part of the selected object is off
screen triggers the bug.


User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:57.0) Gecko/20100101
Firefox/57.0

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

[Libreoffice-bugs] [Bug 114372] New: Add zoom/unzoom mouse scroll on " calc sheet embedded object" in writer

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114372
   Summary: Add zoom/unzoom mouse scroll on "calc sheet embedded
object" in writer
   Product: LibreOffice
   Version: 5.3.2.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: marcdu...@hotmail.com

Description:
It would be very nice if it was possible to zoom and unzoom on an calc sheet
embedded object in writer. I did it with a macro/button but it is not very
friendly user.


'XXX
Sub ZoomPlusMoins

monDoc = ThisComponent
monOLE = monDoc.EmbeddedObjects.getByName("Objet6")
GLOBALHauteur2 = monOLE.Height

oFormu = monDoc.DrawPage.Forms.getByName("Formulaire")
oCompteur = oFormu.getByName("Compteur 1")

sousObjet = monOLE.EmbeddedObject.Component.CurrentController
if  IsNull(sousObjet) then
warning = ("Il faut double cliquer dans le cadre avant de
zoomer")
r = msgbox (warning, 16,"Information")
else
if IsNull(GLOBALoSpinZoom) then
GLOBALoSpinZoom = 0
else
oSpin = oCompteur.SpinValue
GLOBALmonZoom = sousObjet.ZoomValue
if oSpin > GLOBALoSpinZoom then 
GLOBALmonZoom = GLOBALmonZoom + 3
else
GLOBALmonZoom = GLOBALmonZoom - 3

end if
sousObjet.ZoomValue = GLOBALmonZoom
GLOBALoSpinZoom = oSpin

end if


end if
End Sub

Steps to Reproduce:
1.Create a sheet in calc
2.Copy and paste it in writer
3.From writer, double clic on the embedded objet, then Ctrl+Mouse Scroll:
nothing happens

Actual Results:  
Not possible to zoom / unzoom with mouse scroll

Expected Results:
Possible to zoom with mouse scroll in a "sheet calc embedded object" from
writer


Reproducible: Always


User Profile Reset: No



Additional Info:


User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:57.0) Gecko/20100101
Firefox/57.0

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

[Libreoffice-bugs] [Bug 114371] mirroring the borders of pasted images

2017-12-09 Thread bugzilla-daemon

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

--- Comment #1 from ghavami...@hotmail.com ---
Created attachment 138334
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138334=edit
odp

pls try both attachments in MS and LO and move the individual pasted pictures
around to show their borders.

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

[Libreoffice-bugs] [Bug 114371] New: mirroring the borders of pasted images

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114371
   Summary: mirroring the borders of pasted images
   Product: LibreOffice
   Version: 5.4.3.2 release
  Hardware: x86 (IA32)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: ghavami...@hotmail.com

Created attachment 138333
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138333=edit
ppt

Please could see the difference between the specific cut borders of these
pasted images and the generic square border interpreted by LO. nb MS 2016 used.
both standard ppt and  odp tried.

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

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

2017-12-09 Thread Gabor Kelemen

 dictionaries |2 +-
 include/sfx2/strings.hrc |   42 --
 sfx2/inc/strings.hxx |   40 ++--
 sfx2/source/doc/doctempl.cxx |   42 +-
 4 files changed, 104 insertions(+), 22 deletions(-)

New commits:
commit 29c07c224d8b51ff9bf417eb2e3960cd0f9612fd
Author: Gabor Kelemen 
Date:   Wed Nov 29 01:06:46 2017 +0100

tdf#114088 Translate default template names

Change-Id: I173364d723e0afd7275b469aea1f2e8cb105fdab
Reviewed-on: https://gerrit.libreoffice.org/45450
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit d635da1972f15862bb283e77787243fbff8361a6)
Reviewed-on: https://gerrit.libreoffice.org/46160

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index aceb597db301..d323efd25258 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -267,16 +267,38 @@
 #define SFX_STR_SIDEBAR_RESTORE NC_("SFX_STR_SIDEBAR_RESTORE", 
"Restore Default")
 #define SFX_STR_SIDEBAR_HIDE_SIDEBAR
NC_("SFX_STR_SIDEBAR_HIDE_SIDEBAR", "Close Sidebar")
 
-#define STR_TEMPLATE_NAME1  NC_("STR_TEMPLATE_NAME1", 
"Abstract Green")
-#define STR_TEMPLATE_NAME2  NC_("STR_TEMPLATE_NAME2", 
"Abstract Red")
-#define STR_TEMPLATE_NAME3  NC_("STR_TEMPLATE_NAME3", 
"Abstract Yellow")
-#define STR_TEMPLATE_NAME4  NC_("STR_TEMPLATE_NAME4", 
"Bright Blue")
-#define STR_TEMPLATE_NAME5  NC_("STR_TEMPLATE_NAME5", 
"DNA")
-#define STR_TEMPLATE_NAME6  NC_("STR_TEMPLATE_NAME6", 
"Inspiration")
-#define STR_TEMPLATE_NAME7  NC_("STR_TEMPLATE_NAME7", 
"Lush Green")
-#define STR_TEMPLATE_NAME8  NC_("STR_TEMPLATE_NAME8", 
"Metropolis")
-#define STR_TEMPLATE_NAME9  NC_("STR_TEMPLATE_NAME9", 
"Sunset")
-#define STR_TEMPLATE_NAME10 NC_("STR_TEMPLATE_NAME10", 
"Vintage")
+// Translators: default Impress template names
+#define STR_TEMPLATE_NAME1  NC_("STR_TEMPLATE_NAME1", 
"Alizarin")
+#define STR_TEMPLATE_NAME2  NC_("STR_TEMPLATE_NAME2", 
"Beehive")
+#define STR_TEMPLATE_NAME3  NC_("STR_TEMPLATE_NAME3", 
"Blue Curve")
+#define STR_TEMPLATE_NAME4  NC_("STR_TEMPLATE_NAME4", 
"Blueprint Plans")
+#define STR_TEMPLATE_NAME5  NC_("STR_TEMPLATE_NAME5", 
"Bright Blue")
+#define STR_TEMPLATE_NAME6  NC_("STR_TEMPLATE_NAME6", 
"Classy Red")
+#define STR_TEMPLATE_NAME7  NC_("STR_TEMPLATE_NAME7", 
"DNA")
+#define STR_TEMPLATE_NAME8  NC_("STR_TEMPLATE_NAME8", 
"Focus")
+#define STR_TEMPLATE_NAME9  NC_("STR_TEMPLATE_NAME9", 
"Forestbird")
+#define STR_TEMPLATE_NAME10 NC_("STR_TEMPLATE_NAME10", 
"Impress")
+#define STR_TEMPLATE_NAME11 NC_("STR_TEMPLATE_NAME11", 
"Inspiration")
+#define STR_TEMPLATE_NAME12 NC_("STR_TEMPLATE_NAME12", 
"Lights")
+#define STR_TEMPLATE_NAME13 NC_("STR_TEMPLATE_NAME13", 
"Lush Green")
+#define STR_TEMPLATE_NAME14 NC_("STR_TEMPLATE_NAME14", 
"Metropolis")
+#define STR_TEMPLATE_NAME15 NC_("STR_TEMPLATE_NAME15", 
"Midnightblue")
+#define STR_TEMPLATE_NAME16 NC_("STR_TEMPLATE_NAME16", 
"Nature Illustration")
+#define STR_TEMPLATE_NAME17 NC_("STR_TEMPLATE_NAME17", 
"Pencil")
+#define STR_TEMPLATE_NAME18 NC_("STR_TEMPLATE_NAME18", 
"Piano")
+#define STR_TEMPLATE_NAME19 NC_("STR_TEMPLATE_NAME19", 
"Portfolio")
+#define STR_TEMPLATE_NAME20 NC_("STR_TEMPLATE_NAME20", 
"Progress")
+#define STR_TEMPLATE_NAME21 NC_("STR_TEMPLATE_NAME21", 
"Sunset")
+#define STR_TEMPLATE_NAME22 NC_("STR_TEMPLATE_NAME22", 
"Vintage")
+#define STR_TEMPLATE_NAME23 NC_("STR_TEMPLATE_NAME23", 
"Vivid")
+// Translators: default Writer template names
+#define STR_TEMPLATE_NAME24 NC_("STR_TEMPLATE_NAME24", 
"CV")
+#define STR_TEMPLATE_NAME25 NC_("STR_TEMPLATE_NAME25", 
"Resume")
+#define STR_TEMPLATE_NAME26 NC_("STR_TEMPLATE_NAME26", 
"Default")
+#define STR_TEMPLATE_NAME27 NC_("STR_TEMPLATE_NAME27", 
"Modern")
+#define STR_TEMPLATE_NAME28 NC_("STR_TEMPLATE_NAME28", 
"Modern business letter sans-serif")
+#define STR_TEMPLATE_NAME29 NC_("STR_TEMPLATE_NAME29", 
"Modern business letter serif")
+#define STR_TEMPLATE_NAME30 NC_("STR_TEMPLATE_NAME30", 
"Businesscard with logo")
 
 #define

[Libreoffice-commits] core.git: dictionaries

2017-12-09 Thread László Németh

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

New commits:
commit e9bac78922c70ad374ae4ca15d6f2258668697b7
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Wed Dec 6 18:30:20 2017 +0100

Updated core
Project: dictionaries  daa1165deae904b035dae296e97811fb2c4f771d

tdf#95024 update Hungarian spelling dictionary

â improved affix rules

â extended pronunciation and common misspelling data for
  improved Hunspell suggestions

- new and fixed words

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

diff --git a/dictionaries b/dictionaries
index 16bfcddaad3e..daa1165deae9 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68
+Subproject commit daa1165deae904b035dae296e97811fb2c4f771d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 114370] New: Delete chapter from navigator with (Shift/Ctrl) and Suppr

2017-12-09 Thread bugzilla-daemon

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

Bug ID: 114370
   Summary: Delete chapter from navigator with (Shift/Ctrl) and
Suppr
   Product: LibreOffice
   Version: 5.3.5.2 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: marcdu...@hotmail.com

Description:
Hello, it would be fantastic if it was possible to delete à chapter from the
navigator just by pressing on the "Suppr" touch after clicking in the navigator
Il would be more fantastic if it was possible to delete multi chapter by
selecting chapters (with Ctrl or Shift), and then delete them with the "Suppr"
touch

Actual Results:  
Nothing happens when a hit the "suppr" touche in writer navigator

Expected Results:
Hello, it would be fantastic if it was possible to delete à chapter from the
navigator just by pressing on the "Suppr" touch after clicking in the navigator
Il would be more fantastic if it was possible to delete multi chapter by
selecting chapters (with Ctrl or Shift), and then delete them with the "Suppr"
touch.
For information, Word has this behaviour and it is very useful !


Reproducible: Always


User Profile Reset: No



Additional Info:


User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:57.0) Gecko/20100101
Firefox/57.0

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

[Libreoffice-commits] dictionaries.git: es/description.xml es/es_ANY.aff es/es_ANY.dic

2017-12-09 Thread Ricardo Palomares

 es/description.xml |2 -
 es/es_ANY.aff  |   21 ++-
 es/es_ANY.dic  |   70 +
 3 files changed, 69 insertions(+), 24 deletions(-)

New commits:
commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68
Author: Ricardo Palomares 
Date:   Sat Dec 9 14:42:02 2017 +0100

Bring shipped Spanish dictionary up to version 2.2

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

diff --git a/es/description.xml b/es/description.xml
index 703d1fc..21c5f24 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
 
-
+
 
 
 
diff --git a/es/es_ANY.aff b/es/es_ANY.aff
index 51f4ef0..af86543 100644
--- a/es/es_ANY.aff
+++ b/es/es_ANY.aff
@@ -1,4 +1,5 @@
 SET UTF-8
+FLAG UTF-8
 TRY 
aeroinsctldumpbgfvhzÃ³ÃjÃ¡qÃ©Ã±xyÃºÃ¼kwAEROINSCTLDUMPBGFVHZÃÃJÃQÃÃXYÃÃKW
 REP 20
 REP Ã¡s az
@@ -105,6 +106,8 @@ PFX u e tras e[^s]
 PFX v Y 2
 PFX v 0 contra [^r]
 PFX v 0 contrar r
+PFX w Y 1
+PFX w 0 ex  .
 SFX A Y 9
 SFX A r ciÃ³n/S ar
 SFX A er iciÃ³n/S [^cn]er
@@ -3449,7 +3452,7 @@ SFX Ã uzar Ãºzalas uzar
 SFX Ã uzar Ãºzala uzar
 SFX Ã uzar Ãºzalos uzar
 SFX Ã uzar Ãºzalo uzar
-SFX Ã Y 168
+SFX Ã Y 170
 SFX Ã abar Ã¡bame abar
 SFX Ã abar Ã¡banos abar
 SFX Ã r me r
@@ -3566,6 +3569,8 @@ SFX Ã obrar Ã³brame obrar
 SFX Ã obrar Ã³branos obrar
 SFX Ã ocar Ã³came ocar
 SFX Ã ocar Ã³canos ocar
+SFX Ã ocer Ã³ceme ocer
+SFX Ã ocer Ã³cenos ocer
 SFX Ã oger Ã³geme oger
 SFX Ã oger Ã³genos oger
 SFX Ã ojar Ã³jame ojar
@@ -3705,7 +3710,7 @@ SFX Ã untar Ãºntales untar
 SFX Ã untar Ãºntale untar
 SFX Ã uscar Ãºscales uscar
 SFX Ã uscar Ãºscale uscar
-SFX Ã Y 312
+SFX Ã Y 324
 SFX Ã adir Ã¡demela adir
 SFX Ã adir Ã¡demelas adir
 SFX Ã adir Ã¡demelo adir
@@ -3790,6 +3795,18 @@ SFX Ã ancar Ã¡ncasela ancar
 SFX Ã ancar Ã¡ncaselas ancar
 SFX Ã ancar Ã¡ncaselo ancar
 SFX Ã ancar Ã¡ncaselos ancar
+SFX Ã andar Ã¡ndamela andar
+SFX Ã andar Ã¡ndamelas andar
+SFX Ã andar Ã¡ndamelo andar
+SFX Ã andar Ã¡ndamelos andar
+SFX Ã andar Ã¡ndanosla andar
+SFX Ã andar Ã¡ndanoslas andar
+SFX Ã andar Ã¡ndanoslo andar
+SFX Ã andar Ã¡ndanoslos andar
+SFX Ã andar Ã¡ndasela andar
+SFX Ã andar Ã¡ndaselas andar
+SFX Ã andar Ã¡ndaselo andar
+SFX Ã andar Ã¡ndaselos andar
 SFX Ã antar Ã¡ntamela antar
 SFX Ã antar Ã¡ntamelas antar
 SFX Ã antar Ã¡ntamelo antar
diff --git a/es/es_ANY.dic b/es/es_ANY.dic
index d390378..f041479 100644
--- a/es/es_ANY.dic
+++ b/es/es_ANY.dic
@@ -1,4 +1,4 @@
-58918
+58946
 a
 ababa/S
 ababillar/RED
@@ -9906,6 +9906,7 @@ calefactorio/S
 caleidoscÃ³pico/GS
 caleidoscopio/S
 calendario/S
+calendarizar/REDA
 calentador/GS
 calentador/S
 calentado/S
@@ -10521,6 +10522,7 @@ capacidad/kS
 capacitaciÃ³n/S
 capacitador/GS
 capacitar/REDÃÃÃÃ±
+capacitor/S
 capadocio/GS
 capador/S
 capadura/S
@@ -13744,7 +13746,7 @@ combar/RED
 comba/S
 combate/S
 combatidor/S
-combatiente/S
+combatiente/wS
 combatir/REDÃÃÃÃÃ±T
 combatividad/S
 combativo/SG
@@ -14123,8 +14125,10 @@ comÃºnmente
 comÃºn/S
 con
 conato/S
+concadenadamente
 concadenar/RED
 concatenaciÃ³n/S
+concatenadamente
 concatenar/RED
 cÃ³ncava/S
 cÃ³ncavo/GS
@@ -14140,7 +14144,8 @@ concelebrar/RED
 concentraciÃ³n/S
 concentrador/GS
 concentrado/S
-concentrar/REDÃÃÃÃÃ±Ã²Ã´Ã¸T
+concentrar/hpREDÃÃÃÃÃ±Ã²Ã´Ã¸T
+concÃ©ntricamente
 ConcepciÃ³n
 concepcionista/S
 concepciÃ³n/S
@@ -14555,7 +14560,7 @@ connotativo/SG
 connumerar
 conocedor/GS
 conocedor/hSGp
-conocer/IRDÃÃÃÃÃÃÃÃ±Ã²Ãµ
+conocer/IÃRDÃÃÃÃÃÃÃÃ±Ã²Ãµ
 conocible/Sp
 conocida/hp
 conocidamente
@@ -16078,6 +16083,7 @@ cuaresmal/S
 cuaresmar
 cuaresmario/S
 cuaresma/S
+cuark/S
 Cuart
 cuartago/S
 cuartal/S
@@ -16457,6 +16463,7 @@ CuritÃ
 currar/REDÃÃ
 curricular/S
 currÃculo/S
+currÃculum
 curro/GS
 curro/S
 curruca/S
@@ -17137,6 +17144,7 @@ demora/S
 demoroso/GS
 demos
 demo/S
+dÃ©moselo
 demosofÃa/S
 demÃ³stenes
 demostrable/kS
@@ -17199,10 +17207,6 @@ denotativo/GS
 densa/fS
 densar
 dense
-dÃ©nsela
-dÃ©nselas
-dÃ©nselo
-dÃ©nselos
 densidad/S
 densificar/RED
 denso/GS
@@ -17334,6 +17338,7 @@ dermatitis
 dermatoesqueleto/S
 dermatosis
 dermesto/S
+dÃ©rmico/GS
 dermis
 dermitis
 derogador/GS
@@ -19600,6 +19605,7 @@ diestro/GS
 dietario/S
 dietar/RED
 dieta/S
+dietÃ©tico/GS
 DÃez
 diezmar/RED
 diezma/S
@@ -20542,6 +20548,7 @@ driblar/RED
 dril/S
 drino/iS
 driza/S
+drogadicciÃ³n/S
 drogadicto/GS
 droga/LS
 drogar/REDÃÃÃ±Ã²
@@ -22668,6 +22675,7 @@ enjuagadura/S
 enjuagar/REDÃÃÃ±Ã´Ã¸
 enjuagatorio/S
 enjuague/S
+enjugador/GS
 enjugador/S
 enjugar/REDÃÃ
 enjuiciamiento/S
@@ -24813,6 +24821,7 @@ estando
 estÃ¡ndola

[Libreoffice-commits] core.git: dictionaries

2017-12-09 Thread Ricardo Palomares

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

New commits:
commit 4bd0f84d87c16b8dba4c31384c18d644c8f3470d
Author: Ricardo Palomares 
Date:   Sat Dec 9 14:42:02 2017 +0100

Updated core
Project: dictionaries  16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68

Bring shipped Spanish dictionary up to version 2.2

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

diff --git a/dictionaries b/dictionaries
index 56684558fb8b..16bfcddaad3e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 56684558fb8bdb05cf8bc3e4c183e78de630dd6d
+Subproject commit 16bfcddaad3e545a32ba2b5bfb6a6463e2ab1f68
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svtools/uiconfig

2017-12-09 Thread Xisco Fauli

 svtools/uiconfig/ui/addresstemplatedialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30f399a631cae8060cbfb8bde87ecaadcdf4f406
Author: Xisco Fauli 
Date:   Fri Dec 1 16:55:48 2017 +0100

tdf#114098 Show vertical scrollbar

Change-Id: I03b94d6860e559a4074a3a23fcc0407f22c21df4
Reviewed-on: https://gerrit.libreoffice.org/45686
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit be40df24b26827057e5303b612196a3ded84bebd)
Reviewed-on: https://gerrit.libreoffice.org/45693
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit eed2c5d7fc7e96a06bf5862f023f08f5e2446343)
Reviewed-on: https://gerrit.libreoffice.org/45797
Tested-by: Jenkins 

diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui 
b/svtools/uiconfig/ui/addresstemplatedialog.ui
index 0b9caeb94a8c..55384267f3f1 100644
--- a/svtools/uiconfig/ui/addresstemplatedialog.ui
+++ b/svtools/uiconfig/ui/addresstemplatedialog.ui
@@ -216,6 +216,7 @@
 True
 True
 True
+always
 in
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Eike Rathke

 sc/source/ui/view/formatsh.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit dbbf644d22e3a893d83508d2c74e04a7ef9f8020
Author: Eike Rathke 
Date:   Fri Dec 8 22:20:39 2017 +0100

A "standard" format does not necessarily mean the General format

Actually there can be up to three and most times are at least two
(short,medium[,long]) of which usually the medium default is
General.

Change-Id: Iab853fbaa2db3dca488ee40f63271ccd55b6b517
(cherry picked from commit 4d850442a04b63e4ed92dcd431c8620ce12010c2)
Reviewed-on: https://gerrit.libreoffice.org/46128
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 005a1c7a5174..82f5ba3fbc97 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2540,20 +2540,18 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet 
)
 if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >= 
SfxItemState::DEFAULT ) //Modify for more robust
 {
 const SvNumberformat* pFormatEntry = 
pFormatter->GetEntry( nNumberFormat );
-bool bStandard = false;
 
 if ( pFormatEntry )
 {
 aFormatCode = pFormatEntry->GetType();
-bStandard = pFormatEntry->IsStandard();
 }
 
 switch(aFormatCode)
 {
 case css::util::NumberFormat::NUMBER:
 case css::util::NumberFormat::NUMBER| 
css::util::NumberFormat::DEFINED:
-//use format code and standard format code to 
judge whether it is General,
-if (bStandard)
+// Determine if General format.
+if ((nNumberFormat % SV_COUNTRY_LANGUAGE_OFFSET) 
== 0)
 aFormatCode = 0;
 else
 aFormatCode = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Marco Cecchetti

 sc/source/ui/view/gridwin4.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 88fa077b264a07e43fcac33607adba20e37e25a2
Author: Marco Cecchetti 
Date:   Sat Dec 2 17:19:33 2017 +0100

lok: calc: fix: CTRL+RIGHT => crash

Change-Id: I5c127aa4cbdca5e13d2329c1fb68f466464fe432
Reviewed-on: https://gerrit.libreoffice.org/45799
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a25a62d3f81d..9387c1e6d79c 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1066,7 +1066,8 @@ namespace {
 {
 long nTmp = 0; // row/col to render for nPosition
 long nLastScrPos = 0, nScrPos = 0;
-while (nScrPos <= nPosition && nTmp < MAXROW)
+const long nMaxIndex = bRowNotCol ? MAXROW : MAXCOL;
+while (nScrPos <= nPosition && nTmp < nMaxIndex)
 {
 long nSize = bRowNotCol ? pDoc->GetRowHeight( nTmp, nTabNo )
 : pDoc->GetColWidth( nTmp, nTabNo );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tests sc_array_functions_test fail due to floating point precision

2017-12-09 Thread Milton Vandersloot

Hi Eike

On December 7, 2017 at 12:40 PM Eike Rathke wrote:
> On Saturday, 2017-12-02 02:47:03 -0500, Milton Vandersloot wrote:
> > I've also opened the other test documents in
> > sc/qa/unit/data/functions/array/fods/ using LibreOffice. The documents which
> > fail are linest.fods and also logest.fods. The others succeed.
>
>If your build completed ignoring these tests (i.e. produced a
>usable office under ./instdir/), could you please open the
>failing documents and tell us the cell addresses on the second
>sheet where tests fail and the actual values they produced?

Below are the numbers. Some remarks: Many errors are in the
range of 1E-11 to 1E-12 but some are way larger >1E30. I assume
this is due some division of a very small error.

Has someone done a/some theoretical error analysis of the
algorithms involved? (e.g. numeric (forward/backward) stability
and error estimates similar to what is well-known for LU
factorization and other algorithms.)

Who/What provided the reference values -- or reformulated --
what error do these numbers have (wrt to the mathematical
solution).

Best
Milton


Below are the first three columns (A-C). They are prefixed by the
line number (e.g. 'l21'). At the end I added the formula of the
TRUE/FALSE column. I included this as some tests round to
something different than 1E-12, e.g. line 5 in linest.fods.


logest.fods Sheet 2:


l21: 538.89039831558538.890398315583FALSE   
(=ROUND(A21,12)=ROUND(B21,12))
off by 3E-12



linest.fods Sheet 2:


l39: 12237.3616028624   12237.3616028623FALSE   
(=ROUND(A39,12)=ROUND(B39,12))
off by 1E-10

l46: 1.15420554120705E+030  5.5523702096735E+030FALSE   
(=ROUND(A46,12)=ROUND(B46,12))
off by 4.4E30

l66: 1.36570269395312E+030  3.73790456956461E+029   FALSE   
(=ROUND(A66,12)=ROUND(B66,12))
off by 1.E30

l99: 2029957.60481663   2029957.60481605FALSE   
(=ROUND(A99,12)=ROUND(B99,12))
off by 6.E-7

l113: 1.11356775201247E+027 7.3824164159995E+026FALSE   
(=ROUND(A113,12)=ROUND(B113,12))
off by 4E26

l156: 9942283.62964539  9942283.62965002FALSE   
(=ROUND(A156,12)=ROUND(B156,12))
off by 5E-6
l157: 11577901.4177444  11577901.4177444FALSE   
(=ROUND(A157,12)=ROUND(B157,12))
off by 0. This keeps me puzzling ... (increasing the number of significant 
digits yields zeros on both entries)

l163: -108.083609022555 -108.083609022579   FALSE   
(=ROUND(A163,12)=ROUND(B163,12))
off by 2.4E-11
l164: 34.8435504725302  34.8435504725221FALSE   
(=ROUND(A164,12)=ROUND(B164,12))
off by 1.2E-11

l171: 2484916.49382756  2484916.49382742FALSE   
(=ROUND(A171,12)=ROUND(B171,12))
off by 1.4E-6

l184: 2.7060018272122E-14   9.25081260404044E-13FALSE   
(=ROUND(A184,12)=ROUND(B184,12))
off by 9E-13

l186: 4.04703891013103E+033 3.46285083263994E+030   FALSE   
(=ROUND(A186,12)=ROUND(B186,12))
off by 4E33

l189: 5.41123064912622E-14  1.84989825908131E-12FALSE   
(=ROUND(A189,12)=ROUND(B189,12))
off by 1.8E-12

l201: 786024.49976  786024.5001 FALSE   (=ROUND(A201,12)=ROUND(B201,12))
off by 4E-8

l216: 786024.49976  786024.5001 FALSE   (=ROUND(A216,12)=ROUND(B216,12))
off by 4E-8

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

[Libreoffice-bugs] [Bug 89060] Editing: Text spacing changes when click in textbox

2017-12-09 Thread bugzilla-daemon

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

--- Comment #10 from Chris King  ---
Still present in LO 5.4.3.2.

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

[Libreoffice-bugs] [Bug 103238] [META] Customize dialog bugs and enhancements

2017-12-09 Thread bugzilla-daemon

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

Bug 113715 Summary: Customize dialog: .uno:EditAnnotation visible in functions 
list
https://bugs.documentfoundation.org/show_bug.cgi?id=113715

   What|Removed |Added

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

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

[Libreoffice-bugs] [Bug 113715] Customize dialog: .uno: EditAnnotation visible in functions list

2017-12-09 Thread bugzilla-daemon

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

Maxim Monastirsky  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
   Assignee|libreoffice-b...@lists.free |momonas...@gmail.com
   |desktop.org |

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

[Libreoffice-bugs] [Bug 102593] [META] Paste bugs and enhancements

2017-12-09 Thread bugzilla-daemon

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

Bug 108507 Summary: Pasting from Gmail to a Writer document creates incomplete 
URL titles
https://bugs.documentfoundation.org/show_bug.cgi?id=108507

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

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

[Libreoffice-bugs] [Bug 108507] Pasting from Gmail to a Writer document creates incomplete URL titles

2017-12-09 Thread bugzilla-daemon

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

fossterer  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #11 from fossterer  ---
Hello Xisco,

I don't see the same behaviour anymore. Setting the status to 'Resolved'.

I appreciate you following up on my concern. Thanks!

(In reply to Xisco Faulí from comment #10)
> > 
> > Maybe you could try again? Perhaps they changed something in Gmail.. Very
> > weird case.
> 
> Dear fosstener,
> Could you please try it as suggested by Buovjaga?
> I have set the bug's status to 'NEEDINFO'. Please change it back to
> 'UNCONFIRMED' if the bug is still reproducible once retested

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

[Libreoffice-commits] core.git: officecfg/registry sc/sdi starmath/sdi svx/sdi sw/sdi

2017-12-09 Thread Maxim Monastirsky

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
8 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |
8 
 sc/sdi/cellsh.sdi|
6 +-
 sc/sdi/scalc.sdi |
2 +-
 starmath/sdi/smath.sdi   |
6 +++---
 svx/sdi/svx.sdi  |
8 
 sw/sdi/_viewsh.sdi   |
1 +
 8 files changed, 22 insertions(+), 25 deletions(-)

New commits:
commit 591ed2391389120efdf366f207642a98eb9f054c
Author: Maxim Monastirsky 
Date:   Fri Dec 8 02:38:10 2017 +0200

tdf#113715 Fix .uno: names appearing in the customization dialog

Change-Id: Ia4a4231acf2f15ebf58f2acd02b7fc0ab5a88072
Reviewed-on: https://gerrit.libreoffice.org/46062
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index c91b33b9fe9e..4d25cc30a9f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1879,14 +1879,6 @@
   1
 
   
-  
-
-  Sum
-
-
-  1
-
-  
   
 
   So~rt...
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 791ebefce51b..0c70d811a465 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6029,6 +6029,14 @@
   1
 
   
+  
+
+  Sum
+
+
+  1
+
+  
   
 
   Synony~ms
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 08127c537ee1..2c3c827be9c4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2393,14 +2393,6 @@
   Go to Previous Index Mark
 
   
-  
-
-  Sum
-
-
-  1
-
-  
   
 
   Go to next table formula
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 22a66319cd53..decb76cfc659 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -193,7 +193,11 @@ interface CellSelection
 SID_CHARMAP_CONTROL [ ExecMethod = ExecuteEdit; StateMethod = 
GetCellState; ]
 
 SID_INSERT_POSTIT   [ ExecMethod = ExecuteEdit; StateMethod = 
GetCellState; ]
-SID_EDIT_POSTIT   [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
+SID_EDIT_POSTIT
+[
+ExecMethod = ExecuteEdit; StateMethod = GetCellState;
+ToolBoxConfig, MenuConfig , AccelConfig;
+]
 
 SID_TABOP   [ ExecMethod = ExecuteEdit; StateMethod = 
GetState; ]
 SID_CONSOLIDATE [ ExecMethod = ExecuteEdit; StateMethod = 
GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 071ed56e250f..e06f17bd4695 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2228,7 +2228,7 @@ SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
+AccelConfig = FALSE,
 MenuConfig = FALSE,
 ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Options;
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index bf564dcf88cc..0ee7306938ca 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -228,9 +228,9 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
 RecordPerSet;
 Asynchron;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Insert;
 ]
 
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 3d684944a963..eed15720caa9 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4491,9 +4491,9 @@ SfxVoidItem EditAnnotation SID_EDIT_POSTIT
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+

[Libreoffice-bugs] [Bug 113715] Customize dialog: .uno: EditAnnotation visible in functions list

2017-12-09 Thread bugzilla-daemon

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:6.1.0

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

[Libreoffice-bugs] [Bug 113715] Customize dialog: .uno: EditAnnotation visible in functions list

2017-12-09 Thread bugzilla-daemon

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

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

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

tdf#113715 Fix .uno: names appearing in the customization dialog

It will be available in 6.1.0.

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

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

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

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-12-09 Thread andreas kainz

 icon-themes/breeze/links.txt  |5 +++--
 icon-themes/breeze_dark/links.txt |5 +++--
 icon-themes/breeze_svg/links.txt  |5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit e730c6ad094d63f133b338d111923dfade87d634
Author: andreas kainz 
Date:   Sat Dec 9 19:21:05 2017 +0100

breeze-icons: update links.txt file

Change-Id: Id6df93fdbc773f641b11c9340dccf1870e5579b6
Reviewed-on: https://gerrit.libreoffice.org/46159
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index f75980cd25e6..5c7a13247d97 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1327,6 +1327,7 @@ sw/res/sf02.png cmd/sc_charfontname.png
 sw/res/sf03.png cmd/sc_diagramarea.png
 sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
+sw/res/sf06.png cmd/sc_inserttable.png
 
 sw/res/sr2.png cmd/sc_downsearch.png
 sw/res/sr20001.png cmd/sc_upsearch.png
@@ -1372,8 +1373,8 @@ xmlsecurity/res/key_12.png dbaccess/res/pkey.png
 xmlsecurity/res/signet_11x16.png xmlsecurity/res/notcertificate_16.png
 
 cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
-cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
-cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png
+cmd/lc_rowoperations.png cmd/lc_entirerow.png
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
diff --git a/icon-themes/breeze_dark/links.txt 
b/icon-themes/breeze_dark/links.txt
index f75980cd25e6..5c7a13247d97 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1327,6 +1327,7 @@ sw/res/sf02.png cmd/sc_charfontname.png
 sw/res/sf03.png cmd/sc_diagramarea.png
 sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
+sw/res/sf06.png cmd/sc_inserttable.png
 
 sw/res/sr2.png cmd/sc_downsearch.png
 sw/res/sr20001.png cmd/sc_upsearch.png
@@ -1372,8 +1373,8 @@ xmlsecurity/res/key_12.png dbaccess/res/pkey.png
 xmlsecurity/res/signet_11x16.png xmlsecurity/res/notcertificate_16.png
 
 cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
-cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
-cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png
+cmd/lc_rowoperations.png cmd/lc_entirerow.png
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index f75980cd25e6..5c7a13247d97 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1327,6 +1327,7 @@ sw/res/sf02.png cmd/sc_charfontname.png
 sw/res/sf03.png cmd/sc_diagramarea.png
 sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
+sw/res/sf06.png cmd/sc_inserttable.png
 
 sw/res/sr2.png cmd/sc_downsearch.png
 sw/res/sr20001.png cmd/sc_upsearch.png
@@ -1372,8 +1373,8 @@ xmlsecurity/res/key_12.png dbaccess/res/pkey.png
 xmlsecurity/res/signet_11x16.png xmlsecurity/res/notcertificate_16.png
 
 cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
-cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
-cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png
+cmd/lc_rowoperations.png cmd/lc_entirerow.png
 cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 114367] Hangs if I try to save Draw file

2017-12-09 Thread bugzilla-daemon

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

bradha...@fastmail.com changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

--- Comment #2 from bradha...@fastmail.com ---
1) I already tried changing LO profile as described
2) Local Hard disk
3) I will try a recent version when I get some time to install that.

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a5/3a5b3010389f9215f1241cdb2116d6c4bc7bae

2017-12-09 Thread Caolán McNamara

 a5/3a5b3010389f9215f1241cdb2116d6c4bc7bae |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3e3214cfa772fe6ec077df33d843cbc05c759173
Author: CaolÃ¡n McNamara 
Date:   Sat Dec 9 19:56:23 2017 +

Notes added by 'git notes add'

diff --git a/a5/3a5b3010389f9215f1241cdb2116d6c4bc7bae 
b/a5/3a5b3010389f9215f1241cdb2116d6c4bc7bae
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/a5/3a5b3010389f9215f1241cdb2116d6c4bc7bae
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 104254] FILEOPEN DOCX image in header overlaps header text

2017-12-09 Thread bugzilla-daemon

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

--- Comment #4 from Gabor Kelemen  ---
Still present in 
q8p26‖Version: 6.1.0.0.alpha0+
XZmEs‖Build ID: 7886de305809e265cd2126d39912147131d3a004
Dk4vc‖CPU threads: 4; 5DyEd‖OS: Linux 4.4; Yqrwo‖UI render: ZitRE‖default; VCL:
gtk2; 
Ru2AA‖Locale: hu-HU (hu_HU.UTF-8); Calc: group threaded

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

[Libreoffice-bugs] [Bug 97038] FILEOPEN DOCX Image aligned to page instead of textframe

2017-12-09 Thread bugzilla-daemon

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

--- Comment #6 from Gabor Kelemen  ---
Still the same in: 

q8p26‖Version: 6.1.0.0.alpha0+
XZmEs‖Build ID: 7886de305809e265cd2126d39912147131d3a004
Dk4vc‖CPU threads: 4; 5DyEd‖OS: Linux 4.4; Yqrwo‖UI render: ZitRE‖default; VCL:
gtk2; 
Ru2AA‖Locale: hu-HU (hu_HU.UTF-8); Calc: group threaded

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

[Libreoffice-bugs] [Bug 114366] UI: Button "default" in Style (Formatting) toolbar in Writer doesn't work in German UI

2017-12-09 Thread bugzilla-daemon

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 CC||philip...@hotmail.com
 Resolution|--- |DUPLICATE

--- Comment #2 from Yousuf Philips (jay)  ---
This issue is also there in the style menu.

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

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

[Libreoffice-bugs] [Bug 106781] Addition of a style-focused formatting toolbar

2017-12-09 Thread bugzilla-daemon

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

Bug 114366 Summary: UI: Button "default" in Style (Formatting) toolbar in 
Writer doesn't work in German UI
https://bugs.documentfoundation.org/show_bug.cgi?id=114366

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

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

[Libreoffice-ux-advise] [Bug 106781] Addition of a style-focused formatting toolbar

2017-12-09 Thread bugzilla-daemon

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

Bug 114366 Summary: UI: Button "default" in Style (Formatting) toolbar in 
Writer doesn't work in German UI
https://bugs.documentfoundation.org/show_bug.cgi?id=114366

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

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

[Libreoffice-bugs] [Bug 108461] A translatable name shouldn' t be used to reference the default character style

2017-12-09 Thread bugzilla-daemon

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

Yousuf Philips (jay)  changed:

   What|Removed |Added

 CC||l...@tubach.net

--- Comment #2 from Yousuf Philips (jay)  ---
*** Bug 114366 has been marked as a duplicate of this bug. ***

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

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-12-09 Thread Caolán McNamara

 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab3c05f55d87984b8b5f9b9b329698cb9bdfb40b
Author: CaolÃ¡n McNamara 
Date:   Sat Dec 9 19:33:44 2017 +

oss-fuzz hasn't merged this yet

Change-Id: I0b36af5d18d1b02b7d5193e610606c5d15f95ad0

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 10759eb31cd2..c9cb2f0f1b8f 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -43,4 +43,4 @@ cp $SRC/xml.dict $OUT/fodsfuzzer.dict
 cp $SRC/xml.dict $OUT/fodpfuzzer.dict
 cp $SRC/xml.dict $OUT/fodgfuzzer.dict
 cp $SRC/xml.dict $OUT/mmlfuzzer.dict
-cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict
+#cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 109062] Scrolling with touchpad or scrollwheel is not working on Mac

2017-12-09 Thread bugzilla-daemon

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

--- Comment #25 from Telesto  ---
I'm able to repro this one. Same specs as comment 7. A likely candidate - based
on comment 8 - would be the commit for bug 103158, in my opinion.

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

[Libreoffice-bugs] [Bug 114342] Crash while opening a document

2017-12-09 Thread bugzilla-daemon

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

Julien Nabet  changed:

   What|Removed |Added

 CC||serval2...@yahoo.fr

--- Comment #5 from Julien Nabet  ---
Created attachment 138332
  --> https://bugs.documentfoundation.org/attachment.cgi?id=138332=edit
bt with debug symbols

On pc Debian x86-64 with master sources updated today + enable-dbgutil, I also
got a crash but with a different bt.

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

[Libreoffice-bugs] [Bug 100070] UKENR (Norwegian WEEKNUM function) gives wrong week numbers.

2017-12-09 Thread bugzilla-daemon

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

--- Comment #3 from Alex H.  ---
I didn't try in Norwegian, only in English, but I can confirm the behavior.
However, I think that the behavior is correct and that there is a mistake in
the documentation.

At https://help.libreoffice.org/Calc/WEEKNUM it says:

  System 1: The week containing January 1 is the first week of the
  year, and is numbered week 1.

In other words, if the mode argument is either absent, 1, 2, 11, 12, 13, 14,
15, 16 or 17, for January 1st of _any_ year the return value must be 1.

However, this directly contradicts the example further down on the same page:

  =WEEKNUM(DATE(1995;1;1);2) returns 52. If the week starts on Monday,
  Sunday belongs to the last week of the previous year.

This is wrong, I think. January 1st 1995 was a Sunday, but that doesn't even
matter under system 1, where the outcome should be 1 regardless of which day
the week starts on.

(The Norwegian version of that page,
https://help.libreoffice.org/Calc/WEEKNUM/nb, contains essentially the same
text.)

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

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

2017-12-09 Thread Caolán McNamara

 sw/source/filter/html/htmlform.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 95d0281447cb55b6a1bee7ff81f85c06648657cc
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 8 19:54:43 2017 +

catch exception for disable-database-connectivity case

Change-Id: I39da810c4f44b8bbb7250aad17fb12ce5420a000
Reviewed-on: https://gerrit.libreoffice.org/46117
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/html/htmlform.cxx 
b/sw/source/filter/html/htmlform.cxx
index 0857e0ca48e3..b426b844f311 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1299,8 +1300,14 @@ void SwHTMLParser::NewForm( bool bAppend )
 if( !rSrvcMgr.is() )
 return;
 
-uno::Reference< XInterface > xInt = rSrvcMgr->createInstance(
-"com.sun.star.form.component.Form" );
+uno::Reference< XInterface > xInt;
+try
+{
+xInt = rSrvcMgr->createInstance("com.sun.star.form.component.Form");
+}
+catch (const css::lang::ServiceNotRegisteredException&)
+{
+}
 if( !xInt.is() )
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 114367] Hangs if I try to save Draw file

2017-12-09 Thread bugzilla-daemon

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

Julien Nabet  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 CC||serval2...@yahoo.fr
 Ever confirmed|0   |1

--- Comment #1 from Julien Nabet  ---
1) try to rename your LO directory profile (see
https://wiki.documentfoundation.org/UserProfile#GNU.2FLinux) and give a new
try.

2) do you save on a local hard disk or on a usb/network or other location?

3) you can give a try to a recent LO version from LO ppa.

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

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

2017-12-09 Thread Caolán McNamara

 sw/inc/htmltbl.hxx   |   27 ---
 sw/source/core/doc/htmltbl.cxx   |   30 +
 sw/source/filter/html/htmltab.cxx|   48 +--
 sw/source/filter/writer/wrtswtbl.cxx |6 ++--
 4 files changed, 46 insertions(+), 65 deletions(-)

New commits:
commit 7459a283b3a08397d28861dbe588c9f5826398d4
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 8 17:16:48 2017 +

valgrind: more leaks on loading abi3279-1.html

Change-Id: I88d400cdd142094ece9d829a6f54a57e1b967962
Reviewed-on: https://gerrit.libreoffice.org/46106
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index ae2fb28042e7..1c65226e4108 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -37,11 +37,11 @@ class SwFrameFormat;
 
 class SwHTMLTableLayoutCnts
 {
-SwHTMLTableLayoutCnts *pNext;   ///< The next content.
+std::shared_ptr xNext;   ///< The next content.
 
 /// Only one of the following two pointers may be set!
 SwTableBox *pBox;   ///< A Box.
-SwHTMLTableLayout *pTable;  ///< A "table within a table".
+std::shared_ptr xTable;  ///< A "table within a 
table".
 
 /** During first run there are still no boxes. In this case
pStartNode is used instead of pBox. */
@@ -58,20 +58,18 @@ class SwHTMLTableLayoutCnts
 
 public:
 
-SwHTMLTableLayoutCnts( const SwStartNode* pSttNd, SwHTMLTableLayout* pTab,
-   bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt );
-
-~SwHTMLTableLayoutCnts();
+SwHTMLTableLayoutCnts(const SwStartNode* pSttNd, SwHTMLTableLayout* pTab,
+  bool bNoBreakTag, 
std::shared_ptr const& rNxt);
 
 void SetTableBox( SwTableBox *pBx ) { pBox = pBx; }
 SwTableBox *GetTableBox() const { return pBox; }
 
-SwHTMLTableLayout *GetTable() const { return pTable; }
+SwHTMLTableLayout *GetTable() const { return xTable.get(); }
 
 const SwStartNode *GetStartNode() const;
 
 /// Calculation of next node.
-SwHTMLTableLayoutCnts *GetNext() const { return pNext; }
+const std::shared_ptr& GetNext() const { return 
xNext; }
 
 void SetWidthSet( sal_uInt8 nRef ) { nWidthSet = nRef; }
 bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; }
@@ -84,7 +82,7 @@ public:
 
 class SwHTMLTableLayoutCell
 {
-SwHTMLTableLayoutCnts *pContents;  ///< Content of cell.
+std::shared_ptr xContents;  ///< Content of cell.
 
 sal_uInt16 nRowSpan;   ///< ROWSPAN of cell.
 sal_uInt16 nColSpan;   ///< COLSPAN of cell.
@@ -95,16 +93,14 @@ class SwHTMLTableLayoutCell
 
 public:
 
-SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts,
+SwHTMLTableLayoutCell(std::shared_ptr const& rCnts,
  sal_uInt16 nRSpan, sal_uInt16 nCSpan,
  sal_uInt16 nWidthOpt, bool bPrcWdthOpt,
  bool bNWrapOpt );
 
-~SwHTMLTableLayoutCell();
-
 /// Set or get content of a cell.
-void SetContents( SwHTMLTableLayoutCnts *pCnts ) { pContents = pCnts; }
-SwHTMLTableLayoutCnts *GetContents() const { return pContents; }
+void SetContents(std::shared_ptr const& rCnts) { 
xContents = rCnts; }
+const std::shared_ptr& GetContents() const { return 
xContents; }
 
 inline void SetProtected();
 
@@ -353,8 +349,7 @@ inline void SwHTMLTableLayoutCell::SetProtected()
 {
 nRowSpan = 1;
 nColSpan = 1;
-
-pContents = nullptr;
+xContents.reset();
 }
 
 inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin,
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 9408d76aa681..7c45dd598f16 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -78,40 +78,26 @@ public:
 SwHTMLTableLayoutCnts::SwHTMLTableLayoutCnts( const SwStartNode *pSttNd,
   SwHTMLTableLayout* pTab,
   bool bNoBrTag,
-  SwHTMLTableLayoutCnts* pNxt ) :
-pNext( pNxt ), pBox( nullptr ), pTable( pTab ), pStartNode( pSttNd ),
+  
std::shared_ptr const& rNxt ) :
+xNext( rNxt ), pBox( nullptr ), xTable( pTab ), pStartNode( pSttNd ),
 nPass1Done( 0 ), nWidthSet( 0 ), bNoBreakTag( bNoBrTag )
 {}
 
-SwHTMLTableLayoutCnts::~SwHTMLTableLayoutCnts()
-{
-delete pNext;
-delete pTable;
-}
-
 const SwStartNode *SwHTMLTableLayoutCnts::GetStartNode() const
 {
 return pBox ? pBox->GetSttNd() : pStartNode;
 }
 
-SwHTMLTableLayoutCell::SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts,
+SwHTMLTableLayoutCell::SwHTMLTableLayoutCell(std::shared_ptr
 const& rCnts,
   sal_uInt16 nRSpan,

Ward van Wanrooij license statement

2017-12-09 Thread Ward van Wanrooij

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

[Libreoffice-commits] core.git: helpcontent2

2017-12-09 Thread Olivier Hallot

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

New commits:
commit bb966d78980177121a15678ee7933a1ffc971b69
Author: Olivier Hallot 
Date:   Sat Dec 9 16:34:07 2017 -0200

Updated core
Project: help  49abf8b9207718aab9d4ea943730314f71589d27

Mute l10n for binary value

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

diff --git a/helpcontent2 b/helpcontent2
index 2e34647599ad..49abf8b92077 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2e34647599ad3d6a8da7b280b1f19c9d02dab54f
+Subproject commit 49abf8b9207718aab9d4ea943730314f71589d27
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

2017-12-09 Thread Olivier Hallot

 source/text/sbasic/shared/0304.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74ea250201630f2f0ad5b15bc11bf9f235268945
Author: Olivier Hallot 
Date:   Sat Dec 9 16:34:07 2017 -0200

Mute l10n for binary value

Change-Id: I0266cc37fd208cad60c2df721fcaaefaa254c12a
Reviewed-on: https://gerrit.libreoffice.org/46161
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 49abf8b9207718aab9d4ea943730314f71589d27)
Reviewed-on: https://gerrit.libreoffice.org/46163

diff --git a/source/text/sbasic/shared/0304.xhp 
b/source/text/sbasic/shared/0304.xhp
index 4b58867b9..bed14881a 100644
--- a/source/text/sbasic/shared/0304.xhp
+++ b/source/text/sbasic/shared/0304.xhp
@@ -213,7 +213,7 @@
 vbCr
 
 
-\x0D (13)
+\x0D (13)
 
 
 CR - Carriage return
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Olivier Hallot

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

New commits:
commit 057ec97a8bfd5c110324fd0d5869ea203ef9ed08
Author: Olivier Hallot 
Date:   Sat Dec 9 16:34:07 2017 -0200

Updated core
Project: help  74ea250201630f2f0ad5b15bc11bf9f235268945

Mute l10n for binary value

Change-Id: I0266cc37fd208cad60c2df721fcaaefaa254c12a
Reviewed-on: https://gerrit.libreoffice.org/46161
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 49abf8b9207718aab9d4ea943730314f71589d27)
Reviewed-on: https://gerrit.libreoffice.org/46163

diff --git a/helpcontent2 b/helpcontent2
index a46b4149241b..74ea25020163 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a46b4149241b76f65105edf13978108df199c13c
+Subproject commit 74ea250201630f2f0ad5b15bc11bf9f235268945
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Olivier Hallot

 source/text/sbasic/shared/0304.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49abf8b9207718aab9d4ea943730314f71589d27
Author: Olivier Hallot 
Date:   Sat Dec 9 16:34:07 2017 -0200

Mute l10n for binary value

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

diff --git a/source/text/sbasic/shared/0304.xhp 
b/source/text/sbasic/shared/0304.xhp
index 4b58867b9..bed14881a 100644
--- a/source/text/sbasic/shared/0304.xhp
+++ b/source/text/sbasic/shared/0304.xhp
@@ -213,7 +213,7 @@
 vbCr
 
 
-\x0D (13)
+\x0D (13)
 
 
 CR - Carriage return
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-12-09 Thread Olivier Hallot

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

New commits:
commit 9eb0d61e830b4917f0961d9412320a0681bd46c7
Author: Olivier Hallot 
Date:   Sat Dec 9 15:09:21 2017 -0200

Updated core
Project: help  2e34647599ad3d6a8da7b280b1f19c9d02dab54f

Finish help content for Presenter Console

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

diff --git a/helpcontent2 b/helpcontent2
index 6dbfefa1bae1..2e34647599ad 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6dbfefa1bae14ab217abc5847d4a886a5755
+Subproject commit 2e34647599ad3d6a8da7b280b1f19c9d02dab54f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - AllLangHelp_simpress.mk source/auxiliary source/media source/text

2017-12-09 Thread Olivier Hallot

 AllLangHelp_simpress.mk  |3 
 source/auxiliary/simpress.tree   |3 
 source/media/helpimg/sd_PresenterConsole01.png   |binary
 source/media/helpimg/sd_PresenterConsole02.png   |binary
 source/media/helpimg/sd_PresenterConsole03.png   |binary
 source/media/helpimg/sd_PresenterConsole04.png   |binary
 source/text/simpress/04/presenter.xhp|3 
 source/text/simpress/guide/impress_remote.xhp|2 
 source/text/simpress/guide/presenter_console.xhp |  118 +++
 9 files changed, 126 insertions(+), 3 deletions(-)

New commits:
commit a46b4149241b76f65105edf13978108df199c13c
Author: Olivier Hallot 
Date:   Sat Dec 9 15:09:21 2017 -0200

Finish help content for Presenter Console

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

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 75989f108..2784af8e9 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -160,6 +160,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/02/1318 \
 helpcontent2/source/text/simpress/02/1319 \
 helpcontent2/source/text/simpress/04/0102 \
+helpcontent2/source/text/simpress/04/presenter \
 helpcontent2/source/text/simpress/guide/3d_create \
 helpcontent2/source/text/simpress/guide/animated_gif_create \
 helpcontent2/source/text/simpress/guide/animated_gif_save \
@@ -189,6 +190,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/guide/page_copy \
 helpcontent2/source/text/simpress/guide/palette_files \
 helpcontent2/source/text/simpress/guide/photo_album \
+helpcontent2/source/text/simpress/guide/presenter_console \
 helpcontent2/source/text/simpress/guide/print_tofit \
 helpcontent2/source/text/simpress/guide/printing \
 helpcontent2/source/text/simpress/guide/rehearse_timings \
@@ -221,7 +223,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/main0213 \
 helpcontent2/source/text/simpress/main0214 \
 helpcontent2/source/text/simpress/main0503 \
-helpcontent2/source/text/simpress/presenter \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree
index 5dcde779f..56fd29d63 100644
--- a/source/auxiliary/simpress.tree
+++ b/source/auxiliary/simpress.tree
@@ -26,7 +26,7 @@
  Using 
Shortcut Keys in %PRODUCTNAME Impress 
  Shortcut Keys for 
Drawing Objects
  Shortcut Keys 
for %PRODUCTNAME Impress
- Presenter 
Console Keyboard Shortcuts
+ Presenter 
Console Keyboard Shortcuts
  Shortcut Keys for 
Drawings
  Instructions 
for Using %PRODUCTNAME Impress
  Instructions for 
Using %PRODUCTNAME Draw
@@ -156,6 +156,7 @@
  
  
  Showing a Slide 
Show
+ The Presenter 
Console
  Slide 
Show Remote Control - Impress Remote
  Creating 
a Custom Slide Show
  Rehearse Timings of 
Slide Changes
diff --git a/source/media/helpimg/sd_PresenterConsole01.png 
b/source/media/helpimg/sd_PresenterConsole01.png
new file mode 100644
index 0..adc5a6db7
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole01.png 
differ
diff --git a/source/media/helpimg/sd_PresenterConsole02.png 
b/source/media/helpimg/sd_PresenterConsole02.png
new file mode 100644
index 0..911d1ee07
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole02.png 
differ
diff --git a/source/media/helpimg/sd_PresenterConsole03.png 
b/source/media/helpimg/sd_PresenterConsole03.png
new file mode 100644
index 0..832209210
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole03.png 
differ
diff --git a/source/media/helpimg/sd_PresenterConsole04.png 
b/source/media/helpimg/sd_PresenterConsole04.png
new file mode 100644
index 0..d94119da8
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole04.png 
differ
diff --git a/source/text/simpress/presenter.xhp 
b/source/text/simpress/04/presenter.xhp
similarity index 99%
rename from source/text/simpress/presenter.xhp
rename to source/text/simpress/04/presenter.xhp
index b5cbe4b29..95b98ad6e 100644
--- a/source/text/simpress/presenter.xhp
+++ b/source/text/simpress/04/presenter.xhp
@@ -29,6 +29,7 @@
 Presenter Console 
shortcuts
 
 Presenter Console Keyboard Shortcuts
+
   When running a slide show using the Presenter Console, you can 
use the following keys:
   
  
@@ -168,6 +169,6 @@
 
  
   
-
+  

 
diff --git a/source/text/simpress/guide/impress_remote.xhp

[Libreoffice-commits] help.git: AllLangHelp_simpress.mk source/auxiliary source/media source/text

2017-12-09 Thread Olivier Hallot

 AllLangHelp_simpress.mk  |3 
 source/auxiliary/simpress.tree   |3 
 source/media/helpimg/sd_PresenterConsole01.png   |binary
 source/media/helpimg/sd_PresenterConsole02.png   |binary
 source/media/helpimg/sd_PresenterConsole03.png   |binary
 source/media/helpimg/sd_PresenterConsole04.png   |binary
 source/text/simpress/04/presenter.xhp|3 
 source/text/simpress/guide/impress_remote.xhp|2 
 source/text/simpress/guide/presenter_console.xhp |  118 +++
 9 files changed, 126 insertions(+), 3 deletions(-)

New commits:
commit 2e34647599ad3d6a8da7b280b1f19c9d02dab54f
Author: Olivier Hallot 
Date:   Sat Dec 9 15:09:21 2017 -0200

Finish help content for Presenter Console

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

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 75989f108..2784af8e9 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -160,6 +160,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/02/1318 \
 helpcontent2/source/text/simpress/02/1319 \
 helpcontent2/source/text/simpress/04/0102 \
+helpcontent2/source/text/simpress/04/presenter \
 helpcontent2/source/text/simpress/guide/3d_create \
 helpcontent2/source/text/simpress/guide/animated_gif_create \
 helpcontent2/source/text/simpress/guide/animated_gif_save \
@@ -189,6 +190,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/guide/page_copy \
 helpcontent2/source/text/simpress/guide/palette_files \
 helpcontent2/source/text/simpress/guide/photo_album \
+helpcontent2/source/text/simpress/guide/presenter_console \
 helpcontent2/source/text/simpress/guide/print_tofit \
 helpcontent2/source/text/simpress/guide/printing \
 helpcontent2/source/text/simpress/guide/rehearse_timings \
@@ -221,7 +223,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/main0213 \
 helpcontent2/source/text/simpress/main0214 \
 helpcontent2/source/text/simpress/main0503 \
-helpcontent2/source/text/simpress/presenter \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree
index 5dcde779f..56fd29d63 100644
--- a/source/auxiliary/simpress.tree
+++ b/source/auxiliary/simpress.tree
@@ -26,7 +26,7 @@
  Using 
Shortcut Keys in %PRODUCTNAME Impress 
  Shortcut Keys for 
Drawing Objects
  Shortcut Keys 
for %PRODUCTNAME Impress
- Presenter 
Console Keyboard Shortcuts
+ Presenter 
Console Keyboard Shortcuts
  Shortcut Keys for 
Drawings
  Instructions 
for Using %PRODUCTNAME Impress
  Instructions for 
Using %PRODUCTNAME Draw
@@ -156,6 +156,7 @@
  
  
  Showing a Slide 
Show
+ The Presenter 
Console
  Slide 
Show Remote Control - Impress Remote
  Creating 
a Custom Slide Show
  Rehearse Timings of 
Slide Changes
diff --git a/source/media/helpimg/sd_PresenterConsole01.png 
b/source/media/helpimg/sd_PresenterConsole01.png
new file mode 100644
index 0..adc5a6db7
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole01.png 
differ
diff --git a/source/media/helpimg/sd_PresenterConsole02.png 
b/source/media/helpimg/sd_PresenterConsole02.png
new file mode 100644
index 0..911d1ee07
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole02.png 
differ
diff --git a/source/media/helpimg/sd_PresenterConsole03.png 
b/source/media/helpimg/sd_PresenterConsole03.png
new file mode 100644
index 0..832209210
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole03.png 
differ
diff --git a/source/media/helpimg/sd_PresenterConsole04.png 
b/source/media/helpimg/sd_PresenterConsole04.png
new file mode 100644
index 0..d94119da8
Binary files /dev/null and b/source/media/helpimg/sd_PresenterConsole04.png 
differ
diff --git a/source/text/simpress/presenter.xhp 
b/source/text/simpress/04/presenter.xhp
similarity index 99%
rename from source/text/simpress/presenter.xhp
rename to source/text/simpress/04/presenter.xhp
index b5cbe4b29..95b98ad6e 100644
--- a/source/text/simpress/presenter.xhp
+++ b/source/text/simpress/04/presenter.xhp
@@ -29,6 +29,7 @@
 Presenter Console 
shortcuts
 
 Presenter Console Keyboard Shortcuts
+
   When running a slide show using the Presenter Console, you can 
use the following keys:
   
  
@@ -168,6 +169,6 @@
 
  
   
-
+  

 
diff --git a/source/text/simpress/guide/impress_remote.xhp

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

2017-12-09 Thread Olivier Hallot

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

New commits:
commit ade432c1a67b6cceb1cdb130573201b025edf02a
Author: Olivier Hallot 
Date:   Sat Dec 9 15:09:21 2017 -0200

Updated core
Project: help  a46b4149241b76f65105edf13978108df199c13c

Finish help content for Presenter Console

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

diff --git a/helpcontent2 b/helpcontent2
index 8c1f54ec1d24..a46b4149241b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8c1f54ec1d24df174f5af679298b48fccaaeaaba
+Subproject commit a46b4149241b76f65105edf13978108df199c13c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-09 Thread Takeshi Abe

 include/svtools/imap.hxx  |5 +++--
 svtools/source/misc/imap.cxx  |   38 +-
 svtools/source/misc/imap2.cxx |   22 --
 3 files changed, 28 insertions(+), 37 deletions(-)

New commits:
commit 0fa13a403fed6e729e58963479d34694afa7b8d8
Author: Takeshi Abe 
Date:   Sat Dec 9 23:28:39 2017 +0900

svtools: Simplify ImageMap with std::unique_ptr

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

diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 427d2768b67d..e60efb9990ed 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class Point;
@@ -35,7 +36,7 @@ class SVT_DLLPUBLIC ImageMap final
 {
 private:
 
-::std::vector< IMapObject* > maList;
+std::vector maList;
 OUString aName;
 
 // binary saving/loading
@@ -81,7 +82,7 @@ public:
 // not be destroyed from outside
 IMapObject* GetIMapObject( size_t nPos ) const
 {
-return ( nPos < maList.size() ) ? maList[ nPos ] : 
nullptr;
+return ( nPos < maList.size() ) ? maList[ nPos 
].get() : nullptr;
 }
 
 // returns the object which was hit first or NULL;
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 471399fd40bc..b06fd21042db 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -570,15 +570,15 @@ ImageMap::ImageMap( const ImageMap& rImageMap )
 switch( pCopyObj->GetType() )
 {
 case IMAP_OBJ_RECTANGLE:
-maList.push_back( new IMapRectangleObject( 
*static_cast( pCopyObj ) ) );
+maList.emplace_back( new IMapRectangleObject( 
*static_cast( pCopyObj ) ) );
 break;
 
 case IMAP_OBJ_CIRCLE:
-maList.push_back( new IMapCircleObject( 
*static_cast( pCopyObj ) ) );
+maList.emplace_back( new IMapCircleObject( 
*static_cast( pCopyObj ) ) );
 break;
 
 case IMAP_OBJ_POLYGON:
-maList.push_back( new IMapPolygonObject( 
*static_cast( pCopyObj ) ) );
+maList.emplace_back( new IMapPolygonObject( 
*static_cast( pCopyObj ) ) );
 break;
 
 default:
@@ -598,8 +598,6 @@ ImageMap::ImageMap( const ImageMap& rImageMap )
 
 ImageMap::~ImageMap()
 {
-
-ClearImageMap();
 }
 
 
@@ -611,8 +609,6 @@ ImageMap::~ImageMap()
 
 void ImageMap::ClearImageMap()
 {
-for(IMapObject* i : maList)
-delete i;
 maList.clear();
 
 aName.clear();
@@ -638,15 +634,15 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap )
 switch( pCopyObj->GetType() )
 {
 case IMAP_OBJ_RECTANGLE:
-maList.push_back( new IMapRectangleObject( 
*static_cast(pCopyObj) ) );
+maList.emplace_back( new IMapRectangleObject( 
*static_cast(pCopyObj) ) );
 break;
 
 case IMAP_OBJ_CIRCLE:
-maList.push_back( new IMapCircleObject( 
*static_cast(pCopyObj) ) );
+maList.emplace_back( new IMapCircleObject( 
*static_cast(pCopyObj) ) );
 break;
 
 case IMAP_OBJ_POLYGON:
-maList.push_back( new IMapPolygonObject( 
*static_cast(pCopyObj) ) );
+maList.emplace_back( new IMapPolygonObject( 
*static_cast(pCopyObj) ) );
 break;
 
 default:
@@ -678,7 +674,7 @@ bool ImageMap::operator==( const ImageMap& rImageMap )
 
 for ( size_t i = 0; ( i < nCount ) && !bDifferent; i++ )
 {
-IMapObject* pObj = maList[ i ];
+IMapObject* pObj = maList[ i ].get();
 IMapObject* pEqObj = rImageMap.GetIMapObject( i );
 
 if ( pObj->GetType() == pEqObj->GetType() )
@@ -745,15 +741,15 @@ void ImageMap::InsertIMapObject( const IMapObject& 
rIMapObject )
 switch( rIMapObject.GetType() )
 {
 case IMAP_OBJ_RECTANGLE:
-maList.push_back( new IMapRectangleObject( static_cast( rIMapObject ) ) );
+maList.emplace_back( new IMapRectangleObject( static_cast( rIMapObject ) ) );
 break;
 
 case IMAP_OBJ_CIRCLE:
-maList.push_back( new IMapCircleObject( static_cast( rIMapObject ) ) );
+maList.emplace_back( new IMapCircleObject( static_cast( rIMapObject ) ) );
 break;
 
 case IMAP_OBJ_POLYGON:
-

[Libreoffice-commits] core.git: Branch 'private/kohei/excel-2003-xml-orcus-filter' - sc/source

2017-12-09 Thread Kohei Yoshida

 sc/source/filter/inc/orcusinterface.hxx |   22 +
 sc/source/filter/orcus/interface.cxx|  118 +++-
 2 files changed, 107 insertions(+), 33 deletions(-)

New commits:
commit ca625b897e971c9ab704c4afdf2ff1b4297f8d3f
Author: Kohei Yoshida 
Date:   Sat Dec 9 13:38:27 2017 -0500

Implement a reference resolver for orcus.

Orcus uses this to resolve cell addresses for some ops.

Change-Id: I6ee9667ad994fb830e545ba3368004866a048c25

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index 465014b0caf4..5bc3951e7c35 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -47,6 +47,8 @@ class XStatusIndicator;
 class ScOrcusGlobalSettings : public 
orcus::spreadsheet::iface::import_global_settings
 {
 ScDocumentImport& mrDoc;
+formula::FormulaGrammar::Grammar meCalcGrammar;
+orcus::spreadsheet::formula_grammar_t meOrcusGrammar;
 
 public:
 ScOrcusGlobalSettings(ScDocumentImport& rDoc);
@@ -55,6 +57,23 @@ public:
 
 virtual void 
set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) 
override;
 virtual orcus::spreadsheet::formula_grammar_t 
get_default_formula_grammar() const override;
+
+formula::FormulaGrammar::Grammar getCalcGrammar() const
+{
+return meCalcGrammar;
+}
+};
+
+class ScOrcusRefResolver : public 
orcus::spreadsheet::iface::import_reference_resolver
+{
+const ScDocumentImport& mrDoc;
+const ScOrcusGlobalSettings& mrGlobalSettings;
+
+public:
+ScOrcusRefResolver( const ScDocumentImport& rDoc, const 
ScOrcusGlobalSettings& rGS );
+
+orcus::spreadsheet::address_t resolve_address(const char* p, size_t n);
+orcus::spreadsheet::range_t resolve_range(const char* p, size_t n);
 };
 
 class ScOrcusSharedStrings : public 
orcus::spreadsheet::iface::import_shared_strings
@@ -202,7 +221,7 @@ class ScOrcusSheet : public 
orcus::spreadsheet::iface::import_sheet
 public:
 ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory);
 
-virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() 
override { return  }
+virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() 
override;
 virtual orcus::spreadsheet::iface::import_table* get_table() override;
 virtual orcus::spreadsheet::iface::import_sheet_properties* 
get_sheet_properties() override;
 virtual orcus::spreadsheet::iface::import_conditional_format* 
get_conditional_format() override;
@@ -497,6 +516,7 @@ class ScOrcusFactory : public 
orcus::spreadsheet::iface::import_factory
 
 StringCellCaches maStringCells;
 ScOrcusGlobalSettings maGlobalSettings;
+ScOrcusRefResolver maRefResolver;
 ScOrcusSharedStrings maSharedStrings;
 std::vector< std::unique_ptr > maSheets;
 ScOrcusStyles maStyles;
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index c31eb3720ff8..1e917963ccc2 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -58,20 +58,97 @@ using namespace com::sun::star;
 
 namespace os = orcus::spreadsheet;
 
-ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc) : 
mrDoc(rDoc) {}
+namespace {
+
+formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( 
os::formula_grammar_t grammar )
+{
+formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_ODFF;
+switch(grammar)
+{
+case orcus::spreadsheet::formula_grammar_t::ods:
+eGrammar = formula::FormulaGrammar::GRAM_ODFF;
+break;
+case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
+case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
+eGrammar = formula::FormulaGrammar::GRAM_OOXML;
+break;
+case orcus::spreadsheet::formula_grammar_t::gnumeric:
+eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
+break;
+case orcus::spreadsheet::formula_grammar_t::xls_xml:
+eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
+break;
+case orcus::spreadsheet::formula_grammar_t::unknown:
+break;
+}
+
+return eGrammar;
+}
+
+}
+
+ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc) :
+mrDoc(rDoc), meOrcusGrammar(os::formula_grammar_t::unknown) {}
 
 void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
 {
 mrDoc.setOriginDate(year, month, day);
 }
 
-void 
ScOrcusGlobalSettings::set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t
 /*grammar*/)
+void ScOrcusGlobalSettings::set_default_formula_grammar(os::formula_grammar_t 
grammar)
 {
+meCalcGrammar = getCalcGrammarFromOrcus(grammar);
+meOrcusGrammar = grammar;
 }
 
 orcus::spreadsheet::formula_grammar_t 
ScOrcusGlobalSettings::get_default_formula_grammar() const
 {
-

1 2 3 >

1 - 100 of 221 matches

Mail list logo