[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg
icon-themes/breeze/cmd/32/behindobject.png |binary icon-themes/breeze/cmd/32/objectforwardone.png |binary icon-themes/breeze/cmd/32/setobjecttobackground.png |binary icon-themes/breeze/cmd/32/setobjecttoforeground.png |binary icon-themes/breeze/cmd/lc_behindobject.png |binary icon-themes/breeze/cmd/lc_objectforwardone.png |binary icon-themes/breeze/cmd/lc_setobjecttobackground.png |binary icon-themes/breeze/cmd/lc_setobjecttoforeground.png |binary icon-themes/breeze/cmd/sc_beforeobject.png |binary icon-themes/breeze/cmd/sc_behindobject.png |binary icon-themes/breeze/cmd/sc_objectforwardone.png |binary icon-themes/breeze/cmd/sc_setobjecttobackground.png |binary icon-themes/breeze/cmd/sc_setobjecttoforeground.png |binary icon-themes/breeze/links.txt |7 +-- icon-themes/breeze_dark/cmd/32/behindobject.png |binary icon-themes/breeze_dark/cmd/32/objectforwardone.png |binary icon-themes/breeze_dark/cmd/32/setobjecttobackground.png |binary icon-themes/breeze_dark/cmd/32/setobjecttoforeground.png |binary icon-themes/breeze_dark/cmd/lc_behindobject.png |binary icon-themes/breeze_dark/cmd/lc_objectforwardone.png |binary icon-themes/breeze_dark/cmd/lc_setobjecttobackground.png |binary icon-themes/breeze_dark/cmd/lc_setobjecttoforeground.png |binary icon-themes/breeze_dark/cmd/sc_beforeobject.png |binary icon-themes/breeze_dark/cmd/sc_behindobject.png |binary icon-themes/breeze_dark/cmd/sc_objectforwardone.png |binary icon-themes/breeze_dark/cmd/sc_setobjecttobackground.png |binary icon-themes/breeze_dark/cmd/sc_setobjecttoforeground.png |binary icon-themes/breeze_dark/links.txt|7 +-- icon-themes/breeze_dark_svg/cmd/32/behindobject.svg |2 +- icon-themes/breeze_dark_svg/cmd/32/objectforwardone.svg |2 +- icon-themes/breeze_dark_svg/cmd/32/setobjecttobackground.svg |1 + icon-themes/breeze_dark_svg/cmd/32/setobjecttoforeground.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_behindobject.svg |2 +- icon-themes/breeze_dark_svg/cmd/lc_objectforwardone.svg |2 +- icon-themes/breeze_dark_svg/cmd/lc_setobjecttobackground.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_setobjecttoforeground.svg |1 + icon-themes/breeze_dark_svg/cmd/sc_beforeobject.svg |3 ++- icon-themes/breeze_dark_svg/cmd/sc_behindobject.svg |3 ++- icon-themes/breeze_dark_svg/cmd/sc_objectforwardone.svg |3 ++- icon-themes/breeze_dark_svg/cmd/sc_setobjecttobackground.svg |3 +++ icon-themes/breeze_dark_svg/cmd/sc_setobjecttoforeground.svg |3 +++ icon-themes/breeze_svg/cmd/32/behindobject.svg |2 +- icon-themes/breeze_svg/cmd/32/objectforwardone.svg |2 +- icon-themes/breeze_svg/cmd/32/setobjecttobackground.svg |1 + icon-themes/breeze_svg/cmd/32/setobjecttoforeground.svg |1 + icon-themes/breeze_svg/cmd/lc_behindobject.svg |2 +- icon-themes/breeze_svg/cmd/lc_objectforwardone.svg |2 +- icon-themes/breeze_svg/cmd/lc_setobjecttobackground.svg |1 + icon-themes/breeze_svg/cmd/lc_setobjecttoforeground.svg |1 + icon-themes/breeze_svg/cmd/sc_beforeobject.svg |3 ++- icon-themes/breeze_svg/cmd/sc_behindobject.svg |3 ++- icon-themes/breeze_svg/cmd/sc_objectforwardone.svg |3 ++- icon-themes/breeze_svg/cmd/sc_setobjecttobackground.svg |3 +++ icon-themes/breeze_svg/cmd/sc_setobjecttoforeground.svg |3 +++ icon-themes/colibre/cmd/32/setobjecttobackground.png |binary icon-themes/colibre/cmd/32/setobjecttoforeground.png |binary icon-themes/colibre/cmd/lc_setobjecttobackground.png |binary icon-themes/colibre/cmd/lc_setobjecttoforeground.png |binary icon-themes/colibre/cmd/sc_setobjecttobackground.png |binary icon-themes/colibre/cmd/sc_setobjecttoforeground.png |binary icon-themes/colibre/links.txt|6 -- icon-themes/colibre_svg/cmd/32/setobjecttobackground.svg |1 + icon-themes/colibre_svg/cmd/32/setobjecttoforeground.svg |1 + icon-themes/colibre_svg/cmd/lc_setobjecttobackground.svg |1 + icon-themes/colibre_svg/cmd/lc_setobjecttoforeground.svg |1 + icon-themes/colibre_svg/cmd/sc_setobjecttobackground.svg |1 + icon-themes/colibre_svg/cmd/sc_setobjecttoforeground.svg |1 + 67 files changed, 48 insertions(+), 32 deletions(-) New commits: commit 4183a7f7423998d5497c67752624731c2fb00346 Author: Rizal Muttaqin AuthorDate: Sat Mar 28 14:28:05 2020 +0700 Commit: Adolfo Jayme Barrientos Commit
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/navigatorpanel.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 179bcf810809efb8ec1b4658e5f30d3a75513315 Author: Jim Raykowski AuthorDate: Fri Mar 27 16:50:01 2020 -0800 Commit: Jim Raykowski CommitDate: Sun Mar 29 05:57:52 2020 +0200 Enable Writer Navigator content tree tooltips for Gtk3 Change-Id: I7a8b1e9007b7913c05205c6f01b43fc8d60ae07d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91269 Tested-by: Jenkins Reviewed-by: Jim Raykowski diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui index caac5279152b..1f0b21543508 100644 --- a/sw/uiconfig/swriter/ui/navigatorpanel.ui +++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui @@ -601,6 +601,7 @@ True True True +True True True liststore1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Ahad Shabbir License Statement
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
Re: cppunit
Hey David, On Sun, Mar 29, 2020 at 8:29 AM David Wiseman wrote: > Hi, > >As a developer, if make a contribution to the cppunit project, is it > just required that it builds, or are there tests that I should run. And I > guess I would contribute to the test suite also. Can you tell me if there > is a review procedure for contributions? > make check needs to pass. The code will need to be pushed to gerrit, our reviewing platform, where it will be reviewed and finally pushed. Cheers, Markus > > > Thanks, > > David > Please see our Privacy Policy (https://www.iee.lu/en/privacy-policy) to > learn how we handle personal data. This e-mail may contain trade secrets or > privileged, undisclosed or otherwise confidential information. If you are > not the intended recipient and have received this e-mail in error, you are > hereby notified that any review, copying or distribution of it is strictly > prohibited. Please inform us immediately and destroy the original > transmittal from your system. Thank you for your co-operation. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
cppunit
Hi, As a developer, if make a contribution to the cppunit project, is it just required that it builds, or are there tests that I should run. And I guess I would contribute to the test suite also. Can you tell me if there is a review procedure for contributions? Thanks, David Please see our Privacy Policy (https://www.iee.lu/en/privacy-policy) to learn how we handle personal data. This e-mail may contain trade secrets or privileged, undisclosed or otherwise confidential information. If you are not the intended recipient and have received this e-mail in error, you are hereby notified that any review, copying or distribution of it is strictly prohibited. Please inform us immediately and destroy the original transmittal from your system. Thank you for your co-operation. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
The 2nd Notice
After several failed attempts, we are reaching again you as regards the estate of our deceased client who made you one of the beneficiaries of his estate. Do get back to me at your earliest convenience. The Trustees ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/inc/sqlmessage.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1c9ced04189c9d23ffea05d5570960b54b05ef28
Author: Julien Nabet
AuthorDate: Sat Mar 28 18:46:14 2020 +0100
Commit: Noel Grandin
CommitDate: Sat Mar 28 20:30:16 2020 +0100
Fix is_typed_flags for MessBoxStyle (dbaccess)
Change-Id: Ic788677b540588ae963a3fc983879cd77c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91282
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx
b/dbaccess/source/ui/inc/sqlmessage.hxx
index 2aaa4bd5a18e..434250b39e41 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -63,7 +63,7 @@ enum class MessBoxStyle {
}
namespace o3tl {
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/test/unnecessaryparen.cxx|2 +-
compilerplugins/clang/test/unusedenumconstants.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b3822741430bf8ebea23b7457d19db00756ed2db
Author: Julien Nabet
AuthorDate: Sat Mar 28 18:15:28 2020 +0100
Commit: Noel Grandin
CommitDate: Sat Mar 28 20:29:45 2020 +0100
Fix is_typed_flags for BrowseMode (compilerplugins)
Change-Id: Ia6fecc08b2ee66b3e831f2c6289575ca98976783
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91281
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx
b/compilerplugins/clang/test/unnecessaryparen.cxx
index c33876ddae61..f932cd312558 100644
--- a/compilerplugins/clang/test/unnecessaryparen.cxx
+++ b/compilerplugins/clang/test/unnecessaryparen.cxx
@@ -25,7 +25,7 @@ enum class BrowseMode
Modules = 0x01,
Top = 0x02,
Bottom = 0x04,
-Left = 0x04,
+Left = 0x08,
};
namespace o3tl
{
diff --git a/compilerplugins/clang/test/unusedenumconstants.cxx
b/compilerplugins/clang/test/unusedenumconstants.cxx
index 9f16c981acde..189a037670b8 100644
--- a/compilerplugins/clang/test/unusedenumconstants.cxx
+++ b/compilerplugins/clang/test/unusedenumconstants.cxx
@@ -28,7 +28,7 @@ enum class BrowseMode
Modules = 0x01, // expected-error {{read Modules
[loplugin:unusedenumconstants]}}
Top = 0x02, // expected-error {{write Top [loplugin:unusedenumconstants]}}
Bottom = 0x04, // expected-error {{read Bottom
[loplugin:unusedenumconstants]}}
-Left = 0x04, // expected-error {{write Left
[loplugin:unusedenumconstants]}}
+Left = 0x08, // expected-error {{write Left
[loplugin:unusedenumconstants]}}
};
namespace o3tl
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a039725510f13c77591106b02f32f5899c37c007
Author: Oleg Shchelykalnov
AuthorDate: Sat Mar 28 15:48:18 2020 +0300
Commit: Noel Grandin
CommitDate: Sat Mar 28 20:29:04 2020 +0100
tdf#131618 MailMerge: Don't require DataSourceName if ResultSet provided
Allows to use ResultSet instead of DataSourceName and DataCommand
options.
Change-Id: I654cdf3bc850ab1c1a29837e8aabdee410b30439
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91277
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0fd0ffc46cf5..a51cb6366753 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -466,7 +466,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor&
rMergeDesc )
if (
rMergeDesc.rDescriptor.has(svx::DataAccessDescriptorProperty::Connection) )
rMergeDesc.rDescriptor[svx::DataAccessDescriptorProperty::Connection]
>>= xConnection;
-if(aData.sDataSource.isEmpty() || aData.sCommand.isEmpty() ||
!xResSet.is())
+if((aData.sDataSource.isEmpty() || aData.sCommand.isEmpty()) &&
!xResSet.is())
{
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/tdf80635_marginRightRTL.doc |binary
sw/qa/extras/ww8export/data/tdf80635_pageRightRTL.doc |binary
sw/qa/extras/ww8export/ww8export2.cxx | 22
sw/source/filter/ww8/ww8par2.cxx|8 +
4 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit cd868678583fa92833c37a63089131ba905dd3a6
Author: Justin Luth
AuthorDate: Fri Mar 27 08:32:05 2020 +0300
Commit: Justin Luth
CommitDate: Sat Mar 28 20:17:19 2020 +0100
tdf#80635 ww8import:2 take float table RIGHT to inlined table
Since SW has problems with floating tables, any unnecessarily
floated tables are converted to inline. However, the
positioning of the tables is mostly lost. So the choice is
either to refuse to inline a strangely positioned table
or else to transfer the positioning onto the inlined table.
Transferring is easier said than done. But for right-aligned
tables, hopefully it is easy to copy that without causing trouble.
I didn't find any real-world examples in existing unit tests
or bug reports, so I made up my own complicated one
using both right margin and BIDI.
Change-Id: I855ae62531b5930cbc9a3272c3a7228dd7b0df53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91272
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/data/tdf80635_marginRightRTL.doc
b/sw/qa/extras/ww8export/data/tdf80635_marginRightRTL.doc
new file mode 100644
index ..6e509a1907e5
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf80635_marginRightRTL.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf80635_pageRightRTL.doc
b/sw/qa/extras/ww8export/data/tdf80635_pageRightRTL.doc
new file mode 100644
index ..71f9adf4a8b5
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf80635_pageRightRTL.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx
b/sw/qa/extras/ww8export/ww8export2.cxx
index b477b03bbeaa..4672b750baa3 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -252,6 +252,28 @@ DECLARE_WW8EXPORT_TEST(testTdf116570_exportFootnote,
"tdf116570_exportFootnote.o
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of paragraphs in first footnote", 2,
getParagraphs(xFootnoteText) );
}
+DECLARE_WW8EXPORT_TEST(testTdf80635_pageRightRTL, "tdf80635_pageRightRTL.doc")
+{
+// tdf#80635 - transfer the float orientation to the table.
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation",
text::HoriOrientation::LEFT_AND_WIDTH, getProperty(xTable,
"HoriOrient"));
+//CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(3500),
getProperty(xTable, "LeftMargin"), 100);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Did you fix me? Text probably should wrap
here", 2, getPages() );
+// If so, replace test with the table set to a greater preferred width so
that the text shouldn't wrap
+}
+
+DECLARE_WW8EXPORT_TEST(testTdf80635_marginRTL, "tdf80635_marginRightRTL.doc")
+{
+// tdf#80635 - transfer the float orientation to the table.
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+if ( !mbExported )
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation",
text::HoriOrientation::RIGHT, getProperty(xTable, "HoriOrient"));
+}
+
DECLARE_WW8EXPORT_TEST(testTdf107773, "tdf107773.doc")
{
uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3b1615793482..775dae384f6d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2428,7 +2428,13 @@ void WW8TabDesc::CreateSwTable()
if ( m_pIo->m_xSFlyPara && !m_pIo->m_xSFlyPara->pFlyFormat )
{
// Get the table orientation from the fly
-if ( m_pIo->m_xSFlyPara->eHAlign == text::HoriOrientation::CENTER )
+// Do we also need to check
m_pIo->m_xSFlyPara->bToggelPos/IsPosToggle()? [Probably not - layout-only
concern]
+const bool bAdjustMargin = m_pIo->m_xSFlyPara->eHRel ==
text::RelOrientation::PAGE_FRAME || m_pIo->m_xSFlyPara->nXPos;
+const bool bIsInsideMargin = m_bIsBiDi ? m_pIo->m_xSFlyPara->eHAlign
== text::HoriOrientation::RIGHT
+ : m_pIo->m_xSFlyPara->eHAlign
== text::HoriOrientation::LEFT;
+if ( bIsInsideMargin && bAdjustMargin )
+m_eOri = text::HoriOrientation::LEFT_AND_WIDTH;
+else if ( m_pIo->m_xSFlyPara->eHAlign != text::HoriOrientation::NONE )
[Libreoffice-commits] core.git: include/basegfx svx/source
include/basegfx/matrix/Matrix.hxx | 126 ++
svx/source/svdraw/svdpdf.hxx | 106 ---
2 files changed, 128 insertions(+), 104 deletions(-)
New commits:
commit befd6880873cc3f63a0566b76246d2ae54f8a3c5
Author: Tomaž Vajngerl
AuthorDate: Sat Mar 28 18:00:22 2020 +0100
Commit: Tomaž Vajngerl
CommitDate: Sat Mar 28 19:15:03 2020 +0100
svdpdf: move Matrix to basegfx just to get it separated
Change-Id: I9d887dc7a2836b90151ef352b47a9b9ad3b6f12b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91280
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/basegfx/matrix/Matrix.hxx
b/include/basegfx/matrix/Matrix.hxx
new file mode 100644
index ..b742d8cdf293
--- /dev/null
+++ b/include/basegfx/matrix/Matrix.hxx
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+class Matrix
+{
+public:
+Matrix()
+: Matrix(1, 0, 0, 1, 0, 0)
+{
+}
+
+Matrix(const Matrix& other)
+: Matrix(other.ma, other.mb, other.mc, other.md, other.me, other.mf)
+{
+}
+
+Matrix(double da, double db, double dc, double dd, double de, double df)
+: ma(da)
+, mb(db)
+, mc(dc)
+, md(dd)
+, me(de)
+, mf(df)
+{
+}
+
+const Matrix& operator=(const Matrix& other)
+{
+ma = other.ma;
+mb = other.mb;
+mc = other.mc;
+md = other.md;
+me = other.me;
+mf = other.mf;
+return *this;
+}
+
+double a() const { return ma; }
+double b() const { return mb; }
+double c() const { return mc; }
+double d() const { return md; }
+double e() const { return me; }
+double f() const { return mf; }
+
+/// Multiply this * other.
+void Concatinate(const Matrix& other)
+{
+ma = ma * other.ma + mb * other.mc;
+mb = ma * other.mb + mb * other.md;
+mc = mc * other.ma + md * other.mc;
+md = mc * other.mb + md * other.md;
+me = me * other.ma + mf * other.mc + other.me;
+mf = me * other.mb + mf * other.md + other.mf;
+}
+
+/// Transform the point (x, y) by this Matrix.
+template void Transform(T& x, T& y)
+{
+x = ma * x + mc * y + me;
+y = mb * x + md * y + mf;
+}
+
+/// Transform the rectangle (left, right, top, bottom) by this Matrix.
+template void Transform(T& left, T& right, T& top, T& bottom)
+{
+T leftTopX = left;
+T leftTopY = top;
+Transform(leftTopX, leftTopY);
+
+T leftBottomX = left;
+T leftBottomY = bottom;
+Transform(leftBottomX, leftBottomY);
+
+T rightTopX = right;
+T rightTopY = top;
+Transform(rightTopX, rightTopY);
+
+T rightBottomX = right;
+T rightBottomY = bottom;
+Transform(rightBottomX, rightBottomY);
+
+left = std::min(leftTopX, leftBottomX);
+right = std::max(rightTopX, rightBottomX);
+
+if (top > bottom)
+top = std::max(leftTopY, rightTopY);
+else
+top = std::min(leftTopY, rightTopY);
+
+if (top > bottom)
+bottom = std::max(leftBottomY, rightBottomY);
+else
+bottom = std::min(leftBottomY, rightBottomY);
+}
+
+std::string toString() const
+{
+std::ostringstream oss;
+oss << '(' << ma << ", " << mb << ", " << mc << ", " << md << ", " <<
me << ", " << mf
+<< ')';
+return oss.str();
+}
+
+private:
+double ma, mb, mc, md, me, mf;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index 1648eeb3cdd1..46e63a7783ba 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -34,6 +34,8 @@
#include
#include
+#include
+
// Prevent workdir/UnpackedTarball/pdfium/public/fpdfview.h from including
windows.h in a way that
// it will define e.g. Yield as a macro:
#include
@@ -52,110 +54,6 @@ class SvdProgressInfo
Subject: Oleg Shchelykalnov license statement
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: xmloff/source
xmloff/source/forms/formattributes.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fffe585ae397ef3e1c850d648c2d153cb3a6e2e8
Author: Julien Nabet
AuthorDate: Sat Mar 28 15:50:30 2020 +0100
Commit: Noel Grandin
CommitDate: Sat Mar 28 17:24:51 2020 +0100
Fix is_typed_flags for SCAFlags
Since:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=0c2d51e0daf2ce5e18af915ec40ec3196db8ab88
author Noel Grandin 2016-05-12 14:32:30 +0200
committer Noel Grandin 2016-05-12 14:33:35 +0200
commit 0c2d51e0daf2ce5e18af915ec40ec3196db8ab88 (patch)
tree720d61287f718a66747e31a156b0c98eb2d3e24e
parent aba06d6f8d69632559ca9a74320fcd048855a3a3 (diff)
Convert SCA flags to scoped enum
Change-Id: I7bb5b33819cada9410e725d0c45cc7ea10fde1a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91279
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/forms/formattributes.hxx
b/xmloff/source/forms/formattributes.hxx
index 464cffa83f77..0ffef7c0189b 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -131,7 +131,7 @@ enum class SCAFlags {
ImagePosition = 0x08
};
namespace o3tl {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/configurationhelper.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 65ed278fecdf5faf8e1d79fe69043f8208553458
Author: Julien Nabet
AuthorDate: Sat Mar 28 15:09:17 2020 +0100
Commit: Noel Grandin
CommitDate: Sat Mar 28 17:25:17 2020 +0100
Fix is_typed_flags for EConfigurationModes
LazyWrite = 4 dropped
with cb2550750386f51ef7a46a8a664a4ab9de614f8d
Change-Id: Ie14e7c34c681288dec8ff53c77485ab642c1c29b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91278
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/comphelper/configurationhelper.hxx
b/include/comphelper/configurationhelper.hxx
index 5c50aa9f5dff..e09a3a985882 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -52,7 +52,7 @@ namespace comphelper
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
namespace comphelper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/lingu/olmenu.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 190e783379a00b1ba82d4a48e95e47449ce2
Author: Tamás Zolnai
AuthorDate: Fri Mar 27 13:58:52 2020 +0100
Commit: Tamás Zolnai
CommitDate: Sat Mar 28 12:40:59 2020 +0100
sw lok: add uno command for submenus in Spellchecking popup.
Change-Id: I1c7591379ecbce0099ed7d969e5dc83831e322b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91227
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/sw/source/uibase/lingu/olmenu.cxx
b/sw/source/uibase/lingu/olmenu.cxx
index 8098a6a4c7fd..813cfae970af 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -595,6 +595,7 @@ void SwSpellPopup::InitItemCommands(const
css::uno::Sequence< OUString >& aSugge
}
PopupMenu *pMenu = m_xPopupMenu->GetPopupMenu(m_nLangSelectionMenuId);
+m_xPopupMenu->SetItemCommand(m_nLangSelectionMenuId,
".uno:SetSelectionLanguageMenu");
if(pMenu)
{
for (const auto& item : m_aLangTable_Text)
@@ -609,6 +610,7 @@ void SwSpellPopup::InitItemCommands(const
css::uno::Sequence< OUString >& aSugge
}
pMenu = m_xPopupMenu->GetPopupMenu(m_nLangParaMenuId);
+m_xPopupMenu->SetItemCommand(m_nLangParaMenuId,
".uno:SetParagraphLanguageMenu");
if(pMenu)
{
for (const auto& item : m_aLangTable_Paragraph)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg
icon-themes/breeze/cmd/32/behindobject.png |binary icon-themes/breeze/cmd/32/objectforwardone.png |binary icon-themes/breeze/cmd/32/setobjecttobackground.png |binary icon-themes/breeze/cmd/32/setobjecttoforeground.png |binary icon-themes/breeze/cmd/lc_behindobject.png |binary icon-themes/breeze/cmd/lc_objectforwardone.png |binary icon-themes/breeze/cmd/lc_setobjecttobackground.png |binary icon-themes/breeze/cmd/lc_setobjecttoforeground.png |binary icon-themes/breeze/cmd/sc_beforeobject.png |binary icon-themes/breeze/cmd/sc_behindobject.png |binary icon-themes/breeze/cmd/sc_objectforwardone.png |binary icon-themes/breeze/cmd/sc_setobjecttobackground.png |binary icon-themes/breeze/cmd/sc_setobjecttoforeground.png |binary icon-themes/breeze/links.txt |7 +-- icon-themes/breeze_dark/cmd/32/behindobject.png |binary icon-themes/breeze_dark/cmd/32/objectforwardone.png |binary icon-themes/breeze_dark/cmd/32/setobjecttobackground.png |binary icon-themes/breeze_dark/cmd/32/setobjecttoforeground.png |binary icon-themes/breeze_dark/cmd/lc_behindobject.png |binary icon-themes/breeze_dark/cmd/lc_objectforwardone.png |binary icon-themes/breeze_dark/cmd/lc_setobjecttobackground.png |binary icon-themes/breeze_dark/cmd/lc_setobjecttoforeground.png |binary icon-themes/breeze_dark/cmd/sc_beforeobject.png |binary icon-themes/breeze_dark/cmd/sc_behindobject.png |binary icon-themes/breeze_dark/cmd/sc_objectforwardone.png |binary icon-themes/breeze_dark/cmd/sc_setobjecttobackground.png |binary icon-themes/breeze_dark/cmd/sc_setobjecttoforeground.png |binary icon-themes/breeze_dark/links.txt|7 +-- icon-themes/breeze_dark_svg/cmd/32/behindobject.svg |2 +- icon-themes/breeze_dark_svg/cmd/32/objectforwardone.svg |2 +- icon-themes/breeze_dark_svg/cmd/32/setobjecttobackground.svg |1 + icon-themes/breeze_dark_svg/cmd/32/setobjecttoforeground.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_behindobject.svg |2 +- icon-themes/breeze_dark_svg/cmd/lc_objectforwardone.svg |2 +- icon-themes/breeze_dark_svg/cmd/lc_setobjecttobackground.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_setobjecttoforeground.svg |1 + icon-themes/breeze_dark_svg/cmd/sc_beforeobject.svg |3 ++- icon-themes/breeze_dark_svg/cmd/sc_behindobject.svg |3 ++- icon-themes/breeze_dark_svg/cmd/sc_objectforwardone.svg |3 ++- icon-themes/breeze_dark_svg/cmd/sc_setobjecttobackground.svg |3 +++ icon-themes/breeze_dark_svg/cmd/sc_setobjecttoforeground.svg |3 +++ icon-themes/breeze_svg/cmd/32/behindobject.svg |2 +- icon-themes/breeze_svg/cmd/32/objectforwardone.svg |2 +- icon-themes/breeze_svg/cmd/32/setobjecttobackground.svg |1 + icon-themes/breeze_svg/cmd/32/setobjecttoforeground.svg |1 + icon-themes/breeze_svg/cmd/lc_behindobject.svg |2 +- icon-themes/breeze_svg/cmd/lc_objectforwardone.svg |2 +- icon-themes/breeze_svg/cmd/lc_setobjecttobackground.svg |1 + icon-themes/breeze_svg/cmd/lc_setobjecttoforeground.svg |1 + icon-themes/breeze_svg/cmd/sc_beforeobject.svg |3 ++- icon-themes/breeze_svg/cmd/sc_behindobject.svg |3 ++- icon-themes/breeze_svg/cmd/sc_objectforwardone.svg |3 ++- icon-themes/breeze_svg/cmd/sc_setobjecttobackground.svg |3 +++ icon-themes/breeze_svg/cmd/sc_setobjecttoforeground.svg |3 +++ icon-themes/colibre/cmd/32/setobjecttobackground.png |binary icon-themes/colibre/cmd/32/setobjecttoforeground.png |binary icon-themes/colibre/cmd/lc_setobjecttobackground.png |binary icon-themes/colibre/cmd/lc_setobjecttoforeground.png |binary icon-themes/colibre/cmd/sc_setobjecttobackground.png |binary icon-themes/colibre/cmd/sc_setobjecttoforeground.png |binary icon-themes/colibre/links.txt|6 -- icon-themes/colibre_svg/cmd/32/setobjecttobackground.svg |1 + icon-themes/colibre_svg/cmd/32/setobjecttoforeground.svg |1 + icon-themes/colibre_svg/cmd/lc_setobjecttobackground.svg |1 + icon-themes/colibre_svg/cmd/lc_setobjecttoforeground.svg |1 + icon-themes/colibre_svg/cmd/sc_setobjecttobackground.svg |1 + icon-themes/colibre_svg/cmd/sc_setobjecttoforeground.svg |1 + 67 files changed, 48 insertions(+), 32 deletions(-) New commits: commit 96f41e79ad505239a5cd4c7991af767796f77672 Author: Rizal Muttaqin AuthorDate: Sat Mar 28 14:28:05 2020 +0700 Commit: Rizal Muttaqin CommitDate: Sat
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/ww8export2.cxx | 14 ++
sw/qa/extras/ww8import/ww8import.cxx |8
sw/source/filter/ww8/ww8par2.cxx |9 +
3 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 35b3a3eb001ec8ff8c808ad6d990a583163ad365
Author: Justin Luth
AuthorDate: Thu Mar 26 09:33:08 2020 +0300
Commit: Justin Luth
CommitDate: Sat Mar 28 08:50:08 2020 +0100
tdf#80635 ww8import:1 take float table CENTER to inlined table
Since SW has problems with floating tables, any unnecessarily
floated tables are converted to inline. However, the
positioning of the tables is mostly lost. So the choice is
either to refuse to inline a strangely positioned table
or else to transfer the positioning onto the inlined table.
Transferring is easier said than done. But for centered tables,
it is easy to copy that.
Change-Id: I8a6deaa63c45277c30ffa12613c8ed125a45d607
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91188
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8import/data/tdf107773.doc
b/sw/qa/extras/ww8export/data/tdf107773.doc
similarity index 100%
rename from sw/qa/extras/ww8import/data/tdf107773.doc
rename to sw/qa/extras/ww8export/data/tdf107773.doc
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx
b/sw/qa/extras/ww8export/ww8export2.cxx
index 9abcdf7a9eef..b477b03bbeaa 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -252,6 +252,20 @@ DECLARE_WW8EXPORT_TEST(testTdf116570_exportFootnote,
"tdf116570_exportFootnote.o
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of paragraphs in first footnote", 2,
getParagraphs(xFootnoteText) );
}
+DECLARE_WW8EXPORT_TEST(testTdf107773, "tdf107773.doc")
+{
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+// This was 1, multi-page table was imported as a floating one.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
+
+// tdf#80635 - transfer the float orientation to the table.
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation",
text::HoriOrientation::CENTER, getProperty(xTable, "HoriOrient"));
+}
+
DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification,
"tdf112074_RTLtableJustification.doc")
{
uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 7f68b083cd88..1313eff345aa 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -79,14 +79,6 @@ DECLARE_WW8IMPORT_TEST(testFloatingTableSectionColumns,
"floating-table-section-
CPPUNIT_ASSERT( tableWidth.toInt32() > 1 );
}
-DECLARE_WW8IMPORT_TEST(testTdf107773, "tdf107773.doc")
-{
-uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
-// This was 1, multi-page table was imported as a floating one.
-CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
-}
-
DECLARE_WW8IMPORT_TEST(testTdf124601, "tdf124601.doc")
{
// Without the accompanying fix in place, this test would have failed, as
the importer lost the
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6f417543014d..3b1615793482 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2423,6 +2423,15 @@ void WW8TabDesc::CreateSwTable()
m_xTmpPos.reset(new SwPosition(*m_pIo->m_pPaM->GetPoint()));
+// Because SW cannot handle multi-page floating frames,
+// _any unnecessary_ floating tables have been converted to inline.
+if ( m_pIo->m_xSFlyPara && !m_pIo->m_xSFlyPara->pFlyFormat )
+{
+// Get the table orientation from the fly
+if ( m_pIo->m_xSFlyPara->eHAlign == text::HoriOrientation::CENTER )
+m_eOri = m_pIo->m_xSFlyPara->eHAlign;
+}
+
// The table is small: The number of columns is the lowest count of
// columns of the origin, because inserting is faster than deleting.
// The number of rows is the count of bands because (identically)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/table/FieldFormatter.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70adbc53e88e5b99032d63065410716c54b4f96f
Author: Julien Nabet
AuthorDate: Fri Mar 27 22:28:28 2020 +0100
Commit: Julien Nabet
CommitDate: Sat Mar 28 08:25:13 2020 +0100
tdf#131576: fix "Field information" in table wizard, step 2
Change-Id: I8a0dfa9f483f32bc5858e628ff4bb9cb79c9c6a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91236
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java
b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index db401104a094..c3c38e7e2dae 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -73,7 +73,7 @@ public class FieldFormatter implements XItemListener
},
new Object[]
{
-UIConsts.INTEGERS[8], sFieldNames, 91, 27,
IFieldFormatStep, Short.valueOf(curtabindex++), 90
+UIConsts.INTEGERS[8], sFieldNames, 91, 27,
IFieldFormatStep, Short.valueOf(curtabindex++), 67
});
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
