[Libreoffice-commits] online.git: net/Socket.hpp
net/Socket.hpp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 65df3e6ceb8bf06f8ed2afd9f3667a1458ceeec8 Author: Miklos Vajna Date: Thu May 24 08:50:22 2018 +0200 net: use std::move() in the StreamSocket ctor It was inconsistent that the StreamSocket ctor had a const parameter, but the SslStreamSocket had a non-const one and used std::move(). Use the later in the parent class as well for consistency. Change-Id: I58597b97432a801d164d6ed9d831a0372280e687 diff --git a/net/Socket.hpp b/net/Socket.hpp index 6cd2190d4..965f08247 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -706,9 +706,9 @@ class StreamSocket : public Socket, public std::enable_shared_from_this socketHandler) : + std::shared_ptr socketHandler) : Socket(fd), -_socketHandler(socketHandler), +_socketHandler(std::move(socketHandler)), _bytesSent(0), _bytesRecvd(0), _wsState(WSState::HTTP), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/sanitizers writerperfect/uiconfig
solenv/sanitizers/ui/writerperfect.suppr |1 - writerperfect/uiconfig/ui/exportepub.ui |2 -- 2 files changed, 3 deletions(-) New commits: commit bb89376797b3eace17afacf764b833287376a486 Author: Miklos Vajna Date: Wed May 23 21:33:01 2018 +0200 EPUB export: fix gla11y warnings Change-Id: I4d2ca93ff01e27ee3400adab230cb8679aacdaa9 Reviewed-on: https://gerrit.libreoffice.org/54727 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/solenv/sanitizers/ui/writerperfect.suppr b/solenv/sanitizers/ui/writerperfect.suppr deleted file mode 100644 index 8fd09d871e00.. --- a/solenv/sanitizers/ui/writerperfect.suppr +++ /dev/null @@ -1 +0,0 @@ -writerperfect/uiconfig/ui/exportepub.ui://GtkComboBoxText[@id='versionlb'] duplicate-mnemonic diff --git a/writerperfect/uiconfig/ui/exportepub.ui b/writerperfect/uiconfig/ui/exportepub.ui index 8b1ff34d7b00..ff6d43e1fd1c 100644 --- a/writerperfect/uiconfig/ui/exportepub.ui +++ b/writerperfect/uiconfig/ui/exportepub.ui @@ -90,7 +90,6 @@ 6 General True -versionlb 0 @@ -428,7 +427,6 @@ 6 Metadata True -versionlb 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/opengl
slideshow/opengl/rippleFragmentShader.glsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 451a76ec6f585b23108240454557285f518f89c9 Author: Andrea Gelmini Date: Wed May 23 16:10:58 2018 +0200 Fix typo Change-Id: I0635a5f4f02a1de222656133bca1ff2da8ce59f6 Reviewed-on: https://gerrit.libreoffice.org/54711 Reviewed-by: Julien Nabet Tested-by: Christian Lohmaier diff --git a/slideshow/opengl/rippleFragmentShader.glsl b/slideshow/opengl/rippleFragmentShader.glsl index ec641d67a571..df4bd592796f 100644 --- a/slideshow/opengl/rippleFragmentShader.glsl +++ b/slideshow/opengl/rippleFragmentShader.glsl @@ -38,7 +38,7 @@ void main() // We want the ripple to span all of the slide at the end of the transition. float t = time * (sqrt(2.0) * (slideRatio < 1.0 ? 1.0 / slideRatio : slideRatio)); -// Interpolate the distance to the center in fonction of the time. +// Interpolate the distance to the center in function of the time. float mixed = smoothstep(t*w-v, t*w+v, dist); // Get the displacement offset from the current pixel, for fragments that have been touched by the ripple already. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/syswin.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 232103d09e55309ccb77cf2e481df46a9ae6fe83
Author: Tor Lillqvist
Date: Wed May 23 23:17:19 2018 +0300
Add FullScreen bit to WindowStateState
FullScreen in this context means a top-level window that is both
full-screen from the desktop environment's perspective (which
depending on the desktop environment might simply mean that it is as
large as possible to fill its screen, leaving any system menus etc
visible), *and* is in LibreOffice's full-screen mode (with no toolbars
or other UI elements except the document contents visible).
Not yet used, will be used in follow-up commits.
Change-Id: Ia6f86e0d2a7c5a621c6f19d897d3b17ba6bfb8b4
Reviewed-on: https://gerrit.libreoffice.org/54733
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 4a2088114fc6..f9453f106a30 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -70,6 +70,7 @@ enum class WindowStateState {
Rollup = 0x0008,
MaximizedHorz = 0x0010,
MaximizedVert = 0x0020,
+FullScreen = 0x0040,
SystemMask = 0x
};
namespace o3tl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/formulacell.hxx |1
sc/inc/recursionhelper.hxx |8 ++
sc/source/core/data/formulacell.cxx | 23 ++-
sc/source/core/tool/recursionhelper.cxx | 37
4 files changed, 67 insertions(+), 2 deletions(-)
New commits:
commit 25cc0ab3b5d154fffbef27fad4adcf90f36ae92e
Author: Dennis Francis
Date: Tue May 15 16:44:15 2018 +0530
Calc threading : Check for "self" references...
...on indirect dependencies too.
Here a self reference to any formula-group
means if there are any references in a formula
(of the formula-group itself or any of its dependencies)
that points to any element inside the formula-group.
If there are any self-references, then that formula-group
can't be computed in parallel.
For example, with this patch we can detect the following case:-
Suppose the formula-group that we want to check is:
"=(F2+G2-10)*10.0" spanning A2:A100. Let the formula-group
starting at F2 be "=A1*0.1-10". The indirect dependency
formula-group starting at F2, references back the elements of
our original formula-group at A2. This makes the F.G at
A2 unsafe for parallel computation.
Concretly, this patch fixes a recalc crash on tdf#63638/1
Change-Id: I7b999a34571b191d2f70da6a3831f78b24a6b0a7
Reviewed-on: https://gerrit.libreoffice.org/54433
Reviewed-by: Michael Meeks
Tested-by: Jenkins
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 7656e7a3efec..cee9fec13fc2 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -66,6 +66,7 @@ public:
SvNumFormatType mnFormatType;
bool mbInvariant:1;
bool mbSubTotal:1;
+bool mbSeenInPath:1; // For detecting cycle of formula groups
sal_uInt8 meCalcState;
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 560b66ab357e..b8ca1d087509 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -23,9 +23,11 @@
#include "formularesult.hxx"
#include
+#include
#include
class ScFormulaCell;
+struct ScFormulaCellGroup;
struct ScFormulaRecursionEntry
{
@@ -44,10 +46,12 @@ typedef ::std::list< ScFormulaRecursionEntry >
ScFormulaRecursionList;
class ScRecursionHelper
{
typedef ::std::stack< ScFormulaCell* > ScRecursionInIterationStack;
+typedef ::std::vector< ScFormulaCellGroup* > ScFGList;
ScFormulaRecursionList aRecursionFormulas;
ScFormulaRecursionList::iteratoraInsertPos;
ScFormulaRecursionList::iteratoraLastIterationStart;
ScRecursionInIterationStack aRecursionInIterationStack;
+ScFGListaFGList;
sal_uInt16 nRecursionCount;
sal_uInt16 nIteration;
boolbInRecursionReturn;
@@ -94,6 +98,10 @@ public:
ScRecursionInIterationStack&GetRecursionInIterationStack() { return
aRecursionInIterationStack; }
void Clear();
+
+/** Detects whether the formula-group is part of a simple cycle of
formula-groups. */
+bool PushFormulaGroup(ScFormulaCellGroup* pGrp);
+void PopFormulaGroup();
};
#endif // INCLUDED_SC_INC_RECURSIONHELPER_HXX
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9731f8a6f297..daaa80e5b921 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -528,6 +528,7 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
mnFormatType(SvNumFormatType::NUMBER),
mbInvariant(false),
mbSubTotal(false),
+mbSeenInPath(false),
meCalcState(sc::GroupCalcEnabled)
{
}
@@ -1527,6 +1528,14 @@ void ScFormulaCell::Interpret()
else
{
pDocument->IncInterpretLevel();
+
+bool bCheckForFGCycle = mxGroup &&
!pDocument->mbThreadedGroupCalcInProgress &&
+mxGroup->meCalcState == sc::GroupCalcEnabled &&
+ScCalcConfig::isThreadingEnabled();
+bool bPopFormulaGroup = false;
+if (bCheckForFGCycle)
+bPopFormulaGroup =
rRecursionHelper.PushFormulaGroup(mxGroup.get());
+
#if DEBUG_CALCULATION
aDC.enterGroup();
bool bGroupInterpreted = InterpretFormulaGroup();
@@ -1537,6 +1546,10 @@ void ScFormulaCell::Interpret()
if (!InterpretFormulaGroup())
InterpretTail( pDocument->GetNonThreadedContext(), SCITP_NORMAL);
#endif
+
+if (bPopFormulaGroup)
+rRecursionHelper.PopFormulaGroup();
+
pDocument->DecInterpretLevel();
}
@@ -4129,14 +4142,14 @@ struct ScDependantsCalculator
SCROW nEndRow = mrPos.Row() + mnLen - 1;
-if (nRelRow < 0)
+if (nRelRow <= 0)
{
SCROW nTest = nEndRow;
nTest += nRelRow;
if (nTest >= mrPos.Row())
return true;
}
-
[Libreoffice-commits] core.git: cui/source
cui/source/customize/SvxMenuConfigPage.cxx|1 - cui/source/customize/SvxToolbarConfigPage.cxx |1 - 2 files changed, 2 deletions(-) New commits: commit 1d16a2562577acdaa3624ab02216bef02863619a Author: Muhammet Kara Date: Wed May 23 17:24:13 2018 +0300 Remove unnecessary include Change-Id: I660bc8efd441e9fc5b6f83f69dc632a26add193b Reviewed-on: https://gerrit.libreoffice.org/54712 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index dd9fb7e71fe0..9b69c64a1374 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -58,7 +58,6 @@ #include #include #include -#include "eventdlg.hxx" #include #include diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index aaccfca3fef7..bdca809fd326 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -58,7 +58,6 @@ #include #include #include -#include "eventdlg.hxx" #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 +--
writerfilter/source/dmapper/NumberingManager.cxx |1 -
writerfilter/source/dmapper/StyleSheetTable.cxx |2 --
writerfilter/source/dmapper/StyleSheetTable.hxx |1 -
5 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 8d42de21c10bfefeaffabc5c939e7830a09f7dca
Author: Justin Luth
Date: Sat May 12 20:53:45 2018 +0300
revert tdf#76817 ooxmlimport: connect Heading to existing numbers
tdf#50774 has an example document which was broken by 6.1 commit
8e9e705de29a1a3d9b964c9350aa2a3a17cce6f9.
Reverting does a couple of things:
-go back to previous behaviour (right or wrong) - no regression.
-gives an opportunity to find documents broken by reverting -
i.e. it will give an indication as to which state has more broken
docs. Can be re-visited in 6.2.
-gives me an option to escape from this horrible mess without causing
a regression in a production release of LO.
Change-Id: Ib594b76d5533a0c4807cf70ef706c107e52cddcf
Reviewed-on: https://gerrit.libreoffice.org/54293
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0442456cd8c8..0dc6ebe65b20 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -348,10 +348,13 @@ DECLARE_OOXMLEXPORT_TEST(testNumberingFont,
"numbering-font.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf106541_noinheritChapterNumbering,
"tdf106541_noinheritChapterNumbering.odt")
{
-// in LO, it appears that styles based on the Chapter Numbering style
explicitly sets the
-// numbering style/outline level to 0 by default, and prevents inheriting
directly from "Outline" style.
+// in LO, it appears that styles based on the Chapter Numbering style
explicitly set the
+// numbering style/outline level to 0 by default, and that LO prevents
inheriting directly from "Outline" style.
// Adding this preventative unit test to ensure that any fix for tdf106541
doesn't make incorrect assumptions.
-CPPUNIT_ASSERT_EQUAL(OUString("Outline"),
getProperty(getParagraph(1), "NumberingStyleName"));
+
+//reverting tdf#76817 hard-codes the numbering style on the paragraph,
preventing RT of "Outline" style
+//CPPUNIT_ASSERT_EQUAL(OUString("Outline"),
getProperty(getParagraph(1), "NumberingStyleName"));
+
OUString sPara3NumberingStyle = getProperty(getParagraph(3),
"NumberingStyleName");
CPPUNIT_ASSERT_EQUAL(sPara3NumberingStyle,
getProperty(getParagraph(4), "NumberingStyleName"));
@@ -719,7 +722,9 @@ DECLARE_OOXMLEXPORT_TEST(testOOxmlOutlineNumberTypes,
"outline-number-types.odt"
DECLARE_OOXMLEXPORT_TEST(testNumParentStyle, "num-parent-style.docx")
{
-CPPUNIT_ASSERT_EQUAL(OUString("Outline"),
getProperty(getParagraph(4), "NumberingStyleName"));
+//reverting tdf#76817 hard-codes the numbering style on the paragraph,
preventing RT of "Outline" style
+//I think this unit test is wrong, but I will revert to its original claim.
+CPPUNIT_ASSERT(getProperty(getParagraph(4),
"NumberingStyleName").startsWith("WWNum"));
}
DECLARE_OOXMLEXPORT_TEST(testNumOverrideLvltext, "num-override-lvltext.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 409c7083ad7e..f84f37536f93 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1132,8 +1132,7 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap )
sal_Int32 nListId = pEntry ? lcl_getListId(pEntry,
GetStyleSheetTable()) : -1;
if( pStyleSheetProperties && nListId >= 0 )
{
-if ( !pEntry->bIsChapterNumbering )
-pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny(
ListDef::GetStyleName( nListId ) ), false);
+pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny(
ListDef::GetStyleName( nListId ) ), false);
// Indent properties from the paragraph style have priority
// over the ones from the numbering styles in Word
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 8e14b3a32dbc..f3679f8eb614 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -625,7 +625,6 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
xOutlines->getChapterNumberingRules( );
StyleSheetEntryPtr pParaStyle = pAbsLevel->GetParaStyle( );
-pParaStyle->bIsChapterNumbering = true;
aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_HEADING_STYLE_N
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 67 commits - configure.ac download.lst editeng/source external/curl external/expat external/graphite external/icu external/libpng ext
Rebased ref, commits from common ancestor:
commit bc7813272754f95f3705eac4f7726c63c646f985
Author: Michael Meeks
Date: Fri Dec 13 13:20:10 2013 +
graphite2: get visibility right for static linkage on windows.
Change-Id: I79fa15d539bcb86610dd4def08536c33bd2a10c2
(cherry picked from commit 8949d6f32acb9046cb3ddceb4f6fbe39dcc04383)
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index abfa77578086..8126c1ec11f0 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -26,8 +26,9 @@
#include
#include
#if ENABLE_GRAPHITE
-#include
-#include
+# include
+# include
+# include
#endif
#include
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index da8e619fd64c..0202497ae95a 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -23,6 +23,7 @@
// 1001=1&2002=2&fav1=0
#include
#include
+#include
#include
namespace grutils
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index d439026f1fcb..4fe78367c3fa 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -31,6 +31,7 @@
#include
#include
// Libraries
+#include
#include
#include
// Platform
diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx
new file mode 100644
index ..4c70cf1b95ab
--- /dev/null
+++ b/vcl/inc/graphite_static.hxx
@@ -0,0 +1,17 @@
+/* -*- 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/.
+ */
+
+#ifdef WNT
+# ifndef GRAPHITE2_STATIC
+#define GRAPHITE2_STATIC 1
+# endif
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index b54c8765b213..d6b1d85d2178 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -31,7 +31,8 @@
#include
#if ENABLE_GRAPHITE
-#include
+# include
+# include
#endif
class FontSelectPattern;
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index ef76f85172de..499458eb307f 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -53,6 +53,7 @@
#include
// Graphite Libraries (must be after vcl headers on windows)
+#include
#include
#include
commit 60a4f2b0d3f7ff87d2a3211f8139b928d7c3d139
Author: Thorsten Behrens
Date: Wed May 23 11:05:23 2018 +0200
build libxml2 w/o c99 nonsense
Change-Id: I8d2c36edb9d9d07edb33783db156c27a63f18ac6
diff --git a/external/libxml2/UnpackedTarball_xml2.mk
b/external/libxml2/UnpackedTarball_xml2.mk
index 0d3f866a0ae8..17203bfb179e 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
external/libxml2/0001-Increase-buffer-space-for-port-in-HTTP-redirect-supp.patch.1
\
external/libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1
\
external/libxml2/0001-Fix-handling-of-parameter-entity-references.patch.1 \
+ external/libxml2/libxml2-no-c99.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-no-c99.patch
b/external/libxml2/libxml2-no-c99.patch
new file mode 100644
index ..05e6672e2d55
--- /dev/null
+++ b/external/libxml2/libxml2-no-c99.patch
@@ -0,0 +1,31 @@
+--- a/xml2/relaxng.c 2016-05-23 09:25:25.0 +0200
b/xml2/relaxng.c 2018-05-22 23:28:27.192916200 +0200
+@@ -2088,6 +2088,7 @@
+ const xmlChar * arg2)
+ {
+ char msg[1000];
++xmlChar *result;
+
+ if (arg1 == NULL)
+ arg1 = BAD_CAST "";
+@@ -2215,7 +2216,7 @@
+ snprintf(msg, 1000, "Unknown error code %d\n", err);
+ }
+ msg[1000 - 1] = 0;
+-xmlChar *result = xmlCharStrdup(msg);
++result = xmlCharStrdup(msg);
+ return (xmlEscapeFormatString(&result));
+ }
+
+--- a/xml2/xmlschemas.c2016-05-23 09:25:25.0 +0200
b/xml2/xmlschemas.c2018-05-22 23:26:52.835511300 +0200
+@@ -3168,8 +3168,8 @@
+ "valid.");
+ }
+ if (expected) {
+- msg = xmlStrcat(msg, BAD_CAST " Expected is '");
+ xmlChar *expectedEscaped = xmlCharStrdup(expected);
++ msg = xmlStrcat(msg, BAD_CAST " Expected is '");
+ msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
+ FREE_AND_NULL(expectedEscaped);
+ msg = xmlStrcat(msg, BAD_CAST "'.\n");
commit dd730119bb74ff5ce511bd3e42953cba523fc036
Author: Thorsten Behrens
Date: Wed May 23 10:58:59 2018 +0200
build nss w/o c99 nonsense
Change-Id: I4c1058cbd4e4bdef2e15a703d2
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg
icon-themes/breeze/links.txt |8 icon-themes/breeze_dark/links.txt |8 icon-themes/breeze_svg/links.txt |8 3 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 6fecbff9810ae9afc2de8c4d5e9e8a8a511d1f2d Author: andreas kainz Date: Wed May 23 23:24:10 2018 +0200 tdf#117481 Breeze Add dbaccess icons for base sidebar Change-Id: I5174261484c64a6f223c4a2e197d0e042c3581e3 Reviewed-on: https://gerrit.libreoffice.org/54737 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/breeze/res/forms_32.png b/icon-themes/breeze/dbaccess/res/forms_32.png similarity index 100% rename from icon-themes/breeze/res/forms_32.png rename to icon-themes/breeze/dbaccess/res/forms_32.png diff --git a/icon-themes/breeze/res/queries_32.png b/icon-themes/breeze/dbaccess/res/queries_32.png similarity index 100% rename from icon-themes/breeze/res/queries_32.png rename to icon-themes/breeze/dbaccess/res/queries_32.png diff --git a/icon-themes/breeze/res/reports_32.png b/icon-themes/breeze/dbaccess/res/reports_32.png similarity index 100% rename from icon-themes/breeze/res/reports_32.png rename to icon-themes/breeze/dbaccess/res/reports_32.png diff --git a/icon-themes/breeze/res/tables_32.png b/icon-themes/breeze/dbaccess/res/tables_32.png similarity index 100% rename from icon-themes/breeze/res/tables_32.png rename to icon-themes/breeze/dbaccess/res/tables_32.png diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 3c961e2ac9a2..cb07729aa84d 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -912,7 +912,7 @@ dbaccess/res/exinfo.png cmd/sc_helpindex.png dbaccess/res/form_16.png cmd/sc_dbformedit.png dbaccess/res/forms_16.png cmd/sc_dbformedit.png -dbaccess/res/forms_32.png res/forms_32.png +res/forms_32.png dbaccess/res/forms_32.png dbaccess/res/lc036.png cmd/lc_dbnewreport.png dbaccess/res/lc037.png cmd/lc_delete.png @@ -926,11 +926,11 @@ dbaccess/res/nu08.png cmd/sc_cancel.png dbaccess/res/one_left.png cmd/sc_prevrecord.png dbaccess/res/one_right.png cmd/sc_nextrecord.png dbaccess/res/jo01.png dbaccess/res/pkey.png -dbaccess/res/queries_32.png res/queries_32.png +res/queries_32.png dbaccess/res/queries_32.png dbaccess/res/report_16.png cmd/sc_executereport.png dbaccess/res/reports_16.png cmd/sc_executereport.png -dbaccess/res/reports_32.png res/reports_32.png +res/reports_32.png dbaccess/res/reports_32.png dbaccess/res/sc036.png cmd/sc_executereport.png dbaccess/res/sc037.png cmd/sc_delete.png @@ -940,7 +940,7 @@ dbaccess/res/sc040.png cmd/sc_reload.png dbaccess/res/sortdown.png cmd/sc_sortascending.png dbaccess/res/sortup.png cmd/sc_sortdescending.png -dbaccess/res/tables_32.png res/tables_32.png +res/tables_32.png dbaccess/res/tables_32.png # desktop # == diff --git a/icon-themes/breeze_dark/res/forms_32.png b/icon-themes/breeze_dark/dbaccess/res/forms_32.png similarity index 100% rename from icon-themes/breeze_dark/res/forms_32.png rename to icon-themes/breeze_dark/dbaccess/res/forms_32.png diff --git a/icon-themes/breeze_dark/res/queries_32.png b/icon-themes/breeze_dark/dbaccess/res/queries_32.png similarity index 100% rename from icon-themes/breeze_dark/res/queries_32.png rename to icon-themes/breeze_dark/dbaccess/res/queries_32.png diff --git a/icon-themes/breeze_dark/res/reports_32.png b/icon-themes/breeze_dark/dbaccess/res/reports_32.png similarity index 100% rename from icon-themes/breeze_dark/res/reports_32.png rename to icon-themes/breeze_dark/dbaccess/res/reports_32.png diff --git a/icon-themes/breeze_dark/res/tables_32.png b/icon-themes/breeze_dark/dbaccess/res/tables_32.png similarity index 100% rename from icon-themes/breeze_dark/res/tables_32.png rename to icon-themes/breeze_dark/dbaccess/res/tables_32.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index 3c961e2ac9a2..cb07729aa84d 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -912,7 +912,7 @@ dbaccess/res/exinfo.png cmd/sc_helpindex.png dbaccess/res/form_16.png cmd/sc_dbformedit.png dbaccess/res/forms_16.png cmd/sc_dbformedit.png -dbaccess/res/forms_32.png res/forms_32.png +res/forms_32.png dbaccess/res/forms_32.png dbaccess/res/lc036.png cmd/lc_dbnewreport.png dbaccess/res/lc037.png cmd/lc_delete.png @@ -926,11 +926,11 @@ dbaccess/res/nu08.png cmd/sc_cancel.png dbaccess/res/one_left.png cmd/sc_prevrecord.png dbaccess/res/one_right.png cmd/sc_nextrecord.png dbaccess/res/jo01.png dbaccess/res/pkey.png -dbaccess/res/queries_32.png res/queries_32.png +res/queries_32.png dbaccess/res/queries_32.png dbaccess/res/report_16.png cmd/sc_executereport.png dbaccess/res/reports_16.png cmd/sc_executereport.png -dbaccess/res/reports_32.png res/reports_32.png +res/reports_32.png dbaccess/res/reports_32.png dbaccess/res/sc036.png cmd/sc_ex
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/fontworkgallery.cxx | 12 1 file changed, 12 insertions(+) New commits: commit d541c4548fdc1835cf4fc020dbaa7ed7c2f734d0 Author: Armin Le Grand Date: Wed May 23 18:14:58 2018 +0200 tdf#117629 Fix FontWork UNO API/SdrPage settings Change-Id: Id4da3ac2ff9f8bba382512cfafbca323d1002137 Reviewed-on: https://gerrit.libreoffice.org/54722 Tested-by: Jenkins Reviewed-by: Armin Le Grand diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 06c0da159507..29003a619d64 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -216,6 +216,18 @@ void FontWorkGalleryDialog::insertSelectedFontwork() pPage->GetObj(0)->CloneSdrObject( bUseSpecialCalcMode ? *mpDestModel : mpSdrView->getSdrModelFromSdrView())); +// tdf#117629 +// Since the 'old' ::CloneSdrObject also copies the SdrPage* the +// SdrObject::getUnoShape() *will* create the wrong UNO API object +// early. This IS one of the reasons I do change these things - this +// error does not happen with my next change I am working on already +// ARGH! For now, reset the SdrPage* to nullptr. +// What sense does it have to copy the SdrPage* of the original SdrObject ?!? +// : This also *might* be the hidden reason for the strange code at the +// end of SdrObject::SetPage that tries to delete the SvxShape under some +// circumstances... +pNewObject->SetPage(nullptr); + tools::Rectangle aObjRect( pNewObject->GetLogicRect() ); tools::Rectangle aVisArea = pOutDev->PixelToLogic(tools::Rectangle(Point(0,0), pOutDev->GetOutputSizePixel())); Point aPagePos = aVisArea.Center(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/dbaccess/res/forms_32.png |binary icon-themes/elementary/dbaccess/res/queries_32.png |binary icon-themes/elementary/dbaccess/res/reports_32.png |binary icon-themes/elementary/dbaccess/res/tables_32.png |binary icon-themes/elementary/links.txt |8 icon-themes/elementary_svg/dbaccess/res/forms_32.svg |1 + icon-themes/elementary_svg/dbaccess/res/queries_32.svg |1 + icon-themes/elementary_svg/dbaccess/res/reports_32.svg |1 + icon-themes/elementary_svg/dbaccess/res/tables_32.svg |1 + icon-themes/elementary_svg/links.txt | 11 +-- 10 files changed, 13 insertions(+), 10 deletions(-) New commits: commit 748215da08dba56125e3a671381d1e872bd1ecc7 Author: andreas kainz Date: Wed May 23 23:17:27 2018 +0200 tdf#117481 Elementary: Add dbaccess icons for base sidebar Change-Id: Ia4e2b0bb7b31671a50acf6659ea3ca83c3dfcb39 Reviewed-on: https://gerrit.libreoffice.org/54736 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/elementary/dbaccess/res/forms_32.png b/icon-themes/elementary/dbaccess/res/forms_32.png new file mode 100644 index ..e80f64992f78 Binary files /dev/null and b/icon-themes/elementary/dbaccess/res/forms_32.png differ diff --git a/icon-themes/elementary/dbaccess/res/queries_32.png b/icon-themes/elementary/dbaccess/res/queries_32.png new file mode 100644 index ..0d3371a37506 Binary files /dev/null and b/icon-themes/elementary/dbaccess/res/queries_32.png differ diff --git a/icon-themes/elementary/dbaccess/res/reports_32.png b/icon-themes/elementary/dbaccess/res/reports_32.png new file mode 100644 index ..9013ebb4ad22 Binary files /dev/null and b/icon-themes/elementary/dbaccess/res/reports_32.png differ diff --git a/icon-themes/elementary/dbaccess/res/tables_32.png b/icon-themes/elementary/dbaccess/res/tables_32.png new file mode 100644 index ..6d4ac33381e1 Binary files /dev/null and b/icon-themes/elementary/dbaccess/res/tables_32.png differ diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index e05164dfbead..b8a1c9280820 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -904,7 +904,7 @@ dbaccess/res/exinfo.png cmd/sc_helpindex.png dbaccess/res/form_16.png cmd/sc_dbformedit.png dbaccess/res/forms_16.png cmd/sc_dbformedit.png -dbaccess/res/forms_32.png res/forms_32.png +res/forms_32.png dbaccess/res/forms_32.png dbaccess/res/lc036.png cmd/lc_dbnewreport.png dbaccess/res/lc037.png cmd/lc_delete.png @@ -918,11 +918,11 @@ dbaccess/res/nu08.png cmd/sc_cancel.png dbaccess/res/one_left.png cmd/sc_prevrecord.png dbaccess/res/one_right.png cmd/sc_nextrecord.png dbaccess/res/jo01.png dbaccess/res/pkey.png -dbaccess/res/queries_32.png res/queries_32.png +res/queries_32.png dbaccess/res/queries_32.png dbaccess/res/report_16.png cmd/sc_executereport.png dbaccess/res/reports_16.png cmd/sc_executereport.png -dbaccess/res/reports_32.png res/reports_32.png +res/reports_32.png dbaccess/res/reports_32.png dbaccess/res/sc036.png cmd/sc_executereport.png dbaccess/res/sc037.png cmd/sc_delete.png @@ -932,7 +932,7 @@ dbaccess/res/sc040.png cmd/sc_reload.png dbaccess/res/sortdown.png cmd/sc_sortascending.png dbaccess/res/sortup.png cmd/sc_sortdescending.png -dbaccess/res/tables_32.png res/tables_32.png +res/tables_32.png dbaccess/res/tables_32.png # desktop # == diff --git a/icon-themes/elementary_svg/dbaccess/res/forms_32.svg b/icon-themes/elementary_svg/dbaccess/res/forms_32.svg new file mode 100644 index ..9c804e4735a7 --- /dev/null +++ b/icon-themes/elementary_svg/dbaccess/res/forms_32.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/dbaccess/res/queries_32.svg b/icon-themes/elementary_svg/dbaccess/res/queries_32.svg new file mode 100644 index ..a791f7ce916b --- /dev/null +++ b/icon-themes/elementary_svg/dbaccess/res/queries_32.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/dbaccess/res/reports_32.svg b/icon-themes/elementary_svg/dbaccess/res/reports_32.svg new file mode 100644 index ..5913a8d94084 --- /dev/null +++ b/icon-themes/elementary_svg/dbaccess/res/reports_32.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/dbaccess/res/tables_32.svg b/icon-themes/elementary_svg/dbaccess/res/tables_32.svg new file mode 100644 index ..8c9af4c70731 --- /dev/null +++ b/icon-themes/elementary_svg/dbaccess/res/tables_32.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg"; xmlns:xlink=
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |1 +
1 file changed, 1 insertion(+)
New commits:
commit ed985043a18dca99acca4861ebeb1e7010bba6fe
Author: Rene Engelhard
Date: Wed May 23 21:12:30 2018 +0200
deb#899380 apparmor: fix gpg encryption hang trying to lock random_seed
Change-Id: Ib9fb7652922dcc8364567953d17d7cae8ad170a7
Reviewed-on: https://gerrit.libreoffice.org/54726
Reviewed-by: Rene Engelhard
Tested-by: Rene Engelhard
(cherry picked from commit 8615efe611abe8654e643e1ccbc0dc8f52d2e0b0)
Reviewed-on: https://gerrit.libreoffice.org/54731
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index 1f3ac9ae0971..24ff2fa854ac 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -190,5 +190,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/bin/gpgsm rm,
owner @{HOME}/.gnupg/* r,
+owner @{HOME}/.gnupg/random_seed rk,
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx|7 --- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |8 2 files changed, 15 deletions(-) New commits: commit 7d35379465058f2a4f944ad622b628bd1ed38ee2 Author: Stephan Bergmann Date: Wed May 23 17:18:34 2018 +0200 Remove leftover "#undef DEBUG" ...which might have had a purpose in the past, but look unused today. (DEBUG is defined in solenv/gbuild/gbuild.mk iff dbglevel >= 2, and `make Library_xsec_xmlsec dbglevel=2` doesn't run into any problems for me with the undefs removed.) Change-Id: I7f941e8c2d454f4206fb17bc791247606ffe6309 Reviewed-on: https://gerrit.libreoffice.org/54718 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 2a9aaab057bb..c402e2833604 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -17,13 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -/* - * and turn off the additional virtual methods which are part of some interfaces when compiled - * with debug - */ -#undef DEBUG - #include #include #include diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 58fa45acf4b6..45b85cb97705 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -17,14 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/* - * and turn off the additional virtual methods which are part of some interfaces when compiled - * with debug - */ -#ifdef DEBUG -#undef DEBUG -#endif - #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: cppunit 1.14.0 doesn't ship cppunit.m4
Thanks Rene, will try that. Andor On Wed, May 23, 2018 at 8:26 AM, Rene Engelhard wrote: > Hi, > > On Wed, May 23, 2018 at 07:00:30AM +0200, Andor Molnar wrote: > >Is there a better way to configure libcppunit that we should migrate > to? > > pkg-config. > > Regards, > > Rene > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8615efe611abe8654e643e1ccbc0dc8f52d2e0b0
Author: Rene Engelhard
Date: Wed May 23 21:12:30 2018 +0200
deb#899380 apparmor: fix gpg encryption hang trying to lock random_seed
Change-Id: Ib9fb7652922dcc8364567953d17d7cae8ad170a7
Reviewed-on: https://gerrit.libreoffice.org/54726
Reviewed-by: Rene Engelhard
Tested-by: Rene Engelhard
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index fb4c3f013d10..8ce7cbc171c1 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -191,6 +191,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/bin/gpgsm rm,
owner @{HOME}/.gnupg/* r,
+owner @{HOME}/.gnupg/random_seed rk,
}
# probably should become a subprofile like gpg above, but then it doesn't
___
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-5.3-desktop' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 433d35497c921f84d88847ee17681d4a9353ae70 Author: Andras Timar Date: Wed May 23 21:55:24 2018 +0200 Revert "curl: fix MD5SUM" This reverts commit 2cbf3e5bd7bf187a65408bf9874c0eb7d749feab. diff --git a/download.lst b/download.lst index 624cd147ad11..e7f6114b9891 100644 --- a/download.lst +++ b/download.lst @@ -24,7 +24,7 @@ export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-mas export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_MD5SUM := 55ddfe7044cf0f3a257edb0ddeb20fb5 +export CURL_MD5SUM := 48eb126345d3b0f0a71a486b7f5d0307 export CURL_TARBALL := curl-7.60.0.tar.gz export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78 ___ 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/gtk/a11y/atkcomponent.cxx | 67 ++
vcl/unx/gtk/a11y/atkwrapper.cxx |2 -
vcl/unx/gtk/a11y/atkwrapper.hxx |1
vcl/unx/gtk3/gtk3gtkinst.cxx |1
4 files changed, 57 insertions(+), 14 deletions(-)
New commits:
commit 30d43a7ebac16848533ecd7e834201d566388a19
Author: Caolán McNamara
Date: Wed May 23 13:59:43 2018 +0100
forward more a11y stuff for native drawing area widget
Change-Id: Ic5529a73e317fb652944155fabc889b693447355
Reviewed-on: https://gerrit.libreoffice.org/54704
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx
b/vcl/unx/gtk/a11y/atkcomponent.cxx
index c062e12e2415..7d8a4bdc5bba 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -18,23 +18,33 @@
*/
#include "atkwrapper.hxx"
-
#include
+#include
using namespace ::com::sun::star;
+AtkObjectWrapper* getObjectWrapper(AtkComponent *pComponent)
+{
+AtkObjectWrapper *pWrap = nullptr;
+if (ATK_IS_OBJECT_WRAPPER(pComponent))
+pWrap = ATK_OBJECT_WRAPPER(pComponent);
+else if (GTK_IS_DRAWING_AREA(pComponent)) //when using a GtkDrawingArea as
a custom widget in welded gtk3
+{
+GtkWidget* pDrawingArea = GTK_WIDGET(pComponent);
+AtkObject* pAtkObject = gtk_widget_get_accessible(pDrawingArea);
+pWrap = ATK_IS_OBJECT_WRAPPER(pAtkObject) ?
ATK_OBJECT_WRAPPER(pAtkObject) : nullptr;
+}
+return pWrap;
+}
+
/// @throws uno::RuntimeException
static css::uno::Reference
-getComponent( AtkComponent *pComponent )
+getComponent(AtkObjectWrapper *pWrap)
{
-AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pComponent );
-if( pWrap )
+if (pWrap)
{
-if( !pWrap->mpComponent.is() )
-{
+if (!pWrap->mpComponent.is())
pWrap->mpComponent.set(pWrap->mpContext, css::uno::UNO_QUERY);
-}
-
return pWrap->mpComponent;
}
@@ -60,10 +70,15 @@ extern "C" {
static gboolean
component_wrapper_grab_focus (AtkComponent *component)
{
+AtkObjectWrapper* obj = getObjectWrapper(component);
+//if we're a native GtkDrawingArea with custom a11y, use the default
toolkit a11y
+if (obj && obj->mpOrig)
+return atk_component_grab_focus(ATK_COMPONENT(obj->mpOrig));
+
try
{
css::uno::Reference
pComponent
-= getComponent( component );
+= getComponent(obj);
if( pComponent.is() )
{
pComponent->grabFocus();
@@ -86,10 +101,15 @@ component_wrapper_contains (AtkComponent *component,
gint y,
AtkCoordType coord_type)
{
+AtkObjectWrapper* obj = getObjectWrapper(component);
+//if we're a native GtkDrawingArea with custom a11y, use the default
toolkit a11y
+if (obj && obj->mpOrig)
+return atk_component_contains(ATK_COMPONENT(obj->mpOrig), x, y,
coord_type);
+
try
{
css::uno::Reference
pComponent
-= getComponent( component );
+= getComponent(obj);
if( pComponent.is() )
return pComponent->containsPoint( translatePoint( pComponent, x,
y, coord_type ) );
}
@@ -109,10 +129,15 @@ component_wrapper_ref_accessible_at_point (AtkComponent
*component,
gint y,
AtkCoordType coord_type)
{
+AtkObjectWrapper* obj = getObjectWrapper(component);
+//if we're a native GtkDrawingArea with custom a11y, use the default
toolkit a11y
+if (obj && obj->mpOrig)
+return
atk_component_ref_accessible_at_point(ATK_COMPONENT(obj->mpOrig), x, y,
coord_type);
+
try
{
css::uno::Reference
pComponent
-= getComponent( component );
+= getComponent(obj);
if( pComponent.is() )
{
@@ -138,10 +163,18 @@ component_wrapper_get_position (AtkComponent *component,
gint *y,
AtkCoordType coord_type)
{
+AtkObjectWrapper* obj = getObjectWrapper(component);
+//if we're a native GtkDrawingArea with custom a11y, use the default
toolkit a11y
+if (obj && obj->mpOrig)
+{
+atk_component_get_extents(ATK_COMPONENT(obj->mpOrig), x, y, nullptr,
nullptr, coord_type);
+return;
+}
+
try
{
css::uno::Reference
pComponent
-= getComponent( component );
+= getComponent(obj);
if( pComponent.is() )
{
awt::Point aPos;
@@ -168,10 +201,18 @@ component_wrapper_get_size (AtkComponent *component,
gint *width,
gint *height)
{
+AtkObjectWrapper* obj = getObjectWrapper(component);
+//if we're a native GtkDrawingArea with c
Re: *** Spam *** Re: [freedesktop/libreoffice-cppunit] Feature/cmake (#2)
On Wed, May 23, 2018 at 06:32:46PM +0200, claus.klein@googlemail.com wrote: >[...] and even much more simpler to use! No, it isn't. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2cbf3e5bd7bf187a65408bf9874c0eb7d749feab Author: Andras Timar Date: Wed May 23 21:23:30 2018 +0200 curl: fix MD5SUM Change-Id: Ib903769c07985b2c56d351c34ea40fc2d76c4082 diff --git a/download.lst b/download.lst index e7f6114b9891..624cd147ad11 100644 --- a/download.lst +++ b/download.lst @@ -24,7 +24,7 @@ export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-mas export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_MD5SUM := 48eb126345d3b0f0a71a486b7f5d0307 +export CURL_MD5SUM := 55ddfe7044cf0f3a257edb0ddeb20fb5 export CURL_TARBALL := curl-7.60.0.tar.gz export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78 ___ 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 |4 1 file changed, 4 insertions(+) New commits: commit a4c83a91101f35d5b3fa646b42cf95a0d139f05c Author: Rene Engelhard Date: Wed May 23 18:10:35 2018 +0200 actually add AC_MSG_CHECKING/_RESULTs for --enable/disable-postgresql-sdbc Change-Id: I6b02998db5624960ba78ce8b1b0356601a80fc5e Reviewed-on: https://gerrit.libreoffice.org/54721 Reviewed-by: Rene Engelhard Tested-by: Rene Engelhard diff --git a/configure.ac b/configure.ac index 1d7770709b32..c42e17bec20f 100644 --- a/configure.ac +++ b/configure.ac @@ -8514,7 +8514,9 @@ fi dnl === dnl Check for PostgreSQL stuff dnl === +AC_MSG_CHECKING([whether to build the PostgreSQL SDBC driver]) if test "x$enable_postgresql_sdbc" != "xno"; then +AC_MSG_RESULT([yes]) SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC" if test "$with_krb5" = "yes" -a "$enable_openssl" = "no"; then @@ -8655,6 +8657,8 @@ if test "x$enable_postgresql_sdbc" != "xno"; then LIBS=$save_LIBS fi BUILD_POSTGRESQL_SDBC=TRUE +else +AC_MSG_RESULT([no]) fi AC_SUBST(WITH_KRB5) AC_SUBST(WITH_GSSAPI) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/scmod.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72b8f0b81f8c731364d54c2eb8626601f78a5de4 Author: Andrea Gelmini Date: Wed May 23 15:51:28 2018 +0200 Fix typo Change-Id: Ie9501a1cb9f8c2a747b92eb74c120816b49148d8 Reviewed-on: https://gerrit.libreoffice.org/54709 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 76e512424d89..e3974dcf39ad 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -83,7 +83,7 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL ScSelectionTransferObj* m_pSelTransfer; ScMessagePool* m_pMessagePool; css::uno::Reference m_xClipData; // Only used by Vba helper functions -// there is no global InputHandler anymore, each View has it's own +// there is no global InputHandler anymore, each View has its own ScInputHandler* m_pRefInputHandler; ScViewCfg* m_pViewCfg; ScDocCfg* m_pDocCfg; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgdlg.cxx |9 +
cui/source/options/optgdlg.hxx |1 +
2 files changed, 10 insertions(+)
New commits:
commit 8118a5d2eb1524768784adc0b143b8cc1b9f3f61
Author: Miklos Vajna
Date: Wed May 23 17:54:37 2018 +0200
tdf#104086 cui: enable OpenGL when ignoring its blacklist
"Ignore OpenGL blacklist" is called "force OpenGL" in the code, so it
make sense that OpenGLHelper::isVCLOpenGLEnabled() returns true in that
case. But the UI suggested that enabling ignore doesn't enable OpenGL
itself.
Fix this by auto-checking the parent UI widget when enabling the
blacklist.
Change-Id: I16bec69aebd645858260850f15ea8e687566fd0e
Reviewed-on: https://gerrit.libreoffice.org/54720
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index eca23fb512c9..5b6538eb65dc 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -659,6 +659,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
#endif
+m_pForceOpenGL->SetToggleHdl(LINK(this, OfaViewTabPage,
OnForceOpenGLToggled));
+
// Set known icon themes
OUString sAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
m_pIconStyleLB->Clear();
@@ -736,6 +738,13 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled,
CheckBox&, void )
}
#endif
+IMPL_LINK_NOARG(OfaViewTabPage, OnForceOpenGLToggled, CheckBox&, void)
+{
+if (m_pForceOpenGL->IsChecked())
+// Ignoring the opengl blacklist implies that opengl is on.
+m_pUseOpenGL->Check();
+}
+
VclPtr OfaViewTabPage::Create( TabPageParent pParent, const
SfxItemSet* rAttrSet )
{
return VclPtr::Create(pParent.pParent, *rAttrSet);
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 852b8472476e..f6296ff87679 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -121,6 +121,7 @@ private:
#if defined( UNX )
DECL_LINK( OnAntialiasingToggled, CheckBox&, void );
#endif
+DECL_LINK(OnForceOpenGLToggled, CheckBox&, void);
void UpdateOGLStatus();
public:
___
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/scriptinfo.hxx | 74 ++---
sw/source/core/text/porlay.cxx| 94 +++---
2 files changed, 86 insertions(+), 82 deletions(-)
New commits:
commit eded58214c4a4a7c55530b842cec5837ea36caba
Author: Michael Stahl
Date: Wed May 23 15:11:32 2018 +0200
sw: prefix members of SwScriptInfo
Change-Id: I1272d53d602052b09101bed8cf0fb4a19fecf52d
diff --git a/sw/source/core/inc/scriptinfo.hxx
b/sw/source/core/inc/scriptinfo.hxx
index 95ffbee7253c..1f715a49b519 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -50,7 +50,7 @@ private:
};
//TODO - This is sorted, so should probably be a std::set rather than
vector.
// But we also use random access (probably unnecessarily).
-std::vector aScriptChanges;
+std::vector m_ScriptChanges;
//! Records a single change in direction.
struct DirectionChangeInfo
{
@@ -58,12 +58,12 @@ private:
sal_uInt8 type; //!< Direction that we change to.
DirectionChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos),
type(typ) {};
};
-std::vector aDirectionChanges;
-std::deque< sal_Int32 > aKashida;
-std::deque< sal_Int32 > aKashidaInvalid;
-std::deque< sal_Int32 > aNoKashidaLine;
-std::deque< sal_Int32 > aNoKashidaLineEnd;
-std::deque< sal_Int32 > aHiddenChg;
+std::vector m_DirectionChanges;
+std::deque< sal_Int32 > m_Kashida;
+std::deque< sal_Int32 > m_KashidaInvalid;
+std::deque< sal_Int32 > m_NoKashidaLine;
+std::deque< sal_Int32 > m_NoKashidaLineEnd;
+std::deque< sal_Int32 > m_HiddenChg;
//! Records a single change in compression.
struct CompressionChangeInfo
{
@@ -72,13 +72,13 @@ private:
CompType type; //!< Type of compression that we change to.
CompressionChangeInfo(sal_Int32 pos, sal_Int32 len, CompType typ) :
position(pos), length(len), type(typ) {};
};
-std::vector aCompressionChanges;
+std::vector m_CompressionChanges;
#ifdef DBG_UTIL
CompType DbgCompType( const sal_Int32 nPos ) const;
#endif
-sal_Int32 nInvalidityPos;
-sal_uInt8 nDefaultDir;
+sal_Int32 m_nInvalidityPos;
+sal_uInt8 m_nDefaultDir;
void UpdateBidiInfo( const OUString& rText );
@@ -103,75 +103,75 @@ public:
// set/get position from which data is invalid
void SetInvalidityA(const sal_Int32 nPos)
{
-if (nPos < nInvalidityPos)
-nInvalidityPos = nPos;
+if (nPos < m_nInvalidityPos)
+m_nInvalidityPos = nPos;
}
sal_Int32 GetInvalidityA() const
{
-return nInvalidityPos;
+return m_nInvalidityPos;
}
// get default direction for paragraph
-sal_uInt8 GetDefaultDir() const { return nDefaultDir; };
+sal_uInt8 GetDefaultDir() const { return m_nDefaultDir; };
// array operations, nCnt refers to array position
-size_t CountScriptChg() const { return aScriptChanges.size(); }
+size_t CountScriptChg() const { return m_ScriptChanges.size(); }
sal_Int32 GetScriptChg( const size_t nCnt ) const
{
-OSL_ENSURE( nCnt < aScriptChanges.size(),"No ScriptChange today!");
-return aScriptChanges[nCnt].position;
+assert(nCnt < m_ScriptChanges.size());
+return m_ScriptChanges[nCnt].position;
}
sal_uInt8 GetScriptType( const size_t nCnt ) const
{
-OSL_ENSURE( nCnt < aScriptChanges.size(),"No ScriptType today!");
-return aScriptChanges[nCnt].type;
+assert( nCnt < m_ScriptChanges.size());
+return m_ScriptChanges[nCnt].type;
}
-size_t CountDirChg() const { return aDirectionChanges.size(); }
+size_t CountDirChg() const { return m_DirectionChanges.size(); }
sal_Int32 GetDirChg( const size_t nCnt ) const
{
-OSL_ENSURE( nCnt < aDirectionChanges.size(),"No DirChange today!");
-return aDirectionChanges[ nCnt ].position;
+assert(nCnt < m_DirectionChanges.size());
+return m_DirectionChanges[ nCnt ].position;
}
sal_uInt8 GetDirType( const size_t nCnt ) const
{
-OSL_ENSURE( nCnt < aDirectionChanges.size(),"No DirType today!");
-return aDirectionChanges[ nCnt ].type;
+assert(nCnt < m_DirectionChanges.size());
+return m_DirectionChanges[ nCnt ].type;
}
size_t CountKashida() const
{
-return aKashida.size();
+return m_Kashida.size();
}
sal_Int32 GetKashida(const size_t nCnt) const
{
-OSL_ENSURE( nCnt < aKashida.size(),"No Kashidas today!");
-return aKashida[nCnt];
+assert(nCnt < m_Kashida.size());
+return m_Kashida[nCnt];
}
-size_t CountCompChg() const { return aCompressionChanges.size(); };
+size_t CountCompChg() const { return m_CompressionChanges.size(); };
sal_Int32 GetCompStart( const size_t nCnt ) const
{
-
Re: [freedesktop/libreoffice-cppunit] Feature/cmake (#2)
Hi Markus, I understand your concerns. IMHO cmake is more portable than autoconf, and even much more simpler to use! If you need help, I am willing to try my best. I see not the need to support autoconf and cmake. I would terminate the autconf support. Kind regards Claus > Am 23.05.2018 um 02:17 schrieb Markus Mohrhard > : > > I'm a bit concerned about having two build systems especially one that I can > not maintain. In the past we solved this with the cmake branch but this also > causes its own problems as the branch is constantly behind. Currently I have > no good idea how to solve this problem but I'll try to spend some time > thinking about solutions. I plan to release a new version 1.15.0 sometime in > June and will get back to with some plan by then. > > Kind regards, > Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
3 new defect(s) introduced to LibreOffice found with Coverity Scan.
9 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)
** CID 1435749: Error handling issues (UNCAUGHT_EXCEPT)
/sw/source/core/unocore/unoobj2.cxx: 301 in
UnoActionRemoveContext::~UnoActionRemoveContext()()
*** CID 1435749: Error handling issues (UNCAUGHT_EXCEPT)
/sw/source/core/unocore/unoobj2.cxx: 301 in
UnoActionRemoveContext::~UnoActionRemoveContext()()
295 if (m_pDoc)
296 {
297 lcl_RemoveImpl(m_pDoc);
298 }
299 }
300
>>> CID 1435749: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::DeploymentException" is
>>> thrown but the throw list "throw()" doesn't allow it to be thrown. This
>>> will cause a call to unexpected() which usually calls terminate().
301 UnoActionRemoveContext::~UnoActionRemoveContext()
302 {
303 if (m_pDoc)
304 {
305 SwRootFrame *const pRootFrame =
m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
306 if (pRootFrame)
** CID 1435748: Error handling issues (CHECKED_RETURN)
/sw/source/core/crsr/crstrvl.cxx: 995 in SwCursorShell::GotoPrevOutline()()
*** CID 1435748: Error handling issues (CHECKED_RETURN)
/sw/source/core/crsr/crstrvl.cxx: 995 in SwCursorShell::GotoPrevOutline()()
989 }
990
991 SwCursor* pCursor = getShellCursor( true );
992 SwNode* pNd = &(pCursor->GetNode());
993 SwOutlineNodes::size_type nPos;
994 bool bRet = false;
>>> CID 1435748: Error handling issues (CHECKED_RETURN)
>>> Calling "Seek_Entry" without checking return value (as is done
>>> elsewhere 13 out of 14 times).
995 rNds.GetOutLineNds().Seek_Entry(pNd, &nPos);
996 if ( nPos == 0 )
997 {
998 nPos = rNds.GetOutLineNds().size();
999 SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::StartWrapped );
1000 }
** CID 1399120: Error handling issues (UNCAUGHT_EXCEPT)
/sw/source/core/crsr/callnk.cxx: 99 in SwCallLink::~SwCallLink()()
*** CID 1399120: Error handling issues (UNCAUGHT_EXCEPT)
/sw/source/core/crsr/callnk.cxx: 99 in SwCallLink::~SwCallLink()()
93 return;
94 }
95 }
96 }
97 }
98
>>> CID 1399120: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::DeploymentException" is
>>> thrown but the throw list "throw()" doesn't allow it to be thrown. This
>>> will cause a call to unexpected() which usually calls terminate().
99 SwCallLink::~SwCallLink()
100 {
101 if( nNdTyp == SwNodeType::NONE || !rShell.m_bCallChgLnk ) // see
ctor
102 return ;
103
104 // If travelling over Nodes check formats and register them anew at
the
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy8xGl5gyG72PKEYksHTP-2BsN-2Fl4tx2dJYI9r1wBExVlY0fdiopRQPS17y51av41VL5KvO9Gw4yxbfkjSZ3rF9AdRnZEST-2Fjm61RX-2F95yJOA9Fiuikt0WsxaWcabmPiXv6vlAKrMx8lCjFZfBBmsc5YDw5625lPLlbO26TNKRAWq-2Fo-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - 2 commits - vcl/qt5
vcl/qt5/Qt5Menu.cxx | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 46391493f6c28c86aa5c100fc0f490e74b083cd5
Author: Katarina Behrens
Date: Wed May 23 17:39:44 2018 +0200
Add shortcuts to native menu entries
something's wrong though, they don't really show
Change-Id: Id8559fd9b6a5d4b2b49442d179571d31a99b5b20
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 0575d5aab693..fd864e8b2422 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -95,6 +95,7 @@ void Qt5Menu::DoFullMenuUpdate( Menu* pMenuBar, QMenu*
pParentMenu )
OUString aText = pVCLMenu->GetItemText( nId );
QMenu* pQMenu = pParentMenu;
NativeItemText( aText );
+vcl::KeyCode nAccelKey = pVCLMenu->GetAccelKey( nId );
if (mbMenuBar && mpQMenuBar)
// top-level menu
@@ -109,8 +110,11 @@ void Qt5Menu::DoFullMenuUpdate( Menu* pMenuBar, QMenu*
pParentMenu )
if ( pSalMenuItem->mnType == MenuItemType::SEPARATOR )
pQMenu->addSeparator();
else
+{
// leaf menu
-pQMenu->addAction( toQString(aText) );
+QAction *pAction = pQMenu->addAction( toQString(aText) );
+pAction->setShortcut( toQString(
nAccelKey.GetName(GetFrame()->GetWindow()) ) );
+}
}
}
@@ -151,6 +155,15 @@ void Qt5Menu::GetSystemMenuData( SystemMenuData* pData )
{
}
+const Qt5Frame* Qt5Menu::GetFrame() const
+{
+SolarMutexGuard aGuard;
+const Qt5Menu* pMenu = this;
+while( pMenu && ! pMenu->mpFrame )
+pMenu = pMenu->mpParentSalMenu;
+return pMenu ? pMenu->mpFrame : nullptr;
+}
+
void Qt5Menu::NativeItemText( OUString& rItemText )
{
rItemText = rItemText.replace( '~', '&' );
commit 130e23a672383d220ebf2a8cf8715d6ecf52fe58
Author: Katarina Behrens
Date: Wed May 23 11:23:34 2018 +0200
Insert separators into native menu
Change-Id: I88bb70b1e443821cc8d1904039f2a8fb52df1ff9
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 65bf726252df..0575d5aab693 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -105,8 +105,13 @@ void Qt5Menu::DoFullMenuUpdate( Menu* pMenuBar, QMenu*
pParentMenu )
// submenu
pQMenu = pQMenu->addMenu( toQString(aText) );
else
-// leaf menu
-pQMenu->addAction( toQString(aText) );
+{
+if ( pSalMenuItem->mnType == MenuItemType::SEPARATOR )
+pQMenu->addSeparator();
+else
+// leaf menu
+pQMenu->addAction( toQString(aText) );
+}
}
if ( pSalMenuItem->mpSubMenu != nullptr )
@@ -153,6 +158,7 @@ void Qt5Menu::NativeItemText( OUString& rItemText )
Qt5MenuItem::Qt5MenuItem( const SalItemParams* pItemData ) :
mnId( pItemData->nId ),
+mnType( pItemData->eType ),
mpVCLMenu( pItemData->pMenu ),
mpParentMenu( nullptr ),
mpSubMenu( nullptr )
___
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/text/itratr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9d958653e0ac4ff275dd70ec878cc3d529d49db Author: Michael Stahl Date: Wed May 23 13:17:16 2018 +0200 sw: fix max->min in SwTextNode::GetScalingOfSelectedText() (regression from b1ac01de06262bda39be7f970fbceeda9b267fe4) Change-Id: Ic2e835f19aaa4e9b26741c409515fc8d26cab1d3 Reviewed-on: https://gerrit.libreoffice.org/54707 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 060ba0d32b75..d9a9f729c9cc 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -846,7 +846,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd aIter.SeekAndChgAttrIter( nIdx, pOut ); // scan for end of portion -const sal_Int32 nNextChg = std::max(aIter.GetNextAttr(), aScriptInfo.NextScriptChg( nIdx )); +const sal_Int32 nNextChg = std::min(aIter.GetNextAttr(), aScriptInfo.NextScriptChg(nIdx)); sal_Int32 nStop = nIdx; sal_Unicode cChar = CH_BLANK; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/colibre_svg
icon-themes/colibre_svg/links.txt | 1636 ++ 1 file changed, 1636 insertions(+) New commits: commit 933c1a048bc11d3582d8cbd8fa1ed3efea4b0262 Author: Tomaž Vajngerl Date: Thu May 24 00:03:38 2018 +0900 colibre_svg: add links.txt from colibre Change-Id: Ic248ce1a05f740df111a9f507c099965fdc48d35 Reviewed-on: https://gerrit.libreoffice.org/54716 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/icon-themes/colibre_svg/links.txt b/icon-themes/colibre_svg/links.txt new file mode 100644 index ..3d1bde9651ac --- /dev/null +++ b/icon-themes/colibre_svg/links.txt @@ -0,0 +1,1636 @@ +# avmedia +# == +avmedia/res/av02048.png cmd/sc_open.png +avmedia/res/av02049.png cmd/sc_runbasic.png +avmedia/res/av02050.png cmd/sc_mediapause.png +avmedia/res/av02051.png cmd/sc_basicstop.png +avmedia/res/av02052.png cmd/sc_mediarepeat.png +avmedia/res/av02053.png cmd/sc_ok.png +avmedia/res/av02054.png cmd/sc_mediamute.png +avmedia/res/avl02048.png cmd/lc_open.png +avmedia/res/avl02049.png cmd/lc_runbasic.png +avmedia/res/avl02050.png cmd/lc_mediapause.png +avmedia/res/avl02051.png cmd/lc_basicstop.png +avmedia/res/avl02052.png cmd/lc_mediarepeat.png +avmedia/res/avl02053.png cmd/lc_ok.png +avmedia/res/avl02054.png cmd/lc_mediamute.png + +# chart2 +# == +chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png +chart2/res/dataeditor_icon02.png cmd/sc_insertcolumnsafter.png +chart2/res/dataeditor_icon03.png cmd/sc_deleterows.png +chart2/res/dataeditor_icon04.png cmd/sc_deletecolumns.png +chart2/res/dataeditor_icon05.png cmd/sc_insertcellsright.png +chart2/res/dataeditor_icon06.png cmd/sc_insertcellsdown.png +chart2/res/dataeditor_icon07.png cmd/sc_insertcolumnsafter.png +chart2/res/dataeditor_icon08.png cmd/sc_insertcolumns.png +chart2/res/dataeditor_icon09.png cmd/sc_insertrowsbefore.png +chart2/res/selectrange.png formula/res/refinp1.png + +# cmd +# == + +# Add +cmd/lc_adddatefield.png cmd/lc_datefield.png +cmd/lc_addons.png cmd/lc_insertplugin.png +cmd/lc_addprintarea.png cmd/lc_inserttable.png +cmd/lc_addtable.png cmd/lc_inserttable.png +cmd/sc_adddatefield.png cmd/sc_datefield.png +cmd/sc_addons.png cmd/sc_insertplugin.png +cmd/sc_addprintarea.png cmd/sc_inserttable.png +cmd/sc_addtable.png cmd/sc_inserttable.png + +# tooltips +cmd/lc_showinlinetooltips.png cmd/lc_editannotation.png +cmd/sc_showinlinetooltips.png cmd/sc_editannotation.png + +# Insert +cmd/lc_insobjctrl.png cmd/lc_newdoc.png +cmd/lc_insert.png cmd/lc_togglesheetgrid.png +cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png +cmd/lc_insertcurrencyfield.png cmd/lc_formattedfield.png +cmd/lc_insertdatefield.png cmd/lc_datefield.png +cmd/lc_insert.png cmd/lc_togglesheetgrid.png +cmd/lc_insertauthorfield.png cmd/lc_dbviewaliases.png +cmd/lc_insertedit.png cmd/lc_edit.png +cmd/lc_insertfield.png cmd/lc_addfield.png +cmd/lc_insertctrl.png cmd/lc_inserttable.png +cmd/lc_insertfilecontrol.png cmd/lc_open.png +cmd/lc_insertformattedfield.png cmd/lc_formattedfield.png +cmd/lc_insertformcheck.png cmd/lc_checkbox.png +cmd/lc_insertformcombo.png cmd/lc_combobox.png +cmd/lc_insertformlist.png cmd/lc_listbox.png +cmd/lc_insertformradio.png cmd/lc_radiobutton.png +cmd/lc_insertformspin.png cmd/lc_spinbutton.png +cmd/lc_insertformula.png cmd/lc_dbviewfunctions.png +cmd/lc_insertformvscroll.png cmd/lc_scrollbar.png +cmd/lc_insertframeinteract.png cmd/lc_insertframe.png +cmd/lc_insertframeinteractnocolumns.png cmd/lc_insertframe.png +cmd/lc_insertobjectchart.png cmd/lc_drawchart.png +cmd/lc_insertnumericfield.png cmd/lc_numberformatstandard.png +cmd/lc_numericfield.png cmd/lc_numberformatstandard.png +cmd/lc_insertlistbox.png cmd/lc_listbox.png +cmd/lc_inserttextframe.png cmd/lc_insertframe.png +cmd/lc_insertobjectstarmath.png cmd/lc_insertmath.png +cmd/lc_insertpatternfield.png cmd/lc_patternfield.png +cmd/lc_insertpushbutton.png cmd/lc_pushbutton.png +cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png +cmd/lc_insertspreadsheet.png cmd/lc_togglesheetgrid.png +cmd/lc_inserttimefield.png cmd/lc_timefield.png + +cmd/sc_insobjctrl.png cmd/sc_newdoc.png +cmd/sc_insert.png cmd/sc_togglesheetgrid.png +cmd/sc_insertavmedia.png cmd/sc_avmediaplayer.png +cmd/sc_insertcurrencyfield.png cmd/sc_formattedfield.png +cmd/sc_insertdatefield.png cmd/sc_datefield.png +cmd/sc_insertauthorfield.png cmd/sc_dbviewaliases.png +cmd/sc_insertedit.png cmd/sc_text.png +cmd/sc_insertfield.png cmd/sc_addfield.png +cmd/sc_insertctrl.png cmd/sc_inserttable.png +cmd/sc_insertfilecontrol.png cmd/sc_open.png +cmd/sc_insertformattedfield.png cmd/sc_formattedfield.png +cmd/sc_insertformcheck.png cmd/sc_checkbox.png +cmd/sc_insertformcombo.png cmd/sc_combobox.png +cmd/sc_insertformlist.png cmd/sc_listbox.png +cmd/sc_insertformradio.png cmd/sc_radiobutton.png +cmd/sc_insertformspin.png cmd/sc_
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
dev/null |binary icon-themes/colibre/links.txt |8 icon-themes/colibre_svg/res/forms_32.svg |1 - icon-themes/colibre_svg/res/queries_32.svg |1 - icon-themes/colibre_svg/res/reports_32.svg |1 - icon-themes/colibre_svg/res/tables_32.svg |1 - 6 files changed, 4 insertions(+), 8 deletions(-) New commits: commit 30e34899cec5a518328fc8aaa9cf2c02faf214ac Author: andreas kainz Date: Wed May 23 16:23:30 2018 +0200 tdf#117481 Add dbaccess icons for base sidebar Change-Id: If154c05eaf03f26655a910bf3e12c6bd867b8a03 Reviewed-on: https://gerrit.libreoffice.org/54713 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 3d1bde9651ac..fa9cfaa3d9b9 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -986,7 +986,7 @@ dbaccess/res/exinfo.png cmd/sc_helpindex.png dbaccess/res/form_16.png cmd/sc_dbformedit.png dbaccess/res/forms_16.png cmd/sc_dbformedit.png -dbaccess/res/forms_32.png res/forms_32.png +res/forms_32.png dbaccess/res/forms_32.png dbaccess/res/lc036.png cmd/lc_dbnewreport.png dbaccess/res/lc037.png cmd/lc_delete.png @@ -1000,11 +1000,11 @@ dbaccess/res/nu08.png cmd/sc_cancel.png dbaccess/res/one_left.png cmd/sc_prevrecord.png dbaccess/res/one_right.png cmd/sc_nextrecord.png dbaccess/res/jo01.png dbaccess/res/pkey.png -dbaccess/res/queries_32.png res/queries_32.png +res/queries_32.png dbaccess/res/queries_32.png dbaccess/res/report_16.png cmd/sc_executereport.png dbaccess/res/reports_16.png cmd/sc_executereport.png -dbaccess/res/reports_32.png res/reports_32.png +res/reports_32.png dbaccess/res/reports_32.png dbaccess/res/sc036.png cmd/sc_executereport.png dbaccess/res/sc037.png cmd/sc_delete.png @@ -1014,7 +1014,7 @@ dbaccess/res/sc040.png cmd/sc_reload.png dbaccess/res/sortdown.png cmd/sc_sortascending.png dbaccess/res/sortup.png cmd/sc_sortdescending.png -dbaccess/res/tables_32.png res/tables_32.png +res/tables_32.png dbaccess/res/tables_32.png # desktop # == diff --git a/icon-themes/colibre/res/forms_32.png b/icon-themes/colibre/res/forms_32.png deleted file mode 100644 index d46d1adbc90d.. Binary files a/icon-themes/colibre/res/forms_32.png and /dev/null differ diff --git a/icon-themes/colibre/res/queries_32.png b/icon-themes/colibre/res/queries_32.png deleted file mode 100644 index ec5a4199a8dc.. Binary files a/icon-themes/colibre/res/queries_32.png and /dev/null differ diff --git a/icon-themes/colibre/res/reports_32.png b/icon-themes/colibre/res/reports_32.png deleted file mode 100644 index e21d4520de5f.. Binary files a/icon-themes/colibre/res/reports_32.png and /dev/null differ diff --git a/icon-themes/colibre/res/tables_32.png b/icon-themes/colibre/res/tables_32.png deleted file mode 100644 index 2281a264812e.. Binary files a/icon-themes/colibre/res/tables_32.png and /dev/null differ diff --git a/icon-themes/colibre_svg/res/forms_32.svg b/icon-themes/colibre_svg/res/forms_32.svg deleted file mode 100644 index 219f4d203561.. --- a/icon-themes/colibre_svg/res/forms_32.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/queries_32.svg b/icon-themes/colibre_svg/res/queries_32.svg deleted file mode 100644 index c26381ad76e7.. --- a/icon-themes/colibre_svg/res/queries_32.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/reports_32.svg b/icon-themes/colibre_svg/res/reports_32.svg deleted file mode 100644 index 2b7eb13c0bdb.. --- a/icon-themes/colibre_svg/res/reports_32.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/tables_32.svg b/icon-themes/colibre_svg/res/tables_32.svg deleted file mode 100644 index 7496bc2bac16.. --- a/icon-themes/colibre_svg/res/tables_32.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file ___ 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-5.3' - vcl/source
vcl/source/window/floatwin.cxx | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 873f09df02a14c8e16ff13ce189c0af3317a754a
Author: Marco Cecchetti
Date: Wed May 16 21:43:59 2018 +0200
lok: sc: tunneled spell-check context menu appear in bottom right corner
In the end it seems that in this context LogicToLogic is used for
converting non-pixel units, too.
Change-Id: I268e5522e929dd55af1284c38780064315d8cd41
Reviewed-on: https://gerrit.libreoffice.org/54465
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 302703bf4e8a..8a5d5dcc62fd 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -445,13 +445,22 @@ Point FloatingWindow::ImplCalcPos(vcl::Window* pWindow,
if (bLOKActive && pLOKTwipsPos)
{
-// if we use pW->LogicToLogic(aPos, pW->GetMapMode(),
MapMode(MapUnit::MapTwip)),
-// when map mode is not enabled, we gets a 20 twips per pixel
conversion
-// since LogicToLogic uses a fixed 72 dpi value, instead of a correctly
-// computed output device dpi or at least the most commonly used 96 dpi
-// value; and anyway the following is what we already do in
-// ScGridWindow::LogicInvalidate when map mode is not enabled.
-*pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip));
+if (pW->IsMapModeEnabled() || pW->GetMapMode().GetMapUnit() ==
MapUnit::MapPixel)
+{
+// if we use pW->LogicToLogic(aPos, pW->GetMapMode(),
MapMode(MapUnit::MapTwip)),
+// for pixel conversions when map mode is not enabled, we gets
+// a 20 twips per pixel conversion since LogicToLogic uses
+// a fixed 72 dpi value, instead of a correctly computed output
+// device dpi or at least the most commonly used 96 dpi value;
+// and anyway the following is what we already do in
+// ScGridWindow::LogicInvalidate when map mode is not enabled.
+
+*pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip));
+}
+else
+{
+*pLOKTwipsPos = pW->LogicToLogic(aPos, pW->GetMapMode(),
MapMode(MapUnit::MapTwip));
+}
}
// caller expects coordinates relative to top-level win
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/inc sc/qa sc/source
sc/inc/scabstdlg.hxx |3 -
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx |5 +
sc/source/ui/attrdlg/scdlgfact.hxx |3 -
sc/source/ui/unoobj/filtuno.cxx|2
sc/source/ui/view/cellsh2.cxx |2
sc/source/ui/view/viewfun5.cxx | 86 -
7 files changed, 63 insertions(+), 40 deletions(-)
New commits:
commit ca8f4e2961fd1a49af92e348da618827189ac7c0
Author: Marco Cecchetti
Date: Fri Apr 27 21:51:41 2018 +0200
lok: sc: tunneling the ascii import dialog on paste action
I needed to modify CreateScImportAsciiDlg signature so that we are able
to pass a pointer to a dialog parent window to ScImportAsciiDlg.
Moreover, I needed to perform the execution of the ScImportAsciiDlg
dialog in ScViewFunc::PasteDataFormat asynchronously, both for lok and
desktop case. In order to achieve this result it has been needed
to modify the lifespan of some objects previously local
to PasteDataFormat.
Since PasteDataFormat returns a boolean, I took care to check how this
return value is used. I found out 2 cases:
1) in ScViewFunc::PasteFromSystem where it is used for popping up an
error dialog box, informing the user in the case that the paste
operation is failed;
2) in ScGridWindow::ExecuteDrop where it is used for informing the
system window manager of the success or fail of the drag and drop
action.
The first case is now handled by a lamba invoked soon after the dialog
execution ended. The second case is more tricky: I handle it as
the paste operation is always successful, hoping it doesn't do any real
difference since the return value is used not by LO but by the system
window manager (e.g. gtk).
The asynchronous call and the behaviors described above occur only
when the paste operation involves some kind of simple text, in all other
cases nothing is changed.
Change-Id: Id4f96180a9336f665a22a2441ea490af993431b0
Reviewed-on: https://gerrit.libreoffice.org/53575
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index edb52e238a67..620b19297517 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -397,7 +397,8 @@ class ScAbstractDialogFactory
public:
SC_DLLPUBLIC static ScAbstractDialogFactory*Create();
-virtual VclPtr CreateScImportAsciiDlg( const
OUString& aDatName,
+virtual VclPtr
CreateScImportAsciiDlg(vcl::Window* pParent,
+const
OUString& aDatName,
SvStream*
pInStream,
ScImportAsciiCall eCall) = 0;
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 2c32d2c75874..a9c70b2f9e2d 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -243,7 +243,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 13: // "modules/scalc/ui/textimportcsv.ui"
{
-pReturnDialog = mpFact->CreateScImportAsciiDlg(OUString(),
mpStream.get(), SC_PASTETEXT);
+pReturnDialog = mpFact->CreateScImportAsciiDlg(nullptr,
OUString(), mpStream.get(), SC_PASTETEXT);
break;
}
case 14: // "modules/scalc/ui/formatcellsdialog.ui"
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 513ecd8974ac..637986fbcea1 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -611,10 +611,11 @@ bool
AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
}
// =Factories for createdialog ===
-VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( const OUString& aDatName,
+VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( vcl::Window* pParent,
+const OUString& aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall )
{
-VclPtr pDlg = VclPtr::Create( nullptr,
aDatName,pInStream, eCall );
+VclPtr pDlg = VclPtr::Create( pParent,
aDatName,pInStream, eCall );
return VclPtr::Create( pDlg );
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 842505f2b4b7..79f3e11ffb96 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -396,7 +396,8 @@ class ScAbstractDialogFactory_Impl : public
ScAbstractDialogFactory
public:
virtual ~ScAbstractDialogFactory_Impl() {}
-virtual VclPtr CreateScImportAsciiDlg( const
OUString& aDatName,
+virtual VclPtr
CreateScImportAsciiDl
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/inc sc/qa sc/source
sc/inc/scabstdlg.hxx |3 -
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx |5 +
sc/source/ui/attrdlg/scdlgfact.hxx |3 -
sc/source/ui/unoobj/filtuno.cxx|2
sc/source/ui/view/cellsh2.cxx |2
sc/source/ui/view/viewfun5.cxx | 87 -
7 files changed, 64 insertions(+), 40 deletions(-)
New commits:
commit 32ebfd0da5da80a2fc7b92469024585f1d49bb16
Author: Marco Cecchetti
Date: Fri Apr 27 21:51:41 2018 +0200
lok: sc: tunneling the ascii import dialog on paste action
I needed to modify CreateScImportAsciiDlg signature so that we are
able
to pass a pointer to a dialog parent window to ScImportAsciiDlg.
Moreover, I needed to perform the execution of the ScImportAsciiDlg
dialog in ScViewFunc::PasteDataFormat asynchronously, both for lok and
desktop case. In order to achieve this result it has been needed
to modify the lifespan of some objects previously local
to PasteDataFormat.
Since PasteDataFormat returns a boolean, I took care to check how this
return value is used. I found out 2 cases:
1) in ScViewFunc::PasteFromSystem where it is used for popping up an
error dialog box, informing the user in the case that the paste
operation is failed;
2) in ScGridWindow::ExecuteDrop where it is used for informing the
system window manager of the success or fail of the drag and drop
action.
The first case is now handled by a lamba invoked soon after the dialog
execution ended. The second case is more tricky: I handle it as
the paste operation is always successful, hoping it doesn't do any
real
difference since the return value is used not by LO but by the system
window manager (e.g. gtk).
The asynchronous call and the behaviors described above occur only
when the paste operation involves some kind of simple text, in all
other
cases nothing is changed.
Change-Id: Id4f96180a9336f665a22a2441ea490af993431b0
Reviewed-on: https://gerrit.libreoffice.org/53931
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 67be06b9ad73..92c66e392902 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -394,7 +394,8 @@ class ScAbstractDialogFactory
public:
SC_DLLPUBLIC static ScAbstractDialogFactory*Create();
-virtual VclPtr CreateScImportAsciiDlg( const
OUString& aDatName,
+virtual VclPtr
CreateScImportAsciiDlg(vcl::Window* pParent,
+const
OUString& aDatName,
SvStream*
pInStream,
ScImportAsciiCall eCall) = 0;
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 3cf875b3cc05..9def8077e515 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -244,7 +244,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 13: // "modules/scalc/ui/textimportcsv.ui"
{
-pReturnDialog = mpFact->CreateScImportAsciiDlg(OUString(),
mpStream.get(), SC_PASTETEXT);
+pReturnDialog = mpFact->CreateScImportAsciiDlg(nullptr,
OUString(), mpStream.get(), SC_PASTETEXT);
break;
}
case 14: // "modules/scalc/ui/formatcellsdialog.ui"
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 733afc03d39a..dfcd08f4639c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -604,10 +604,11 @@ bool
AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
}
// =Factories for createdialog ===
-VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( const OUString& aDatName,
+VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( vcl::Window* pParent,
+const OUString& aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall )
{
-VclPtr pDlg = VclPtr::Create( nullptr,
aDatName,pInStream, eCall );
+VclPtr pDlg = VclPtr::Create( pParent,
aDatName,pInStream, eCall );
return VclPtr::Create( pDlg );
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index ef6e0a6a1057..2a0e2652c5c6 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -418,7 +418,8 @@ class ScAbstractDialogFactory_Impl : public
ScAbstractDialogFactory
public:
virtual ~ScAbstractDialogFactory_Impl() {}
-virtual VclPtr CreateScImportAsciiDlg( const
OUString& aDatName,
+virtual VclPtr
CreateScI
[Libreoffice-commits] online.git: loleaflet/debug loleaflet/loleaflet.html.m4
loleaflet/debug/document/loleaflet.html |2 +- loleaflet/loleaflet.html.m4 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8490cecdf5b39adc6eb2fff34daade72f9db1da8 Author: Andras Timar Date: Wed May 23 15:52:06 2018 +0200 Help translations should take precedence (stray ~ chars were detected in German help) Change-Id: I86b4a04abc29855f565b36cd2c68d15730e2eecf diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html index 17244e7ef..429da430e 100644 --- a/loleaflet/debug/document/loleaflet.html +++ b/loleaflet/debug/document/loleaflet.html @@ -29,8 +29,8 @@ - + diff --git a/loleaflet/loleaflet.html.m4 b/loleaflet/loleaflet.html.m4 index d76df1a27..1a590d273 100644 --- a/loleaflet/loleaflet.html.m4 +++ b/loleaflet/loleaflet.html.m4 @@ -29,8 +29,8 @@ ifelse(DEBUG,[true],foreachq([fileCSS],[LOLEAFLET_CSS],[ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/salgeom.hxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 8adebf346e24c6131fe33165d1530319c959c352
Author: Tor Lillqvist
Date: Wed May 23 15:37:00 2018 +0300
Add debug output operator<< for SalFrameGeometry
Change-Id: Ifb855eb3fa6d58c06cf145523dbb0735b2ca5a0b
Reviewed-on: https://gerrit.libreoffice.org/54702
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx
index 0321e99ab368..6adeb7a6937c 100644
--- a/vcl/inc/salgeom.hxx
+++ b/vcl/inc/salgeom.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_INC_SALGEOM_HXX
#define INCLUDED_VCL_INC_SALGEOM_HXX
+#include
+
#include
struct SalFrameGeometry {
@@ -47,6 +49,14 @@ struct SalFrameGeometry {
{}
};
+inline std::ostream &operator <<(std::ostream& s, const SalFrameGeometry&
rGeom)
+{
+s << rGeom.nWidth << "x" << rGeom.nHeight << "@(" << rGeom.nX << "," <<
rGeom.nY << "):{"
+ << rGeom.nLeftDecoration << "," << rGeom.nTopDecoration << "," <<
rGeom.nRightDecoration << "," << rGeom.nBottomDecoration << "}";
+
+return s;
+}
+
/// Interface used to share logic on sizing between
/// SalVirtualDevices and SalFrames
class VCL_PLUGIN_PUBLIC SalGeometryProvider {
___
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-5.3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 249e93db8aaa25398eda29cc8292c1d707afacad Author: Andras Timar Date: Wed May 23 15:32:36 2018 +0200 Updated core Project: translations 1dbde0d58502a8c2b5bf27926c85a627789c3fa4 remove extra ~ characters from German translation Change-Id: Iadeafd183afecb6c16f8b7d23311b6f050266dde diff --git a/translations b/translations index 5c8037b1eea4..1dbde0d58502 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5c8037b1eea42c23f7b20d203ace7c0317c55d7e +Subproject commit 1dbde0d58502a8c2b5bf27926c85a627789c3fa4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-5.3' - source/de
source/de/officecfg/registry/data/org/openoffice/Office/UI.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1dbde0d58502a8c2b5bf27926c85a627789c3fa4 Author: Andras Timar Date: Wed May 23 15:32:36 2018 +0200 remove extra ~ characters from German translation Change-Id: Iadeafd183afecb6c16f8b7d23311b6f050266dde diff --git a/source/de/officecfg/registry/data/org/openoffice/Office/UI.po b/source/de/officecfg/registry/data/org/openoffice/Office/UI.po index 5c8bccc612c..7e1a425dd81 100644 --- a/source/de/officecfg/registry/data/org/openoffice/Office/UI.po +++ b/source/de/officecfg/registry/data/org/openoffice/Office/UI.po @@ -27412,7 +27412,7 @@ msgctxt "" "Label\n" "value.text" msgid "To Previous Paragraph in Level" -msgstr "Zum vorherigen Absatz ~gleicher Ebene springen" +msgstr "Zum vorherigen Absatz gleicher Ebene springen" #: WriterCommands.xcu msgctxt "" @@ -27439,7 +27439,7 @@ msgctxt "" "Label\n" "value.text" msgid "To Next Paragraph in Level" -msgstr "~Zum nächsten Absatz g~leicher Ebene" +msgstr "Zum nächsten Absatz gleicher Ebene" #: WriterCommands.xcu msgctxt "" ___ 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/docnode/swbaslnk.cxx | 133 +++-
1 file changed, 12 insertions(+), 121 deletions(-)
New commits:
commit 7581730b2795a58d4fe6868e2f61572a91fde293
Author: Tomaž Vajngerl
Date: Wed May 23 17:36:44 2018 +0900
tdf#117247 just send a GRAPHIC_ARRIVED hint after update
As we always load graphic complete now, we can just hint that it
has arrived. In the future we might properly restore retrieving the
stream of a graphic throught link manager, but not creating the
partial graphic from it - just an async retrieval of the bytes.
The graphic should then always be created completely with the
GraphicFilter.
Change-Id: I8560c9d41a057d228aa558316131ba99d436645b
Reviewed-on: https://gerrit.libreoffice.org/54693
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/source/core/docnode/swbaslnk.cxx
b/sw/source/core/docnode/swbaslnk.cxx
index 4f30f7b4d67e..744eb2720cea 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -126,8 +126,6 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem&
rItem )
}
bool bUpdate = false;
-bool bGraphicArrived = false;
-bool bGraphicPieceArrived = false;
bool bFrameInPaint = false;
Size aGrfSz, aOldSz;
@@ -142,9 +140,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem&
rItem )
bFrameInPaint = pSwGrfNode->IsFrameInPaint();
-bGraphicArrived = GetObj()->IsDataComplete();
-bGraphicPieceArrived = GetObj()->IsPending();
-pSwGrfNode->SetGraphicArrived( bGraphicArrived );
+pSwGrfNode->SetGraphicArrived(true);
Graphic aGrf;
@@ -154,36 +150,18 @@ static void lcl_CallModify( SwGrfNode& rGrfNd,
SfxPoolItem& rItem )
{
aGrfSz = ::GetGraphicSizeTwip( aGrf, nullptr );
-if( bGraphicPieceArrived && GraphicType::Default != aGrf.GetType()
&&
-( !aOldSz.Width() || !aOldSz.Height() ) )
-{
-// If only a part arrives, but the size is not set
-// we need to go through bGraphicArrived down there.
-// Or else the graphic is painted at its definitive size
-bGraphicArrived = true;
-bGraphicPieceArrived = false;
-}
-
pSwGrfNode->SetGraphic(aGrf, "");
bUpdate = true;
-// In order for the Node to have the right transparency status
-// without having to access the graphic.
-// Or else we cause a SwapIn.
-if( bGraphicArrived )
+// Always use the correct graphic size
+if( aGrfSz.Height() && aGrfSz.Width() &&
+aOldSz.Height() && aOldSz.Width() &&
+aGrfSz != aOldSz )
{
-// Always use the correct graphic size
-if( aGrfSz.Height() && aGrfSz.Width() &&
-aOldSz.Height() && aOldSz.Width() &&
-aGrfSz != aOldSz )
-{
-pSwGrfNode->SetTwipSize( aGrfSz );
-aOldSz = aGrfSz;
-}
+pSwGrfNode->SetTwipSize(aGrfSz);
+aOldSz = aGrfSz;
}
}
-if ( bUpdate && !bGraphicArrived && !bGraphicPieceArrived )
-pSwGrfNode->SetTwipSize( Size(0,0) );
}
else if( m_pContentNode->IsOLENode() )
bUpdate = true;
@@ -191,101 +169,14 @@ static void lcl_CallModify( SwGrfNode& rGrfNd,
SfxPoolItem& rItem )
if ( !bUpdate || bFrameInPaint )
return SUCCESS;
-SwViewShell *pSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
-SwEditShell* pESh = pDoc->GetEditShell();
-
-if ( bGraphicPieceArrived && !m_bInSwapIn )
-{
-// Send hint without Actions; triggers direct paint
-if ( (!pSh || !pSh->ActionPend()) && (!pESh || !pESh->ActionPend()) )
-{
-SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED );
-m_pContentNode->ModifyNotification( &aMsgHint, &aMsgHint );
-bUpdate = false;
-}
-}
-
-static bool bInNotifyLinks = false;
-if( (!m_bInSwapIn || bGraphicArrived) && !bInNotifyLinks)
+if (bUpdate)
{
-bool bLockView = false;
-if( pSh )
+if (!SetGrfFlySize(aGrfSz, pSwGrfNode, aOldSz))
{
-bLockView = pSh->IsViewLocked();
-pSh->LockView( true );
+SwMsgPoolItem aMsgHint(RES_GRAPHIC_ARRIVED);
+lcl_CallModify(*pSwGrfNode, aMsgHint);
+return SUCCESS;
}
-
-if( pESh )
-pESh->StartAllAction();
-else if( pSh )
-pSh->StartAction();
-
-SwMsgPoolItem aMsgHint(
-bGraphicArrived ? sal_uInt16(RES_GRAPHIC_ARRIVED) :
sal_uInt16(RES_UPDATE_ATTR) );
-
-if ( bGraphicArrived )
-{
-// Notify all who a
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e90d9f2c4a8723806b39b6e211c13455fb31b1d Author: Andras Timar Date: Wed May 23 14:23:03 2018 +0200 Bump version to 5.3-49 Change-Id: Ifc5166f7a4e7d478f5d36306fa645aa31a043def diff --git a/configure.ac b/configure.ac index d235b6aa608d..935edfa7ebb3 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.48],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.49],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - 2 commits - lotuswordpro/qa lotuswordpro/source
lotuswordpro/qa/cppunit/data/fail/recurse-4.lwp |binary
lotuswordpro/source/filter/lwpfrib.cxx |2 +-
lotuswordpro/source/filter/lwplayout.cxx|5 +++--
lotuswordpro/source/filter/lwplayout.hxx| 14 --
lotuswordpro/source/filter/lwppagelayout.cxx|4 ++--
5 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit fd96a5f499b0ca4b9d8118fedaae6a3222162353
Author: Caolán McNamara
Date: Fri Apr 13 14:33:27 2018 +0100
ofz#7648 Bad-cast
Change-Id: I21aaf36f3d6b6c3054649208de809b99aa384c01
Reviewed-on: https://gerrit.libreoffice.org/52836
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit 1db17a71b028c392a00393cdf313e1720b93fd2e)
(cherry picked from commit 20bf87c6a3a076fe78f938b7a3086146336976e7)
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx
b/lotuswordpro/source/filter/lwpfrib.cxx
index ed7db90da9df..1e1505f88f0a 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -249,7 +249,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
XFTextStyle* pNamedStyle = nullptr;
if (m_pModifiers->HasCharStyle && pFoundry)
{
-pNamedStyle = static_cast
+pNamedStyle = dynamic_cast
(pFoundry->GetStyleManager()->GetStyle(m_pModifiers->CharStyleID));
}
if (pNamedStyle)
commit 1948aa5649c114aa570c215d460578a6cc6c3866
Author: Caolán McNamara
Date: Sun Mar 25 14:01:25 2018 +0100
ofz#7109 infinite regress
Change-Id: Iac0bd81c9b0e3ac6b005bb0065895ca1b4ca4233
Reviewed-on: https://gerrit.libreoffice.org/51828
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit e4308d4b3638d52ca70778565ba2541e9f3f0ff2)
(cherry picked from commit 79bb8c64b633f9397601df4e73f09d7fef066c2b)
diff --git a/lotuswordpro/qa/cppunit/data/fail/recurse-4.lwp
b/lotuswordpro/qa/cppunit/data/fail/recurse-4.lwp
new file mode 100644
index ..f48c5bb718a4
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/recurse-4.lwp
differ
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index 75524aaf4f64..3f7aeda23cd4 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -78,6 +78,7 @@ LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr,
LwpSvStream* pStrm)
, m_bGettingMarginsSameAsParent(false)
, m_bGettingHasProtection(false)
, m_bGettingIsProtected(false)
+, m_bGettingIsAutoGrowDown(false)
, m_bGettingMarginsValue(false)
, m_bGettingExtMarginsValue(false)
, m_nAttributes(0)
@@ -391,7 +392,7 @@ LwpVirtualLayout*
LwpVirtualLayout::FindChildByType(LWP_LAYOUT_TYPE eType)
*/
bool LwpVirtualLayout::IsFitGraphic()
{
-return IsAutoGrowRight() && !IsAutoGrowLeft() && IsAutoGrowDown();
+return IsAutoGrowRight() && !IsAutoGrowLeft() && GetIsAutoGrowDown();
}
/**
@@ -1174,7 +1175,7 @@ bool LwpMiddleLayout::IsAutoGrowDown()
rtl::Reference xBase(GetBasedOnStyle());
if (LwpMiddleLayout* pLay =
dynamic_cast(xBase.get()))
{
-return pLay->IsAutoGrowDown();
+return pLay->GetIsAutoGrowDown();
}
}
return LwpVirtualLayout::IsAutoGrowDown();
diff --git a/lotuswordpro/source/filter/lwplayout.hxx
b/lotuswordpro/source/filter/lwplayout.hxx
index 8d2e47dd9016..346d52bc9213 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -103,7 +103,6 @@ public:
virtual double GetColGap(sal_uInt16 nIndex);
virtual bool IsAutoGrow(){ return false;}
virtual bool IsAutoGrowUp(){ return false;}
-virtual bool IsAutoGrowDown(){ return false;}
virtual bool IsAutoGrowLeft(){ return false;}
virtual bool IsAutoGrowRight(){ return false;}
bool IsFitGraphic();
@@ -137,6 +136,15 @@ public:
m_bGettingIsProtected = false;
return bRet;
}
+bool GetIsAutoGrowDown()
+{
+if (m_bGettingIsAutoGrowDown)
+throw std::runtime_error("recursion in layout");
+m_bGettingIsAutoGrowDown = true;
+bool bRet = IsAutoGrowDown();
+m_bGettingIsAutoGrowDown = false;
+return bRet;
+}
bool GetHasProtection()
{
if (m_bGettingHasProtection)
@@ -216,6 +224,7 @@ protected:
bool HasProtection();
virtual bool HonorProtection();
virtual bool IsProtected();
+virtual bool IsAutoGrowDown(){ return false;}
virtual double MarginsValue(sal_uInt8 /*nWhichSide*/){return 0;}
virtual double ExtMarginsValue(sal_uInt8 /*nWhichSide*/){return 0;}
virtual bool MarginsSameAsParent();
@@ -224,6 +233,7 @@ protected:
bool m_bGettingMarginsSameAsParent;
bool m_bGettingHasProtection;
bool m_bGettingIsProtected;
+bool m_bGettingIsAutoGrowDown;
bool m_bGettingMarginsValue;
bool m
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 6 commits - connectivity/source download.lst external/curl lotuswordpro/qa lotuswordpro/source sfx2/source sw/source
connectivity/source/commontools/DateConversion.cxx |2
download.lst |4
external/curl/CVE-2017-8816.patch | 67
external/curl/CVE-2018-105.patch | 36 --
external/curl/CVE-2018-107.patch | 110
external/curl/ExternalPackage_curl.mk |8
external/curl/ExternalProject_curl.mk | 48 +--
external/curl/UnpackedTarball_curl.mk | 17 -
external/curl/clang-cl.patch.0 | 11
external/curl/curl-7.26.0_mingw.patch | 24 -
external/curl/curl-7.26.0_win-proxy.patch | 49 +--
external/curl/curl-msvc-disable-protocols.patch.1 | 11
external/curl/curl-msvc-schannel.patch.1 | 22 -
external/curl/curl-msvc.patch.1| 48 +--
external/curl/curl-osx.patch.1 | 285 -
external/curl/curl-xp.patch.1 | 12
external/curl/zlib.patch.0 | 100 +++
lotuswordpro/qa/cppunit/data/fail/recurse-4.lwp|binary
lotuswordpro/source/filter/lwpfrib.cxx |2
lotuswordpro/source/filter/lwplayout.cxx |5
lotuswordpro/source/filter/lwplayout.hxx | 14 -
lotuswordpro/source/filter/lwppagelayout.cxx |4
sfx2/source/dialog/dinfdlg.cxx | 14 +
sw/source/core/tox/tox.cxx | 33 +-
24 files changed, 249 insertions(+), 677 deletions(-)
New commits:
commit 3f83a6d632ab3839fbab3865366e8a1eb244cbe3
Author: Andras Timar
Date: Wed May 23 14:10:08 2018 +0200
curl: upgrade to release 7.60.0
Change-Id: Ic8510b424f52c059f979e26441e67ec15b332933
(cherry picked from commit f5a1568cb2e41b68d65e81dda099bc767a7a7801)
diff --git a/download.lst b/download.lst
index dd39b9588b71..e9b96aa4f172 100644
--- a/download.lst
+++ b/download.lst
@@ -24,8 +24,8 @@ export COLLADA2GLTF_TARBALL :=
4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
export CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_MD5SUM := 4e1ef056e117b4d25f4ec42ac609c0d4
-export CURL_TARBALL := curl-7.52.1.tar.gz
+export CURL_MD5SUM := 48eb126345d3b0f0a71a486b7f5d0307
+export CURL_TARBALL := curl-7.60.0.tar.gz
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
diff --git a/external/curl/CVE-2017-8816.patch
b/external/curl/CVE-2017-8816.patch
deleted file mode 100644
index dd4fa677e03f..
--- a/external/curl/CVE-2017-8816.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 7947c50bcd09cf471c95511739bc66d2cb506ee2 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg
-Date: Mon, 6 Nov 2017 23:51:52 +0100
-Subject: [PATCH] ntlm: avoid integer overflow for malloc size
-
-Reported-by: Alex Nichols
-Assisted-by: Kamil Dudka and Max Dymond
-
-CVE-2017-8816
-
-Bug: https://curl.haxx.se/docs/adv_2017-11e7.html
- lib/curl_ntlm_core.c | 23 +--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
-index 1309bf0d9..e8962769c 100644
a/lib/curl_ntlm_core.c
-+++ b/lib/curl_ntlm_core.c
-@@ -644,23 +644,42 @@ CURLcode Curl_hmac_md5(const unsigned char *key,
unsigned int keylen,
- Curl_HMAC_final(ctxt, output);
-
- return CURLE_OK;
- }
-
-+#ifndef SIZE_T_MAX
-+/* some limits.h headers have this defined, some don't */
-+#if defined(SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > 4)
-+#define SIZE_T_MAX 18446744073709551615U
-+#else
-+#define SIZE_T_MAX 4294967295U
-+#endif
-+#endif
-+
- /* This creates the NTLMv2 hash by using NTLM hash as the key and Unicode
- * (uppercase UserName + Domain) as the data
- */
- CURLcode Curl_ntlm_core_mk_ntlmv2_hash(const char *user, size_t userlen,
-const char *domain, size_t domlen,
-unsigned char *ntlmhash,
-unsigned char *ntlmv2hash)
- {
- /* Unicode representation */
-- size_t identity_len = (userlen + domlen) * 2;
-- unsigned char *identity = malloc(identity_len);
-+ size_t identity_len;
-+ unsigned char *identity;
- CURLcode result = CURLE_OK;
-
-+ /* we do the length checks below separately to avoid integer overflow risk
-+ on extreme data lengths */
-+ if((userlen > SIZE_T_MAX/2) ||
-+ (domlen > SIZE_T_MAX/2) ||
-+ ((userlen + domlen) > SIZE_T_MAX/2))
-+return CURLE_OUT_OF_MEMORY;
-+
-+ identity_len = (userlen + domlen) * 2;
-+ identity = malloc(identity_len);
-+
- if(!identity)
- return CURLE_OUT_OF_MEMORY;
-
- ascii_uppercase_to_unicode_le(identity, user, userlen);
- ascii_to_unicode_le(identity + (userlen << 1), do
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - download.lst external/curl
download.lst |4
external/curl/CVE-2017-8816.patch | 67 -
external/curl/CVE-2018-105.patch | 36 --
external/curl/CVE-2018-107.patch | 110
external/curl/ExternalPackage_curl.mk |8
external/curl/ExternalProject_curl.mk | 48 +--
external/curl/UnpackedTarball_curl.mk | 17 -
external/curl/clang-cl.patch.0| 11
external/curl/curl-7.26.0_mingw.patch | 24 -
external/curl/curl-7.26.0_win-proxy.patch | 49 +--
external/curl/curl-msvc-disable-protocols.patch.1 | 11
external/curl/curl-msvc-schannel.patch.1 | 22 -
external/curl/curl-msvc.patch.1 | 48 +--
external/curl/curl-osx.patch.1| 285 --
external/curl/curl-xp.patch.1 | 12
external/curl/zlib.patch.0| 100 +++
16 files changed, 200 insertions(+), 652 deletions(-)
New commits:
commit f5a1568cb2e41b68d65e81dda099bc767a7a7801
Author: Andras Timar
Date: Wed May 23 14:10:08 2018 +0200
curl: upgrade to release 7.60.0
Change-Id: Ic8510b424f52c059f979e26441e67ec15b332933
diff --git a/download.lst b/download.lst
index f145dd6879e6..e7f6114b9891 100644
--- a/download.lst
+++ b/download.lst
@@ -24,8 +24,8 @@ export COLLADA2GLTF_TARBALL :=
4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
export CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_MD5SUM := 4e1ef056e117b4d25f4ec42ac609c0d4
-export CURL_TARBALL := curl-7.52.1.tar.gz
+export CURL_MD5SUM := 48eb126345d3b0f0a71a486b7f5d0307
+export CURL_TARBALL := curl-7.60.0.tar.gz
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
diff --git a/external/curl/CVE-2017-8816.patch
b/external/curl/CVE-2017-8816.patch
deleted file mode 100644
index dd4fa677e03f..
--- a/external/curl/CVE-2017-8816.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 7947c50bcd09cf471c95511739bc66d2cb506ee2 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg
-Date: Mon, 6 Nov 2017 23:51:52 +0100
-Subject: [PATCH] ntlm: avoid integer overflow for malloc size
-
-Reported-by: Alex Nichols
-Assisted-by: Kamil Dudka and Max Dymond
-
-CVE-2017-8816
-
-Bug: https://curl.haxx.se/docs/adv_2017-11e7.html
- lib/curl_ntlm_core.c | 23 +--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
-index 1309bf0d9..e8962769c 100644
a/lib/curl_ntlm_core.c
-+++ b/lib/curl_ntlm_core.c
-@@ -644,23 +644,42 @@ CURLcode Curl_hmac_md5(const unsigned char *key,
unsigned int keylen,
- Curl_HMAC_final(ctxt, output);
-
- return CURLE_OK;
- }
-
-+#ifndef SIZE_T_MAX
-+/* some limits.h headers have this defined, some don't */
-+#if defined(SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > 4)
-+#define SIZE_T_MAX 18446744073709551615U
-+#else
-+#define SIZE_T_MAX 4294967295U
-+#endif
-+#endif
-+
- /* This creates the NTLMv2 hash by using NTLM hash as the key and Unicode
- * (uppercase UserName + Domain) as the data
- */
- CURLcode Curl_ntlm_core_mk_ntlmv2_hash(const char *user, size_t userlen,
-const char *domain, size_t domlen,
-unsigned char *ntlmhash,
-unsigned char *ntlmv2hash)
- {
- /* Unicode representation */
-- size_t identity_len = (userlen + domlen) * 2;
-- unsigned char *identity = malloc(identity_len);
-+ size_t identity_len;
-+ unsigned char *identity;
- CURLcode result = CURLE_OK;
-
-+ /* we do the length checks below separately to avoid integer overflow risk
-+ on extreme data lengths */
-+ if((userlen > SIZE_T_MAX/2) ||
-+ (domlen > SIZE_T_MAX/2) ||
-+ ((userlen + domlen) > SIZE_T_MAX/2))
-+return CURLE_OUT_OF_MEMORY;
-+
-+ identity_len = (userlen + domlen) * 2;
-+ identity = malloc(identity_len);
-+
- if(!identity)
- return CURLE_OUT_OF_MEMORY;
-
- ascii_uppercase_to_unicode_le(identity, user, userlen);
- ascii_to_unicode_le(identity + (userlen << 1), domain, domlen);
---
-2.15.0
-
diff --git a/external/curl/CVE-2018-105.patch
b/external/curl/CVE-2018-105.patch
deleted file mode 100644
index 7b5578b1aacc..
--- a/external/curl/CVE-2018-105.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa3dbb9a147488a2943bda809c66fc497efe06cb Mon Sep 17 00:00:00 2001
-From: Zhouyihai Ding
-Date: Wed, 10 Jan 2018 10:12:18 -0800
-Subject: [PATCH] http2: fix incorrect trailer buffer size
-
-Prior to this change the stored byte count of each trailer was
-miscalculated and 1 less than required. It appears any trai
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 12 commits - basic/source chart2/source distro-configs/LibreOfficeLinux.conf download.lst external/curl formula/source include/xmloff
basic/source/inc/date.hxx| 9 + basic/source/runtime/methods.cxx | 39 +--- basic/source/runtime/methods1.cxx| 20 basic/source/sbx/sbxscan.cxx | 2 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 7 + distro-configs/LibreOfficeLinux.conf | 1 download.lst | 4 external/curl/curl-7.26.0_win-proxy.patch| 8 - formula/source/ui/dlg/formula.cxx| 38 +++- include/xmloff/xmlimp.hxx| 2 sc/source/ui/inc/viewdata.hxx| 12 ++ sc/source/ui/view/viewdata.cxx | 34 --- sfx2/source/doc/templatedlg.cxx | 4 sw/qa/core/data/ww8/pass/ofz7322-1.doc |binary sw/source/core/doc/docbm.cxx | 9 + vcl/opengl/opengl_blacklist_windows.xml | 6 + vcl/qa/cppunit/pdfexport/data/tdf105954.odt |binary vcl/qa/cppunit/pdfexport/pdfexport.cxx | 47 ++ vcl/source/gdi/pdfextoutdevdata.cxx | 5 + vcl/source/opengl/OpenGLContext.cxx | 15 ++- xmloff/source/core/xmlictxt.cxx | 6 - xmloff/source/core/xmlimp.cxx| 10 +- 22 files changed, 197 insertions(+), 81 deletions(-) New commits: commit bb02e3687c1ffa64834d70b886fa37e09d0f8be5 Author: Tor Lillqvist Date: Tue May 22 11:00:35 2018 +0300 Open template read-only Otherwise when creating a new docuent based on a template, the template document file is opened read-write eventually (after first being opened read-only five times, and closed again...). Sure, LibreOffice probably doesn't actually write anything to it, but still, just opening read-write when you are going to only read is silly. Stack trace from the read-write opening: #0 0x7f063dea0047 in openFilePath(char const*, void**, unsigned int, unsigned int) (cpFilePath=0x7ffeacc7d610 "/ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", pHandle=0x342af78, uFlags=3, mode=438) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1039 #1 0x7f063dea027b in openFile(_rtl_uString*, void**, unsigned int, unsigned int) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3, mode=4294967295) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1071 #2 0x7f063dea01a8 in osl_openFile(rtl_uString*, oslFileHandle*, sal_uInt32) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1050 #3 0x7f060aec5f1a in osl::File::open(unsigned int) (this=0x342af78, uFlags=3) at /ssd1/lo/fedora/include/osl/file.hxx:975 #4 0x7f060aec5a8f in fileaccess::ReconnectingFile::open(unsigned int) (this=0x342af78, uFlags=3) at /ssd1/lo/fedora/ucb/source/ucp/file/filrec.cxx:50 #5 0x7f060aee0324 in fileaccess::XStream_impl::XStream_impl(rtl::OUString const&, bool) (this=0x342af10, aUncPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", bLock=true) at /ssd1/lo/fedora/ucb/source/ucp/file/filstr.cxx:58 #6 0x7f060aee8bac in fileaccess::TaskManager::open_rw(int, rtl::OUString const&, bool) (this=0x2c5ded0, CommandId=231, aUnqPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", bLock=true) at /ssd1/lo/fedora/ucb/source/ucp/file/filtask.cxx:766 #7 0x7f060ae9ba9b in fileaccess::BaseContent::open(int, com::sun::star::ucb::OpenCommandArgument2 const&) (this=0x3428810, nMyCommandIdentifier=231, aCommandArgument=...) at /ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:937 #8 0x7f060ae99dfa in fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, com::sun::star::uno::Reference const&) (this=0x3428810, aCommand=..., CommandId=231, Environment=uno::Reference to (ucbhelper::CommandEnvironment *) 0x341d088) at /ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:331 #9 0x7f060ae9d001 in non-virtual thunk to fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, com::sun::star::uno::Reference const&) () at /ssd1/lo/fedora/instdir/program/../program/libucpfile1.so #10 0x7f06337395da in ucbhelper::Content_Impl::executeCommand(com::sun::star:
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sd/qa sd/source
sd/qa/unit/data/ppt/tdf116899.ppt|binary
sd/qa/unit/import-tests.cxx | 25 +
sd/source/filter/ppt/pptinanimations.cxx | 15 ---
3 files changed, 37 insertions(+), 3 deletions(-)
New commits:
commit f0370fbab11afe5a601e49061b2e3be5fac50745
Author: Aron Budea
Date: Sun Apr 22 16:10:28 2018 +0200
tdf#116899: normalize key times during PPT import if needed
If TimeAnimationValueListEntry contains time with -1000,
key times have to be distributed evenly between 0 and 1.
([MS-PPT] 2.8.31)
Reviewed-on: https://gerrit.libreoffice.org/53284
Tested-by: Jenkins
Reviewed-by: Aron Budea
(cherry picked from commit 4e207c2e17d75a3cb7b6b72690375279be40d64a)
Reviewed-on: https://gerrit.libreoffice.org/54663
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit c703c934d3f9d6ad7cba620c76520d80cc0e2be7)
Change-Id: I67a3b83f1f1832fade5df7908c58032bcb9b73ce
Reviewed-on: https://gerrit.libreoffice.org/54700
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit 37af3939b768be09b6c5671fc8ae89f4e5fc38b6)
diff --git a/sd/qa/unit/data/ppt/tdf116899.ppt
b/sd/qa/unit/data/ppt/tdf116899.ppt
new file mode 100644
index ..edad3356d36f
Binary files /dev/null and b/sd/qa/unit/data/ppt/tdf116899.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index c66134291e05..2e24756b80c4 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -158,6 +158,7 @@ public:
void testTdf114821();
void testTdf51340();
void testTdf115639();
+void testTdf116899();
bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber,
std::vector& rExpected);
void testPatternImport();
@@ -232,6 +233,7 @@ public:
CPPUNIT_TEST(testTdf114821);
CPPUNIT_TEST(testTdf51340);
CPPUNIT_TEST(testTdf115639);
+CPPUNIT_TEST(testTdf116899);
CPPUNIT_TEST_SUITE_END();
};
@@ -2442,6 +2444,29 @@ void SdImportTest::testTdf115639()
}
}
+void SdImportTest::testTdf116899()
+{
+// This is a PPT created in Impress and roundtripped in PP, the key times
become [1, -1] in PP,
+// a time of -1 (-1000) in PPT means key times have to be distributed
evenly between 0 and 1
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf116899.ppt"), PPT);
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+uno::Reference< animations::XAnimationNodeSupplier > xAnimNodeSupplier(
+xPage, uno::UNO_QUERY_THROW );
+uno::Reference< animations::XAnimationNode > xRootNode(
+xAnimNodeSupplier->getAnimationNode() );
+std::vector< uno::Reference< animations::XAnimationNode > > aAnimVector;
+anim::create_deep_vector(xRootNode, aAnimVector);
+uno::Reference< animations::XAnimate > xNode(
+aAnimVector[8], uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of key times in the animation node
isn't 2.", xNode->getKeyTimes().getLength(), static_cast(2) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "First key time in the animation node isn't
0, key times aren't normalized.", 0., xNode->getKeyTimes()[0] );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second key time in the animation node isn't
1, key times aren't normalized.", 1., xNode->getKeyTimes()[1] );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 2c3574f93d52..c0788f5f9b71 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2391,15 +2391,17 @@ void AnimationImporter::importAnimateKeyPoints( const
Atom* pAtom, const Referen
OUString aFormula;
pIter = pAtom->findFirstChildAtom(DFF_msofbtAnimKeyTime);
-int nKeyTime;
sal_Int32 nTemp;
-for( nKeyTime = 0; (nKeyTime < nKeyTimes) && pIter; nKeyTime++ )
+bool bToNormalize = false;
+for( int nKeyTime = 0; (nKeyTime < nKeyTimes) && pIter; nKeyTime++ )
{
if( pIter->seekToContent() )
{
mrStCtrl.ReadInt32( nTemp );
double fTemp = (double)nTemp / 1000.0;
aKeyTimes[nKeyTime] = fTemp;
+if( fTemp == -1 )
+bToNormalize = true;
const Atom* pValue = Atom::findNextChildAtom(pIter);
if( pValue && pValue->getType() ==
DFF_msofbtAnimAttributeValue )
@@ -2496,7 +2498,14 @@ void AnimationImporter::importAnimateKeyPoints( const
Atom* pAtom, const Referen
}
dump( "\"" );
#endif
-
+if( bToNormalize &
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sw/inc sw/source
sw/inc/view.hxx |1 +
sw/source/uibase/uiview/view.cxx | 39 +++
2 files changed, 40 insertions(+)
New commits:
commit dcb523dbf09096e7f8f99455292f98139636db3a
Author: Mike Kaganski
Date: Mon May 21 09:35:01 2018 +0300
tdf#115386: Show Mail Merge toolbar for documents with MM fields
Change-Id: I357a30d72c5ac4af8c64b82b4cc61c3bd606940a
Reviewed-on: https://gerrit.libreoffice.org/54612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/54698
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a2321ce13531..a54c6d8e7935 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -250,6 +250,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
m_bIsPreviewDoubleClick : 1, // #i114045#
m_bMakeSelectionVisible : 1, // transport the bookmark
selection
m_bAnnotationMode; ///< The real cursor position is inside
an annotation.
+bool m_bInitOnceCompleted = false;
/// LibreOfficeKit has to force the page size for PgUp/PgDown
/// functionality based on the user's view, instead of using the
m_aVisArea.
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ea211cf616f5..2e241fc01555 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -221,6 +221,28 @@ IMPL_LINK_NOARG(SwView, FormControlActivated,
LinkParamNone*, void)
}
}
+namespace
+{
+uno::Reference getLayoutManager(const SfxViewFrame&
rViewFrame)
+{
+uno::Reference xLayoutManager;
+uno::Reference
xPropSet(rViewFrame.GetFrame().GetFrameInterface(),
+ uno::UNO_QUERY);
+if (xPropSet.is())
+{
+try
+{
+xLayoutManager.set(xPropSet->getPropertyValue("LayoutManager"),
uno::UNO_QUERY);
+}
+catch (const Exception& e)
+{
+SAL_WARN("sw.ui", "Failure getting layout manager: " + e.Message);
+}
+}
+return xLayoutManager;
+}
+}
+
void SwView::SelectShell()
{
// Attention: Maintain the SelectShell for the WebView additionally
@@ -426,6 +448,21 @@ void SwView::SelectShell()
GetEditWin().SetInputContext( aCntxt );
}
+// Show Mail Merge toolbar initially for documents with Database fields
+if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc())
+{
+auto xLayoutManager = getLayoutManager(*GetViewFrame());
+if (xLayoutManager.is())
+{
+const OUString
sResourceURL("private:resource/toolbar/mailmerge");
+if (!xLayoutManager->getElement(sResourceURL).is())
+{
+xLayoutManager->createElement(sResourceURL);
+xLayoutManager->showElement(sResourceURL);
+}
+}
+}
+
// Activate the toolbar to the new selection which also was active
last time.
// Before a flush () must be, but does not affect the UI according to
MBA and
// is not a performance problem.
@@ -450,6 +487,8 @@ void SwView::SelectShell()
m_pWrtShell->UpdateTable();
GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
+
+m_bInitOnceCompleted = true;
}
// Interaction: AttrChangedNotify() and TimeoutHdl.
___
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-5.3' - sd/qa sd/source
sd/qa/unit/data/ppt/tdf116899.ppt|binary
sd/qa/unit/import-tests.cxx | 25 +
sd/source/filter/ppt/pptinanimations.cxx | 15 ---
3 files changed, 37 insertions(+), 3 deletions(-)
New commits:
commit 37af3939b768be09b6c5671fc8ae89f4e5fc38b6
Author: Aron Budea
Date: Sun Apr 22 16:10:28 2018 +0200
tdf#116899: normalize key times during PPT import if needed
If TimeAnimationValueListEntry contains time with -1000,
key times have to be distributed evenly between 0 and 1.
([MS-PPT] 2.8.31)
Reviewed-on: https://gerrit.libreoffice.org/53284
Tested-by: Jenkins
Reviewed-by: Aron Budea
(cherry picked from commit 4e207c2e17d75a3cb7b6b72690375279be40d64a)
Reviewed-on: https://gerrit.libreoffice.org/54663
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit c703c934d3f9d6ad7cba620c76520d80cc0e2be7)
Change-Id: I67a3b83f1f1832fade5df7908c58032bcb9b73ce
Reviewed-on: https://gerrit.libreoffice.org/54700
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sd/qa/unit/data/ppt/tdf116899.ppt
b/sd/qa/unit/data/ppt/tdf116899.ppt
new file mode 100644
index ..edad3356d36f
Binary files /dev/null and b/sd/qa/unit/data/ppt/tdf116899.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index c66134291e05..2e24756b80c4 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -158,6 +158,7 @@ public:
void testTdf114821();
void testTdf51340();
void testTdf115639();
+void testTdf116899();
bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber,
std::vector& rExpected);
void testPatternImport();
@@ -232,6 +233,7 @@ public:
CPPUNIT_TEST(testTdf114821);
CPPUNIT_TEST(testTdf51340);
CPPUNIT_TEST(testTdf115639);
+CPPUNIT_TEST(testTdf116899);
CPPUNIT_TEST_SUITE_END();
};
@@ -2442,6 +2444,29 @@ void SdImportTest::testTdf115639()
}
}
+void SdImportTest::testTdf116899()
+{
+// This is a PPT created in Impress and roundtripped in PP, the key times
become [1, -1] in PP,
+// a time of -1 (-1000) in PPT means key times have to be distributed
evenly between 0 and 1
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf116899.ppt"), PPT);
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+uno::Reference< animations::XAnimationNodeSupplier > xAnimNodeSupplier(
+xPage, uno::UNO_QUERY_THROW );
+uno::Reference< animations::XAnimationNode > xRootNode(
+xAnimNodeSupplier->getAnimationNode() );
+std::vector< uno::Reference< animations::XAnimationNode > > aAnimVector;
+anim::create_deep_vector(xRootNode, aAnimVector);
+uno::Reference< animations::XAnimate > xNode(
+aAnimVector[8], uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of key times in the animation node
isn't 2.", xNode->getKeyTimes().getLength(), static_cast(2) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "First key time in the animation node isn't
0, key times aren't normalized.", 0., xNode->getKeyTimes()[0] );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second key time in the animation node isn't
1, key times aren't normalized.", 1., xNode->getKeyTimes()[1] );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 2c3574f93d52..c0788f5f9b71 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2391,15 +2391,17 @@ void AnimationImporter::importAnimateKeyPoints( const
Atom* pAtom, const Referen
OUString aFormula;
pIter = pAtom->findFirstChildAtom(DFF_msofbtAnimKeyTime);
-int nKeyTime;
sal_Int32 nTemp;
-for( nKeyTime = 0; (nKeyTime < nKeyTimes) && pIter; nKeyTime++ )
+bool bToNormalize = false;
+for( int nKeyTime = 0; (nKeyTime < nKeyTimes) && pIter; nKeyTime++ )
{
if( pIter->seekToContent() )
{
mrStCtrl.ReadInt32( nTemp );
double fTemp = (double)nTemp / 1000.0;
aKeyTimes[nKeyTime] = fTemp;
+if( fTemp == -1 )
+bToNormalize = true;
const Atom* pValue = Atom::findNextChildAtom(pIter);
if( pValue && pValue->getType() ==
DFF_msofbtAnimAttributeValue )
@@ -2496,7 +2498,14 @@ void AnimationImporter::importAnimateKeyPoints( const
Atom* pAtom, const Referen
}
dump( "\"" );
#endif
-
+if( bToNormalize && nKeyTimes >= 2 )
+{
+// if TimeAnimationValueList c
[Libreoffice-commits] core.git: l10ntools/source scp2/source solenv/inc
l10ntools/source/ulfconv/msi-encodinglist.txt |1 + scp2/source/ooo/module_langpack.ulf |6 ++ solenv/inc/langlist.mk|1 + 3 files changed, 8 insertions(+) New commits: commit f8fb04d0af7b1d21b8638e92922d0965e507c5d9 Author: Christian Lohmaier Date: Wed May 23 11:12:23 2018 +0200 tdf#117729 add Frisian (fy) UI langauge Change-Id: I46f75e969b1252a9511507c116f44578dfbd Reviewed-on: https://gerrit.libreoffice.org/54699 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index 9670f9ea0af6..44d7f91b2650 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -58,6 +58,7 @@ fi 0 1035 fo 0 1080 # Faroese fr 0 1036 fr-CA0 3084 +fy 0 1122 # Frisian fur 0 1585 ga 0 2108 # Irish gd 0 1084 # Gaelic (Scotland) diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 113f01906c5a..ca1c40b2a7db 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -40,6 +40,12 @@ en-US = "French" [STR_DESC_MODULE_LANGPACK_FR] en-US = "Installs the French user interface" +[STR_NAME_MODULE_LANGPACK_FY] +en-US = "Frisian" + +[STR_DESC_MODULE_LANGPACK_FY] +en-US = "Installs the Frisian user interface" + [STR_NAME_MODULE_LANGPACK_IT] en-US = "Italian" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 41b557a420c4..d0c5cb5cba78 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -49,6 +49,7 @@ eu \ fa \ fi \ fr \ +fy \ ga \ gd \ gl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/qa sd/source
sd/qa/unit/data/odp/BulletsAsImage.odp |binary
sd/qa/unit/export-tests.cxx| 54 +++--
sd/source/filter/eppt/pptx-text.cxx|6 +++
3 files changed, 57 insertions(+), 3 deletions(-)
New commits:
commit 82975bbc1a6acee97e3a90756909e424af03bc37
Author: Tomaž Vajngerl
Date: Wed May 23 18:24:19 2018 +0900
sd: extend bitmap bullet tests
Change-Id: I169f7306f3af2c283b1c928230eaf6566b1a6660
Reviewed-on: https://gerrit.libreoffice.org/54696
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/qa/unit/data/odp/BulletsAsImage.odp
b/sd/qa/unit/data/odp/BulletsAsImage.odp
index 21d10e494829..7094d34af949 100644
Binary files a/sd/qa/unit/data/odp/BulletsAsImage.odp and
b/sd/qa/unit/data/odp/BulletsAsImage.odp differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index c6dd4a70741f..165d212fd956 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -944,14 +944,64 @@ void SdExportTest::testBulletsAsImage()
uno::Reference
xLevels(xPropSet->getPropertyValue("NumberingRules"), uno::UNO_QUERY_THROW);
uno::Sequence aProperties;
xLevels->getByIndex(0) >>= aProperties; // 1st level
+
uno::Reference xBitmap;
-for (const beans::PropertyValue& rProperty : aProperties)
+awt::Size aSize;
+sal_Int16 nNumberingType = -1;
+
+for (beans::PropertyValue const & rProperty : aProperties)
{
-if (rProperty.Name == "GraphicBitmap")
+if (rProperty.Name == "NumberingType")
+{
+nNumberingType = rProperty.Value.get();
+}
+else if (rProperty.Name == "GraphicBitmap")
+{
xBitmap = rProperty.Value.get>();
+}
+else if (rProperty.Name == "GraphicSize")
+{
+aSize = rProperty.Value.get();
+}
}
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
style::NumberingType::BITMAP, nNumberingType);
+
+// Graphic Bitmap
const OString sFailed = sFailedMessageBase + "No bitmap for the
bullets";
CPPUNIT_ASSERT_MESSAGE(sFailed.getStr(), xBitmap.is());
+Graphic aGraphic(uno::Reference(xBitmap,
uno::UNO_QUERY));
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
GraphicType::Bitmap, aGraphic.GetType());
+CPPUNIT_ASSERT_MESSAGE(sFailedMessageBase.getStr(),
aGraphic.GetSizeBytes() > sal_uLong(0));
+
+if (nExportFormat == ODP || nExportFormat == PPT)
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 16L,
aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 16L,
aGraphic.GetSizePixel().Height());
+}
+else // FIXME: what happened here
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 64L,
aGraphic.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 64L,
aGraphic.GetSizePixel().Height());
+}
+
+// Graphic Size
+if (nExportFormat == ODP)
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
sal_Int32(500), aSize.Width);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
sal_Int32(500), aSize.Height);
+
+}
+else if (nExportFormat == PPT) // seems like a conversion error
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
sal_Int32(504), aSize.Width);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
sal_Int32(504), aSize.Height);
+}
+else // FIXME: totally wrong
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
sal_Int32(790), aSize.Width);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(),
sal_Int32(790), aSize.Height);
+}
xDocShRef->DoClose();
}
commit 15938ebbfa3a52595371a718f251137612184d21
Author: Tomaž Vajngerl
Date: Wed May 23 18:23:31 2018 +0900
sd: convert XGraphic to XBitmap for the "GraphicBitmap" property
Change-Id: Idec08d4823775b11976f8650fe942f296d6dd4ce
Reviewed-on: https://gerrit.libreoffice.org/54695
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index 615cb15aad09..285c5e14a5fd 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -846,7 +847,10 @@ void ParagraphObj::ImplGetNumberingLevel(
PPTExBulletProvider* pBuProv, sal_Int1
}
else if ( aPropName == "GraphicBitmap" )
-xGraphic =
pPropValue[i].Value.get>();
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 30bdedc49f7007ce0305d013ac89c910c6cb1ae4
Author: Tor Lillqvist
Date: Tue May 22 11:00:35 2018 +0300
Open template read-only
Otherwise when creating a new docuent based on a template, the
template document file is opened read-write eventually (after first
being opened read-only five times, and closed again...). Sure,
LibreOffice probably doesn't actually write anything to it, but still,
just opening read-write when you are going to only read is silly.
Stack trace from the read-write opening:
#0 0x7f063dea0047 in openFilePath(char const*, void**, unsigned int,
unsigned int) (cpFilePath=0x7ffeacc7d610
"/ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott",
pHandle=0x342af78, uFlags=3, mode=438)
at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1039
#1 0x7f063dea027b in openFile(_rtl_uString*, void**, unsigned int,
unsigned int) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3,
mode=4294967295) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1071
#2 0x7f063dea01a8 in osl_openFile(rtl_uString*, oslFileHandle*,
sal_uInt32) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3)
at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1050
#3 0x7f060aec5f1a in osl::File::open(unsigned int) (this=0x342af78,
uFlags=3) at /ssd1/lo/fedora/include/osl/file.hxx:975
#4 0x7f060aec5a8f in fileaccess::ReconnectingFile::open(unsigned int)
(this=0x342af78, uFlags=3)
at /ssd1/lo/fedora/ucb/source/ucp/file/filrec.cxx:50
#5 0x7f060aee0324 in
fileaccess::XStream_impl::XStream_impl(rtl::OUString const&, bool)
(this=0x342af10,
aUncPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott",
bLock=true) at /ssd1/lo/fedora/ucb/source/ucp/file/filstr.cxx:58
#6 0x7f060aee8bac in fileaccess::TaskManager::open_rw(int,
rtl::OUString const&, bool) (this=0x2c5ded0, CommandId=231,
aUnqPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott",
bLock=true)
at /ssd1/lo/fedora/ucb/source/ucp/file/filtask.cxx:766
#7 0x7f060ae9ba9b in fileaccess::BaseContent::open(int,
com::sun::star::ucb::OpenCommandArgument2 const&) (this=0x3428810,
nMyCommandIdentifier=231, aCommandArgument=...) at
/ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:937
#8 0x7f060ae99dfa in
fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int,
com::sun::star::uno::Reference
const&) (this=0x3428810, aCommand=..., CommandId=231,
Environment=uno::Reference to (ucbhelper::CommandEnvironment *) 0x341d088) at
/ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:331
#9 0x7f060ae9d001 in non-virtual thunk to
fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int,
com::sun::star::uno::Reference
const&) () at /ssd1/lo/fedora/instdir/program/../program/libucpfile1.so
#10 0x7f06337395da in
ucbhelper::Content_Impl::executeCommand(com::sun::star::ucb::Command const&)
(this=0x3427f70, rCommand=...)
at /ssd1/lo/fedora/ucbhelper/source/client/content.cxx:1258
#11 0x7f063373be55 in ucbhelper::Content::openWriteableStream()
(this=0x7ffeacc7f030)
at /ssd1/lo/fedora/ucbhelper/source/client/content.cxx:751
#12 0x7f06333f56c0 in
utl::MediaDescriptor::impl_openStreamWithURL(rtl::OUString const&, bool)
(this=0x7ffeacc801d0,
sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott",
bLockFile=true)
at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:666
#13 0x7f06333f3e01 in utl::MediaDescriptor::impl_addInputStream(bool)
(this=0x7ffeacc801d0, bLockFile=true)
at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:521
#14 0x7f06333f4051 in utl::MediaDescriptor::addInputStreamOwnLock()
(this=0x7ffeacc801d0)
at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:490
#15 0x7f05b132f0bf in
filter::config::TypeDetection::impl_openStream(utl::MediaDescriptor&)
(this=0x33caa10, rDescriptor=...)
at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:1127
#16 0x7f05b132e9ac in
filter::config::TypeDetection::impl_askDetectService(rtl::OUString const&,
utl::MediaDescriptor&) (this=0x33caa10,
sDetectService="com.sun.star.comp.filters.StorageFilterDetect",
rDescriptor=...) at
/ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:981
#17 0x7f05b132b7a4 in
filter::config::TypeDetection::impl_detectTypeFlatAndDeep(utl::MediaDescriptor&,
std::__debug::vector > const&, bool,
std::__debug::vector >&,
rtl::OUString&) (this=0x33caa10, rDescriptor=...,
lFlatTypes=std::__debug::vector of length 168, capacity 256 = {...},
bAllowDeep=true, rUsedDetectors=std::__debug::vector
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/scmod.hxx | 10 +-
sc/qa/unit/screenshots/screenshots.cxx | 50 +
sc/source/core/data/documen2.cxx | 12 ---
sc/source/ui/app/drwtrans.cxx | 16 +-
sc/source/ui/app/scmod.cxx | 26 ++---
sc/source/ui/app/transobj.cxx | 14 +++--
sc/source/ui/docshell/docsh.cxx| 14 +
sc/source/ui/inc/drwtrans.hxx |4 +-
sc/source/ui/inc/tabvwsh.hxx |6 +++
sc/source/ui/inc/transobj.hxx |4 +-
sc/source/ui/undo/undoblk.cxx |2 -
sc/source/ui/vba/excelvbahelper.cxx| 14 +++--
sc/source/ui/vba/vbarange.cxx |6 ---
sc/source/ui/view/cellsh.cxx | 24 +++
sc/source/ui/view/cellsh1.cxx | 17 ---
sc/source/ui/view/cliputil.cxx |3 -
sc/source/ui/view/drawvie4.cxx |5 ++-
sc/source/ui/view/gridwin.cxx |2 -
sc/source/ui/view/viewfun3.cxx | 18 ++-
sc/source/ui/view/viewfun7.cxx |3 -
20 files changed, 174 insertions(+), 76 deletions(-)
New commits:
commit a2e6f31c6f90e446d1462e7c80f6b1317f7825bc
Author: Henry Castro
Date: Sun May 6 22:40:05 2018 -0400
tdf#117228: crash in SfxItemSet::GetItemState...
(unsigned short, bool, SfxPoolItem const**) when pasting comment of closed
document
Re-work commit 1b7a8277aa3e9f73ccdf15e933a1ee3b42849a44.
In the tiled rendering case, each view has its own clipboard,
but not in desktop version which it has a shared clipboard each view.
Change-Id: I57b1ab81e4c141829dbad899330e5c22204c384a
Reviewed-on: https://gerrit.libreoffice.org/53922
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 253c5cb637e0..76e512424d89 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -29,6 +29,8 @@
#include "shellids.hxx"
#include
+#include
+
#include
#include
#include
@@ -80,7 +82,8 @@ class ScModule: public SfxModule, public SfxListener, public
utl::ConfigurationL
ScDragData* m_pDragData;
ScSelectionTransferObj* m_pSelTransfer;
ScMessagePool* m_pMessagePool;
-// there is no global InputHandler anymore, each View has its own
+css::uno::Reference m_xClipData; //
Only used by Vba helper functions
+// there is no global InputHandler anymore, each View has it's own
ScInputHandler* m_pRefInputHandler;
ScViewCfg* m_pViewCfg;
ScDocCfg* m_pDocCfg;
@@ -172,6 +175,11 @@ public:
voidSetPrintOptions ( const ScPrintOptions& rOpt );
voidInsertEntryToLRUList(sal_uInt16 nFIndex);
+SC_DLLPUBLIC css::uno::Reference
+GetClipData() { return m_xClipData; }
+SC_DLLPUBLIC void SetClipData(
+const css::uno::Reference&
xTransferable) { m_xClipData = xTransferable; }
+
static void GetSpellSettings( LanguageType& rDefLang,
LanguageType& rCjkLang, LanguageType& rCtlLang,
bool& rAutoSpell );
static void SetAutoSpellProperty( bool bSet );
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 59a10ef21dd9..9eb753dd61fd 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -72,9 +73,11 @@ public:
ScScreenshotTest();
void testOpeningModalDialogs();
+void testMultiViewCopyPaste();
CPPUNIT_TEST_SUITE(ScScreenshotTest);
CPPUNIT_TEST(testOpeningModalDialogs);
+CPPUNIT_TEST(testMultiViewCopyPaste);
CPPUNIT_TEST_SUITE_END();
};
@@ -286,6 +289,53 @@ void ScScreenshotTest::testOpeningModalDialogs()
mxComponent.clear();
}
+void ScScreenshotTest::testMultiViewCopyPaste()
+{
+initialize();
+
+ScDocument& rDoc = mxDocSh->GetDocument();
+
+rDoc.SetString(ScAddress(0, 0, 0), "TestCopy1");
+rDoc.SetString(ScAddress(1, 0, 0), "TestCopy2");
+
+// view #1
+ScTabViewShell* pView1 =
dynamic_cast(SfxViewShell::Current());
+CPPUNIT_ASSERT(pView1);
+
+// view #2
+SfxLokHelper::createView();
+ScTabViewShell* pView2 =
dynamic_cast(SfxViewShell::Current());
+CPPUNIT_ASSERT(pView1 != pView2);
+{
+std::unique_ptr xItem1;
+std::unique_ptr xItem2;
+CPPUNIT_ASSERT(SfxItemState::DISABLED !=
pView1->GetViewFrame()->GetBindings().QueryState(SID_PASTE, xItem1));
+CPPUNIT_ASSERT(SfxItemState::DISABLED !=
pView2->GetViewFrame()->GetBindings().QueryState(SID_PASTE, xItem2));
+}
+
+// copy text view 1
+pView1->SetCursor(0, 0);
+pView1->GetViewFrame()->GetBindings().Execute(SID_COPY);
+
+// copy text view 2
+pView2->SetCursor(1, 0);
+pView2->GetViewFrame()->GetBindings
Broken --with-help=html `make packageinfo`
There's a `make packageinfo` target ("generates package information for
distros" according to solenv/gbuild/gbuild.help.txt) which I'm not sure
who uses it, if anybody at all.
With the current state of --with-help=html configuration (to have
offline help content bundled with LO and displayed through a browser
application, which isn't the default yet), what I assume the intended
output of `make packageinfo` (namely, the files under
workdir/PackageInfo/) is not correct:
For one, the workdir/PackageInfo/help-*.files are completely empty. For
another,
help/*/bookmarks.js
help/*/contents.js
help/*/text
are listed in workdir/PackageInfo/l10n-*.files instead of
workdir/PackageInfo/help-*.files.
If anybody uses `make packageinfo` they need to get that fixed if they
use --with-help=html (explicitly now, or implicitly in the future when
that eventually becomes the default).
If, on the other hand, nobody uses `make packageinfo`, we should rip
that out.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40cf5a9b3dd619a650a94d8b65bf6987125b75fb Author: Christian Lohmaier Date: Wed May 23 12:09:03 2018 +0200 Updated core Project: translations 3f52ddee8a430cba4f5a9631cb41cc7981df96d0 add Frisian translation Change-Id: I2ac3bb11cf5fd5f83d65a37c7e225e4f8816cbce diff --git a/translations b/translations index 70836fdf7467..3f52ddee8a43 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 70836fdf7467a34f5a5ac03c576e9ebe535f5cde +Subproject commit 3f52ddee8a430cba4f5a9631cb41cc7981df96d0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac desktop/Library_sofficeapp.mk distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOf
Repository.mk |1
config_host.mk.in |1
configure.ac | 12
desktop/Library_sofficeapp.mk |1
distro-configs/LibreOfficeAndroid.conf|1
distro-configs/LibreOfficeAndroidAarch64.conf |1
distro-configs/LibreOfficeAndroidX86.conf |1
distro-configs/LibreOfficeiOS.conf|1
scp2/InstallModule_ooo.mk |1
scp2/source/ooo/common_brand.scp | 11
sfx2/Library_qstart_gtk.mk| 67
sfx2/Library_sfx.mk |8
sfx2/Module_sfx2.mk |8
sfx2/source/appl/shutdownicon.cxx | 117 ---
sfx2/source/appl/shutdowniconunx.cxx | 388 --
sysui/CustomTarget_share.mk |4
sysui/desktop/menus/qstart.desktop| 28 -
17 files changed, 13 insertions(+), 638 deletions(-)
New commits:
commit 3e9c908b73f0fe0978c9980750a06bbc9e02295e
Author: Rene Engelhard
Date: Fri May 18 14:31:35 2018 +0200
remove Linux ("UNX") systray "Quickstarter"
Change-Id: Ie0e8b8b7ad59ee640d6b195dfae1a7cf745056fd
Reviewed-on: https://gerrit.libreoffice.org/54543
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/Repository.mk b/Repository.mk
index 7a019e2d311b..b69650c0d62b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -289,7 +289,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
$(if $(ENABLE_EVOAB2),evoab) \
$(if $(ENABLE_GTK),vclplug_gtk) \
$(if $(ENABLE_GTK3),vclplug_gtk3) \
- $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
$(if $(ENABLE_GIO),losessioninstall) \
$(if $(ENABLE_GIO),ucpgio1) \
))
diff --git a/config_host.mk.in b/config_host.mk.in
index 70f0ecb02893..4a864c745424 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -171,7 +171,6 @@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
-export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
export ENABLE_VALGRIND=@ENABLE_VALGRIND@
export ENABLE_VLC=@ENABLE_VLC@
export ENABLE_WERROR=@ENABLE_WERROR@
diff --git a/configure.ac b/configure.ac
index 95e2865017a8..1d7770709b32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -672,7 +672,6 @@ darwin*) # Mac OS X or iOS
INSTROOTCONTENTSUFFIX=/Contents
SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK
fi
-enable_systray=no
# See comment above the case "$host_os"
LINKFLAGSSHL="-dynamiclib -single_module"
@@ -1197,11 +1196,6 @@ libo_FUZZ_ARG_ENABLE(gtk3,
[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+
3.0 is available.]),
,test "${enable_gtk3+set}" = set || enable_gtk3=yes)
-libo_FUZZ_ARG_ENABLE(systray,
-AS_HELP_STRING([--disable-systray],
-[Determines whether to build the systray quickstarter.]),
-,test "${enable_systray+set}" = set || enable_systray=yes)
-
AC_ARG_ENABLE(split-app-modules,
AS_HELP_STRING([--enable-split-app-modules],
[Split file lists for app modules, e.g. base, calc.
@@ -10111,7 +10105,6 @@ dnl
===
GTK_CFLAGS=""
GTK_LIBS=""
-ENABLE_SYSTRAY_GTK=""
if test "$test_gtk" = "yes"; then
if test "$ENABLE_GTK" = "TRUE"; then
@@ -10125,10 +10118,6 @@ if test "$test_gtk" = "yes"; then
FilterLibs "${GTHREAD_LIBS}"
GTHREAD_LIBS="${filteredlibs}"
-if test "x$enable_systray" = "xyes"; then
-ENABLE_SYSTRAY_GTK="TRUE"
-fi
-
AC_MSG_CHECKING([whether to enable Gtk print dialog support])
PKG_CHECK_MODULES([GTK_PRINT], [gtk+-unix-print-2.0 >= 2.10.0],
[ENABLE_GTK_PRINT="TRUE"],
@@ -10156,7 +10145,6 @@ fi
AC_SUBST(ENABLE_GIO)
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
-AC_SUBST(ENABLE_SYSTRAY_GTK)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTHREAD_CFLAGS)
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 53496f2c1544..288e26d47726 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
-DDESKTOP_DLLIMPLEMENTATION \
$(if $(filter WNT,$(OS)),-DENABLE_QUICKSTART_APPLET) \
$(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \
-$(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
))
$(eval $(call
gb_Library_set_precompiled_header,sofficeapp,$(SRCDIR)/desktop/inc/pch/precompiled_sofficeapp))
diff --git a/distro-configs/LibreOfficeAndroid.conf
b/distro-configs/LibreOfficeAndroid.conf
index 9cc574909d66..cc82b0df393b 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -4,7
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide' - 46 commits - sw/source
Rebased ref, commits from common ancestor:
commit 1f69ec72af274a5b6984b4d315bd5aa87953c89a
Author: Michael Stahl
Date: Wed May 23 11:36:15 2018 +0200
sw_redlinehide: SwDrawTextInfo conversion in frmpaint.cxx etc.
Change-Id: I64bb3478b11888373d9b5e0c8d4716065a625f6c
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index fe0ef8f78f63..c0ba1765beee 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1465,7 +1465,7 @@ void SwTextFrame::FillCursorPos( SwFillData& rFill ) const
if( FILL_TAB != rFill.Mode() )
{
const OUString aTmp(" ");
-SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, aTmp, 0, 2 );
+SwDrawTextInfo aDrawInf( pSh, *pOut, aTmp, 0, 2 );
nSpace = pFnt->GetTextSize_( aDrawInf ).Width()/2;
}
if( rFill.X() >= nRight )
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 9d9107053399..3a7de75f3067 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -192,7 +192,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc,
long nMax, bool bRed )
// Get script type of line numbering:
pFnt->SetActual( SwScriptInfo::WhichFont( 0, &aTmp, nullptr ) );
-SwDrawTextInfo aDrawInf( pSh, *pSh->GetOut(), nullptr, aTmp, 0,
aTmp.getLength() );
+SwDrawTextInfo aDrawInf( pSh, *pSh->GetOut(), aTmp, 0, aTmp.getLength() );
aDrawInf.SetSpace( 0 );
aDrawInf.SetWrong( nullptr );
aDrawInf.SetGrammarCheck( nullptr );
@@ -547,7 +547,7 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool
bCheck ) const
if ( EmptyHeight( ) > 1 )
{
const OUString aTmp( CH_PAR );
-SwDrawTextInfo aDrawInf( pSh, *pSh->GetOut(), nullptr,
aTmp, 0, 1 );
+SwDrawTextInfo aDrawInf( pSh, *pSh->GetOut(), aTmp, 0, 1 );
aDrawInf.SetPos( aPos );
aDrawInf.SetSpace( 0 );
aDrawInf.SetKanaComp( 0 );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index fb1e7fba9cb2..636121362f0a 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1651,11 +1651,11 @@ TextFrameIndex SwTextCursor::GetCursorOfst( SwPosition
*pPos, const Point &rPoin
// additional information:
aDrawInf.SetNumberOfBlanks( pPor->InTextGrp() ?
static_cast(pPor)->GetSpaceCnt( aSizeInf, nCharCnt ) :
-0 );
+TextFrameIndex(0) );
}
if ( pPor->InFieldGrp() && pCMS && pCMS->m_pSpecialPos )
-aDrawInf.SetLen( COMPLETE_STRING );
+aDrawInf.SetLen( TextFrameIndex(COMPLETE_STRING) );
aDrawInf.SetSpace( nSpaceAdd );
aDrawInf.SetFont( aSizeInf.GetFont() );
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index da26149b1725..0f0542ffc955 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -1213,7 +1213,7 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf )
aTmpFont.SetSize( aFontSize, nScrp );
}
-SwDrawTextInfo aDrawInf( pSh, *rInf.GetOut(), nullptr, m_aExpand,
i, 1 );
+SwDrawTextInfo aDrawInf(pSh, *rInf.GetOut(), m_aExpand, i, 1);
Size aSize = aTmpFont.GetTextSize_( aDrawInf );
const sal_uInt16 nAsc = aTmpFont.GetAscent( pSh, *rInf.GetOut() );
aPos[ i ] = static_cast(aSize.Width());
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 785935e151ec..9a87329d4a26 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -529,7 +529,7 @@ void SwTextPortion::Paint( const SwTextPaintInfo &rInf )
const
assert(false); // this is some debugging only code
rInf.DrawBackBrush( *this );
const OUString aText(CH_TXT_ATR_SUBST_FIELDEND);
-rInf.DrawText( aText, *this, 0, aText.getLength() );
+rInf.DrawText(aText, *this, TextFrameIndex(0),
TextFrameIndex(aText.getLength()));
}
else if (rInf.OnWin() && TextFrameIndex(1) == rInf.GetLen()
&& CH_TXT_ATR_FIELDSTART == rInf.GetText()[sal_Int32(rInf.GetIdx())])
@@ -537,7 +537,7 @@ void SwTextPortion::Paint( const SwTextPaintInfo &rInf )
const
assert(false); // this is some debugging only code
rInf.DrawBackBrush( *this );
const OUString aText(CH_TXT_ATR_SUBST_FIELDSTART);
-rInf.DrawText( aText, *this, 0, aText.getLength() );
+rInf.DrawText(aText, *this, TextFrameIndex(0),
TextFrameIndex(aText.getLength()));
}
else
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/wrkwin.hxx |2 +-
vcl/source/window/wrkwin.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5c6c6ebd121a50b293e015d0aa6c0f1e4dc416ae
Author: Noel Grandin
Date: Wed May 23 10:36:58 2018 +0200
Revert "vcl: StartPresentationMode should be using a sal_uInt32.."
This reverts commit 9321c560943330fbc76dacfebff67bd740fbc95b.
This is just plain wrong. Both the call sites and the function that this
method in turn calls want to use sal_Int32. It doesn't seem to cause any
actual problems, but that's probably just lucky.
Change-Id: Id77867094b9c7c209edd8b575c9203aee6515ff3
Reviewed-on: https://gerrit.libreoffice.org/54691
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index e062a6c48090..89f240eea9b2 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -84,7 +84,7 @@ public:
voidStartPresentationMode( bool bPresentation,
PresentationFlags nFlags,
- sal_uInt32 nDisplayScreen );
+ sal_Int32 nDisplayScreen );
/**
@overload void StartPresentationMode( PresentationFlags nFlags,
sal_uInt32 nDisplayScreen)
*/
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 7352f215a1b3..39d8395e7af8 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -160,7 +160,7 @@ void WorkWindow::StartPresentationMode( PresentationFlags
nFlags )
return StartPresentationMode( false/*bPresentation*/, nFlags,
GetScreenNumber());
}
-void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags
nFlags, sal_uInt32 nDisplayScreen )
+void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags
nFlags, sal_Int32 nDisplayScreen )
{
if ( !bPresentation == !mbPresentationMode )
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source config_host/config_extensions.h.in config_host/config_extension_update.h.in config_host/config_features.h.in configure.ac desktop/source
basic/source/uno/namecont.cxx |2 - config_host/config_extension_update.h.in |6 config_host/config_extensions.h.in| 15 ++ config_host/config_features.h.in |9 -- configure.ac |2 - desktop/source/app/app.cxx|1 desktop/source/deployment/gui/dp_gui_dialog2.hxx |2 - desktop/source/deployment/manager/dp_activepackages.hxx |2 - desktop/source/deployment/registry/configuration/dp_configuration.cxx |2 - 9 files changed, 21 insertions(+), 20 deletions(-) New commits: commit 51e92859c9433feeca0ccca9238e9ed0848d8470 Author: Rene Engelhard Date: Wed May 9 23:25:46 2018 + rename config_extension_update.h.in to config_extensions.h.in ... and move HAVE_FEATURE_EXTENSIONS there, too Change-Id: I37fe52071e1db32cf5cc1e51dbd89bb4f32a39c1 Reviewed-on: https://gerrit.libreoffice.org/54072 Tested-by: Jenkins Reviewed-by: Rene Engelhard diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index becadd064099..8ad36224f819 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/config_host/config_extension_update.h.in b/config_host/config_extension_update.h.in deleted file mode 100644 index 5e12a78f951e.. --- a/config_host/config_extension_update.h.in +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CONFIG_EXTENSION_UPDATE -#define CONFIG_EXTENSION_UPDATE - -#define ENABLE_EXTENSION_UPDATE 0 - -#endif diff --git a/config_host/config_extensions.h.in b/config_host/config_extensions.h.in new file mode 100644 index ..62cf1862896a --- /dev/null +++ b/config_host/config_extensions.h.in @@ -0,0 +1,15 @@ +#ifndef CONFIG_EXTENSION_UPDATE +#define CONFIG_EXTENSION_UPDATE + +/* EXTENSIONS - Whether we have any extension mechanism at all + * + * Primarily intended for non-desktop platforms where supporting + * extensions can be complicated, or even prohibited by the OS (as on + * iOS). + */ + +#define HAVE_FEATURE_EXTENSIONS 0 + +#define ENABLE_EXTENSION_UPDATE 0 + +#endif diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index c66435a12007..a7b08c7ddcfe 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -47,15 +47,6 @@ #define HAVE_FEATURE_DBCONNECTIVITY 0 -/* EXTENSIONS - Whether we have any extension mechanism at all - * - * Primarily intended for non-desktop platforms where supporting - * extensions can be complicated, or even prohibited by the OS (as on - * iOS). - */ - -#define HAVE_FEATURE_EXTENSIONS 0 - /* SCRIPTING - Whether we have any mechanism to execute user-provided scripts * * Primarily intended for the iOS App Store where the diff --git a/configure.ac b/configure.ac index 69be2fce47ec..95e2865017a8 100644 --- a/configure.ac +++ b/configure.ac @@ -12725,7 +12725,7 @@ AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_dconf.h]) AC_CONFIG_HEADERS([config_host/config_eot.h]) -AC_CONFIG_HEADERS([config_host/config_extension_update.h]) +AC_CONFIG_HEADERS([config_host/config_extensions.h]) AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h]) AC_CONFIG_HEADERS([config_host/config_cxxabi.h]) AC_CONFIG_HEADERS([config_host/config_dbus.h]) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 22092bac9760..cb67abaa8fd9 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index ed00106535e8..293f83539ccf 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX -#include +#include #include #include diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 286f9d801372..9d7b7b5ecf41 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX -#include +#include #include diff --git a/desktop/source/deployment/registry/config
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/view.hxx |1 +
sw/source/uibase/uiview/view.cxx | 38 ++
2 files changed, 39 insertions(+)
New commits:
commit 5c2c5ff01c23e4f7a8947746afc13a46cbef5bec
Author: Mike Kaganski
Date: Mon May 21 09:35:01 2018 +0300
tdf#115386: Show Mail Merge toolbar for documents with MM fields
Change-Id: I357a30d72c5ac4af8c64b82b4cc61c3bd606940a
Reviewed-on: https://gerrit.libreoffice.org/54612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 30e00b1e5844..91d02e252160 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -234,6 +234,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
m_bOldShellWasPagePreview : 1,
m_bIsPreviewDoubleClick : 1, // #i114045#
m_bMakeSelectionVisible : 1; // transport the bookmark
selection
+bool m_bInitOnceCompleted = false;
/// LibreOfficeKit has to force the page size for PgUp/PgDown
/// functionality based on the user's view, instead of using the
m_aVisArea.
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 5317cb99ed00..6244a6771818 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -219,6 +219,28 @@ IMPL_LINK_NOARG(SwView, FormControlActivated,
LinkParamNone*, void)
}
}
+namespace
+{
+uno::Reference getLayoutManager(const SfxViewFrame&
rViewFrame)
+{
+uno::Reference xLayoutManager;
+uno::Reference
xPropSet(rViewFrame.GetFrame().GetFrameInterface(),
+ uno::UNO_QUERY);
+if (xPropSet.is())
+{
+try
+{
+xLayoutManager.set(xPropSet->getPropertyValue("LayoutManager"),
uno::UNO_QUERY);
+}
+catch (const Exception& e)
+{
+SAL_WARN("sw.ui", "Failure getting layout manager: " + e.Message);
+}
+}
+return xLayoutManager;
+}
+}
+
void SwView::SelectShell()
{
// Attention: Maintain the SelectShell for the WebView additionally
@@ -420,6 +442,20 @@ void SwView::SelectShell()
GetEditWin().SetInputContext( aCntxt );
}
+// Show Mail Merge toolbar initially for documents with Database fields
+if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc())
+{
+if (auto xLayoutManager = getLayoutManager(*GetViewFrame()))
+{
+const OUString
sResourceURL("private:resource/toolbar/mailmerge");
+if (!xLayoutManager->getElement(sResourceURL).is())
+{
+xLayoutManager->createElement(sResourceURL);
+xLayoutManager->showElement(sResourceURL);
+}
+}
+}
+
// Activate the toolbar to the new selection which also was active
last time.
// Before a flush () must be, but does not affect the UI according to
MBA and
// is not a performance problem.
@@ -444,6 +480,8 @@ void SwView::SelectShell()
m_pWrtShell->UpdateTable();
GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
+
+m_bInitOnceCompleted = true;
}
// Interaction: AttrChangedNotify() and TimeoutHdl.
___
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/editutil.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1464b94ab8ef58b2620e05d663403684deb19d0c
Author: Luboš Luňák
Date: Fri May 18 10:49:37 2018 +0200
extend mutex protection to the whole of ScEditUtil::GetString()
Otherwise with Calc's threading enabled and novell#306440-1.xlsx
this function gets called multiple times at the same time and
the SetText() calls operate on the same object.
Change-Id: Ic044132ac98bed46440aadbdad6ad36f3a2e9beb
Reviewed-on: https://gerrit.libreoffice.org/54520
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index e56a1b2ca437..d05cac306c86 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -112,6 +112,8 @@ OUString ScEditUtil::GetMultilineString( const
EditTextObject& rEdit )
OUString ScEditUtil::GetString( const EditTextObject& rEditText, const
ScDocument* pDoc )
{
+static osl::Mutex aMutex;
+osl::MutexGuard aGuard( aMutex);
// ScFieldEditEngine is needed to resolve field contents.
if (pDoc)
{
@@ -124,8 +126,6 @@ OUString ScEditUtil::GetString( const EditTextObject&
rEditText, const ScDocumen
}
else
{
-static osl::Mutex aMutex;
-osl::MutexGuard aGuard( aMutex);
EditEngine& rEE = ScGlobal::GetStaticFieldEditEngine();
rEE.SetText( rEditText);
return GetMultilineString( rEE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/qa sd/source
sd/qa/unit/data/ppt/tdf116899.ppt|binary
sd/qa/unit/import-tests.cxx | 25 +
sd/source/filter/ppt/pptinanimations.cxx | 15 ---
3 files changed, 37 insertions(+), 3 deletions(-)
New commits:
commit c703c934d3f9d6ad7cba620c76520d80cc0e2be7
Author: Aron Budea
Date: Sun Apr 22 16:10:28 2018 +0200
tdf#116899: normalize key times during PPT import if needed
If TimeAnimationValueListEntry contains time with -1000,
key times have to be distributed evenly between 0 and 1.
([MS-PPT] 2.8.31)
Reviewed-on: https://gerrit.libreoffice.org/53284
Tested-by: Jenkins
Reviewed-by: Aron Budea
(cherry picked from commit 4e207c2e17d75a3cb7b6b72690375279be40d64a)
Change-Id: I67a3b83f1f1832fade5df7908c58032bcb9b73ce
Reviewed-on: https://gerrit.libreoffice.org/54663
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sd/qa/unit/data/ppt/tdf116899.ppt
b/sd/qa/unit/data/ppt/tdf116899.ppt
new file mode 100644
index ..edad3356d36f
Binary files /dev/null and b/sd/qa/unit/data/ppt/tdf116899.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 0dca601168b1..574447f60a79 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -173,6 +173,7 @@ public:
void testTdf115394();
void testTdf115394PPT();
void testTdf115639();
+void testTdf116899();
void testTdf116266();
bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber,
std::vector& rExpected);
@@ -252,6 +253,7 @@ public:
CPPUNIT_TEST(testTdf115394);
CPPUNIT_TEST(testTdf115394PPT);
CPPUNIT_TEST(testTdf115639);
+CPPUNIT_TEST(testTdf116899);
CPPUNIT_TEST(testTdf116266);
CPPUNIT_TEST_SUITE_END();
@@ -2470,6 +2472,29 @@ void SdImportTest::testTdf115639()
}
}
+void SdImportTest::testTdf116899()
+{
+// This is a PPT created in Impress and roundtripped in PP, the key times
become [1, -1] in PP,
+// a time of -1 (-1000) in PPT means key times have to be distributed
evenly between 0 and 1
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf116899.ppt"), PPT);
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+uno::Reference< animations::XAnimationNodeSupplier > xAnimNodeSupplier(
+xPage, uno::UNO_QUERY_THROW );
+uno::Reference< animations::XAnimationNode > xRootNode(
+xAnimNodeSupplier->getAnimationNode() );
+std::vector< uno::Reference< animations::XAnimationNode > > aAnimVector;
+anim::create_deep_vector(xRootNode, aAnimVector);
+uno::Reference< animations::XAnimate > xNode(
+aAnimVector[8], uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of key times in the animation node
isn't 2.", xNode->getKeyTimes().getLength(), static_cast(2) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "First key time in the animation node isn't
0, key times aren't normalized.", 0., xNode->getKeyTimes()[0] );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second key time in the animation node isn't
1, key times aren't normalized.", 1., xNode->getKeyTimes()[1] );
+}
+
void SdImportTest::testTdf116266()
{
sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf116266.odp"), ODP);
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 361d723b5f98..6414800b6599 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2391,15 +2391,17 @@ void AnimationImporter::importAnimateKeyPoints( const
Atom* pAtom, const Referen
OUString aFormula;
pIter = pAtom->findFirstChildAtom(DFF_msofbtAnimKeyTime);
-int nKeyTime;
sal_Int32 nTemp;
-for( nKeyTime = 0; (nKeyTime < nKeyTimes) && pIter; nKeyTime++ )
+bool bToNormalize = false;
+for( int nKeyTime = 0; (nKeyTime < nKeyTimes) && pIter; nKeyTime++ )
{
if( pIter->seekToContent() )
{
mrStCtrl.ReadInt32( nTemp );
double fTemp = (double)nTemp / 1000.0;
aKeyTimes[nKeyTime] = fTemp;
+if( fTemp == -1 )
+bToNormalize = true;
const Atom* pValue = Atom::findNextChildAtom(pIter);
if( pValue && pValue->getType() ==
DFF_msofbtAnimAttributeValue )
@@ -2496,7 +2498,14 @@ void AnimationImporter::importAnimateKeyPoints( const
Atom* pAtom, const Referen
}
dump( "\"" );
#endif
-
+if( bToNormalize && nKeyTimes >= 2 )
+{
+// if TimeAnimationValueList contains time -1000, key points must
be evenly distributed between 0
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src
loleaflet/src/layer/marker/Cursor.js |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 86db1912df690f56fcf89d04b5cf5905b96355d5
Author: Tamás Zolnai
Date: Tue May 22 19:09:56 2018 +0200
lok: Restart blinking animation when moving the cursor
It provides a better user experienc that the user see the cursor at
the new positin (not in invisible state).
Change-Id: Ifa4b9c65b13901fec0c606422a7bd2a292d85608
Reviewed-on: https://gerrit.libreoffice.org/54679
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 15f42c493b97a58d903a50b476d7a63bf3be61ad)
Reviewed-on: https://gerrit.libreoffice.org/54694
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index 792a13485..8be48906f 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -105,6 +105,12 @@ L.Cursor = L.Layer.extend({
_setPos: function (pos) {
L.DomUtil.setPosition(this._container, pos);
this._container.style.zIndex = this.options.zIndex;
+ // Restart blinking animation
+ if (this.options.blink) {
+ L.DomUtil.removeClass(this._cursor, 'blinking-cursor');
+ void this._cursor.offsetWidth;
+ L.DomUtil.addClass(this._cursor, 'blinking-cursor');
+ }
},
_setSize: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/marker/Cursor.js |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 15f42c493b97a58d903a50b476d7a63bf3be61ad
Author: Tamás Zolnai
Date: Tue May 22 19:09:56 2018 +0200
lok: Restart blinking animation when moving the cursor
It provides a better user experienc that the user see the cursor at
the new positin (not in invisible state).
Change-Id: Ifa4b9c65b13901fec0c606422a7bd2a292d85608
Reviewed-on: https://gerrit.libreoffice.org/54679
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index 792a13485..8be48906f 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -105,6 +105,12 @@ L.Cursor = L.Layer.extend({
_setPos: function (pos) {
L.DomUtil.setPosition(this._container, pos);
this._container.style.zIndex = this.options.zIndex;
+ // Restart blinking animation
+ if (this.options.blink) {
+ L.DomUtil.removeClass(this._cursor, 'blinking-cursor');
+ void this._cursor.offsetWidth;
+ L.DomUtil.addClass(this._cursor, 'blinking-cursor');
+ }
},
_setSize: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/inc vcl/qt5
vcl/inc/qt5/Qt5Menu.hxx |6 +
vcl/qt5/Qt5Menu.cxx | 50
2 files changed, 32 insertions(+), 24 deletions(-)
New commits:
commit 718982237e15948e4e3d45d63b8a25de049af271
Author: Katarina Behrens
Date: Wed May 23 10:51:30 2018 +0200
Native leaf menus and submenus are now visible
Change-Id: Ieaac0966b167d82c8bdeb60f3ce4b9cc8589ec62
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index aa3948ce6d2d..38dcc3688b1f 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -12,6 +12,7 @@
#include
class MenuItemList;
+class QMenu;
class QMenuBar;
class Qt5MenuItem;
class Qt5Frame;
@@ -24,12 +25,9 @@ private:
Qt5Menu* mpParentSalMenu;
Qt5Frame*mpFrame;
bool mbMenuBar;
-
QMenuBar*mpQMenuBar;
-void ActivateAllSubMenus( Menu* pMenuBar );
-void Update();
-
+void DoFullMenuUpdate( Menu* pMenuBar, QMenu* pParentMenu = nullptr );
void NativeItemText( OUString &rItemText );
public:
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 586130925356..65bf726252df 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -53,6 +53,16 @@ void Qt5Menu::RemoveItem( unsigned nPos )
void Qt5Menu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu,
unsigned nPos )
{
+SolarMutexGuard aGuard;
+Qt5MenuItem *pItem = static_cast< Qt5MenuItem* >( pSalMenuItem );
+Qt5Menu *pQSubMenu = static_cast< Qt5Menu* >( pSubMenu );
+
+if ( pQSubMenu == nullptr )
+return;
+
+pQSubMenu->mpParentSalMenu = this;
+pItem->mpSubMenu = pQSubMenu;
+
}
void Qt5Menu::SetFrame( const SalFrame* pFrame )
@@ -68,26 +78,10 @@ void Qt5Menu::SetFrame( const SalFrame* pFrame )
if( pMainWindow )
mpQMenuBar = pMainWindow->menuBar();
-ActivateAllSubMenus( mpVCLMenu );
-
-Update();
+DoFullMenuUpdate( mpVCLMenu );
}
-void Qt5Menu::ActivateAllSubMenus( Menu* pMenuBar )
-{
-for (Qt5MenuItem* pSalItem : maItems)
-{
-if ( pSalItem->mpSubMenu != nullptr )
-{
-pMenuBar->HandleMenuActivateEvent(pSalItem->mpSubMenu->GetMenu());
-pSalItem->mpSubMenu->ActivateAllSubMenus(pMenuBar);
-pSalItem->mpSubMenu->Update();
-
pMenuBar->HandleMenuDeActivateEvent(pSalItem->mpSubMenu->GetMenu());
-}
-}
-}
-
-void Qt5Menu::Update()
+void Qt5Menu::DoFullMenuUpdate( Menu* pMenuBar, QMenu* pParentMenu )
{
Menu* pVCLMenu = mpVCLMenu;
@@ -99,11 +93,27 @@ void Qt5Menu::Update()
Qt5MenuItem *pSalMenuItem = GetItemAtPos( nItem );
sal_uInt16 nId = pSalMenuItem->mnId;
OUString aText = pVCLMenu->GetItemText( nId );
+QMenu* pQMenu = pParentMenu;
+NativeItemText( aText );
if (mbMenuBar && mpQMenuBar)
+// top-level menu
+pQMenu = mpQMenuBar->addMenu( toQString(aText) );
+else
+{
+if( pSalMenuItem->mpSubMenu )
+// submenu
+pQMenu = pQMenu->addMenu( toQString(aText) );
+else
+// leaf menu
+pQMenu->addAction( toQString(aText) );
+}
+
+if ( pSalMenuItem->mpSubMenu != nullptr )
{
- NativeItemText( aText );
- mpQMenuBar->addMenu( toQString(aText) );
+
pMenuBar->HandleMenuActivateEvent(pSalMenuItem->mpSubMenu->GetMenu());
+pSalMenuItem->mpSubMenu->DoFullMenuUpdate( pMenuBar, pQMenu );
+
pMenuBar->HandleMenuDeActivateEvent(pSalMenuItem->mpSubMenu->GetMenu());
}
}
}
___
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-5.3-desktop' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf116976.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |7 +++
writerfilter/source/dmapper/GraphicImport.cxx | 10 --
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 3790b16318f687b11a1a6453e96e86a48b0e2eb1
Author: Miklos Vajna
Date: Thu Apr 12 18:39:36 2018 +0200
tdf#116976 DOCX import: fix rel size of shape after bitmap
We have a queue of these odd relative sizes (which are not XML
attributes but text inside the XML element), if the bitmap doesn't pop
the queue, the following shape won't get its size.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
Change-Id: I1602208c9509d8889bf0be254f3b25fb25fafca2
Reviewed-on: https://gerrit.libreoffice.org/54669
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit e6f39221b5ce652c78cc675c8dd0a662332ecacc)
diff --git a/sw/qa/extras/ooxmlexport/data/tdf116976.docx
b/sw/qa/extras/ooxmlexport/data/tdf116976.docx
new file mode 100644
index ..70492a4af2f3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf116976.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index ddcce371d885..079fadcca914 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -726,6 +726,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf115861, "tdf115861.docx")
CPPUNIT_ASSERT_EQUAL(OUString("(k)"), getParagraph(2)->getString());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
+{
+// This was 0, reltive size of shape after bitmap was ignored.
+CPPUNIT_ASSERT_EQUAL(static_cast(40),
+ getProperty(getShape(1), "RelativeWidth"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 5044454ddaef..5ae59defc618 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1087,10 +1087,12 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
break;
case NS_ooxml::LN_CT_SizeRelH_pctWidth:
case NS_ooxml::LN_CT_SizeRelV_pctHeight:
-if (m_xShape.is() && !m_pImpl->m_rPositivePercentages.empty())
+if (m_pImpl->m_rPositivePercentages.empty())
+break;
+
+if (m_xShape.is())
{
sal_Int16 nPositivePercentage =
rtl::math::round(m_pImpl->m_rPositivePercentages.front().toDouble() /
oox::drawingml::PER_PERCENT);
-m_pImpl->m_rPositivePercentages.pop();
if (nPositivePercentage)
{
@@ -1099,6 +1101,10 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
xPropertySet->setPropertyValue(aProperty,
uno::makeAny(nPositivePercentage));
}
}
+
+// Make sure the token is consumed even if xShape is an empty
+// reference.
+m_pImpl->m_rPositivePercentages.pop();
break;
case NS_ooxml::LN_EG_WrapType_wrapNone: // 90944; - doesn't contain
attributes
//depending on the behindDoc attribute text wraps through behind
or in fron of the object
___
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-5.3-desktop' - filter/source include/unotools officecfg/registry sw/CppunitTest_sw_mailmerge.mk sw/inc sw/qa sw/source sw/uiconfig unotools/
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 13
include/unotools/compatibility.hxx|8
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |6
sw/CppunitTest_sw_mailmerge.mk|4
sw/inc/IDocumentSettingAccess.hxx |1
sw/inc/doc.hxx|3
sw/inc/ndhints.hxx| 26 +
sw/inc/ndtxt.hxx | 12
sw/inc/viewsh.hxx |2
sw/qa/extras/mailmerge/data/5-with-blanks.ods |binary
sw/qa/extras/mailmerge/data/tdf35798-legacy.fodt | 37 ++
sw/qa/extras/mailmerge/data/tdf35798-legacy.odt |binary
sw/qa/extras/mailmerge/data/tdf35798-new.fodt | 38 ++
sw/qa/extras/mailmerge/data/tdf35798-new.odt |binary
sw/qa/extras/mailmerge/mailmerge.cxx | 141
++
sw/source/core/doc/DocumentSettingManager.cxx |7
sw/source/core/doc/doc.cxx| 128
+
sw/source/core/doc/doctxm.cxx |4
sw/source/core/inc/DocumentSettingManager.hxx |1
sw/source/core/text/txtfrm.cxx|9
sw/source/core/txtnode/atrfld.cxx | 27 +
sw/source/core/txtnode/ndtxt.cxx |2
sw/source/core/txtnode/thints.cxx | 71 ++---
sw/source/core/view/viewsh.cxx| 20 +
sw/source/filter/xml/xmlimp.cxx | 26 +
sw/source/ui/config/optcomp.cxx | 33 +-
sw/source/uibase/app/docshini.cxx | 22 -
sw/source/uibase/uno/SwXDocumentSettings.cxx | 18 +
sw/uiconfig/swriter/ui/optcompatpage.ui |1
unotools/source/config/compatibility.cxx | 52 +++
30 files changed, 573 insertions(+), 139 deletions(-)
New commits:
commit 281fba83860c9635ac7b9b00286b68270abf3c27
Author: Mike Kaganski
Date: Fri May 18 18:48:38 2018 +0300
tdf#35798: Hide empty Database fields' paragraphs (+ compat option)
With this change, Database fields that expand to empty values behave
as if they are "Hidden Paragraph" fields.
A compatibility option to enable this behaviour is added. The option is
enabled by default, and for any non-native documents (for compatibility
with other office suites). For existing (F)ODT documents, the option is
disabled for those documents that don't have this setting set, to keep
the layout of legacy documents.
Change-Id: Ic5e8cb15a3a7d1a765a984eef4b0d97666df7dfd
Reviewed-on: https://gerrit.libreoffice.org/54552
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/54661
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 88d829dead0b..bf1b0b2ea427 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -96,12 +96,25 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence<
css::beans::Property
PropertyMapEntry aImportInfoMap[] =
{
{ OUString("BaseURI"), 0, ::cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID, 0},
+{ OUString("DefaultDocumentSettings"), 0,
+ ::cppu::UnoType>::get(),
PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo(
aImportInfoMap ) ) );
xInfoSet->setPropertyValue( "BaseURI", makeAny( aBaseURI ));
+
+OUString aFilterName;
+auto It = aMediaMap.find(OUString("FilterName"));
+if (It != aMediaMap.end() && (It->second >>= aFilterName)
+&& aFilterName == "OpenDocument Text Flat XML")
+{
+PropertyValue EmptyDbFieldHidesPara("EmptyDbFieldHidesPara", 0,
Any(false),
+
PropertyState::PropertyState_DIRECT_VALUE);
+Sequence aSettings{ EmptyDbFieldHidesPara };
+xInfoSet->setPropertyValue("DefaultDocumentSettings",
makeAny(aSettings));
+}
aAnys[0] <<= xInfoSet;
diff --git a/include/unotools/compatibility.hxx
b/include/unotools/compatibility.hxx
index 8f4ce5a2ee12..09f4e200f16e 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -41,7 +41,8 @@ enum Co
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unotext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 539d939cbd6a02ca043ef535424cda4a65abe5fd
Author: Caolán McNamara
Date: Tue May 22 21:40:43 2018 +0100
ofz#8473 Null-dereference READ
Change-Id: Id6578d180fec3738be127993f02aaf45af915688
Reviewed-on: https://gerrit.libreoffice.org/54682
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 5d9bde6d73a7..5ecc6fbf399b 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -559,7 +559,7 @@ SwXText::insertTextContent(
pTmp = pTmp->StartOfSectionNode();
}
// if the document starts with a section
-while (pOwnStartNode->IsSectionNode())
+while (pOwnStartNode && pOwnStartNode->IsSectionNode())
{
pOwnStartNode = pOwnStartNode->StartOfSectionNode();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/find-unneeded-includes
bin/find-unneeded-includes |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9b2136fb7124934a8869a4d72cf7bf86db503935
Author: Gabor Kelemen
Date: Sat May 19 07:34:51 2018 +0200
find-unneeded-includes: Make the output user friendlier
This way it's easy to copy-paste the problematic command
for further investigation of IWYUs proposals
Change-Id: I9e7403f0f05e64e562441941f00127a62bf15265
Reviewed-on: https://gerrit.libreoffice.org/54560
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 7cc933ff6c9a..b4a2a89e0377 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -165,7 +165,7 @@ def run_tool(task_queue, failed_files):
p = subprocess.Popen(invocation, shell=True,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
retcode =
processIWYUOutput(p.communicate()[0].decode('utf-8').splitlines(), moduleRules)
if retcode != 0:
-print("ERROR: '" + invocation + "' found unused includes.")
+print("ERROR: The following command found unused includes:\n"
+ invocation)
failed_files.append(invocation)
task_queue.task_done()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source
vcl/source/opengl/OpenGLContext.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 014a573a05bc69e0883a9e5fccdc7bed72b0a62e
Author: Miklos Vajna
Date: Thu May 17 17:21:40 2018 +0200
tdf#104893 vcl opengl: fix assert failure when starting chart editing
OpenGLContext::prepareForYield() assumed that in case we have a current
context, then it's the last one, but that's not the case for chart windows
since commit 78b100ec9cb0db2f7b33ece5ad3287a67a37246f (only init the OpenGL
context if we need it, 2016-06-07), which creates an OpenGLContext instance
(which is then the last one in the context list) but explicitly doesn't
initialize it (so that it would become the current one).
Fix the problem by resetting not the last but the last current context.
(cherry picked from commit 2a6171ed6fb85b3419dcf5cf1346cf1eec447987)
Change-Id: Ie0e96927473290590cd6333e5cdcb7daa009431b
Reviewed-on: https://gerrit.libreoffice.org/54516
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 958c59925db2..200a772e2a36 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -483,8 +483,19 @@ void OpenGLContext::prepareForYield()
SAL_INFO("vcl.opengl", "Unbinding contexts in preparation for yield");
-if( pCurrentCtx->isCurrent() )
-pCurrentCtx->resetCurrent();
+// Find the first context that is current and reset it.
+// Usually the last context is the current, but not in case a new
+// OpenGLContext is created already but not yet initialized.
+while (pCurrentCtx.is())
+{
+if (pCurrentCtx->isCurrent())
+{
+pCurrentCtx->resetCurrent();
+break;
+}
+
+pCurrentCtx = pCurrentCtx->mpPrevContext;
+}
assert (!hasCurrent());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp |4 1 file changed, 4 deletions(-) New commits: commit 51631b4e2295d7e40a0a6a03771e15609d96c730 Author: Miklos Vajna Date: Wed May 23 09:13:47 2018 +0200 kit: remove unused using declarations Change-Id: Ide76d327b3b064180aa4eaa28f13827d665edaa5 diff --git a/kit/Kit.cpp b/kit/Kit.cpp index b76dc1094..0b02d5569 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -82,7 +82,6 @@ using Poco::File; using Poco::JSON::Array; using Poco::JSON::Object; using Poco::JSON::Parser; -using Poco::Net::WebSocket; using Poco::Runnable; using Poco::StringTokenizer; using Poco::Thread; @@ -91,9 +90,6 @@ using Poco::URI; using Poco::Util::Application; #ifndef BUILDING_TESTS -using Poco::Net::HTTPClientSession; -using Poco::Net::HTTPRequest; -using Poco::Net::HTTPResponse; using Poco::Path; using Poco::Process; #endif ___ 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/rtfexport/data/tdf117505.odt |binary
sw/qa/extras/rtfexport/rtfexport3.cxx | 11 +++
sw/source/filter/ww8/rtfattributeoutput.cxx |9 -
sw/source/filter/ww8/rtfexport.cxx |3 +++
sw/source/filter/ww8/rtfexport.hxx |4
5 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 5956828c88501ef1366e60010b05053a8e1e642e
Author: Miklos Vajna
Date: Tue May 22 22:05:24 2018 +0200
tdf#117505 RTF export: fix incorrect header distance for first/follow pages
In case the first and the follow page format has different header
distances, the DOC and DOCX import work with the distance from the first
page format when they take the last item from the MSWordSections
container at the end of the export.
RTF writes section info before the document content, and in case there
are separate first and follow page formats, then we work with the follow
format since commit 20a53cb9e9c7b797c091fe6ac6a34dfb28c61304
(INTEGRATION: CWS limerickfilterteam08 (1.16.32); FILE MERGED,
2003-09-01) as a fix for i#13107.
There is no perfect solution here, the sw doc model can store different
header distances for first and follow pages, while Word works with a
single distance. But RTF/DOCX/DOC import puts the relevant header
distance to the first page format and DOCX/DOC export reads the distance
from there, so be consistent and do the same in the RTF export as well.
This means the DOCX import -> RTF export -> RTF import sequence from the
bugreport will result in a correct header distance.
Change-Id: I3f1fe3080360702c41d680b8785cc3602e74685e
Reviewed-on: https://gerrit.libreoffice.org/54680
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/rtfexport/data/tdf117505.odt
b/sw/qa/extras/rtfexport/data/tdf117505.odt
new file mode 100644
index ..91bde8f92393
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf117505.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 142c7f6c8381..d27eec82fea9 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -145,6 +145,17 @@ DECLARE_RTFEXPORT_TEST(testTdf117268, "tdf117268.rtf")
CPPUNIT_ASSERT_EQUAL(xCell, xAnchorCell);
}
+DECLARE_RTFEXPORT_TEST(testTdf117505, "tdf117505.odt")
+{
+uno::Reference
xPageStyles(getStyles("PageStyles"));
+uno::Reference
xFirstPage(xPageStyles->getByName("First Page"),
+ uno::UNO_QUERY);
+// This was 499, small header height resulted in visible whitespace from
+// remaining top margin -> header content moved down.
+CPPUNIT_ASSERT_EQUAL(static_cast(1499),
+ getProperty(xFirstPage, "HeaderHeight"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 56c0d2f9d293..42199d4770b6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3017,7 +3017,14 @@ void RtfAttributeOutput::FormatULSpace(const
SvxULSpaceItem& rULSpace)
if (!m_rExport.GetCurItemSet())
return;
-sw::util::HdFtDistanceGlue aDistances(*m_rExport.GetCurItemSet());
+// If we export a follow page format, then our doc model has
+// separate header/footer distances for the first page and the
+// follow pages, but Word can have only a single distance. In case
+// the two values differ, work with the value from the first page
+// format to be in sync with the import.
+sw::util::HdFtDistanceGlue
aDistances(m_rExport.GetFirstPageItemSet()
+ ?
*m_rExport.GetFirstPageItemSet()
+ :
*m_rExport.GetCurItemSet());
if (aDistances.dyaTop)
{
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 0b206edcf693..7c5e096ea5b3 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1348,7 +1348,10 @@ void RtfExport::OutPageDescription(const SwPageDesc&
rPgDsc, bool bCheckForFirst
const SwFormat* pFormat = &m_pCurrentPageDesc->GetMaster(); //GetLeft();
m_bOutPageDescs = true;
+if (m_pCurrentPageDesc != &rPgDsc)
+m_pFirstPageItemSet = &rPgDsc.GetMaster().GetAttrSet();
OutputFormat(*pFormat, true, false);
+m_pFirstPageItemSet = nullptr;
m_bOutPageDescs = false;
// normal header / footer (without a style)
diff --git a/sw/source/filter/ww8/rtfexport.hxx
b/sw/source/filter/ww8/rtfexport.hxx
index 03f06d5e22b1..fd2c7a285e7b 100644
--- a/sw/source/filte
