[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source
vcl/source/window/layout.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 95d7d13205c05c2114a6d3bc2c4538246b22f3e0
Author: Tomáš Chvátal
AuthorDate: Wed Jan 8 13:25:05 2020 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jan 8 15:40:41 2020 +0100
tdf#129879 Fix wrong order of buttons
Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86426
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 981ac621aa60..9c5a36304a21 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -718,8 +718,8 @@ static int getButtonPriority(const OString )
const OUString = Application::GetDesktopEnvironment();
if (rEnv.equalsIgnoreAsciiCase("windows") ||
-rEnv.equalsIgnoreAsciiCase("tde") ||
-rEnv.startsWithIgnoreAsciiCase("kde"))
+rEnv.equalsIgnoreAsciiCase("lxqt") ||
+rEnv.startsWithIgnoreAsciiCase("plasma"))
{
pOrder = [0];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4f0d4c9387eb1d73f96b9072128cff2038f6c61a
Author: Tomáš Chvátal
AuthorDate: Wed Jan 8 13:25:05 2020 +0100
Commit: Tomáš Chvátal
CommitDate: Wed Jan 8 15:35:20 2020 +0100
tdf#129879 Fix wrong order of buttons
Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86425
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Jenkins
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index fbada38f6e48..be8313c12f00 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -722,8 +722,8 @@ static int getButtonPriority(const OString )
const OUString = Application::GetDesktopEnvironment();
if (rEnv.equalsIgnoreAsciiCase("windows") ||
-rEnv.equalsIgnoreAsciiCase("tde") ||
-rEnv.startsWithIgnoreAsciiCase("kde"))
+rEnv.equalsIgnoreAsciiCase("lxqt") ||
+rEnv.startsWithIgnoreAsciiCase("plasma"))
{
pOrder = [0];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx
vcl/unx/generic/fontmanager/fontconfig.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 30312e66acb030b24fa4cf327a96fe19c5c571f7
Author: Tomáš Chvátal
AuthorDate: Wed Sep 11 09:58:43 2019 +0200
Commit: Caolán McNamara
CommitDate: Fri Sep 13 09:38:10 2019 +0200
Check for EMOJI content only on ICU 57 and newer
The older ICU does not have the logic to work with there as it is
feature of the new icu only:
http://bugs.icu-project.org/trac/ticket/11802
Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7
Reviewed-on: https://gerrit.libreoffice.org/78812
Reviewed-by: Tomáš Chvátal
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index c7bfbb47e9bd..a36dfc868329 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -798,7 +798,11 @@ namespace
bool isEmoji(sal_uInt32 nCurrentChar)
{
+#if U_ICU_VERSION_MAJOR_NUM >= 57
return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI);
+#else
+ return false;
+#endif
}
//returns true if the given code-point couldn't possibly be in rLangTag.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/fontmanager/fontconfig.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 39b8846276e82a50625a08dfddec34de67ca71c8
Author: Tomáš Chvátal
AuthorDate: Wed Sep 11 09:58:43 2019 +0200
Commit: Tomáš Chvátal
CommitDate: Wed Sep 11 10:55:44 2019 +0200
Check for EMOJI content only on ICU 57 and newer
The older ICU does not have the logic to work with there as it is
feature of the new icu only:
http://bugs.icu-project.org/trac/ticket/11802
Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7
Reviewed-on: https://gerrit.libreoffice.org/78811
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 2767cafcf07f..bfa487153321 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -800,7 +800,11 @@ namespace
bool isEmoji(sal_uInt32 nCurrentChar)
{
+#if U_ICU_VERSION_MAJOR_NUM >= 57
return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI);
+#else
+ return false;
+#endif
}
//returns true if the given code-point couldn't possibly be in rLangTag.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source
sw/source/core/layout/calcmove.cxx |8
sw/source/core/layout/flowfrm.cxx |4
2 files changed, 12 insertions(+)
New commits:
commit 35208b451b5d8bdf496f83dd8acaf5917131b50b
Author: Tomáš Chvátal
AuthorDate: Mon Aug 19 13:30:23 2019 +0200
Commit: Andras Timar
CommitDate: Thu Aug 29 11:33:04 2019 +0200
Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
Reviewed-on: https://gerrit.libreoffice.org/77716
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/77922
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 8ae94ce1fe7b..2f700131c2a9 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -409,12 +409,20 @@ void SwFrame::PrepareCursor()
if ( bTab )
{
+#if BOOST_VERSION < 105600
+tabGuard.reset(static_cast(this)); // tdf#125741
+#else
tabGuard.emplace(static_cast(this)); // tdf#125741
+#endif
pThis = static_cast(this);
}
else if (IsRowFrame())
{
+#if BOOST_VERSION < 105600
+rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+#else
rowGuard.emplace(this); // tdf#125741 keep this alive
+#endif
}
else if( IsSctFrame() )
{
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 6c9e61595f23..dbe7d9c7feec 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2527,7 +2527,11 @@ bool SwFlowFrame::MoveBwd( bool )
&& pTabFrame->GetFirstNonHeadlineRow() ==
m_rThis.GetUpper()->GetUpper())
{
// lock follow-flow-row (similar to sections above)
+#if BOOST_VERSION < 105600
+
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+#else
g.emplace(m_rThis.GetUpper()->GetUpper());
+#endif
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/core/inc/frame.hxx |4
sw/source/core/layout/calcmove.cxx |9 +++--
sw/source/core/layout/flowfrm.cxx |6 +-
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 3780d305ae1607458029af3c9452bad251490461
Author: Tomáš Chvátal
AuthorDate: Fri Aug 23 09:44:01 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Aug 27 11:05:47 2019 +0200
Fix old boost build for good
With the previous approach the code could lead to crashes in
the flowfrm.cxx
Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2
Reviewed-on: https://gerrit.libreoffice.org/78001
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 920bd621fff4..6519a4ae1207 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1232,11 +1232,15 @@ public:
m_pForbidFrame->ForbidDelete();
}
+SwFrameDeleteGuard(const SwFrameDeleteGuard&) =delete;
+
~SwFrameDeleteGuard()
{
if (m_pForbidFrame)
m_pForbidFrame->AllowDelete();
}
+
+SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete;
};
typedef long (SwFrame:: *SwFrameGet)() const;
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index ff2befe5d969..316ba4de217c 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -403,14 +403,19 @@ void SwFrame::PrepareCursor()
const bool bTab = IsTabFrame();
bool bNoSect = IsInSct();
+#if BOOST_VERSION < 105600
+std::list tabGuard;
+std::list rowGuard;
+#else
boost::optional tabGuard;
boost::optional rowGuard;
+#endif
SwFlowFrame* pThis = bCnt ? static_cast(this) :
nullptr;
if ( bTab )
{
#if BOOST_VERSION < 105600
-tabGuard.reset(static_cast(this)); // tdf#125741
+tabGuard.emplace_back(static_cast(this)); //
tdf#125741
#else
tabGuard.emplace(static_cast(this)); // tdf#125741
#endif
@@ -419,7 +424,7 @@ void SwFrame::PrepareCursor()
else if (IsRowFrame())
{
#if BOOST_VERSION < 105600
-rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+rowGuard.emplace_back(this); // tdf#125741 keep this alive
#else
rowGuard.emplace(this); // tdf#125741 keep this alive
#endif
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index dbe7d9c7feec..77617dc5cfa9 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2517,7 +2517,11 @@ bool SwFlowFrame::MoveBwd( bool )
{
auto const pOld = m_rThis.GetUpper();
+#if BOOST_VERSION < 105600
+std::list g;
+#else
::boost::optional g;
+#endif
if (m_rThis.GetUpper()->IsCellFrame())
{
// note: IsFollowFlowRow() is never set for new-style tables
@@ -2528,7 +2532,7 @@ bool SwFlowFrame::MoveBwd( bool )
{
// lock follow-flow-row (similar to sections above)
#if BOOST_VERSION < 105600
-
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+g.emplace_back(m_rThis.GetUpper()->GetUpper());
#else
g.emplace(m_rThis.GetUpper()->GetUpper());
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source
sw/source/core/inc/frame.hxx |5 +
sw/source/core/layout/calcmove.cxx |9 +++--
sw/source/core/layout/flowfrm.cxx |6 +-
3 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 5df2a0ba034ab23289361b762cc88cfa90d15f17
Author: Tomáš Chvátal
AuthorDate: Fri Aug 23 09:44:01 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Aug 27 11:04:52 2019 +0200
Fix old boost build for good
With the previous approach the code could lead to crashes in
the flowfrm.cxx
Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2
Reviewed-on: https://gerrit.libreoffice.org/78002
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index ab1047d0348f..312957a02593 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1238,7 +1238,12 @@ public:
//it in e.g. SwSectionFrame::MergeNext etc because we will need it
//again after the SwFrameDeleteGuard dtor
explicit SwFrameDeleteGuard(SwFrame* pFrame);
+
+SwFrameDeleteGuard(const SwFrameDeleteGuard&) =delete;
+
~SwFrameDeleteGuard();
+
+SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete;
};
typedef long (SwFrame:: *SwFrameGet)() const;
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 3502450c2a47..cb956d8f916c 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -404,14 +404,19 @@ void SwFrame::PrepareCursor()
const bool bTab = IsTabFrame();
bool bNoSect = IsInSct();
+#if BOOST_VERSION < 105600
+std::list tabGuard;
+std::list rowGuard;
+#else
boost::optional tabGuard;
boost::optional rowGuard;
+#endif
SwFlowFrame* pThis = bCnt ? static_cast(this) :
nullptr;
if ( bTab )
{
#if BOOST_VERSION < 105600
-tabGuard.reset(static_cast(this)); // tdf#125741
+tabGuard.emplace_back(static_cast(this)); //
tdf#125741
#else
tabGuard.emplace(static_cast(this)); // tdf#125741
#endif
@@ -420,7 +425,7 @@ void SwFrame::PrepareCursor()
else if (IsRowFrame())
{
#if BOOST_VERSION < 105600
-rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+rowGuard.emplace_back(this); // tdf#125741 keep this alive
#else
rowGuard.emplace(this); // tdf#125741 keep this alive
#endif
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 54f0bdd4e567..fb87c6025061 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2522,7 +2522,11 @@ bool SwFlowFrame::MoveBwd( bool )
{
auto const pOld = m_rThis.GetUpper();
+#if BOOST_VERSION < 105600
+std::list g;
+#else
::boost::optional g;
+#endif
if (m_rThis.GetUpper()->IsCellFrame())
{
// note: IsFollowFlowRow() is never set for new-style tables
@@ -2533,7 +2537,7 @@ bool SwFlowFrame::MoveBwd( bool )
{
// lock follow-flow-row (similar to sections above)
#if BOOST_VERSION < 105600
-
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+g.emplace_back(m_rThis.GetUpper()->GetUpper());
#else
g.emplace(m_rThis.GetUpper()->GetUpper());
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3877328fcea01f24a94fd3debc243cf9f187dee9
Author: Tomáš Chvátal
AuthorDate: Mon Aug 19 15:35:35 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Aug 27 08:06:09 2019 +0200
Use get_value_or instead of value_or
The old boost does not understand the value_or function
Change-Id: I575d04eaab62294e1b402cd8c991c0daa1854271
Reviewed-on: https://gerrit.libreoffice.org/77728
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Samuel Mehrbrodt
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bad7d74672d0..07d3549e750d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1287,7 +1287,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
OUString sSetupVersion =
utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent =
sSetupVersion.getToken(0,'.').toInt32() * 10 +
sSetupVersion.getToken(1,'.').toInt32();
OUString sLastVersion
-=
officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0");
+=
officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0");
sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() *
10 + sLastVersion.getToken(1,'.').toInt32();
if ((iCurrent > iLast) &&
!Application::IsHeadlessModeEnabled() && !bIsUITest)
{
___
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/core/inc/frame.hxx |4
sw/source/core/layout/calcmove.cxx |9 +++--
sw/source/core/layout/flowfrm.cxx |6 +-
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 09d29fab72e22ba830f178b15a74a5a87c8a73a5
Author: Tomáš Chvátal
AuthorDate: Fri Aug 23 09:44:01 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Aug 27 08:05:34 2019 +0200
Fix old boost build for good
With the previous approach the code could lead to crashes in
the flowfrm.cxx
Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2
Reviewed-on: https://gerrit.libreoffice.org/78003
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index a966947ca94c..5cae3ccabdc9 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1245,11 +1245,15 @@ public:
m_pForbidFrame->ForbidDelete();
}
+SwFrameDeleteGuard(const SwFrameDeleteGuard&) =delete;
+
~SwFrameDeleteGuard()
{
if (m_pForbidFrame)
m_pForbidFrame->AllowDelete();
}
+
+SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete;
};
typedef long (SwFrame:: *SwFrameGet)() const;
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 3502450c2a47..cb956d8f916c 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -404,14 +404,19 @@ void SwFrame::PrepareCursor()
const bool bTab = IsTabFrame();
bool bNoSect = IsInSct();
+#if BOOST_VERSION < 105600
+std::list tabGuard;
+std::list rowGuard;
+#else
boost::optional tabGuard;
boost::optional rowGuard;
+#endif
SwFlowFrame* pThis = bCnt ? static_cast(this) :
nullptr;
if ( bTab )
{
#if BOOST_VERSION < 105600
-tabGuard.reset(static_cast(this)); // tdf#125741
+tabGuard.emplace_back(static_cast(this)); //
tdf#125741
#else
tabGuard.emplace(static_cast(this)); // tdf#125741
#endif
@@ -420,7 +425,7 @@ void SwFrame::PrepareCursor()
else if (IsRowFrame())
{
#if BOOST_VERSION < 105600
-rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+rowGuard.emplace_back(this); // tdf#125741 keep this alive
#else
rowGuard.emplace(this); // tdf#125741 keep this alive
#endif
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index ea9df3300d11..c7cfd3006f06 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2523,7 +2523,11 @@ bool SwFlowFrame::MoveBwd( bool )
{
auto const pOld = m_rThis.GetUpper();
+#if BOOST_VERSION < 105600
+std::list g;
+#else
::boost::optional g;
+#endif
if (m_rThis.GetUpper()->IsCellFrame())
{
// note: IsFollowFlowRow() is never set for new-style tables
@@ -2534,7 +2538,7 @@ bool SwFlowFrame::MoveBwd( bool )
{
// lock follow-flow-row (similar to sections above)
#if BOOST_VERSION < 105600
-
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+g.emplace_back(m_rThis.GetUpper()->GetUpper());
#else
g.emplace(m_rThis.GetUpper()->GetUpper());
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source
sfx2/source/view/viewfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6c387cad214a56bb002fd28004705a64c3bf8bcc
Author: Tomáš Chvátal
AuthorDate: Mon Aug 19 15:35:35 2019 +0200
Commit: Caolán McNamara
CommitDate: Wed Aug 21 11:57:53 2019 +0200
Use get_value_or instead of value_or
The old boost does not understand the value_or function
Change-Id: I575d04eaab62294e1b402cd8c991c0daa1854271
Reviewed-on: https://gerrit.libreoffice.org/77729
Reviewed-by: Tomáš Chvátal
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5620f4396e8f..f879bc1df21f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1234,7 +1234,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
OUString sSetupVersion =
utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent =
sSetupVersion.getToken(0,'.').toInt32() * 10 +
sSetupVersion.getToken(1,'.').toInt32();
OUString sLastVersion
-=
officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0");
+=
officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0");
sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() *
10 + sLastVersion.getToken(1,'.').toInt32();
if ((iCurrent > iLast) &&
!Application::IsHeadlessModeEnabled() && !bIsUITest)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source
sw/source/core/layout/calcmove.cxx |8
sw/source/core/layout/flowfrm.cxx |4
2 files changed, 12 insertions(+)
New commits:
commit f8c14525575ccd030afb124b09490e5f8c6efe2c
Author: Tomáš Chvátal
AuthorDate: Mon Aug 19 13:30:23 2019 +0200
Commit: Caolán McNamara
CommitDate: Wed Aug 21 11:56:51 2019 +0200
Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
Reviewed-on: https://gerrit.libreoffice.org/77715
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index c142221cedc5..3502450c2a47 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -410,12 +410,20 @@ void SwFrame::PrepareCursor()
if ( bTab )
{
+#if BOOST_VERSION < 105600
+tabGuard.reset(static_cast(this)); // tdf#125741
+#else
tabGuard.emplace(static_cast(this)); // tdf#125741
+#endif
pThis = static_cast(this);
}
else if (IsRowFrame())
{
+#if BOOST_VERSION < 105600
+rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+#else
rowGuard.emplace(this); // tdf#125741 keep this alive
+#endif
}
else if( IsSctFrame() )
{
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 6e1b40986f73..54f0bdd4e567 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2532,7 +2532,11 @@ bool SwFlowFrame::MoveBwd( bool )
&& pTabFrame->GetFirstNonHeadlineRow() ==
m_rThis.GetUpper()->GetUpper())
{
// lock follow-flow-row (similar to sections above)
+#if BOOST_VERSION < 105600
+
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+#else
g.emplace(m_rThis.GetUpper()->GetUpper());
+#endif
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/core/layout/calcmove.cxx |8
sw/source/core/layout/flowfrm.cxx |4
2 files changed, 12 insertions(+)
New commits:
commit 3dd86101182543dcbad4df0c2e746ede26f1cbbb
Author: Tomáš Chvátal
AuthorDate: Mon Aug 19 13:30:23 2019 +0200
Commit: Caolán McNamara
CommitDate: Tue Aug 20 11:15:44 2019 +0200
Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
Reviewed-on: https://gerrit.libreoffice.org/77716
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 1856e6b69d40..ff2befe5d969 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -409,12 +409,20 @@ void SwFrame::PrepareCursor()
if ( bTab )
{
+#if BOOST_VERSION < 105600
+tabGuard.reset(static_cast(this)); // tdf#125741
+#else
tabGuard.emplace(static_cast(this)); // tdf#125741
+#endif
pThis = static_cast(this);
}
else if (IsRowFrame())
{
+#if BOOST_VERSION < 105600
+rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+#else
rowGuard.emplace(this); // tdf#125741 keep this alive
+#endif
}
else if( IsSctFrame() )
{
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 6c9e61595f23..dbe7d9c7feec 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2527,7 +2527,11 @@ bool SwFlowFrame::MoveBwd( bool )
&& pTabFrame->GetFirstNonHeadlineRow() ==
m_rThis.GetUpper()->GetUpper())
{
// lock follow-flow-row (similar to sections above)
+#if BOOST_VERSION < 105600
+
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+#else
g.emplace(m_rThis.GetUpper()->GetUpper());
+#endif
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
}
}
___
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/core/layout/calcmove.cxx |8
sw/source/core/layout/flowfrm.cxx |4
2 files changed, 12 insertions(+)
New commits:
commit 3132fe363a70fbc11b050f1548688ad84bc6fee1
Author: Tomáš Chvátal
AuthorDate: Mon Aug 19 13:30:23 2019 +0200
Commit: Tomáš Chvátal
CommitDate: Mon Aug 19 14:49:29 2019 +0200
Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
Reviewed-on: https://gerrit.libreoffice.org/77714
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index c142221cedc5..3502450c2a47 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -410,12 +410,20 @@ void SwFrame::PrepareCursor()
if ( bTab )
{
+#if BOOST_VERSION < 105600
+tabGuard.reset(static_cast(this)); // tdf#125741
+#else
tabGuard.emplace(static_cast(this)); // tdf#125741
+#endif
pThis = static_cast(this);
}
else if (IsRowFrame())
{
+#if BOOST_VERSION < 105600
+rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this
alive
+#else
rowGuard.emplace(this); // tdf#125741 keep this alive
+#endif
}
else if( IsSctFrame() )
{
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 0b09ff3680ac..ea9df3300d11 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2533,7 +2533,11 @@ bool SwFlowFrame::MoveBwd( bool )
&& pTabFrame->GetFirstNonHeadlineRow() ==
m_rThis.GetUpper()->GetUpper())
{
// lock follow-flow-row (similar to sections above)
+#if BOOST_VERSION < 105600
+
g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+#else
g.emplace(m_rThis.GetUpper()->GetUpper());
+#endif
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbc7a53b99d358eeed9478bf40c5b60aff815cbd Author: Tomáš Chvátal AuthorDate: Mon Jul 8 13:35:16 2019 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jul 15 00:46:15 2019 +0200 Require cmis-client 0.5.2 and newer With older releases the C++ 17 will not work and the configure would error out with weird message. Change-Id: Ife83669f0b55d3b013ca33f0b2a2709884309d5d Reviewed-on: https://gerrit.libreoffice.org/75218 Tested-by: Jenkins Tested-by: Tomáš Chvátal Reviewed-by: Tomáš Chvátal Reviewed-by: Adolfo Jayme Barrientos diff --git a/configure.ac b/configure.ac index b57a6225ef8c..44907555d6c5 100644 --- a/configure.ac +++ b/configure.ac @@ -6389,7 +6389,7 @@ dnl Check for system libcmis dnl === # libcmis requires curl and we can't build curl for iOS if test $_os != iOS; then -libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.0]) +libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2]) ENABLE_LIBCMIS=TRUE else ENABLE_LIBCMIS= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c6e07ec8799338405cbedf3cee22145c25e31742 Author: Tomáš Chvátal AuthorDate: Mon Jul 8 13:35:16 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Tue Jul 9 16:24:47 2019 +0200 Require cmis-client 0.5.2 and newer With older releases the C++ 17 will not work and the configure would error out with weird message. Change-Id: Ife83669f0b55d3b013ca33f0b2a2709884309d5d Reviewed-on: https://gerrit.libreoffice.org/75217 Tested-by: Jenkins Reviewed-by: Tomáš Chvátal Tested-by: Tomáš Chvátal Reviewed-by: Samuel Mehrbrodt diff --git a/configure.ac b/configure.ac index e3da6a75cd0b..45fefe5ada3a 100644 --- a/configure.ac +++ b/configure.ac @@ -6456,7 +6456,7 @@ dnl Check for system libcmis dnl === # libcmis requires curl and we can't build curl for iOS if test $_os != iOS; then -libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.0]) +libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2]) ENABLE_LIBCMIS=TRUE else ENABLE_LIBCMIS= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk solenv/gbuild
postprocess/CustomTarget_images.mk |4 ++--
postprocess/CustomTarget_registry.mk |2 ++
solenv/gbuild/GeneratedPackage.mk|2 +-
solenv/gbuild/Module.mk |2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 766425e2c58a00480feb3e30d9114df50a8e03a1
Author: Tomáš Chvátal
AuthorDate: Thu Apr 4 13:33:26 2019 +0200
Commit: Michael Stahl
CommitDate: Mon Apr 8 12:01:16 2019 +0200
Use sort on finds to improve deterministic build
This should sort out all outputs prior processing them further resulting
in equal output among multiple builds.
Change-Id: Iaf24bbb94eb7b8960177bcf2c3e08d31d2fb7210
Reviewed-on: https://gerrit.libreoffice.org/70254
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/postprocess/CustomTarget_images.mk
b/postprocess/CustomTarget_images.mk
index 5ad55799e1e1..f1e32f0b28ff 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -96,9 +96,9 @@ $(packimages_DIR)/commandimagelist.ilst :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
$(FIND) $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \
- grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' |
$(SORT) | uniq | \
+ grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | \
sed "s#^#%MODULE%#" | \
- LC_ALL=C $(SORT) > $@.tmp && \
+ LC_ALL=C $(SORT) -u > $@.tmp && \
$(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@))
$(packimages_DIR)/sorted.lst : \
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index e84c35eec7e5..a2560f2e2d74 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -597,6 +597,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Helper_abbreviate_dirs,\
$(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \
-name *.xcu -size +0c \
+ | LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print ""} \
{print ""$$0""} \
END {print ""}' > $@ \
@@ -612,6 +613,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
$(call gb_XcuResTarget_get_target,updchk/$*/))\
-name *.xcu \
+ | LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print ""} \
{print ""$$0""} \
END {print ""}' > $@ \
diff --git a/solenv/gbuild/GeneratedPackage.mk
b/solenv/gbuild/GeneratedPackage.mk
index 25af209b857e..05bbcf43a93e 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -42,7 +42,7 @@ $(call gb_GeneratedPackage_get_target,%) :
$(foreach pair,$(PACKAGE_DIRS),&& cp -R
$(PACKAGE_SOURCEDIR)/$(call gb_GeneratedPackage__get_srcdir,$(pair)) $(call
gb_GeneratedPackage__get_destdir,$(pair))) \
)
$(call gb_Helper_abbreviate_dirs,\
- $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call
gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print > $@
\
+ $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call
gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print |
LC_ALL=C $(SORT) > $@ \
)
.PHONY : $(call gb_GeneratedPackage_get_clean_target,%)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 8b74a425bb2e..52798fd40731 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -235,7 +235,7 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize
propex ulfex xrmex tr
$(call gb_Output_announce,$(subst .pot,,$(subst
$(WORKDIR)/,,$@)),$(true),POT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && $(call gb_Helper_execute,localize)
$(SRCDIR) $(dir $@)/pot \
- && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e
"s/\.pot/.po/" > $(dir $@)/LIST \
+ && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e
"s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
&& touch $@)
# enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source
sc/source/core/tool/interpr1.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 04074fe336be514d3d3f3537e6ff915a7604f6f4
Author: Tomáš Chvátal
AuthorDate: Fri Mar 15 16:43:31 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Mar 25 16:35:05 2019 +0100
Use RegexMatcher.find(pos, status) call on old ICU
The RegexMatcher.find(status) is new since icu 55 and this works even
on the old releases thus revert there to the available albeit slower
call.
Change-Id: I964c10efd15515b04ac9037cda3b5b309910baf5
Reviewed-on: https://gerrit.libreoffice.org/69311
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Reviewed-on: https://gerrit.libreoffice.org/69312
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c9c3624bb019..fc0600368b7f 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -9411,7 +9411,12 @@ void ScInterpreter::ScRegex()
{
// Find n-th occurrence.
sal_Int32 nCount = 0;
-while (aRegexMatcher.find( status) && U_SUCCESS(status) && ++nCount <
nOccurrence)
+#if (U_ICU_VERSION_MAJOR_NUM < 55)
+int32_t nStartPos = 0;
+while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status) &&
++nCount < nOccurrence)
+#else
+while (aRegexMatcher.find(status) && U_SUCCESS(status) && ++nCount <
nOccurrence)
+#endif
;
if (U_FAILURE(status))
{
@@ -9451,7 +9456,12 @@ void ScInterpreter::ScRegex()
{
// Replace n-th occurrence of match with replacement.
sal_Int32 nCount = 0;
-while (aRegexMatcher.find( status) && U_SUCCESS(status))
+#if (U_ICU_VERSION_MAJOR_NUM < 55)
+int32_t nStartPos = 0;
+while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status))
+#else
+while (aRegexMatcher.find(status) && U_SUCCESS(status))
+#endif
{
// XXX NOTE: After several RegexMatcher::find() the
// RegexMatcher::appendReplacement() still starts at the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/core/crsr/findtxt.cxx |4
sw/source/core/inc/txtfrm.hxx |7 +++
2 files changed, 11 insertions(+)
New commits:
commit 848b25f0848bbf3d214ac19c9f815b488be9303d
Author: Tomáš Chvátal
AuthorDate: Wed Mar 20 12:05:39 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Mar 25 16:34:03 2019 +0100
Add few more fixes to build with Boost < 1.56
Change-Id: Ifbdbf7f2d44d569c491b1822d9d842433a9978a1
Reviewed-on: https://gerrit.libreoffice.org/69461
Reviewed-by: Tomáš Chvátal
Tested-by: Tomáš Chvátal
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index f45516361c2d..03239dfb1063 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -152,7 +152,11 @@ public:
{
if (pFrame)
{
+#if BOOST_VERSION < 105600
+m_oMergedIter.reset(*pFrame);
+#else
m_oMergedIter.emplace(*pFrame);
+#endif
}
}
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 9af04de107a5..bf4c0ad8a316 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -24,6 +24,8 @@
#include
#include "TextFrameIndex.hxx"
+#include
+
namespace com { namespace sun { namespace star { namespace linguistic2 { class
XHyphenatedWord; } } } }
namespace sw { namespace mark { class IMark; } }
@@ -980,8 +982,13 @@ struct MergedPara
class MergedAttrIterBase
{
protected:
+#if BOOST_VERSION < 105600
+sw::MergedPara const* m_pMerged;
+SwTextNode const* m_pNode;
+#else
sw::MergedPara const*const m_pMerged;
SwTextNode const*const m_pNode;
+#endif
size_t m_CurrentExtent;
size_t m_CurrentHint;
MergedAttrIterBase(SwTextFrame const& rFrame);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source
sfx2/source/appl/shutdownicon.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 358637547c5bb7ae6ca637640c4279455414dbfa Author: Tomáš Chvátal AuthorDate: Fri Mar 15 16:16:31 2019 +0100 Commit: Caolán McNamara CommitDate: Mon Mar 25 16:32:39 2019 +0100 Fix build with boost 1.69 This is also fixed with master with boost bump which we do not need here. Change-Id: I61caec10c0c6d442cef3d51c31eaff01f18b89e3 Reviewed-on: https://gerrit.libreoffice.org/69310 Reviewed-by: Tomáš Chvátal Tested-by: Tomáš Chvátal Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index e917c3a91a0c..8a51e5c88122 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -143,7 +143,7 @@ bool LoadModule() #endif // ENABLE_QUICKSTART_APPLET } assert(!boost::logic::indeterminate(loaded)); -return loaded; +return bool(loaded); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 3aaee1170807ba5b8a301291800a89e96c012832
Author: Tomáš Chvátal
AuthorDate: Fri Mar 15 16:43:31 2019 +0100
Commit: Eike Rathke
CommitDate: Fri Mar 22 20:58:16 2019 +0100
Use RegexMatcher.find(pos, status) call on old ICU
The RegexMatcher.find(status) is new since icu 55 and this works even
on the old releases thus revert there to the available albeit slower
call.
Change-Id: I964c10efd15515b04ac9037cda3b5b309910baf5
Reviewed-on: https://gerrit.libreoffice.org/69311
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 75fd8f82b874..0281ab3f4cbf 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -9408,7 +9408,12 @@ void ScInterpreter::ScRegex()
{
// Find n-th occurrence.
sal_Int32 nCount = 0;
-while (aRegexMatcher.find( status) && U_SUCCESS(status) && ++nCount <
nOccurrence)
+#if (U_ICU_VERSION_MAJOR_NUM < 55)
+int32_t nStartPos = 0;
+while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status) &&
++nCount < nOccurrence)
+#else
+while (aRegexMatcher.find(status) && U_SUCCESS(status) && ++nCount <
nOccurrence)
+#endif
;
if (U_FAILURE(status))
{
@@ -9448,7 +9453,12 @@ void ScInterpreter::ScRegex()
{
// Replace n-th occurrence of match with replacement.
sal_Int32 nCount = 0;
-while (aRegexMatcher.find( status) && U_SUCCESS(status))
+#if (U_ICU_VERSION_MAJOR_NUM < 55)
+int32_t nStartPos = 0;
+while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status))
+#else
+while (aRegexMatcher.find(status) && U_SUCCESS(status))
+#endif
{
// XXX NOTE: After several RegexMatcher::find() the
// RegexMatcher::appendReplacement() still starts at the
___
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/core/crsr/findtxt.cxx |4
sw/source/core/inc/txtfrm.hxx |7 +++
2 files changed, 11 insertions(+)
New commits:
commit 0e4ea2d08a2bf7bda47815ed32b19e70c0d7e905
Author: Tomáš Chvátal
AuthorDate: Wed Mar 20 12:05:39 2019 +0100
Commit: Tomáš Chvátal
CommitDate: Fri Mar 22 11:44:11 2019 +0100
Add few more fixes to build with Boost < 1.56
Change-Id: Ifbdbf7f2d44d569c491b1822d9d842433a9978a1
Reviewed-on: https://gerrit.libreoffice.org/69462
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index eeba1415994c..8503a98c17c2 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -151,7 +151,11 @@ public:
{
if (pFrame)
{
+#if BOOST_VERSION < 105600
+m_oMergedIter.reset(*pFrame);
+#else
m_oMergedIter.emplace(*pFrame);
+#endif
}
}
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 4cf13bbdf1c5..51eaf62279c5 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -24,6 +24,8 @@
#include
#include "TextFrameIndex.hxx"
+#include
+
namespace com { namespace sun { namespace star { namespace linguistic2 { class
XHyphenatedWord; } } } }
namespace sw { namespace mark { class IMark; } }
@@ -978,8 +980,13 @@ struct MergedPara
class MergedAttrIterBase
{
protected:
+#if BOOST_VERSION < 105600
+sw::MergedPara const* m_pMerged;
+SwTextNode const* m_pNode;
+#else
sw::MergedPara const*const m_pMerged;
SwTextNode const*const m_pNode;
+#endif
size_t m_CurrentExtent;
size_t m_CurrentHint;
MergedAttrIterBase(SwTextFrame const& rFrame);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
