[Libreoffice-commits] core.git: configure.ac README.md
README.md|2 +- configure.ac | 36 +++- 2 files changed, 16 insertions(+), 22 deletions(-) New commits: commit a7f57d86c7c67ba3ceb4f4ec27cb1a7826579b3f Author: Tor Lillqvist AuthorDate: Fri Nov 23 12:07:40 2018 +0200 Commit: Tor Lillqvist CommitDate: Tue Nov 27 08:35:44 2018 +0100 Bump minimum macOS run-time version to 10.10 It is much over a year since we bumped to 10.9, so it is time. Bumping to 10.10 will allow us to with good conscience get rid of some code that (presumably) tries to emulate some aspects of OS X user interface look that went away in 10.10. See tdf#114839. Change-Id: Ic41f73d8e59a40c4696069af85bb3ff33146086c Reviewed-on: https://gerrit.libreoffice.org/63880 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/README.md b/README.md index 9192f828be10..1285ed7e3f12 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ run and compile LibreOffice, also used by the TDF builds: * Runtime: Windows 7 * Build: Cygwin + Visual Studio 2017 * macOS: -* Runtime: 10.9 +* Runtime: 10.10 * Build: 10.12 + Xcode 9.3 * Linux: * Runtime: RHEL 6 or CentOS 6 diff --git a/configure.ac b/configure.ac index ea2229e3324d..b35ceab44ad1 100644 --- a/configure.ac +++ b/configure.ac @@ -2297,7 +2297,7 @@ AC_ARG_WITH(macosx-sdk, not terribly useful. It works fine to build with a new SDK and run the result on an older OS. - e. g.: --with-macosx-sdk=10.9 + e. g.: --with-macosx-sdk=10.10 there are 3 options to control the MacOSX build: --with-macosx-sdk (referred as 'sdk' below) @@ -2311,15 +2311,15 @@ AC_ARG_WITH(macosx-sdk, == command line || config result == - min | max | sdk || min | max | sdk | - ?| ?| ?|| 10.9 | 10.s | 10.s | - ?| ?| 10.x || 10.9 | 10.x | 10.x | - ?| 10.x | ?|| 10.9 | 10.s | 10.s | - ?| 10.x | 10.y || 10.9 | 10.x | 10.y | - 10.x | ?| ?|| 10.x | 10.s | 10.s | - 10.x | ?| 10.y || 10.x | 10.y | 10.y | - 10.x | 10.y | ?|| 10.x | 10.y | 10.y | - 10.x | 10.y | 10.z || 10.x | 10.y | 10.z | + min | max | sdk || min | max | sdk | + ?| ?| ?|| 10.10 | 10.s | 10.s | + ?| ?| 10.x || 10.10 | 10.x | 10.x | + ?| 10.x | ?|| 10.10 | 10.s | 10.s | + ?| 10.x | 10.y || 10.10 | 10.x | 10.y | + 10.x | ?| ?|| 10.x | 10.s | 10.s | + 10.x | ?| 10.y || 10.x | 10.y | 10.y | + 10.x | 10.y | ?|| 10.x | 10.y | 10.y | + 10.x | 10.y | 10.z || 10.x | 10.y | 10.z | see: http://developer.apple.com/library/mac/#technotes/tn2064/_index.html @@ -2333,7 +2333,7 @@ AC_ARG_WITH(macosx-version-min-required, AS_HELP_STRING([--with-macosx-version-min-required=], [set the minimum OS version needed to run the built LibreOffice]) [ - e. g.: --with-macos-version-min-required=10.9 + e. g.: --with-macos-version-min-required=10.10 see --with-macosx-sdk for more info ], ,) @@ -2342,7 +2342,7 @@ AC_ARG_WITH(macosx-version-max-allowed, AS_HELP_STRING([--with-macosx-version-max-allowed=], [set the maximum allowed OS version the LibreOffice compilation can use APIs from]) [ - e. g.: --with-macos-version-max-allowed=10.9 + e. g.: --with-macos-version-max-allowed=10.10 see --with-macosx-sdk for more info ], ,) @@ -2759,7 +2759,7 @@ if test $_os = Darwin -o $_os = iOS; then esac if test "$with_macosx_version_min_required" = "" ; then -with_macosx_version_min_required="10.9"; +with_macosx_version_min_required="10.10"; fi if test "$with_macosx_version_max_allowed" = "" ; then @@ -2784,9 +2784,6 @@ if test $_os = Darwin -o $_os = iOS; then fi case "$with_macosx_version_min_required" in -10.9) -MAC_OS_X_VERSION_MIN_REQUIRED="1090" -;; 10.10) MAC_OS_X_VERSION_MIN_REQUIRED="101000" ;; @@ -2803,7 +2800,7 @@ if test $_os = Darwin -o $_os = iOS; then MAC_OS_X_VERSION_MIN_REQUIRED="101400" ;; *) -
[Libreoffice-commits] core.git: include/vcl
include/vcl/GraphicObject.hxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 1f5fa39b45c0a62fb1ba266e6823ebdaa8d419eb
Author: Noel Grandin
AuthorDate: Mon Nov 26 09:41:47 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 27 07:27:08 2018 +0100
remove unused GRFMGR_AUTOSWAPSTREAM defines
Change-Id: I01321f82958bbf22838554010abf706a3e9b9391
Reviewed-on: https://gerrit.libreoffice.org/64061
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index bad14526f1d4..88038fb71afe 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -41,13 +41,6 @@ namespace o3tl
template<> struct typed_flags :
is_typed_flags {};
}
-// AutoSwap defines
-
-#define GRFMGR_AUTOSWAPSTREAM_LINK nullptr
-#define GRFMGR_AUTOSWAPSTREAM_LOADED
reinterpret_cast(sal_IntPtr(-3))
-#define GRFMGR_AUTOSWAPSTREAM_TEMP
reinterpret_cast(sal_IntPtr(-2))
-#define GRFMGR_AUTOSWAPSTREAM_NONE
reinterpret_cast(sal_IntPtr(-1))
-
// Adjustment defines
enum class GraphicAdjustmentFlags
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source
compilerplugins/clang/unusedenumconstants.readonly.results |2 --
include/vcl/help.hxx |4 +---
vcl/source/app/help.cxx|4 +---
3 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 30c953423a847e170ea26008535b79eb6f23e62e
Author: Noel Grandin
AuthorDate: Mon Nov 26 09:19:20 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 27 07:26:35 2018 +0100
remove unused QuickHelpFlags enum value
Change-Id: Ia40e882af0df396895a19dd34caa60461cdf6c12
Reviewed-on: https://gerrit.libreoffice.org/64059
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 5406774ba33c..1eb66c1a180d 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -900,8 +900,6 @@ include/vcl/graphictools.hxx:229
enum SvtGraphicFill::FillType fillSolid
include/vcl/help.hxx:42
enum QuickHelpFlags NoAutoPos
-include/vcl/help.hxx:45
-enum QuickHelpFlags NoDelay
include/vcl/keycod.hxx:32
enum KeyFuncType REDO
include/vcl/keycod.hxx:32
diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 2c467974fdc5..768d4d03cbe1 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -41,8 +41,6 @@ enum class QuickHelpFlags
Bottom= 0x0020,
NoAutoPos = Left | Center | Right | Top | VCenter | Bottom,
CtrlText = 0x0040,
-/// no delay when opening the quick help. Applies to ShowBalloon and
ShowQuickHelp
-NoDelay = 0x0080,
/// force balloon-style in ShowPopover and ShowQuickHelp
TipStyleBalloon = 0x0100,
NoEvadePointer= 0x0200,
@@ -50,7 +48,7 @@ enum class QuickHelpFlags
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
#define OOO_HELP_INDEX ".help:index"
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index ab6767b39adb..c1634351f0ad 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -544,9 +544,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16
nHelpWinStyle, QuickHe
return;
sal_uInt64 nCurTime = tools::Time::GetSystemTicks();
-if ( ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) <
HelpSettings::GetTipDelay() )
-|| ( nStyle & QuickHelpFlags::NoDelay )
-)
+if ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) <
HelpSettings::GetTipDelay() )
nDelayMode = HELPDELAY_NONE;
pHelpWin = VclPtr::Create( pParent, rHelpText,
nHelpWinStyle, nStyle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Dmitriy Shilin license statement
Morning! All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Dmitriy. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source
sd/source/core/sdpage.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 1658770eb9c023484846994a26c3be31deee24d8 Author: Noel Grandin AuthorDate: Wed Oct 31 13:55:35 2018 +0200 Commit: Aron Budea CommitDate: Tue Nov 27 05:17:17 2018 +0100 tdf#120920 Assertion failure when switching slide layouts with text entered no need to call StartListening here, has already been done inside SdPage::CreatePresObj Change-Id: I590e51f7afeb336d562d3ad9ccc123f542897aae Reviewed-on: https://gerrit.libreoffice.org/62689 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit ef9bfdfe4f4ef75ca65547face0db09af7352314) Reviewed-on: https://gerrit.libreoffice.org/64082 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 9479976ac74e..f8808e789fa0 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2143,8 +2143,6 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P if (pSubtitleSheet) pOutlParaObj->ChangeStyleSheetName(SD_STYLE_FAMILY_MASTERPAGE, pSubtitleSheet->GetName(), pSheet->GetName()); } - -pNewObj->StartListening(*pSheet); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/uiconfig
sd/uiconfig/sdraw/ui/dlgsnap.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 0b47b3bf77c5c2b9f341753bdb797369269b3f71 Author: Xisco Fauli AuthorDate: Mon Nov 26 17:29:30 2018 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Nov 27 04:15:42 2018 +0100 tdf#120879 Remove has_default from help Change-Id: I5b776f89b7a49307e7a3ed4382f28ac58fc738ff Reviewed-on: https://gerrit.libreoffice.org/64073 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui index 37a0ab88c3a1..0bb64dc9e5eb 100644 --- a/sd/uiconfig/sdraw/ui/dlgsnap.ui +++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui @@ -96,7 +96,6 @@ True True True -True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/uiconfig
sd/uiconfig/sdraw/ui/dlgsnap.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 81a5ff9b2de61fd0d848427b3c9b34b4e3c84145 Author: Xisco Fauli AuthorDate: Mon Nov 26 17:29:30 2018 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Nov 27 04:15:33 2018 +0100 tdf#120879 Remove has_default from help Change-Id: I5b776f89b7a49307e7a3ed4382f28ac58fc738ff Reviewed-on: https://gerrit.libreoffice.org/64054 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 2bb070f95a05d52cba6fa36450d6317ab883d881) Reviewed-on: https://gerrit.libreoffice.org/64074 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui index 37a0ab88c3a1..0bb64dc9e5eb 100644 --- a/sd/uiconfig/sdraw/ui/dlgsnap.ui +++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui @@ -96,7 +96,6 @@ True True True -True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/document/xlinktargetsupplier.hxx | 34 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv |1
sc/qa/extras/scmodelobj.cxx|7 ++
test/Library_subsequenttest.mk |1
test/source/document/xlinktargetsupplier.cxx | 30 +++
5 files changed, 71 insertions(+), 2 deletions(-)
New commits:
commit 851c80fdf6fb3509b53c6301dd0721be58c18719
Author: Rahul Gurung
AuthorDate: Sat Nov 24 21:59:46 2018 +0530
Commit: Markus Mohrhard
CommitDate: Tue Nov 27 04:12:53 2018 +0100
tdf#45904 Move _XLinkTargetSupplier Java Tests to C++
Change-Id: Idd62a6458d7aa0d1d8a479f5ebf78637e0360548
Reviewed-on: https://gerrit.libreoffice.org/63950
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/include/test/document/xlinktargetsupplier.hxx
b/include/test/document/xlinktargetsupplier.hxx
new file mode 100644
index ..de273f89b80f
--- /dev/null
+++ b/include/test/document/xlinktargetsupplier.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+* 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/.
+*/
+
+#ifndef INCLUDED_TEST_DOCUMENT_XLINKTARGETSUPPLIER_HXX
+#define INCLUDED_TEST_DOCUMENT_XLINKTARGETSUPPLIER_HXX
+
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XLinkTargetSupplier
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetLinks();
+
+protected:
+~XLinkTargetSupplier() {}
+};
+}
+
+#endif // INCLUDED_TEST_DOCUMENT_XLINKTARGETSUPPLIER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
index 6c6fe08e39c7..dcdad19ec09d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
@@ -1,7 +1,6 @@
"ScModelObj";"com::sun::star::drawing::XDrawPagesSupplier";"getDrawPages()"
"ScModelObj";"com::sun::star::document::XEventBroadcaster#optional";"addEventListener()"
"ScModelObj";"com::sun::star::document::XEventBroadcaster#optional";"removeEventListener()"
-"ScModelObj";"com::sun::star::document::XLinkTargetSupplier";"getLinks()"
"ScModelObj";"com::sun::star::style::XStyleFamiliesSupplier";"getStyleFamilies()"
"ScModelObj";"com::sun::star::document::XActionLockable";"isActionLocked()"
"ScModelObj";"com::sun::star::document::XActionLockable";"addActionLock()"
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 78bc8f7b34d5..6a7e0833054f 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -35,7 +36,8 @@ class ScModelObj : public UnoApiTest,
public apitest::XCalculatable,
public apitest::XConsolidatable,
public apitest::XDocumentAuditing,
- public apitest::XGoalSeek
+ public apitest::XGoalSeek,
+ public apitest::XLinkTargetSupplier
{
public:
virtual void setUp() override;
@@ -67,6 +69,9 @@ public:
// XGoalSeek
CPPUNIT_TEST(testSeekGoal);
+// XLinkTargetSupplier
+CPPUNIT_TEST(testGetLinks);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index c8a125c38f51..b6ca7bfa4085 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -50,6 +50,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/container/xnamed \
test/source/container/xnamereplace \
test/source/drawing/captionshape \
+ test/source/document/xlinktargetsupplier \
test/source/sheet/cellarealink \
test/source/sheet/cellproperties \
test/source/sheet/databaseimportdescriptor \
diff --git a/test/source/document/xlinktargetsupplier.cxx
b/test/source/document/xlinktargetsupplier.cxx
new file mode 100644
index ..67ff19f723a2
--- /dev/null
+++ b/test/source/document/xlinktargetsupplier.cxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+* 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/.
+*/
+
+#include
+
+#include
+
+#include
+
+#include
+
+using namespace com::sun::star;
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2import.cxx| 15 +++
chart2/qa/extras/data/xlsx/external_str_ref.xlsx |binary
2 files changed, 15 insertions(+)
New commits:
commit 3f2b8db38c8823d9980d43dd6eec9d3150cc5405
Author: Markus Mohrhard
AuthorDate: Mon Nov 26 23:25:57 2018 +0100
Commit: Markus Mohrhard
CommitDate: Tue Nov 27 04:10:13 2018 +0100
add test for tdf#108027
Change-Id: I1048d86bf11b4fdd4a5c90f6e98276893b8ffbf4
Reviewed-on: https://gerrit.libreoffice.org/64078
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index e76090acd83d..d0a5c344a1e6 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -117,6 +117,7 @@ public:
void testTdf114179();
void testDeletedDataLabel();
void testDataPointInheritedColorDOCX();
+void testExternalStrRefsXLSX();
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
@@ -188,6 +189,7 @@ public:
CPPUNIT_TEST(testTdf114179);
CPPUNIT_TEST(testDeletedDataLabel);
CPPUNIT_TEST(testDataPointInheritedColorDOCX);
+CPPUNIT_TEST(testExternalStrRefsXLSX);
CPPUNIT_TEST_SUITE_END();
@@ -1685,6 +1687,19 @@ void Chart2ImportTest::testDataPointInheritedColorDOCX()
CPPUNIT_ASSERT_EQUAL(sal_Int32(16776960), nColor);
}
+void Chart2ImportTest::testExternalStrRefsXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "external_str_ref.xlsx");
+uno::Reference< chart2::XChartDocument > xChartDoc( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW );
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
+chart2::ScaleData aScaleData = xAxis->getScaleData();
+css::uno::Sequence aValues =
aScaleData.Categories->getValues()->getData();
+CPPUNIT_ASSERT_EQUAL(OUString("test1"), aValues[0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("test2"), aValues[1].get());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/external_str_ref.xlsx
b/chart2/qa/extras/data/xlsx/external_str_ref.xlsx
new file mode 100644
index ..f2dde80e1fb5
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/external_str_ref.xlsx
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/thb/libo-6-1+backports'
New branch 'private/thb/libo-6-1+backports' available with the following commits: commit c0b5e3baf696f9b3c4a28d6771294154f1c5172f Author: Armin Le Grand Date: Thu Nov 8 15:36:37 2018 +0100 tdf#120252 use the already transformed PolyPolygon Change-Id: I38abc73116720b99364c3de9fa4378c730385dc2 Reviewed-on: https://gerrit.libreoffice.org/63104 Reviewed-by: Xisco Faulí Tested-by: Xisco Faulí Reviewed-by: Armin Le Grand Conflicts: vcl/quartz/salgdicommon.cxx commit 0fc65058b55f084dd1f28e5e011175b8416c9f55 Author: Armin Le Grand Date: Wed Oct 3 15:55:29 2018 +0200 Support estimateUsageInBytes for SystemDependentData Change-Id: I6074035ed8f90e452915e9ecffdbe9363375e126 Reviewed-on: https://gerrit.libreoffice.org/61306 Tested-by: Jenkins Reviewed-by: Armin Le Grand Conflicts: vcl/win/gdi/gdiimpl.cxx vcl/win/gdi/salbmp.cxx commit 81b0cfeb0a045af68be375cdaaee142075fcd6c0 Author: Armin Le Grand Date: Fri Sep 21 16:42:01 2018 +0200 Support buffering SystemDependent GraphicData Started to make the buffering more flexible by adding virtual methods virtual sal_uInt32 getHoldCyclesInSeconds() const; virtual sal_Int64 estimateUsageInBytes() const; to class SystemDependentData. This will allow to add more sensitive buffering/caching. Also fine-tuned Linux-derived classes actively used for buffering to be more sensitive when and where to reuse the buffered data Change-Id: Ifc69c318ade0209aff071d76001869d9f4eeb10d Reviewed-on: https://gerrit.libreoffice.org/60881 Tested-by: Jenkins Reviewed-by: Armin Le Grand Conflicts: vcl/win/gdi/gdiimpl.cxx commit 41a281c199306ac5ea104f478957b7bddadbd18c Author: Armin Le Grand Date: Sat Sep 15 13:48:12 2018 +0200 Support buffering SystemDependent GraphicData (III) This change is for speedup of fat line drawing when using X11. This is a long-term problem which never really progressed, but is avoided using Cairo in the future. Still - if used, speedup using current state and buffering possibilities. Two speedup steps will be used: (1) The tesselation is no longer done using trapezoids. That works (but was done wrong leaving artifacts) but is not fast and done every time. It is even not done with FatLines and more than 1000 points. New version will use triangulation. Dspite using the existing triangulator (that works but is slow) extend the FatLine geometry creator to directly create triangles. This is also necessary since for buffering that data a transformation-invariant version is needed (in device coordinates the data changes all the time when scrolling). Trapezoids are by definition *not* transformation-invariant (e.g. rotation) (2) Buffer that triangulation - with the needed care and watch. It is e.g. necessary to react on 'hairlines' since these change their logical LineWidth view-dependent (zoom). In those cases, the buffered data *has* to be removed due to the base for buffering is the created FatLine geometry based on one stable logical LineWidth Also took the time to adapt B2DPolygonTriangulator to use an own data type (B2DTriangle) and a vector of these for better understandability and security. Adapted all usages as needed. Change-Id: Iedb2932b094a8786fd9c32d0d0ab1ca603a1a7b2 Reviewed-on: https://gerrit.libreoffice.org/60818 Tested-by: Jenkins Reviewed-by: Armin Le Grand commit dea95717cd6e919c848dd557479e2f72b2760e93 Author: Armin Le Grand Date: Wed Sep 19 15:38:50 2018 +0200 tdf#119843 Use transformed polygon data when needed Change-Id: I33cd8da925b9bf3d5b50a1c6ac43babedbe31d0a Reviewed-on: https://gerrit.libreoffice.org/60769 Tested-by: Jenkins Reviewed-by: Mike Kaganski commit 75f705f69cfd7006d86ae792b446ef83007acb05 Author: Stephan Bergmann Date: Fri Nov 23 18:31:01 2018 +0100 loplugin:override Change-Id: Ia45b5f7c126c082d8f3835c3c3529a34a9e20975 commit b52de645f12f97b86a36b2e2b2f757e823515f47 Author: Aleksei Nikiforov Date: Thu Nov 22 12:55:06 2018 +0300 tdf#121417 Allow dynamic menu changes for Qt5 and KDE5 interfaces Separate HandleMenuActivateEvent function call from HandleMenuCommandEvent function call since first one might update some of menus. Also add call to HandleMenuDeActivateEvent function. Delete action with Qt5MenuItem to reflect the change in actual menu. Also update underlying qt-based menu from Qt5Menu::InsertItem function. And update Qt5Menu::SetItemImage to work with different types of descendants of SalBitmap. This code is shared between Qt5 and KDE5 plugins, but KDE5 plugin uses SvpSalBitmap instead of Qt5Bitmap. New image conversion process is borrowed from GTK plugin code. This a
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rat-excludes solenv/ant solenv/gbuild
rat-excludes |1 +
solenv/ant/aoo-ant.xml |2 +-
solenv/gbuild/Ant.mk |3 +--
solenv/gbuild/platform/freebsd.mk | 10 ++
solenv/gbuild/platform/linux.mk| 10 ++
solenv/gbuild/platform/macosx.mk | 10 ++
solenv/gbuild/platform/os2.mk |9 +
solenv/gbuild/platform/solaris.mk | 10 ++
solenv/gbuild/platform/windows.mk | 10 ++
solenv/gbuild/platform/winmingw.mk |9 +
10 files changed, 71 insertions(+), 3 deletions(-)
New commits:
commit 12a5af41357ade9fd8b966930ff36bf402eb0b2d
Author: Damjan Jovanovic
AuthorDate: Tue Nov 27 00:51:01 2018 +
Commit: Damjan Jovanovic
CommitDate: Tue Nov 27 00:51:01 2018 +
Fix the Ant dependency extraction for the case when
there are no dependencies.
Fix the format of Ant paths on Windows.
Patch by: me
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 2fd708f2eb18..45fcb7fe30a1 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -102,7 +102,7 @@
-
+
diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk
index 3fd2c32c4610..f45d70a86db2 100644
--- a/solenv/gbuild/Ant.mk
+++ b/solenv/gbuild/Ant.mk
@@ -66,8 +66,7 @@ $(eval $(call gb_Module_register_target,$(call
gb_Jar_get_outdir_target,$(1)),$(
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call
gb_Ant_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
-__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
-$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+$(call gb_Ant_add_dependencies,$(1),$(2))
endef
diff --git a/solenv/gbuild/platform/freebsd.mk
b/solenv/gbuild/platform/freebsd.mk
index 31c041274c58..e7f49f83ed6a 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -457,6 +457,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 86710beab6df..4e9f4936b400 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -433,6 +433,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e7ea6d6c383f..84d84198b971 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -471,6 +471,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 0c783b898eb4..8bd8faf1c5ca 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -550,6 +550,15 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -Ddependencies.outfile=`cygpath -m
$(WORKDIR)/Ant/$(1)/deps` -f `cygpath -m $(2)` dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(shell cygpath -u
$(dep)
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 60d6cf6f573a..d60eeb1da1f0 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -400,6 +400,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - drawinglayer/source
drawinglayer/source/tools/emfphelperdata.cxx | 74 +--
1 file changed, 58 insertions(+), 16 deletions(-)
New commits:
commit 39dbb20bb9a5f73487c5f3e0e685d7c61963a073
Author: Bartosz Kosiorek
AuthorDate: Sun Nov 4 02:39:09 2018 +0100
Commit: Bartosz Kosiorek
CommitDate: Tue Nov 27 01:59:09 2018 +0100
tdf#55058 tdf#106084 EMF+ Add support for Underline and Strikeout
Add support of Underline and Strikeout for DrawString and
DrawDriverString EMF+ records
Change-Id: I24c47e0d7524dabc13edd04c6b68aec69fa35e7b
Reviewed-on: https://gerrit.libreoffice.org/62827
Tested-by: Jenkins
Reviewed-by: Patrick Jaap
Reviewed-by: Bartosz Kosiorek
(cherry picked from commit 8d4da5429548ba6ef4d3ee4dd6062c25a77ba78b)
Reviewed-on: https://gerrit.libreoffice.org/63576
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 0f827fceb81a..595fddd96af2 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1320,10 +1321,6 @@ namespace emfplushelper
mrPropertyHolders.Current().setFont(vcl::Font(font->family, Size(font->emSize,
font->emSize)));
// done reading
-// transform to TextSimplePortionPrimitive2D
-// TODO add more decorations: underline,
strikeout, etc
-// and create a
TextDecoratedPortionPrimitive2D
-
const OUString emptyString;
drawinglayer::attribute::FontAttribute
fontAttribute(
font->family,
// font family
@@ -1376,8 +1373,10 @@ namespace emfplushelper
if (color.GetTransparency() < 255)
{
std::vector emptyVector;
-
drawinglayer::primitive2d::Primitive2DReference aPrimitiveText(
-new
drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+drawinglayer::primitive2d::BasePrimitive2D*
pBaseText = nullptr;
+if (font->Underline() || font->Strikeout())
+{
+pBaseText = new
drawinglayer::primitive2d::TextDecoratedPortionPrimitive2D(
transformMatrix,
text,
0, // text always
starts at 0
@@ -1385,8 +1384,28 @@ namespace emfplushelper
emptyVector, // EMF-PLUS has
no DX-array
fontAttribute,
locale,
-color.getBColor()));
-
+color.getBColor(),
+COL_TRANSPARENT,
+color.getBColor(),
+color.getBColor(),
+
drawinglayer::primitive2d::TEXT_LINE_NONE,
+font->Underline() ?
drawinglayer::primitive2d::TEXT_LINE_SINGLE :
drawinglayer::primitive2d::TEXT_LINE_NONE,
+false,
+font->Strikeout() ?
drawinglayer::primitive2d::TEXT_STRIKEOUT_SINGLE :
drawinglayer::primitive2d::TEXT_STRIKEOUT_NONE);
+}
+else
+{
+pBaseText = new
drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+transformMatrix,
+text,
+0, // text always
starts at 0
+stringLength,
+emptyVector, // EMF-PLUS has
no DX-array
+fontAttribute,
+locale,
+color.getBColor());
+}
+
drawinglayer::primitive2d::Primitive2DReference aPrimitiveText(pBaseText);
if (color.GetTransparency() != 0)
{
aPrimitiveText
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/winproc.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit f21d2b48bd68424a96aa6cd5572e368208378291 Author: Miklos Vajna AuthorDate: Mon Nov 26 16:34:10 2018 +0100 Commit: Miklos Vajna CommitDate: Tue Nov 27 00:57:39 2018 +0100 tdf#121723 vcl: leave popup mode on focus loss of toplevel windows This way it can't happen that we open a menu or context menu, the user switches away (loosing focus) and a leftover floating window is still there. Handle this at the same place where we stop blinking the cursor on focus loss. Change-Id: I4321e8e3fa1d3f8976c0a1fa29c6a182972023bf Reviewed-on: https://gerrit.libreoffice.org/64053 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ea29c4a265d7..add5c3b45957 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1842,6 +1842,11 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow ) vcl::Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide(); + +// Make sure that no menu is visible when a toplevel window loses focus. +VclPtr pFirstFloat = pSVData->maWinData.mpFirstFloat; +if (pFirstFloat && !pWindow->GetParent()) +pFirstFloat->EndPopupMode(FloatWinPopupEndFlags::Cancel | FloatWinPopupEndFlags::CloseAll); } struct DelayedCloseEvent ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/config.h ios/config.h.in
configure.ac|1 + ios/config.h.in |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 8dee7815428e5895bb4876901fa58f9afe2231ed Author: Tor Lillqvist AuthorDate: Tue Nov 27 01:03:00 2018 +0200 Commit: Tor Lillqvist CommitDate: Tue Nov 27 01:05:04 2018 +0200 Use the right version name and git hash for the iOS app Propagate the information to the otherwise pre-canned iOS version of config.h, too. Change-Id: Ia459a20b529e2ea02b4e00894521a085a8806d57 diff --git a/configure.ac b/configure.ac index cc23e8c31..bc7353d42 100644 --- a/configure.ac +++ b/configure.ac @@ -602,6 +602,7 @@ AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap]) AC_CONFIG_FILES([Makefile gtk/Makefile + ios/config.h ios/Mobile/Info.plist test/Makefile loleaflet/Makefile diff --git a/ios/config.h b/ios/config.h.in similarity index 96% rename from ios/config.h rename to ios/config.h.in index 9f4751035..0911b21fc 100644 --- a/ios/config.h +++ b/ios/config.h.in @@ -70,10 +70,10 @@ #define LOOLWSD_CACHEDIR lo_ios_app_getCacheDir() /* LibreOffice Online WebSocket server version */ -#define LOOLWSD_VERSION "master" // ??? +#define LOOLWSD_VERSION "@LOOLWSD_VERSION@" /* LibreOffice Online git hash if present */ -#define LOOLWSD_VERSION_HASH "xx" // ??? +#define LOOLWSD_VERSION_HASH "@LOOLWSD_VERSION_HASH@" /* Path to LibreOffice installation */ #define LO_PATH "." ___ 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/core/Socket.js |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ec23c39687cc1dbc4856f4e83ae30c4ae714ed8b
Author: Tor Lillqvist
AuthorDate: Tue Nov 27 01:00:55 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Nov 27 01:01:02 2018 +0200
Don't create a link in the Help>About for LOOLWSD either in the iOS app
Change-Id: Ifa10bf0996258edf32108bde1b922fb6d097c0de
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d85af967f..1a8c05066 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -264,7 +264,9 @@ L.Socket = L.Class.extend({
var loolwsdVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = 'https://hub.libreoffice.org/git-online/' + h + '">' + h + '';
+ if (!window.ThisIsTheiOSApp) {
+ h = 'https://hub.libreoffice.org/git-online/' + h + '">' + h + '';
+ }
$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h +
')');
}
else {
___
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' - ios/CustomTarget_iOS_setup.mk
ios/CustomTarget_iOS_setup.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c99b38190249ae86d5d8f6023a074fa67024b02 Author: Tor Lillqvist AuthorDate: Tue Nov 27 00:41:04 2018 +0200 Commit: Tor Lillqvist CommitDate: Tue Nov 27 00:41:04 2018 +0200 Fill buildid in versionrc for iOS with the git HEAD hash Previously it tried to use a BUILDID Make variable that did not exist. Change-Id: Idaf8076fac0a39fc3805c4445de2b41b55044c1a diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 4de69c94e6ab..7c09103a6de4 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -80,7 +80,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i echo '[Version]'> $(IOSRES)/program/versionrc echo 'AllLanguages=en-US' >> $(IOSRES)/program/versionrc echo 'BuildVersion='>> $(IOSRES)/program/versionrc - echo "buildid=$(BUILDID)" >> $(IOSRES)/program/versionrc + echo "buildid=$(shell git -C $(SRCDIR) log -1 --format=%H)" >> $(IOSRES)/program/versionrc $(SRCDIR)/bin/lo-all-static-libs | sed -e 's/ /\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/README loleaflet/html loleaflet/Makefile.am loleaflet/src
ios/README |2 +-
loleaflet/Makefile.am|1 +
loleaflet/html/loleaflet.html.m4 |3 ++-
loleaflet/src/control/Toolbar.js |7 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit fe3832f3c6a91c1cc28ea522c44cf7fbd95c98f1
Author: Tor Lillqvist
AuthorDate: Tue Nov 27 00:35:57 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Nov 27 00:35:57 2018 +0200
Use --with-iosapp-name to set the name displayed in the Help>About dialog
Change-Id: I04b0e7c152ee69b038ec30549c203a54eecf4780
diff --git a/ios/README b/ios/README
index 525d8c9b4..dbd802339 100644
--- a/ios/README
+++ b/ios/README
@@ -24,7 +24,7 @@ make or open the Mobile project there yet.
3) Do a separate clone of the online repo on Linux, run autogen.sh,
and configure it with the --enable-iosapp option:
-./configure --enable-iosapp
+./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice"
Then run make. That will produce files in loleaflet/dist, nothing
else. Copy those to the corresponding folder in the online clone
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1e9d9ca4a..51ff68bc0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -224,6 +224,7 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
-DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
+ -DMOBILEAPPNAME="$(MOBILE_APP_NAME)" \
-DLOLEAFLET_CSS="$(subst
$(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS)
$(NODE_MODULES_JS) \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 5ac502fcf..a7625742c 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -160,7 +160,8 @@ ifelse(MOBILEAPP,[true],
dnl# For use in conditionals in JS: window.ThisIsAMobileApp,
window.ThisIsTheiOSApp,
dnl# and window.ThisIsTheGtkApp
ifelse(MOBILEAPP,[true],
- [window.ThisIsAMobileApp = true;],
+ [window.ThisIsAMobileApp = true;
+ window.MobileAppName='MOBILEAPPNAME'],
[window.ThisIsAMobileApp = false;]
)
ifelse(IOSAPP,[true],
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index debc090d6..bdbf2a0d5 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -245,7 +245,12 @@ L.Map.include({
// Move the div sitting in 'body' as vex-content and make it
visible
var content = $('#about-dialog').clone().css({display:
'block'});
// fill product-name and product-string
- var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
+ var productName;
+ if (window.ThisIsAMobileApp) {
+ productName = window.MobileAppName;
+ } else {
+ productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online';
+ }
content.find('#product-name').text(productName);
var productString = _('This version of %productName is powered
by');
content.find('#product-string').text(productString.replace('%productName',
productName));
___
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/core/Socket.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 191d7bfa35a15c47634bf6901d8b5351e4a9ca52
Author: Tor Lillqvist
AuthorDate: Tue Nov 27 00:13:16 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Nov 27 00:18:53 2018 +0200
Don't create a link to the git log in Help:About in the iOS app
We don't want to bother with creating a new view showing the link for
now.
Change-Id: I917a7646af4b472d3a2d32389ed5bc63a4157b7a
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 1d66ce854..d85af967f 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -279,7 +279,7 @@ L.Socket = L.Class.extend({
else if (textMsg.startsWith('lokitversion ')) {
var lokitVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
- if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
+ if (!window.ThisIsTheiOSApp &&
parseInt(h,16).toString(16) === h.toLowerCase().replace(/^0+/, '')) {
h = 'https://hub.libreoffice.org/git-core/' + h + '">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName +
' ' +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk
ios/CustomTarget_iOS_setup.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 27e517b2e592d8516844848a85399c6ed05f18aa Author: Tor Lillqvist AuthorDate: Tue Nov 27 00:07:02 2018 +0200 Commit: Tor Lillqvist CommitDate: Tue Nov 27 00:09:26 2018 +0200 Fill buildid in versionrc for iOS with the git HEAD hash Previously it tried to use a BUILDID Make variable that did not exist. Change-Id: Ie31eb3928c69dc52fcb17a9a5593cbe166d95307 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 642c6d969c77..539f3856ad5e 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -100,7 +100,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ (echo '[Version]' \ && echo 'AllLanguages=en-US' \ && echo 'BuildVersion=' \ - && echo "buildid=$(BUILDID)" \ + && echo "buildid=$(shell git -C $(SRCDIR) log -1 --format=%H)" \ ) > $(IOSRES)/program/versionrc $(SRCDIR)/bin/lo-all-static-libs | sed -e 's/ /\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source
vcl/source/font/fontcharmap.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ab4987667d315f371bd9cd44c2fa412477a7c617 Author: Xisco Fauli AuthorDate: Mon Nov 26 13:16:08 2018 +0100 Commit: Xisco Faulí CommitDate: Mon Nov 26 23:03:46 2018 +0100 tdf#121647: fix regression from 85b3c799ede62a3d7ad0493fc80b629214956601 the pCP = pCodePairs statement was left behind in - std::vector::const_iterator itInt = aSupportedRanges.begin(); - for( pCP = pCodePairs; itInt != aSupportedRanges.end(); ++itInt ) - *(pCP++) = *itInt; + for (auto const& supportedRange : aSupportedRanges) + *(pCP++) = supportedRange; Change-Id: Icedf7a4dae224f6b328f924691ec4c6767495389 Reviewed-on: https://gerrit.libreoffice.org/64048 Reviewed-by: Julien Nabet Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 153d5b62a918..ade991626dd9 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -357,6 +357,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) if( nRangeCount <= 0 ) return false; pCodePairs = new sal_UCS4[ nRangeCount * 2 ]; +pCP = pCodePairs; for (auto const& supportedRange : aSupportedRanges) *(pCP++) = supportedRange; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source
vcl/source/font/fontcharmap.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit c9adae998cb1132716874a98972a3d07d9dabd32 Author: Xisco Fauli AuthorDate: Mon Nov 26 13:16:08 2018 +0100 Commit: Xisco Faulí CommitDate: Mon Nov 26 23:03:58 2018 +0100 tdf#121647: fix regression from 85b3c799ede62a3d7ad0493fc80b629214956601 the pCP = pCodePairs statement was left behind in - std::vector::const_iterator itInt = aSupportedRanges.begin(); - for( pCP = pCodePairs; itInt != aSupportedRanges.end(); ++itInt ) - *(pCP++) = *itInt; + for (auto const& supportedRange : aSupportedRanges) + *(pCP++) = supportedRange; Change-Id: Icedf7a4dae224f6b328f924691ec4c6767495389 Reviewed-on: https://gerrit.libreoffice.org/64049 Reviewed-by: Julien Nabet Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index bafa613b764d..4064dd1e86e3 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -356,6 +356,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) if( nRangeCount <= 0 ) return false; pCodePairs = new sal_UCS4[ nRangeCount * 2 ]; +pCP = pCodePairs; for (auto const& supportedRange : aSupportedRanges) *(pCP++) = supportedRange; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/fontcharmap.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8efb302a446bb319a0793c45076ca6fca288949b Author: Xisco Fauli AuthorDate: Mon Nov 26 13:16:08 2018 +0100 Commit: Xisco Faulí CommitDate: Mon Nov 26 23:01:04 2018 +0100 tdf#121647: fix regression from 85b3c799ede62a3d7ad0493fc80b629214956601 the pCP = pCodePairs statement was left behind in - std::vector::const_iterator itInt = aSupportedRanges.begin(); - for( pCP = pCodePairs; itInt != aSupportedRanges.end(); ++itInt ) - *(pCP++) = *itInt; + for (auto const& supportedRange : aSupportedRanges) + *(pCP++) = supportedRange; Change-Id: Icedf7a4dae224f6b328f924691ec4c6767495389 Reviewed-on: https://gerrit.libreoffice.org/64038 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 153d5b62a918..ade991626dd9 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -357,6 +357,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) if( nRangeCount <= 0 ) return false; pCodePairs = new sal_UCS4[ nRangeCount * 2 ]; +pCP = pCodePairs; for (auto const& supportedRange : aSupportedRanges) *(pCP++) = supportedRange; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/dlgsnap.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 2bb070f95a05d52cba6fa36450d6317ab883d881 Author: Xisco Fauli AuthorDate: Mon Nov 26 17:29:30 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Nov 26 21:48:41 2018 +0100 tdf#120879 Remove has_default from help Change-Id: I5b776f89b7a49307e7a3ed4382f28ac58fc738ff Reviewed-on: https://gerrit.libreoffice.org/64054 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui index 37a0ab88c3a1..0bb64dc9e5eb 100644 --- a/sd/uiconfig/sdraw/ui/dlgsnap.ui +++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui @@ -96,7 +96,6 @@ True True True -True True True ___ 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/ui/fmtui/tmpdlg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 73616a273d9aa0e0bb3c7a7babc87479680a78b5
Author: Jim Raykowski
AuthorDate: Sat Nov 24 16:47:56 2018 -0900
Commit: Katarina Behrens
CommitDate: Mon Nov 26 21:29:58 2018 +0100
tdf#105225 Use derived background tab page in Paragraph Style dialog
Missed this one in Change-Id: I47f9ae10a0fd967729ff6e83c1a312aa49e1d13c
Change-Id: Ibb825a922e7d7fcc31456386935b3a847642ebf0
Reviewed-on: https://gerrit.libreoffice.org/63966
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index a35b833e251f..262115338bf9 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -119,7 +119,7 @@
SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent,
AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc(
RID_SVXPAGE_CHAR_TWOLINES ) );
-AddTabPage("highlighting", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND
));
+AddTabPage("highlighting", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
AddTabPage("tabs",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Muhammet Kara license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7d58fd88fe24ca8f99a387f6a63c405c190432b8
Author: Andrea Gelmini
AuthorDate: Mon Nov 26 18:03:03 2018 +0100
Commit: Julien Nabet
CommitDate: Mon Nov 26 20:50:37 2018 +0100
Fix typo
Change-Id: I339e1d956ed6f3017453237f0b8ad540d7d4ad20
Reviewed-on: https://gerrit.libreoffice.org/64068
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 9bcab4e62ad5..f80f656cf478 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2408,7 +2408,7 @@ Reference< drawing::XShape >
VSeriesPlotter::createLegendSymbolForPoint(
if( rSeries.isAttributedDataPoint( nPointIndex ) )
xPointSet.set( rSeries.getPropertiesOfPoint( nPointIndex ));
-// if a data point has no own color use a color fom the diagram's color
scheme
+// if a data point has no own color use a color from the diagram's color
scheme
if( ! rSeries.hasPointOwnColor( nPointIndex ))
{
Reference< util::XCloneable > xCloneable( xPointSet,uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source
compilerplugins/clang/unusedenumconstants.readonly.results |4
include/vcl/outdev.hxx |4 +---
vcl/source/gdi/sallayout.cxx |2 --
3 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 0111686c214fa269f8e3f001f2b776a8769164bd
Author: Noel Grandin
AuthorDate: Mon Nov 26 09:14:03 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 19:13:38 2018 +0100
remove unused SalLayoutFlags enum values
Change-Id: I5d1559c2cb201ec69fc6353aaf491fbb5c0534dd
Reviewed-on: https://gerrit.libreoffice.org/64047
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 922644280873..5406774ba33c 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -916,10 +916,6 @@ include/vcl/menu.hxx:76
enum PopupMenuFlags ExecuteLeft
include/vcl/menu.hxx:84
enum PopupMenuFlags NoHorzPlacement
-include/vcl/outdev.hxx:142
-enum SalLayoutFlags EnableLigatures
-include/vcl/outdev.hxx:143
-enum SalLayoutFlags SubstituteDigits
include/vcl/outdev.hxx:175
enum DrawTextFlags NewsEllipsis
include/vcl/outdev.hxx:190
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 47d8872a4960..81c47e63c7c6 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -139,15 +139,13 @@ enum class SalLayoutFlags
DisableKerning = 0x0010,
KerningAsian= 0x0020,
Vertical= 0x0040,
-EnableLigatures = 0x0200,
-SubstituteDigits= 0x0400,
KashidaJustification= 0x0800,
ForFallback = 0x2000,
GlyphItemsOnly = 0x4000,
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
typedef std::vector< tools::Rectangle > MetricVector;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 4cbca56d9b70..0fea93f90ee3 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -72,8 +72,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs
const &rArgs)
TEST(DisableKerning);
TEST(KerningAsian);
TEST(Vertical);
-TEST(EnableLigatures);
-TEST(SubstituteDigits);
TEST(KashidaJustification);
TEST(ForFallback);
#undef TEST
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - comphelper/source compilerplugins/clang drawinglayer/source include/vcl vcl/source
comphelper/source/misc/graphicmimetype.cxx |2
compilerplugins/clang/unusedenumconstants.readonly.results | 14 --
drawinglayer/source/processor2d/vclprocessor2d.cxx | 22 -
include/vcl/outdev.hxx | 29 -
include/vcl/salctype.hxx |3 -
vcl/source/filter/graphicfilter.cxx|1
vcl/source/outdev/bitmap.cxx | 28 ++--
vcl/source/outdev/gradient.cxx | 29 +
vcl/source/outdev/hatch.cxx|9
vcl/source/outdev/outdevstate.cxx | 27 +---
vcl/source/outdev/text.cxx | 18
vcl/source/outdev/textline.cxx | 20
vcl/source/outdev/transparent.cxx |9
13 files changed, 33 insertions(+), 178 deletions(-)
New commits:
commit b8b79633021488a7f3400026357a66c4cdadb4b6
Author: Noel Grandin
AuthorDate: Fri Nov 23 16:45:55 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 19:13:20 2018 +0100
remove unused DrawModeFlags enum values
Change-Id: I86775a5b7609f5e85c8fcc18a0be7e0ee3c8f84c
Reviewed-on: https://gerrit.libreoffice.org/64046
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 96d5d1a5c68c..922644280873 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -926,18 +926,6 @@ include/vcl/outdev.hxx:190
enum DrawImageFlags Highlight
include/vcl/outdev.hxx:191
enum DrawImageFlags Deactive
-include/vcl/outdev.hxx:228
-enum DrawModeFlags NoBitmap
-include/vcl/outdev.hxx:229
-enum DrawModeFlags NoGradient
-include/vcl/outdev.hxx:230
-enum DrawModeFlags GhostedLine
-include/vcl/outdev.hxx:232
-enum DrawModeFlags GhostedText
-include/vcl/outdev.hxx:233
-enum DrawModeFlags GhostedBitmap
-include/vcl/outdev.hxx:234
-enum DrawModeFlags GhostedGradient
include/vcl/pdfwriter.hxx:110
enum vcl::PDFWriter::PDFVersion PDF_1_3
include/vcl/pdfwriter.hxx:110
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index de94ac307120..e5b77c1c86d3 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1308,7 +1308,7 @@ namespace drawinglayer
{
const DrawModeFlags
nOriginalDrawMode(mpOutputDevice->GetDrawMode());
-if(nOriginalDrawMode &
(DrawModeFlags::BlackLine|DrawModeFlags::GrayLine|DrawModeFlags::GhostedLine|DrawModeFlags::WhiteLine|DrawModeFlags::SettingsLine))
+if(nOriginalDrawMode &
(DrawModeFlags::BlackLine|DrawModeFlags::GrayLine|DrawModeFlags::WhiteLine|DrawModeFlags::SettingsLine))
{
DrawModeFlags nAdaptedDrawMode(nOriginalDrawMode);
@@ -1330,15 +1330,6 @@ namespace drawinglayer
nAdaptedDrawMode &= ~DrawModeFlags::GrayFill;
}
-if(nOriginalDrawMode & DrawModeFlags::GhostedLine)
-{
-nAdaptedDrawMode |= DrawModeFlags::GhostedFill;
-}
-else
-{
-nAdaptedDrawMode &= ~DrawModeFlags::GhostedFill;
-}
-
if(nOriginalDrawMode & DrawModeFlags::WhiteLine)
{
nAdaptedDrawMode |= DrawModeFlags::WhiteFill;
@@ -1364,7 +1355,7 @@ namespace drawinglayer
void VclProcessor2D::adaptTextToFillDrawMode() const
{
const DrawModeFlags
nOriginalDrawMode(mpOutputDevice->GetDrawMode());
-if(nOriginalDrawMode &
(DrawModeFlags::BlackText|DrawModeFlags::GrayText|DrawModeFlags::GhostedText|DrawModeFlags::WhiteText|DrawModeFlags::SettingsText))
+if(nOriginalDrawMode &
(DrawModeFlags::BlackText|DrawModeFlags::GrayText|DrawModeFlags::WhiteText|DrawModeFlags::SettingsText))
{
DrawModeFlags nAdaptedDrawMode(nOriginalDrawMode);
@@ -1386,15 +1377,6 @@ namespace drawinglayer
nAdaptedDrawMode &= ~DrawModeFlags::GrayFill;
}
-if(nOriginalDrawMode & DrawModeFlags::GhostedText)
-{
-nAdaptedDrawMode |= DrawModeFlags::GhostedFill;
-}
-else
-{
-nAdaptedDrawMode &= ~DrawModeFlags::GhostedFill;
-}
-
if(nOriginalDrawMode & DrawModeFlags::WhiteText)
{
nAdaptedDrawMode |= DrawModeFlags::WhiteFill;
diff --git a/includ
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/vcl svl/source vcl/source
compilerplugins/clang/unusedenumconstants.readonly.results |2
include/vcl/splitwin.hxx |3
svl/source/items/IndexedStyleSheets.cxx| 30 ++-
vcl/source/window/splitwin.cxx | 99 -
4 files changed, 51 insertions(+), 83 deletions(-)
New commits:
commit 37b3502b5c781007e701e78c3b361eba5ce8cfe0
Author: Noel Grandin
AuthorDate: Fri Nov 23 15:18:50 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 19:11:57 2018 +0100
remove unused enum value SplitWindowItemFlags::Invisible
Change-Id: I4d63601ca3658b4ffd9eaf1c13d4c17503640aa0
Reviewed-on: https://gerrit.libreoffice.org/64041
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 2994af2a95fe..0c0bad002db6 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1070,8 +1070,6 @@ include/vcl/ptrstyle.hxx:92
enum PointerStyle Chart
include/vcl/salctype.hxx:41
enum ConvertDataFormat PDF
-include/vcl/splitwin.hxx:37
-enum SplitWindowItemFlags Invisible
include/vcl/vclenum.hxx:37
enum MenuItemBits POPUPSELECT
include/vcl/vclenum.hxx:143
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 0c8edcfe298e..7f015ce96cf0 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -34,11 +34,10 @@ enum class SplitWindowItemFlags
RelativeSize = 0x0002,
PercentSize= 0x0004,
ColSet = 0x0008,
-Invisible = 0x0010,
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
#define SPLITWINDOW_APPEND (sal_uInt16(0x))
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 18085cade791..ed5b9621990a 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -401,7 +401,6 @@ static void ImplCalcSet( ImplSplitSet* pSet,
sal_uInt16 nMins;
sal_uInt16 nCalcItems;
size_t nItems = pSet->mvItems.size();
-sal_uInt16 nVisItems;
sal_uInt16 nAbsItems;
longnCalcSize;
longnPos;
@@ -409,20 +408,12 @@ static void ImplCalcSet( ImplSplitSet* pSet,
std::vector< ImplSplitItem >& rItems = pSet->mvItems;
boolbEmpty;
-// get number of visible items
-nVisItems = 0;
-for ( auto& rItem : rItems )
-{
-if ( !(rItem.mnBits & SplitWindowItemFlags::Invisible) )
-nVisItems++;
-}
-
// calculate sizes
if ( bRows )
nCalcSize = nSetHeight;
else
nCalcSize = nSetWidth;
-nCalcSize -= (nVisItems-1)*pSet->mnSplitSize;
+nCalcSize -= (rItems.size()-1)*pSet->mnSplitSize;
if ( pSet->mbCalcPix || (pSet->mnLastSize != nCalcSize) )
{
long nPercentFactor = 10;
@@ -433,15 +424,12 @@ static void ImplCalcSet( ImplSplitSet* pSet,
long nCurSize = 0;
for ( auto& rItem : rItems )
{
-if ( !(rItem.mnBits & SplitWindowItemFlags::Invisible) )
-{
-if ( rItem.mnBits & SplitWindowItemFlags::RelativeSize )
-nRelCount += rItem.mnSize;
-else if ( rItem.mnBits & SplitWindowItemFlags::PercentSize )
-nPercent += rItem.mnSize;
-else
-nAbsSize += rItem.mnSize;
-}
+if ( rItem.mnBits & SplitWindowItemFlags::RelativeSize )
+nRelCount += rItem.mnSize;
+else if ( rItem.mnBits & SplitWindowItemFlags::PercentSize )
+nPercent += rItem.mnSize;
+else
+nAbsSize += rItem.mnSize;
}
// map relative values to percentages (percentage here one tenth of a
procent)
nPercent *= nPercentFactor;
@@ -466,9 +454,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
long nSizeDelta = nCalcSize-nAbsSize;
for ( auto& rItem : rItems )
{
-if ( rItem.mnBits & SplitWindowItemFlags::Invisible )
-rItem.mnPixSize = 0;
-else if ( rItem.mnBits & SplitWindowItemFlags::RelativeSize )
+if ( rItem.mnBits & SplitWindowItemFlags::RelativeSize )
{
if ( nSizeDelta <= 0 )
rItem.mnPixSize = 0;
@@ -500,13 +486,10 @@ static void ImplCalcSet( ImplSplitSet* pSet,
// first resize absolute items relative
for ( auto& rItem : rItems )
{
-if ( !(rItem.mnBits & SplitWindowItemFlags::Invisible) )
+if ( !(rItem.mnBits & (SplitWindowItemFlags::RelativeSize |
SplitWindowItemFlags::PercentSize)) )
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx | 47 --
1 file changed, 19 insertions(+), 28 deletions(-)
New commits:
commit b62c43d1200e524369d9c7c2bd1dad3044efd672
Author: Michael Meeks
AuthorDate: Fri Nov 23 02:14:00 2018 +
Commit: Michael Meeks
CommitDate: Mon Nov 26 18:54:08 2018 +0100
Anti-alias toolbar button drop-downs.
Change-Id: Id4eed12f3d4a32b71d00b99e6e82ca7cefb3f8ec
Reviewed-on: https://gerrit.libreoffice.org/63961
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index a5820aff5013..649e4970708d 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2491,36 +2491,27 @@ static void ImplDrawDropdownArrow(vcl::RenderContext&
rRenderContext, const tool
float fScaleFactor = rRenderContext.GetDPIScaleFactor();
-if( !bRotate )
-{
-long width = 5 * fScaleFactor;
-long height = 3 * fScaleFactor;
+tools::Polygon aPoly(4);
-long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
-long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;
-while( width >= 1)
-{
-rRenderContext.DrawRect( tools::Rectangle( x, y, x+width-1, y ) );
-y++;
-x++;
-width -= 2;
-}
-}
-else
-{
-long width = 3 * fScaleFactor;
-long height = 5 * fScaleFactor;
+long width = 7 * fScaleFactor;
+long height = 4 * fScaleFactor;
-long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
-long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;
-while( height >= 1)
-{
-rRenderContext.DrawRect( tools::Rectangle( x, y, x, y+height-1 ) );
-y++;
-x++;
-height -= 2;
-}
-}
+long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
+long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;
+
+long halfwidth = (width+1)>>1;
+aPoly.SetPoint(Point(x, y), 0);
+aPoly.SetPoint(Point(x + halfwidth, y + height), 1);
+aPoly.SetPoint(Point(x + halfwidth*2, y), 2);
+aPoly.SetPoint(Point(x, y), 3);
+
+if (bRotate) // TESTME: harder ...
+aPoly.Rotate(Point(x,y+height/2),2700);
+
+auto aaflags = rRenderContext.GetAntialiasing();
+rRenderContext.SetAntialiasing(AntialiasingFlags::EnableB2dDraw);
+rRenderContext.DrawPolygon( aPoly );
+rRenderContext.SetAntialiasing(aaflags);
if( bFillColor )
rRenderContext.SetFillColor(aOldFillColor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - ios/Mobile
ios/Mobile/Info.plist.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0673178b8f9c6fee66e010271e202871abbefb2 Author: Tor Lillqvist AuthorDate: Mon Nov 26 19:47:32 2018 +0200 Commit: Tor Lillqvist CommitDate: Mon Nov 26 19:47:32 2018 +0200 Bump CFBundleVersion Change-Id: Ie2e9349c99bd9f6f3e87191469c6ee39f3fb92ca diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in index f37269b27..430213fd8 100644 --- a/ios/Mobile/Info.plist.in +++ b/ios/Mobile/Info.plist.in @@ -177,7 +177,7 @@ CFBundleShortVersionString 0.1 CFBundleVersion -8 +9 LSRequiresIPhoneOS UIFileSharingEnabled commit 24e09f4eddeef5df60b033964ebba253bc78ba4a Author: Tor Lillqvist AuthorDate: Mon Nov 26 19:07:33 2018 +0200 Commit: Tor Lillqvist CommitDate: Mon Nov 26 19:07:33 2018 +0200 Bump CFBundleVersion Change-Id: I0ca058c14a78074eafaf585373694f36164146e0 diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in index 497aa633a..f37269b27 100644 --- a/ios/Mobile/Info.plist.in +++ b/ios/Mobile/Info.plist.in @@ -177,7 +177,7 @@ CFBundleShortVersionString 0.1 CFBundleVersion -7 +8 LSRequiresIPhoneOS UIFileSharingEnabled ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/condformat/condformatdlgentry.cxx | 146 ++---
sc/uiconfig/scalc/ui/conditionalentry.ui | 44 +++
2 files changed, 131 insertions(+), 59 deletions(-)
New commits:
commit d608b0af3f855e01535f40f3473dbee03d581863
Author: Roman Kuznetsov
AuthorDate: Sat Nov 10 14:06:20 2018 +0100
Commit: Mike Kaganski
CommitDate: Mon Nov 26 18:38:14 2018 +0100
tdf#117720 Delete Max from list Min and delete Min from list Max in CF
dialog
This changes how the list items are identified in the code, making
use of the support for item ids in comboboxes introduced in commit
83cefb5ceb4428d61a5b9fae80d1e673131e9bfe.
Change-Id: I69390c8f9d32b77454e2935cf28b38ea44be8ffd
Reviewed-on: https://gerrit.libreoffice.org/63238
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2483ebe29d7f..f0683d6b302f 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -654,12 +654,77 @@ OUString convertNumberToString(double nVal, const
ScDocument* pDoc)
return aText;
}
+const struct
+{
+ScColorScaleEntryType eType;
+const char* sId;
+} TypeIdMap[] = {
+{ COLORSCALE_AUTO, "auto" },
+{ COLORSCALE_MIN,"min" },
+{ COLORSCALE_MAX,"max" },
+{ COLORSCALE_PERCENTILE, "percentil" },
+{ COLORSCALE_VALUE, "value" },
+{ COLORSCALE_PERCENT,"percent" },
+{ COLORSCALE_FORMULA,"formula" },
+};
+
+ScColorScaleEntryType getTypeForId(const OUString& sId)
+{
+for (auto& r : TypeIdMap)
+{
+if (sId.equalsAscii(r.sId))
+return r.eType;
+}
+assert(false); // The id is not in TypeIdMap - something not in sync?
+return COLORSCALE_AUTO; // invalid id - use default
+}
+
+// Item ids are imported from .ui into OUString* and are referenced by entry
data.
+// See commit 83cefb5ceb4428d61a5b9fae80d1e673131e9bfe
+
+ScColorScaleEntryType getSelectedType(const ListBox& rListBox)
+{
+const OUString* sId =
static_cast(rListBox.GetSelectedEntryData());
+assert(sId
+ && "The color scale type entries must have item ids in "
+ "sc/uiconfig/scalc/ui/conditionalentry.ui");
+return getTypeForId(*sId);
+}
+
+sal_Int32 getEntryPos(const ListBox& rListBox, ScColorScaleEntryType eType)
+{
+const sal_Int32 nSize = rListBox.GetEntryCount();
+for (sal_Int32 i = 0; i < nSize; ++i)
+{
+const OUString* sId = static_cast(rListBox.GetEntryData(i));
+assert(sId
+ && "The color scale type entries must have item ids in "
+ "sc/uiconfig/scalc/ui/conditionalentry.ui");
+if (getTypeForId(*sId) == eType)
+return i;
+}
+return -1;
+}
+
+void selectType(ListBox& rListBox, ScColorScaleEntryType eType)
+{
+const sal_Int32 nPos = getEntryPos(rListBox, eType);
+if (nPos >= 0)
+rListBox.SelectEntryPos(nPos);
+}
+
+void removeType(ListBox& rListBox, ScColorScaleEntryType eType)
+{
+const sal_Int32 nPos = getEntryPos(rListBox, eType);
+if (nPos >= 0)
+rListBox.RemoveEntry(nPos);
+}
+
void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox&
rLbType, Edit& rEdit, SvxColorListBox& rLbCol, const ScDocument* pDoc )
{
// entry Automatic is not available for color scales
-sal_Int32 nIndex = static_cast(rEntry.GetType());
-assert(nIndex > 0);
-rLbType.SelectEntryPos(nIndex - 1);
+assert(rEntry.GetType() > COLORSCALE_AUTO);
+selectType(rLbType, rEntry.GetType());
switch(rEntry.GetType())
{
case COLORSCALE_MIN:
@@ -683,16 +748,13 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry&
rEntry, ListBox& rLbType,
rLbCol.SelectEntry(rEntry.GetColor());
}
-void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType,
const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos, bool bDataBar )
+void SetColorScaleEntry(ScColorScaleEntry* pEntry, const ListBox& rType, const
Edit& rValue,
+ScDocument* pDoc, const ScAddress& rPos)
{
+ScColorScaleEntryType eType = getSelectedType(rType);
-// color scale does not have the automatic entry
-sal_Int32 nPos = rType.GetSelectedEntryPos();
-if(!bDataBar)
-++nPos;
-
-pEntry->SetType(static_cast(nPos));
-switch(nPos)
+pEntry->SetType(eType);
+switch (eType)
{
case COLORSCALE_AUTO:
case COLORSCALE_MIN:
@@ -721,7 +783,7 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox&
rType, const SvxColorLi
{
ScColorScaleEntry* pEntry = new ScColorScaleEntry();
-SetColorScaleEntry( pEntry, rType, rValue, pDoc, rPos, false );
+SetColorScaleEntry(pEntry, rType, rValue, pDoc, rPos);
Color aColor = rColor.GetSelectEntryColor();
pEntry->SetColor(aColor);
return pEntry;
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/Library_chartcontroller.mk chart2/source chart2/uiconfig extras/source solenv/bin vcl/source
chart2/Library_chartcontroller.mk |1
chart2/source/controller/dialogs/dlg_DataSource.cxx|2
chart2/source/controller/dialogs/tp_DataSource.cxx | 592 +
chart2/source/controller/dialogs/tp_DataSource.hxx | 91 +
chart2/source/controller/dialogs/tp_DataSourceControls.cxx | 44
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 56 -
chart2/uiconfig/ui/tp_DataSource.ui| 119 ++
extras/source/glade/libreoffice-catalog.xml.in |3
solenv/bin/native-code.py |1
vcl/source/app/salvtables.cxx | 11
10 files changed, 434 insertions(+), 486 deletions(-)
New commits:
commit f3412df7ea4210bef028ed1e6f587cf3bb663495
Author: Caolán McNamara
AuthorDate: Mon Oct 15 15:35:46 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Nov 26 18:06:07 2018 +0100
weld DataSourceTabPage
Change-Id: I99b7c2ec397829c2f7ceb7ec18ae24195b9781e2
Reviewed-on: https://gerrit.libreoffice.org/64045
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index ae8535e5fa3c..02c8bcb75774 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -125,7 +125,6 @@ $(eval $(call
gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/dialogs/tp_AxisPositions \
chart2/source/controller/dialogs/tp_ChartType \
chart2/source/controller/dialogs/tp_DataLabel \
-chart2/source/controller/dialogs/tp_DataSourceControls \
chart2/source/controller/dialogs/tp_DataSource \
chart2/source/controller/dialogs/tp_ErrorBars \
chart2/source/controller/dialogs/tp_LegendPosition \
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 9a182ef19726..76b03043b1dd 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -138,7 +138,7 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
m_pRangeChooserTabPage =
VclPtr::Create(TabPageParent(m_pTabControl),
*(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true
/* bHideDescription */ );
-m_pDataSourceTabPage = VclPtr::Create(m_pTabControl,
*(m_apDialogModel.get()),
+m_pDataSourceTabPage =
VclPtr::Create(TabPageParent(m_pTabControl),
*(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true
/* bHideDescription */ );
m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE)
);
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 4919de66e71b..5b1ef9ff44e4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -24,7 +24,6 @@
#include "ChartTypeTemplateProvider.hxx"
#include
#include
-#include "tp_DataSourceControls.hxx"
#include
#include
#include "DialogModel.hxx"
@@ -55,84 +54,72 @@ namespace
const OUString lcl_aLabelRole( "label" );
-OUString lcl_GetRoleLBEntry(
-const OUString & rRole, const OUString & rRange )
+void lcl_UpdateCurrentRange(weld::TreeView& rOutListBox, const OUString &
rRole,
+const OUString& rRange)
{
-OUStringBuffer aEntry( rRole );
-aEntry.append( "\t" );
-aEntry.append(
-::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ) );
-aEntry.append( "\t" );
-aEntry.append( rRange );
-
-OUString sFoo = aEntry.makeStringAndClear();
-return sFoo;
+int nEntry = rOutListBox.get_selected_index();
+if (nEntry != -1)
+{
+rOutListBox.set_text(nEntry,
::chart::DialogModel::ConvertRoleFromInternalToUI(rRole), 0);
+rOutListBox.set_text(nEntry, rRange, 1);
+::chart::SeriesEntry* pEntry =
reinterpret_cast<::chart::SeriesEntry*>(rOutListBox.get_id(nEntry).toInt64());
+pEntry->m_sRole = rRole;
+}
}
-void lcl_UpdateCurrentRange(
-SvTabListBox & rOutListBox,
-const OUString & rRole, const OUString & rRange )
+bool lcl_UpdateCurrentSeriesName(weld::TreeView& rOutListBox)
{
-SvTreeListEntry * pEntry = rOutListBox.FirstSelected();
-if( pEntry )
-rOutListBox.SetEntryText( lcl_GetRoleLBEntry( rRole, rRange ), pEntry
);
-}
+int nEntry = rOutListBox.get_selected_index();
+if (nEntry == -1)
+return false;
-bool lcl_UpdateCurrentSeriesName(
-SvTreeListBox & rOutListBox )
-{
bool bResult = false;
-::chart::SeriesEntry * pEntry = dynamic_cast< ::chart::SeriesEntry * >(
rOutListBox.FirstSelected());
-if( pEntry &&
-pEntry->m_xDataSeries.is() &&
-pEntry->m_xChartType.is())
+::
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5b3d56351f7cbec5805c37001eb8a2ceb44fd3a7 Author: Olivier Hallot AuthorDate: Mon Nov 26 14:48:59 2018 -0200 Commit: Gerrit Code Review CommitDate: Mon Nov 26 17:53:47 2018 +0100 Update git submodules * Update helpcontent2 from branch 'master' - tdf#120927 Webservice functions needs linking to Change-Id: I8d96025238fc2005dab37c1050a0c7915210d73a Reviewed-on: https://gerrit.libreoffice.org/64055 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9634a1ff3a4f..6c2abb860183 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9634a1ff3a4ff5c7d4e4c102dd136640e30843dc +Subproject commit 6c2abb8601836f6bea02b7dfabba486208f2c6be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060110.xhp|9 ++
source/text/scalc/01/func_webservice.xhp | 124 ---
2 files changed, 75 insertions(+), 58 deletions(-)
New commits:
commit 6c2abb8601836f6bea02b7dfabba486208f2c6be
Author: Olivier Hallot
AuthorDate: Mon Nov 26 14:48:59 2018 -0200
Commit: Olivier Hallot
CommitDate: Mon Nov 26 17:53:47 2018 +0100
tdf#120927 Webservice functions needs linking to
Change-Id: I8d96025238fc2005dab37c1050a0c7915210d73a
Reviewed-on: https://gerrit.libreoffice.org/64055
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/01/04060110.xhp
b/source/text/scalc/01/04060110.xhp
index 6f50c9096..c582ffc30 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -777,6 +777,15 @@
=VALUE("4321") returns 4321.
+
+
+
+
+
+
+
+
+
diff --git a/source/text/scalc/01/func_webservice.xhp
b/source/text/scalc/01/func_webservice.xhp
index 0401cf023..e74e1613b 100644
--- a/source/text/scalc/01/func_webservice.xhp
+++ b/source/text/scalc/01/func_webservice.xhp
@@ -1,62 +1,70 @@
+* 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/.
+*
+-->
-
-
- URI Functions
- /text/scalc/01/func_webservice.xhp
-
-
-
-
- WEBSERVICE function
-
-
- WEBSERVICE
- Get some web content from a URI.
-
- WEBSERVICE(URI)
- URI: URI text of the web service.
-
- =WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss")
- Returns
the web page content of
"https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss";.
-
-
-
-
- FILTERXML function
-
- FILTERXML
- Apply a XPath expression to a XML
document.
-
- FILTERXML(XML
Document; XPath expression)
- XML
Document (required): String containing a valid XML stream.
- XPath expression (required): String containing a
valid XPath expression.
-
- =FILTERXML(WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss");"//lastBuildDate")
- Returns
information on the last build date of the wiki.
-
-
-
-
- ENCODEURL function
-
- ENCODEURL function
- Returns a URL-encoded
string.
- Use this function to transform text with symbols of national
alphabets (for example accented characters, non-ASCII alphabets or Asian words)
to a string of URL-standard symbols.
-
- ENCODEURL(Text)
- Text: String to encode to a sequence of
URL-standard symbols.
-
- If cell A1 contains the Cyrillic text "автомобиль", =ENCODEURL(A1) returns
%D0%B0%D0%B2%D1%82%D0%BE%D0%BC%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C (the word
"автомобиль" means car in Russian).
- If cell B1 contains the text "車", =ENCODEURL(B1) returns %E8%BB%8A ("車" means car in
Japanese).
-
-
+
+
+URI Functions
+/text/scalc/01/func_webservice.xhp
+
+
+
+
+
+WEBSERVICE function
+
+
+
+WEBSERVICE
+Get some web content from a
URI.
+
+
+WEBSERVICE(URI)
+URI: URI text of the web service.
+
+=WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss")
+Returns the web page content of
"https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss";.
+
+
+
+
+FILTERXML function
+
+
+FILTERXML
+Apply a XPath expression to a
XML document.
+
+
+FILTERXML(XML Document; XPath expression)
+XML Document (required): String containing a
valid XML stream.
+XPath expression (required): String containing a
valid XPath expression.
+
+=FILTERXML(WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss");"//lastBuildDate")
+
Returns information on the last build date of the wiki.
+
+
+
+
+ENCODEURL function
+
+
+ENCODEURL
+Returns a URL-encoded
string.
+
+Use this function to transform text with symbols of national
alphabets (for example accented characters, non-ASCII alphabets or Asian words)
to a string of URL-standard symbols.
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source
sc/source/ui/unoobj/chart2uno.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bc6f854412f7e7073f38821c3cd4a79de421de77 Author: Markus Mohrhard AuthorDate: Mon Nov 26 00:51:20 2018 +0100 Commit: Markus Mohrhard CommitDate: Mon Nov 26 17:37:20 2018 +0100 tdf#108027, add external ref string items to the data array Change-Id: Iaf607fca6d7e88f2c529ab4a374f34164813331a Reviewed-on: https://gerrit.libreoffice.org/64009 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 72e204da9a062282e52d5060e7f633e3b21414ff) Reviewed-on: https://gerrit.libreoffice.org/64011 Reviewed-by: Xisco Faulí Tested-by: Xisco Faulí diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 233b0fe6ba73..448652397cee 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2637,7 +2637,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke aItem.mbIsValue = false; aItem.maString = pMat->GetString(nC, nR).getString(); -m_aDataArray.emplace_back(); +m_aDataArray.emplace_back(aItem); ++nDataCount; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source
vcl/source/treelist/svimpbox.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 879b34787b795d467e9492258fe1e78de2e72663 Author: Caolán McNamara AuthorDate: Mon Nov 26 10:43:11 2018 + Commit: Caolán McNamara CommitDate: Mon Nov 26 16:49:30 2018 +0100 like keypress does, on mouse press create a cursor if missing Change-Id: I57cd718ed03846dbff164acb5cd3c329d9eee615 Reviewed-on: https://gerrit.libreoffice.org/64037 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 97ebe9a14d61..e61b0ebb05d4 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -1983,6 +1983,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() ) return; +if( !pCursor ) +pCursor = pStartEntry; SvTreeListEntry* pEntry = GetEntry( aPos ); if ( pEntry != pCursor ) // new entry selected -> reset current tab position to first tab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/treelist/svimpbox.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7a6c84d1790fe9d54f74270db01dbb51b24c5509 Author: Caolán McNamara AuthorDate: Mon Nov 26 10:43:11 2018 + Commit: Caolán McNamara CommitDate: Mon Nov 26 16:29:30 2018 +0100 like keypress does, on mouse press create a cursor if missing Change-Id: I57cd718ed03846dbff164acb5cd3c329d9eee615 Reviewed-on: https://gerrit.libreoffice.org/64036 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 97ebe9a14d61..e61b0ebb05d4 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -1983,6 +1983,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() ) return; +if( !pCursor ) +pCursor = pStartEntry; SvTreeListEntry* pEntry = GetEntry( aPos ); if ( pEntry != pCursor ) // new entry selected -> reset current tab position to first tab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/Library_chartcontroller.mk chart2/source chart2/uiconfig extras/source solenv/bin vcl/source
chart2/Library_chartcontroller.mk |1
chart2/source/controller/dialogs/dlg_DataSource.cxx|2
chart2/source/controller/dialogs/tp_DataSource.cxx | 592 +
chart2/source/controller/dialogs/tp_DataSource.hxx | 91 +
chart2/source/controller/dialogs/tp_DataSourceControls.cxx | 44
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 56 -
chart2/uiconfig/ui/tp_DataSource.ui| 119 ++
extras/source/glade/libreoffice-catalog.xml.in |3
solenv/bin/native-code.py |1
vcl/source/app/salvtables.cxx | 11
10 files changed, 434 insertions(+), 486 deletions(-)
New commits:
commit cf9f303ff9d8e2c9382d1e09e480f9801d254acd
Author: Caolán McNamara
AuthorDate: Mon Oct 15 15:35:46 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Nov 26 16:09:34 2018 +0100
weld DataSourceTabPage
Change-Id: I99b7c2ec397829c2f7ceb7ec18ae24195b9781e2
Reviewed-on: https://gerrit.libreoffice.org/61800
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index ae8535e5fa3c..02c8bcb75774 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -125,7 +125,6 @@ $(eval $(call
gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/dialogs/tp_AxisPositions \
chart2/source/controller/dialogs/tp_ChartType \
chart2/source/controller/dialogs/tp_DataLabel \
-chart2/source/controller/dialogs/tp_DataSourceControls \
chart2/source/controller/dialogs/tp_DataSource \
chart2/source/controller/dialogs/tp_ErrorBars \
chart2/source/controller/dialogs/tp_LegendPosition \
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 9a182ef19726..76b03043b1dd 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -138,7 +138,7 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
m_pRangeChooserTabPage =
VclPtr::Create(TabPageParent(m_pTabControl),
*(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true
/* bHideDescription */ );
-m_pDataSourceTabPage = VclPtr::Create(m_pTabControl,
*(m_apDialogModel.get()),
+m_pDataSourceTabPage =
VclPtr::Create(TabPageParent(m_pTabControl),
*(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true
/* bHideDescription */ );
m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE)
);
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 4919de66e71b..5b1ef9ff44e4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -24,7 +24,6 @@
#include "ChartTypeTemplateProvider.hxx"
#include
#include
-#include "tp_DataSourceControls.hxx"
#include
#include
#include "DialogModel.hxx"
@@ -55,84 +54,72 @@ namespace
const OUString lcl_aLabelRole( "label" );
-OUString lcl_GetRoleLBEntry(
-const OUString & rRole, const OUString & rRange )
+void lcl_UpdateCurrentRange(weld::TreeView& rOutListBox, const OUString &
rRole,
+const OUString& rRange)
{
-OUStringBuffer aEntry( rRole );
-aEntry.append( "\t" );
-aEntry.append(
-::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ) );
-aEntry.append( "\t" );
-aEntry.append( rRange );
-
-OUString sFoo = aEntry.makeStringAndClear();
-return sFoo;
+int nEntry = rOutListBox.get_selected_index();
+if (nEntry != -1)
+{
+rOutListBox.set_text(nEntry,
::chart::DialogModel::ConvertRoleFromInternalToUI(rRole), 0);
+rOutListBox.set_text(nEntry, rRange, 1);
+::chart::SeriesEntry* pEntry =
reinterpret_cast<::chart::SeriesEntry*>(rOutListBox.get_id(nEntry).toInt64());
+pEntry->m_sRole = rRole;
+}
}
-void lcl_UpdateCurrentRange(
-SvTabListBox & rOutListBox,
-const OUString & rRole, const OUString & rRange )
+bool lcl_UpdateCurrentSeriesName(weld::TreeView& rOutListBox)
{
-SvTreeListEntry * pEntry = rOutListBox.FirstSelected();
-if( pEntry )
-rOutListBox.SetEntryText( lcl_GetRoleLBEntry( rRole, rRange ), pEntry
);
-}
+int nEntry = rOutListBox.get_selected_index();
+if (nEntry == -1)
+return false;
-bool lcl_UpdateCurrentSeriesName(
-SvTreeListBox & rOutListBox )
-{
bool bResult = false;
-::chart::SeriesEntry * pEntry = dynamic_cast< ::chart::SeriesEntry * >(
rOutListBox.FirstSelected());
-if( pEntry &&
-pEntry->m_xDataSeries.is() &&
-pEntry->m_xChartType.is())
+::
[Libreoffice-commits] core.git: compilerplugins/clang include/vcl svtools/source vcl/source
compilerplugins/clang/unusedenumconstants.readonly.results |2
include/vcl/treelistentry.hxx |6 --
svtools/source/contnr/iconview.cxx | 28 --
vcl/source/treelist/treelistbox.cxx| 35 -
vcl/source/treelist/treelistentry.cxx |6 --
5 files changed, 27 insertions(+), 50 deletions(-)
New commits:
commit acfa3917ab2eb3d3efd45f319ec48e6ccb87c5dd
Author: Noel Grandin
AuthorDate: Fri Nov 23 15:14:41 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 15:44:49 2018 +0100
remove unused enum value SvTLEntryFlags::IN_USE
Change-Id: Ieb09d4d28cc2084da4660165a96561ee57d2420d
Reviewed-on: https://gerrit.libreoffice.org/64029
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 5e7a1dd16a29..2994af2a95fe 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1072,8 +1072,6 @@ include/vcl/salctype.hxx:41
enum ConvertDataFormat PDF
include/vcl/splitwin.hxx:37
enum SplitWindowItemFlags Invisible
-include/vcl/treelistentry.hxx:38
-enum SvTLEntryFlags IN_USE
include/vcl/vclenum.hxx:37
enum MenuItemBits POPUPSELECT
include/vcl/vclenum.hxx:143
diff --git a/include/vcl/treelistentry.hxx b/include/vcl/treelistentry.hxx
index b318bb3c440f..1cb234c7c98a 100644
--- a/include/vcl/treelistentry.hxx
+++ b/include/vcl/treelistentry.hxx
@@ -35,16 +35,15 @@ enum class SvTLEntryFlags
NONE= 0x,
CHILDREN_ON_DEMAND = 0x0001,
DISABLE_DROP= 0x0002,
-IN_USE = 0x0004,
// is set if RequestingChildren has not set any children
-NO_NODEBMP = 0x0008,
+NO_NODEBMP = 0x0004,
// entry had or has children
HAD_CHILDREN= 0x0010,
SEMITRANSPARENT = 0x8000, // draw semi-transparent entry bitmaps
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
class VCL_DLLPUBLIC SvTreeListEntry
@@ -104,7 +103,6 @@ public:
voidSetUserData( void* pPtr );
voidEnableChildrenOnDemand( bool bEnable=true );
boolHasChildrenOnDemand() const;
-boolHasInUseEmphasis() const;
SvTLEntryFlags GetFlags() const { return nEntryFlags;}
void SetFlags( SvTLEntryFlags nFlags );
diff --git a/svtools/source/contnr/iconview.cxx
b/svtools/source/contnr/iconview.cxx
index f00e10b77b5e..31f80325f40d 100644
--- a/svtools/source/contnr/iconview.cxx
+++ b/svtools/source/contnr/iconview.cxx
@@ -101,7 +101,6 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX,
long nY,
Color aBackupColor = rRenderContext.GetFillColor();
bool bCurFontIsSel = false;
-bool bInUse = rEntry.HasInUseEmphasis();
const WinBits nWindowStyle = GetStyle();
const bool bHideSelection = (nWindowStyle & WB_HIDESELECTION) !=0 &&
!HasFocus();
const StyleSettings& rSettings =
rRenderContext.GetSettings().GetStyleSettings();
@@ -142,22 +141,19 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long
nX, long nY,
if (pViewDataEntry->IsHighlighted())
{
Color aNewWallColor = rSettings.GetHighlightColor();
-if (!bInUse)
+// if the face color is bright then the deactive color is also
bright
+// -> so you can't see any deactive selection
+if (bHideSelection && !rSettings.GetFaceColor().IsBright()
+ && aWallpaper.GetColor().IsBright() !=
rSettings.GetDeactiveColor().IsBright())
{
-// if the face color is bright then the deactive color is also
bright
-// -> so you can't see any deactive selection
-if (bHideSelection && !rSettings.GetFaceColor().IsBright()
- && aWallpaper.GetColor().IsBright() !=
rSettings.GetDeactiveColor().IsBright())
-{
-aNewWallColor = rSettings.GetDeactiveColor();
-}
-// set font color to highlight
-if (!bCurFontIsSel)
-{
-rRenderContext.SetTextColor(aHighlightTextColor);
-rRenderContext.SetFont(aHighlightFont);
-bCurFontIsSel = true;
-}
+aNewWallColor = rSettings.GetDeactiveColor();
+}
+// set font color to highlight
+if (!bCurFontIsSel)
+{
+rRenderContext.SetTextColor(aHighlightTextColor);
+rRenderContext.SetFont(aHighlightFont);
+bCurFontIsSel = true;
}
aWallpaper.SetColor(aNewWallColor);
}
diff --git a/vc
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/ui/misc/outline.cxx|6 --
sw/source/uibase/inc/outline.hxx |2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d3a79b489adc6a40b3c4063c1ec324d36686853b
Author: Caolán McNamara
AuthorDate: Thu Nov 22 16:53:36 2018 +
Commit: Caolán McNamara
CommitDate: Mon Nov 26 15:39:07 2018 +0100
tdf#120426 save the style names when set or changed
instead of waiting until gaining focus of the listbox,
because of the differences in what that focus means in
the different backends. It was an odd way to do things anyway.
Change-Id: I072e3da04db184b49a86a9888080b60223813729
Reviewed-on: https://gerrit.libreoffice.org/63822
Tested-by: Jenkins
Tested-by: Xisco Faulí
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index ea75b1761586..c23794861501 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -410,7 +410,6 @@
SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage,
m_xLevelLB->connect_changed(LINK(this,SwOutlineSettingsTabPage,
LevelHdl));
m_xAllLevelNF->connect_value_changed(LINK(this, SwOutlineSettingsTabPage,
ToggleComplete));
m_xCollBox->connect_changed(LINK(this,SwOutlineSettingsTabPage,
CollSelect));
-m_xCollBox->connect_focus_in(LINK(this, SwOutlineSettingsTabPage,
CollSelectGetFocus));
m_xNumberBox->connect_changed(LINK(this, SwOutlineSettingsTabPage,
NumberSelect));
m_xPrefixED->connect_changed(LINK(this, SwOutlineSettingsTabPage,
DelimModify));
m_xSuffixED->connect_changed(LINK(this, SwOutlineSettingsTabPage,
DelimModify));
@@ -608,9 +607,10 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect,
weld::ComboBoxText&, rBox, void
}
SetModified();
+CollSave();
}
-IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, weld::Widget&,
void)
+void SwOutlineSettingsTabPage::CollSave()
{
for (sal_uInt8 i = 0; i < MAXLEVEL; ++i)
aSaveCollNames[i] = pCollNames[i];
@@ -723,6 +723,8 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell*
pShell)
pNumRule =
static_cast(GetDialogController())->GetNumRule();
pCollNames =
static_cast(GetDialogController())->GetCollNames();
+CollSave();
+
m_aPreviewWIN.SetNumRule(pNumRule);
m_aPreviewWIN.SetOutlineNames(pCollNames);
// set start value - nActLevel must be 1 here
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index d009b1d60226..f47d809fe261 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -100,7 +100,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
DECL_LINK( LevelHdl, weld::TreeView&, void );
DECL_LINK( ToggleComplete, weld::SpinButton&, void );
DECL_LINK( CollSelect, weld::ComboBoxText&, void );
-DECL_LINK( CollSelectGetFocus, weld::Widget&, void );
+void CollSave();
DECL_LINK( NumberSelect, weld::ComboBoxText&, void );
DECL_LINK( DelimModify, weld::Entry&, void );
DECL_LINK( StartModified, weld::SpinButton&, void );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/source
chart2/source/view/charttypes/PieChart.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit da957eff1dc2e4b9e49a27799344978af03a6e24
Author: Tamas Bunth
AuthorDate: Mon Nov 26 07:19:41 2018 +0100
Commit: Andras Timar
CommitDate: Mon Nov 26 15:12:15 2018 +0100
Put text label outside of the pie if..
performLabelBestFitInnerPlacement fails.
Change-Id: Ic84e8b42e02da2023b22a9406c44d462170c5305
Reviewed-on: https://gerrit.libreoffice.org/64015
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
(cherry picked from commit 3339c730f8c9a6088a2e8b335185f1bf0b232216)
Reviewed-on: https://gerrit.libreoffice.org/64032
Reviewed-by: Andras Timar
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 7f03317b5daa..35e789b52f8f 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -1575,7 +1575,18 @@ void PieChart::performLabelBestFit(ShapeParam&
rShapeParam, PieLabelInfo const &
if( !performLabelBestFitInnerPlacement(rShapeParam, rPieLabelInfo) )
{
-// TODO
+// If it does not fit inside, let's put it outside
+PolarLabelPositionHelper
aPolarPosHelper(m_pPosHelper.get(),m_nDimension,m_xLogicTarget,m_pShapeFactory);
+auto eAlignment = LABEL_ALIGN_CENTER;
+awt::Point aScreenPosition2D(
+
aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment,
css::chart::DataLabelPlacement::OUTSIDE
+, rShapeParam.mfUnitCircleStartAngleDegree,
rShapeParam.mfUnitCircleWidthAngleDegree
+, rShapeParam.mfUnitCircleInnerRadius,
rShapeParam.mfUnitCircleOuterRadius, rShapeParam.mfLogicZ+0.5, 0 ));
+basegfx::B2IVector aTranslationVector = rPieLabelInfo.aFirstPosition -
rPieLabelInfo.aOrigin;
+aTranslationVector.setLength(150);
+aScreenPosition2D.X += aTranslationVector.getX();
+aScreenPosition2D.Y += aTranslationVector.getY();
+rPieLabelInfo.xLabelGroupShape->setPosition(aScreenPosition2D);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source sfx2/uiconfig
sfx2/source/dialog/versdlg.cxx | 204 +--
sfx2/source/inc/versdlg.hxx | 36 +-
sfx2/uiconfig/ui/versionscmis.ui | 168 +---
3 files changed, 153 insertions(+), 255 deletions(-)
New commits:
commit 57b3e2422402a7b700d9d8d67e5e95eda0c35bed
Author: Caolán McNamara
AuthorDate: Sun Nov 25 20:18:11 2018 +
Commit: Caolán McNamara
CommitDate: Mon Nov 26 15:09:54 2018 +0100
weld SfxCmisVersionsDialog
Change-Id: I73fc8ba88021f3d1450d10a75970e1fd58f26c3f
Reviewed-on: https://gerrit.libreoffice.org/64031
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 7ceb3b7be93f..13724cf6a54c 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -111,105 +111,42 @@ SfxVersionInfo::SfxVersionInfo()
{
}
-void SfxVersionsTabListBox_Impl::KeyInput(const KeyEvent& rKeyEvent)
+namespace
{
-const vcl::KeyCode& rCode = rKeyEvent.GetKeyCode();
-switch (rCode.GetCode())
+void setColSizes(weld::TreeView& rVersionBox)
{
-case KEY_RETURN :
-case KEY_ESCAPE :
-case KEY_TAB :
-{
-Dialog *pParent = GetParentDialog();
-if (pParent)
-pParent->KeyInput(rKeyEvent);
-else
-SvSimpleTable::KeyInput(rKeyEvent);
-break;
-}
-default:
-SvSimpleTable::KeyInput( rKeyEvent );
-break;
-}
-}
-
-void SfxVersionsTabListBox_Impl::setColSizes()
-{
-HeaderBar &rBar = GetTheHeaderBar();
-if (rBar.GetItemCount() < 3)
-return;
-
-// recalculate the datetime column width
-long
nWidestTime(GetTextWidth(getWidestTime(Application::GetSettings().GetLocaleDataWrapper(;
-long nW1 = rBar.GetTextWidth(rBar.GetItemText(1));
+// recalculate the datetime column width
+int
nWidestTime(rVersionBox.get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
+int nW1 =
rVersionBox.get_pixel_size(rVersionBox.get_column_title(1)).Width();
-long nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
-const long nRest = GetSizePixel().Width() - nMax;
+int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little
offset
+const int nRest = rVersionBox.get_preferred_size().Width() - nMax;
-std::set aAuthors;
-SfxVersionInfo aInfo;
-aAuthors.insert(SvtUserOptions().GetFullName());
-
-for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
-{
-
aAuthors.insert(static_cast(pEntry->GetUserData())->aAuthor);
-}
+std::set aAuthors;
+SfxVersionInfo aInfo;
+aAuthors.insert(SvtUserOptions().GetFullName());
-long nMaxAuthorWidth = nRest/4;
-for (auto const& author : aAuthors)
-{
-nMaxAuthorWidth = std::max(nMaxAuthorWidth, GetTextWidth(author));
-if (nMaxAuthorWidth > nRest/2)
+for (int i = 0; i < rVersionBox.n_children(); ++i)
{
-nMaxAuthorWidth = nRest/2;
-break;
+
aAuthors.insert(reinterpret_cast(rVersionBox.get_id(i).toInt64())->aAuthor);
}
-}
-long aTabPositions[] = { 0, nMax, nMax + nMaxAuthorWidth };
-SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions,
MapUnit::MapPixel);
-}
-
-void SfxVersionsTabListBox_Impl::Resize()
-{
-SvSimpleTable::Resize();
-if (isInitialLayout(this))
-setColSizes();
-}
-
-void SfxVersionDialog::setColSizes()
-{
-// recalculate the datetime column width
-int
nWidestTime(m_xVersionBox->get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
-int nW1 =
m_xVersionBox->get_pixel_size(m_xVersionBox->get_column_title(1)).Width();
-
-int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
-const int nRest = m_xVersionBox->get_preferred_size().Width() - nMax;
-
-std::set aAuthors;
-SfxVersionInfo aInfo;
-aAuthors.insert(SvtUserOptions().GetFullName());
-
-for (int i = 0; i < m_xVersionBox->n_children(); ++i)
-{
-
aAuthors.insert(reinterpret_cast(m_xVersionBox->get_id(i).toInt64())->aAuthor);
-}
-
-int nMaxAuthorWidth = nRest/4;
-for (auto const& author : aAuthors)
-{
-nMaxAuthorWidth = std::max(nMaxAuthorWidth,
m_xVersionBox->get_pixel_size(author).Width());
-if (nMaxAuthorWidth > nRest/2)
+int nMaxAuthorWidth = nRest/4;
+for (auto const& author : aAuthors)
{
-nMaxAuthorWidth = nRest/2;
-break;
+nMaxAuthorWidth = std::max(nMaxAuthorWidth,
rVersionBox.get_pixel_size(author).Width());
+if (nMaxAuthorWidth > nRest/2)
+{
+nMaxAuthorWidth = nRest/2;
+break;
+}
Re: Help regarding Transliteration in LO writer
> I am interested in introducing transliteration facility (English to > Devnagari) > to LibreOffice writer. But, after downloading the huge source code I am > unable to decide where to start. > Are you sure such functionality doesn't belong in the desktop environment, an IME (Input Method) that would translate Latin character input (not "English") to Devanagari for *all* applications, not just LibreOffice? See https://en.wikipedia.org/wiki/Devanagari#Phonetic . LibreOffice should not re-implement functionality that belongs in the operating system or desktop environment. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source
sfx2/source/dialog/dinfdlg.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0f59ab7aa00232a083f28a52d006b2ea361798e0
Author: Caolán McNamara
AuthorDate: Fri Nov 23 09:23:34 2018 +
Commit: Caolán McNamara
CommitDate: Mon Nov 26 14:38:35 2018 +0100
Resolves: tdf#121644 clear pointer to customlines when customlines cleared
Change-Id: I09bf6f3c484a2d90a865f0a5743c4e99d2f77b0a
Reviewed-on: https://gerrit.libreoffice.org/63873
Tested-by: Jenkins
Tested-by: Xisco Faulí
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 937256384486..2e560e73520b 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1618,7 +1618,7 @@ bool CustomPropertiesWindow::IsLineValid(
CustomPropertyLine* pLine ) const
void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool
bIsFromTypeBox )
{
-if ( !IsLineValid( pLine ) )
+if (pLine && !IsLineValid(pLine))
{
if ( bIsFromTypeBox ) // LoseFocus of TypeBox
pLine->m_bTypeLostFocus = true;
@@ -1753,6 +1753,7 @@ void CustomPropertiesWindow::ClearAllLines()
CustomPropertyLine* pLine = *pIter;
delete pLine;
}
+m_pCurrentLine = nullptr;
m_aCustomProperties.clear();
m_aCustomPropertiesLines.clear();
m_nScrollPos = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help regarding Transliteration in LO writer
Hi! On 26.11.2018 13:39, Harshad Gorde wrote: > Hello everyone, > > I am interested in introducing transliteration facility (English to > Devnagari) to LibreOffice writer. But, after downloading the huge source > code I am unable to decide where to start. > > Kindly suggest me some initial steps to be followed. Personally I would suggest you to start by writing a (StarBasic) macro [1] for that. Not because I suppose it shouldn't be built in (I don't suppose that), but because for such a high-level task, a Basic macro could be very good initial approximation/plot for a future C++-based function, but allows you to avoid additional complexity at the first steps. IMO. [1] http://www.pitonyak.org/oo.php -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source
sc/source/ui/unoobj/chart2uno.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d370bbe3c15706872f8c0258ed1e21741d0228d Author: Markus Mohrhard AuthorDate: Mon Nov 26 00:51:20 2018 +0100 Commit: Xisco Faulí CommitDate: Mon Nov 26 14:24:29 2018 +0100 tdf#108027, add external ref string items to the data array Change-Id: Iaf607fca6d7e88f2c529ab4a374f34164813331a Reviewed-on: https://gerrit.libreoffice.org/64009 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 72e204da9a062282e52d5060e7f633e3b21414ff) Reviewed-on: https://gerrit.libreoffice.org/64012 Reviewed-by: Xisco Faulí diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index fd1976a75b44..34ab089b86f0 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2653,7 +2653,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke aItem.mbIsValue = false; aItem.maString = pMat->GetString(nC, nR).getString(); -m_aDataArray.emplace_back(); +m_aDataArray.emplace_back(aItem); ++nDataCount; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source xmlsecurity/qa
include/sfx2/signaturestate.hxx |4 +++-
include/sfx2/strings.hrc|1 +
sfx2/source/doc/objserv.cxx |8 +++-
xmlsecurity/qa/unit/signing/signing.cxx |6 --
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 4a59a8aba8c9d451edff790d9281d0095c1bd78e
Author: Miklos Vajna
AuthorDate: Mon Nov 26 09:21:18 2018 +0100
Commit: Miklos Vajna
CommitDate: Mon Nov 26 14:21:26 2018 +0100
sfx2: show partial signatures even if cert validation fails
Change-Id: I6060b7130827346ac5d6955bf38ebe3b476819fd
Reviewed-on: https://gerrit.libreoffice.org/64022
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index a1fd09360906..8bdfdfac75d9 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -33,7 +33,9 @@ enum class SignatureState
NOTVALIDATED = 4,
// signature and certificate are ok, but not all files are signed, as it
was the case in
// OOo 2.x - OOo 3.1.1. This state is only used together with document
signatures.
-PARTIAL_OK= 5
+PARTIAL_OK= 5,
+/// Certificate could not be validated and the document is only partially
signed.
+NOTVALIDATED_PARTIAL_OK = 6
};
#endif // INCLUDED_SFX2_SIGNATURESTATE_HXX
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index f02efc506078..ec2867206e54 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -261,6 +261,7 @@
#define STR_SIGNATURE_INVALID NC_("STR_SIGNATURE_INVALID",
"The signature was valid, but the document has been modified")
#define STR_SIGNATURE_NOTVALIDATED
NC_("STR_SIGNATURE_NOTVALIDATED", "The signature is OK, but the certificate
could not be validated.")
#define STR_SIGNATURE_PARTIAL_OK
NC_("STR_SIGNATURE_PARTIAL_OK", "The signature is OK, but the document is only
partially signed.")
+#define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK
NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be
validated and the document is only partially signed.")
#define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This
document is digitally signed and the signature is valid.")
#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW",
"Show Signatures")
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index f0a7f80d5a78..35d507286965 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1068,6 +1068,10 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
sMessage = SfxResId(STR_SIGNATURE_OK);
aInfoBarType = InfoBarType::Info;
break;
+case SignatureState::NOTVALIDATED_PARTIAL_OK:
+sMessage =
SfxResId(STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK);
+aInfoBarType = InfoBarType::Warning;
+break;
//FIXME SignatureState::Unknown, own message?
default:
break;
@@ -1285,7 +1289,9 @@ SignatureState
SfxObjectShell::ImplCheckSignaturesInformation( const uno::Sequen
}
}
-if ( nResult == SignatureState::OK && !bCertValid )
+if (nResult == SignatureState::OK && !bCertValid && !bCompleteSignature)
+nResult = SignatureState::NOTVALIDATED_PARTIAL_OK;
+else if (nResult == SignatureState::OK && !bCertValid)
nResult = SignatureState::NOTVALIDATED;
else if ( nResult == SignatureState::OK && bCertValid &&
!bCompleteSignature)
nResult = SignatureState::PARTIAL_OK;
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx
b/xmlsecurity/qa/unit/signing/signing.cxx
index 411cfceecf82..d9507982486b 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -639,12 +639,14 @@ void SigningTest::testOOXMLPartial()
SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
CPPUNIT_ASSERT(pObjectShell);
// This was SignatureState::BROKEN due to missing RelationshipTransform
and SHA-256 support.
-// We expect NOTVALIDATED in case the root CA is not imported on the
system, and PARTIAL_OK otherwise, so accept both.
+// We expect NOTVALIDATED_PARTIAL_OK in case the root CA is not imported
on the system, and PARTIAL_OK otherwise, so accept both.
+// But reject NOTVALIDATED, hiding incompleteness is not OK.
SignatureState nActual = pObjectShell->GetDocumentSignatureState();
CPPUNIT_ASSERT_MESSAGE(
(OString::number(static_cast::type>(nActual))
.getStr()),
-(nActual == SignatureState::NOTVALIDATED || nActual ==
SignatureState::PARTIAL_OK));
+(nActual == SignatureState::NOTVALIDATED_PARTIAL_OK
+ || nActual == SignatureState::PARTIAL_OK));
}
void SigningTest::testOO
Help regarding Transliteration in LO writer
Hello everyone, I am interested in introducing transliteration facility (English to Devnagari) to LibreOffice writer. But, after downloading the huge source code I am unable to decide where to start. Kindly suggest me some initial steps to be followed. Thanks! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Tabs.js |2 +-
loleaflet/src/control/Parts.js|4 ++--
loleaflet/src/layer/tile/TileLayer.js |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 823a4bf88e062a81618b637864cd2de2c79f904c
Author: Tor Lillqvist
AuthorDate: Mon Nov 26 13:42:24 2018 +0200
Commit: Tor Lillqvist
CommitDate: Mon Nov 26 13:47:28 2018 +0200
Fix further fallout from e27ae38bebf4b57aa7563357a188e33d0e1e0be8
One more special case where we do want to do the whileScrolling
callback from the onUpdate callback: When selecting another sheet of a
multi-sheet Calc document. Handle it by adding an optional parameter
to setPart() in Parts.js from _serPart() in Control.Tabs.js, that
eventually gets passed down as the "scroll" parameter to
_onUpdateCursor() in TileLayer.js, which turns on the special
handling.
Change-Id: I44772912a0598b78bef182f1b6147ff91d6c88e9
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index 3c6895356..0d7a3a3d5 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -152,7 +152,7 @@ L.Control.Tabs = L.Control.extend({
_setPart: function (e) {
var part = e.target.id.match(/\d+/g)[0];
if (part !== null) {
- this._map.setPart(parseInt(part));
+ this._map.setPart(parseInt(part), /*external:*/ false,
/*calledFromSetPartHandler:*/ true);
}
}
});
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index f14a8065f..395f9e092 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -3,7 +3,7 @@
* Document parts switching handler
*/
L.Map.include({
- setPart: function (part, external) {
+ setPart: function (part, external, calledFromSetPartHandler) {
var docLayer = this._docLayer;
docLayer._prevSelectedPart = docLayer._selectedPart;
if (part === 'prev') {
@@ -41,7 +41,7 @@ L.Map.include({
docLayer.eachView(docLayer._cellViewCursors,
docLayer._onUpdateCellViewCursor, docLayer);
docLayer.eachView(docLayer._graphicViewMarkers,
docLayer._onUpdateGraphicViewSelection, docLayer);
docLayer.eachView(docLayer._viewSelections,
docLayer._onUpdateTextViewSelection, docLayer);
- docLayer._clearSelections();
+ docLayer._clearSelections(calledFromSetPartHandler);
docLayer._updateOnChangePart();
docLayer._pruneTiles();
docLayer._prevSelectedPartNeedsUpdate = true;
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index ff078ce15..f543be0f7 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1477,9 +1477,9 @@ L.TileLayer = L.GridLayer.extend({
e.tile.onload = null;
},
- _clearSelections: function () {
+ _clearSelections: function (calledFromSetPartHandler) {
// hide the cursor if not editable
- this._onUpdateCursor();
+ this._onUpdateCursor(calledFromSetPartHandler);
// hide the text selection
this._selections.clearLayers();
// hide the selection handles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/vcl vcl/source
compilerplugins/clang/unusedenumconstants.readonly.results |4
include/vcl/window.hxx |6 ++
vcl/source/window/window.cxx |2 +-
vcl/source/window/window2.cxx |1 -
4 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 12d0c06703842754de1eee4c1ea4f5796429730b
Author: Noel Grandin
AuthorDate: Fri Nov 23 15:07:09 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 14:07:48 2018 +0100
remove unused enum value TrackingEventFlags::DontCallHdl
Change-Id: I75b28d20e2e0954fbd2fee396b8e06e9bb7d7073
Reviewed-on: https://gerrit.libreoffice.org/64028
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 978c17c2454f..5e7a1dd16a29 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1094,8 +1094,6 @@ include/vcl/wall.hxx:43
enum WallpaperStyle BottomLeft
include/vcl/wall.hxx:44
enum WallpaperStyle Bottom
-include/vcl/window.hxx:121
-enum TrackingEventFlags DontCallHdl
include/xmloff/shapeexport.hxx:53
enum XMLShapeExportFlags WIDTH
include/xmloff/shapeexport.hxx:54
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8afd84688523..60389e836aa9 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -118,11 +118,10 @@ enum class TrackingEventFlags
Focus = 0x0004,
Repeat = 0x0100,
End= 0x1000,
-DontCallHdl= 0x8000,
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 922b4b4ab161..877c66bdee05 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -296,7 +296,6 @@ void Window::EndTracking( TrackingEventFlags nFlags )
}
// call EndTracking if required
-if ( !(nFlags & TrackingEventFlags::DontCallHdl) )
{
Point aMousePos(
mpWindowImpl->mpFrameData->mnLastMouseX,
mpWindowImpl->mpFrameData->mnLastMouseY );
if( ImplIsAntiparallel() )
commit ea72ad4474789af1532fd49677158f62ba8e2543
Author: Noel Grandin
AuthorDate: Fri Nov 23 15:05:08 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 14:07:37 2018 +0100
remove unused ShowFlags::NoParentUpdate
Change-Id: Id63e1d73643a18d823dfcb35479f0f8eb3e20b15
Reviewed-on: https://gerrit.libreoffice.org/63972
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 327ddeb57286..978c17c2454f 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1096,8 +1096,6 @@ include/vcl/wall.hxx:44
enum WallpaperStyle Bottom
include/vcl/window.hxx:121
enum TrackingEventFlags DontCallHdl
-include/vcl/window.hxx:172
-enum ShowFlags NoParentUpdate
include/xmloff/shapeexport.hxx:53
enum XMLShapeExportFlags WIDTH
include/xmloff/shapeexport.hxx:54
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index dc5def79c8a3..8afd84688523 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -169,14 +169,13 @@ namespace o3tl
enum class ShowFlags
{
NONE = 0x,
-NoParentUpdate = 0x0001,
NoFocusChange = 0x0002,
NoActivate = 0x0004,
ForegroundTask = 0x0008,
};
namespace o3tl
{
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
}
// Flags for SetZOrder()
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e1d97513172d..2b835fd81796 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2232,7 +2232,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
aBounds.AdjustBottom(workaround_border );
aInvRegion = aBounds;
}
-if ( !mpWindowImpl->mbNoParentUpdate && !(nFlags &
ShowFlags::NoParentUpdate) )
+if ( !mpWindowImpl->mbNoParentUpdate )
{
if ( !aInvRegion.IsEmpty() )
ImplInvalidateParentFrameRegion( aInvRegion );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
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.
2 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 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 2 of 2 defect(s)
** CID 1441522: Null pointer dereferences (FORWARD_NULL)
*** CID 1441522: Null pointer dereferences (FORWARD_NULL)
/svx/source/tbxctrls/fontworkgallery.cxx: 200 in
svx::FontWorkGalleryDialog::insertSelectedFontwork()()
194 // the mpSdrView that is used to insert
(InsertObjectAtView below) the
195 // cloned SdrObject.
196 const bool bUseSpecialCalcMode(nullptr != mppSdrObject
&& nullptr != mpDestModel);
197 const bool bSdrViewInsertMode(nullptr != mpSdrView);
198
199 // center shape on current view
>>> CID 1441522: Null pointer dereferences (FORWARD_NULL)
>>> Passing null pointer "this->mpSdrView" to "GetFirstOutputDevice", which
>>> dereferences it.
200 OutputDevice*
pOutDev(mpSdrView->GetFirstOutputDevice());
201
202 if(pOutDev && (bUseSpecialCalcMode ||
bSdrViewInsertMode))
203 {
204 // Clone directly to target SdrModel (may be
different due to user/caller (!))
205 SdrObject* pNewObject(
** CID 1441521: API usage errors (INVALIDATE_ITERATOR)
/svl/source/passwordcontainer/passwordcontainer.cxx: 1280 in
PasswordContainer::Notify()()
*** CID 1441521: API usage errors (INVALIDATE_ITERATOR)
/svl/source/passwordcontainer/passwordcontainer.cxx: 1280 in
PasswordContainer::Notify()()
1274 if ( m_pStorageFile )
1275 m_pStorageFile->remove( rEntry.first,
aNPIter->GetUserName() ); // remove record ( aURL, aName )
1276 }
1277
1278 if( !aNPIter->HasPasswords( MEMORY_RECORD ) )
1279 {
>>> CID 1441521: API usage errors (INVALIDATE_ITERATOR)
>>> Using invalid iterator "std::vector>> std::allocator >::const_iterator(aNPIter)".
1280 aNPIter = rEntry.second.erase(aNPIter);
1281 }
1282 else
1283 ++aNPIter;
1284 }
1285 }
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-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyPvqYm7xQDzkVodLK1TcrkXKPdOyH620dN1PXJe81RVARFJDDBwCZPHg2q9rcCOCHpXWKxzCyug927WQjrLSJJytBCqRmTrMIfQKTNV-2BBcS5H990Z2VWkX58BzNNDQt4CB9eHPXssxwal2n7qxz-2BzDMYCO9SE82lnxETmLr-2FLiuA-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 11 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 27 +++--
3 files changed, 29 insertions(+), 9 deletions(-)
New commits:
commit 24eff43ac009558121f15d188b1d1ab6ffc81372
Author: Serge Krot
AuthorDate: Fri Nov 16 09:53:37 2018 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 26 13:40:27 2018 +0100
tdf#121456: sw: DOCX: tabs export and TABS_RELATIVE_TO_INDENT prop
In DOCX, w:pos specifies the position of the current custom tab stop
with respect to the current page margins.
But in ODT, zero position could be page margins or paragraph indent
according to used settings DocumentSettingId::TABS_RELATIVE_TO_INDENT
Added new unit test.
Change-Id: Ic56a8527380b6562f4239df1edce0c9b4649af24
Reviewed-on: https://gerrit.libreoffice.org/63460
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/64035
diff --git a/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt
b/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt
new file mode 100755
index ..ff8d5400950b
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 4da51b6b87a1..b3ba248cc210 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -53,6 +53,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf46938_clearTabStop,
"tdf46938_clearTabStop.docx"
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<
uno::Sequence >(getParagraph(1), "ParaTabStops").getLength());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf121456_tabsOffset, "tdf121456_tabsOffset.odt")
+{
+for (int i=2; i<8; i++)
+{
+uno::Sequence< style::TabStop > stops = getProperty<
uno::Sequence >(getParagraph( i ), "ParaTabStops");
+CPPUNIT_ASSERT_EQUAL( sal_Int32(1), stops.getLength());
+CPPUNIT_ASSERT_EQUAL( css::style::TabAlign_RIGHT, stops[ 0 ].Alignment
);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(17000), stops[ 0 ].Position );
+}
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict,
"tdf82065_Ind_start_strict.docx")
{
uno::Reference
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index fcd5bcf5f498..8ba68c790338 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7443,8 +7443,8 @@ void DocxAttributeOutput::ParaWidows( const
SvxWidowsItem& rWidows )
m_pSerializer->singleElementNS( XML_w, XML_widowControl, FSNS( XML_w,
XML_val ), "false", FSEND );
}
-static void impl_WriteTabElement( FSHelperPtr pSerializer,
- const SvxTabStop& rTab, long /* nCurrentLeft
*/ )
+static void impl_WriteTabElement( FSHelperPtr const & pSerializer,
+ const SvxTabStop& rTab, long tabsOffset )
{
FastAttributeList *pTabElementAttrList =
FastSerializerHelper::createAttrList();
@@ -7466,9 +7466,11 @@ static void impl_WriteTabElement( FSHelperPtr
pSerializer,
break;
}
-// Because GetTabPos already includes indent, we don't need to add
nCurrentLeft (CurrentLeft is indentation information)
-//pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::valueOf(
rTab.GetTabPos() + nCurrentLeft ) );
-pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::number(
rTab.GetTabPos()) );
+// Write position according to used offset of the whole paragraph.
+// In DOCX, w:pos specifies the position of the current custom tab stop
with respect to the current page margins.
+// But in ODT, zero position could be page margins or paragraph indent
according to used settings.
+// This is handled outside of this method and provided for us in
tabsOffset parameter.
+pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::number(
rTab.GetTabPos() + tabsOffset ) );
sal_Unicode cFillChar = rTab.GetFill();
@@ -7488,9 +7490,6 @@ static void impl_WriteTabElement( FSHelperPtr pSerializer,
void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
{
-const SfxPoolItem* pLR = m_rExport.HasItem( RES_LR_SPACE );
-long nCurrentLeft = pLR ? static_cast(pLR)->GetTextLeft() : 0;
-
sal_uInt16 nCount = rTabStop.Count();
// must contain at least one , so don't write it empty
@@ -7504,10 +7503,20 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem& rTabStop )
m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND );
+// Get offset for tabs
+// In DOCX, w:pos specifies the position of the current cust
[Libreoffice-commits] core.git: chart2/IwyuFilter_chart2.yaml chart2/source
chart2/IwyuFilter_chart2.yaml |3 ++ chart2/source/view/axes/DateHelper.cxx |1 chart2/source/view/axes/DateScaling.cxx|1 chart2/source/view/axes/MinimumAndMaximumSupplier.cxx |1 chart2/source/view/axes/ScaleAutomatism.cxx|1 chart2/source/view/axes/Tickmarks.cxx |1 chart2/source/view/axes/Tickmarks_Equidistant.cxx |1 chart2/source/view/axes/VAxisBase.cxx |1 chart2/source/view/axes/VAxisOrGridBase.cxx|1 chart2/source/view/axes/VAxisProperties.cxx|6 +--- chart2/source/view/axes/VCartesianAxis.cxx |5 --- chart2/source/view/axes/VCartesianCoordinateSystem.cxx |1 chart2/source/view/axes/VCartesianGrid.cxx |1 chart2/source/view/axes/VCoordinateSystem.cxx |8 -- chart2/source/view/axes/VPolarAxis.cxx |2 - chart2/source/view/axes/VPolarGrid.cxx |2 - chart2/source/view/axes/VPolarRadiusAxis.cxx |1 chart2/source/view/charttypes/AreaChart.cxx|4 --- chart2/source/view/charttypes/BarPositionHelper.cxx|4 --- chart2/source/view/charttypes/BubbleChart.cxx | 10 --- chart2/source/view/charttypes/CandleStickChart.cxx |6 chart2/source/view/charttypes/NetChart.cxx |7 - chart2/source/view/charttypes/PieChart.cxx |1 chart2/source/view/charttypes/Splines.cxx |1 chart2/source/view/charttypes/VSeriesPlotter.cxx | 14 -- chart2/source/view/diagram/VDiagram.cxx|5 --- chart2/source/view/inc/LabelPositionHelper.hxx |1 chart2/source/view/inc/PlottingPositionHelper.hxx |2 - chart2/source/view/main/ChartItemPool.cxx |1 chart2/source/view/main/ChartView.cxx | 22 - chart2/source/view/main/DrawModelWrapper.cxx |8 +- chart2/source/view/main/LabelPositionHelper.cxx|2 - chart2/source/view/main/PlotterBase.cxx|1 chart2/source/view/main/PlottingPositionHelper.cxx |2 - chart2/source/view/main/PolarLabelPositionHelper.cxx |1 chart2/source/view/main/PropertyMapper.cxx |1 chart2/source/view/main/ShapeFactory.cxx |7 - chart2/source/view/main/Stripe.cxx |1 chart2/source/view/main/VDataSeries.cxx|5 --- chart2/source/view/main/VLegend.cxx|4 --- chart2/source/view/main/VLegendSymbolFactory.cxx |2 - chart2/source/view/main/VPolarTransformation.cxx |1 chart2/source/view/main/VTitle.cxx |8 -- 43 files changed, 12 insertions(+), 146 deletions(-) New commits: commit ae3309c908311248f1580a894f197732964bfac2 Author: Gabor Kelemen AuthorDate: Wed Nov 21 23:26:18 2018 +0100 Commit: Miklos Vajna CommitDate: Mon Nov 26 12:22:46 2018 +0100 tdf#42949 Fix IWYU warnings in chart2/source/view/*cxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I9ee3318c79d3b59f272a2a5f89c38b26afa05974 Reviewed-on: https://gerrit.libreoffice.org/63775 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index 2fe87e01a76a..9349a4baa55a 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -468,6 +468,9 @@ blacklist: chart2/source/controller/main/ElementSelector.hxx: # base class has to be a complete type - com/sun/star/lang/XServiceInfo.hpp +chart2/source/view/main/ShapeFactory.cxx: +# Needed for template +- com/sun/star/graphic/XGraphic.hpp chart2/source/controller/main/StatusBarCommandDispatch.hxx: # base class has to be a complete type - CommandDispatch.hxx diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx index 046760436acd..2e1fa3a4b867 100644 --- a/chart2/source/view/axes/DateHelper.cxx +++ b/chart2/source/view/axes/DateHelper.cxx @@ -18,7 +18,6 @@ */ #include -#include "DateScaling.hxx" #include #include diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 28b66633628d..1ce1e1d06746 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -20,7 +20,6 @@ #include "DateScaling.hxx" #include #include -#include #include namespace diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index 861407840db1..50c3d4958694 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -22,7 +22,6 @@ #include
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/macosx.mk | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
New commits:
commit ab9d95e6073d84a0dbabf1a4e704b8468afe7bff
Author: Alyssa Ross
AuthorDate: Mon Nov 26 01:07:42 2018 +
Commit: Michael Stahl
CommitDate: Mon Nov 26 11:57:19 2018 +0100
Use -filelist with macOS linker
macOS's linker can take a -filelist argument, in place of taking the
list of object files to link on the command line. This is a more limited
version of "response files" as used elsewhere in the code base, and by
using it we make it far less likely that a linker invocation will hit
ARG_MAX.
A standard LibreOffice build probably won't hit ARG_MAX on macOS just
yet, but it's not far off - some LDFLAGS are enough to tip it over the
edge, which is what prompted me to fix the issue. If not fixed, a few
more object files will probably break LibreOffice builds on macOS! An
example of another large program that has encountered this issue is
Thunderbird, which implemented the same fix[1].
The changes I've made to use -filelist are adapted from the code
elsewhere in gbuild that creates response files, but this is slightly
different because -filelist files are a bit different - they can only
contain object files, as opposed to arbitrary linker arguments, and
arguments are separated by newlines rather than spaces.
[1]: https://bugzilla.mozilla.org/show_bug.cgi?id=837618
Change-Id: I01b9126aad95056c3dc82f941dea4fd43f95d0f2
Reviewed-on: https://gerrit.libreoffice.org/64010
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index d51ce5887956..e9c2b485d4ec 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -101,13 +101,7 @@ endef
define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
- $(if
$(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC))
\
- $(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(if $(filter
Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
- $(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(subst \d,$$,$(RPATH)) \
- $(T_LDFLAGS) \
- $(patsubst lib%.dylib,-l%,$(patsubst
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib) \
+ FILELIST=$(call var2file,$(shell $(gb_MKTEMP)),100, \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
@@ -115,10 +109,21 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
- $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat
$(extraobjectlist)`) \
+ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat
$(extraobjectlist && \
+ cat $${FILELIST} | sed 's/ /\$(NEWLINE)/g' | grep -v '^$$' >
$${FILELIST}.1 && \
+ mv $${FILELIST}.1 $${FILELIST} && \
+ $(if
$(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC))
\
+ $(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+ $(if $(filter
Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
+ $(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
+ $(patsubst lib%.dylib,-l%,$(patsubst
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib) \
+ -Wl$(COMMA)-filelist$(COMMA)$${FILELIST} \
$(T_LIBS) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
-o $(1) && \
+ rm -f $${FILELIST} && \
$(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \
$(if $(filter Executable,$(TARGETTYPE)), \
$(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl app
$(LAYER) $(1) &&) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-16'
Tag 'cp-6.0-16' created by Andras Timar at 2018-11-26 10:53 + cp-6.0-16 Changes since cp-6.0-15-18: --- 0 files changed --- ___ 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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7aed6eb9b920a133ecef16f3f96a82311be25c9 Author: Andras Timar AuthorDate: Mon Nov 26 11:53:35 2018 +0100 Commit: Andras Timar CommitDate: Mon Nov 26 11:53:35 2018 +0100 Bump version to 6.0-16 Change-Id: I57dccc57e433aba964da95dcb2b20a5ba3ca34b2 diff --git a/configure.ac b/configure.ac index 136a704bba67..ef2525bc8c58 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],[6.0.10.15],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.0.10.16],[],[],[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 'libreoffice-6-1' - sc/source
sc/source/core/data/drwlayer.cxx | 104 ---
1 file changed, 76 insertions(+), 28 deletions(-)
New commits:
commit 24551cb78d4ae11101860ef98e9040a9105251df
Author: Armin Le Grand
AuthorDate: Thu Nov 22 13:18:30 2018 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 26 11:51:21 2018 +0100
tdf#116931 Fix scale when calc cells move indirectly
For the anchor mode 'To Cell (resize with cell)' there
were errors e.g. when the cell the object is in does
not scale but move. If that move went further than the
object is, wrong offsets emerged.
Also added full linear per-cell scale instead of only
scale (no translation through scale). Overhauled to
use liner transfomations, too.
Change-Id: Icff0fad168476c68ea10fd5830bf53bd7294b89f
Reviewed-on: https://gerrit.libreoffice.org/63803
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 10a58ec15438d34a594437815882862c4576e2c0)
Reviewed-on: https://gerrit.libreoffice.org/63852
Reviewed-by: Thorsten Behrens
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 5fd0945e6713..4f7f1978919f 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -651,11 +651,15 @@ void ScDrawLayer::ResizeLastRectFromAnchor(const
SdrObject* pObj, ScDrawObjData&
aPos.setX(TwipsToHmm(aPos.X()));
aPos.setY(TwipsToHmm(aPos.Y()));
aPos += lcl_calcAvailableDiff(*pDoc, nCol1, nRow1, nTab1,
rData.maStartOffset);
+
+// this sets the needed changed position (translation)
aRect.SetPos(aPos);
if (bCanResize)
{
-tools::Rectangle aLastCellRect = rData.getLastCellRect();
+// all this stuff is additional stuff to evtl. not only translate the
+// range (Rectangle), but also check for and evtl. do corrections for
it's size
+const tools::Rectangle aLastCellRect(rData.getLastCellRect());
// If the row was hidden before, or we don't have a valid cell rect,
calculate the
// new rect based on the end point.
@@ -675,61 +679,105 @@ void ScDrawLayer::ResizeLastRectFromAnchor(const
SdrObject* pObj, ScDrawObjData&
// We calculate based on the last cell rect to be able to scale
the image
// as much as the cell was scaled.
// Still, we keep the image in its current cell (to keep start
anchor == end anchor)
-tools::Rectangle aCurrentCellRect = GetCellRect(*GetDocument(),
rData.maStart, true);
-double fWidthFactor =
static_cast(aCurrentCellRect.GetWidth())
- /
static_cast(aLastCellRect.GetWidth());
-double fHeightFactor =
static_cast(aCurrentCellRect.GetHeight())
- /
static_cast(aLastCellRect.GetHeight());
+const tools::Rectangle
aCurrentCellRect(GetCellRect(*GetDocument(), rData.maStart, true));
+long nCurrentWidth(aCurrentCellRect.GetWidth());
+long nCurrentHeight(aCurrentCellRect.GetHeight());
+const long nLastWidth(aLastCellRect.GetWidth());
+const long nLastHeight(aLastCellRect.GetHeight());
+
+// tdf#116931 Avoid and correct nifty numerical problems with the
integer
+// based and converted values (GetCellRect uses multiplies with
HMM_PER_TWIPS)
+if(nCurrentWidth + 1 == nLastWidth || nCurrentWidth == nLastWidth
+ 1)
+{
+nCurrentWidth = nLastWidth;
+}
-bool bIsGrowingLarger = aLastCellRect.GetWidth() *
aLastCellRect.GetHeight()
-< aCurrentCellRect.GetWidth() *
aCurrentCellRect.GetHeight();
+if(nCurrentHeight + 1 == nLastHeight || nCurrentHeight ==
nLastHeight + 1)
+{
+nCurrentHeight = nLastHeight;
+}
-if (pObj->shouldKeepAspectRatio())
+// get intial ScalingFactors
+double fWidthFactor(nCurrentWidth == nLastWidth || 0 == nLastWidth
+? 1.0
+: static_cast(nCurrentWidth) /
static_cast(nLastWidth));
+double fHeightFactor(nCurrentHeight == nLastHeight || 0 ==
nLastHeight
+? 1.0
+: static_cast(nCurrentHeight) /
static_cast(nLastHeight));
+
+// check if we grow or shrink - and at all
+const bool bIsGrowing(nCurrentWidth > nLastWidth || nCurrentHeight
> nLastHeight);
+const bool bIsShrinking(nCurrentWidth < nLastWidth ||
nCurrentHeight < nLastHeight);
+const bool bIsSizeChanged(bIsGrowing || bIsShrinking);
+
+// handle AspectRatio, only needed if size does change
+if(bIsSizeChanged && pObj->shouldKeepAspectRatio())
{
tools::Rectangle aRectIncludingOffset = aRect;
aRectIncludingOffset.setWidth(aRect.GetWidth() +
rD
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source
sc/source/core/data/drwlayer.cxx | 104 ---
1 file changed, 76 insertions(+), 28 deletions(-)
New commits:
commit a63cd8bbe7cf881daa8dc7a7f32f3e5ac384e902
Author: Armin Le Grand
AuthorDate: Thu Nov 22 13:18:30 2018 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 26 11:50:42 2018 +0100
tdf#116931 Fix scale when calc cells move indirectly
For the anchor mode 'To Cell (resize with cell)' there
were errors e.g. when the cell the object is in does
not scale but move. If that move went further than the
object is, wrong offsets emerged.
Also added full linear per-cell scale instead of only
scale (no translation through scale). Overhauled to
use liner transfomations, too.
Change-Id: Icff0fad168476c68ea10fd5830bf53bd7294b89f
Reviewed-on: https://gerrit.libreoffice.org/63803
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 10a58ec15438d34a594437815882862c4576e2c0)
Reviewed-on: https://gerrit.libreoffice.org/63851
Reviewed-by: Thorsten Behrens
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index dc24b9e0d410..540e320d1999 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -642,11 +642,15 @@ void ScDrawLayer::ResizeLastRectFromAnchor(const
SdrObject* pObj, ScDrawObjData&
aPos.setX(TwipsToHmm(aPos.X()));
aPos.setY(TwipsToHmm(aPos.Y()));
aPos += lcl_calcAvailableDiff(*pDoc, nCol1, nRow1, nTab1,
rData.maStartOffset);
+
+// this sets the needed changed position (translation)
aRect.SetPos(aPos);
if (bCanResize)
{
-tools::Rectangle aLastCellRect = rData.getLastCellRect();
+// all this stuff is additional stuff to evtl. not only translate the
+// range (Rectangle), but also check for and evtl. do corrections for
it's size
+const tools::Rectangle aLastCellRect(rData.getLastCellRect());
// If the row was hidden before, or we don't have a valid cell rect,
calculate the
// new rect based on the end point.
@@ -666,61 +670,105 @@ void ScDrawLayer::ResizeLastRectFromAnchor(const
SdrObject* pObj, ScDrawObjData&
// We calculate based on the last cell rect to be able to scale
the image
// as much as the cell was scaled.
// Still, we keep the image in its current cell (to keep start
anchor == end anchor)
-tools::Rectangle aCurrentCellRect = GetCellRect(*GetDocument(),
rData.maStart, true);
-double fWidthFactor =
static_cast(aCurrentCellRect.GetWidth())
- /
static_cast(aLastCellRect.GetWidth());
-double fHeightFactor =
static_cast(aCurrentCellRect.GetHeight())
- /
static_cast(aLastCellRect.GetHeight());
+const tools::Rectangle
aCurrentCellRect(GetCellRect(*GetDocument(), rData.maStart, true));
+long nCurrentWidth(aCurrentCellRect.GetWidth());
+long nCurrentHeight(aCurrentCellRect.GetHeight());
+const long nLastWidth(aLastCellRect.GetWidth());
+const long nLastHeight(aLastCellRect.GetHeight());
+
+// tdf#116931 Avoid and correct nifty numerical problems with the
integer
+// based and converted values (GetCellRect uses multiplies with
HMM_PER_TWIPS)
+if(nCurrentWidth + 1 == nLastWidth || nCurrentWidth == nLastWidth
+ 1)
+{
+nCurrentWidth = nLastWidth;
+}
-bool bIsGrowingLarger = aLastCellRect.GetWidth() *
aLastCellRect.GetHeight()
-< aCurrentCellRect.GetWidth() *
aCurrentCellRect.GetHeight();
+if(nCurrentHeight + 1 == nLastHeight || nCurrentHeight ==
nLastHeight + 1)
+{
+nCurrentHeight = nLastHeight;
+}
-if (pObj->shouldKeepAspectRatio())
+// get intial ScalingFactors
+double fWidthFactor(nCurrentWidth == nLastWidth || 0 == nLastWidth
+? 1.0
+: static_cast(nCurrentWidth) /
static_cast(nLastWidth));
+double fHeightFactor(nCurrentHeight == nLastHeight || 0 ==
nLastHeight
+? 1.0
+: static_cast(nCurrentHeight) /
static_cast(nLastHeight));
+
+// check if we grow or shrink - and at all
+const bool bIsGrowing(nCurrentWidth > nLastWidth || nCurrentHeight
> nLastHeight);
+const bool bIsShrinking(nCurrentWidth < nLastWidth ||
nCurrentHeight < nLastHeight);
+const bool bIsSizeChanged(bIsGrowing || bIsShrinking);
+
+// handle AspectRatio, only needed if size does change
+if(bIsSizeChanged && pObj->shouldKeepAspectRatio())
{
tools::Rectangle aRectIncludingOffset = aRect;
aRectIncludingOffset.setWidth(aRect.GetWidth() +
rD
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - chart2/source
chart2/source/view/charttypes/PieChart.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 46833de245efb53874fa28685038194cc5b430aa
Author: Tamas Bunth
AuthorDate: Mon Nov 26 07:19:41 2018 +0100
Commit: Andras Timar
CommitDate: Mon Nov 26 11:47:13 2018 +0100
Put text label outside of the pie if..
performLabelBestFitInnerPlacement fails.
Change-Id: Ic84e8b42e02da2023b22a9406c44d462170c5305
Reviewed-on: https://gerrit.libreoffice.org/64015
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
(cherry picked from commit 3339c730f8c9a6088a2e8b335185f1bf0b232216)
Reviewed-on: https://gerrit.libreoffice.org/64034
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 2d1ebd9fc634..ae447c733a54 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -1595,7 +1595,18 @@ void PieChart::performLabelBestFit(ShapeParam&
rShapeParam, PieLabelInfo const &
if( !performLabelBestFitInnerPlacement(rShapeParam, rPieLabelInfo) )
{
-// TODO
+// If it does not fit inside, let's put it outside
+PolarLabelPositionHelper
aPolarPosHelper(m_pPosHelper.get(),m_nDimension,m_xLogicTarget,m_pShapeFactory);
+auto eAlignment = LABEL_ALIGN_CENTER;
+awt::Point aScreenPosition2D(
+
aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment,
css::chart::DataLabelPlacement::OUTSIDE
+, rShapeParam.mfUnitCircleStartAngleDegree,
rShapeParam.mfUnitCircleWidthAngleDegree
+, rShapeParam.mfUnitCircleInnerRadius,
rShapeParam.mfUnitCircleOuterRadius, rShapeParam.mfLogicZ+0.5, 0 ));
+basegfx::B2IVector aTranslationVector = rPieLabelInfo.aFirstPosition -
rPieLabelInfo.aOrigin;
+aTranslationVector.setLength(150);
+aScreenPosition2D.X += aTranslationVector.getX();
+aScreenPosition2D.Y += aTranslationVector.getY();
+rPieLabelInfo.xLabelGroupShape->setPosition(aScreenPosition2D);
}
}
___
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' - connectivity/qa connectivity/source
connectivity/qa/connectivity/mysql/mysql.cxx| 11 +--
connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |8 +++-
2 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit d1beae8257a2b1124db2df3c6893fc3c2608ace0
Author: Tamas Bunth
AuthorDate: Fri Nov 23 18:31:37 2018 +0100
Commit: Andras Timar
CommitDate: Mon Nov 26 11:44:19 2018 +0100
mysqlc: next() should move cursor from Last
XResultSet::next() should move cursor when called while cursor is on the
last position. It is not documented, but older versions of the mysqlc
extension are implemented that way. The cursor goes to the so called
afterlast position.
Even so, the next() call on the last position should return false.
Change-Id: I0fd145c920077151364a6a8c12e05290496b99c8
Reviewed-on: https://gerrit.libreoffice.org/63895
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
Reviewed-on: https://gerrit.libreoffice.org/64017
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/connectivity/qa/connectivity/mysql/mysql.cxx
b/connectivity/qa/connectivity/mysql/mysql.cxx
index 8f2f664056c4..f5e878590363 100644
--- a/connectivity/qa/connectivity/mysql/mysql.cxx
+++ b/connectivity/qa/connectivity/mysql/mysql.cxx
@@ -173,9 +173,16 @@ void MysqlTestDriver::testIntegerInsertAndQuery()
CPPUNIT_ASSERT_MESSAGE("not enough result after query", hasRow);
CPPUNIT_ASSERT_EQUAL(i, xRow->getLong(1)); // first and only column
}
-bool hasRow = xResultSet->next();
-// no more rows
+CPPUNIT_ASSERT_MESSAGE("Cursor is not on last position.",
+ xResultSet->isLast()); // cursor is on last position
+CPPUNIT_ASSERT_EQUAL(ROW_COUNT, xResultSet->getRow()); // which is the
last position
+
+bool hasRow = xResultSet->next(); // go to afterlast
+// no more rows, next should return false
CPPUNIT_ASSERT_MESSAGE("next returns true after last row", !hasRow);
+// cursor should be in afterlast position
+CPPUNIT_ASSERT_EQUAL(ROW_COUNT + 1, xResultSet->getRow());
+CPPUNIT_ASSERT_MESSAGE("Cursor is not on after-last position.",
xResultSet->isAfterLast());
nUpdateCount = xStatement->executeUpdate("DROP TABLE myTestTable");
CPPUNIT_ASSERT_EQUAL(0, nUpdateCount); // it's a DDL statement
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 50ab0be3af16..392a037b3ed3 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -693,8 +693,14 @@ sal_Bool SAL_CALL OResultSet::next()
MutexGuard aGuard(m_aMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
ensureResultFetched();
-if (m_nRowPosition + 1 >= m_nRowCount)
+if (m_nRowPosition + 1 > m_nRowCount) // afterlast
return false;
+if (m_nRowPosition + 1 == m_nRowCount) // last
+{
+// return false but take it to afterlast anyway
+++m_nRowPosition;
+return false;
+}
++m_nRowPosition;
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5Menu.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 2d6dfead4b0546c28dcc864dc27488f83d190e3f
Author: Aleksei Nikiforov
AuthorDate: Fri Nov 23 15:24:00 2018 +0300
Commit: Samuel Mehrbrodt
CommitDate: Mon Nov 26 11:38:56 2018 +0100
Fix menu insertion to specified position
Change-Id: I61f870010003fae98d792f95d7fdac0e59d4305c
Reviewed-on: https://gerrit.libreoffice.org/63885
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 15e0136b18f3..8acaf1e5e410 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -74,7 +74,18 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem,
unsigned nPos)
if (pSalMenuItem->mpSubMenu)
{
// submenu
-pQMenu = pQMenu->addMenu(toQString(aText));
+if ((nPos != MENU_APPEND)
+&& (static_cast(nPos) <
static_cast(pQMenu->actions().size(
+{
+QMenu* pTempQMenu = new QMenu(toQString(aText), pQMenu);
+pQMenu->insertMenu(pQMenu->actions()[nPos], pTempQMenu);
+pQMenu = pTempQMenu;
+}
+else
+{
+pQMenu = pQMenu->addMenu(toQString(aText));
+}
+
mpQActionGroup = new QActionGroup(pQMenu);
connect(pQMenu, &QMenu::aboutToShow, this,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/inc sc/source
sc/inc/lookupcache.hxx |8 -
sc/source/core/tool/interpr1.cxx| 56
sc/source/core/tool/lookupcache.cxx | 13
3 files changed, 76 insertions(+), 1 deletion(-)
New commits:
commit 3d177795132c385ea7d5467c71cc964068290ebe
Author: Serge Krot
AuthorDate: Wed Oct 31 22:11:31 2018 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 26 11:33:32 2018 +0100
tdf#121052 sc: avoid multiple empty value lookups in ranges
Change-Id: I7759aef51af2f400f3f5ec69854fd9133e845f49
Reviewed-on: https://gerrit.libreoffice.org/62712
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Check isEmptyStringQuery() early to avoid call ..., tdf#121052 follow-up
... and comparison of lcl_getPrevRowWithEmptyValueLookup() result.
Change-Id: Ie4b848f30a0696cc40b04376c352a530b99190b9
Reviewed-on: https://gerrit.libreoffice.org/63840
Reviewed-by: Eike Rathke
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/64030
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 9e33c2b1d7ac..6e9ba2e27d2b 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -104,6 +104,10 @@ public:
(mbString ? (*mpStr == *r.mpStr) : (mfVal == r.mfVal));
}
+bool isEmptyStringQuery() const
+{
+return (getQueryOp() == QueryOp::EQUAL) && mbString && mpStr &&
mpStr->isEmpty();
+}
};
/// MUST be new'd because Notify() deletes.
@@ -112,11 +116,13 @@ public:
/// Remove from document structure and delete (!) cache on modify hint.
virtual void Notify( const SfxHint& rHint ) override;
-/// @returns document address in o_rAddress if Result==FOUND
+/// @returns document address in o_rResultAddress if Result==FOUND
Result lookup( ScAddress & o_rResultAddress,
const QueryCriteria & rCriteria,
const ScAddress & rQueryAddress ) const;
+SCROW lookup( const QueryCriteria & rCriteria ) const;
+
/** Insert query and result.
@param bAvailable
Pass sal_False if the search didn't deliver a result. A subsequent
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8d7313d56a78..7268fdb43275 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8688,6 +8688,44 @@ static bool lcl_LookupQuery( ScAddress & o_rResultPos,
ScDocument * pDoc,
return bFound;
}
+// tdf#121052:
+// =VLOOKUP(SearchCriterion; RangeArray; Index; Sorted)
+// [SearchCriterion] is the value searched for in the first column of the
array.
+// [RangeArray] is the reference, which is to comprise at least two columns.
+// [Index] is the number of the column in the array that contains the value
to be returned. The first column has the number 1.
+//
+// Prerequisite of lcl_getPrevRowWithEmptyValueLookup():
+// Value referenced by [SearchCriterion] is empty.
+// lcl_getPrevRowWithEmptyValueLookup() performs following checks:
+// - if we run query with "exact match" mode (i.e. VLOOKUP)
+// - and if we already have the same lookup done before but for another row
+// which is also had empty [SearchCriterion]
+//
+// then
+// we could say, that for current row we could reuse results of the cached
call which was done for the row2
+// In this case we return row index, which is >= 0.
+//
+// Elsewhere
+// -1 is returned, which will lead to default behavior =>
+// complete lookup will be done in RangeArray inside lcl_LookupQuery()
method.
+//
+// This method was added only for speed up to avoid several useless complete
+// lookups inside [RangeArray] for searching empty strings.
+//
+static SCROW lcl_getPrevRowWithEmptyValueLookup( const ScLookupCache& rCache,
+const ScLookupCache::QueryCriteria& rCriteria, const ScQueryParam &
rParam)
+{
+// is lookup value empty?
+const ScQueryEntry& rEntry = rParam.GetEntry(0);
+const ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
+if (! rItem.maString.getString().isEmpty())
+return -1; // not found
+
+// try to find the row index for which we have already performed lookup
+// and have some result of it inside cache
+return rCache.lookup( rCriteria );
+}
+
bool ScInterpreter::LookupQueryWithCache( ScAddress & o_rResultPos,
const ScQueryParam & rParam ) const
{
@@ -8711,6 +8749,24 @@ bool ScInterpreter::LookupQueryWithCache( ScAddress &
o_rResultPos,
ScLookupCache::QueryCriteria aCriteria( rEntry);
ScLookupCache::Result eCacheResult = rCache.lookup( o_rResultPos,
aCriteria, aPos);
+
+// tdf#121052: Slow load of cells with VLOOKUP with references to
empty cells
+// This check was added only for speed up to avo
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/dialog/versdlg.cxx | 204 +--
sfx2/source/inc/versdlg.hxx | 36 +-
sfx2/uiconfig/ui/versionscmis.ui | 168 +---
3 files changed, 153 insertions(+), 255 deletions(-)
New commits:
commit b1baf73dc671069bedec18d170f8199b0766ea60
Author: Caolán McNamara
AuthorDate: Sun Nov 25 20:18:11 2018 +
Commit: Caolán McNamara
CommitDate: Mon Nov 26 11:31:37 2018 +0100
weld SfxCmisVersionsDialog
Change-Id: I73fc8ba88021f3d1450d10a75970e1fd58f26c3f
Reviewed-on: https://gerrit.libreoffice.org/64002
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 7ceb3b7be93f..13724cf6a54c 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -111,105 +111,42 @@ SfxVersionInfo::SfxVersionInfo()
{
}
-void SfxVersionsTabListBox_Impl::KeyInput(const KeyEvent& rKeyEvent)
+namespace
{
-const vcl::KeyCode& rCode = rKeyEvent.GetKeyCode();
-switch (rCode.GetCode())
+void setColSizes(weld::TreeView& rVersionBox)
{
-case KEY_RETURN :
-case KEY_ESCAPE :
-case KEY_TAB :
-{
-Dialog *pParent = GetParentDialog();
-if (pParent)
-pParent->KeyInput(rKeyEvent);
-else
-SvSimpleTable::KeyInput(rKeyEvent);
-break;
-}
-default:
-SvSimpleTable::KeyInput( rKeyEvent );
-break;
-}
-}
-
-void SfxVersionsTabListBox_Impl::setColSizes()
-{
-HeaderBar &rBar = GetTheHeaderBar();
-if (rBar.GetItemCount() < 3)
-return;
-
-// recalculate the datetime column width
-long
nWidestTime(GetTextWidth(getWidestTime(Application::GetSettings().GetLocaleDataWrapper(;
-long nW1 = rBar.GetTextWidth(rBar.GetItemText(1));
+// recalculate the datetime column width
+int
nWidestTime(rVersionBox.get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
+int nW1 =
rVersionBox.get_pixel_size(rVersionBox.get_column_title(1)).Width();
-long nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
-const long nRest = GetSizePixel().Width() - nMax;
+int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little
offset
+const int nRest = rVersionBox.get_preferred_size().Width() - nMax;
-std::set aAuthors;
-SfxVersionInfo aInfo;
-aAuthors.insert(SvtUserOptions().GetFullName());
-
-for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
-{
-
aAuthors.insert(static_cast(pEntry->GetUserData())->aAuthor);
-}
+std::set aAuthors;
+SfxVersionInfo aInfo;
+aAuthors.insert(SvtUserOptions().GetFullName());
-long nMaxAuthorWidth = nRest/4;
-for (auto const& author : aAuthors)
-{
-nMaxAuthorWidth = std::max(nMaxAuthorWidth, GetTextWidth(author));
-if (nMaxAuthorWidth > nRest/2)
+for (int i = 0; i < rVersionBox.n_children(); ++i)
{
-nMaxAuthorWidth = nRest/2;
-break;
+
aAuthors.insert(reinterpret_cast(rVersionBox.get_id(i).toInt64())->aAuthor);
}
-}
-long aTabPositions[] = { 0, nMax, nMax + nMaxAuthorWidth };
-SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions,
MapUnit::MapPixel);
-}
-
-void SfxVersionsTabListBox_Impl::Resize()
-{
-SvSimpleTable::Resize();
-if (isInitialLayout(this))
-setColSizes();
-}
-
-void SfxVersionDialog::setColSizes()
-{
-// recalculate the datetime column width
-int
nWidestTime(m_xVersionBox->get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
-int nW1 =
m_xVersionBox->get_pixel_size(m_xVersionBox->get_column_title(1)).Width();
-
-int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
-const int nRest = m_xVersionBox->get_preferred_size().Width() - nMax;
-
-std::set aAuthors;
-SfxVersionInfo aInfo;
-aAuthors.insert(SvtUserOptions().GetFullName());
-
-for (int i = 0; i < m_xVersionBox->n_children(); ++i)
-{
-
aAuthors.insert(reinterpret_cast(m_xVersionBox->get_id(i).toInt64())->aAuthor);
-}
-
-int nMaxAuthorWidth = nRest/4;
-for (auto const& author : aAuthors)
-{
-nMaxAuthorWidth = std::max(nMaxAuthorWidth,
m_xVersionBox->get_pixel_size(author).Width());
-if (nMaxAuthorWidth > nRest/2)
+int nMaxAuthorWidth = nRest/4;
+for (auto const& author : aAuthors)
{
-nMaxAuthorWidth = nRest/2;
-break;
+nMaxAuthorWidth = std::max(nMaxAuthorWidth,
rVersionBox.get_pixel_size(author).Width());
+if (nMaxAuthorWidth > nRest/2)
+{
+nMaxAuthorWidth = nRest/2;
+break;
+}
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - include/vcl sfx2/source sfx2/uiconfig vcl/source vcl/unx
include/vcl/weld.hxx |1
sfx2/source/dialog/versdlg.cxx | 268 +--
sfx2/source/doc/objserv.cxx |6
sfx2/source/inc/versdlg.hxx | 42 ++---
sfx2/uiconfig/ui/versionsofdialog.ui | 176 --
vcl/source/app/salvtables.cxx| 15 +
vcl/source/treelist/treelistbox.cxx |4
vcl/unx/gtk3/gtk3gtkinst.cxx | 24 +++
8 files changed, 295 insertions(+), 241 deletions(-)
New commits:
commit d86d564290b9bff664ff871e77e11f3f5f307172
Author: Caolán McNamara
AuthorDate: Sun Nov 25 20:08:41 2018 +
Commit: Caolán McNamara
CommitDate: Mon Nov 26 11:31:01 2018 +0100
weld SfxVersionDialog
Change-Id: I0b69192a6eab9dadac892968a4a2d4fa3d9febde
Reviewed-on: https://gerrit.libreoffice.org/64023
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index ae7ed7505b1c..fa2ba7bcd03a 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -505,6 +505,7 @@ public:
virtual int get_height_rows(int nRows) const = 0;
virtual void set_column_fixed_widths(const std::vector& rWidths) = 0;
+virtual OUString get_column_title(int nColumn) const = 0;
virtual void set_selection_mode(bool bMultiple) = 0;
virtual int count_selected_rows() const = 0;
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index ddd974ec5a93..7ceb3b7be93f 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -133,13 +133,6 @@ void SfxVersionsTabListBox_Impl::KeyInput(const KeyEvent&
rKeyEvent)
}
}
-void SfxVersionsTabListBox_Impl::Resize()
-{
-SvSimpleTable::Resize();
-if (isInitialLayout(this))
-setColSizes();
-}
-
void SfxVersionsTabListBox_Impl::setColSizes()
{
HeaderBar &rBar = GetTheHeaderBar();
@@ -177,69 +170,85 @@ void SfxVersionsTabListBox_Impl::setColSizes()
SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions,
MapUnit::MapPixel);
}
-SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool
bIsSaveVersionOnClose )
-: SfxModalDialog(nullptr, "VersionsOfDialog", "sfx/ui/versionsofdialog.ui")
-, pViewFrame(pVwFrame)
-, m_bIsSaveVersionOnClose(bIsSaveVersionOnClose)
+void SfxVersionsTabListBox_Impl::Resize()
{
-get(m_pSaveButton, "save");
-get(m_pSaveCheckBox, "always");
-get(m_pOpenButton, "open");
-get(m_pViewButton, "show");
-get(m_pDeleteButton, "delete");
-get(m_pCompareButton, "compare");
-get(m_pCmisButton, "cmis");
+SvSimpleTable::Resize();
+if (isInitialLayout(this))
+setColSizes();
+}
-SvSimpleTableContainer *pContainer =
get("versions");
-Size aControlSize(260, 114);
-aControlSize = pContainer->LogicToPixel(aControlSize,
MapMode(MapUnit::MapAppFont));
-pContainer->set_width_request(aControlSize.Width());
-pContainer->set_height_request(aControlSize.Height());
+void SfxVersionDialog::setColSizes()
+{
+// recalculate the datetime column width
+int
nWidestTime(m_xVersionBox->get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
+int nW1 =
m_xVersionBox->get_pixel_size(m_xVersionBox->get_column_title(1)).Width();
-m_pVersionBox = VclPtr::Create(*pContainer,
WB_TABSTOP);
+int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
+const int nRest = m_xVersionBox->get_preferred_size().Width() - nMax;
-Link aClickLink = LINK( this, SfxVersionDialog,
ButtonHdl_Impl );
-m_pViewButton->SetClickHdl ( aClickLink );
-m_pSaveButton->SetClickHdl ( aClickLink );
-m_pDeleteButton->SetClickHdl ( aClickLink );
-m_pCompareButton->SetClickHdl ( aClickLink );
-m_pOpenButton->SetClickHdl ( aClickLink );
-m_pSaveCheckBox->SetClickHdl ( aClickLink );
-m_pCmisButton->SetClickHdl ( aClickLink );
+std::set aAuthors;
+SfxVersionInfo aInfo;
+aAuthors.insert(SvtUserOptions().GetFullName());
-m_pVersionBox->SetSelectHdl( LINK( this, SfxVersionDialog, SelectHdl_Impl
) );
-m_pVersionBox->SetDoubleClickHdl( LINK( this, SfxVersionDialog,
DClickHdl_Impl ) );
+for (int i = 0; i < m_xVersionBox->n_children(); ++i)
+{
+
aAuthors.insert(reinterpret_cast(m_xVersionBox->get_id(i).toInt64())->aAuthor);
+}
-m_pVersionBox->GrabFocus();
-m_pVersionBox->SetStyle( m_pVersionBox->GetStyle() | WB_HSCROLL |
WB_CLIPCHILDREN );
-m_pVersionBox->SetSelectionMode( SelectionMode::Single );
+int nMaxAuthorWidth = nRest/4;
+for (auto const& author : aAuthors)
+{
+nMaxAuthorWidth = std::max(nMaxAuthorWidth,
m_xVersionBox->get_pixel_size(author).Width());
+if (nMaxAuthorWidth > nRest/2)
+{
+nMaxAuthorWidth = nRest/2;
+break;
+}
+}
-long aTabPositions[] = { 0, 0, 0 };
-m_pVersionBox->
[Libreoffice-commits] core.git: compilerplugins/clang include/xmloff sw/source xmloff/source
compilerplugins/clang/unusedenumconstants.readonly.results |6 --
include/xmloff/shapeexport.hxx |2
include/xmloff/xmlexppr.hxx|7 --
sw/source/filter/xml/xmlexpit.cxx | 33 +++--
sw/source/filter/xml/xmlexpit.hxx |4 -
xmloff/source/style/xmlexppr.cxx |1
6 files changed, 11 insertions(+), 42 deletions(-)
New commits:
commit aaad3500b3d558836a776b162184cb0556850940
Author: Noel Grandin
AuthorDate: Mon Nov 26 10:14:58 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Nov 26 10:41:14 2018 +0100
remove some unused enum values in xmloff
(*) also make it more obvious what XMLShapeExportFlags::SIZE represents
Change-Id: Ie63edf0f2827f171542037b819ebe7d55e090275
Reviewed-on: https://gerrit.libreoffice.org/63948
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 3a5f2fc378cd..327ddeb57286 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1102,12 +1102,6 @@ include/xmloff/shapeexport.hxx:53
enum XMLShapeExportFlags WIDTH
include/xmloff/shapeexport.hxx:54
enum XMLShapeExportFlags HEIGHT
-include/xmloff/xmlexppr.hxx:35
-enum SvXmlExportFlags DEFAULTS
-include/xmloff/xmlexppr.hxx:36
-enum SvXmlExportFlags DEEP
-include/xmloff/xmlexppr.hxx:38
-enum SvXmlExportFlags EMPTY
include/xmloff/xmlimp.hxx:108
enum SvXMLImportFlags EMBEDDED
o3tl/qa/test-enumarray.cxx:30
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index def1bd936536..d9cb574deadc 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -52,7 +52,7 @@ enum class XMLShapeExportFlags {
POSITION = 0x0003,
WIDTH= 0x0004,
HEIGHT = 0x0008,
- SIZE = 0x000c,
+ SIZE = WIDTH | HEIGHT,
// when you set this flag a chart does NOT export its own data as table element
NO_CHART_DATA = 0x0010,
// When setting the flag below no ignorableWhiteSpace will be called around
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index b2f564e186ec..770572c3bd99 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -32,16 +32,11 @@
enum class SvXmlExportFlags {
NONE= 0x,
-DEFAULTS= 0x0001, // export also default items
-DEEP= 0x0002, // export also items from
- // parent item sets
-EMPTY = 0x0004, // export attribs element
- // even if its empty
IGN_WS = 0x0008
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
class SvXMLUnitConverter;
diff --git a/sw/source/filter/xml/xmlexpit.cxx
b/sw/source/filter/xml/xmlexpit.cxx
index 70172d3c6bf3..862066b8c0c5 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -66,7 +66,6 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport&
rExport,
const SfxItemSet& rSet,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap,
-SvXmlExportFlags nFlags,
std::vector *pIndexArray ) const
{
const sal_uInt16 nCount = mrMapEntries->getCount();
@@ -79,8 +78,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport&
rExport,
// we have a valid map entry here, so lets use it...
if( 0 == (rEntry.nMemberId & MID_SW_FLAG_NO_ITEM_EXPORT) )
{
-const SfxPoolItem* pItem = GetItem( rSet, rEntry.nWhichId,
-nFlags );
+const SfxPoolItem* pItem = GetItem( rSet, rEntry.nWhichId );
// do we have an item?
if(pItem)
{
@@ -232,7 +230,7 @@ void SvXMLExportItemMapper::exportElementItems(
OSL_ENSURE( 0 != (rEntry.nMemberId & MID_SW_FLAG_ELEMENT_ITEM_EXPORT),
"wrong mid flag!" );
-const SfxPoolItem* pItem = GetItem( rSet, rEntry.nWhichId, nFlags );
+const SfxPoolItem* pItem = GetItem( rSet, rEntry.nWhichId );
// do we have an item?
if(pItem)
{
@@ -248,30 +246,19 @@ void SvXMLExportItemMapper::exportElementItems(
}
/** returns the item with the given WhichId from the given ItemSet if its
-set or its default item if it's not set and the SvXmlExportFlags::DEEP
-is set in the flags
+set
*/
const SfxPoolItem* SvXMLExportItemMapper::GetItem( const SfxItemSet& rSet,
- s
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/notebookbar.ui | 754 + 1 file changed, 495 insertions(+), 259 deletions(-) New commits: commit ab86777f93754f1f40d8a7ed584422ddc05b9eb7 Author: andreas kainz AuthorDate: Sun Nov 25 21:47:41 2018 +0100 Commit: andreas_kainz CommitDate: Mon Nov 26 10:25:26 2018 +0100 NB tabbed impress: add shortcuts and Right2Left support Change-Id: Ic333dd44c980ace2f52057d795c29930515965f1 Reviewed-on: https://gerrit.libreoffice.org/64006 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index a9e6f7e171c7..97c23ade6fa9 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -1015,6 +1015,13 @@ + +True +False +.uno:VerticalText + + + True False @@ -2157,7 +2164,7 @@ True -False +True end True icons @@ -2184,7 +2191,7 @@ True -False +True end True icons @@ -2227,9 +2234,10 @@ _File True -False +True False False +end center True immediate @@ -2246,9 +2254,10 @@ _Help True -False +True False False +end center True immediate @@ -2309,7 +2318,7 @@ True -False +True center 5 True @@ -2343,7 +2352,7 @@ True -False +True both-horiz False @@ -2368,7 +2377,7 @@ True -False +True both-horiz False @@ -2428,7 +2437,7 @@ True -False +True center True both @@ -2462,7 +2471,7 @@ True -False +True False False .uno:RecentFileList @@ -2478,7 +2487,7 @@ True -False +True both-horiz False @@ -2538,7 +2547,7 @@ True -False +True center True both @@ -2572,7 +2581,7 @@ True -False +True both-horiz False @@ -2597,7 +2606,7 @@ True -False +True both-h
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/notebookbar.ui | 260 1 file changed, 206 insertions(+), 54 deletions(-) New commits: commit 79def472f6cc8338cafd7bef88fdc9b0485f4ca7 Author: andreas kainz AuthorDate: Sun Nov 25 21:43:00 2018 +0100 Commit: andreas_kainz CommitDate: Mon Nov 26 10:24:51 2018 +0100 NB tabbed draw: add shortcuts and Right2Left support Change-Id: I4531a32f38ecfc1cd26b092d84ec9da442a71ea9 Reviewed-on: https://gerrit.libreoffice.org/64005 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 33dd28c5d95e..4f315a0e39b6 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -1015,6 +1015,13 @@ + +True +False +.uno:VerticalText + + + True False @@ -2078,6 +2085,7 @@ True False False +end center True immediate @@ -2097,6 +2105,7 @@ True False False +end center True immediate @@ -2863,7 +2872,7 @@ True False -File +~File True @@ -3027,6 +3036,7 @@ True False False +end center True none @@ -3124,6 +3134,17 @@ True + + +True +False +.uno:VerticalText + + +False +True + + False @@ -3597,7 +3618,7 @@ 200 True -True +False both-horiz False @@ -4002,7 +4023,7 @@ True -True +False both-horiz False @@ -4026,7 +4047,7 @@ True -True +False icons False @@ -4108,7 +4129,7 @@ True False -Home +~Home True@@ -4841,6 +4862,7 @@ True False False +end center True none @@ -4909,7 +4931,7 @@@@ -4939,11 +4961,12 @@ vertical @@ -4533,6 +4541,22 @@ True + ++ + +False +True +0 ++