[Libreoffice-commits] core.git: basctl/source chart2/source include/svx sc/inc sc/source svx/source sw/inc sw/source
basctl/source/basicide/baside3.cxx|6 +--
basctl/source/inc/baside3.hxx |2 -
chart2/source/controller/inc/ChartController.hxx |2 -
chart2/source/controller/main/ChartController.cxx |6 ++-
include/svx/svdmodel.hxx |5 +-
sc/inc/drwlayer.hxx |2 -
sc/source/core/data/documen9.cxx |3 +
sc/source/core/data/drwlayer.cxx | 38 ++
sc/source/core/data/postit.cxx|9 ++---
sc/source/core/tool/detfunc.cxx | 16 -
sc/source/ui/docshell/docfunc.cxx | 24 ++---
sc/source/ui/docshell/docsh2.cxx |3 +
sc/source/ui/drawfunc/futext3.cxx |4 +-
sc/source/ui/inc/docfunc.hxx |2 -
sc/source/ui/inc/undobase.hxx |2 -
sc/source/ui/inc/undoblk.hxx |3 +
sc/source/ui/inc/undocell.hxx |6 +--
sc/source/ui/inc/undodraw.hxx |2 -
sc/source/ui/undo/undobase.cxx|4 +-
sc/source/ui/undo/undoblk3.cxx|4 +-
sc/source/ui/undo/undocell.cxx| 12 +++---
sc/source/ui/undo/undodraw.cxx|4 +-
sc/source/ui/view/drawview.cxx|2 -
sc/source/ui/view/viewfun3.cxx| 22 ++--
svx/source/svdraw/svdmodel.cxx|4 +-
sw/inc/doc.hxx|2 -
sw/source/core/doc/DocumentDrawModelManager.cxx |5 +-
sw/source/core/undo/undraw.cxx|6 +--
28 files changed, 101 insertions(+), 99 deletions(-)
New commits:
commit 6be7e2e9dd8027d284f1b00ef6e3b4654eec7d79
Author: Noel Grandin
AuthorDate: Thu Aug 30 13:54:33 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 08:27:48 2018 +0200
pass SdrUndoAction around by std::unique_ptr
convert the LINK we use here to std::function, since LINK
does not currently handle std::unique_ptr
Change-Id: I9df80352e612445e5f5ca513d7d4196d65589778
Reviewed-on: https://gerrit.libreoffice.org/59804
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index 91e1d4972539..dfa698a4a345 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -83,7 +83,7 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent,
ScriptDocument const& rD
InitSettings();
m_pEditor->GetModel().SetNotifyUndoActionHdl(
-LINK(this, DialogWindow, NotifyUndoActionHdl)
+::NotifyUndoActionHdl
);
SetHelpId( HID_BASICIDE_DIALOGWINDOW );
@@ -217,13 +217,11 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
}
-IMPL_STATIC_LINK(
-DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, pUndoAction, void )
+void DialogWindow::NotifyUndoActionHdl( std::unique_ptr )
{
// #i120515# pUndoAction needs to be deleted, this hand over is an
ownership
// change. As long as it does not get added to the undo manager, it needs
at
// least to be deleted.
-delete pUndoAction;
}
void DialogWindow::DoInit()
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 6d332ca90c65..0277d9cba92e 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -72,7 +72,7 @@ protected:
virtual voidCommand( const CommandEvent& rCEvt ) override;
virtual voidLoseFocus() override;
-DECL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void
);
+static void NotifyUndoActionHdl( std::unique_ptr );
virtual voidDoInit() override;
virtual voidDoScroll( ScrollBar* pCurScrollBar ) override;
virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 3397a1bcf5d1..3ad81a5848ca 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -332,7 +332,7 @@ public:
void SetAndApplySelection(const css::uno::Reference&
rxShape);
void StartTextEdit( const Point* pMousePixel = nullptr );
-DECL_LINK( NotifyUndoActionHdl, SdrUndoAction*, void );
+void NotifyUndoActionHdl( std::unique_ptr );
css::uno::Reference const & getChartView();
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index cd9e889066e3..9fbc7b6de301 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -73,6 +73,7 @@
#include
#include
+#include
#include
#include
#include
@@
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk solenv/flatpak-manifest.in
Makefile.fetch |1 Repository.mk |1 download.lst |2 + external/more_fonts/ExternalPackage_sourceserif.mk | 27 + external/more_fonts/Module_more_fonts.mk |2 + external/more_fonts/UnpackedTarball_sourceserif.mk | 14 ++ solenv/flatpak-manifest.in |6 7 files changed, 53 insertions(+) New commits: commit 3ff21b52de4047a03c4fcd82daff8aff588aebc3 Author: heiko tietze AuthorDate: Thu Aug 23 13:54:53 2018 +0200 Commit: Heiko Tietze CommitDate: Mon Sep 3 09:04:46 2018 +0200 tdf#79022 - Please bundle Source Serif Pro Source Serif added Change-Id: Ibbdbd2556852e7c4e19357d332990646aec7a43d Reviewed-on: https://gerrit.libreoffice.org/59498 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/Makefile.fetch b/Makefile.fetch index 59aadccaffe3..3f8250a98cb0 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,6 +177,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 56174af8ef07..5f62c277b33d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -982,6 +982,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ + fonts_sourceserif \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 3532e2be3aa3..ac11b65846f6 100644 --- a/download.lst +++ b/download.lst @@ -66,6 +66,8 @@ export FONT_SOURCECODE_SHA256SUM := 09466dce8765f189acd8358c60c6736dcd95f042 export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz +export FONT_SOURCESERIF_SHA256SUM := 10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb +export FONT_SOURCESERIF_TARBALL := source-serif-font-2.007R.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 diff --git a/external/more_fonts/ExternalPackage_sourceserif.mk b/external/more_fonts/ExternalPackage_sourceserif.mk new file mode 100644 index ..6a5272bbaa7a --- /dev/null +++ b/external/more_fonts/ExternalPackage_sourceserif.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourceserif,font_sourceserif)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourceserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + SourceSerifPro-BoldIt.ttf \ + SourceSerifPro-ExtraLight.ttf \ + SourceSerifPro-Light.ttf \ + SourceSerifPro-Semibold.ttf \ + SourceSerifPro-BlackIt.ttf \ + SourceSerifPro-Bold.ttf \ + SourceSerifPro-It.ttf \ + SourceSerifPro-Regular.ttf \ + SourceSerifPro-Black.ttf \ + SourceSerifPro-ExtraLightIt.ttf \ + SourceSerifPro-LightIt.ttf \ + SourceSerifPro-SemiboldIt.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index c6944cb6264e..c3d5631ae689 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_libre_hebrew \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ + ExternalPackage_sourceserif \ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -42,6 +43,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |7 +++
cui/source/dialogs/insrc.cxx |7 +++
2 files changed, 14 insertions(+)
New commits:
commit a3c8250c5b56a2cb40aa01b9a6a59e4daa1fd2f8
Author: heiko tietze
AuthorDate: Fri Aug 31 14:24:54 2018 +0200
Commit: Heiko Tietze
CommitDate: Mon Sep 3 09:05:11 2018 +0200
tdf#119293 - UI Consistency for inserting rows in Writer table
Labels are set now depending on row/col as left/right and above/below
Change-Id: I73b81660db1e4e8c3d0146f59e193744a3883583
Reviewed-on: https://gerrit.libreoffice.org/59867
Reviewed-by: Olivier Hallot
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 99e0b1b69030..9581676fed37 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -96,12 +96,19 @@
#define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
#define RID_SVXSTR_SELECTOR_RUN
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
#define RID_SVXSTR_ROW NC_("RID_SVXSTR_ROW",
"Insert Rows")
+// tdf#119293 Labels depending on row/col
+#define RID_SVXSTR_INSERTROW_BEFORE
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above the selection")
+#define RID_SVXSTR_INSERTROW_AFTER
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below the selection")
#define RID_SVXSTR_REMOVE_FAVORITES
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
#define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
#define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
// PPI is pixel per inch, %1 is a number
#define RID_SVXSTR_PPI NC_("RID_SVXSTR_PPI", "(%1
PPI)")
#define RID_SVXSTR_COL NC_("RID_SVXSTR_COL",
"Insert Columns")
+// tdf#119293 Labels depending on row/col
+#define RID_SVXSTR_INSERTCOL_BEFORE
NC_("RID_SVXSTR_INSERTCOL_BEFORE", "Left of the selection")
+#define RID_SVXSTR_INSERTCOL_AFTER
NC_("RID_SVXSTR_INSERTCOL_AFTER", "Right of the selection")
+
#define RID_SVXSTR_AUTO_ENTRY
NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic")
#define RID_SVXSTR_EDIT_GRAPHIC
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
#define RID_SVXSTR_LOADACCELCONFIG
NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration")
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 5cecafd62c82..eab54d16d6f7 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -40,6 +40,13 @@ SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool
bColumn, const OStr
, m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after"))
{
m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) :
CuiResId(RID_SVXSTR_ROW));
+if (bColumn) {
+m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_BEFORE));
+m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_AFTER));
+} else {
+m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_BEFORE));
+m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_AFTER));
+}
m_xDialog->set_help_id(rHelpId);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dptabres.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit fc5ab21dd326c28486e9cb668c50f417ab4455ee
Author: Caolán McNamara
AuthorDate: Sun Sep 2 21:20:40 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 3 10:00:36 2018 +0200
ofz#10189 check container size
Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161
Reviewed-on: https://gerrit.libreoffice.org/59911
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 30ee19333830..2e9e71df17ef 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2862,10 +2862,14 @@ void ScDPResultDimension::LateInitFrom(
{
if ( rParams.IsEnd( nPos ) )
return;
-OSL_ENSURE( nPos <= pItemData.size(),
OString::number(pItemData.size()).getStr() );
+if (nPos >= pItemData.size())
+{
+SAL_WARN("sc.core", "pos " << nPos << ", but vector size is " <<
pItemData.size());
+return;
+}
+SCROW rThisData = pItemData[nPos];
ScDPDimension* pThisDim = rParams.GetDim( nPos );
ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
-SCROW rThisData = pItemData[nPos];
if (!pThisDim || !pThisLevel)
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 06/3857bd52709009430d2c2a36d5b2dc80390769 21/a0c3efd32b0f0e32cf54d6278d87a37650db89
06/3857bd52709009430d2c2a36d5b2dc80390769 |1 + 21/a0c3efd32b0f0e32cf54d6278d87a37650db89 |1 + 2 files changed, 2 insertions(+) New commits: commit 094195a32a4fa3922266286963dacccdbd8ae582 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:09:57 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:09:57 2018 +0100 Notes added by 'git notes add' diff --git a/21/a0c3efd32b0f0e32cf54d6278d87a37650db89 b/21/a0c3efd32b0f0e32cf54d6278d87a37650db89 new file mode 100644 index ..8ebbe55237b1 --- /dev/null +++ b/21/a0c3efd32b0f0e32cf54d6278d87a37650db89 @@ -0,0 +1 @@ +ignore: obsolete commit eec8e9fc0e4ea014cb461764c009c71928df6fc6 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:09:42 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:09:42 2018 +0100 Notes added by 'git notes add' diff --git a/06/3857bd52709009430d2c2a36d5b2dc80390769 b/06/3857bd52709009430d2c2a36d5b2dc80390769 new file mode 100644 index ..8ebbe55237b1 --- /dev/null +++ b/06/3857bd52709009430d2c2a36d5b2dc80390769 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 11/11f7e1d4441b59e22c57c3f2cb1f301d2df331 fe/f9de97922f56fcbeee4926124c9cc8f5a054b1
11/11f7e1d4441b59e22c57c3f2cb1f301d2df331 |1 + fe/f9de97922f56fcbeee4926124c9cc8f5a054b1 |1 + 2 files changed, 2 insertions(+) New commits: commit 5d13d82fb5e98670a13e0dc2d6711a256a23a5f8 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:09:07 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:09:07 2018 +0100 Notes added by 'git notes add' diff --git a/fe/f9de97922f56fcbeee4926124c9cc8f5a054b1 b/fe/f9de97922f56fcbeee4926124c9cc8f5a054b1 new file mode 100644 index ..8ebbe55237b1 --- /dev/null +++ b/fe/f9de97922f56fcbeee4926124c9cc8f5a054b1 @@ -0,0 +1 @@ +ignore: obsolete commit 5a021f8c06774bdc3e3e52a358a47d1e414732b3 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:08:44 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:08:44 2018 +0100 Notes added by 'git notes add' diff --git a/11/11f7e1d4441b59e22c57c3f2cb1f301d2df331 b/11/11f7e1d4441b59e22c57c3f2cb1f301d2df331 new file mode 100644 index ..8ebbe55237b1 --- /dev/null +++ b/11/11f7e1d4441b59e22c57c3f2cb1f301d2df331 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/xmluconv.cxx | 101 ++--
1 file changed, 36 insertions(+), 65 deletions(-)
New commits:
commit 238f180e0813368f697b77768b1ca50714ae47ed
Author: Eike Rathke
AuthorDate: Fri Aug 31 18:18:41 2018 +0200
Commit: Eike Rathke
CommitDate: Mon Sep 3 08:37:50 2018 +0200
SvXMLUnitConverter::convertDateTime: use tools::Time::GetClock()
... to not round up to the next magnitude.
Change-Id: Ibda6e014ae3bdbe021e208c8781f619b112bee21
Reviewed-on: https://gerrit.libreoffice.org/59887
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 76f9467b9fe4..237c041e92cc 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -319,61 +319,12 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer&
rBuffer,
bool bAddTimeIf0AM )
{
double fValue = fDateTime;
-sal_Int32 nValue = static_cast (::rtl::math::approxFloor
(fValue));
+const sal_Int32 nDays = static_cast (::rtl::math::approxFloor
(fValue));
Date aDate (aTempNullDate.Day, aTempNullDate.Month, aTempNullDate.Year);
-aDate.AddDays( nValue);
-fValue -= nValue;
-double fCount;
-if (nValue > 0)
- fCount = ::rtl::math::approxFloor
(log10(static_cast(nValue))) + 1;
-else if (nValue < 0)
- fCount = ::rtl::math::approxFloor (log10(static_cast(nValue *
-1))) + 1;
-else
-fCount = 0.0;
-sal_Int16 nCount = sal_Int16(fCount);
-bool bHasTime(false);
-double fHoursValue = 0;
-double fMinsValue = 0;
-double fSecsValue = 0;
-double f100SecsValue = 0;
-if (fValue > 0.0)
-{
-bHasTime = true;
-fValue *= 24;
-fHoursValue = ::rtl::math::approxFloor (fValue);
-fValue -= fHoursValue;
-fValue *= 60;
-fMinsValue = ::rtl::math::approxFloor (fValue);
-fValue -= fMinsValue;
-fValue *= 60;
-fSecsValue = ::rtl::math::approxFloor (fValue);
-fValue -= fSecsValue;
-if (fValue > 0.0)
-f100SecsValue = ::rtl::math::round( fValue,
XML_MAXDIGITSCOUNT_TIME - nCount);
-else
-f100SecsValue = 0.0;
+aDate.AddDays( nDays);
+fValue -= nDays;
+const bool bHasTime = (fValue > 0.0);
-if (f100SecsValue == 1.0)
-{
-f100SecsValue = 0.0;
-fSecsValue += 1.0;
-}
-if (fSecsValue >= 60.0)
-{
-fSecsValue -= 60.0;
-fMinsValue += 1.0;
-}
-if (fMinsValue >= 60.0)
-{
-fMinsValue -= 60.0;
-fHoursValue += 1.0;
-}
-if (fHoursValue >= 24.0)
-{
-fHoursValue -= 24.0;
-aDate.AddDays(1);
-}
-}
sal_Int16 nTempYear = aDate.GetYear();
assert(nTempYear != 0);
if (nTempYear < 0)
@@ -400,29 +351,49 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer&
rBuffer,
if (nTemp < 10)
rBuffer.append( '0');
rBuffer.append( sal_Int32( nTemp));
-if(bHasTime || bAddTimeIf0AM)
+if (bHasTime || bAddTimeIf0AM)
{
+double fCount;
+if (nDays > 0)
+fCount = ::rtl::math::approxFloor
(log10(static_cast(nDays))) + 1;
+else if (nDays < 0)
+fCount = ::rtl::math::approxFloor (log10(static_cast(nDays
* -1))) + 1;
+else
+fCount = 0.0;
+const int nDigits = sal_Int16(fCount) + 4; // +4 for *86400 in seconds
+const int nFractionDecimals = std::max( XML_MAXDIGITSCOUNT_TIME -
nDigits, 0);
+
+sal_uInt16 nHour, nMinute, nSecond;
+double fFractionOfSecond;
+// Pass the original date+time value for proper scaling and rounding.
+tools::Time::GetClock( fDateTime, nHour, nMinute, nSecond,
fFractionOfSecond, nFractionDecimals);
+
rBuffer.append( 'T');
-if (fHoursValue < 10)
+if (nHour < 10)
rBuffer.append( '0');
-rBuffer.append( sal_Int32( fHoursValue));
+rBuffer.append( sal_Int32( nHour));
rBuffer.append( ':');
-if (fMinsValue < 10)
+if (nMinute < 10)
rBuffer.append( '0');
-rBuffer.append( sal_Int32( fMinsValue));
+rBuffer.append( sal_Int32( nMinute));
rBuffer.append( ':');
-if (fSecsValue < 10)
+if (nSecond < 10)
rBuffer.append( '0');
-rBuffer.append( sal_Int32( fSecsValue));
-if (f100SecsValue > 0.0)
+rBuffer.append( sal_Int32( nSecond));
+if (nFractionDecimals)
{
-OUString a100th( ::rtl::math::doubleToUString( fValue,
+// nFractionDecimals+1 to not round up what GetClock() carefully
+// truncated.
+OUString aFraction( ::rtl::math::doubleToUString(
fFractionOfSecond,
rtl_math_StringFormat_F,
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 54/5e976cb77e5519621819cb48efb93d89b14c07
54/5e976cb77e5519621819cb48efb93d89b14c07 |1 + 1 file changed, 1 insertion(+) New commits: commit f092195dbd710c0f0c3cd663fb85b84ea56b1963 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:12:56 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:12:56 2018 +0100 Notes added by 'git notes add' diff --git a/54/5e976cb77e5519621819cb48efb93d89b14c07 b/54/5e976cb77e5519621819cb48efb93d89b14c07 new file mode 100644 index ..8ebbe55237b1 --- /dev/null +++ b/54/5e976cb77e5519621819cb48efb93d89b14c07 @@ -0,0 +1 @@ +ignore: obsolete ___ 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' - 2 commits - sc/source sw/source
sc/source/core/data/document.cxx |2 +-
sw/source/uibase/app/apphdl.cxx |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8a8e4e3fc338994883fbb7db8fb9447e1f99f012
Author: Michael Weghorn
AuthorDate: Thu Aug 30 12:59:06 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 3 10:12:51 2018 +0200
tdf#112454 Also consider last SCTAB in loop
Since 'rRange.aEnd.Tab()' is valid, it needs to
be included in the loop to get a valid result.
Reviewed-on: https://gerrit.libreoffice.org/59798
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit 03b361673d04f31e0602d2988e4df26eaeb53a34)
Conflicts:
sc/source/core/data/document.cxx
Backported.
Change-Id: I7b2447e059dc03444c56e7fc0b113e1b618dd510
Reviewed-on: https://gerrit.libreoffice.org/59878
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 9858b7004856a632778dde0dc7edddb14b673194)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 1c06c813c2f7..f5a3218301f5 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6730,7 +6730,7 @@ bool ScDocument::ContainsNotesInRange( const ScRangeList&
rRange ) const
for( size_t i = 0; i < rRange.size(); ++i)
{
const ScRange* pRange = rRange[i];
-for( SCTAB nTab = pRange->aStart.Tab(); nTab < pRange->aEnd.Tab();
++nTab )
+for( SCTAB nTab = pRange->aStart.Tab(); nTab <= pRange->aEnd.Tab();
++nTab )
{
bool bContainsNote = maTabs[nTab]->ContainsNotesInRange( *pRange );
if(bContainsNote)
commit d576955f513509a2740ab2e40b4523bf1a6b17ac
Author: Ilhan Yesil
AuthorDate: Tue Aug 28 18:39:57 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 3 10:12:50 2018 +0200
tdf#117823 Save mail merge config item in new view
The config object is now saved in a newly created document.
Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0.
Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6
Reviewed-on: https://gerrit.libreoffice.org/59728
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c)
Reviewed-on: https://gerrit.libreoffice.org/59803
(cherry picked from commit 55498d196c31c098b02da5f4638fc0ca155b60b4)
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 27dbf41be1ce..5952313aabd4 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -532,6 +532,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl,
Dialog&, void )
std::shared_ptr xMMConfig =
m_pView->GetMailMergeConfigItem();
if (pNewView)
{
+pNewView->SetMailMergeConfigItem(xMMConfig);
m_pView = pNewView;
xMMConfig->DocumentReloaded();
//new source view!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 49/4f05f40eb4e5fed708d1f598ba5d63049dc07e
49/4f05f40eb4e5fed708d1f598ba5d63049dc07e |1 + 1 file changed, 1 insertion(+) New commits: commit 32ced64442292a983266126b589021585d8283b1 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:12:19 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:12:19 2018 +0100 Notes added by 'git notes add' diff --git a/49/4f05f40eb4e5fed708d1f598ba5d63049dc07e b/49/4f05f40eb4e5fed708d1f598ba5d63049dc07e new file mode 100644 index ..8ebbe55237b1 --- /dev/null +++ b/49/4f05f40eb4e5fed708d1f598ba5d63049dc07e @@ -0,0 +1 @@ +ignore: obsolete ___ 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 35215cd023b81612f8a2b33160be9ff9e3fcf422 Author: Andras Timar AuthorDate: Mon Sep 3 11:50:38 2018 +0200 Commit: Andras Timar CommitDate: Mon Sep 3 11:50:38 2018 +0200 Bump version to 6.0-8 Change-Id: I2f3c6a1d8eea3dc00a221c81704f1724df65a226 diff --git a/configure.ac b/configure.ac index f521b9f272bd..c6161b1a0e1f 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.7],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.0.10.8],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/source include/sal
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx | 32
++
include/sal/log-areas.dox |1
2 files changed, 23 insertions(+), 10 deletions(-)
New commits:
commit 40a286c9d09e65a9dda8c6ae228a76ab3da411e5
Author: Tamas Bunth
AuthorDate: Wed Aug 29 10:49:52 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 3 10:05:45 2018 +0200
mysqlc: Add library to log areas and put some
warnings into databasemetadata
Change-Id: I4c2841e9174e738fff6b8627f8860588c7838c49
Reviewed-on: https://gerrit.libreoffice.org/59755
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
Reviewed-on: https://gerrit.libreoffice.org/59869
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 1fe3f3976ae5..4319405ad9eb 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -29,6 +29,7 @@
#include
#include
+#include
#include
#include "mysqlc_general.hxx"
#include "mysqlc_statement.hxx"
@@ -101,6 +102,7 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getMaxCursorNameLength() { return 64; }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections()
{
+SAL_WARN("connectivity.mysqlc", "method not implemented");
// TODO
// SELECT @@max_connections
return 100;
@@ -110,6 +112,7 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getMaxColumnsInTable() { return 512; }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength()
{
+SAL_WARN("connectivity.mysqlc", "method not implemented");
// TODO
// "SHOW VARIABLES LIKE 'max_allowed_packet'"
return 32767;
@@ -123,18 +126,21 @@ sal_Bool SAL_CALL
ODatabaseMetaData::doesMaxRowSizeIncludeBlobs() { return true;
sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers()
{
+SAL_WARN("connectivity.mysqlc", "method not implemented");
// TODO
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers()
{
+SAL_WARN("connectivity.mysqlc", "method not implemented");
//TODO;
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
{
+SAL_WARN("connectivity.mysqlc", "method not implemented");
// TODO
return false;
}
@@ -142,18 +148,21 @@ sal_Bool SAL_CALL
ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers()
{
// TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers()
{
// TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers()
{
// TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return false;
}
@@ -262,6 +271,7 @@ sal_Bool SAL_CALL
ODatabaseMetaData::supportsTableCorrelationNames() { return tr
sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /*fromType*/,
sal_Int32 /*toType*/)
{
// TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return false;
}
@@ -291,17 +301,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll()
return m_rConnection.getMysqlVersion() >= 4;
}
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers()
-{
-// TODO
-return false;
-}
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() { return
false; }
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers()
-{
-// TODO
-return false;
-}
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers() {
return false; }
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd() { return false; }
@@ -363,6 +365,7 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getURL()
rtl::OUString SAL_CALL ODatabaseMetaData::getUserName()
{
// TODO execute "SELECT USER()"
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return rtl::OUString();
}
@@ -391,6 +394,7 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() {
return rtl::OUString
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
{
// TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return MARIADBC_VERSION_MAJOR;
}
@@ -403,6 +407,7 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getDefaultTransactionIsolation()
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
{
// TODO
+SAL_WARN("connectivity.mysqlc", "method not implemented");
return MARIADBC_VERSION_MINOR;
}
@@ -859,6 +864,7 @@ Reference
UNO_QUERY);
std::vector> rRows;
// TODO IMPL
+SAL_WARN("connectivity.mysqlc", "method
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/Library_mysqlc.mk
connectivity/Library_mysqlc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 275a9245d6406b97f6429dc523ca9ad5d40a65ec Author: Stephan Bergmann AuthorDate: Sat Apr 7 12:46:22 2018 +0200 Commit: Miklos Vajna CommitDate: Mon Sep 3 10:36:18 2018 +0200 Don't link Library_mysqlc against -lnsl At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development headers and libraries. (It only still contains some binaries for backwards compatibility, in the libnsl sub-package: "This package provides the legacy version of libnsl library, for accessing NIS services.") The -lnsl was present ever since 4946c62f2943dfb3466cc4214a9c8ccd922669b5 "mysqlconnector: initial import from CWS mysqlnative", but appears to not be necessary (at least any more). Reviewed-on: https://gerrit.libreoffice.org/52536 Reviewed-by: Michael Stahl Tested-by: Jenkins (cherry picked from commit 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd) Conflicts: mysqlc/Library_mysqlc.mk Change-Id: I10b56cdc1a438fb2978125ae0acde0dbec747e78 diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk index 26add5bee4cc..e57f84aaf57f 100644 --- a/connectivity/Library_mysqlc.mk +++ b/connectivity/Library_mysqlc.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\ $(eval $(call gb_Library_add_libs,mysqlc,\ $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\ - -rdynamic -lz -lcrypt -lnsl -lm)) \ + -rdynamic -lz -lcrypt -lm)) \ $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/fntcache.hxx |6 +-
sw/source/core/inc/swcache.hxx |6 +-
sw/source/core/inc/swfont.hxx | 92 ++--
sw/source/core/text/frmcrsr.cxx |2
sw/source/core/text/inftxt.cxx |2
sw/source/core/text/itratr.cxx | 12 ++--
sw/source/core/text/itratr.hxx |2
sw/source/core/text/porfld.cxx |2
sw/source/core/text/porrst.cxx |2
sw/source/core/text/redlnitr.cxx| 12 ++--
sw/source/core/text/txtdrop.cxx | 14 ++---
sw/source/core/text/txthyph.cxx | 10 +--
sw/source/core/txtnode/fntcache.cxx | 20 +++
sw/source/core/txtnode/fntcap.cxx | 12 ++--
sw/source/core/txtnode/swfntcch.cxx |2
sw/source/core/txtnode/swfont.cxx | 32 ++--
16 files changed, 114 insertions(+), 114 deletions(-)
New commits:
commit 2e8cc2f51284163a35e0efe22497efb9bdf64317
Author: Noel Grandin
AuthorDate: Fri Aug 31 15:02:36 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 09:56:51 2018 +0200
use less magic in sw/
rename the "magic" members and fields that are actually a font-cache-id,
to more useful names
Change-Id: Ie787b0939115c576e979c7e27a21a68c138c32f6
Reviewed-on: https://gerrit.libreoffice.org/59868
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 9bf8024c9f72..ee8a1d2971f7 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -55,7 +55,7 @@ public:
// Font cache, global variable, created/destroyed in txtinit.cxx
extern SwFntCache *pFntCache;
extern SwFntObj *pLastFont;
-extern sal_uInt8 *pMagicNo;
+extern sal_uInt8* mnFontCacheIdCounter;
/**
* Defines a substring on a given output device, to be used as an std::map<>
@@ -99,7 +99,7 @@ class SwFntObj : public SwCacheObj
static MapMode *pPixMap;
public:
-SwFntObj( const SwSubFont , const void* pOwner,
+SwFntObj( const SwSubFont , const void* nFontCacheId,
SwViewShell const *pSh );
virtual ~SwFntObj() override;
@@ -149,7 +149,7 @@ protected:
virtual SwCacheObj *NewObj( ) override;
public:
-SwFntAccess( const void * , sal_uInt16 , const void *pOwner,
+SwFntAccess( const void*& rnFontCacheId, sal_uInt16 , const void
*pOwner,
SwViewShell const *pShell,
bool bCheck = false );
SwFntObj* Get() { return static_cast( SwCacheAccess::Get() ); }
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 30410061b49f..2744b9f2f318 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -200,7 +200,7 @@ protected:
inline SwCacheObj *Get();
inline SwCacheAccess( SwCache , const void *pOwner, bool bSeek );
-inline SwCacheAccess( SwCache , const void *pOwner, const
sal_uInt16 nIndex );
+inline SwCacheAccess( SwCache , const void* nCacheId, const
sal_uInt16 nIndex );
public:
virtual ~SwCacheAccess();
@@ -233,11 +233,11 @@ inline SwCacheAccess::SwCacheAccess( SwCache , const
void *pOwn, bool bSeek )
m_pObj->Lock();
}
-inline SwCacheAccess::SwCacheAccess( SwCache , const void *pOwn,
+inline SwCacheAccess::SwCacheAccess( SwCache , const void* nCacheId,
const sal_uInt16 nIndex ) :
m_rCache( rC ),
m_pObj( nullptr ),
-m_pOwner( pOwn )
+m_pOwner( nCacheId )
{
if ( m_pOwner && nullptr != (m_pObj = m_rCache.Get( m_pOwner, nIndex )) )
m_pObj->Lock();
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 19596895847c..043836bad096 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -51,7 +51,7 @@ sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool
bVertFormat );
class SwSubFont : public SvxFont
{
friend class SwFont;
-const void *m_pMagic; // "MagicNumber" within the font cache
+const void* m_nFontCacheId; // "MagicNumber" within the font cache
Sizem_aSize; // foreigners only see this size
sal_uInt16 m_nFontIndex; // index in the font cache
sal_uInt16 m_nOrgHeight; // height including escapement/proportion
@@ -110,10 +110,10 @@ class SwSubFont : public SvxFont
short CheckKerning()
{ return GetFixKerning() >= 0 ? GetFixKerning() : CheckKerning_( ); }
void SetPropWidth( const sal_uInt16 nNew )
-{ m_pMagic = nullptr; m_nProportionalWidth = nNew; }
+{ m_nFontCacheId = nullptr; m_nProportionalWidth = nNew; }
public:
SwSubFont() : m_aSize(0,0)
-{ m_pMagic = nullptr; m_nFontIndex = m_nOrgHeight = m_nOrgAscent = 0;
m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; }
+{ m_nFontCacheId = nullptr; m_nFontIndex = m_nOrgHeight = m_nOrgAscent =
0; m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; }
sal_uInt16 GetPropWidth()
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - codemaker/GoogleTest_cppumaker.mk Module_ooo.mk postprocess/packcomponents Repository.mk scaddins/AllLangResTarget_analysis.mk scaddins/AllLangResT
Module_ooo.mk |1 Repository.mk |2 codemaker/GoogleTest_cppumaker.mk |2 postprocess/packcomponents/makefile.mk |3 - scaddins/AllLangResTarget_analysis.mk | 44 scaddins/AllLangResTarget_date.mk | 42 +++ scaddins/Library_analysis.mk | 70 + scaddins/Library_date.mk | 64 ++ scaddins/Makefile | 32 +++ scaddins/Module_scaddins.mk| 34 scaddins/prj/build.lst |4 - scaddins/prj/d.lst | 11 - scaddins/prj/makefile.mk | 44 scaddins/source/analysis/analysis.cxx |4 - scaddins/source/datefunc/datefunc.cxx |4 - solenv/gbuild/Executable.mk|2 solenv/gbuild/GoogleTest.mk|2 solenv/gbuild/Library.mk |4 + solenv/gbuild/LinkTarget.mk| 29 +++-- solenv/gbuild/StaticLibrary.mk |2 solenv/gbuild/TargetLocations.mk |1 21 files changed, 363 insertions(+), 38 deletions(-) New commits: commit a7cfad66a718993e3a94bfacc0a4ce7ad08f9aa5 Author: Damjan Jovanovic AuthorDate: Mon Sep 3 06:12:40 2018 + Commit: Damjan Jovanovic CommitDate: Mon Sep 3 06:12:40 2018 + Allow specifying the .rdb file, and which UNO types to generate headers from, in the gbuild *_set_private_api function. Fix codemaker's makefile to use this. Port main/scaddins to gbuild. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index ca7635d58893..d2b40d35658e 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sane \ sax \ sc \ +scaddins \ sccomp \ sd \ sfx2 \ diff --git a/Repository.mk b/Repository.mk index 4d9dcf8489e6..c5318b09b54b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ agg \ +analysis \ animcore \ avmedia \ avmediagst \ @@ -86,6 +87,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cppcanvas \ ctl \ cui \ +date \ dba \ dbaxml \ dbmm \ diff --git a/codemaker/GoogleTest_cppumaker.mk b/codemaker/GoogleTest_cppumaker.mk index 3765ad4c7362..e61ab79f9123 100644 --- a/codemaker/GoogleTest_cppumaker.mk +++ b/codemaker/GoogleTest_cppumaker.mk @@ -32,7 +32,7 @@ $(eval $(call gb_GoogleTest_set_include,cppumaker_test,\ -I$(SRCDIR)/codemaker/inc/pch \ )) -$(eval $(call gb_GoogleTest_set_private_api,cppumaker_test,\ +$(eval $(call gb_GoogleTest_set_private_api,cppumaker_test,$(OUTDIR)/bin/udkapi.rdb,\ $(SRCDIR)/codemaker/test/cppumaker/types.idl \ )) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 4c0044c95c58..5b9efd1c7484 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -46,7 +46,6 @@ my_components = \ reflection \ stocservices \ abp \ -analysis \ basprov \ bib \ calc \ @@ -104,6 +103,8 @@ my_components = \ component/sc/util/sc \ component/sc/util/scd \ component/sc/util/vbaobj \ +component/scaddins/source/analysis/analysis \ +component/scaddins/source/datefunc/date \ component/sd/util/sd \ component/sd/util/sdd \ component/sfx2/util/sfx \ diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk new file mode 100644 index ..1e1e220b9f9e --- /dev/null +++ b/scaddins/AllLangResTarget_analysis.mk @@ -0,0 +1,44 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,analysis)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,analysis,scaddins)) + +$(eval $(call
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 08/d960805bfa5d69ac0ddba22b883dd388995207
08/d960805bfa5d69ac0ddba22b883dd388995207 |1 + 1 file changed, 1 insertion(+) New commits: commit 952ab0a19f43e084a2842944941fefc862aaa1f1 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:10:04 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:10:04 2018 +0100 Notes added by 'git notes add' diff --git a/08/d960805bfa5d69ac0ddba22b883dd388995207 b/08/d960805bfa5d69ac0ddba22b883dd388995207 new file mode 100644 index ..8e5c182e7789 --- /dev/null +++ b/08/d960805bfa5d69ac0ddba22b883dd388995207 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf82177_insideCellBorders.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx| 10 ++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4
3 files changed, 14 insertions(+)
New commits:
commit 4b5fcd417587cfb9e6d8b61ecb037ab165eeb5b9
Author: Justin Luth
AuthorDate: Mon Aug 27 20:26:15 2018 +0300
Commit: Miklos Vajna
CommitDate: Mon Sep 3 10:43:36 2018 +0200
tdf#82177 ooxmlimport: ignore direct insideV/H cell borders
17.4.25 insideV (Table Cell Inside Vertical Edges Border)
This element specifies the border which shall be displayed on
all interior vertical edges of the current group of table cells.
[Note: Although individual table cells have no concept
of n internal edge, which would render this property useless
in most cases, it is used to determine the cell borders to
apply to a specific group of cells as part of table
conditional formatting in a table style, for example, the
inside vertical edges on the set of cells in the header row.
end note]
So, I interpret this as insideV/H having meaning only within table
styles, and not when directly applied to a cell. The only
documents I've seen with insideV/H directly applied to a cell seem to
have been created by LO - which dumps them everywhere, redundantly.
Change-Id: Ie76e9af6845cc87b0b847050b031e57d95b1a31b
Reviewed-on: https://gerrit.libreoffice.org/59674
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf82177_insideCellBorders.docx
b/sw/qa/extras/ooxmlexport/data/tdf82177_insideCellBorders.docx
new file mode 100644
index ..f1f0d272d0a4
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf82177_insideCellBorders.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index e5ef60d164b6..33650378b229 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -485,6 +485,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82177_outsideCellBorders,
"tdf82177_outsideCellB
CPPUNIT_ASSERT_EQUAL(static_cast(0),
getProperty(xCell, "LeftBorder").LineWidth);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf82177_insideCellBorders,
"tdf82177_insideCellBorders.docx")
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference< text::XTextTable > xTable( xTables->getByIndex(0),
uno::UNO_QUERY );
+uno::Reference< table::XCell > xCell = xTable->getCellByName( "E4" );
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
getProperty(xCell, "TopBorder").LineWidth);
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
getProperty(xCell, "LeftBorder").LineWidth);
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
{
// This was 0, relative size of shape after bitmap was ignored.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 94861a74175a..bf9421c3aaad 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -669,6 +669,10 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
//aCellIterator points to a PropertyMapPtr;
if( *aCellIterator )
{
+// remove directly applied insideV/H borders since they are
meaningless without a context (tdf#82177)
+(*aCellIterator)->Erase(META_PROP_VERTICAL_BORDER);
+(*aCellIterator)->Erase(META_PROP_HORIZONTAL_BORDER);
+
pAllCellProps->InsertProps(rInfo.pTableDefaults);
sal_Int32 nCellStyleMask = 0;
___
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/source
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9581f62f33d6f912b38e3eb3b0513fcc7bc8bac0 Author: Andras Timar AuthorDate: Mon Sep 3 10:42:31 2018 +0200 Commit: Andras Timar CommitDate: Mon Sep 3 10:42:57 2018 +0200 fix for 'mysqlc: Use unique_ptr on C style arrays' Change-Id: I9460c6f8e52890ebb37ae59264ba9035b063f560 diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index dee5d091a353..cc8d3bbdfad5 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -649,7 +649,7 @@ sal_Bool SAL_CALL OPreparedResultSet::next() mysqlc_sdbc_driver::allocateSqlVar(_aData[i].buffer, m_aData[i].buffer_type, m_aFields[i].length); } -mysql_stmt_bind_result(m_pStmt, m_aData); +mysql_stmt_bind_result(m_pStmt, m_aData.get()); if (bFirstRun) mysql_stmt_store_result(m_pStmt); int failure = mysql_stmt_fetch(m_pStmt); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/useuniqueptr.cxx | 32 +++-
1 file changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 651a2dee1c8c5bb084aa6b84fd7171f35ff52305
Author: Noel Grandin
AuthorDate: Mon Sep 3 09:58:12 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 11:03:30 2018 +0200
loplugin:useuniqueptr update exclusions
Change-Id: I9c741dbaba772550b4d68406fff50d8b0ac60874
Reviewed-on: https://gerrit.libreoffice.org/59923
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/useuniqueptr.cxx
b/compilerplugins/clang/useuniqueptr.cxx
index cbcde8c2fce1..313d79edf9a7 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -116,6 +116,9 @@ public:
// WW8TabBandDesc
if (fn == SRCDIR "/sw/source/filter/ww8/ww8par2.cxx")
return;
+// ZipOutputStream, ownership of ZipEntry is horribly complicated here
+if (fn == SRCDIR "/package/source/zipapi/ZipOutputStream.cxx")
+return;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
}
@@ -410,6 +413,12 @@ void UseUniquePtr::CheckLoopDelete(const CXXMethodDecl*
methodDecl, const CXXDel
if (!memberExpr)
return;
+std::string fn(handler.getMainFileName());
+loplugin::normalizeDotDotInFilePath(fn);
+// OStorage_Impl::Commit very complicated ownership passing going on
+if (fn == SRCDIR "/package/source/xstor/xstorage.cxx")
+return;
+
CheckDeleteExpr(methodDecl, deleteExpr, memberExpr, "rather manage with
std::some_container>");
}
@@ -433,6 +442,12 @@ void UseUniquePtr::CheckCXXForRangeStmt(const
CXXMethodDecl* methodDecl, const C
if (!fieldDecl)
return;
+std::string fn(handler.getMainFileName());
+loplugin::normalizeDotDotInFilePath(fn);
+// appears to just randomly leak stuff, and it involves some lex/yacc stuff
+if (fn == SRCDIR "/idlc/source/aststack.cxx")
+return;
+
CheckDeleteExpr(methodDecl, deleteExpr, memberExpr, "rather manage with
std::some_container>");
}
@@ -654,9 +669,6 @@ bool UseUniquePtr::VisitCXXDeleteExpr(const CXXDeleteExpr*
deleteExpr)
// SAXEventKeeperImpl::smashBufferNode
if (fn == SRCDIR "/xmlsecurity/source/framework/saxeventkeeperimpl.cxx")
return true;
-// ZipOutputStream, ownership of ZipEntry is horribly complicated here
-if (fn == SRCDIR "/package/source/zipapi/ZipOutputStream.cxx")
-return true;
// SwDoc::DeleteExtTextInput
if (fn == SRCDIR "/sw/source/core/doc/extinput.cxx")
return true;
@@ -720,12 +732,22 @@ bool
UseUniquePtr::TraverseConstructorInitializer(CXXCtorInitializer * ctorInit)
return true;
if
(!loplugin::TypeCheck(ctorInit->getMember()->getType()).Class("unique_ptr").StdNamespace())
return true;
-auto constructExpr = dyn_cast(ctorInit->getInit());
-if (!constructExpr)
+auto constructExpr =
dyn_cast_or_null(ctorInit->getInit());
+if (!constructExpr || constructExpr->getNumArgs() == 0)
return true;
auto init = constructExpr->getArg(0)->IgnoreImpCasts();
if (!isa(init))
return true;
+
+StringRef fn =
getFileNameOfSpellingLoc(compiler.getSourceManager().getSpellingLoc(ctorInit->getSourceLocation()));
+// don't feel like fiddling with the yacc parser
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/idlc/"))
+return true;
+// cannot change URE
+if (loplugin::hasPathnamePrefix(fn, SRCDIR
"/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx"))
+return true;
+
+
report(
DiagnosticsEngine::Warning,
"should be passing via std::unique_ptr param",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/dbdocimp.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 9e28155909a5d3295e2a531731790a42fdb4c8a2
Author: Jochen Nitschke
AuthorDate: Sun Sep 2 11:38:22 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 08:33:56 2018 +0200
cppcheck: knownConditionTrueFalse
Change-Id: I6ee2dd049b2482d93b5d05754c11b34bf535e377
Reviewed-on: https://gerrit.libreoffice.org/59907
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/docshell/dbdocimp.cxx
b/sc/source/ui/docshell/dbdocimp.cxx
index df9b96129c2f..49c1cf8d542b 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -140,7 +140,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const
ScImportParam& rParam,
ScDocShellModificator aModificator( rDocShell );
bool bSuccess = false;
-bool bApi = false; //! pass as argument
bool bTruncated = false;// for warning
const char* pErrStringId = nullptr;
OUString aErrorMessage;
@@ -602,10 +601,10 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const
ScImportParam& rParam,
if (pWaitWin)
pWaitWin->LeaveWait();
-if ( bTruncated && !bApi ) // show warning
+if ( bTruncated ) // show warning
ErrorHandler::HandleError(SCWARN_IMPORT_RANGE_OVERFLOW);
}
-else if ( !bApi )
+else
{
if (pWaitWin)
pWaitWin->LeaveWait();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/basmgr/basmgr.cxx|9 -
basic/source/classes/sbunoobj.cxx |2 +-
basic/source/classes/sbxmod.cxx |6 +++---
basic/source/sbx/sbxdec.cxx |6 +++---
4 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 89b47b5eb272f26ea829dcd0fc9cd6a98160fe76
Author: Jochen Nitschke
AuthorDate: Sun Sep 2 14:52:11 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 08:34:25 2018 +0200
cppcheck: useInitializationList in basic
Change-Id: I97fefc25076c2c163f6010745081772ee8c17712
Reviewed-on: https://gerrit.libreoffice.org/59908
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index e4841ce100e9..8318466c88f1 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -384,12 +384,11 @@ public:
BasicLibInfo::BasicLibInfo()
+: aStorageName(szImbedded)
+, aRelStorageName(szImbedded)
+, bDoLoad(false)
+, bReference(false)
{
-bReference = false;
-bDoLoad = false;
-mxScriptCont= nullptr;
-aStorageName= szImbedded;
-aRelStorageName = szImbedded;
}
BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index ddf92c07638b..376bae1217b7 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4407,8 +4407,8 @@ struct StarBasicDisposeItem
explicit StarBasicDisposeItem( StarBASIC* pBasic )
: m_pBasic( pBasic )
+, m_pRegisteredVariables(new SbxArray())
{
-m_pRegisteredVariables = new SbxArray();
}
};
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index fd6713b6eb49..51bb267c7060 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1665,10 +1665,10 @@ class ErrorHdlResetter
Link mErrHandler;
boolmbError;
public:
-ErrorHdlResetter() : mbError( false )
+ErrorHdlResetter()
+: mErrHandler(StarBASIC::GetGlobalErrorHdl()) // save error handler
+, mbError( false )
{
-// save error handler
-mErrHandler = StarBASIC::GetGlobalErrorHdl();
// set new error handler
StarBASIC::SetGlobalErrorHdl( LINK( this, ErrorHdlResetter,
BasicErrorHdl ) );
}
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 4c9be3546afd..c71b031df2be 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -29,23 +29,24 @@
// Implementation SbxDecimal
SbxDecimal::SbxDecimal()
+: mnRefCount(0)
{
setInt( 0 );
-mnRefCount = 0;
}
SbxDecimal::SbxDecimal( const SbxDecimal& rDec )
+: mnRefCount(0)
{
#ifdef _WIN32
maDec = rDec.maDec;
#else
(void)rDec;
#endif
-mnRefCount = 0;
}
SbxDecimal::SbxDecimal
( const css::bridge::oleautomation::Decimal& rAutomationDec )
+: mnRefCount(0)
{
#ifdef _WIN32
maDec.scale = rAutomationDec.Scale;
@@ -56,7 +57,6 @@ SbxDecimal::SbxDecimal
#else
(void)rAutomationDec;
#endif
-mnRefCount = 0;
}
void SbxDecimal::fillAutomationDecimal
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/fntcache.hxx | 20
sw/source/core/txtnode/fntcache.cxx | 56 +---
2 files changed, 60 insertions(+), 16 deletions(-)
New commits:
commit aeff83240c88435d11590f5e9c6fe9927a508c6a
Author: Miklos Vajna
AuthorDate: Fri Aug 31 18:19:12 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 3 09:13:32 2018 +0200
sw: save more vcl layout calls in SwFntObj
This builds on top of commit 436b829f5b904d76039db0818cff5dedf1ae89f1
(sw: save one vcl layout call in SwFntObj::DrawText(), 2018-08-16), but
now layouts are shared not only inside SwFntObj::DrawText(), but also
between SwFntObj::GetTextSize() and SwFntObj::DrawText().
To get there, create an SwFntObj cache member that stores already
calculated vcl layouts. SwFntObj already derives from SwCacheObj, so no
need to explicitly expire this cache member.
Total number of GenericSalLayout::LayoutText() invocations go down from
8 to 5 with this when pressing a key in Writer.
Change-Id: Ifbe84a5c00025604f9c1331b56074b3dc27864b5
Reviewed-on: https://gerrit.libreoffice.org/59879
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 9edfd6d0e17b..9bf8024c9f72 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -20,8 +20,11 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
+#include
+
#include
#include
+#include
#include
#include "swcache.hxx"
#include "TextFrameIndex.hxx"
@@ -54,6 +57,20 @@ extern SwFntCache *pFntCache;
extern SwFntObj *pLastFont;
extern sal_uInt8 *pMagicNo;
+/**
+ * Defines a substring on a given output device, to be used as an std::map<>
+ * key.
+ */
+struct SwTextGlyphsKey
+{
+VclPtr m_pOutputDevice;
+OUString m_aText;
+sal_Int32 m_nIndex;
+sal_Int32 m_nLength;
+
+};
+bool operator<(const SwTextGlyphsKey& l, const SwTextGlyphsKey& r);
+
class SwFntObj : public SwCacheObj
{
friend class SwFntAccess;
@@ -75,6 +92,9 @@ class SwFntObj : public SwCacheObj
bool m_bSymbol : 1;
bool m_bPaintBlank : 1;
+/// Cache of already calculated layout glyphs.
+std::map m_aTextGlyphs;
+
static long nPixWidth;
static MapMode *pPixMap;
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 49b1224501ed..2845d223db86 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -98,23 +98,23 @@ long EvalGridWidthAdd( const SwTextGridItem *const pGrid,
const SwDrawTextInfo &
}
/**
- * Pre-calculates glyph items for the rendered subset of rInf's text, assuming
+ * Pre-calculates glyph items for the rendered subset of rKey's text, assuming
* outdev state does not change between the outdev calls.
*/
-SalLayoutGlyphs* lcl_CreateLayout(SwDrawTextInfo& rInf, const OUString& rText,
sal_Int32 nIdx,
- sal_Int32 nLen, SalLayoutGlyphs& rTextGlyphs)
+SalLayoutGlyphs* lcl_CreateLayout(SwTextGlyphsKey& rKey, SalLayoutGlyphs&
rTextGlyphs)
{
-// Not the string we want to pre-calculate.
-if (rText != rInf.GetText() || nIdx != rInf.GetIdx() || nLen !=
rInf.GetLen())
-return nullptr;
-
// Use pre-calculated result.
if (!rTextGlyphs.empty())
return
+if (rKey.m_nIndex >= rKey.m_aText.getLength())
+// Same as in OutputDevice::GetTextArray().
+return nullptr;
+
// Calculate glyph items.
-std::unique_ptr pLayout = rInf.GetOut().ImplLayout(
-rText, nIdx, nLen, Point(0, 0), 0, nullptr,
SalLayoutFlags::GlyphItemsOnly);
+std::unique_ptr pLayout
+= rKey.m_pOutputDevice->ImplLayout(rKey.m_aText, rKey.m_nIndex,
rKey.m_nLength, Point(0, 0), 0,
+ nullptr,
SalLayoutFlags::GlyphItemsOnly);
if (!pLayout)
return nullptr;
@@ -129,6 +129,27 @@ SalLayoutGlyphs* lcl_CreateLayout(SwDrawTextInfo& rInf,
const OUString& rText, s
}
}
+bool operator<(const SwTextGlyphsKey& l, const SwTextGlyphsKey& r)
+{
+if (l.m_pOutputDevice.get() < r.m_pOutputDevice.get())
+return true;
+if (l.m_pOutputDevice.get() > r.m_pOutputDevice.get())
+return false;
+if (l.m_aText < r.m_aText)
+return true;
+if (l.m_aText > r.m_aText)
+return false;
+if (l.m_nIndex < r.m_nIndex)
+return true;
+if (l.m_nIndex > r.m_nIndex)
+return false;
+if (l.m_nLength < r.m_nLength)
+return true;
+if (l.m_nLength > r.m_nLength)
+return false;
+return false;
+};
+
void SwFntCache::Flush( )
{
if ( pLastFont )
@@ -810,8 +831,6 @@ void SwFntObj::DrawText( SwDrawTextInfo )
vcl::Font* pTmpFont = bUseScrFont ? m_pScrFont : m_pPrtFont;
-SalLayoutGlyphs aTextGlyphs;
-
// bDirectPrint and
[Libreoffice-commits] core.git: qadevOOo/tests sc/source
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 44 ++--
sc/source/core/data/docpool.cxx |2
2 files changed, 30 insertions(+), 16 deletions(-)
New commits:
commit 08b5048198d59441cb8033ed14cd17e68c943004
Author: heiko tietze
AuthorDate: Tue Aug 28 11:09:03 2018 +0200
Commit: Heiko Tietze
CommitDate: Mon Sep 3 09:05:31 2018 +0200
tdf#99296 - Disable headers/footers by default
Change-Id: I9232c879cebdcb92236322e4d4a12048d9fec00f
Reviewed-on: https://gerrit.libreoffice.org/59696
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 74670742c8ae..d7ff676f5a0e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -106,6 +106,35 @@ public class ScAccessiblePageHeader extends TestCase {
e.printStackTrace(log);
}
+XStyleFamiliesSupplier StyleFam = UnoRuntime.queryInterface(
+XStyleFamiliesSupplier.class,
+xSpreadsheetDoc );
+XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
+XStyle StdStyle = null;
+
+XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject(
+new Type(XNameAccess.class),
+StyleFamNames.getByName("PageStyles"));
+StdStyle = (XStyle) AnyConverter.toObject(
+new Type(XStyle.class), PageStyles.getByName("Default"));
+
+//get the property-set
+final XPropertySet PropSet =
UnoRuntime.queryInterface(XPropertySet.class, StdStyle);
+
+// tdf#99296 - Disable headers/footers by default
+try {
+PropSet.setPropertyValue("HeaderIsOn", Boolean.TRUE);
+PropSet.setPropertyValue("FooterIsOn", Boolean.TRUE);
+} catch (com.sun.star.beans.UnknownPropertyException upe) {
+log.println("Don't know the Property 'HeaderIsOn' or
'FooterIsOn'");
+} catch (com.sun.star.lang.WrappedTargetException wte) {
+log.println("WrappedTargetException while setting Property
'HeaderIsOn' or 'FooterIsOn'");
+} catch (com.sun.star.lang.IllegalArgumentException iae) {
+log.println("IllegalArgumentException while setting Property
'HeaderIsOn' or 'FooterIsOn'");
+} catch (com.sun.star.beans.PropertyVetoException pve) {
+log.println("PropertyVetoException while setting Property
'HeaderIsOn' or 'FooterIsOn'");
+}
+
XModel aModel = UnoRuntime.queryInterface(XModel.class,
xSpreadsheetDoc);
XController xController = aModel.getCurrentController();
@@ -151,21 +180,6 @@ public class ScAccessiblePageHeader extends TestCase {
TestEnvironment tEnv = new TestEnvironment(oObj);
-XStyleFamiliesSupplier StyleFam = UnoRuntime.queryInterface(
-XStyleFamiliesSupplier.class,
-xSpreadsheetDoc );
-XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
-XStyle StdStyle = null;
-
-XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject(
-new Type(XNameAccess.class),
-StyleFamNames.getByName("PageStyles"));
-StdStyle = (XStyle) AnyConverter.toObject(
-new Type(XStyle.class), PageStyles.getByName("Default"));
-
-//get the property-set
-final XPropertySet PropSet =
UnoRuntime.queryInterface(XPropertySet.class, StdStyle);
-
XHeaderFooterContent RPHC = null;
// creation of testobject here
// first we write what we are intend to do to log file
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index f117d783c35a..f199e49a26e2 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -293,7 +293,7 @@ ScDocumentPool::ScDocumentPool()
mvPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new
SvxSizeItem( ATTR_PAGE_SIZE );
mvPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_HORCENTER );
mvPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_VERCENTER );
-mvPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_ON, true );
+mvPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_ON, false );
mvPoolDefaults[ ATTR_PAGE_DYNAMIC- ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_DYNAMIC, true );
mvPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_SHARED, true );
mvPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_PAGE_NOTES, false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/source
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |2 +-
connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 5ca8b9752c3afb8a688279aa2306c80ef34f1297
Author: Tamas Bunth
AuthorDate: Fri Aug 31 18:20:50 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 3 10:08:38 2018 +0200
mysqlc: implement beforeFirst and fix findColumn
Change-Id: I9a12ef6c61b83f588be89ed9aff301d570155d74
Reviewed-on: https://gerrit.libreoffice.org/59881
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 695f6973512e..dee5d091a353 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -118,7 +118,7 @@ sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const
rtl::OUString& columnNam
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed);
-MYSQL_FIELD* pFields = mysql_fetch_field(m_pResult);
+MYSQL_FIELD* pFields = mysql_fetch_fields(m_pResult);
for (sal_Int32 i = 0; i < m_nFieldCount; ++i)
{
if (columnName.equalsIgnoreAsciiCaseAscii(pFields[i].name))
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index aa2f821fb868..9fa2f64613c0 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -142,7 +142,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const
rtl::OUString& columnName)
MutexGuard aGuard(m_aMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-MYSQL_FIELD* pFields = mysql_fetch_field(m_pResult);
+MYSQL_FIELD* pFields = mysql_fetch_fields(m_pResult);
for (unsigned int i = 0; i < fieldCount; ++i)
{
if (columnName.equalsIgnoreAsciiCaseAscii(pFields[i].name))
@@ -541,8 +541,7 @@ void SAL_CALL OResultSet::beforeFirst()
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-
-
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::beforeFirst",
*this);
+mysql_data_seek(m_pResult, 0);
}
void SAL_CALL OResultSet::afterLast()
___
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/source
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 15
+++---
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 15
++
connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |2 -
connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx |2 -
4 files changed, 15 insertions(+), 19 deletions(-)
New commits:
commit 5ef1ea2339c2e527f1ab5e0189e7db4f7b1c9a94
Author: Tamas Bunth
AuthorDate: Fri Aug 31 11:11:02 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 3 10:08:02 2018 +0200
mysqlc: Use unique_ptr on C style arrays
Change-Id: Id65487191c29f7af1a171c06345034d1dc5b20ec
Reviewed-on: https://gerrit.libreoffice.org/59856
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
Reviewed-on: https://gerrit.libreoffice.org/59871
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 7b84661b8e21..695f6973512e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -84,8 +84,6 @@ OPreparedResultSet::OPreparedResultSet(OConnection& rConn,
OPreparedStatement* p
m_aFields = mysql_fetch_fields(m_pResult);
}
-OPreparedResultSet::~OPreparedResultSet() {}
-
void OPreparedResultSet::disposing()
{
OPropertySetHelper::disposing();
@@ -502,11 +500,8 @@ void SAL_CALL OPreparedResultSet::close()
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed);
-if (m_aData)
-{
-delete[] m_aData;
-delete[] m_aMetaData;
-}
+m_aData.reset();
+m_aMetaData.reset();
if (m_pResult)
mysql_free_result(m_pResult);
@@ -633,9 +628,9 @@ sal_Bool SAL_CALL OPreparedResultSet::next()
if (m_aData == nullptr)
{
bFirstRun = true;
-m_aData = new MYSQL_BIND[m_nFieldCount];
-memset(m_aData, 0, m_nFieldCount * sizeof(MYSQL_BIND));
-m_aMetaData = new BindMetaData[m_nFieldCount];
+m_aData.reset(new MYSQL_BIND[m_nFieldCount]);
+memset(m_aData.get(), 0, m_nFieldCount * sizeof(MYSQL_BIND));
+m_aMetaData.reset(new BindMetaData[m_nFieldCount]);
}
for (sal_Int32 i = 0; i < m_nFieldCount; ++i)
{
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
index 5cbb37f5bd6d..93690d194fdf 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
@@ -62,17 +62,20 @@ class OPreparedResultSet final : public OBase_Mutex,
OConnection& m_rConnection;
css::uno::WeakReferenceHelper m_aStatement;
css::uno::Reference m_xMetaData;
-MYSQL_RES* m_pResult;
-MYSQL_STMT* m_pStmt;
+
+// non-owning pointers
+MYSQL_RES* m_pResult = nullptr;
+MYSQL_STMT* m_pStmt = nullptr;
+MYSQL_FIELD* m_aFields = nullptr;
+
rtl_TextEncoding m_encoding;
sal_Int32 m_nCurrentField = 0;
sal_Int32 m_nFieldCount;
// Use c style arrays, because we have to work with pointers
// on these.
-MYSQL_BIND* m_aData = nullptr;
-MYSQL_FIELD* m_aFields = nullptr;
-BindMetaData* m_aMetaData = nullptr;
+std::unique_ptr m_aData;
+std::unique_ptr m_aMetaData;
bool m_bWasNull = false;
@@ -90,7 +93,7 @@ class OPreparedResultSet final : public OBase_Mutex,
void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
SAL_OVERRIDE;
// you can't delete objects of this type
-virtual ~OPreparedResultSet() override;
+virtual ~OPreparedResultSet() override = default;
public:
virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index c52b587fba55..aa2f821fb868 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -108,8 +108,6 @@ OResultSet::OResultSet(OConnection& rConn,
OCommonStatement* pStmt, MYSQL_RES* p
fieldCount = mysql_num_fields(pResult);
}
-OResultSet::~OResultSet() {}
-
void OResultSet::disposing()
{
OPropertySetHelper::disposing();
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
index c4a203cda91e..9bfd8ecc1aef 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
@@ -87,7 +87,7 @@ class OResultSet final : public OBase_Mutex,
void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
SAL_OVERRIDE;
// you can't delete objects of this type
-virtual
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/source
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx | 64
+-
1 file changed, 58 insertions(+), 6 deletions(-)
New commits:
commit 16e9c0079d7881ada95a9813c2aa07c927c85286
Author: Tamas Bunth
AuthorDate: Fri Aug 31 10:10:50 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 3 10:07:09 2018 +0200
mysqlc: implement getImportedKeys
Change-Id: Ic819389000b5b31de69bece6b280cf89f93db948
Reviewed-on: https://gerrit.libreoffice.org/59851
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
Reviewed-on: https://gerrit.libreoffice.org/59870
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 4319405ad9eb..e4d70bed516a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -895,16 +895,68 @@ Reference SAL_CALL
ODatabaseMetaData::getExportedKeys(const Any& /*c
}
Reference SAL_CALL ODatabaseMetaData::getImportedKeys(const Any&
/*catalog*/,
- const
rtl::OUString& /*schema*/,
- const
rtl::OUString& /*table*/)
+ const
rtl::OUString& schema,
+ const
rtl::OUString& table)
{
Reference
xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
UNO_QUERY);
-std::vector> rRows;
-// TODO implement
-SAL_WARN("connectivity.mysqlc", "method not implemented");
-lcl_setRows_throw(xResultSet, 9, rRows);
+
+rtl::OUString query(
+"SELECT refi.CONSTRAINT_CATALOG, k.COLUMN_NAME, "
+" refi.UNIQUE_CONSTRAINT_CATALOG, "
+" refi.UNIQUE_CONSTRAINT_SCHEMA, refi.REFERENCED_TABLE_NAME,
k.REFERENCED_COLUMN_NAME, "
+" refi.UPDATE_RULE, refi.DELETE_RULE, refi.CONSTRAINT_NAME "
+" FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS as refi"
+" INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE as k ON
k.CONSTRAINT_NAME = "
+"refi.CONSTRAINT_NAME "
+" and k.TABLE_NAME = refi.TABLE_NAME "
+" WHERE refi.CONSTRAINT_SCHEMA LIKE "
+"'?' AND refi.TABLE_NAME='?'"); // TODO
+query = query.replaceFirst("?", schema);
+query = query.replaceFirst("?", table);
+
+std::vector> aRows;
+Reference statement = m_rConnection.createStatement();
+Reference rs = statement->executeQuery(query.getStr());
+Reference xRow(rs, UNO_QUERY_THROW);
+
+while (rs->next())
+{
+std::vector aRow{ Any() }; // 0. element is unused
+
+// primary key catalog
+aRow.push_back(makeAny(xRow->getString(1)));
+// primary key schema
+aRow.push_back(makeAny(schema));
+// primary key table
+aRow.push_back(makeAny(table));
+// primary column name
+aRow.push_back(makeAny(xRow->getString(2)));
+
+// fk table catalog
+aRow.push_back(makeAny(xRow->getString(3)));
+// fk schema
+aRow.push_back(makeAny(xRow->getString(4)));
+// fk table
+aRow.push_back(makeAny(xRow->getString(5)));
+// fk column name
+aRow.push_back(makeAny(xRow->getString(6)));
+// KEY_SEQ
+aRow.push_back(makeAny(sal_Int32{ 0 })); // TODO
+// update rule
+aRow.push_back(makeAny(xRow->getShort(7)));
+// delete rule
+aRow.push_back(makeAny(xRow->getShort(8)));
+// foreign key name
+aRow.push_back(makeAny(xRow->getShort(9)));
+// primary key name
+aRow.push_back(makeAny(OUString{})); // TODO
+// deferrability
+aRow.push_back(makeAny(Deferrability::NONE));
+aRows.push_back(aRow);
+}
+lcl_setRows_throw(xResultSet, 1, aRows);
return xResultSet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 42/3afc8ac55c22f9a7481072213bef91350dc04a
42/3afc8ac55c22f9a7481072213bef91350dc04a |1 + 1 file changed, 1 insertion(+) New commits: commit 723cf9ecb30c689ae0f368eaacb090de6e9ae3ff Author: Caolán McNamara AuthorDate: Mon Sep 3 09:08:32 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 09:08:32 2018 +0100 Notes added by 'git notes add' diff --git a/42/3afc8ac55c22f9a7481072213bef91350dc04a b/42/3afc8ac55c22f9a7481072213bef91350dc04a new file mode 100644 index ..6746598c671c --- /dev/null +++ b/42/3afc8ac55c22f9a7481072213bef91350dc04a @@ -0,0 +1 @@ +prefer: a4312af08cbd8c69ba4bead9608f3bf549caf7a0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: regarding tdf#91367 - replace ApiTokenSequence and UNO formulas in OOXML calc import
Hi Rahul, On Saturday, 2018-09-01 08:22:02 +0530, Rahul Gurung wrote: > I found this bug cool and want to work on it, Welcome! > but the data given on > comments weren't enough for my level of intelligence ( a beginner ), thus I > need more background on this bug and what I really need to do. I just added comment 15 there in the bug, https://bugs.documentfoundation.org/show_bug.cgi?id=91367#c15 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Weekly QA Report (W35-2018)
Hello, What have happened in QA in the last 7 days? * 128 bugs have been reported by 95 people. + Link: http://tinyurl.com/ycmtz79a * Top 15 reporters: + Jim Raykowski (7) + andreas_k (7) + Telesto (4) + Gabor Kelemen (4) + vaaydayaasra (3) + Timur (3) + Aron Budea (3) + 21Naown (3) + Buovjaga (2) + robert (2) + Werner (2) + Kamil Landa (2) + Diogo G. Sousa (2) + Doce Infância (2) + kompilainenn (2) * 52 bugs reported haven't been triaged yet. + Link: http://tinyurl.com/y758uq6p * Total number of unconfirmed bugs: 478 * 1209 comments have been written by 200 people. * 51 new people have signed up to Bugzilla. == STATUSES CHANGED == * 1 bug has been changed from 'ASSIGNED' to 'NEEDINFO'. + Link: http://tinyurl.com/y7yrowjt + Done by: Heiko Tietze (1) * 6 bugs have been changed from 'ASSIGNED' to 'NEW'. + Link: http://tinyurl.com/yc8az9nr + Done by: Xisco Faulí (4), gianluca.delfino (1), balazs.varga991 (1) * 25 bugs have been changed from 'ASSIGNED' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y9gecupy + Done by: Mike Kaganski (4), Miklos Vajna (3), Jim Raykowski (3) Justin L (3), Caolán McNamara (3), Adolfo Jayme (2) László Németh (1), Maxim Monastirsky (1), Eike Rathke (1) * 1 bug has been changed from 'NEEDINFO' to 'ASSIGNED'. + Link: http://tinyurl.com/y7yrowjt + Done by: Heiko Tietze (1) * 2 bugs have been changed from 'NEEDINFO' to 'NEW'. + Link: http://tinyurl.com/ycgtga7h + Done by: Xisco Faulí (1), Buovjaga (1) * 5 bugs have been changed from 'NEEDINFO' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/ydz68c8a + Done by: Xisco Faulí (3), V Stuart Foote (1), Maxim Monastirsky (1) * 1 bug has been changed from 'NEEDINFO' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/yd53pdvh + Done by: Ola Smith (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/y8y9zwlz + Done by: m.a.riosv (1), Timur (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED INVALID'. + Link: http://tinyurl.com/ybcqpnnj + Done by: V Stuart Foote (1), Nikos (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/y98gm6c2 + Done by: Regina Henschel (1), Timur (1) * 1 bug has been changed from 'NEEDINFO' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/y7g6mg44 + Done by: Xisco Faulí (1) * 23 bugs have been changed from 'NEEDINFO' to 'UNCONFIRMED'. + Link: http://tinyurl.com/ycmmfq82 + Done by: nicolae788 (2), Hugo Rodrigues (1), Xisco Faulí (1) Thomas Bertels (1), seven (1), Ron (1), Peter (1), Pen (1) matthewnote (1), librelibre (1), legoroboticist (1) karsten.henning (1), john.kirk (1), Jay Michael (1) Buck Shockley (1), Michael Zapf (1), bloup38 (1) * 23 bugs have been changed from 'NEW' to 'ASSIGNED'. + Link: http://tinyurl.com/y9lc2nkk + Done by: Xisco Faulí (6), Mike Kaganski (3), Caolán McNamara (3) Heiko Tietze (2), Jim Raykowski (2), Michael Weghorn (2) Eike Rathke (1), balazs.varga991 (1) * 2 bugs have been changed from 'NEW' to 'NEEDINFO'. + Link: http://tinyurl.com/y82uekje + Done by: Xisco Faulí (1), Thomas Lendo (1) * 10 bugs have been changed from 'NEW' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/ycd882jd + Done by: Thomas Lendo (2), Maxim Monastirsky (2), Xisco Faulí (1) Nate Graham (1), Michael Stahl (1), Gabor Kelemen (1) * 21 bugs have been changed from 'NEW' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/ya3qcbb2 + Done by: Jim Raykowski (3), Maxim Monastirsky (3), Adolfo Jayme (3) Xisco Faulí (2), Julien Nabet (2), Heiko Tietze (1) Timur (1), Drew Jensen (1), Aron Budea (1) * 2 bugs have been changed from 'NEW' to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/ydb3rbxa + Done by: Xisco Faulí (1), Eike Rathke (1) * 2 bugs have been changed from 'NEW' to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/y9e2j8bc + Done by: Buovjaga (1), Aron Budea (1) * 10 bugs have been changed from 'NEW' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/yc4857x7 + Done by: Timur (5), Buovjaga (2), Regina Henschel (1) Kevin Holloway (1) * 3 bugs have been changed from 'NEW' to 'UNCONFIRMED'. + Link: http://tinyurl.com/y9v7f9bp + Done by: Xisco Faulí (1), Elmar (1), Timur (1)
[Libreoffice-commits] core.git: 2 commits - i18npool/source
i18npool/source/localedata/data/af_ZA.xml | 24 - i18npool/source/localedata/data/en_ZA.xml | 42 +++--- 2 files changed, 22 insertions(+), 44 deletions(-) New commits: commit 464154aa26ae77883dd59fcbaab9e084aa035c9d Author: Eike Rathke AuthorDate: Mon Sep 3 09:41:03 2018 +0200 Commit: Eike Rathke CommitDate: Mon Sep 3 13:38:23 2018 +0200 Related: tdf#119613 inherit af_ZA separators from identical en_ZA Also LC_FORMAT is already inherited. Change-Id: I166ac1b50329430139d3f243454d7fdd2069e4ad Reviewed-on: https://gerrit.libreoffice.org/59920 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/i18npool/source/localedata/data/af_ZA.xml b/i18npool/source/localedata/data/af_ZA.xml index e3fcf6f23015..dfaae6f3769c 100644 --- a/i18npool/source/localedata/data/af_ZA.xml +++ b/i18npool/source/localedata/data/af_ZA.xml @@ -28,29 +28,7 @@ South Africa - - - / - - , - : - , - ; - - - - - - - ‘ - ’ - “ - ” - -vm. -nm. -metric - + commit 5c10c448b299faf43d9df28bdb9dc4fbb00540aa Author: Eike Rathke AuthorDate: Mon Sep 3 09:20:53 2018 +0200 Commit: Eike Rathke CommitDate: Mon Sep 3 13:38:13 2018 +0200 tdf#119613 [*-ZA] decimal separator is comma, group separator is space Change-Id: I9152a419385cc894f973a7333ae03b75b7f79008 Reviewed-on: https://gerrit.libreoffice.org/59919 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/i18npool/source/localedata/data/af_ZA.xml b/i18npool/source/localedata/data/af_ZA.xml index a8eaaa1ff491..e3fcf6f23015 100644 --- a/i18npool/source/localedata/data/af_ZA.xml +++ b/i18npool/source/localedata/data/af_ZA.xml @@ -31,10 +31,10 @@ / - , - . + + , : - . + , ; diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml index 5b65d64a9a1b..b0584d8e1966 100644 --- a/i18npool/source/localedata/data/en_ZA.xml +++ b/i18npool/source/localedata/data/en_ZA.xml @@ -31,10 +31,10 @@ / - , - . + + , : - . + , ; @@ -60,55 +60,55 @@ 0 - 0.00 + 0,00 - #,##0 + # ##0 - #,##0.00 + # ##0,00 - #,###.00 + # ###,00 - #,##0_);(#,##0) + # ##0_);(# ##0) - #,##0.00_);(#,##0.00) + # ##0,00_);(# ##0,00) - 0.00E+000 + 0,00E+000 - 0.00E+00 + 0,00E+00 - ##0.00E+00 + ##0,00E+00 0% - 0.00% + 0,00% - [CURRENCY] #,##0;[CURRENCY]-#,##0 + [CURRENCY] # ##0;[CURRENCY]-# ##0 - [CURRENCY] #,##0.00;[CURRENCY]-#,##0.00 + [CURRENCY] # ##0,00;[CURRENCY]-# ##0,00 - [CURRENCY] #,##0;[RED][CURRENCY]-#,##0 + [CURRENCY] # ##0;[RED][CURRENCY]-# ##0 - [CURRENCY] #,##0.00;[RED][CURRENCY]-#,##0.00 + [CURRENCY] # ##0,00;[RED][CURRENCY]-# ##0,00 - #,##0.00 CCC + # ##0,00 CCC - [CURRENCY] #,##0.--;[RED][CURRENCY]-#,##0.-- + [CURRENCY] # ##0,--;[RED][CURRENCY]-# ##0,-- YY/MM/DD @@ -190,10 +190,10 @@ [HH]:MM:SS - MM:SS.00 + MM:SS,00 - [HH]:MM:SS.00 + [HH]:MM:SS,00 YY/MM/DD HH:MM ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9212201d70c33516efd16c8715716cf502a479c0 Author: Caolán McNamara AuthorDate: Mon Sep 3 09:17:30 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 15:36:57 2018 +0200 upgrade curl to 7.61.0 Change-Id: Iaaa83fc4146c2b91b1d1f1942882ab1e664f998b Reviewed-on: https://gerrit.libreoffice.org/59925 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/download.lst b/download.lst index ac11b65846f6..7e5c90600324 100644 --- a/download.lst +++ b/download.lst @@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 3d569869d27b48860210c758c4f313082103a5e58219a7669b52 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_SHA256SUM := e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5 -export CURL_TARBALL := curl-7.60.0.tar.gz +export CURL_SHA256SUM := ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720 +export CURL_TARBALL := curl-7.61.0.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8 ___ 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/inc sd/source
sd/inc/stlpool.hxx | 10 +++ sd/inc/stlsheet.hxx | 13 + sd/source/core/drawdoc.cxx |2 - sd/source/core/drawdoc3.cxx | 42 +++- sd/source/core/stlpool.cxx | 26 +-- sd/source/ui/app/sdxfer.cxx |2 - sd/source/ui/func/unmovss.cxx | 23 ++--- sd/source/ui/inc/unmovss.hxx|4 +-- sd/source/ui/sidebar/DocumentHelper.cxx |2 - 9 files changed, 75 insertions(+), 49 deletions(-) New commits: commit b6b6d5c22e52c83af60eba077f0c5098f2198782 Author: Caolán McNamara AuthorDate: Wed Aug 22 10:08:42 2018 +0100 Commit: Miklos Vajna CommitDate: Mon Sep 3 16:34:02 2018 +0200 Resolves: tdf#119259 reused in-use SdStyleSheet removed by undo since... commit a4cd841541a729d7b8126d27d91fa28e30b01403 Date: Thu Feb 13 16:10:47 2014 +0530 n#757432: Styles (rename &) copy to different decks. While copying slides to different slide decks, styles were not being copied if there is already one with the same name. This patch renames and copies those to keep the formatting intact. if a SdStyleSheet is not freshly created, but reused, it ends up in the rCreatedSheets list, and so when the copy is undone (via SdMoveStyleSheetsUndoAction), the SdStyleSheet is unconditionally remove from the StylePool and so its ref count hits 0 and is removed, even though there are still objects depending on it. the problem becames more common since... bash-4.4$ git show 57db6e24b5ad43d447c30e44a112c74c7e75b46b commit 57db6e24b5ad43d447c30e44a112c74c7e75b46b Date: Tue Aug 15 02:51:07 2017 +0530 Removing old SfxItemSet::getHash usage improves the SfxItemSet comparison. Assuming that its correct to leave SdStyleSheetPool::CopySheets with those reused SdStyleSheets in the list, change things so that a flag is passed around to indicate if the SdStyleSheet should be removed or not by undo Change-Id: I82b5bd93183fd1ff9e67957ccfb5babef81fd36d Reviewed-on: https://gerrit.libreoffice.org/59434 Tested-by: Jenkins Tested-by: Xisco Faulí Reviewed-by: Miklos Vajna diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index cfe639038f9a..f4cf930d26e3 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -70,12 +70,12 @@ public: SD_DLLPUBLIC voidCreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false ); static void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector ); voidCreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets); -voidCopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); +voidCopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets); voidCopyGraphicSheets(SdStyleSheetPool& rSourcePool); voidCopyCellSheets(SdStyleSheetPool& rSourcePool); voidCopyTableStyles(SdStyleSheetPool const & rSourcePool); -voidCopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets); -voidRenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString const ); +voidCopyCellSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets); +voidRenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets, OUString const ); voidCreatePseudosIfNecessary(); voidUpdateStdNames(); @@ -117,8 +117,8 @@ public: private: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); -void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets ); -void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, const OUString ); +void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets ); +void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets, const OUString ); virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, SfxStyleSearchBits nMask) override; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index ae21105070a8..e8e0842e00c7 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -155,6 +155,19 @@ private: typedef std::vector< rtl::Reference< SdStyleSheet > > SdStyleSheetVector; +struct
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-animations.cxx | 57 +++---
1 file changed, 52 insertions(+), 5 deletions(-)
New commits:
commit ee883e6156668f1c6b9117b5f8507fd192584de8
Author: Mark Hung
AuthorDate: Thu Aug 30 22:53:26 2018 +0800
Commit: Mark Hung
CommitDate: Mon Sep 3 12:37:56 2018 +0200
sd/pptx export: utility class to further refactor.
Add NodeContext to wrap reference of XAnimationNode
and bMainSeqChild so that the node under processing can be
get via getCurrentNode() and isMainSeqChild() instead passing
arround via parameters.
Change-Id: Ie4be58211f4194fc2a24aa951c2110911c91d94e
Reviewed-on: https://gerrit.libreoffice.org/59876
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 3f7600fc74ce..65d17800e2df 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include "epptooxml.hxx"
@@ -451,9 +452,24 @@ sal_Int32 convertNodeType(sal_Int16 nType)
return xmlNodeType;
}
+class NodeContext;
+
+typedef std::unique_ptr NodeContextPtr;
+
+class NodeContext
+{
+const Reference& mxNode;
+const bool mbMainSeqChild;
+
+public:
+NodeContext(const Reference& xNode, bool bMainSeqChild);
+const Reference& getNode() const { return mxNode; }
+bool isMainSeqChild() const { return mbMainSeqChild; }
+};
+
class PPTXAnimationExport
{
-void WriteAnimationNode(const Reference& rXNode, bool
bMainSeqChild);
+void WriteAnimationNode(const NodeContextPtr& pContext);
void WriteAnimationNodeAnimate(const Reference& rXNode,
sal_Int32 nXmlNodeType,
bool bMainSeqChild);
void WriteAnimationNodeAnimateInside(const Reference&
rXNode,
@@ -464,9 +480,12 @@ class PPTXAnimationExport
void WriteAnimationNodeCommonPropsStart(const Reference&
rXNode,
bool bMainSeqChild);
void WriteAnimationTarget(const Any& rTarget);
+bool isMainSeqChild();
+const Reference& getCurrentNode();
PowerPointExport& mrPowerPointExport;
const FSHelperPtr& mpFS;
+const NodeContext* mpContext;
public:
PPTXAnimationExport(PowerPointExport& rExport, const FSHelperPtr& pFS);
@@ -490,7 +509,20 @@ void WriteAnimations(const FSHelperPtr& pFS, const
Reference& rXDrawP
PPTXAnimationExport::PPTXAnimationExport(PowerPointExport& rExport, const
FSHelperPtr& pFS)
: mrPowerPointExport(rExport)
, mpFS(pFS)
+, mpContext(nullptr)
+{
+}
+
+bool PPTXAnimationExport::isMainSeqChild()
{
+assert(mpContext);
+return mpContext->isMainSeqChild();
+}
+
+const Reference& PPTXAnimationExport::getCurrentNode()
+{
+assert(mpContext);
+return mpContext->getNode();
}
void PPTXAnimationExport::WriteAnimationTarget(const Any& rTarget)
@@ -953,7 +985,10 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart(
{
Reference
xChildNode(xEnumeration->nextElement(), UNO_QUERY);
if (xChildNode.is())
-WriteAnimationNode(xChildNode, nType ==
EffectNodeType::MAIN_SEQUENCE);
+{
+WriteAnimationNode(o3tl::make_unique(
+xChildNode, nType ==
EffectNodeType::MAIN_SEQUENCE));
+}
} while (xEnumeration->hasMoreElements());
mpFS->endElementNS(XML_p, XML_childTnLst);
@@ -1040,9 +1075,14 @@ void
PPTXAnimationExport::WriteAnimationNodeCommand(const Reference&
rXNode,
- bool bMainSeqChild)
+void PPTXAnimationExport::WriteAnimationNode(const NodeContextPtr& pContext)
{
+const NodeContext* pSavedContext = mpContext;
+mpContext = pContext.get();
+
+const Reference& rXNode = getCurrentNode();
+bool bMainSeqChild = isMainSeqChild();
+
SAL_INFO("sd.eppt", "export node type: " << rXNode->getType());
sal_Int32 xmlNodeType = convertNodeType(rXNode->getType());
@@ -1090,6 +1130,8 @@ void PPTXAnimationExport::WriteAnimationNode(const
Reference& rX
SAL_WARN("sd.eppt", "unhandled animation node: " <<
rXNode->getType());
break;
}
+
+mpContext = pSavedContext;
}
void PPTXAnimationExport::WriteAnimations(const Reference&
rXDrawPage)
@@ -1110,7 +1152,7 @@ void PPTXAnimationExport::WriteAnimations(const
Reference& rXDrawPage
mpFS->startElementNS(XML_p, XML_timing, FSEND);
mpFS->startElementNS(XML_p, XML_tnLst, FSEND);
-WriteAnimationNode(xNode, false);
+WriteAnimationNode(o3tl::make_unique(xNode,
false));
mpFS->endElementNS(XML_p, XML_tnLst);
mpFS->endElementNS(XML_p,
Re: Precedence between fo:line-height and style:line-height-at-least
hi Regina, On 01.09.2018 19:01, Regina Henschel wrote: Hi all, the ODF specification has only for value "normal" a rule for the precedence between the attributes fo:line-height [3] and style:line-height-at-least [1] and style:line-spacing [2]. So I want to extend the description. Unfortunately LibreOffice behaves so, that the attribute order determines the final style (examine attached file). But in XML the order of attributes is irrelevant. So what behavior would you like to be specified? i agree that having results depending on attribute order is in need of improvement, but i'm not sure what exactly the result should be in that case. maybe the "fo:line-height" should win, because it's an "exact" value, while "style:line-height-at-least" specifies only a lower bound? The attributes "style:line-height-at-least" and "style:line-spacing" are not supported for ODF by MS Office. I don't know, whether something similar exists in OOXML. okay then preferring "fo:line-height" would interop better with MS Office too... -- Michael Stahl Senior Software-Entwickler LibreOffice ––– CIB software GmbH Geschäftsstelle Hamburg Flachsland 10 22083 Hamburg ––– T +49 (40) / 28 48 42 -296 F +49 (40) / 28 48 42 -100 michael.st...@cib.de www.cib.de ––– Sitz: München Registergericht München, HRB 123286 Geschäftsführer: Dipl.-Ing. Ulrich Brandner ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/edit/edglbldc.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5967bae717c83a44d865558373acc08ee365de22
Author: Noel Grandin
AuthorDate: Mon Sep 3 11:32:02 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 13:14:24 2018 +0200
fix bug in SwEditShell::GetGlobalDocContent
ever since
commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62
Date: Mon Sep 18 23:08:29 2000 +
initial import
where it could insert an uninitialised pointer into the
SwGlblDocContents sorted vector
Change-Id: Id58778444593c39b5f80bac3a6dab8e14404030a
Reviewed-on: https://gerrit.libreoffice.org/59932
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index ec77cb82287a..e2f4dd71f7bf 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -67,7 +67,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents&
rArr ) const
const SwSection* pSect = rSectFormats[ --n ]->GetGlobalDocSection();
if( pSect )
{
-SwGlblDocContent* pNew;
+SwGlblDocContent* pNew = nullptr;
switch( pSect->GetType() )
{
case TOX_HEADER_SECTION:
@@ -81,7 +81,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents&
rArr ) const
pNew = new SwGlblDocContent( pSect );
break;
}
-if( !rArr.insert( pNew ).second )
+if( pNew && !rArr.insert( pNew ).second )
delete pNew;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/datetime/ttime.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 57cd494c9045d86d8337087be099c0a2e10beb23 Author: Stephan Bergmann AuthorDate: Mon Sep 3 13:50:51 2018 +0200 Commit: Stephan Bergmann CommitDate: Mon Sep 3 13:50:51 2018 +0200 Missing include Change-Id: Ib04de3f3f143cfa8a0c9d6171e329655d96527eb diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index e4a6afd50048..5a677b9b0dbf 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -19,6 +19,8 @@ #include +#include + #if defined(_WIN32) #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unosett.hxx | 34 +-
sw/source/core/unocore/unosett.cxx | 120 ++---
2 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit 009fdd4b83ba5ed66bd858784938fd6e246ddf75
Author: Miklos Vajna
AuthorDate: Mon Sep 3 09:12:36 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 3 16:01:48 2018 +0200
sw: prefix members of SwXTextColumns
Change-Id: I03add1c19ce225eeec92d6d3d43063b59c6b7967
Reviewed-on: https://gerrit.libreoffice.org/59917
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 1372c30126d0..e4203d3a315d 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -246,20 +246,20 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4
css::lang::XServiceInfo
>
{
-sal_Int32 nReference;
-css::uno::Sequence< css::text::TextColumn>aTextColumns;
-boolbIsAutomaticWidth;
-sal_Int32 nAutoDistance;
+sal_Int32 m_nReference;
+css::uno::Sequence< css::text::TextColumn>m_aTextColumns;
+boolm_bIsAutomaticWidth;
+sal_Int32 m_nAutoDistance;
const SfxItemPropertySet* m_pPropSet;
//separator line
-sal_Int32 nSepLineWidth;
-Color nSepLineColor;
-sal_Int8nSepLineHeightRelative;
-css::style::VerticalAlignment nSepLineVertAlign;
-boolbSepLineIsOn;
-sal_Int8nSepLineStyle;
+sal_Int32 m_nSepLineWidth;
+Color m_nSepLineColor;
+sal_Int8m_nSepLineHeightRelative;
+css::style::VerticalAlignment m_nSepLineVertAlign;
+boolm_bSepLineIsOn;
+sal_Int8m_nSepLineStyle;
protected:
virtual ~SwXTextColumns() override;
@@ -293,14 +293,14 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
-sal_Int32 GetSepLineWidth() const {return nSepLineWidth;}
-Color GetSepLineColor() const {return nSepLineColor;}
-sal_Int8GetSepLineHeightRelative() const {return
nSepLineHeightRelative;}
-css::style::VerticalAlignment GetSepLineVertAlign() const {return
nSepLineVertAlign;}
-boolGetSepLineIsOn() const {return bSepLineIsOn;}
-sal_Int8GetSepLineStyle() const {return nSepLineStyle;}
+sal_Int32 GetSepLineWidth() const {return m_nSepLineWidth;}
+Color GetSepLineColor() const {return m_nSepLineColor;}
+sal_Int8GetSepLineHeightRelative() const {return
m_nSepLineHeightRelative;}
+css::style::VerticalAlignment GetSepLineVertAlign() const {return
m_nSepLineVertAlign;}
+boolGetSepLineIsOn() const {return m_bSepLineIsOn;}
+sal_Int8GetSepLineStyle() const {return m_nSepLineStyle;}
-boolIsAutomaticWidth() const {return bIsAutomaticWidth;}
+boolIsAutomaticWidth() const {return m_bIsAutomaticWidth;}
};
#endif
diff --git a/sw/source/core/unocore/unosett.cxx
b/sw/source/core/unocore/unosett.cxx
index d88406c9b6a8..c1b1529534a7 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2295,49 +2295,49 @@ Sequence< OUString >
SwXTextColumns::getSupportedServiceNames()
}
SwXTextColumns::SwXTextColumns() :
-nReference(0),
-bIsAutomaticWidth(true),
-nAutoDistance(0),
+m_nReference(0),
+m_bIsAutomaticWidth(true),
+m_nAutoDistance(0),
m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_COLUMS)),
-nSepLineWidth(0),
-nSepLineColor(0), //black
-nSepLineHeightRelative(100),//full height
-nSepLineVertAlign(style::VerticalAlignment_MIDDLE),
-bSepLineIsOn(false),
-nSepLineStyle(API_COL_LINE_NONE) // None
+m_nSepLineWidth(0),
+m_nSepLineColor(0), //black
+m_nSepLineHeightRelative(100),//full height
+m_nSepLineVertAlign(style::VerticalAlignment_MIDDLE),
+m_bSepLineIsOn(false),
+m_nSepLineStyle(API_COL_LINE_NONE) // None
{
}
SwXTextColumns::SwXTextColumns(const SwFormatCol& rFormatCol) :
-nReference(0),
-aTextColumns(rFormatCol.GetNumCols()),
-bIsAutomaticWidth(rFormatCol.IsOrtho()),
+m_nReference(0),
+m_aTextColumns(rFormatCol.GetNumCols()),
+m_bIsAutomaticWidth(rFormatCol.IsOrtho()),
m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_COLUMS))
{
const sal_uInt16 nItemGutterWidth = rFormatCol.GetGutterWidth();
-nAutoDistance = bIsAutomaticWidth ?
+m_nAutoDistance = m_bIsAutomaticWidth ?
USHRT_MAX == nItemGutterWidth ? DEF_GUTTER_WIDTH :
static_cast(nItemGutterWidth)
: 0;
-
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/page.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 5a4ed4533127db8cf149353d587a7d3a89c5b338
Author: Caolán McNamara
AuthorDate: Mon Sep 3 10:09:55 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 3 13:52:12 2018 +0200
Resolves: tdf#119574 set specific width for style list widget
so super wide style name doesn't break things
Change-Id: I096eb1d3deeb935b43566b4d3ccb45d89ac2a56a
Reviewed-on: https://gerrit.libreoffice.org/59928
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df36ebf3a12d..054bc8fb16ed 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -183,6 +183,8 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent,
const SfxItemSet& rAttr)
, m_xPrintRangeQueryText(m_xBuilder->weld_label("labelMsg"))
, m_xBspWin(new weld::CustomWeld(*m_xBuilder, "drawingareaPageDirection",
m_aBspWin))
{
+
m_xRegisterLB->set_size_request(m_xRegisterLB->get_approximate_digit_width() *
20, -1);
+
bBorderModified = false;
m_aBspWin.EnableRTL(false);
@@ -1425,8 +1427,10 @@ void SvxPageDescPage::SetCollectionList(const
std::vector )
OSL_ENSURE(!aList.empty(), "Empty string list");
sStandardRegister = aList[0];
+m_xRegisterLB->freeze();
for (size_t i = 1; i < aList.size(); ++i)
m_xRegisterLB->append_text(aList[i]);
+m_xRegisterLB->thaw();
m_xRegisterCB->show();
m_xRegisterFT->show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to Build LO Eclipse
Howdy Shobhan, First, a little embarrassed that I somehow skipped visually what was there for instructions. Not sure I understand about the python project, that is the only reason I cloned the repository https://github.com/LibreOffice/loeclipse was to pickup the python support. There was no python folder created at that time, so maybe I did something wrong right there. Is there a different repository? Anyway, imported the source into eclipse (committer-photon june 2018) and I've tried building with ant outside eclipse. (not sure that it matters but for the LibreOffice installation I'm using the 6.2 master daily build and sdk) So far no love from either build, but down to only a few errors when done inside Eclipse (4 total); outside using ANT many more. Anyway, thanks for the response, it was a needed gentle slap on the back of the head ;-0 Will get back into later today and see if I can't get it all worked out. If really get stuck I'll ask more. Thanks for the work on the project and best wishes, Drew On Mon, Sep 3, 2018 at 8:38 AM Shobhan Mandal wrote: > Hello Drew, > > If you are looking forward to developing the eclipse addon directly from > the source, you can try the following:- > > *1.* Run this command (switch to the build folder in the downloaded > repository): >~/git/loeclipse/build$ *ant -Dlibreoffice.home=/usr/lib/libreoffice > -Declipse.home=/home/shobhan/Desktop//eclipse* > *2.* A new folder called 'site' is created beside the existing core, > java, python (*python folder will show up if there is Python module in > the repository that you downloaded*), build and script folder. > *3.* Go to Eclipse. Open the Help menu -> Install -> Click the Add button > -> Select Local -> Use the wizard to select the 'site' folder created in > above step. > > A concise version was mentioned under > https://github.com/LibreOffice/loeclipse#release-management > > If you are looking forward to contributing to the source code, following > the steps mentioned under > https://github.com/LibreOffice/loeclipse#development would help you get > started. > > Thanks and Regards, > Shobhan. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst Makefile.fetch
Rebased ref, commits from common ancestor: commit 5cedc9f4a2e7d1df5187ffcbde8de43c26ad7b0b Author: Thorsten Behrens AuthorDate: Sun Sep 2 23:57:55 2018 +0200 Commit: Thorsten Behrens CommitDate: Mon Sep 3 12:46:57 2018 +0200 fixup: libpng update This fixes 9b112ad6f8227b9edd1d83b9b7d7044e472f196d Change-Id: Ic8a5a9aa96f271711fe3108205f6e4adda816e92 diff --git a/Makefile.fetch b/Makefile.fetch index 47a8f9802c7b..a147e4a8c938 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -92,6 +92,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,NSS,NSS_TARBALL) \ $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ + $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ $(call fetch_Optional,ZLIB,ZLIB_TARBALL) \ @@ -158,7 +159,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,OPENLDAP,$(OPENLDAP_TARBALL)) \ $(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \ $(call fetch_Optional,CAIRO,$(PIXMAN_TARBALL)) \ - $(call fetch_Optional,LIBPNG,$(PNG_TARBALL)) \ $(call fetch_Optional,POPPLER,$(POPPLER_TARBALL)) \ $(call fetch_Optional,POSTGRESQL,$(POSTGRESQL_TARBALL)) \ $(call fetch_Optional,REDLAND,$(RAPTOR_TARBALL)) \ diff --git a/download.lst b/download.lst index d53cb9590313..802f2c3ae6ef 100644 --- a/download.lst +++ b/download.lst @@ -42,6 +42,8 @@ OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114 export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz ZLIB_MD5SUM := 85adef240c5f370b308da8c938951a68 export ZLIB_TARBALL := zlib-1.2.11.tar.xz +PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b +export PNG_TARBALL := libpng-1.5.24.tar.gz export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -102,8 +104,6 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b -export PNG_TARBALL := libpng-1.5.24.tar.gz export POPPLER_TARBALL := 1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz ___ 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' - vcl/win
vcl/win/window/salframe.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c0445201e035f2042187de806a3558da72b0c624
Author: Ilhan Yesil
AuthorDate: Mon Jul 30 11:56:22 2018 +0200
Commit: Thorsten Behrens
CommitDate: Mon Sep 3 14:14:40 2018 +0200
tdf#118994 JAWS has no access to accessibility objects
According to the MSDN, lParam must be cast to DWORD when examining
WM_GETOBJECT messages on 64-bit Windows. The MSDN example also
casts wParam, so in this solution, lParam and wParam are cast to
the appropriate types sal_Int32 and sal_uInt32.
Change-Id: I1edc00778c7da91d2baf5784e4c3f8c441e42eab
Reviewed-on: https://gerrit.libreoffice.org/58312
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit 200fafc341c9ac5cedb0e3e8a38fcc4e88fce77c)
Reviewed-on: https://gerrit.libreoffice.org/59935
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index b6865e83cb3e..7aeec51d8cac 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5290,12 +5290,15 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM
wParam, LRESULT & nRet)
uno::Reference< accessibility::XMSAAService > xMSAA(
pSVData->mxAccessBridge, uno::UNO_QUERY );
if ( xMSAA.is() )
{
+sal_Int32 lParam32 = (sal_Int32)lParam;
+sal_uInt32 wParam32 = (sal_uInt32)wParam;
+
// mhOnSetTitleWnd not set to reasonable value anywhere...
-if ( lParam == OBJID_CLIENT )
+if ( lParam32 == OBJID_CLIENT )
{
nRet = xMSAA->getAccObjectPtr(
-reinterpret_cast(hWnd), lParam, wParam);
-if( nRet != 0 )
+reinterpret_cast(hWnd), lParam32, wParam32);
+if (nRet != 0)
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/html loleaflet/Makefile.am Makefile.am
Makefile.am |8
configure.ac | 12
loleaflet/Makefile.am|1 +
loleaflet/html/loleaflet.html.m4 | 29 ++---
4 files changed, 43 insertions(+), 7 deletions(-)
New commits:
commit 1ae4a32067c5e1892e47434fb94c7c1f224b7830
Author: Tor Lillqvist
AuthorDate: Fri Aug 31 13:24:17 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Sep 3 17:10:19 2018 +0300
Factor out loleaflet/dist construction for iOS app building
The idea is that on a Linux box you have a tree of online that you
configure with --enable-iosapp. Then running 'make' there will only
create the stuff in loleaflet/dist. That loleaflet/dist can then be
copied to the Mac where you build the iOS app.
(To me, this approach seemed for now simpler than to get all the
PKG_CONFIG etc stuff working that running configure normally requires,
and run all the node, npm, and associated crack, on a Mac.)
Change-Id: Id2e495d0521922d0666fdab5fdcb5fcd460136f1
diff --git a/Makefile.am b/Makefile.am
index a8901de71..141467a5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
+if ENABLE_IOSAPP
+
+SUBDIRS = loleaflet
+
+else
+
SUBDIRS = . test loleaflet
export ENABLE_DEBUG
@@ -357,3 +363,5 @@ endif
# just run the build without any tests
build-nocheck: all-am
+
+endif
diff --git a/configure.ac b/configure.ac
index 421fdd686..5d337ef42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,11 @@ AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
[Enable debugging, link with debugging version of
Poco libraries]))
+AC_ARG_ENABLE([iosapp],
+ AS_HELP_STRING([--enable-iosapp],
+ [Use in a tree where the only purpose is to build
the HTML and CSS stuff
+ to be copied to a Mac where the iOS app is being
built.]))
+
AC_ARG_ENABLE([seccomp],
AS_HELP_STRING([--disable-seccomp],
[Disable use of linux/seccomp.h header when
kernel on target system does not support it.
@@ -153,6 +158,13 @@ if test -n "$with_logfile" ; then
fi
AC_SUBST(LOOLWSD_LOGFILE)
+ENABLE_IOSAPP=
+if test "$enable_iosapp" = "yes"; then
+ ENABLE_IOSAPP=true
+fi
+AC_SUBST(ENABLE_IOSAPP)
+AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
+
MAX_CONNECTIONS=20
AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt
"0"],
[MAX_CONNECTIONS="$with_max_connections"])
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c5baba4b9..922a6242d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -190,6 +190,7 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
$(builddir)/dist/bundle.css $(builddir)/dist/bundle.js
@echo "Generating loleaflet.html..."
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
+ -DIOSAPP=$(ENABLE_IOSAPP) \
-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 87bcf697e..f41d80c4f 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -23,14 +23,29 @@
define([_foreachq],[ifelse([$#],[3],[],[define([$1],[$4])$2[]$0([$1],[$2],shift(
};
window.addEventListener('message', PostMessageReadyListener, false);
-ifelse(DEBUG,[true],foreachq([fileCSS],[LOLEAFLET_CSS],[
-]),[
-])dnl
+ifelse(IOSAPP,[true],
+ ifelse(DEBUG,[true],
+foreachq([fileCSS],[LOLEAFLET_CSS],[
+ ]),
+[
+ ]),
+ ifelse(DEBUG,[true],
+foreachq([fileCSS],[LOLEAFLET_CSS],[
+ ]),
+[
+ ])dnl
+)dnl
-
-
-
-
+ifelse(IOSAPP,[true],
+ [
+
+
+ ],
+ [
+
+
+ ]
+)dnl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/qa vcl/source
include/vcl/errinf.hxx |2 +-
vcl/qa/cppunit/errorhandler.cxx |4 ++--
vcl/source/window/errinf.cxx| 27 ---
3 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit dbcabd8f46af3c0e609be44cabbcfa2ebdbd5742
Author: Noel Grandin
AuthorDate: Mon Sep 3 14:37:04 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 16:19:28 2018 +0200
return by std::unique_ptr from GetErrorInfo
Change-Id: I80f1643b252d0b38d279b402a422733c0c4749b9
Reviewed-on: https://gerrit.libreoffice.org/59938
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index 95e16213981b..a7160dfd695d 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -146,7 +146,7 @@ public:
ErrCode const & GetErrorCode() const { return nUserId; }
-static ErrorInfo* GetErrorInfo(ErrCode);
+static std::unique_ptr GetErrorInfo(ErrCode);
private:
ErrCode nUserId;
diff --git a/vcl/qa/cppunit/errorhandler.cxx b/vcl/qa/cppunit/errorhandler.cxx
index f59abb0f9a96..7848c4368c6e 100644
--- a/vcl/qa/cppunit/errorhandler.cxx
+++ b/vcl/qa/cppunit/errorhandler.cxx
@@ -51,13 +51,13 @@ void ErrorHandlerTest::testGetErrorString()
CPPUNIT_ASSERT_MESSAGE("GetErrorString(ERRCODE_ABORT, aErrStr) should
return false",
!ErrorHandler::GetErrorString(ERRCODE_ABORT,
aErrStr));
// normally protected, but MockErrorHandler is a friend of this class
-xErrorInfo.reset(ErrorInfo::GetErrorInfo(ERRCODE_ABORT));
+xErrorInfo = ErrorInfo::GetErrorInfo(ERRCODE_ABORT);
aErrHdlr.CreateString(xErrorInfo.get(), aErrStr);
CPPUNIT_ASSERT_EQUAL_MESSAGE("error message should be non-dynamic",
OUString("Non-dynamic error"), aErrStr);
CPPUNIT_ASSERT_MESSAGE("GetErrorString(ERRCODE_NONE, aErrStr) should
return false",
!ErrorHandler::GetErrorString(ERRCODE_NONE,
aErrStr));
-xErrorInfo.reset(ErrorInfo::GetErrorInfo(ERRCODE_NONE));
+xErrorInfo = ErrorInfo::GetErrorInfo(ERRCODE_NONE);
aErrHdlr.CreateString(xErrorInfo.get(), aErrStr);
CPPUNIT_ASSERT_EQUAL_MESSAGE("error message should be non-dynamic",
OUString("Non-dynamic error"), aErrStr);
}
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 0ec0ca504b68..ec001e0a2b30 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
@@ -97,15 +98,14 @@ bool ErrorHandler::GetErrorString(ErrCode nErrCodeId,
OUString& rErrStr)
if(!nErrCodeId || nErrCodeId == ERRCODE_ABORT)
return false;
-ErrorInfo *pInfo = ErrorInfo::GetErrorInfo(nErrCodeId);
+std::unique_ptr pInfo = ErrorInfo::GetErrorInfo(nErrCodeId);
-if (ErrorStringFactory::CreateString(pInfo,aErr))
+if (ErrorStringFactory::CreateString(pInfo.get(),aErr))
{
rErrStr = aErr;
return true;
}
-delete pInfo;
return false;
}
@@ -115,7 +115,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
weld::Window *pParent,
return DialogMask::NONE;
ErrorRegistry = TheErrorRegistry::get();
-ErrorInfo *pInfo = ErrorInfo::GetErrorInfo(nErrCodeId);
+std::unique_ptr pInfo = ErrorInfo::GetErrorInfo(nErrCodeId);
OUString aAction;
if (!rData.contexts.empty())
@@ -139,7 +139,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
weld::Window *pParent,
else
nErrFlags |= DialogMask::MessageError;
-DynamicErrorInfo* pDynPtr = dynamic_cast(pInfo);
+DynamicErrorInfo* pDynPtr = dynamic_cast(pInfo.get());
if(pDynPtr)
{
DialogMask nDynFlags = pDynPtr->GetDialogMask();
@@ -148,7 +148,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
weld::Window *pParent,
}
OUString aErr;
-if (ErrorStringFactory::CreateString(pInfo, aErr))
+if (ErrorStringFactory::CreateString(pInfo.get(), aErr))
{
if(!rData.pDsp)
{
@@ -156,8 +156,6 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
weld::Window *pParent,
}
else
{
-delete pInfo;
-
if(!rData.bIsWindowDsp)
{
(*reinterpret_cast(rData.pDsp))(aErr,aAction);
@@ -181,7 +179,6 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
weld::Window *pParent,
else
OSL_FAIL("ERRCODE_ABORT not handled");
-delete pInfo;
return DialogMask::NONE;
}
@@ -225,7 +222,7 @@ private:
}
voidRegisterError(DynamicErrorInfo *);
static void UnRegisterError(DynamicErrorInfo const *);
-static ErrorInfo* GetDynamicErrorInfo(ErrCode nId);
+static std::unique_ptr GetDynamicErrorInfo(ErrCode nId);
ErrCode nErrId;
DialogMask nMask;
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source
sfx2/source/appl/sfxhelp.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit e6a0d77e144cf41459cc1124244638e562b8d0db
Author: Caolán McNamara
AuthorDate: Thu Aug 30 13:45:12 2018 +0100
Commit: Miklos Vajna
CommitDate: Mon Sep 3 16:34:51 2018 +0200
tdf#119579 skip floating windows as potential parent for missing help dialog
Change-Id: Ibcee9a6aab0b04bf52f3e75a46f52d98864eee4c
Reviewed-on: https://gerrit.libreoffice.org/59809
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index c754cdb0d86f..8cf29fedbdf4 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -724,6 +724,21 @@ static bool impl_showOfflineHelp( const OUString& rURL )
return false;
}
+namespace
+{
+// tdf#119579 skip floating windows as potential parent for missing help
dialog
+const vcl::Window* GetBestParent(const vcl::Window* pWindow)
+{
+while (pWindow)
+{
+if (pWindow->IsSystemWindow() && pWindow->GetType() !=
WindowType::FLOATINGWINDOW)
+break;
+pWindow = pWindow->GetParent();
+}
+return pWindow;
+}
+}
+
bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow,
const OUString& rKeyword)
{
OUStringBuffer aHelpRootURL("vnd.sun.star.help://");
@@ -824,6 +839,8 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow, const
return true;
}
+pWindow = GetBestParent(pWindow);
+
if ( !impl_hasHelpInstalled() )
{
std::unique_ptr
xBuilder(Application::CreateBuilder(pWindow ? pWindow->GetFrameWeld() :
nullptr, "sfx/ui/helpmanual.ui"));
___
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' - sw/source
sw/source/core/unocore/unocrsrhelper.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d3e07a584fc92c548d6356116448e202a2766d11
Author: Caolán McNamara
AuthorDate: Thu Aug 30 16:59:40 2018 +0100
Commit: Miklos Vajna
CommitDate: Mon Sep 3 16:36:17 2018 +0200
Resolves: tdf#119607 crash in calling getPropertyState on TextParagraph
Change-Id: Ib7091473e3547241e95dc3d3921abf650f288aff
Reviewed-on: https://gerrit.libreoffice.org/59825
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index ad54ef7383e1..227c08f131bc 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -599,8 +599,11 @@ bool getCursorPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
SwTextNode* pTextNode =
rPam.GetPoint()->nNode.GetNode().GetTextNode();
if (pTextNode)
{
-uno::Reference xParagraph =
SwXParagraph::CreateXParagraph(*pTextNode->GetDoc(), pTextNode);
-*pAny <<= xParagraph;
+if (pAny)
+{
+uno::Reference xParagraph =
SwXParagraph::CreateXParagraph(*pTextNode->GetDoc(), pTextNode);
+*pAny <<= xParagraph;
+}
}
else
eNewState = PropertyState_DEFAULT_VALUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basegfx/source drawinglayer/source sc/source sw/source
basegfx/source/matrix/b3dhommatrix.cxx | 15 +--
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 17 +++--
sc/source/filter/inc/lotattr.hxx |2 -
sc/source/filter/lotus/lotattr.cxx |6 ++--
sc/source/ui/attrdlg/scdlgfact.cxx |2 -
sc/source/ui/attrdlg/scdlgfact.hxx |4 +--
sw/source/core/layout/wsfrm.cxx| 14 +-
7 files changed, 26 insertions(+), 34 deletions(-)
New commits:
commit 437d5d30422014c0a6def06e432a41e3f2e5c4c5
Author: Noel Grandin
AuthorDate: Fri Aug 31 16:49:22 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 3 12:41:46 2018 +0200
move identity checks into B3DHomMatrix::operator*=
and consequently simplify some call-sites
Change-Id: I301fc4c88fdfb8af75a348a41593a27f4c6567c5
Reviewed-on: https://gerrit.libreoffice.org/59916
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx
b/basegfx/source/matrix/b3dhommatrix.cxx
index d23aed896120..e3f3d3d28475 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -117,9 +117,20 @@ namespace basegfx
B3DHomMatrix& B3DHomMatrix::operator*=(const B3DHomMatrix& rMat)
{
-if(!rMat.isIdentity())
+if(rMat.isIdentity())
+{
+// multiply with identity, no change -> nothing to do
+}
+else if(isIdentity())
+{
+// we are identity, result will be rMat -> assign
+*this = rMat;
+}
+else
+{
+// multiply
mpImpl->doMulMatrix(*rMat.mpImpl);
-
+}
return *this;
}
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 12eef36c16ac..6e2ab2e16b3e 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -404,14 +404,11 @@ namespace drawinglayer
aUnitGradientToObject.rotate(atan2(aVector.getY(),
aVector.getX()));
aUnitGradientToObject.translate(getStart().getX(),
getStart().getY());
-if(!getGradientTransform().isIdentity())
-{
-aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
-}
+aUnitGradientToObject *= getGradientTransform();
// create full transform from unit gradient coordinates to
object coordinates
// including the SvgGradient transformation
-aUnitGradientToObject = aObjectTransform *
aUnitGradientToObject;
+aUnitGradientToObject *= aObjectTransform;
}
else
{
@@ -424,10 +421,7 @@ namespace drawinglayer
aUnitGradientToObject.rotate(atan2(aVector.getY(),
aVector.getX()));
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
-if(!getGradientTransform().isIdentity())
-{
-aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
-}
+aUnitGradientToObject *= getGradientTransform();
}
// create inverse from it
@@ -757,10 +751,7 @@ namespace drawinglayer
aUnitGradientToObject.scale(fRadius, fRadius);
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
-if(!getGradientTransform().isIdentity())
-{
-aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
-}
+aUnitGradientToObject *= getGradientTransform();
}
// create inverse from it
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index cdce7870a536..bc41904eea2c 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -274,18 +274,8 @@ void TransformableSwFrame::restoreFrameAreas()
// transform by given B2DHomMatrix
void TransformableSwFrame::transform(const basegfx::B2DHomMatrix aTransform)
{
-if(!aTransform.isIdentity())
-{
-if(!maFrameAreaTransformation.isIdentity())
-{
-maFrameAreaTransformation *= aTransform;
-}
-
-if(!maFramePrintAreaTransformation.isIdentity())
-{
-maFramePrintAreaTransformation *= aTransform;
-}
-}
+maFrameAreaTransformation *= aTransform;
+maFramePrintAreaTransformation *= aTransform;
}
SwFrame::SwFrame( SwModify *pMod, SwFrame* pSib )
commit
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-animations.cxx | 67 +-
1 file changed, 30 insertions(+), 37 deletions(-)
New commits:
commit 6c21fb251ba6bb2455c947583709262deddf5e4a
Author: Mark Hung
AuthorDate: Fri Aug 31 23:22:48 2018 +0800
Commit: Mark Hung
CommitDate: Mon Sep 3 14:31:10 2018 +0200
sd/pptx export: clean up rXNode and bMainSeqChild
from function paramter list, invoke getCurrentNode() and
isMainSeqChild() only when necessary.
Change-Id: I1da472426fab84219176b98a826210bbe279bb53
Reviewed-on: https://gerrit.libreoffice.org/59877
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 65d17800e2df..a5d72d2750cd 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -470,15 +470,12 @@ public:
class PPTXAnimationExport
{
void WriteAnimationNode(const NodeContextPtr& pContext);
-void WriteAnimationNodeAnimate(const Reference& rXNode,
sal_Int32 nXmlNodeType,
- bool bMainSeqChild);
-void WriteAnimationNodeAnimateInside(const Reference&
rXNode,
- bool bMainSeqChild, bool bSimple,
bool bWriteTo = true);
-void WriteAnimationNodeSeq(const Reference& rXNode, bool
bMainSeqChild);
-void WriteAnimationNodeEffect(const Reference& rXNode,
bool bMainSeqChild);
-void WriteAnimationNodeCommand(const Reference& rXNode,
bool bMainSeqChild);
-void WriteAnimationNodeCommonPropsStart(const Reference&
rXNode,
-bool bMainSeqChild);
+void WriteAnimationNodeAnimate(sal_Int32 nXmlNodeType);
+void WriteAnimationNodeAnimateInside(bool bSimple, bool bWriteTo = true);
+void WriteAnimationNodeSeq();
+void WriteAnimationNodeEffect();
+void WriteAnimationNodeCommand();
+void WriteAnimationNodeCommonPropsStart();
void WriteAnimationTarget(const Any& rTarget);
bool isMainSeqChild();
const Reference& getCurrentNode();
@@ -567,9 +564,9 @@ void PPTXAnimationExport::WriteAnimationTarget(const Any&
rTarget)
}
}
-void PPTXAnimationExport::WriteAnimationNodeAnimate(const
Reference& rXNode,
-sal_Int32 nXmlNodeType,
bool bMainSeqChild)
+void PPTXAnimationExport::WriteAnimationNodeAnimate(sal_Int32 nXmlNodeType)
{
+const Reference& rXNode = getCurrentNode();
Reference rXAnimate(rXNode, UNO_QUERY);
if (!rXAnimate.is())
return;
@@ -689,14 +686,13 @@ void PPTXAnimationExport::WriteAnimationNodeAnimate(const
ReferenceendElementNS(XML_p, nXmlNodeType);
}
-void PPTXAnimationExport::WriteAnimationNodeAnimateInside(const
Reference& rXNode,
- bool bMainSeqChild,
bool bSimple,
- bool bWriteTo)
+void PPTXAnimationExport::WriteAnimationNodeAnimateInside(bool bSimple, bool
bWriteTo)
{
+const Reference& rXNode = getCurrentNode();
Reference rXAnimate(rXNode, UNO_QUERY);
if (!rXAnimate.is())
return;
@@ -726,7 +722,7 @@ void
PPTXAnimationExport::WriteAnimationNodeAnimateInside(const ReferencestartElementNS(XML_p, XML_cBhvr, XML_additive, pAdditive, FSEND);
-WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild);
+WriteAnimationNodeCommonPropsStart();
Reference xIterate(rXNode->getParent(), UNO_QUERY);
WriteAnimationTarget(xIterate.is() ? xIterate->getTarget() :
rXAnimate->getTarget());
@@ -761,9 +757,10 @@ void
PPTXAnimationExport::WriteAnimationNodeAnimateInside(const ReferencegetTo(),
rXAnimate->getAttributeName());
}
-void PPTXAnimationExport::WriteAnimationNodeCommonPropsStart(
-const Reference& rXNode, bool bMainSeqChild)
+void PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
{
+const Reference& rXNode = getCurrentNode();
+bool bMainSeqChild = isMainSeqChild();
const char* pDuration = nullptr;
const char* pRestart = nullptr;
const char* pNodeType = nullptr;
@@ -1000,14 +997,13 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart(
mpFS->endElementNS(XML_p, XML_cTn);
}
-void PPTXAnimationExport::WriteAnimationNodeSeq(const
Reference& rXNode,
-bool bMainSeqChild)
+void PPTXAnimationExport::WriteAnimationNodeSeq()
{
SAL_INFO("sd.eppt", "write animation node SEQ");
mpFS->startElementNS(XML_p, XML_seq, FSEND);
-WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild);
+WriteAnimationNodeCommonPropsStart();
WriteAnimationCondition(mpFS, nullptr, "onPrev", 0, true, XML_prevCondLst);
WriteAnimationCondition(mpFS, nullptr, "onNext", 0, true, XML_nextCondLst);
@@ -1015,11 +1011,10 @@ void PPTXAnimationExport::WriteAnimationNodeSeq(const
Reference&
RE: How to Build LO Eclipse
Hello Drew, If you are looking forward to developing the eclipse addon directly from the source, you can try the following:- *1.* Run this command (switch to the build folder in the downloaded repository): ~/git/loeclipse/build$ *ant -Dlibreoffice.home=/usr/lib/libreoffice -Declipse.home=/home/shobhan/Desktop//eclipse* *2.* A new folder called 'site' is created beside the existing core, java, python (*python folder will show up if there is Python module in the repository that you downloaded*), build and script folder. *3.* Go to Eclipse. Open the Help menu -> Install -> Click the Add button -> Select Local -> Use the wizard to select the 'site' folder created in above step. A concise version was mentioned under https://github.com/LibreOffice/loeclipse#release-management If you are looking forward to contributing to the source code, following the steps mentioned under https://github.com/LibreOffice/loeclipse#development would help you get started. Thanks and Regards, Shobhan. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/CppunitTest_sw_unowriter.mk sw/Module_sw.mk sw/qa sw/source
sw/CppunitTest_sw_unowriter.mk | 76 +++
sw/Module_sw.mk |1
sw/qa/extras/unowriter/data/test.jpg |binary
sw/qa/extras/unowriter/unowriter.cxx | 60 +++
sw/source/core/unocore/unoframe.cxx | 10
5 files changed, 147 insertions(+)
New commits:
commit d687d1bbba3f7226f3a533c31b2c84d81755
Author: Miklos Vajna
AuthorDate: Tue Aug 7 11:06:30 2018 +0200
Commit: Caolán McNamara
CommitDate: Mon Sep 3 16:30:52 2018 +0200
sw TextGraphicObject: fix GraphicURL handling in the descriptor
Commit dfee7d93b4e863d673c45921f79bb876b5738ea6 (sw: get rid of
FN_UNO_GRAPHIC_U_R_L and "GraphicURL" property, 2018-03-08) removed
support for string-based graphic references, then a later commit
restored the setter. But one scenario (when setting the graphic URL
before inserting the text graphic object) was still unsupported for real
URL setter; restore that as well.
(cherry picked from commit bba0ccd743a3d023e4829155571cdf0318fcb81c)
Conflicts:
sw/qa/extras/unowriter/unowriter.cxx
Change-Id: I52a7f96e820f614d9d031df3ba03c794984ad68b
Reviewed-on: https://gerrit.libreoffice.org/59849
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/CppunitTest_sw_unowriter.mk b/sw/CppunitTest_sw_unowriter.mk
new file mode 100644
index ..a51f4ac38000
--- /dev/null
+++ b/sw/CppunitTest_sw_unowriter.mk
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_unowriter))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_unowriter, \
+sw/qa/extras/unowriter/unowriter \
+))
+
+# note: this links msword only for the reason to have a order dependency,
+# because "make sw.check" will not see the dependency through services.rdb
+$(eval $(call gb_CppunitTest_use_libraries,sw_unowriter, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+msword \
+sal \
+sfx \
+svl \
+svt \
+svxcore \
+sw \
+test \
+unotest \
+vcl \
+tl \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_unowriter,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_unowriter,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_unowriter,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_unowriter))
+$(eval $(call gb_CppunitTest_use_vcl,sw_unowriter))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_unowriter,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_unowriter))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_unowriter, \
+modules/swriter \
+))
+
+$(call gb_CppunitTest_get_target,sw_unowriter): \
+$(call gb_Library_get_target,textconv_dict)
+
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(call gb_CppunitTest_get_target,sw_unowriter): \
+$(call gb_ExternalPackage_get_target,fonts_liberation)
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 1e56264ac8de..d36b96a94cfe 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_globalfilter \
CppunitTest_sw_accessible_relation_set \
CppunitTest_sw_apitests \
+CppunitTest_sw_unowriter \
))
ifneq ($(ENABLE_HEADLESS),TRUE)
diff --git a/sw/qa/extras/unowriter/data/test.jpg
b/sw/qa/extras/unowriter/data/test.jpg
new file mode 100644
index ..12b393569efb
Binary files /dev/null and b/sw/qa/extras/unowriter/data/test.jpg differ
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
new file mode 100644
index ..9b993618769f
--- /dev/null
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+
+namespace
+{
+char const DATA_DIRECTORY[] = "/sw/qa/extras/unowriter/data/";
+}
+
+/// Test to assert UNO API call results of Writer.
+class
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/qa sw/source
sw/qa/extras/unowriter/unowriter.cxx | 33 +
sw/source/core/unocore/unoframe.cxx |7 +++
sw/source/core/unocore/unomap1.cxx |2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 2fb37f232849db1f0ae852203fef4d4a40145755
Author: Miklos Vajna
AuthorDate: Wed Aug 8 17:58:20 2018 +0200
Commit: Caolán McNamara
CommitDate: Mon Sep 3 16:31:52 2018 +0200
sw TextGraphicObject: handle XBitmap for GraphicURL
This restores compatibility for API users who called getByName() on the
bitmap table and expected that the result can be set as a value for the
GraphicURL property.
Changing the property type to cppu::UnoType::get() is
necessary, otherwise scripting languages figure out (via reflection)
that the type doesn't match, and SwXFrame::setPropertyValue() is not
called.
Change-Id: Idd62f109e91dbaebf1138b9038f66c6c648d780e
Reviewed-on: https://gerrit.libreoffice.org/58745
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 587803ba46055d43b5b108be744fdde17aeabc7c)
Reviewed-on: https://gerrit.libreoffice.org/59850
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index 9b993618769f..ca1e8cab28fd 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -21,9 +21,11 @@ class SwUnoWriter : public SwModelTestBase
{
public:
void testGraphicDesciptorURL();
+void testGraphicDesciptorURLBitmap();
CPPUNIT_TEST_SUITE(SwUnoWriter);
CPPUNIT_TEST(testGraphicDesciptorURL);
+CPPUNIT_TEST(testGraphicDesciptorURLBitmap);
CPPUNIT_TEST_SUITE_END();
};
@@ -54,6 +56,37 @@ void SwUnoWriter::testGraphicDesciptorURL()
CPPUNIT_ASSERT(xGraphic.is());
}
+void SwUnoWriter::testGraphicDesciptorURLBitmap()
+{
+loadURL("private:factory/swriter", nullptr);
+
+// Load a bitmap into the bitmap table.
+uno::Reference xFactory(mxComponent,
uno::UNO_QUERY);
+uno::Reference xBitmaps(
+xFactory->createInstance("com.sun.star.drawing.BitmapTable"),
uno::UNO_QUERY);
+OUString aGraphicURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"test.jpg";
+xBitmaps->insertByName("test", uno::makeAny(aGraphicURL));
+
+// Create a graphic.
+uno::Reference xTextGraphic(
+xFactory->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
+xTextGraphic->setPropertyValue("GraphicURL", xBitmaps->getByName("test"));
+xTextGraphic->setPropertyValue("AnchorType",
+
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+
+// Insert it.
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference xBodyText(xTextDocument->getText(),
uno::UNO_QUERY);
+uno::Reference xCursor(xBodyText->createTextCursor());
+uno::Reference xTextContent(xTextGraphic,
uno::UNO_QUERY);
+xBodyText->insertTextContent(xCursor, xTextContent, false);
+
+// This failed: setting GraphicURL to the result of getByName() did not
+// work anymore.
+auto xGraphic =
getProperty>(getShape(1), "Graphic");
+CPPUNIT_ASSERT(xGraphic.is());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUnoWriter);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index c4a1b7dfbf6e..b0de9f773463 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2753,8 +2753,15 @@ void SwXFrame::attachToRange(const uno::Reference<
text::XTextRange > & xTextRan
if (m_pProps->GetProperty(FN_UNO_GRAPHIC_URL, 0, pGraphicURL))
{
OUString sGraphicURL;
+uno::Reference xBitmap;
if (((*pGraphicURL) >>= sGraphicURL) && !sGraphicURL.isEmpty())
aGraphic = vcl::graphic::loadFromURL(sGraphicURL);
+else if ((*pGraphicURL) >>= xBitmap)
+{
+uno::Reference xGraphic(xBitmap,
uno::UNO_QUERY);
+if (xGraphic.is())
+aGraphic = xGraphic;
+}
}
const ::uno::Any* pGraphicAny;
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index 10365bd83082..273edc7c4dab 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -850,7 +850,7 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetGraphicPropertyMap(
{ OUString(UNO_NAME_REPLACEMENT_GRAPHIC), FN_UNO_REPLACEMENT_GRAPHIC,
cppu::UnoType::get(), 0, 0 },
{ OUString(UNO_NAME_GRAPHIC_FILTER), FN_UNO_GRAPHIC_FILTER,
cppu::UnoType::get(), 0, 0 },
{ OUString(UNO_NAME_GRAPHIC), FN_UNO_GRAPHIC,
cppu::UnoType::get(), 0, 0 },
-{ OUString(UNO_NAME_GRAPHIC_URL), FN_UNO_GRAPHIC_URL,
cppu::UnoType::get(), 0, 0 },
+
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dpshttab.cxx | 28 +++-
sc/source/ui/view/cellsh1.cxx| 30 +-
2 files changed, 52 insertions(+), 6 deletions(-)
New commits:
commit 73af06a6a7fcb2d92d36a45bbe54395bcba8dfb0
Author: Julien Nabet
AuthorDate: Thu Jul 26 11:36:08 2018 +0200
Commit: Eike Rathke
CommitDate: Mon Sep 3 14:39:15 2018 +0200
tdf#37268: use also sheet local range in Pivot
There are 2 types of range names:
- those global to the document
- those specific to a sheet
Before this patch, Pivot could only see global range names
There are 2 parts on the patch:
1) ScCellShell::ExecuteDataPilotDialog()
Retrieve all the range names and use:
- for sheets range names: .
- for global range names:
2) ScSheetSourceDesc::GetSourceRange()
Search about the presence of . to know if it's a global or sheet
name range
Change-Id: I92ac321e1475516cce7ee42b6e6038c231d0514b
Reviewed-on: https://gerrit.libreoffice.org/58070
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index fd50d2dfca9d..54efc6b9e5ae 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -234,13 +234,39 @@ const ScRange& ScSheetSourceDesc::GetSourceRange() const
{
// Obtain the source range from the range name first.
maSourceRange = ScRange();
+
+// Range names referring a sheet contain a .
+// See comment of ScCellShell::ExecuteDataPilotDialog
+// paragraph "Populate named ranges"
+sal_Int32 nAfterSheetName = ScGlobal::FindUnquoted( maRangeName, '.');
+
+// let's consider the range name is global to the doc by default
ScRangeName* pRangeName = mpDoc->GetRangeName();
+OUString searchRangeName(maRangeName);
+
+// the range name concerns a specificsheet
+if (nAfterSheetName != -1)
+{
+OUString sheetName = maRangeName.copy(0, nAfterSheetName);
+ScGlobal::EraseQuotes( sheetName, '\'', false);
+searchRangeName = maRangeName.copy(nAfterSheetName+1);
+
+SCTAB nTab = 0;
+if (!mpDoc->GetTable(sheetName, nTab))
+{
+// the sheetname should exist
+assert(false);
+return maSourceRange;
+}
+pRangeName = mpDoc->GetRangeName(nTab);
+}
+
do
{
if (!pRangeName)
break;
-OUString aUpper = ScGlobal::pCharClass->uppercase(maRangeName);
+OUString aUpper = ScGlobal::pCharClass->uppercase(searchRangeName);
const ScRangeData* pData = pRangeName->findByUpperName(aUpper);
if (!pData)
break;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 7722f9ca1c1b..45c47ef492b7 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
#include
#include
@@ -2794,12 +2795,31 @@ void ScCellShell::ExecuteDataPilotDialog()
pTabViewShell->GetFrameWeld(), bEnableExt));
// Populate named ranges (if any).
-ScRangeName* pRangeName = pDoc->GetRangeName();
-if (pRangeName)
+// We must take into account 2 types of scope : global doc and sheets
+// for global doc:
+// for sheets: .
+std::map aRangeMap;
+pDoc->GetRangeNameMap(aRangeMap);
+for (auto const& elemRangeMap : aRangeMap)
{
-ScRangeName::const_iterator itr = pRangeName->begin(), itrEnd =
pRangeName->end();
-for (; itr != itrEnd; ++itr)
-pTypeDlg->AppendNamedRange(itr->second->GetName());
+ScRangeName* pRangeName = elemRangeMap.second;
+if (pRangeName)
+{
+if (elemRangeMap.first == STR_GLOBAL_RANGE_NAME)
+{
+for (auto const& elem : *pRangeName)
+pTypeDlg->AppendNamedRange(elem.second->GetName());
+}
+else
+{
+OUString aScope(elemRangeMap.first);
+ScGlobal::AddQuotes(aScope, '\'');
+for (auto const& elem : *pRangeName)
+{
+pTypeDlg->AppendNamedRange(aScope + "." +
elem.second->GetName());
+}
+}
+}
}
if ( pTypeDlg->Execute() == RET_OK )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-animations.cxx | 216 ++
1 file changed, 131 insertions(+), 85 deletions(-)
New commits:
commit 459c5e3e04a0c5b99f412202b55e3ef2db44200c
Author: Mark Hung
AuthorDate: Sat Sep 1 07:41:48 2018 +0800
Commit: Mark Hung
CommitDate: Mon Sep 3 15:58:44 2018 +0200
sd/ pptx export: refactor WriteAnimationNodeCommonPropsStart().
Make switch-case conversions standalone functions to make the
function shorter and more clear.
Change-Id: I71ea33c92ab4df848f106979c8d2d69340775da8
Reviewed-on: https://gerrit.libreoffice.org/59888
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index a5d72d2750cd..79781b8c86bc 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -452,6 +452,123 @@ sal_Int32 convertNodeType(sal_Int16 nType)
return xmlNodeType;
}
+/// Convert AnimationRestart to ST_TLTimeNodeRestartType value.
+const char* convertAnimationRestart(sal_Int16 nRestart)
+{
+const char* pRestart = nullptr;
+switch (nRestart)
+{
+case AnimationRestart::ALWAYS:
+pRestart = "always";
+break;
+case AnimationRestart::WHEN_NOT_ACTIVE:
+pRestart = "whenNotActive";
+break;
+case AnimationRestart::NEVER:
+pRestart = "never";
+break;
+}
+return pRestart;
+}
+
+/// Convert EffectNodeType to ST_TLTimeNodeType
+const char* convertEffectNodeType(sal_Int16 nType)
+{
+const char* pNodeType = nullptr;
+switch (nType)
+{
+case EffectNodeType::TIMING_ROOT:
+pNodeType = "tmRoot";
+break;
+case EffectNodeType::MAIN_SEQUENCE:
+pNodeType = "mainSeq";
+break;
+case EffectNodeType::ON_CLICK:
+pNodeType = "clickEffect";
+break;
+case EffectNodeType::AFTER_PREVIOUS:
+pNodeType = "afterEffect";
+break;
+case EffectNodeType::WITH_PREVIOUS:
+pNodeType = "withEffect";
+break;
+case EffectNodeType::INTERACTIVE_SEQUENCE:
+pNodeType = "interactiveSeq";
+break;
+}
+return pNodeType;
+}
+
+/// Convert EffectPresetClass to ST_TLTimeNodePresetClassType
+const char* convertEffectPresetClass(sal_Int16 nPresetClass)
+{
+const char* pPresetClass = nullptr;
+switch (nPresetClass)
+{
+case EffectPresetClass::ENTRANCE:
+pPresetClass = "entr";
+break;
+case EffectPresetClass::EXIT:
+pPresetClass = "exit";
+break;
+case EffectPresetClass::EMPHASIS:
+pPresetClass = "emph";
+break;
+case EffectPresetClass::MOTIONPATH:
+pPresetClass = "path";
+break;
+case EffectPresetClass::OLEACTION:
+pPresetClass = "verb"; // ?
+break;
+case EffectPresetClass::MEDIACALL:
+pPresetClass = "mediacall";
+break;
+}
+return pPresetClass;
+}
+
+/// convert AnimationFill to ST_TLTimeNodeFillType.
+const char* convertAnimationFill(sal_Int16 nFill)
+{
+const char* pFill = nullptr;
+switch (nFill)
+{
+case AnimationFill::FREEZE:
+pFill = "hold";
+break;
+case AnimationFill::HOLD:
+pFill = "hold";
+break;
+case AnimationFill::REMOVE:
+pFill = "remove";
+break;
+case AnimationFill::TRANSITION:
+pFill = "transition";
+break;
+}
+return pFill;
+}
+
+/// Convert TextAnimationType to ST_IterateType.
+const char* convertTextAnimationType(sal_Int16 nType)
+{
+const char* sType = nullptr;
+switch (nType)
+{
+case TextAnimationType::BY_PARAGRAPH:
+sType = "el";
+break;
+case TextAnimationType::BY_LETTER:
+sType = "lt";
+break;
+case TextAnimationType::BY_WORD:
+default:
+sType = "wd";
+break;
+}
+return sType;
+}
+
class NodeContext;
typedef std::unique_ptr NodeContextPtr;
@@ -783,18 +900,7 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
aAny >>= fDuration;
}
-switch (rXNode->getRestart())
-{
-case AnimationRestart::ALWAYS:
-pRestart = "always";
-break;
-case AnimationRestart::WHEN_NOT_ACTIVE:
-pRestart = "whenNotActive";
-break;
-case AnimationRestart::NEVER:
-pRestart = "never";
-break;
-}
+pRestart = convertAnimationRestart(rXNode->getRestart());
const Sequence aUserData = rXNode->getUserData();
const Any* pAny[DFF_ANIM_PROPERTY_ID_COUNT];
@@ -803,31 +909,17 @@ void
[Libreoffice-commits] online.git: test/TileCacheTests.cpp
test/TileCacheTests.cpp |1 -
1 file changed, 1 deletion(-)
New commits:
commit 1e0b4928ad84f640cb281257250d4f6206993543
Author: Tamás Zolnai
AuthorDate: Mon Sep 3 16:54:12 2018 +0200
Commit: Tamás Zolnai
CommitDate: Mon Sep 3 16:54:12 2018 +0200
Remove this printing line used only for debugging
Change-Id: I482adcac61cf2fa4bec4fb02feec0e23370a3e45
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 10a1900f4..32a47169d 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -1192,7 +1192,6 @@ void TileCacheTests::testTileRequestByZoom()
{
std::vector tile = getResponseMessage(socket, "tile:", testname);
CPPUNIT_ASSERT_MESSAGE("Did not get tile as expected!", !tile.empty());
-std::cout << i << std::endl;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-animations.cxx | 82 --
1 file changed, 56 insertions(+), 26 deletions(-)
New commits:
commit f7c37579e6c348ec8d48ddbfb26e08ac09a8eeba
Author: Mark Hung
AuthorDate: Sat Sep 1 08:53:53 2018 +0800
Commit: Mark Hung
CommitDate: Mon Sep 3 16:54:38 2018 +0200
sd/ pttx export: wrap user data handling in NodeContext.
Move effect node type, effect preset class, preset id, and prset subtype
to NodeContext.
Change-Id: I1f89a71e0bfc4bf3beb6c3c55662c076bef88fa8
Reviewed-on: https://gerrit.libreoffice.org/59890
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 79781b8c86bc..6cc5e6573733 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -578,10 +578,23 @@ class NodeContext
const Reference& mxNode;
const bool mbMainSeqChild;
+// Attributes inialized from mxNode->getUserData().
+sal_Int16 mnEffectNodeType;
+sal_Int16 mnEffectPresetClass;
+OUString msEffectPresetId;
+OUString msEffectPresetSubType;
+
+/// constructor helper for initializing user datas.
+void initUserData();
+
public:
NodeContext(const Reference& xNode, bool bMainSeqChild);
const Reference& getNode() const { return mxNode; }
bool isMainSeqChild() const { return mbMainSeqChild; }
+sal_Int16 getEffectNodeType() const { return mnEffectNodeType; }
+sal_Int16 getEffectPresetClass() const { return mnEffectPresetClass; }
+const OUString& getEffectPresetId() const { return msEffectPresetId; }
+const OUString& getEffectPresetSubType() const { return
msEffectPresetSubType; }
};
class PPTXAnimationExport
@@ -885,6 +898,7 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
const char* pFill = nullptr;
double fDuration = 0;
Any aAny;
+assert(mpContext);
aAny = rXNode->getDuration();
if (aAny.hasValue())
@@ -902,12 +916,8 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
pRestart = convertAnimationRestart(rXNode->getRestart());
-const Sequence aUserData = rXNode->getUserData();
-const Any* pAny[DFF_ANIM_PROPERTY_ID_COUNT];
-AnimationExporter::GetUserData(aUserData, pAny, sizeof(pAny));
-
-sal_Int16 nType = 0;
-if (pAny[DFF_ANIM_NODE_TYPE] && (*pAny[DFF_ANIM_NODE_TYPE] >>= nType))
+sal_Int16 nType = mpContext->getEffectNodeType();
+if (nType != -1)
{
pNodeType = convertEffectNodeType(nType);
if (nType == EffectNodeType::TIMING_ROOT)
@@ -923,35 +933,26 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
}
}
-sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED;
-if (pAny[DFF_ANIM_PRESET_CLASS])
-{
-if (*pAny[DFF_ANIM_PRESET_CLASS] >>= nPresetClass)
-{
-pPresetClass = convertEffectPresetClass(nPresetClass);
-}
-}
+sal_uInt32 nPresetClass = mpContext->getEffectPresetClass();
+if (nPresetClass != DFF_ANIM_PRESS_CLASS_USER_DEFINED)
+pPresetClass = convertEffectPresetClass(nPresetClass);
sal_uInt32 nPresetId = 0;
bool bPresetId = false;
-if (pAny[DFF_ANIM_PRESET_ID])
+const OUString& rPresetId = mpContext->getEffectPresetId();
+if (rPresetId.getLength() > 0)
{
-OUString sPreset;
-if (*pAny[DFF_ANIM_PRESET_ID] >>= sPreset)
-nPresetId = AnimationExporter::GetPresetID(sPreset, nPresetClass,
bPresetId);
+nPresetId = AnimationExporter::GetPresetID(rPresetId, nPresetClass,
bPresetId);
}
sal_uInt32 nPresetSubType = 0;
bool bPresetSubType = false;
-if (pAny[DFF_ANIM_PRESET_SUB_TYPE])
+const OUString& sPresetSubType = mpContext->getEffectPresetSubType();
+if (sPresetSubType.getLength() > 0)
{
-OUString sPresetSubType;
-if (*pAny[DFF_ANIM_PRESET_SUB_TYPE] >>= sPresetSubType)
-{
-nPresetSubType =
AnimationExporter::TranslatePresetSubType(nPresetClass, nPresetId,
-
sPresetSubType);
-bPresetSubType = true;
-}
+nPresetSubType
+= AnimationExporter::TranslatePresetSubType(nPresetClass,
nPresetId, sPresetSubType);
+bPresetSubType = true;
}
if (nType != EffectNodeType::TIMING_ROOT && nType !=
EffectNodeType::MAIN_SEQUENCE)
@@ -1204,6 +1205,35 @@ void PPTXAnimationExport::WriteAnimations(const
Reference& rXDrawPage
NodeContext::NodeContext(const Reference& xNode, bool
bMainSeqChild)
: mxNode(xNode)
, mbMainSeqChild(bMainSeqChild)
+, mnEffectNodeType(-1)
+, mnEffectPresetClass(DFF_ANIM_PRESS_CLASS_USER_DEFINED)
{
+initUserData();
}
+
+void NodeContext::initUserData()
+{
+assert(mxNode.is());
+
+Sequence aUserData = mxNode->getUserData();
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 5 commits - sw/inc sw/source
sw/inc/hints.hxx| 13 +
sw/source/core/attr/hints.cxx |5
sw/source/core/doc/DocumentContentOperationsManager.cxx | 151
sw/source/core/doc/DocumentRedlineManager.cxx | 73 +++
sw/source/core/inc/txtfrm.hxx |3
sw/source/core/text/txtfrm.cxx | 95 +-
sw/source/core/txtnode/ndtxt.cxx|2
sw/source/core/undo/unredln.cxx | 13 +
8 files changed, 283 insertions(+), 72 deletions(-)
New commits:
commit 62a030a71f267b65ca7b188cf97df21bd71d17bd
Author: Michael Stahl
AuthorDate: Mon Sep 3 18:07:29 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Sep 3 18:12:15 2018 +0200
sw_redlinehide_2: update frames on Redline ops
When Delete redline is created, removed, accepted, rejected & undo/redo
of all of these, update all the text frames so they're merged or not,
as required.
Change-Id: I08aa6aea270a50d19f4bda0caf016870a42a8dd3
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 11af40aaa469..1bb52e00e186 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3619,6 +3620,11 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline(
nsRedlineType_t::REDLINE_DELETE, rPam ), true );
m_rDoc.getIDocumentState().SetModified();
+// sw_redlinehide: 2 reasons why this is needed:
+// 1. it's the first redline in node => RedlineDelText was sent but ignored
+// 2. redline spans multiple nodes => must merge text frames
+sw::UpdateFramesForAddDeleteRedline(rPam);
+
if (pUndo)
{
m_rDoc.GetIDocumentUndoRedo().EndUndo( SwUndoId::EMPTY, nullptr );
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index ad9c292810a1..4088a497f989 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -113,6 +114,72 @@ using namespace com::sun::star;
#endif
+namespace sw {
+
+void UpdateFramesForAddDeleteRedline(SwPaM const& rPam)
+{
+if (rPam.GetPoint()->nNode != rPam.GetMark()->nNode)
+{
+SwTextNode *const
pStartNode(rPam.Start()->nNode.GetNode().GetTextNode());
+std::vector frames;
+SwIterator
aIter(*pStartNode);
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame =
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.push_back(pFrame);
+}
+}
+for (SwTextFrame * pFrame : frames)
+{
+SwTextNode & rFirstNode(pFrame->GetMergedPara()
+? *pFrame->GetMergedPara()->pFirstNode
+: *pStartNode);
+assert(rFirstNode.GetIndex() <= pStartNode->GetIndex());
+pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
+*pFrame, rFirstNode, sw::FrameMode::Existing));
+}
+}
+}
+
+void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM const& rPam)
+{
+if (rPam.GetPoint()->nNode != rPam.GetMark()->nNode)
+{
+// first, call CheckParaRedlineMerge on the first paragraph,
+// to init flag on new merge range (if any) + 1st node post the merge
+SwTextNode *const
pStartNode(rPam.Start()->nNode.GetNode().GetTextNode());
+std::vector frames;
+SwIterator
aIter(*pStartNode);
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame =
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.push_back(pFrame);
+}
+}
+for (SwTextFrame * pFrame : frames)
+{
+if (auto const pMergedPara = pFrame->GetMergedPara())
+{
+assert(pMergedPara->pFirstNode->GetIndex() <=
pStartNode->GetIndex());
+pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
+*pFrame, *pMergedPara->pFirstNode,
sw::FrameMode::Existing));
+}
+}
+// now start node until end of merge + 1 has proper flags; MakeFrames
+// should pick up from the next node in need of frames by checking
flags
+if (!frames.empty())
+{
+SwNodeIndex const start(*pStartNode, +1);
+SwNodeIndex const end(rPam.End()->nNode, +1); // end is exclusive
+::MakeFrames(, start, end);
+}
+}
+}
+
+} // namespace sw
+
[Libreoffice-commits] core.git: sc/uiconfig solenv/sanitizers
sc/uiconfig/scalc/ui/databaroptions.ui |6 -- sc/uiconfig/scalc/ui/dataprovider.ui |8 solenv/sanitizers/ui/modules/scalc.suppr |9 - 3 files changed, 12 insertions(+), 11 deletions(-) New commits: commit 009618776924b21516c9d29660eb2dd64266db01 Author: Katarina Behrens AuthorDate: Fri Aug 31 17:24:49 2018 +0200 Commit: Katarina Behrens CommitDate: Mon Sep 3 18:38:04 2018 +0200 sc dataprovider/databar dialogs: fix some a11y issues Change-Id: Id57c11e6e41d5b940e4c48519a198885a593f2ef Reviewed-on: https://gerrit.libreoffice.org/59921 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui index ed499a1fd77a..3e693b97a9a2 100644 --- a/sc/uiconfig/scalc/ui/databaroptions.ui +++ b/sc/uiconfig/scalc/ui/databaroptions.ui @@ -1,5 +1,5 @@ - + @@ -266,6 +266,8 @@ False end Fill: +True +fill_type 0 @@ -511,8 +513,8 @@ False -0 The minimum value must be less than the maximum value. +0 False diff --git a/sc/uiconfig/scalc/ui/dataprovider.ui b/sc/uiconfig/scalc/ui/dataprovider.ui index f9f42ac7ebda..934e4303a50b 100644 --- a/sc/uiconfig/scalc/ui/dataprovider.ui +++ b/sc/uiconfig/scalc/ui/dataprovider.ui @@ -105,6 +105,8 @@ True False URL: +True +url False @@ -163,6 +165,8 @@ True False Database Range: +True +combobox_db False @@ -197,6 +201,8 @@ True False Data Provider: +True +combobox_provider False @@ -232,6 +238,8 @@ True False Search String: +True +edit_id False diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index e6ac51ceed17..10e9898560cc 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -43,8 +43,6 @@ sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkEntry[@id='source'] no-labelled-b sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkComboBoxText[@id='service'] no-labelled-by sc/uiconfig/scalc/ui/databaroptions.ui://GtkEntry[@id='min_value'] no-labelled-by sc/uiconfig/scalc/ui/databaroptions.ui://GtkEntry[@id='max_value'] no-labelled-by -sc/uiconfig/scalc/ui/databaroptions.ui://GtkLabel[@id='label10'] orphan-label -sc/uiconfig/scalc/ui/databaroptions.ui://GtkComboBoxText[@id='fill_type'] no-labelled-by sc/uiconfig/scalc/ui/databaroptions.ui://GtkLabel[@id='str_same_value'] orphan-label sc/uiconfig/scalc/ui/datafielddialog.ui://GtkLabel[@id='label2'] orphan-label sc/uiconfig/scalc/ui/datafielddialog.ui://GtkLabel[@id='name'] orphan-label @@ -53,13 +51,6 @@ sc/uiconfig/scalc/ui/dataform.ui://GtkLabel[@id='label'] orphan-label sc/uiconfig/scalc/ui/datastreams.ui://GtkLabel[@id='label6'] orphan-label sc/uiconfig/scalc/ui/datastreams.ui://GtkEntry[@id='range'] no-labelled-by sc/uiconfig/scalc/ui/datastreams.ui://GtkEntry[@id='limit'] no-labelled-by -sc/uiconfig/scalc/ui/dataprovider.ui://GtkLabel[@id='label6'] orphan-label -sc/uiconfig/scalc/ui/dataprovider.ui://GtkLabel[@id='label_db'] orphan-label -sc/uiconfig/scalc/ui/dataprovider.ui://GtkComboBox[@id='combobox_db'] no-labelled-by -sc/uiconfig/scalc/ui/dataprovider.ui://GtkLabel[@id='label_provider'] orphan-label -sc/uiconfig/scalc/ui/dataprovider.ui://GtkComboBox[@id='combobox_provider'] no-labelled-by -sc/uiconfig/scalc/ui/dataprovider.ui://GtkLabel[@id='label_search'] orphan-label -sc/uiconfig/scalc/ui/dataprovider.ui://GtkEntry[@id='edit_id'] no-labelled-by sc/uiconfig/scalc/ui/dataproviderentry.ui://GtkComboBox[@id='provider_lst'] no-labelled-by
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 68 commits - svl/source sw/inc sw/source
Rebased ref, commits from common ancestor:
commit 455271c854ae3a6d578a576d05f7692d7a462e23
Author: Michael Stahl
AuthorDate: Mon Sep 3 18:07:29 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Sep 3 19:03:00 2018 +0200
sw_redlinehide_2: update frames on Redline ops
When Delete redline is created, removed, accepted, rejected & undo/redo
of all of these, update all the text frames so they're merged or not,
as required.
Change-Id: I08aa6aea270a50d19f4bda0caf016870a42a8dd3
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 11af40aaa469..1bb52e00e186 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3619,6 +3620,11 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline(
nsRedlineType_t::REDLINE_DELETE, rPam ), true );
m_rDoc.getIDocumentState().SetModified();
+// sw_redlinehide: 2 reasons why this is needed:
+// 1. it's the first redline in node => RedlineDelText was sent but ignored
+// 2. redline spans multiple nodes => must merge text frames
+sw::UpdateFramesForAddDeleteRedline(rPam);
+
if (pUndo)
{
m_rDoc.GetIDocumentUndoRedo().EndUndo( SwUndoId::EMPTY, nullptr );
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index ad9c292810a1..db1dcabb5d80 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -113,6 +114,69 @@ using namespace com::sun::star;
#endif
+namespace sw {
+
+void UpdateFramesForAddDeleteRedline(SwPaM const& rPam)
+{
+SwTextNode *const pStartNode(rPam.Start()->nNode.GetNode().GetTextNode());
+std::vector frames;
+SwIterator
aIter(*pStartNode);
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.push_back(pFrame);
+}
+}
+for (SwTextFrame * pFrame : frames)
+{
+SwTextNode & rFirstNode(pFrame->GetMergedPara()
+? *pFrame->GetMergedPara()->pFirstNode
+: *pStartNode);
+assert(rFirstNode.GetIndex() <= pStartNode->GetIndex());
+pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
+*pFrame, rFirstNode, sw::FrameMode::Existing));
+}
+}
+
+void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM const& rPam)
+{
+if (rPam.GetPoint()->nNode != rPam.GetMark()->nNode)
+{
+// first, call CheckParaRedlineMerge on the first paragraph,
+// to init flag on new merge range (if any) + 1st node post the merge
+SwTextNode *const
pStartNode(rPam.Start()->nNode.GetNode().GetTextNode());
+std::vector frames;
+SwIterator
aIter(*pStartNode);
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame =
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.push_back(pFrame);
+}
+}
+for (SwTextFrame * pFrame : frames)
+{
+if (auto const pMergedPara = pFrame->GetMergedPara())
+{
+assert(pMergedPara->pFirstNode->GetIndex() <=
pStartNode->GetIndex());
+pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
+*pFrame, *pMergedPara->pFirstNode,
sw::FrameMode::Existing));
+}
+}
+// now start node until end of merge + 1 has proper flags; MakeFrames
+// should pick up from the next node in need of frames by checking
flags
+if (!frames.empty())
+{
+SwNodeIndex const start(*pStartNode, +1);
+SwNodeIndex const end(rPam.End()->nNode, +1); // end is exclusive
+::MakeFrames(, start, end);
+}
+}
+}
+
+} // namespace sw
+
namespace
{
inline bool IsPrevPos( const SwPosition & rPos1, const SwPosition & rPos2 )
@@ -294,6 +358,7 @@ namespace
{
bool bRet = true;
SwRangeRedline* pRedl = rArr[ rPos ];
+SwDoc& rDoc = *pRedl->GetDoc();
SwPosition *pRStt = nullptr, *pREnd = nullptr;
SwComparePosition eCmp = SwComparePosition::Outside;
if( pSttRng && pEndRng )
@@ -309,7 +374,6 @@ namespace
{
case nsRedlineType_t::REDLINE_INSERT:
{
-SwDoc& rDoc = *pRedl->GetDoc();
const SwPosition *pDelStt = nullptr, *pDelEnd = nullptr;
bool bDelRedl = false;
switch( eCmp )
@@ -390,6 +454,8 @@ namespace
Re: make check fails in [build JCS]
On 29/08/18 11:43, Noel Grandin wrote:
On 2018/08/29 11:06 AM, Stephan Bergmann wrote:
investigating deeper into the issue. (Apparently, Java no longer
accepts file:... URLs there, at least on Windows, and won't accept
full pathnames starting with a drive letter like C:/..., but does
accept ("drive-absolute") pathnames like /...; so my hack should work
as long as your files are on drive C.)
That probably needs whatever magic will convert a cygwin path into a
DOS/NT path i.e. something starting with
C:\
(note the backslash instead of a forwardslash)
No, things unfortunately appear to be more broken than that (at least
with JDK 10.0.2):
* Using C:\foo\bar.jar pathnames in a jar's manifest class-path doesn't
work (and
does require those values to be "relative URLs"). At java run-time
(e.g., when executing a JunitTest), resolving classes via that
class-path entry apparently fails.
* Likewise when using C:/foo/bar.jar pathnames.
* Using file:/C:/foo/bar.jar URLs in a jar's manifest class-path would
work at run-time. However, when that jar is then mentioned in the
-classpath argument of some javac invocation at build time, that
invocation fails with "error: illegal argument for --class-path: Illegal
char <:> at index 4: file:/C:/..."
* The only working hack I found for now is to use /foo/bar.jar
drive-relative pathnames, which happen to also match the syntax of
relative URLs.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/border.cxx | 63 +++--
1 file changed, 54 insertions(+), 9 deletions(-)
New commits:
commit b094921089beeecb2333075e174c8b1fa6d1b812
Author: Caolán McNamara
AuthorDate: Mon Sep 3 11:02:24 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 3 17:56:14 2018 +0200
expand CheckBox AddItemConnection
Change-Id: I35e7f0e129186a863d0ddcc6ebcb86b81378ea78
Reviewed-on: https://gerrit.libreoffice.org/59933
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 186c77a13827..d638e8657c62 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -333,6 +333,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent,
const SfxItemSet& rCore
}
}
}
+
bool bSupportsShadow = !SfxItemPool::IsSlot( GetWhich( nShadowSlot ) );
if( bSupportsShadow )
AddItemConnection( svx::CreateShadowConnection( nShadowSlot,
rCoreAttrs, *m_pWndShadows, *m_pEdShadowSize, *m_pLbShadowColor ) );
@@ -345,13 +346,10 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent,
const SfxItemSet& rCore
AddItemConnection( svx::CreateFrameLineConnection(
SID_ATTR_BORDER_DIAG_TLBR, *m_pFrameSel, svx::FrameBorderType::TLBR ) );
if( m_pFrameSel->IsBorderEnabled( svx::FrameBorderType::BLTR ) )
AddItemConnection( svx::CreateFrameLineConnection(
SID_ATTR_BORDER_DIAG_BLTR, *m_pFrameSel, svx::FrameBorderType::BLTR ) );
-// #i43593# - item connection doesn't work for Writer,
-// because the Writer item sets contain these items
+
// checkbox "Merge with next paragraph" only visible for Writer dialog
format.paragraph
-AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_BORDER_CONNECT,
*m_pMergeWithNextCB, ItemConnFlags::NONE ) );
m_pMergeWithNextCB->Hide();
// checkbox "Merge adjacent line styles" only visible for Writer dialog
format.table
-AddItemConnection( new sfx::CheckBoxConnection( SID_SW_COLLAPSING_BORDERS,
*m_pMergeAdjacentBordersCB, ItemConnFlags::NONE ) );
m_pMergeAdjacentBordersCB->Hide();
SfxObjectShell* pDocSh = SfxObjectShell::Current();
@@ -437,11 +435,27 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed(
SvxBorderLineStyle nStyle ) con
return maUsedBorderStyles.count(nStyle) > 0;
}
-
void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
{
SfxTabPage::Reset( rSet );
+SfxItemPool* pPool = rSet->GetPool();
+sal_uInt16 nMergeAdjacentBordersId =
pPool->GetWhich(SID_SW_COLLAPSING_BORDERS);
+const SfxBoolItem *pMergeAdjacentBorders = static_cast(rSet->GetItem(nMergeAdjacentBordersId));
+if (!pMergeAdjacentBorders)
+m_pMergeAdjacentBordersCB->SetState(TRISTATE_INDET);
+else
+m_pMergeAdjacentBordersCB->Check(pMergeAdjacentBorders->GetValue());
+m_pMergeAdjacentBordersCB->SaveValue();
+
+sal_uInt16 nMergeWithNextId = pPool->GetWhich(SID_ATTR_BORDER_CONNECT);
+const SfxBoolItem *pMergeWithNext = static_cast(rSet->GetItem(nMergeWithNextId));
+if (!pMergeWithNext)
+m_pMergeWithNextCB->SetState(TRISTATE_INDET);
+else
+m_pMergeWithNextCB->Check(pMergeWithNext->GetValue());
+m_pMergeWithNextCB->SaveValue();
+
const SvxBoxItem* pBoxItem;
const SvxBoxInfoItem* pBoxInfoItem;
sal_uInt16 nWhichBox = GetWhich(mnBoxSlot);
@@ -451,7 +465,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
pBoxInfoItem = GetItem( *rSet, SID_ATTR_BORDER_INNER, false );
-eCoreUnit = rSet->GetPool()->GetMetric( nWhichBox );
+eCoreUnit = pPool->GetMetric( nWhichBox );
if ( pBoxItem && pBoxInfoItem ) // -> Don't Care
{
@@ -648,9 +662,10 @@ void SvxBorderTabPage::ChangesApplied()
m_pRightMF->SaveValue();
m_pTopMF->SaveValue();
m_pBottomMF->SaveValue();
+m_pMergeWithNextCB->SaveValue();
+m_pMergeAdjacentBordersCB->SaveValue();
}
-
DeactivateRC SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
@@ -659,14 +674,44 @@ DeactivateRC SvxBorderTabPage::DeactivatePage(
SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-
bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
{
bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs );
+SfxItemPool* pPool = rCoreAttrs->GetPool();
+if (m_pMergeAdjacentBordersCB->IsValueChangedFromSaved())
+{
+sal_uInt16 nMergeAdjacentBordersId =
pPool->GetWhich(SID_SW_COLLAPSING_BORDERS);
+auto nState = m_pMergeAdjacentBordersCB->GetState();
+if (nState == TRISTATE_INDET)
+rCoreAttrs->ClearItem(nMergeAdjacentBordersId);
+else
+{
+std::unique_ptr
xNewItem(static_cast(rCoreAttrs->Get(nMergeAdjacentBordersId).Clone()));
+xNewItem->SetValue(static_cast(nState));
+
[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
wsd/DocumentBroker.cpp | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 14537846a8891adaa2a56ae05edbe288a9469f43
Author: Tamás Zolnai
AuthorDate: Mon Sep 3 16:35:00 2018 +0200
Commit: Tamás Zolnai
CommitDate: Mon Sep 3 16:35:00 2018 +0200
Handle unset client visible area case while calculating tiles-on-fly limit
Change-Id: I25ea6f1efdc8115304d5449cfccdbb5c0c15fb1f
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 59ce6d0b8..8de6a9779 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1370,13 +1370,23 @@ void DocumentBroker::sendRequestedTiles(const
std::shared_ptr& se
// How many tiles we have on the visible area, set the upper limit
accordingly
Util::Rectangle normalizedVisArea = session->getNormalizedVisibleArea();
-const int tilesFitOnWidth = std::ceil(normalizedVisArea._x2 /
session->getTileWidthInTwips()) -
-std::ceil(normalizedVisArea._x1 /
session->getTileWidthInTwips()) + 1;
-const int tilesFitOnHeight = std::ceil(normalizedVisArea._y2 /
session->getTileHeightInTwips()) -
- std::ceil(normalizedVisArea._y1 /
session->getTileHeightInTwips()) + 1;
-const int tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight;
+float tilesOnFlyUpperLimit = 0;
+if (normalizedVisArea.hasSurface() && session->getTileWidthInTwips() != 0
&& session->getTileHeightInTwips() != 0)
+{
+
+const int tilesFitOnWidth = std::ceil(normalizedVisArea._x2 /
session->getTileWidthInTwips()) -
+std::ceil(normalizedVisArea._x1 /
session->getTileWidthInTwips()) + 1;
+const int tilesFitOnHeight = std::ceil(normalizedVisArea._y2 /
session->getTileHeightInTwips()) -
+ std::ceil(normalizedVisArea._y1 /
session->getTileHeightInTwips()) + 1;
+const int tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight;
+
+tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT,
tilesInVisArea * 1.5f);
+}
+else
+{
+tilesOnFlyUpperLimit = 200; // Have a big number here to get all tiles
requested by file openning
+}
-const float tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT,
tilesInVisArea * 1.5f);
// Update client's tilesBeingRendered list
session->removeOutdatedTileSubscriptions();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig extras/source include/sfx2 include/svtools include/svx include/vcl Repository.mk solenv/sanitizers svtools/source svx/Executable_pixelctl.mk svx
Repository.mk |3
cui/source/inc/backgrnd.hxx |4
cui/source/inc/cuitabarea.hxx | 248 +++---
cui/source/tabpages/backgrnd.cxx | 43 -
cui/source/tabpages/tparea.cxx| 130 +--
cui/source/tabpages/tpbitmap.cxx | 430 +-
cui/source/tabpages/tpcolor.cxx |6
cui/source/tabpages/tpgradnt.cxx | 482 +---
cui/source/tabpages/tphatch.cxx | 353
cui/source/tabpages/tppattern.cxx | 289 +++
cui/uiconfig/ui/areatabpage.ui| 12
cui/uiconfig/ui/bitmaptabpage.ui | 78 +
cui/uiconfig/ui/colorpage.ui | 54 +
cui/uiconfig/ui/gradientpage.ui | 132 ++-
cui/uiconfig/ui/hatchpage.ui | 106 ++
cui/uiconfig/ui/patterntabpage.ui | 108 ++
extras/source/glade/libreoffice-catalog.xml.in|3
include/sfx2/tabdlg.hxx |8
include/svtools/valueset.hxx |6
include/svx/SvxPresetListBox.hxx | 39
include/svx/colorbox.hxx |3
include/svx/dlgctrl.hxx | 31
include/vcl/customweld.hxx|6
include/vcl/layout.hxx| 11
include/vcl/weld.hxx |4
solenv/sanitizers/ui/cui.suppr| 19
svtools/source/control/valueacc.cxx | 19
svtools/source/control/valueimp.hxx |3
svtools/source/control/valueset.cxx | 75 +
svx/Executable_pixelctl.mk| 40 -
svx/Module_svx.mk |2
svx/inc/pch/precompiled_svx.hxx | 39
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 552 ++
svx/source/accessibility/svxrectctaccessiblecontext.cxx |3
svx/source/dialog/dlgctrl.cxx | 82 --
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 191 +---
svx/source/inc/svxrectctaccessiblecontext.hxx | 19
svx/source/tbxctrls/SvxPresetListBox.cxx | 78 +
svx/workben/pixelctl.cxx | 127 ---
vcl/source/app/customweld.cxx |6
vcl/source/app/salvtables.cxx | 15
vcl/source/uitest/uiobject.cxx|9
vcl/unx/gtk3/gtk3gtkinst.cxx | 33
43 files changed, 1908 insertions(+), 1993 deletions(-)
New commits:
commit 79daf40ec696e0855d4a2894f048e44188cfbbb6
Author: Caolán McNamara
AuthorDate: Tue Jun 19 15:02:49 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 3 18:25:52 2018 +0200
weld SvxAreaTabPage
which itself has 5 sub tab pages
Change-Id: If71e91248b5771af4845ad6dba997ac4c7841b5d
Reviewed-on: https://gerrit.libreoffice.org/56112
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/Repository.mk b/Repository.mk
index 5f62c277b33d..6787c1c0add5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -66,8 +66,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svdemo \
fftester \
svptest \
-svpclient \
-pixelctl ) \
+svpclient ) \
$(if $(filter LINUX %BSD SOLARIS,$(OS)), tilebench) \
$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
outdevgrind) \
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index b08e9b92d249..078e78f05297 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -144,12 +144,12 @@ private:
class SvxBkgTabPage : public SvxAreaTabPage
{
-VclPtr m_pTblLBox;
+std::unique_ptr m_xTblLBox;
boolbHighlighting : 1;
public:
using SvxAreaTabPage::DeactivatePage;
-SvxBkgTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
+SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxBkgTabPage() override;
virtual void dispose() override;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 119c466a9971..de7fd90cc3e7 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -37,6 +37,7 @@
#define NO_BUTTON_SELECTED -1
+class ColorListBox;
class SdrModel;
class SvxBitmapCtl;
class SvxColorListBox;
@@ -46,37 +47,37 @@ class ButtonBox
{
private:
[Libreoffice-commits] core.git: sw/sdi sw/source
sw/sdi/_frmsh.sdi |6 ++
sw/source/uibase/shells/frmsh.cxx |6 ++
2 files changed, 12 insertions(+)
New commits:
commit 6c3d10d86e48e92ad963750ec5ba6e1049df2532
Author: Maxim Monastirsky
AuthorDate: Mon Sep 3 12:16:55 2018 +0300
Commit: Maxim Monastirsky
CommitDate: Mon Sep 3 23:39:20 2018 +0200
Enable the align group button for frames
Change-Id: I6ba8b5fe0d185817e61986c90f5264493b6d5339
Reviewed-on: https://gerrit.libreoffice.org/59951
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 734b50c5ebc1..6d02c04efdeb 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -330,6 +330,12 @@ interface BaseTextFrame
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+SID_OBJECT_ALIGN
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
FN_FORMAT_FOOTNOTE_DLG // status()
[
ExecMethod = Execute;
diff --git a/sw/source/uibase/shells/frmsh.cxx
b/sw/source/uibase/shells/frmsh.cxx
index b9c7b98a3f95..1f3a0d3424ca 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -735,6 +735,12 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
rSet.Put(aSet.Get(GetPool().GetWhich(nWhich)));
}
break;
+case SID_OBJECT_ALIGN:
+{
+if ( bProtect )
+rSet.DisableItem( nWhich );
+}
+break;
case SID_OBJECT_ALIGN_LEFT :
case SID_OBJECT_ALIGN_CENTER :
case SID_OBJECT_ALIGN_RIGHT :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-animations.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 3017396a26f22ea193b4fd74bc485bc31cd547fe
Author: Mark Hung
AuthorDate: Sat Sep 1 09:45:21 2018 +0800
Commit: Mark Hung
CommitDate: Tue Sep 4 00:36:32 2018 +0200
sd/pptx export: allow exporting effect preset id.
Change-Id: I2a0149e7f47fe3d5abeea61c93d0a55782af3e6d
Reviewed-on: https://gerrit.libreoffice.org/59891
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 6cc5e6573733..2f02c44a6a47 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -943,6 +943,7 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
if (rPresetId.getLength() > 0)
{
nPresetId = AnimationExporter::GetPresetID(rPresetId, nPresetClass,
bPresetId);
+bPresetId = true;
}
sal_uInt32 nPresetSubType = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 23 +++--
1 file changed, 21 insertions(+), 2 deletions(-)
New commits:
commit a8aaffa6ea0f0fd8cf1d22883173df64a93e3322
Author: Mike Kaganski
AuthorDate: Mon Sep 3 19:27:57 2018 +0300
Commit: Mike Kaganski
CommitDate: Mon Sep 3 22:25:35 2018 +0200
tdf#119146: fix populating maCurrentSubsets
Regression from commit 4600b07c1d787f959618d9ecf54161e4ea4ffa61
Before the mentioned commit, creating a subset X, and then adding
sub-subsets until all the subset is excluded, had left the subset X
with two *empty* nodes in maCurrentSubsets, 1st of them having both
mnStartIndex and mnEndIndex equal to maSubset.mnStartIndex, and 2nd
having both mnStartIndex and mnEndIndex equal to maSubset.mnEndIndex.
The commit above changed that to adding maSubset to maCurrentSubsets
in the beginning of each exclusion, which finally resulted in a messy
maCurrentSubsets with multiple duplicating nodes effectively covering
all maSubset. That resulted in the item as a whole handled *besides*
the sub-subsets.
This commit (1) avoids adding extra maSubset to maCurrentSubsets, and
(2) adds the two empty nodes in case all the subset has been excluded
by its sub-subsets.
Change-Id: I7fc5f2d0b6ecf4f9247351da3a2746032150557b
Reviewed-on: https://gerrit.libreoffice.org/59948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 308e0502ab7a..3bc64b7125ee 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -214,6 +214,25 @@ namespace slideshow
maCurrentSubsets.insert(maCurrentSubsets.end(),
aNodesToAppend.begin(),
aNodesToAppend.end());
+// Excluding subsets must not leave an absolutely empty
maCurrentSubsets, because it
+// would mean "non-subsetting" mode unconditionally, with whole
object added to subsets.
+// So to indicate a subset with all parts excluded, add two empty
subsets (starting and
+// ending).
+if (maCurrentSubsets.empty())
+{
+if (maSubset.isEmpty())
+{
+maCurrentSubsets.emplace_back(0, 0);
+maCurrentSubsets.emplace_back(maActionClassVector.size(),
+ maActionClassVector.size());
+}
+else
+{
+maCurrentSubsets.emplace_back(maSubset.getStartIndex(),
+ maSubset.getStartIndex());
+maCurrentSubsets.emplace_back(maSubset.getEndIndex(),
maSubset.getEndIndex());
+}
+}
}
void DrawShapeSubsetting::updateSubsets()
@@ -276,10 +295,10 @@ namespace slideshow
void DrawShapeSubsetting::initCurrentSubsets()
{
-// only add subset to vector, if it's not empty - that's
+// only add subset to vector, if vector is empty, and subset is
not empty - that's
// because the vector's content is later literally used
// for e.g. painting.
-if( !maSubset.isEmpty() )
+if (maCurrentSubsets.empty() && !maSubset.isEmpty())
maCurrentSubsets.push_back( maSubset );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in
distro-configs/LibreOfficeFlatpak.conf |1 +
solenv/flatpak-manifest.in | 18 --
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 76dbcbf621af4e684ff0d9a36f1f5a0e3cc219b1
Author: Stephan Bergmann
AuthorDate: Mon Sep 3 10:50:36 2018 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 3 21:59:59 2018 +0200
Adapt solenv/flatpak-manifest.in to recent changes
Change-Id: Ibbc167ca736012e7585694885370c1505ad48499
Reviewed-on: https://gerrit.libreoffice.org/59939
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index 10c767b52919..016c9b065431 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -45,6 +45,7 @@
--without-system-libwps
--without-system-libzmf
--without-system-lpsolve
+--without-system-mariadb
--without-system-mdds
--without-system-mythes
--without-system-neon
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 8964111edf8d..d9c397de4318 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -360,10 +360,16 @@
"dest-filename":
"external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2;,
-"sha256":
"dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1",
+"url":
"https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz;,
+"sha256":
"fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60",
"type": "file",
-"dest-filename": "external/tarballs/mdds-1.3.1.tar.bz2"
+"dest-filename":
"external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+},
+{
+"url":
"https://dev-www.libreoffice.org/src/mdds-1.4.1.tar.bz2;,
+"sha256":
"9ac690c37f5f06dc88551405d5daf9d9ad25edf65aae6325b59e905c2ba444c3",
+"type": "file",
+"dest-filename": "external/tarballs/mdds-1.4.1.tar.bz2"
},
{
"url":
"https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz;,
@@ -390,10 +396,10 @@
"dest-filename": "external/tarballs/openldap-2.4.45.tgz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz;,
-"sha256":
"bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b",
+"url":
"https://dev-www.libreoffice.org/src/liborcus-0.14.0.tar.gz;,
+"sha256":
"7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef",
"type": "file",
-"dest-filename": "external/tarballs/liborcus-0.13.4.tar.gz"
+"dest-filename": "external/tarballs/liborcus-0.14.0.tar.gz"
},
{
"url":
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/84cb870bf475fbded9decde12d577d45bdbd51
0e/84cb870bf475fbded9decde12d577d45bdbd51 |1 + 1 file changed, 1 insertion(+) New commits: commit 8c0bd4e06e93478e777590baa241b8c1d3873751 Author: Caolán McNamara AuthorDate: Mon Sep 3 21:34:32 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 21:34:32 2018 +0100 Notes added by 'git notes add' diff --git a/0e/84cb870bf475fbded9decde12d577d45bdbd51 b/0e/84cb870bf475fbded9decde12d577d45bdbd51 new file mode 100644 index ..b966adadf710 --- /dev/null +++ b/0e/84cb870bf475fbded9decde12d577d45bdbd51 @@ -0,0 +1 @@ +prefer: 9212201d70c33516efd16c8715716cf502a479c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a7/cfad66a718993e3a94bfacc0a4ce7ad08f9aa5
a7/cfad66a718993e3a94bfacc0a4ce7ad08f9aa5 |1 + 1 file changed, 1 insertion(+) New commits: commit 11076681942a69056355ebe66e10fa4225f724a4 Author: Caolán McNamara AuthorDate: Mon Sep 3 21:34:56 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 21:34:56 2018 +0100 Notes added by 'git notes add' diff --git a/a7/cfad66a718993e3a94bfacc0a4ce7ad08f9aa5 b/a7/cfad66a718993e3a94bfacc0a4ce7ad08f9aa5 new file mode 100644 index ..8e5c182e7789 --- /dev/null +++ b/a7/cfad66a718993e3a94bfacc0a4ce7ad08f9aa5 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/openssl sw/source
external/openssl/ExternalProject_openssl.mk |1 + sw/source/filter/ww8/ww8par.cxx |3 +++ 2 files changed, 4 insertions(+) New commits: commit 81a6835048d1f2e01432b8765e696f8b3529bed3 Author: Caolán McNamara AuthorDate: Mon Sep 3 17:20:21 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 22:01:51 2018 +0200 ofz#10198 reset uncommitted fly stuff & pams before applying redlining Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99 Reviewed-on: https://gerrit.libreoffice.org/59946 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index d5fe4bde60b4..79c7ef20b885 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5393,6 +5393,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) UpdateFields(); +m_xWFlyPara.reset(); +m_xSFlyPara.reset(); + // delete the pam before the call for hide all redlines (Bug 73683) if (m_bNewDoc) m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode); commit b31829c93d8ae45bdda52155021d44b91b73 Author: Caolán McNamara AuthorDate: Mon Sep 3 16:57:23 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 3 22:01:41 2018 +0200 define PURIFY for openssl for dbgutil to silence valgrind spew Change-Id: I318ca368f26e42038a043b1e264a619795a9515e Reviewed-on: https://gerrit.libreoffice.org/59945 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 211de4ab06fd..c00521f9f168 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -82,6 +82,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ && $(MAKE) build_libs \ CC="$(CC) -fPIC \ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), -DPURIFY,) \ $(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden)" \ ) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 119653] Paragraph Style: problems with next-style rule and line spacing
https://bugs.documentfoundation.org/show_bug.cgi?id=119653 Dieter Praas changed: What|Removed |Added Summary|Paragraph Style |Paragraph Style: problems ||with next-style rule and ||line spacing CC||dgp-m...@gmx.de --- Comment #2 from Dieter Praas --- Leandro, I can't find paragraph style "test style" or "test style with indent", so I couldn't try to reproduce it. It might be similar to my reported bug 113131, butI don't think it i a duplicate. I also couldn't reproduce your second report (might be better to open a separate bug report). I changed the line spacing to 2cm and could see clearly that this didn't effect the spacing between the paragraph and the second heasing. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119153] Print Previews shortcut listed in File menu doesn't work by default
https://bugs.documentfoundation.org/show_bug.cgi?id=119153 Jon changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #5 from Jon --- Yes, in safe mode the behavior is the same. I pulled up a couple of presentations I did last year, obviously under an earlier version of LibreOffice, and the problem does not appear when presenting them in 6.1. The file I uploaded is from a series which I am doing and typically I start a new presentation by opening the previous one and renaming it, then delete most of the slides (1-3 at the beginning are repeated with minor changes each week) and continue producing new slides. The problem first occurs in a file I created at the end of last January. I haven't checked every file since then, but it appears to persist after that point. It is possible that the problem is due to some corruption introduced in the January presentation, but if no one else is having problems with the file I uploaded, clearly there's something else going on. As I stated before, this behavior is identical on 2 computers, both with different processors and different graphics cards, both running the same version of Windows 10 and Libreoffice 6.1. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108364] [META] Table/Row/Column/Cell management function bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108364 Bug 108364 depends on bug 119293, which changed state. Bug 119293 Summary: UI Consistency for inserting rows in Writer table https://bugs.documentfoundation.org/show_bug.cgi?id=119293 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113305] [META] Bundled fonts bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=113305 Bug 113305 depends on bug 79022, which changed state. Bug 79022 Summary: Please bundle Source Serif Pro https://bugs.documentfoundation.org/show_bug.cgi?id=79022 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119076] Add means to use the horizontal ruler to shift left indent but leave first line in place
https://bugs.documentfoundation.org/show_bug.cgi?id=119076 Heiko Tietze changed: What|Removed |Added CC|libreoffice-ux-advise@lists |tietze.he...@gmail.com |.freedesktop.org| Keywords|needsUXEval | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119153] Print Previews shortcut listed in File menu doesn't work by default
https://bugs.documentfoundation.org/show_bug.cgi?id=119153 --- Comment #7 from Jon --- My apologies. Because I hadn't seen comments on this bug for a while, I assumed it was about another, more recent issue I had with Impress. To answer your question, yes, the problem does persist in any Writer document in safe mode. When I pull up the keyboard customization, there is nothing assigned to Ctrl-Shift-O. Obviously it's easy to fix, but I reported it just because it creates some confusion and could be a turn off for a new user. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 111854] Formula objects are permanently deleted when tracking changes
https://bugs.documentfoundation.org/show_bug.cgi?id=111854 --- Comment #4 from Frederic Parrenin --- It also present in 6.1.1.1. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119625] Firebird: Migration: "value exceeds range for a valid time"
https://bugs.documentfoundation.org/show_bug.cgi?id=119625 --- Comment #1 from Alex Thurgood --- Testing with Version: 6.2.0.0.alpha0+ Build ID: b8658c0e847afe1ed199c5fa7a2dd5d1d61ccbac CPU threads: 4; OS: Mac OS X 10.13.6; UI render: default; Locale: fr-FR (fr_FR.UTF-8); Calc: threaded I see no error message, but then again, no migration is performed, irrespective of the number of times I press on the "Yes" button (Experimental options activated). -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119628] EDITING: Firebird Embedded: error message when resetting auto increment a second time
https://bugs.documentfoundation.org/show_bug.cgi?id=119628 --- Comment #1 from Alex Thurgood --- I get the following error message 1: firebird_sdbc error: *Dynamic SQL Error *SQL error code = -104 *Token unknown - line 1, column 42 *"Employee ID" caused by 'isc_dsql_prepare' when using Version: 6.2.0.0.alpha0+ Build ID: b8658c0e847afe1ed199c5fa7a2dd5d1d61ccbac CPU threads: 4; OS: Mac OS X 10.13.6; UI render: default; Locale: fr-FR (fr_FR.UTF-8); Calc: threaded and the SQL command: ALTER TABLE "Employee Table" ALTER FIELD "Employee ID" RESTART WITH 16 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119157] After Modifying A Writer Template, Document Doesn't Ask To Update Styles When Opened
https://bugs.documentfoundation.org/show_bug.cgi?id=119157 Dieter Praas changed: What|Removed |Added CC||dgp-m...@gmx.de --- Comment #6 from Dieter Praas --- Perhaps it's a possibility to open the meta.xml file of your document to prove, if the template path and the settings are correct. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 119412] Graphic Contextmenu in Writer, Calc, Draw and Impress
https://bugs.documentfoundation.org/show_bug.cgi?id=119412 --- Comment #10 from Maxim Monastirsky --- Also, it would be nice to replace the .uno:AlignFrameMenu submenu in Writer with .uno:ObjectAlign (I looked at the code and verified that they're do the same thing). This will add consistency with shapes and other apps, and also with the toolbar, as Jay replaced the commands in the toolbar with the ones from .uno:ObjectAlign - see https://cgit.freedesktop.org/libreoffice/core/commit/?id=24f50a40fc704b92a0aa6017f1877b4399926640 -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 61605] Windows: App icons are of low quality, have jagged corners
https://bugs.documentfoundation.org/show_bug.cgi?id=61605 Heiko Tietze changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME CC||tietze.he...@gmail.com --- Comment #6 from Heiko Tietze --- Icons have been reworked in 6.1. So this issue should be past. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106228] [META] Icon theme issues
https://bugs.documentfoundation.org/show_bug.cgi?id=106228 Bug 106228 depends on bug 61605, which changed state. Bug 61605 Summary: Windows: App icons are of low quality, have jagged corners https://bugs.documentfoundation.org/show_bug.cgi?id=61605 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 118991] EDITING. 100% CPU usage after a few minutes with certain documents.
https://bugs.documentfoundation.org/show_bug.cgi?id=118991 --- Comment #10 from laur...@norbit.no --- I deleted my profile and ran both 6.0.5 and 6.1.0 on macOS and the system behaved well for a while (no excessive CPU use). I did try redoing one of the tables (and frame) on the first page at the same time. But it seems that the problem has returned last week, it's possible that a colleague has edited in Word 2016 (but not sure - and he cannot remember) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119153] Print Previews shortcut listed in File menu doesn't work by default
https://bugs.documentfoundation.org/show_bug.cgi?id=119153 --- Comment #6 from Buovjaga --- (In reply to Jon from comment #5) > I pulled up a couple of presentations I did last year, obviously under an > earlier version of LibreOffice, and the problem does not appear when > presenting them in 6.1. The file I uploaded is from a series which I am > doing You did not upload any file yet. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47518] LO ignores locale settings in windows
https://bugs.documentfoundation.org/show_bug.cgi?id=47518 Eike Rathke changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Eike Rathke --- *** This bug has been marked as a duplicate of bug 46448 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47518] LO ignores locale settings in windows
https://bugs.documentfoundation.org/show_bug.cgi?id=47518 Eike Rathke changed: What|Removed |Added Status|RESOLVED|CLOSED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46448] Allow custom locale settings for decimal separator, group separator, default date and time formats
https://bugs.documentfoundation.org/show_bug.cgi?id=46448 Eike Rathke changed: What|Removed |Added CC||zaboda...@yandex.ru --- Comment #21 from Eike Rathke --- *** Bug 47518 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103303] [META] Desktop integration bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103303 Bug 103303 depends on bug 47518, which changed state. Bug 47518 Summary: LO ignores locale settings in windows https://bugs.documentfoundation.org/show_bug.cgi?id=47518 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119648] Crash if I click on Fontwork Shape: Arch Left, Arch Right (Pour or Curve).
https://bugs.documentfoundation.org/show_bug.cgi?id=119648 Xisco Faulí changed: What|Removed |Added Crash report or||["SdrObjList::GetObj(unsign crash signature||ed int)"] See Also||https://crashreport.libreof ||fice.org/stats/signature/Sd ||rObjList::GetObj(unsigned%2 ||0int) CC||xiscofa...@libreoffice.org -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119623] Lonely SUM formula fails to update, and thus can lead to a treacherously wrong result (steps in comment 5)
https://bugs.documentfoundation.org/show_bug.cgi?id=119623 --- Comment #8 from jean.orl...@free.fr --- (In reply to Oliver Brinzing from comment #2) > Created attachment 144587 [details] > test_sum_bug > > can also confirm with a newly created document. Also confirm with your newly created document. For info, I have Version: 6.0.5.2 Build ID: 54c8cbb85f300ac59db32fe8a675ff7683cd5a16 Threads CPU : 4; OS : Mac OS X 10.13.6; UI Render : par défaut; Locale : fr-FR (fr_FR.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 116482] CRASH on Drawing (assertion failure at vcl/source/app/scheduler.cxx:597)
https://bugs.documentfoundation.org/show_bug.cgi?id=116482 Xisco Faulí changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||9648 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119648] Crash if I click on Fontwork Shape: Arch Left, Arch Right (Pour or Curve).
https://bugs.documentfoundation.org/show_bug.cgi?id=119648 --- Comment #4 from Xisco Faulí --- Created attachment 144623 --> https://bugs.documentfoundation.org/attachment.cgi?id=144623=edit gdb backtrace -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119648] Crash if I click on Fontwork Shape: Arch Left, Arch Right (Pour or Curve).
https://bugs.documentfoundation.org/show_bug.cgi?id=119648 Xisco Faulí changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||6482 Keywords||haveBacktrace -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119650] FILESAVE: It takes >2:40 to save a small spreadsheet with comments and more than 400Mb in extra memory usage with GTK2, 3 VCL
https://bugs.documentfoundation.org/show_bug.cgi?id=119650 Xisco Faulí changed: What|Removed |Added Version|5.2.7.2 release |4.1 all versions Keywords||wantBacktrace --- Comment #5 from Xisco Faulí --- it takes real7m10.271s user7m8.012s sys 0m1.191s in Version 4.1.0.0.alpha0+ (Build ID: efca6f15609322f62a35619619a6d5fe5c9bd5a) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119076] Add means to use the horizontal ruler to shift left indent but leave first line in place
https://bugs.documentfoundation.org/show_bug.cgi?id=119076 Dieter Praas changed: What|Removed |Added Resolution|--- |WORKSFORME Status|UNCONFIRMED |RESOLVED --- Comment #11 from Dieter Praas --- Bernd, I opened Bug 119657. Please confirm it (and perhaps add you experiences). I close this bug with WORKSFORME. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 119076] Add means to use the horizontal ruler to shift left indent but leave first line in place
https://bugs.documentfoundation.org/show_bug.cgi?id=119076 Dieter Praas changed: What|Removed |Added Resolution|--- |WORKSFORME Status|UNCONFIRMED |RESOLVED --- Comment #11 from Dieter Praas --- Bernd, I opened Bug 119657. Please confirm it (and perhaps add you experiences). I close this bug with WORKSFORME. -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 108629] [META] Ruler bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108629 Bug 108629 depends on bug 119076, which changed state. Bug 119076 Summary: Add means to use the horizontal ruler to shift left indent but leave first line in place https://bugs.documentfoundation.org/show_bug.cgi?id=119076 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 91130] Smaller default font name list
https://bugs.documentfoundation.org/show_bug.cgi?id=91130 Heiko Tietze changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=88 ||416 -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 91130] Smaller default font name list
https://bugs.documentfoundation.org/show_bug.cgi?id=91130 Heiko Tietze changed: What|Removed |Added CC||aftertheb...@gmail.com --- Comment #28 from Heiko Tietze --- *** Bug 60626 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60626] Allow custom font sorting
https://bugs.documentfoundation.org/show_bug.cgi?id=60626 Heiko Tietze changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #10 from Heiko Tietze --- *** This bug has been marked as a duplicate of bug 91130 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113638] [META] Fonts listed in LibreOffice
https://bugs.documentfoundation.org/show_bug.cgi?id=113638 Bug 113638 depends on bug 60626, which changed state. Bug 60626 Summary: Allow custom font sorting https://bugs.documentfoundation.org/show_bug.cgi?id=60626 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
