date:20230211

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

2023-02-11 Thread Justin Luth (via logerrit)

 sw/inc/IDocumentMarkAccess.hxx  |2 +-
 sw/qa/extras/globalfilter/globalfilter.cxx  |2 +-
 sw/source/core/crsr/crbm.cxx|2 +-
 sw/source/core/crsr/crstrvl.cxx |2 +-
 sw/source/core/crsr/pam.cxx |4 ++--
 sw/source/core/crsr/swcrsr.cxx  |2 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 +-
 sw/source/core/doc/docbm.cxx|   11 +++
 sw/source/core/inc/MarkManager.hxx  |2 +-
 sw/source/core/text/inftxt.cxx  |2 +-
 sw/source/core/text/itrform2.cxx|2 +-
 sw/source/core/text/redlnitr.cxx|2 +-
 sw/source/core/txtnode/modeltoviewhelper.cxx|4 ++--
 sw/source/core/unocore/unotext.cxx  |4 ++--
 sw/source/filter/ww8/wrtw8nds.cxx   |4 ++--
 sw/source/uibase/shells/textfld.cxx |6 +++---
 sw/source/uibase/shells/textsh1.cxx |8 
 sw/source/uibase/uno/loktxdoc.cxx   |2 +-
 sw/source/uibase/uno/unotxdoc.cxx   |4 ++--
 19 files changed, 35 insertions(+), 32 deletions(-)

New commits:
commit f7afed99a807a9ce42edf84cab36a4710ddcd58e
Author: Justin Luth 
AuthorDate: Thu Jan 12 11:35:02 2023 -0500
Commit: Justin Luth 
CommitDate: Sat Feb 11 12:10:55 2023 +

sw: rename getFieldmarkFor() to getInnerFieldmarkFor()

The same change was made for getBookmarkFor()
in https://gerrit.libreoffice.org/c/core/+/145412

Because otherwise it's quite confusing
that we have a For() and an At()
which could only be differentiated by a code read.

Also improve getInnerFieldmarkFor() a tiny bit,
so we process the first hit only once.

Suggested at

.

Change-Id: I47e815eea0b8ac0df4957ac0d224acb6c5975b8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145486
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index e86a4efc8f1a..d53f180d3fe9 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -329,7 +329,7 @@ class IDocumentMarkAccess
 
 /// get Fieldmark for CH_TXT_ATR_FIELDSTART/CH_TXT_ATR_FIELDEND at rPos
 virtual ::sw::mark::IFieldmark* getFieldmarkAt(const SwPosition& rPos) 
const =0;
-virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& pos) 
const =0;
+virtual sw::mark::IFieldmark* getInnerFieldmarkFor(const SwPosition& 
pos) const = 0;
 virtual sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& 
pos, bool bLoop) const =0;
 virtual sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& pos, 
bool bLoop) const =0;
 
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 7beb928dd344..2b8c37114ce1 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -889,7 +889,7 @@ static auto verifyNestedFieldmark(OUString const& rTestName,
 + u"baz" + OUStringChar(CH_TXT_ATR_FIELDEND)), outerString);
 
 // must return innermost mark
-CPPUNIT_ASSERT_EQUAL(pInner, rIDMA.getFieldmarkFor(innerPos));
+CPPUNIT_ASSERT_EQUAL(pInner, rIDMA.getInnerFieldmarkFor(innerPos));
 }
 
 void Test::testNestedFieldmark()
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 53d2538538d8..e296bd50e8fe 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -287,7 +287,7 @@ bool SwCursorShell::IsFormProtected()
 {
 // TODO: Refactor
 SwPosition pos(*GetCursor()->Start());
-return getIDocumentMarkAccess()->getFieldmarkFor(pos);
+return getIDocumentMarkAccess()->getInnerFieldmarkFor(pos);
 }
 
 sw::mark::IFieldmark* SwCursorShell::GetFieldmarkAfter(bool bLoop)
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 954e9ba6707c..966127cece62 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1612,7 +1612,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 if( !bRet && IsAttrAtPos::FormControl & 
rContentAtPos.eContentAtPos )
 {
 IDocumentMarkAccess* pMarksAccess = 
GetDoc()->getIDocumentMarkAccess( );
-sw::mark::IFieldmark* pFieldBookmark = 
pMarksAccess->getFieldmarkFor( aPos );
+sw::mark::IFieldmark* pFieldBookmark = 
pMarksAccess->getInnerFieldmarkFor(aPos);
 if (bCursorFoundExact && pFieldBookmark)
 {
 rContentAtPos.eContentAtPos = IsAttrAtPos::FormCont

Re: Extended ODF schema

2023-02-11 Thread Regina Henschel


Hi Laurent,


I see no problem in your new version below, but Michael is the expert 
for RELAX. Perhaps he knows a solution.


Here only some ideas, what you could do:
Do you have inspect the tmp file of the failing test, whether it really 
has the expected markup?
Do you have confirmed, that your  
element, which is added into the  element, is not inside 
another define-element by mistake.
Do you have tried, whether a combine="choice" works? Similar as for the 
loext:clear attribute of the text:line-break element?


Kind regards,
Regina

Laurent Balland schrieb am 10.02.2023 um 19:23:

Hello,

Le 08/02/2023 à 14:09, Michael Stahl a écrit :


if it should go on the numer:text element, it needs to be a child of 
its rng:element - currently it's not extensible (via "combine" feature):


  
    
  
    
  

so you have to override it - at the start of the libreoffice schema 
there is an rng:include, paste the above into this include element and 
adapt it - this will override what is in the included file.



Thanks for your feedback. I made some progress, but it does not yet work.

I added in rng:include

     
   
     
   
     
     
   

   

and define number-text-attlist outside rng:include

   
     
   
     
   
     
   
     
   

Then I get the following errors:

- /tmp/libtest_sc_sparkline_test.sorjp6.tmp/styles.xml[2,9446]: Error: 
tag name "number:text" is not allowed. Possible tag names are: 
,,,
number:text loext:blank-width-char=")"> 

  ^
/tmp/libtest_sc_sparkline_test.sorjp6.tmp/styles.xml[2,10964]: Error: 
tag name "number:text" is not allowed. Possible tag names are: 
,
number:text loext:blank-width-char=")"> 
<


I do not understand what I made wrong. Why validator is expecting 
loext:blank-width-char with other tags than number:text?


Best regards

Laurent Balland

[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 4 commits - basegfx/test include/basegfx include/svx svx/qa svx/source sw/source

2023-02-11 Thread Tomaž Vajngerl (via logerrit)

 basegfx/test/LengthUnitTest.cxx  |  131 +--
 include/basegfx/units/LengthBase.hxx |   10 +-
 include/svx/svdobj.hxx   |4 -
 include/svx/svdopage.hxx |2 
 include/svx/svdtrans.hxx |9 ++
 svx/qa/unit/svdraw.cxx   |   69 +-
 svx/source/svdraw/svdobj.cxx |   78 +---
 svx/source/svdraw/svdopage.cxx   |5 +
 svx/source/svdraw/svdtrans.cxx   |   16 
 sw/source/core/draw/dflyobj.cxx  |   16 
 sw/source/core/inc/dflyobj.hxx   |8 +-
 11 files changed, 244 insertions(+), 104 deletions(-)

New commits:
commit a234d39f227aa328d802d987dcd7bf8bc6cd6361
Author: Tomaž Vajngerl 
AuthorDate: Sat Feb 11 22:02:11 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat Feb 11 22:02:11 2023 +0900

make NbcRotate abstract as it's implementation is noop

During testing the NbcRotate function on SdrObject it turned out
the the function is essentially a noop, because it uses normal
equality to test the values of a double, which are a product of
sin and cos functions (to determine the 90 degree angles). So
because of this the input rectangle was never modified - noop.

Because of this we can just remove the impl. of the function and
declare it abstract, so that the actual implementations define
a valid function to rotate.

There were some subclasses that didn't override the NbcRotate so
they used the one implementation in SdrObject. These subclasses
now override the function and in the implementation we call
assert(false), which is never called during a test run. It seems
we never rotate those objects.

Change-Id: I1b1a45a8e96ed2d061f9b9f80c5fdaa5a84d4c05

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 76645d262a68..7c3cad7443ea 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -544,7 +544,7 @@ public:
 virtual void NbcMove  (const Size& rSiz);
 virtual void NbcResize(const Point& rRef, const Fraction& xFact, const 
Fraction& yFact);
 virtual void NbcCrop  (const basegfx::B2DPoint& rRef, double fxFact, 
double fyFact);
-virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, 
double cs);
+virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, 
double cs) = 0;
 // Utility for call sites that don't have sin and cos handy
 void NbcRotate(const Point& rRef, Degree100 nAngle);
 virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index abb35d8239cd..279c75c758a6 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -64,6 +64,8 @@ public:
 
 virtual OUString TakeObjNameSingul() const override;
 virtual OUString TakeObjNamePlural() const override;
+
+void NbcRotate(const Point& rRef, Degree100 nAngle, double sinAngle, 
double cosAngle) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 555e77a11963..3f33e41f7cba 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1444,33 +1444,6 @@ void SdrObject::NbcRotate(const Point& rRef, Degree100 
nAngle)
 
 namespace
 {
-
-tools::Rectangle lclRotateRectangle(tools::Rectangle const& rRectangle, Point 
const& rRef, double sn, double cs)
-{
-tools::Rectangle aRectangle(rRectangle);
-aRectangle.Move(-rRef.X(),-rRef.Y());
-tools::Rectangle R(aRectangle);
-if (sn==1.0 && cs==0.0) { // 90deg
-aRectangle.SetLeft(-R.Bottom() );
-aRectangle.SetRight(-R.Top() );
-aRectangle.SetTop(R.Left() );
-aRectangle.SetBottom(R.Right() );
-} else if (sn==0.0 && cs==-1.0) { // 180deg
-aRectangle.SetLeft(-R.Right() );
-aRectangle.SetRight(-R.Left() );
-aRectangle.SetTop(-R.Bottom() );
-aRectangle.SetBottom(-R.Top() );
-} else if (sn==-1.0 && cs==0.0) { // 270deg
-aRectangle.SetLeft(R.Top() );
-aRectangle.SetRight(R.Bottom() );
-aRectangle.SetTop(-R.Right() );
-aRectangle.SetBottom(-R.Left() );
-}
-aRectangle.Move(rRef.X(),rRef.Y());
-aRectangle.Normalize(); // just in case
-return aRectangle;
-}
-
 tools::Rectangle lclMirrorRectangle(tools::Rectangle const& rRectangle, Point 
const& rRef1, Point const& rRef2)
 {
 tools::Rectangle aRectangle(rRectangle);
@@ -1502,17 +1475,6 @@ tools::Rectangle lclMirrorRectangle(tools::Rectangle 
const& rRectangle, Point co
 
 } // end anonymous namespace
 
-void SdrObject::NbcRotate(const Point& rRef,  Degree100 nAngle, double sn, 
double cs)
-{
-SetGlueReallyAbsolute(true);
-tools::Rectangle aRectangle = getOutRectangle();
-aRectangle = lclRotateRectangle(aRectangle, rRef, sn, cs);
-setOutRectangle(aRectangle);
-SetBoundAndSnapRectsDirty();
-NbcRotateGluePoints

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

2023-02-11 Thread Justin Luth (via logerrit)

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a942e6e5ecfdd9ff83fc7febb8234c8f0e2813db
Author: Justin Luth 
AuthorDate: Fri Jan 20 08:32:31 2023 -0500
Commit: Justin Luth 
CommitDate: Sat Feb 11 16:08:35 2023 +

assert commit looking for example document to test theory.

related tdf#125038 FORMTEXT/REF:fix spurious text outside IF field
speculated that this should always return false,
since the IF statement is not processed at all.
However, there are no documents that match this condition in the
existing unit tests, so a wider net is needed.

Change-Id: I8a5a0fd077cc141abc5438cacd0de77fcfe7c476
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145931
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d048d600f496..7f4c800b1002 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -292,11 +292,16 @@ static bool IsFieldNestingAllowed(const FieldContextPtr& 
pOuter, const FieldCont
 case FIELD_IF:
 case FIELD_MERGEFIELD:
 case FIELD_REF:
+case FIELD_PAGE:
+case FIELD_NUMPAGES:
 {
 // LO does not currently know how to evaluate these as 
conditions or results
 return false;
 }
 default:
+SAL_WARN("writerfilter","found 
field["<<*pInner->GetFieldId()<<"] defined in FieldTypes.hxx");
+assert(false && "looking for example documents using { IF 
} with fields for condition or result");
+return false;
 break;
 }
 break;

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

2023-02-11 Thread Seth Chaiklin (via logerrit)

 source/text/swriter/01/0406.xhp |   26 ++
 source/text/swriter/01/04060100.xhp |   24 +---
 2 files changed, 27 insertions(+), 23 deletions(-)

New commits:
commit 7266a58cba3c89fdf9cd7100c00ef360e8d45e08
Author: Seth Chaiklin 
AuthorDate: Fri Jan 27 23:40:46 2023 +
Commit: Seth Chaiklin 
CommitDate: Sat Feb 11 17:53:38 2023 +

tdf#153122: Add missing controls to Caption and Caption Options help

  swriter/01/0406.xhp
+ add Numbering Separator control and description
* move position of "Caption" to correspond to order in dialog
* refactor ,,,

   swriter/01/04060100.xhp
+ add Caption section title
+ add Caption Ordering control and description
* refactor ,,,

Change-Id: I0d97dfcc0ca9083e5eec20f679d5634764764872
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146208
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/0406.xhp 
b/source/text/swriter/01/0406.xhp
index c5eb94e0d1..9131fb75ef 100644
--- a/source/text/swriter/01/0406.xhp
+++ b/source/text/swriter/01/0406.xhp
@@ -33,46 +33,48 @@
 
 
 
-Caption
+Caption
 Adds a numbered caption to a selected image, 
table, chart, frame, or shape. You can also access this command by 
right-clicking the item that you want to add the caption to. 

 
 
 
 
 
+Caption
+Type the text 
that you want to appear after the caption number.
 
-Properties
+Properties
 Set the 
caption options for the current selection.
 
 
-Category
+Category
 Select the caption category, or 
type a name to create a new category. The category text appears before the 
caption number in the caption label. Each predefined caption category is 
formatted with a paragraph style of the same name.  For example, the 
"Illustration" caption category is formatted with the "Illustration" paragraph 
style.
 
 
-Numbering
+Numbering
 Select the type of numbering 
that you want to use in the caption.
 
 
-Caption
-Type the text that 
you want to appear after the caption number.
+Numbering separator
+Enter optional text 
characters to appear between numbering and category. Only active when 
Numbering first is selected for Caption 
order in Options.
 
 
-Separator
+Separator
 Enter optional text characters to appear between the number and the 
caption text.
 moved help id to here
 
-Position
+Position
 Adds the caption above or below 
the selected item. This option is only available for some 
objects.
 
-Options
+Options
 
 
 
-AutoCaption
+AutoCaption
 Opens the Caption dialog. It has the same information as the dialog you 
get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog 
box.
-
+
 
 
+
 
-
 
diff --git a/source/text/swriter/01/04060100.xhp 
b/source/text/swriter/01/04060100.xhp
index f3cf33a603..7c6cc2d19b 100644
--- a/source/text/swriter/01/04060100.xhp
+++ b/source/text/swriter/01/04060100.xhp
@@ -1,6 +1,5 @@
 
-
-
+
 
 
-
 
 
 Options
@@ -31,7 +29,7 @@
 
 
 
-Options
+Options
 Adds 
the chapter number to the caption label. To use this feature, you must first 
assign an outline 
level to a paragraph style, and then apply the style to the chapter 
headings in your document.
 
 
@@ -39,24 +37,28 @@
 
 
 
-Numbering by chapter
+Numbering by chapter
 When you add 
chapter numbers to caption labels, the caption numbering is reset when a 
chapter heading is encountered. For example, if the last figure in chapter 1 is 
"Figure 1.12", the first figure in the next chapter would be "Figure 
2.1".
 
-Level
+Level
 Select the number of outline 
levels from the top of the chapter hierarchy down to include in the caption 
label.
 
-Separator
+Separator
 Enter the character that you 
want to insert between the chapter number and the caption 
number.
-Category and frame format
+Category and frame format
 
-Character style
+Character style
 Specifies the character style.
 
-Apply 
border and shadow
+Apply border and shadow
 Applies the border 
and shadow of the object to the caption frame.
-
+Caption
+Caption order
+Select ordering of 
category label and numbering.
+
 
 
 
+

[Libreoffice-commits] core.git: helpcontent2

2023-02-11 Thread Seth Chaiklin (via logerrit)

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

New commits:
commit 1f1a1f3786a0f7b2efb7739ad227358561112e80
Author: Seth Chaiklin 
AuthorDate: Sat Feb 11 17:53:38 2023 +
Commit: Gerrit Code Review 
CommitDate: Sat Feb 11 17:53:38 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7266a58cba3c89fdf9cd7100c00ef360e8d45e08
  - tdf#153122: Add missing controls to Caption and Caption Options help

  swriter/01/0406.xhp
+ add Numbering Separator control and description
* move position of "Caption" to correspond to order in dialog
* refactor ,,,

   swriter/01/04060100.xhp
+ add Caption section title
+ add Caption Ordering control and description
* refactor ,,,

Change-Id: I0d97dfcc0ca9083e5eec20f679d5634764764872
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146208
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index b1149d14e24a..7266a58cba3c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b1149d14e24a6611d00ca13d0942d17d617c2620
+Subproject commit 7266a58cba3c89fdf9cd7100c00ef360e8d45e08

GSoC Project: Sidebar deck for quick find

2023-02-11 Thread Siddharth Khattar

Hello,

I was recently taking a look again at the GSoC ideas list and I found out
that it had been updated a bit since I last took a look at it a couple of
weeks ago. I, unfortunately, wasn't able to find a mentor to help me with
the previous idea (Improving Zoner Draw Filter), and also couldn't find a
copy of Zoner Draw 2 for testing, which I was researching to implement so I
went to look at the list again for inspiration. Then, the idea to implement
Quick Find as a sidebar deck interested me. As I researched the idea
further, I read through the discussion and implementation regarding this
idea at: https://bugs.documentfoundation.org/show_bug.cgi?id=95405. I also
looked at the mock-up at:
https://bug-attachments.documentfoundation.org/attachment.cgi?id=184862 &
thought that it was pretty close to my view of the project as well. The
implementation of the idea seems pretty doable for a beginner like me who
is new to open-source development as a whole. In the meanwhile, I've looked
into the files srchdlg.cxx and navigatorpanel.ui for an initial idea of the
implementation of the project.

I think the ideal implementation of this idea would be to -
1) Create an additional find/replace section in sidebar
2) Leave the current find/replace dialogue in place (for the sake of user
choice)
3) Show multiple matches of the searched keyword from the content in the
sidebar and highlight them alongside with a yellow font color in the file,
also allowing the user to cycle through them with a button click

Firstly (and most importantly), Are there please any potential mentors who
are willing to help me with this project? The GSoC ideas page mentioned
potential mentors as *Jim Raykowski and **Heiko Tietze, *can somebody
please contact them and ask if they're interested in this project?
Are there any foreseeable roadblocks or challenges to the execution of this
idea?
In which area should I start focusing my research to start working on the
document to successfully implement this idea as part of GSoC 2023?
Is anyone else currently aiming to implement this idea at LibreOffice or in
the LibreOffice open-source community?
Lastly, are there any other tips or thoughts regarding this that you would
like to give me?

Thanking for your time and consideration,
Siddharth K

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

2023-02-11 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf147892.fodt |   25 ++
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx   |   10 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   30 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |4 +--
 4 files changed, 53 insertions(+), 16 deletions(-)

New commits:
commit 382892341a63e400f221e1a533fd5a5d6b4d9d70
Author: László Németh 
AuthorDate: Fri Feb 10 13:43:40 2023 +0100
Commit: László Németh 
CommitDate: Sat Feb 11 21:06:21 2023 +

tdf#147892 DOCX: fix corrupt export at para marker revision history

OOXML export of tracked deletion of tracked paragraph insertion
resulted invalid document.xml, because change tracking history of
paragraph markers isn't supported by OOXML. Export the tracked deletion
of the last run of paragraphs without history (tracked insertion).
This way w:p/w:pPr/w:rPr contains only w:del or w:ins, not both of them
(with broken tag order).

Note: it's possible to optimize the fix to keep the change
tracking history of the characters of the last run of the paragraph,
except the paragraph marker.

Regression from commit 19b3fcf8b0374c361c7f6c285fd5c89b5a2f
"tdf#142387 DOCX track changes: export w:del in w:ins".

Minimal unit test document was created by Miklós Vajna.

Change-Id: I425f4d63c8c6ac29ccd807c1574748c7b9b39e80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146782
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf147892.fodt 
b/sw/qa/extras/ooxmlexport/data/tdf147892.fodt
new file mode 100644
index ..bb3ffc324dc1
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf147892.fodt
@@ -0,0 +1,25 @@
+
+http://purl.org/dc/elements/1.1/"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+  
+
+  
+
+  
+
+  Bob
+  2023-01-02T00:00:00
+
+  
+  
+
+  Alice
+  2023-01-01T00:00:00
+
+  
+
+  
+  
+  
+
+  
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 444fbf51a39c..2713a582c9d9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -1997,6 +1997,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf142387)
 assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p/w:ins/w:del/w:r/w:delText", "inserts ");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf147892)
+{
+loadAndSave("tdf147892.fodt");
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+// w:del in w:ins is exported correctly
+// (both w:del and w:ins were exported for para marker)
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:del", 1);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:ins", 0);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf123054, "tdf123054.docx")
 {
 CPPUNIT_ASSERT_EQUAL(OUString("No Spacing"),
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0aef9a066741..528033e7b3b7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1510,13 +1510,13 @@ void DocxAttributeOutput::EndParagraphProperties(const 
SfxItemSet& rParagraphMar
 
 if ( pRedlineParagraphMarkerDeleted )
 {
-StartRedline( pRedlineParagraphMarkerDeleted );
-EndRedline( pRedlineParagraphMarkerDeleted );
+StartRedline( pRedlineParagraphMarkerDeleted, /*bLastRun=*/true );
+EndRedline( pRedlineParagraphMarkerDeleted, /*bLastRun=*/true );
 }
 if ( pRedlineParagraphMarkerInserted )
 {
-StartRedline( pRedlineParagraphMarkerInserted );
-EndRedline( pRedlineParagraphMarkerInserted );
+StartRedline( pRedlineParagraphMarkerInserted, /*bLastRun=*/true );
+EndRedline( pRedlineParagraphMarkerInserted, /*bLastRun=*/true );
 }
 
 // mergeTopMarks() after paragraph mark properties child elements.
@@ -1623,7 +1623,7 @@ void DocxAttributeOutput::StartRun( const SwRedlineData* 
pRedlineData, sal_Int32
 m_pSerializer->mark(Tag_StartRun_3); // let's call it "postponed text"
 }
 
-void DocxAttributeOutput::EndRun(const SwTextNode* pNode, sal_Int32 nPos, 
sal_Int32 nLen, bool /*bLastRun*/)
+void DocxAttributeOutput::EndRun(const SwTextNode* pNode, sal_Int32 nPos, 
sal_Int32 nLen, bool bLastRun)
 {
 int nFieldsInPrevHyperlink = m_nFieldsInHyperlink;
 // Reset m_nFieldsInHyperlink if a new hyperlink is about to start
@@ -1707,9 +1707,9 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, sal_In
 // InputField with extra grabbag params - it is sdt field
 (

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

2023-02-11 Thread Rafael Lima (via logerrit)

 sd/source/ui/view/drviewse.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit c96e1ec61835bc01e2969ec97fce9a1674fbf6d7
Author: Rafael Lima 
AuthorDate: Sat Feb 11 16:36:00 2023 -0300
Commit: Jim Raykowski 
CommitDate: Sat Feb 11 21:07:31 2023 +

tdf#45705 Make SID_ZOOM_IN and SID_ZOOM_OUT smoother in Impress

As reported in the bug ticket, the commands SID_ZOOM_IN and SID_ZOOM_OUT 
are not smooth and increase/decrease zoom at too big steps.

This patch uses basegfx::zoomtools to zoom in and out, making it smoother.

Change-Id: I801fa6123bf0696046e5d45c7a6b309e7cc3312e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146825
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index b3183397a084..5a6a7577951e 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -95,6 +95,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1189,8 +1190,11 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 
 case SID_ZOOM_OUT:  // BASIC
 {
+const sal_uInt16 nOldZoom = GetActiveWindow()->GetZoom();
+const sal_uInt16 nNewZoom = basegfx::zoomtools::zoomOut(nOldZoom);
+SetZoom(nNewZoom);
+
 mbZoomOnPage = false;
-SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 
2, GetActiveWindow()->GetMinZoom() ) );
 ::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( 
::tools::Rectangle( Point(0,0),
   
GetActiveWindow()->GetOutputSizePixel()) );
 mpZoomList->InsertZoomRect(aVisAreaWin);
@@ -1203,8 +1207,11 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 
 case SID_ZOOM_IN:
 {
+const sal_uInt16 nOldZoom = GetActiveWindow()->GetZoom();
+const sal_uInt16 nNewZoom = basegfx::zoomtools::zoomIn(nOldZoom);
+SetZoom(nNewZoom);
+
 mbZoomOnPage = false;
-SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 
2, GetActiveWindow()->GetMaxZoom() ) );
 ::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( 
::tools::Rectangle( Point(0,0),
   
GetActiveWindow()->GetOutputSizePixel()) );
 mpZoomList->InsertZoomRect(aVisAreaWin);

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

2023-02-11 Thread Bartosz Kosiorek (via logerrit)

 emfio/qa/cppunit/emf/EmfImportTest.cxx |   45 ++---
 emfio/source/reader/emfreader.cxx  |   25 +++---
 emfio/source/reader/mtftools.cxx   |4 +-
 3 files changed, 43 insertions(+), 31 deletions(-)

New commits:
commit bbdbe8ea2ef176ef6f08b30b3c18876c2c4f0c22
Author: Bartosz Kosiorek 
AuthorDate: Fri Feb 3 22:55:54 2023 +0100
Commit: Bartosz Kosiorek 
CommitDate: Sat Feb 11 21:24:18 2023 +

tdf#142018 Properly create Pen width if style is COSMETIC

Change-Id: I6453058c4af352a3b0e14cbccbc1a67c73cd1426
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146551
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 

diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 75f2b9001a08..e858fd7afc4d 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -180,14 +180,19 @@ void Test::testPolyPolygon()
 assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[2]/polypolygon", "path",
 "m2574 13194v-12065h15303v12065z");
 
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke", 116);
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke", 44);
 assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstroke[1]/polygon",
-   "2574,13194 2574,1129 17877,1129 17877,13194");
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"color", "#ff");
-
+   "2574,13194 2574,1129");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"color", "#00");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"width", "0");
+assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstroke[2]/polygon",
+   "2574,1129 2574,1129");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", 
"color", "#00");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", 
"width", "0");
 assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstroke[10]/polygon",
-   "8674,13194 8674,1129");
+   "8674,1129 8674,1129");
 assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[10]/line", 
"color", "#00");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[10]/line", 
"width", "0");
 
 assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion", 28);
 assertXPath(pDocument, aXPathPrefix + "mask/textsimpleportion[6]", 
"width", "459");
@@ -1547,7 +1552,7 @@ void Test::TestRoundRect()
 void Test::TestCreatePen()
 {
 // Check import of EMF image with records: RESTOREDC, SAVEDC, MOVETOEX, 
LINETO, POLYLINE16, EXTTEXTOUTW with DxBuffer
-// The CREATEPEN record is used with PS_COSMETIC line style, which 
sometimes will be displayed as solid hairline
+// The CREATEPEN record is used with PS_COSMETIC line style, and in this 
case width must be set to 0
 Primitive2DSequence aSequence = 
parseEmf(u"/emfio/qa/cppunit/emf/data/TestCreatePen.emf");
 CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
 drawinglayer::Primitive2dXmlDump dumper;
@@ -1556,29 +1561,29 @@ void Test::TestCreatePen()
 
 assertXPath(pDocument, aXPathPrefix + "mask/polypolygon", "path", "m0 
0h31250v18192h-31250z");
 
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke", 748);
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke", 3);
 assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstroke[1]/polygon",
-   "27875,16523 27875,1453");
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"color", "#ff");
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"width", "6");
+   "17898,5693 20172,5693");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"color", "#008000");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[1]/line", 
"width", "0");
 
 assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstroke[2]/polygon",
-   "27975,16453 27875,16453");
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", 
"color", "#ff");
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", 
"width", "6");
+   "17898,6959 20172,6959");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", 
"color", "#80");
+assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[2]/line", 
"width", "0");
 
 assertXPathContent(pDocument, aXPathPrefix + 
"mask/polygonstroke[3]/polygon",
-   "27925,16078 27875,16078");
+   "17898,7381 20172,7381");
 assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[3]/line", 
"color", "#ff");
-assertXPath(pDocument, aXPathPrefix + "mask/polygonstroke[3]/lin

[Libreoffice-commits] core.git: 2 commits - bin/lo-pack-sources

2023-02-11 Thread Sebastian Andrzej Siewior (via logerrit)

 bin/lo-pack-sources |   24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

New commits:
commit cb9883b1e9fb620f280e950de2bb50f9ec3a4c5e
Author: Sebastian Andrzej Siewior 
AuthorDate: Tue Jan 24 23:00:44 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Feb 11 22:45:18 2023 +

lo-pack-sources: Use threaded compression for xz.

The xz utility can compress in parallel by using more CPU cores. The
more CPUs are available the quicker it gets.
The option -T0 automatically detects the number of available CPUs and
uses all of them.
Additional benefit is that xz starting with v5.4 can decompress the
archive using multiple CPUs as well.

The parallel compression works by splitting the input in multiple blocks
of equal size which are compressed in parallel. Since the state is not
preserved / reuse across blocks, the compression gets a little worse:

-6  255M (current default)
-T0 261M
-eT0259M
-7T0251M
-7eT0   249M

-7 uses larger blocks and dictionary which requires more memory on the
compressing and decompressing side vs the current default -6.
The -e option spends some extra cycles and improves the compression a
bit.

Use parallel compression and spend some extra cycles.

Signed-off-by: Sebastian Andrzej Siewior 
Change-Id: Ib69c4bc1996ddd52153b8ac27b653c21e3998a68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146793
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index b4150ab87ad7..289a595b06e0 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -283,10 +283,22 @@ sub pack_module_sources()
 sub generate_module_tarball()
 {
 my ($source_dir, $release_version, $module, $md5, $bzip2, $xz, 
$lo_topdir_name, $module_tarball_name) = @_;
+my $PARALLELISM =  $ENV{'PARALLELISM'};
+my $CPUS_XZ = 0;
+
+# Set CPUS_ to the number of CPUs that should be used. If PARALLELISM
+# is set then this is used otherwise autodetect is used.
+if (defined $PARALLELISM) {
+if ($PARALLELISM > 0) {
+$CPUS_XZ = $PARALLELISM;
+} else {
+$CPUS_XZ = 1;
+ }
+}
 
 my $temp_dir = prepare_module_sources($source_dir, $release_version, 
$module, $lo_topdir_name);
 pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.bz2", 
"bzip2 -z --best > ") if (defined $bzip2);
-pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.xz", "xz -z 
> ") if (defined $xz);
+pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.xz", "xz -z 
-T$CPUS_XZ -e > ") if (defined $xz);
 remove_tempdir($temp_dir);
 }
 
commit 30f49b56ba6712fb8fb3dd8febb870a1157e1516
Author: Sebastian Andrzej Siewior 
AuthorDate: Fri Feb 10 21:49:25 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Feb 11 22:45:10 2023 +

lo-pack-sources: Split archiver invocation away from tar.

Instead of passing --bzip2 or --xz invoke the compression program via a
pipe. This make the replacement of compressor as well its options
easier.

Signed-off-by: Sebastian Andrzej Siewior 
Change-Id: Ib69c4bc1996ddd52153b8ac27b653c21e3998a67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146105
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 8c795dc170c5..b4150ab87ad7 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -155,11 +155,11 @@ sub generate_sources_version_file($$)
 
 sub generate_tarball($$$)
 {
-my ($dir, $tarball, $tar_compress_option) = @_;
+my ($dir, $tarball, $compressor_option) = @_;
 
 print "Creating $tarball...";
 # generate the tarball in the current directory; avoid "./" prefix in the 
stored paths; show progress
-system ("tar -c $tar_compress_option -f $tarball -C $dir $lo_topdir_name") 
&& 
+system ("tar -c -C $dir $lo_topdir_name | $compressor_option $tarball") &&
 die "Error: releasing failed: $!\n";
 print "\n";
 }
@@ -274,9 +274,9 @@ sub prepare_module_sources()
 
 sub pack_module_sources()
 {
-my ($temp_dir, $md5, $tarball, $tar_compress_option) = @_;
+my ($temp_dir, $md5, $tarball, $compressor_option) = @_;
 
-generate_tarball($temp_dir, $tarball, $tar_compress_option);
+generate_tarball($temp_dir, $tarball, $compressor_option);
 generate_md5($tarball) if (defined $md5);
 }
 
@@ -285,8 +285,8 @@ sub generate_module_tarball()
 my ($source_dir, $release_version, $module, $md5, $bzip2, $xz, 
$lo_topdir_name, $module_tarball_name) = @_;
 
 my $temp_dir = prepare_module_sources($source_dir, $release_version, 
$module, $lo_topdir_name);
-pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.bz2", 
"--bzip2") if (defined $bzi

[Libreoffice-commits] core.git: bin/lo-pack-sources

2023-02-11 Thread Sebastian Andrzej Siewior (via logerrit)

 bin/lo-pack-sources |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit a0165bb7900f6d03a49076d755568ac33ee8e9c9
Author: Sebastian Andrzej Siewior 
AuthorDate: Fri Feb 10 22:18:05 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Feb 11 22:45:27 2023 +

lo-pack-sources: Add support for pbzip2.

Use pbzip for compression if possible. Otherwise fallback to bzip2.

Signed-off-by: Sebastian Andrzej Siewior 
Change-Id: I9091c5dfe25ee00854b6938464af23b56cdcb31c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146814
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 289a595b06e0..a34a4c95ab6a 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -285,19 +285,33 @@ sub generate_module_tarball()
 my ($source_dir, $release_version, $module, $md5, $bzip2, $xz, 
$lo_topdir_name, $module_tarball_name) = @_;
 my $PARALLELISM =  $ENV{'PARALLELISM'};
 my $CPUS_XZ = 0;
+my $CPUS_BZ2 = "";
+my $bzip_arguments;
 
 # Set CPUS_ to the number of CPUs that should be used. If PARALLELISM
 # is set then this is used otherwise autodetect is used.
 if (defined $PARALLELISM) {
 if ($PARALLELISM > 0) {
 $CPUS_XZ = $PARALLELISM;
+$CPUS_BZ2 = "-p$PARALLELISM";
 } else {
 $CPUS_XZ = 1;
+$CPUS_BZ2 = "-p1";
  }
 }
 
+if (defined $bzip2) {
+ my $exit_code = system("pbzip2 --version >/dev/null 2>&1");
+ if ($exit_code == 0) {
+ $bzip_arguments = "pbzip2 -z -b20 $CPUS_BZ2";
+ } else {
+ $bzip_arguments = "bzip2 -z --best";
+ print("Consider installing pbzip2, using bzip2 
now.\n");
+ }
+}
+
 my $temp_dir = prepare_module_sources($source_dir, $release_version, 
$module, $lo_topdir_name);
-pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.bz2", 
"bzip2 -z --best > ") if (defined $bzip2);
+pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.bz2", 
"$bzip_arguments > ") if (defined $bzip2);
 pack_module_sources($temp_dir, $md5, "$module_tarball_name.tar.xz", "xz -z 
-T$CPUS_XZ -e > ") if (defined $xz);
 remove_tempdir($temp_dir);
 }

[Libreoffice-commits] core.git: download.lst external/liborcus

2023-02-11 Thread Kohei Yoshida (via logerrit)

 download.lst|4 
 external/liborcus/ExternalProject_liborcus.mk   |2 
 external/liborcus/UnpackedTarball_liborcus.mk   |2 
 external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 |  236 
 external/liborcus/liborcus-no-benchmark.patch.1 |   19 
 5 files changed, 4 insertions(+), 259 deletions(-)

New commits:
commit 3c988ef450b809767ca7f897c59041758af53f4b
Author: Kohei Yoshida 
AuthorDate: Sat Feb 11 17:05:45 2023 -0500
Commit: Kohei Yoshida 
CommitDate: Sat Feb 11 23:04:29 2023 +

Update liborcus to 0.18.1

Change-Id: I0439640789e59e4dd6e92d7f2975538de2f42f53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146826
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/download.lst b/download.lst
index 0f42585bb7c8..4b8e212456e2 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENSSL_TARBALL := openssl-3.0.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ORCUS_SHA256SUM := 
0a8c55a227f13dbda08da8a1f6e18f27ba873da55a2cdd23bd0825989d1abff8
-ORCUS_TARBALL := liborcus-0.18.0.tar.xz
+ORCUS_SHA256SUM := 
6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb
+ORCUS_TARBALL := liborcus-0.18.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index b07df31a34d0..7f2e5f24083f 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -99,6 +99,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
+   --without-benchmark \
+   --without-doc-example \
--disable-python \
--disable-werror \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 48b7fb4743e9..ca4a40acf4e5 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
-   external/liborcus/liborcus-no-benchmark.patch.1 \
-   external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 
b/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
deleted file mode 100644
index 5b8a04069e99..
--- a/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
+++ /dev/null
@@ -1,236 +0,0 @@
-diff --git a/src/liborcus/xls_xml_context.cpp 
b/src/liborcus/xls_xml_context.cpp
-index 85916fc7..739678ee 100644
 a/src/liborcus/xls_xml_context.cpp
-+++ b/src/liborcus/xls_xml_context.cpp
-@@ -1292,7 +1292,7 @@ void xls_xml_context::start_element_border(const 
xml_token_attrs_t& attrs)
- {
- ss::border_direction_t dir = ss::border_direction_t::unknown;
- ss::border_style_t style = ss::border_style_t::unknown;
--ss::color_rgb_t color;
-+std::optional color;
- long weight = 0;
- 
- for (const xml_token_attr_t& attr : attrs)
-@@ -1950,8 +1950,14 @@ void xls_xml_context::commit_default_style()
- {
- for (const border_style_type& b : m_default_style->borders)
- {
--border_style->set_style(b.dir, b.style);
--border_style->set_color(b.dir, 255, b.color.red, b.color.green, 
b.color.blue);
-+if (b.dir == ss::border_direction_t::unknown)
-+continue;
-+
-+if (b.style != ss::border_style_t::unknown)
-+border_style->set_style(b.dir, b.style);
-+
-+if (b.color)
-+border_style->set_color(b.dir, 255, b.color->red, 
b.color->green, b.color->blue);
- }
- }
- 
-@@ -2109,8 +2115,14 @@ void xls_xml_context::commit_styles()
- 
- for (const border_style_type& b : style->borders)
- {
--border_style->set_style(b.dir, b.style);
--border_style->set_color(b.dir, 255, b.color.red, 
b.color.green, b.color.blue);
-+if (b.dir == ss::border_direction_t::unknown)
-+continue;
-+
-+if (b.style != ss::border_style_t::unknown)
-+border_style->set_style(b.dir, b.style);
-+
-+if (b.color)
-+border_style->set_color(b.dir, 255, b.color->red,

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

2023-02-11 Thread Justin Luth (via logerrit)

 sw/source/uibase/wrtsh/wrtsh1.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit d8b72d2d841d35f3dfdd38aa9adcedae7550279b
Author: Justin Luth 
AuthorDate: Sat Feb 11 11:15:44 2023 -0500
Commit: Justin Luth 
CommitDate: Sat Feb 11 23:24:21 2023 +

sw wrtsh1: cleanup unused pointer

Having a separate pCurRule was made useless by
commit 3234a9deaa8db760bbd7dbb6414aa3e8f9993c34
Author: Vladimir Glazounov 
Date:   Mon Feb 21 15:07:41 2005 +

INTEGRATION: CWS swqcore05 (1.40.82); FILE MERGED

Change-Id: I5fe0c7b09245acd9376d46b448708f29594a7266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146824
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 8b6b3b225113..5f7ac28519b4 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1349,12 +1349,9 @@ void SwWrtShell::SplitNode( bool bAutoFormat )
 // cursor position in the document.
 void SwWrtShell::NumOrBulletOn(bool bNum)
 {
-// determine numbering rule found at current cursor position in the 
document.
-const SwNumRule* pCurRule = GetNumRuleAtCurrCursorPos();
-
 StartUndo(SwUndoId::NUMORNONUM);
 
-const SwNumRule * pNumRule = pCurRule;
+const SwNumRule* pNumRule = GetNumRuleAtCurrCursorPos();
 
 // - activate outline rule respectively turning on outline rule for
 //   current text node. But, only for turning on a numbering ( == 
true).

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

2023-02-11 Thread Seth Chaiklin (via logerrit)

 sw/uiconfig/swriter/ui/captionoptions.ui  |5 +++--
 sw/uiconfig/swriter/ui/flddocumentpage.ui |5 +++--
 sw/uiconfig/swriter/ui/fldvarpage.ui  |3 ++-
 sw/uiconfig/swriter/ui/optcaptionpage.ui  |   11 +++
 sw/uiconfig/swriter/ui/tocindexpage.ui|3 ++-
 5 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 6f15382790e2e758ef7328a62341b30c655aced1
Author: Seth Chaiklin 
AuthorDate: Wed Feb 8 14:21:20 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Feb 11 23:31:44 2023 +

tdf#152605  change "heading level" to "outline level" in UI

This patch addresses extended tips in the UI that refer to a heading
or chapter level, with the aim to remove this kind of terminology.
In many cases, tooltips are added, and extended tips are corrected.
Also, add "Outline" in front of "level" in the UI for Caption
Options and AutoCaption.

Change-Id: Idcf16892599913af31372b89d180251c86945d21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146622
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui 
b/sw/uiconfig/swriter/ui/captionoptions.ui
index e4c89373ee6f..fbe32fede7b7 100644
--- a/sw/uiconfig/swriter/ui/captionoptions.ui
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -102,9 +102,10 @@
 True
 False
 True
+Specify the maximum outline level 
of the immediately prior heading number to include in the caption 
number.
 
   
-Select the 
number of outline levels from the top of the chapter hierarchy down to include 
in the caption label.
+Specify the 
maximum outline level of the immediately prior heading number to include in the 
caption number. For numbers to appear, the selected heading must have numbering 
applied.
   
 
   
@@ -135,7 +136,7 @@
   
 True
 False
-_Level:
+_Outline level:
 True
 level
 1
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui 
b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index 9863c4e0b6d5..086dc0c924f0 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -345,7 +345,7 @@
   
 True
 False
-_Level
+_Outline level
 True
 level
 0
@@ -361,9 +361,10 @@
 True
 adjustment1
 True
+Specifies the maximum outline 
level of the immediately prior heading to be used.
 
   
-Select the 
chapter heading level that you want to include in the selected field.
+The first 
immediately prior heading with an outline level equal or less than the 
specified number is selected for display. If “Chapter number” is selected, then 
numbering must be applied in the Chapter Numbering dialog (see Tools 
menu).
   
 
   
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui 
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 78aa13b9b78f..caa033ee231c 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -429,12 +429,13 @@
   
 True
 False
+Choose the maximum outline level of the 
heading number to prepend to the displayed field.
 
   None
 
 
   
-Choose the heading 
or chapter level at which to restart numbering in the document.
+Choose the maximum 
outline level of the heading number to prepend to the displayed field. The 
selected heading number comes from the first immediately prior heading with the 
specified outline level or less. No heading number is displayed if “None” is 
selected.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui 
b/sw/uiconfig/swriter/ui/optcaptionpage.ui
index 0bc7de887e73..0ad93bc4d888 100644
--- a/sw/uiconfig/swriter/ui/optcaptionpage.ui
+++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui
@@ -147,10 +147,11 @@
 center
 True
 True
+Enter optional text characters 
to appear after the caption category and number.
 T

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

2023-02-11 Thread Seth Chaiklin (via logerrit)

 sw/uiconfig/swriter/ui/tocindexpage.ui |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 496b1b3179ca096dea1fd91ab2408c02f16b06cf
Author: Seth Chaiklin 
AuthorDate: Sat Feb 11 23:43:53 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Feb 12 02:40:14 2023 +

tdf#152605 "heading level"->"outline level" and other tip corrections

Change-Id: I3751b8586ffe47233f3cd27602bcb5cad4d9ecb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146797
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui 
b/sw/uiconfig/swriter/ui/tocindexpage.ui
index c29f0e4b384b..17712fa86184 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -354,9 +354,10 @@
 True
 True
 True
+Creates the index from all 
paragraphs that have an outline level equal to or greater than “1”.
 
   
-Creates the 
index using outline levels. Paragraphs formatted with one of the predefined 
heading styles (Heading 1-10) are added to the index.
+Creates the 
index from all paragraphs that have an outline level equal to or greater than 
“1”.
   
 
   
@@ -502,6 +503,7 @@
 False
 True
 True
+Include 
selected paragraph styles with outline level “Text Body” in the 
index.
 
   
 Includes the paragraph styles 
that you specify in the Assign Styles dialog as index entries. To select the 
paragraph styles that you want to include in the index, click the Assign Styles 
(...) button to the right of this box.
@@ -549,7 +551,7 @@
 
 
   
-Opens the Assign Styles dialog, 
where you can select the paragraph styles to include in the index. Choose the 
proper heading level on which the style will be included in the 
index.
+Opens the Assign Styles dialog, 
where you can select the paragraph styles to include in the index by choosing 
the outline level for where the style should be placed.
   
 
   
@@ -1014,7 +1016,7 @@
 True
 
   
-Replaces 
identical index entries with a single entry that lists the page numbers where 
the entry occurs in the document. For example, the entries "View 10, View 43" 
are combined as "View 10, 43".
+Replaces 
identical index entries with a single entry that lists the page numbers where 
the entry occurs in the document. For example, the entries “View 10, View 43” 
are combined as “View 10, 43”.
   
 
   
@@ -1034,7 +1036,7 @@
 True
 
   
-Replaces identical 
index entries that occur on the directly following page(s), with a single entry 
that lists the first page number and a "f" or "ff". For example, the entries 
"View 10, View 11" are combined as "View 10f", and "View 10, View 11, View 12" 
as "View 10ff". Actual appearance depends on the locale setting, but can be 
overridden with Sort - Language.
+Replaces identical 
index entries that occur on the directly following page(s), with a single entry 
that lists the first page number and a “f” or “ff”. For example, the entries 
“View 10, View 11” are combined as “View 10f”, and “View 10, View 11, View 12” 
as “View 10ff”. Actual appearance depends on the locale setting, but can be 
overridden with Sort - Language.
   
 
   
@@ -1054,7 +1056,7 @@
 True
 
   
-Replaces 
identical index entries that occur on consecutive pages with a single entry and 
the page range where the entry occurs. For example, the entries "View 10, View 
11, View 12" are combined as "View 10-12".
+Replaces 
identical index entries that occur on consecutive pages with a single entry and 
the page range where the entry occurs. For example, the entries “View 10, View 
11, View 12” are combined as “View 10-12”.

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

Re: Extended ODF schema

[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 4 commits - basegfx/test include/basegfx include/svx svx/qa svx/source sw/source

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

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

[Libreoffice-commits] core.git: helpcontent2

GSoC Project: Sidebar deck for quick find

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

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

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

[Libreoffice-commits] core.git: 2 commits - bin/lo-pack-sources

[Libreoffice-commits] core.git: bin/lo-pack-sources

[Libreoffice-commits] core.git: download.lst external/liborcus

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

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

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

16 matches

Site Navigation

Mail list logo

Footer information