[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/SvxNotebookbarConfigPage.cxx |7
cui/source/customize/cfg.cxx |2
cui/source/inc/cfg.hxx|2
cui/uiconfig/ui/menuassignpage.ui | 541 ++
4 files changed, 265 insertions(+), 287 deletions(-)
New commits:
commit e7f62648f01ba776357e9fcbb9f49c2fb3490ab1
Author: Caolán McNamara
AuthorDate: Thu Dec 8 20:34:21 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 09:05:04 2022 +
make Notebookbar customize page match indent with the others
remove intermediate grids with just one child, name the containers
of the groups of widgets to be hidden and hide the container rather
than the individual members so the container space doesn't push
this page out of alignment with the others.
Change-Id: Ie3fb291da49a6b43ca4516e5fe55b828543631e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143838
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 91ce6352ddca..35dc04aacbaa 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -107,14 +107,11 @@
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
m_xDescriptionField->set_visible(false);
m_xMoveUpButton->set_visible(false);
m_xMoveDownButton->set_visible(false);
-m_xAddCommandButton->set_visible(false);
-m_xRemoveCommandButton->set_visible(false);
+m_xCommandButtons->set_visible(false);
m_xLeftFunctionLabel->set_visible(false);
m_xSearchLabel->set_visible(false);
m_xCategoryLabel->set_visible(false);
-m_xInsertBtn->set_visible(false);
-m_xModifyBtn->set_visible(false);
-m_xResetBtn->set_visible(false);
+m_xCustomizeBox->set_visible(false);
m_xCustomizeLabel->set_visible(false);
weld::TreeView& rCommandCategoryBox = m_xFunctions->get_widget();
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 030307879738..fe59621c1c4b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1009,9 +1009,11 @@ SvxConfigPage::SvxConfigPage(weld::Container* pPage,
weld::DialogController* pCo
, m_xMoveUpButton(m_xBuilder->weld_button("up"))
, m_xMoveDownButton(m_xBuilder->weld_button("down"))
, m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
+, m_xCustomizeBox(m_xBuilder->weld_widget("customizebox"))
, m_xInsertBtn(m_xBuilder->weld_menu_button("insert"))
, m_xModifyBtn(m_xBuilder->weld_menu_button("modify"))
, m_xResetBtn(m_xBuilder->weld_button("defaultsbtn"))
+, m_xCommandButtons(m_xBuilder->weld_widget("arrowgrid"))
, m_xAddCommandButton(m_xBuilder->weld_button("add"))
, m_xRemoveCommandButton(m_xBuilder->weld_button("remove"))
{
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 87b17b1c912f..10ce7d89af7b 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -411,12 +411,14 @@ protected:
std::unique_ptrm_xSaveInListBox;
+std::unique_ptr m_xCustomizeBox;
std::unique_ptr m_xInsertBtn;
std::unique_ptr m_xModifyBtn;
// Used to reset the selected toolbar/menu/context menu
std::unique_ptr m_xResetBtn;
// Middle buttons
+std::unique_ptr m_xCommandButtons;
std::unique_ptr m_xAddCommandButton;
std::unique_ptr m_xRemoveCommandButton;
diff --git a/cui/uiconfig/ui/menuassignpage.ui
b/cui/uiconfig/ui/menuassignpage.ui
index b67c24b24f1f..b545c193a352 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -674,7 +674,7 @@
-
+
True
False
5
@@ -762,7 +762,7 @@
-
+
True
False
center
@@ -770,32 +770,20 @@
6
6
-
-
+
True
-False
-5
-
-
-True
-True
-True
-Add item
-center
-start
-5
-image3
-True
-
-
-Click on the right
arrow button to select a function on the left display box and copy to the right
display box. This will add the function to the selected menu.
-
-
+True
+True
+Add item
+center
+start
+10
+
Re: What's the license of external library？
On Fri, 2022-12-09 at 08:58 +0900, taichi wrote: > What license is applied to *.patch* files in the external/[library > name] directory? > > 1. the MPLv2 > 2. the license of each library (including MPLv2) It depends where the patch came from. If they are backports from the upstream[1] then its the upstream license. If its added by one of our contributors it defaults to our usual license (which the contributor has stated is the case for their contributions at some point in the past), but any sensible person will want to allow those patches to be merged upstream if such a merge makes sense so feel free to clarify that if necessary. [1] like external/harfbuzz/0001-font-Respect-subfont-slant-setting-in- hb-draw.patch.1
[Libreoffice-commits] core.git: sfx2/source sw/source
sfx2/source/view/frmload.cxx |4 ++-- sw/source/uibase/app/swmodule.cxx |5 - sw/source/uibase/uno/unodoc.cxx |2 +- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit e624621089886f52e9606c4f5058f5f5a890261c Author: Stephan Bergmann AuthorDate: Fri May 21 08:40:06 2021 +0100 Commit: Stephan Bergmann CommitDate: Fri Dec 9 09:11:57 2022 + Fix hang during JunitTest_framework_complex on macOS ...when [NSSpellChecker init] is called on a non-main thread, leading to deadlock (see below). The fix is noticing that the first half of SfxFrameLoader_Impl::load and the call to SwGlobals::ensure from Writer_SwTextDocument_getImplementation both don't need to be covered by SolarMutex. Which in turn showed that the call to StartListening from the constructor of SwModule needs to be covered by the SolarMutex (which it no longer was now). The deadlock was at > thread #7, name = 'cppu_threadpool::ORequestThread' > #1: libsystem_pthread.dylib`_pthread_cond_wait > #2: Foundation`-[NSOperation waitUntilFinished] > #3: CoreFoundation`_CFXNotificationPost > #4: Foundation`-[NSNotificationCenter postNotificationName:object:userInfo:] > #5: AppKit`-[NSMenu insertItem:atIndex:] > #6: AppKit`-[NSApplication(NSServicesMenuPrivate) _fillSpellCheckerPopupButton:] > #7: AppKit`-[NSSpellChecker _fillSpellCheckerPopupButton:] > #8: AppKit`-[NSSpellChecker init] > #9: AppKit`__36+[NSSpellChecker sharedSpellChecker]_block_invoke > #10: libdispatch.dylib`_dispatch_client_callout > #11: libdispatch.dylib`_dispatch_once_callout > #12: AppKit`+[NSSpellChecker sharedSpellChecker] > #13: libMacOSXSpelllo.dylib`MacSpellChecker::getLocales at lingucomponent/source/spellcheck/macosxspell/macspellimp.mm:117:42 > #14: liblnglo.dylib`LngSvcMgr::GetAvailableSpellSvcs_Impl at linguistic/source/lngsvcmgr.cxx:969:63 > #15: liblnglo.dylib`LngSvcMgr::getAvailableServices at linguistic/source/lngsvcmgr.cxx:1395:9 > #16: liblnglo.dylib`LngSvcMgr::getAvailableLocales at linguistic/source/lngsvcmgr.cxx:1459:42 > #17: liblnglo.dylib`LngSvcMgr::UpdateAll at linguistic/source/lngsvcmgr.cxx:654:49 > #18: liblnglo.dylib`LngSvcMgr::LngSvcMgr at linguistic/source/lngsvcmgr.cxx:411:5 > #19: liblnglo.dylib`LngSvcMgr::LngSvcMgr at linguistic/source/lngsvcmgr.cxx:399:1 > #20: liblnglo.dylib`::linguistic_LngSvcMgr_get_implementation at linguistic/source/lngsvcmgr.cxx:1840:30 > #21: libuno_cppuhelpergcc3.dylib.3`decltype(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&)>(fp)(std::__1::forward(fp0), std::__1::forward const&>(fp0))) std::__1::__invoke const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&>(com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence const&) > #22: libuno_cppuhelpergcc3.dylib.3`com::sun::star::uno::XInterface* std::__1::__invoke_void_return_wrapper::__call const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&>(com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence const&) > #23: libuno_cppuhelpergcc3.dylib.3`std::__1::__function::__alloc_func const&), std::__1::allocator const&)>, com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&)>::operator(com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence const&) > #24: libuno_cppuhelpergcc3.dylib.3`std::__1::__function::__func const&), std::__1::allocator const&)>, com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&)>::operator(com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence const&) > #25: libuno_cppuhelpergcc3.dylib.3`std::__1::__function::__value_func const&)>::operator(com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence const&) const > #26: libuno_cppuhelpergcc3.dylib.3`std::__1::function const&)>::operator(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence const&) const > #27: libuno_cppuhelpergcc3.dylib.3`cppuhelper::ServiceManager::Data::Implementation::doCreateInstance at cppuhelper/source/servicemanager.cxx:702:13 > #28: libuno_cppuhelpergcc3.dylib.3`cppuhelper::ServiceManager::Data::Implementation::createInstance at cppuhelper/source/servicemanager.cxx:667:30 > #29: libuno_cppuhelpergcc3.dylib.3`cppuhelper::ServiceManager::createInstanceWithContext at cppuhelper/source/servicemanager.cxx:1002:36 > #30: libswlo.dylib`com::sun
[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/quartz
vcl/inc/quartz/salgdi.h |2 +-
vcl/osx/salprn.cxx |2 +-
vcl/quartz/salgdi.cxx | 11 +--
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit de3f13e2175564316eb5a62dee65e9ff8f31b460
Author: Patrick Luby
AuthorDate: Wed Dec 7 14:24:57 2022 -0500
Commit: Caolán McNamara
CommitDate: Fri Dec 9 09:17:42 2022 +
tdf#146842 Do not use Skia for printing
Skia does not work with a native print graphics contexts. I am not sure why
but from what I can see, the Skia implementation drawing to a bitmap buffer.
However, in an NSPrintOperation, the print view's backing buffer is
CGPDFContext so even if this bug could be solved by blitting the Skia bitmap
buffer, the printed PDF would not have selectable text so always disable Skia
for print graphics contexts.
Change-Id: I214ba83b6e368af3ef51ea770b093612d04047a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143798
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 61ff01c12e3a..9e070c4215ce 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -454,7 +454,7 @@ class AquaSalGraphics : public SalGraphicsAutoDelegateToImpl
rtl::ReferencempFont[MAX_FALLBACK];
public:
-AquaSalGraphics();
+AquaSalGraphics(bool bPrinter = false);
virtual ~AquaSalGraphics() override;
voidSetVirDevGraphics(SalVirtualDevice*
pVirDev,CGLayerHolder const &rLayer, CGContextRef, int nBitDepth = 0);
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index bec30a35b562..e9101e390085 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -71,7 +71,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const
SalPrinterQueueInfo& i_rQueue ) :
[mpPrintInfo setOrientation: NSPaperOrientationPortrait];
}
-mpGraphics = new AquaSalGraphics();
+mpGraphics = new AquaSalGraphics(true);
const int nWidth = 100, nHeight = 100;
mpContextMemory.reset(new (std::nothrow) sal_uInt8[nWidth * 4 * nHeight]);
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 1058b7bc31e9..571e44f23e71 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -137,14 +137,21 @@ sal_IntPtr CoreTextFontFace::GetFontId() const
return reinterpret_cast(mxFontDescriptor);
}
-AquaSalGraphics::AquaSalGraphics()
+AquaSalGraphics::AquaSalGraphics(bool bPrinter)
: mnRealDPIX( 0 )
, mnRealDPIY( 0 )
{
SAL_INFO( "vcl.quartz", "AquaSalGraphics::AquaSalGraphics() this=" << this
);
#if HAVE_FEATURE_SKIA
-if(SkiaHelper::isVCLSkiaEnabled())
+// tdf#146842 Do not use Skia for printing
+// Skia does not work with a native print graphics contexts. I am not sure
+// why but from what I can see, the Skia implementation drawing to a bitmap
+// buffer. However, in an NSPrintOperation, the print view's backing buffer
+// is CGPDFContext so even if this bug could be solved by blitting the
+// Skia bitmap buffer, the printed PDF would not have selectable text so
+// always disable Skia for print graphics contexts.
+if(!bPrinter && SkiaHelper::isVCLSkiaEnabled())
mpBackend.reset(new AquaSkiaSalGraphicsImpl(*this, maShared));
#else
if(false)
Re: Re: What's the license of external library？
What should I do to clarify? > - Original Message - > > From: "Caolán McNamara" > To: "taichi" <20001...@ymail.ne.jp>; "libreoffice@lists.freedesktop.org" > > Date: 2022/12/09 金 18:12 > Subject: Re: What's the license of external library？ > > > On Fri, 2022-12-09 at 08:58 +0900, taichi wrote: > > What license is applied to *.patch* files in the external/[library > > name] directory? > > > > 1. the MPLv2 > > 2. the license of each library (including MPLv2) > > It depends where the patch came from. If they are backports from the > upstream[1] then its the upstream license. If its added by one of our > contributors it defaults to our usual license (which the contributor > has stated is the case for their contributions at some point in the > past), but any sensible person will want to allow those patches to be > merged upstream if such a merge makes sense so feel free to clarify > that if necessary. > > [1] like external/harfbuzz/0001-font-Respect-subfont-slant-setting-in- > hb-draw.patch.1 >
Re: Re: What's the license of external library？
On Fri, 2022-12-09 at 18:49 +0900, taichi wrote: > What should I do to clarify? ask the author or whoever added the patch
Re: Re: Re: What's the license of external library？
OK, so if it is a patch I added, I can commit these patches to upstream. I have one last question. If those patches are merged into upstream, will it affect the upstream license? --- caol...@redhat.com wrote: > On Fri, 2022-12-09 at 18:49 +0900, taichi wrote: > > What should I do to clarify? > > ask the author or whoever added the patch
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-13'
Tag 'cib-6.4-13' created by Thorsten Behrens at 2022-12-09 11:29 + Release CIB Office 6.4-13 -BEGIN PGP SIGNATURE- iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCY5McAl8UgAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF RkM0OEVEQkFGM0Y3NjE5MzBENDgyMUUwNzk2QTY4MTdDOTFFNgAKCRAeB5amgXyR 5t2NAQDcey3liBXchzSm7sLWawRdtTFDaVG74JZI7/kCAbB7MgEAzxp3PvpGvPxN dPCvfluMqtYJ7buv1WPACl62zAviJgc= =iDe8 -END PGP SIGNATURE- Changes since cib-6.4-12-17: --- 0 files changed ---
Re: Re: Re: What's the license of external library？
On Fri, 2022-12-09 at 20:23 +0900, taichi wrote: > OK, so if it is a patch I added, I can commit these patches to > upstream. If it's your own patch then you can certainly upstream it and can provide it to upstream under whatever license upstream wants. Doesn't really matter what the copy of your patch in the LibreOffice tree might be under if it's your own work that you are upstreaming. If you have a specific concern you can email le...@documentfoundation.org to get advice
[Libreoffice-commits] core.git: cui/Library_cui.mk include/svx svx/Library_svxcore.mk
cui/Library_cui.mk|1 +
include/svx/diagram/datamodel.hxx | 25 +
svx/Library_svxcore.mk|1 +
3 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit ce4c154e8b254f3bcd59ea46b3db4bd3d5a26058
Author: Michael Stahl
AuthorDate: Thu Dec 8 18:27:06 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Dec 9 12:08:47 2022 +
svx: fix unmaintainable TypeConstant definition
Add one new token and every test in CppunitTest_sd_import_tests-smartart
fails.
Change-Id: I0d79a5000fc2ef9b699ffca3d75199e9479cf561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143834
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index e967e4491419..85f779cc964d 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Library_add_defs,cui,\
$(eval $(call gb_Library_use_custom_headers,cui,\
officecfg/registry \
+ oox/generated \
))
$(eval $(call gb_Library_use_sdk_api,cui))
diff --git a/include/svx/diagram/datamodel.hxx
b/include/svx/diagram/datamodel.hxx
index 42b04fb216f2..756fdd1aff2c 100644
--- a/include/svx/diagram/datamodel.hxx
+++ b/include/svx/diagram/datamodel.hxx
@@ -30,23 +30,24 @@
#include
#include
+#include
namespace svx::diagram {
enum TypeConstant {
XML_none = 0,
-XML_type = 395,
-XML_asst = 680,
-XML_doc = 1924,
-XML_node = 3596,
-XML_norm = 3609,
-XML_parOf = 3878,
-XML_parTrans = 3879,
-XML_pres = 4085,
-XML_presOf = 4090,
-XML_presParOf = 4091,
-XML_rel = 4298,
-XML_sibTrans = 4746,
+XML_type = oox::XML_Type,
+XML_asst = oox::XML_asst,
+XML_doc = oox::XML_doc,
+XML_node = oox::XML_node,
+XML_norm = oox::XML_norm,
+XML_parOf = oox::XML_parOf,
+XML_parTrans = oox::XML_parTrans,
+XML_pres = oox::XML_pres,
+XML_presOf = oox::XML_presOf,
+XML_presParOf = oox::XML_presParOf,
+XML_rel = oox::XML_rel,
+XML_sibTrans = oox::XML_sibTrans,
};
/** A Connection
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 925228c8959d..6a1c0b5de352 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -29,6 +29,7 @@ $(eval $(call
gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
$(eval $(call gb_Library_use_custom_headers,svxcore,\
officecfg/registry \
+ oox/generated \
))
$(eval $(call gb_Library_use_sdk_api,svxcore))
[Libreoffice-commits] core.git: configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 05f55b3898407828bb24347be56247f58803f7bb
Author: Michael Stahl
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Dec 9 12:09:22 2022 +
python3: upgrade to release 3.8.16
Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.
Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index 5fc489a7e8c0..613604558eb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9987,7 +9987,7 @@ if test \( "$cross_compiling" = yes -a -z
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index 814bbf7e744e..60af75d77aca 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export POPPLER_DATA_SHA256SUM :=
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
export POSTGRESQL_SHA256SUM :=
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM :=
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sw/Library_vbaswobj.mk sw/qa sw/source
oovbaapi/UnoApi_oovbaapi.mk|3
oovbaapi/ooo/vba/word/WdContentControlType.idl | 25
oovbaapi/ooo/vba/word/XContentControl.idl | 103 +++
oovbaapi/ooo/vba/word/XContentControls.idl | 23
oovbaapi/ooo/vba/word/XDocument.idl|3
sw/Library_vbaswobj.mk |2
sw/qa/core/data/docm/testModernVBA.docm|binary
sw/qa/core/macros-test.cxx |4
sw/source/ui/vba/vbacontentcontrol.cxx | 754 +
sw/source/ui/vba/vbacontentcontrol.hxx | 142
sw/source/ui/vba/vbacontentcontrols.cxx| 262
sw/source/ui/vba/vbacontentcontrols.hxx| 40 +
sw/source/ui/vba/vbadocument.cxx | 27
sw/source/ui/vba/vbadocument.hxx |3
14 files changed, 1391 insertions(+)
New commits:
commit b7b3538b60455053edbc697ae3fe888c17f1eaee
Author: Justin Luth
AuthorDate: Mon Nov 21 11:44:52 2022 -0500
Commit: Justin Luth
CommitDate: Fri Dec 9 12:23:52 2022 +
tdf#151548 vba ContentControls: Add basic word::XContentControl
squashed patch, including Stephan's cleanup patch
090faf1d8ccf5f7b17b7b6f2a85b3fafa0c5
This adds basic VBA macro support for accessing
the modern content controls used for creating forms.
I ran out of time to make it fully functional.
TODO
-Invalidation: the screen isn't updating the modified results until
interaction from the user (mouse click, etc.)
-Unlike FormFields, content controls really depend on having
Range working. I didn't have time to look into that.
-I was hoping to check that my approach could accommodate the other
methods that create a filtered ContentControls object:
* Document.SelectLinkedControls,
* Document.SelectUnlinkedControls
* Range.ContentControls.
I guess it will be left up to whoever needs these to add the bits
that will create an appropriate collection for these limited sets.
-setType: changing one type to another - both LO and Word allow
limited use of this - depending on the text contents fitting
the new type.
What works:
-getByIndex - which probably is the "normal" way to do it,
since the UI doesn't provide a name/ID; just got via msgbox .ID.
-full checkbox support (minus the visual invalidation)
-VBA accepts almost all properties/methods that are requested.
make CppunitTest_sw_macros_test CPPUNIT_TEST_NAME=testVba
If Not ActiveDocument.ContentControls(1).Checked
If ActiveDocument.ContentControls(2).Checked
'If ActiveDocument.ContentControls(2).Range.Text <> "$"
ActiveDocument.SelectContentControlsByTag("checkboxes").Item(1).Checked
= ActiveDocument.SelectContentControlsByTag("checkboxes").Item(2).Checked
ActiveDocument.SelectContentControlsByTag("checkboxes")
.Item(2).SetUncheckedSymbol (8364) '€
With ActiveDocument.SelectContentControlsByTitle("listbox").Item(1)
If Not .ShowingPlaceholderText
'If .Range.Text <> "Choose an item."
If .Type <> wdContentControlDropdownList
End With
With ActiveDocument.ContentControls.Item(5)
'If Not .Temporary Then GoTo errorhandler:
If .Temporary <> False Then GoTo errorhandler:
If .Tag <> "" Then GoTo errorhandler:
If .Title <> "" Then GoTo errorhandler:
End With
With ActiveDocument.ContentControls.Item(6)
If .Type <> wdContentControlText
If .MultiLine Then GoTo errorhandler:
If ActiveDocument.ContentControls.Count <> 7
.Delete 'Doesn't actually Delete in LO yet - unsafe
' If ActiveDocument.ContentControls.Count <> 6
End With
' Change to 6 when delete is working safely
With ActiveDocument.ContentControls.Item(7)
If .Type <> wdContentControlDate Then GoTo errorhandler:
.Color = wdColorBlueGray 'unknown to Word 2010
If .Color <> wdColorBlueGray Then GoTo errorhandler:
If .DateDisplayFormat <> "mm/yy/dd" Then GoTo errorhandler:
If .DateCalendarType <> wdCalendarWestern Then GoTo errorhandler:
If .LockContents <> False Then GoTo errorhandler:
End With
Change-Id: I1c636f671de81e0283c040a578838a0433ef1f5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143080
Tested-by: Jenkins
Reviewed-by: Justin Luth
Fix typos
Change-Id: I9d22e4a2140f5195d3829e6289ddf3d2f79b632e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143281
Tested-by: Jenkins
Reviewed-by: Julien Nabet
cid#1517059 disentangle Improper use of negative value
Change-Id: I907f54cd93d78fe3638e407c70253b94f849eac3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143351
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143419
Tested-by: Jenkins CollaboraOffice
[Libreoffice-commits] core.git: cui/source
cui/source/customize/macropg.cxx | 49 +++
cui/source/inc/macropg.hxx |2 -
2 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit 4702910165dff6d5cef0d1bc707ff66b0b0d95bd
Author: Caolán McNamara
AuthorDate: Fri Dec 9 10:30:34 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 12:37:20 2022 +
drop unnecessary pThis indirection
Change-Id: I28c338a4f09036c9365937af99cb85fd4be95901
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index db36fe10713a..a1fe3dab39dc 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -375,20 +375,19 @@ IMPL_LINK_NOARG( SvxMacroTabPage_, SelectEvent_Impl,
weld::TreeView&, void)
IMPL_LINK( SvxMacroTabPage_, AssignDeleteHdl_Impl, weld::Button&, rBtn, void )
{
-GenericHandler_Impl(this, &rBtn);
+GenericHandler_Impl(&rBtn);
}
IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, weld::TreeView&, bool)
{
-GenericHandler_Impl(this, nullptr);
+GenericHandler_Impl(nullptr);
return true;
}
// handler for double click on the listbox, and for the assign/delete buttons
-void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const
weld::Button* pBtn)
+void SvxMacroTabPage_::GenericHandler_Impl(const weld::Button* pBtn)
{
-SvxMacroTabPage_Impl*pImpl = pThis->mpImpl.get();
-weld::TreeView& rListBox = *pImpl->xEventLB;
+weld::TreeView& rListBox = *mpImpl->xEventLB;
int nEntry = rListBox.get_selected_index();
if (nEntry == -1)
{
@@ -396,16 +395,16 @@ void
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
return;
}
-const bool bAssEnabled = pBtn != pImpl->xDeletePB.get() &&
pImpl->xAssignPB->get_sensitive();
+const bool bAssEnabled = pBtn != mpImpl->xDeletePB.get() &&
mpImpl->xAssignPB->get_sensitive();
OUString sEventName = rListBox.get_id(nEntry);
OUString sEventURL;
OUString sEventType;
-if(pThis->bAppEvents)
+if (bAppEvents)
{
-EventsHash::iterator h_it = pThis->m_appEventsHash.find(sEventName);
-if(h_it != pThis->m_appEventsHash.end() )
+EventsHash::iterator h_it = m_appEventsHash.find(sEventName);
+if (h_it != m_appEventsHash.end() )
{
sEventType = h_it->second.first;
sEventURL = h_it->second.second;
@@ -413,8 +412,8 @@ void
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
}
else
{
-EventsHash::iterator h_it = pThis->m_docEventsHash.find(sEventName);
-if(h_it != pThis->m_docEventsHash.end() )
+EventsHash::iterator h_it = m_docEventsHash.find(sEventName);
+if (h_it != m_docEventsHash.end() )
{
sEventType = h_it->second.first;
sEventURL = h_it->second.second;
@@ -423,57 +422,57 @@ void
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
bool bDoubleClick = (pBtn == nullptr);
bool bUNOAssigned = sEventURL.startsWith( aVndSunStarUNO );
-if( pBtn == pImpl->xDeletePB.get() )
+if (pBtn == mpImpl->xDeletePB.get())
{
// delete pressed
sEventType = "Script" ;
sEventURL.clear();
-if(!pThis->bAppEvents)
-pThis->bDocModified = true;
+if (!bAppEvents)
+bDocModified = true;
}
else if ( ( ( pBtn != nullptr )
-&& ( pBtn == pImpl->xAssignComponentPB.get() )
+&& ( pBtn == mpImpl->xAssignComponentPB.get() )
)
|| ( bDoubleClick
&& bUNOAssigned
)
)
{
-AssignComponentDialog aAssignDlg(pThis->GetFrameWeld(), sEventURL);
+AssignComponentDialog aAssignDlg(GetFrameWeld(), sEventURL);
short ret = aAssignDlg.run();
if( ret )
{
sEventType = "UNO";
sEventURL = aAssignDlg.getURL();
-if(!pThis->bAppEvents)
-pThis->bDocModified = true;
+if (!bAppEvents)
+bDocModified = true;
}
}
else if( bAssEnabled )
{
// assign pressed
-SvxScriptSelectorDialog aDlg(pThis->GetFrameWeld(), pThis->GetFrame());
+SvxScriptSelectorDialog aDlg(GetFrameWeld(), GetFrame());
short ret = aDlg.run();
if ( ret )
{
sEventType = "Script";
sEventURL = aDlg.GetScriptURL();
-if(!pThis->bAppEvents)
-pThis->bDocModified = true;
+if (!bAppEvents)
+bDocModified = true;
}
}
// update the hashes
-if(pThis->bAppEvents)
+if (bAppEvents)
{
-EventsHash::iterator h_it = pThis->m
[Libreoffice-commits] core.git: cui/source
cui/source/customize/macropg.cxx | 45 ++-
cui/source/inc/macropg.hxx |6 +++--
2 files changed, 30 insertions(+), 21 deletions(-)
New commits:
commit 83eb2796d1f4a6778d40a5e2e94c4b536163fecb
Author: Caolán McNamara
AuthorDate: Fri Dec 9 10:47:05 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 12:37:37 2022 +
Related: tdf#152266 give feedback which events are assigned
where assigned is means an event is assigned to a non-empty url, now the
delete button is only enabled when there is something to delete,
bringing the customizie event page into line with the sheet event page
and the writer frame event assignment page
Change-Id: I7e016bf578dff24b7d47312fd5f7cc63883d1e4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143848
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index a1fe3dab39dc..34eb44849d84 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -64,7 +64,9 @@ void SvxMacroTabPage_::EnableButtons()
int nEvent = mpImpl->xEventLB->get_selected_index();
if (nEvent != -1)
{
-mpImpl->xDeletePB->set_sensitive( !mpImpl->bReadOnly );
+const EventPair* pEventPair =
LookupEvent(mpImpl->xEventLB->get_id(nEvent));
+const bool bAssigned = pEventPair && !pEventPair->second.isEmpty();
+mpImpl->xDeletePB->set_sensitive(!mpImpl->bReadOnly && bAssigned);
mpImpl->xAssignPB->set_sensitive( !mpImpl->bReadOnly );
if( mpImpl->xAssignComponentPB )
mpImpl->xAssignComponentPB->set_sensitive( !mpImpl->bReadOnly );
@@ -384,6 +386,24 @@ IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl,
weld::TreeView&, bool)
return true;
}
+const EventPair* SvxMacroTabPage_::LookupEvent(const OUString& rEventName)
+{
+const EventPair* pRet = nullptr;
+if (bAppEvents)
+{
+EventsHash::iterator h_it = m_appEventsHash.find(rEventName);
+if (h_it != m_appEventsHash.end() )
+pRet = &h_it->second;
+}
+else
+{
+EventsHash::iterator h_it = m_docEventsHash.find(rEventName);
+if (h_it != m_docEventsHash.end() )
+pRet = &h_it->second;
+}
+return pRet;
+}
+
// handler for double click on the listbox, and for the assign/delete buttons
void SvxMacroTabPage_::GenericHandler_Impl(const weld::Button* pBtn)
{
@@ -401,23 +421,10 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
OUString sEventURL;
OUString sEventType;
-if (bAppEvents)
+if (const EventPair* pEventPair = LookupEvent(sEventName))
{
-EventsHash::iterator h_it = m_appEventsHash.find(sEventName);
-if (h_it != m_appEventsHash.end() )
-{
-sEventType = h_it->second.first;
-sEventURL = h_it->second.second;
-}
-}
-else
-{
-EventsHash::iterator h_it = m_docEventsHash.find(sEventName);
-if (h_it != m_docEventsHash.end() )
-{
-sEventType = h_it->second.first;
-sEventURL = h_it->second.second;
-}
+sEventType = pEventPair->first;
+sEventURL = pEventPair->second;
}
bool bDoubleClick = (pBtn == nullptr);
@@ -548,7 +555,7 @@ void SvxMacroTabPage_::InitAndSetHandler( const Reference<
container::XNameRepla
// returns the two props EventType & Script for a given event name
Any SvxMacroTabPage_::GetPropsByName( const OUString& eventName, EventsHash&
eventsHash )
{
-const std::pair< OUString, OUString >& rAssignedEvent( eventsHash[
eventName ] );
+const EventPair& rAssignedEvent(eventsHash[eventName]);
Any aReturn;
::comphelper::NamedValueCollection aProps;
@@ -564,7 +571,7 @@ Any SvxMacroTabPage_::GetPropsByName( const OUString&
eventName, EventsHash& eve
// converts the Any returned by GetByName into a pair which can be stored in
// the EventHash
-std::pair< OUString, OUString > SvxMacroTabPage_::GetPairFromAny( const Any&
aAny )
+EventPair SvxMacroTabPage_::GetPairFromAny( const Any& aAny )
{
Sequence< beans::PropertyValue > props;
OUString type, url;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index ef9e16c51bba..7c934e33799d 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -30,7 +30,8 @@
#include
#include
-typedef std::unordered_map< OUString, std::pair< OUString, OUString > >
EventsHash;
+typedef std::pair EventPair;
+typedef std::unordered_map EventsHash;
struct EventDisplayName
{
@@ -56,6 +57,7 @@ class SvxMacroTabPage_ : public SfxTabPage
DECL_LINK( DoubleClickHdl_Impl, weld::TreeView&, bool );
void GenericHandler_Impl(const weld::Button* pBtn);
+const EventPair* LookupEvent(const OUString& rEventName);
css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/layout/data/tdf152413.fodt | 117
sw/qa/extras/layout/layout.cxx | 13 +++
2 files changed, 130 insertions(+)
New commits:
commit 754b6ef15b8a93f73db4b293ee853668768c91e6
Author: Xisco Fauli
AuthorDate: Fri Dec 9 11:22:41 2022 +0100
Commit: Xisco Fauli
CommitDate: Fri Dec 9 12:57:55 2022 +
tdf#152413: sw_layoutwriter: Add unittest
Change-Id: Ic485c1521969b126d66b0e33b72ca966d02d0ff5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143846
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/layout/data/tdf152413.fodt
b/sw/qa/extras/layout/data/tdf152413.fodt
new file mode 100644
index ..e950289def3a
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf152413.fodt
@@ -0,0 +1,117 @@
+
+http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+
2022-12-09T10:45:58.3046934092022-12-09T10:46:08.151316200PT11S1LibreOfficeDev/7.5.0.0.alpha1$Linux_X86_64
LibreOffice_project/f9395a123e8c85134bdd6e471bc93b2745e22a9d
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ صِرَ ٰطَ
+
+
+
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 587fa4d4294e..71cb32fd9fda 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3504,6 +3504,19 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128611)
assertXPathContent(pXmlDoc, "//tab/row/cell[1]/txt", "Abcd efghijkl");
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf152413)
+{
+createSwDoc("tdf152413.fodt");
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+// Without the fix in place, this test would have failed with
+// - Expected: 1
+// - Actual : 2
+// - In <>, XPath
'/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion' number of nodes
is incorrect
+assertXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion", "portion",
+u"صِرَ ٰطَ");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf125893)
{
createSwDoc("tdf125893.docx");
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx |6 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 10 ++
sw/source/filter/ww8/docxattributeoutput.hxx |1 +
writerfilter/source/dmapper/DomainMapper.cxx | 11 ++-
4 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit a5098b222c9406af858fd6d94d0ceb2c3c2066a8
Author: Justin Luth
AuthorDate: Thu Dec 8 11:45:05 2022 -0500
Commit: Miklos Vajna
CommitDate: Fri Dec 9 13:50:50 2022 +
tdf#151548 sw content controls: preserve tag for block SDTs
The tag is critical for VBA access.
Although we do not yet import blockSdts as content controls,
losing this would break any VBA macros for MS Word.
So make sure it round-trips.
I can't imagine why it wasn't treated the same as alias.
I guess because Alias is seen, while tag appears to have
no valuable function (until VBA, where it becomes the most
likely ID field.)
Change-Id: I05a04faa9d2314c7b37c5b86f107bd1a16019509
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143830
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index d631c783b1a9..f5230adb643a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -490,6 +490,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148671, "tdf148671.docx")
{
// Don't assert with 'pFieldMark' failed when document is opened
CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+if (!isExported())
+return;
+// Preserve tag on SDT blocks. (Before the fix, these were all lost)
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc, "//w:sdt/w:sdtPr/w:tag", 3);
}
DECLARE_OOXMLEXPORT_TEST(testTdf140668, "tdf140668.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index dcafe422a0e8..95f137ec771f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -615,6 +615,8 @@ void SdtBlockHelper::DeleteAndResetTheLists()
m_pTextAttrs.clear();
if (!m_aAlias.isEmpty())
m_aAlias.clear();
+if (!m_aTag.isEmpty())
+m_aTag.clear();
if (!m_aPlaceHolderDocPart.isEmpty())
m_aPlaceHolderDocPart.clear();
if (!m_aColor.isEmpty())
@@ -719,6 +721,9 @@ void SdtBlockHelper::WriteExtraParams(const
::sax_fastparser::FSHelperPtr& pSeri
if (!m_aAlias.isEmpty())
pSerializer->singleElementNS(XML_w, XML_alias, FSNS(XML_w, XML_val),
m_aAlias);
+
+if (!m_aTag.isEmpty())
+pSerializer->singleElementNS(XML_w, XML_tag, FSNS(XML_w, XML_val),
m_aTag);
}
void SdtBlockHelper::EndSdtBlock(const ::sax_fastparser::FSHelperPtr&
pSerializer)
@@ -828,6 +833,11 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const
uno::Sequence>= m_aAlias))
SAL_WARN("sw.ww8", "DocxAttributeOutput::GrabBag: unexpected
sdt alias value");
}
+else if (aPropertyValue.Name == "ooxml:CT_SdtPr_tag" &&
m_aTag.isEmpty())
+{
+if (!(aPropertyValue.Value >>= m_aTag))
+SAL_WARN("sw.ww8", "DocxAttributeOutput::GrabBag: unexpected
sdt tag value");
+}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_id")
m_bHasId = true;
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_citation")
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6e029cc9dfc4..f8da5a4bd32d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -144,6 +144,7 @@ public:
OUString m_aPlaceHolderDocPart;
bool m_bShowingPlaceHolder;
OUString m_aAlias;
+OUString m_aTag;
sal_Int32 m_nSdtPrToken;
void DeleteAndResetTheLists();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4683ff445458..a3a4407a5971 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2910,14 +2910,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
break;
}
}
-else
-{
-if (nSprmId == NS_ooxml::LN_CT_SdtPr_tag)
-{
-// Tag is only handled here in case of inline SDT.
-break;
-}
-}
// this is an unsupported SDT property, create a grab bag for it
OUString sName;
@@ -2933,6 +2925,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
case NS_ooxml::LN_CT_SdtPr_group: sName =
"ooxml:CT_SdtPr_group"; break;
case NS_ooxml::LN_CT_SdtPr_id: sName =
"ooxml:CT_SdtPr_id"; break;
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/eventdlg.cxx |1
cui/source/customize/macropg.cxx | 64
cui/source/customize/macropg_impl.hxx |1
cui/source/inc/macropg.hxx|2
cui/uiconfig/ui/eventsconfigpage.ui | 14 +
cui/uiconfig/ui/macroassignpage.ui| 90 +++---
6 files changed, 125 insertions(+), 47 deletions(-)
New commits:
commit e1de95f72b1e6467510f7c3b32b25d7528c93a75
Author: Caolán McNamara
AuthorDate: Thu Dec 8 16:47:32 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 13:53:38 2022 +
Related: tdf#152266 add a remove all button
Change-Id: Ibf6b749089d2d6da71a9ce00779bce8886453856
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143833
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index 7aa67e3f5a81..755fd16b416a 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -44,6 +44,7 @@ SvxEventConfigPage::SvxEventConfigPage(weld::Container*
pPage, weld::DialogContr
mpImpl->xEventLB = m_xBuilder->weld_tree_view("events");
mpImpl->xAssignPB = m_xBuilder->weld_button("macro");
mpImpl->xDeletePB = m_xBuilder->weld_button("delete");
+mpImpl->xDeleteAllPB = m_xBuilder->weld_button("deleteall");
mpImpl->xAssignComponentPB = m_xBuilder->weld_button("component");
mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width()
* 70,
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 34eb44849d84..3980c8b6c3f7 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -61,21 +61,20 @@
MacroEventListBox::MacroEventListBox(std::unique_ptr xTreeView)
// and it is not read only
void SvxMacroTabPage_::EnableButtons()
{
+mpImpl->xDeleteAllPB->set_sensitive(m_nAssignedEvents != 0);
int nEvent = mpImpl->xEventLB->get_selected_index();
-if (nEvent != -1)
-{
-const EventPair* pEventPair =
LookupEvent(mpImpl->xEventLB->get_id(nEvent));
-const bool bAssigned = pEventPair && !pEventPair->second.isEmpty();
-mpImpl->xDeletePB->set_sensitive(!mpImpl->bReadOnly && bAssigned);
-mpImpl->xAssignPB->set_sensitive( !mpImpl->bReadOnly );
-if( mpImpl->xAssignComponentPB )
-mpImpl->xAssignComponentPB->set_sensitive( !mpImpl->bReadOnly );
-}
+const EventPair* pEventPair = nEvent == -1 ? nullptr :
LookupEvent(mpImpl->xEventLB->get_id(nEvent));
+const bool bAssigned = pEventPair && !pEventPair->second.isEmpty();
+mpImpl->xDeletePB->set_sensitive(!mpImpl->bReadOnly && bAssigned);
+mpImpl->xAssignPB->set_sensitive(!mpImpl->bReadOnly);
+if (mpImpl->xAssignComponentPB)
+mpImpl->xAssignComponentPB->set_sensitive( !mpImpl->bReadOnly );
}
SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage,
weld::DialogController* pController, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet& rAttrSet)
: SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
+, m_nAssignedEvents(0)
, bDocModified(false)
, bAppEvents(false)
, bInitialized(false)
@@ -308,6 +307,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
mpImpl->xEventLB->freeze();
mpImpl->xEventLB->clear();
+m_nAssignedEvents = 0;
EventsHash* eventsHash;
Reference< container::XNameReplace> nameReplace;
if(bAppEvents)
@@ -348,6 +348,9 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
mpImpl->xEventLB->append(sEventName, displayName);
mpImpl->xEventLB->set_image(nRow, GetEventDisplayImage(eventURL), 1);
mpImpl->xEventLB->set_text(nRow,
OUString(GetEventDisplayText(eventURL)), 2);
+
+if (!eventURL.isEmpty())
+++m_nAssignedEvents;
}
mpImpl->xEventLB->thaw();
@@ -427,6 +430,9 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
sEventURL = pEventPair->second;
}
+if (!sEventURL.isEmpty())
+--m_nAssignedEvents;
+
bool bDoubleClick = (pBtn == nullptr);
bool bUNOAssigned = sEventURL.startsWith( aVndSunStarUNO );
if (pBtn == mpImpl->xDeletePB.get())
@@ -484,6 +490,9 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
h_it->second.second = sEventURL;
}
+if (!sEventURL.isEmpty())
+++m_nAssignedEvents;
+
rListBox.set_image(nEntry, GetEventDisplayImage(sEventURL), 1);
rListBox.set_text(nEntry, OUString(GetEventDisplayText(sEventURL)), 2);
@@ -493,6 +502,41 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
EnableButtons();
}
+IMPL_LINK_NOARG(SvxMacroTabPage_, DeleteAllHdl_Impl, weld::Button&, void)
+{
+OUString sEventType = "Script" ;
+OUString sEmptyString;
+
+mpImpl->xEventLB->all_foreach([this, &s
[Libreoffice-commits] core.git: external/zxing
external/zxing/UnpackedTarball_zxing.mk |1 +
external/zxing/coroutine.patch.0| 11 +++
2 files changed, 12 insertions(+)
New commits:
commit e2d3baf0db4dec6b7b00192c41700611bd1d147c
Author: Stephan Bergmann
AuthorDate: Fri Dec 9 13:17:05 2022 +0100
Commit: Stephan Bergmann
CommitDate: Fri Dec 9 14:26:16 2022 +
external/zxing: Silence MSVC 2022 error C3781
> workdir\UnpackedTarball\zxing\core\src\Generator.h(20): error C3781:
Generator::promise_type: a coroutine's promise must
declare either 'return_value' or 'return_void'
seen at least when building with --with-latest-c++ against VS 2022 17.5.0
Preview 1.0
Change-Id: Ie69100d87e6cb85526d772e8f0f5d11e1f9d6704
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143853
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/external/zxing/UnpackedTarball_zxing.mk
b/external/zxing/UnpackedTarball_zxing.mk
index ac0aff061d72..9e877201a9e2 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/android_include.patch.0 \
external/zxing/missing-include.patch.0 \
external/zxing/msvc-lambdacapture.patch.0 \
+ external/zxing/coroutine.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/zxing/coroutine.patch.0 b/external/zxing/coroutine.patch.0
new file mode 100644
index ..c863ff948f88
--- /dev/null
+++ b/external/zxing/coroutine.patch.0
@@ -0,0 +1,11 @@
+--- core/src/Generator.h
core/src/Generator.h
+@@ -26,7 +26,7 @@
+ current_value = std::move(value);
+ return {};
+ }
+-//void return_value(T&& value) noexcept { current_value =
std::move(value); }
++ void return_void() noexcept {}
+ // Disallow co_await in generator coroutines.
+ void await_transform() = delete;
+ [[noreturn]] static void unhandled_exception() { throw; }
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8sty.cxx | 99 ++
1 file changed, 49 insertions(+), 50 deletions(-)
New commits:
commit 960207c72aedaf8569b880a7c000c10d0baabb70
Author: Mike Kaganski
AuthorDate: Thu Dec 8 19:11:04 2022 +0300
Commit: Mike Kaganski
CommitDate: Fri Dec 9 14:26:31 2022 +
Related: tdf#152425 Use ww::sti enum instead of respective number literals
Simplifies reading and checking its correctness greatly.
Change-Id: I16253f324cbafac6cb526ab195a7257530abe0a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143827
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index f251f41cff15..b6c198b03378 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -204,67 +204,66 @@ sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat
)
sal_uInt16 nRet = ww::stiUser;// user style as default
sal_uInt16 nPoolId = rFormat.GetPoolFormatId();
if( nPoolId == RES_POOLCOLL_STANDARD )
-nRet = 0;
+nRet = ww::stiNormal;
else if( nPoolId >= RES_POOLCOLL_HEADLINE1 &&
nPoolId <= RES_POOLCOLL_HEADLINE9 )
-nRet = static_cast< sal_uInt16 >(nPoolId + 1 - RES_POOLCOLL_HEADLINE1);
+nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiLevFirst -
RES_POOLCOLL_HEADLINE1);
else if( nPoolId >= RES_POOLCOLL_TOX_IDX1 &&
nPoolId <= RES_POOLCOLL_TOX_IDX3 )
-nRet = static_cast< sal_uInt16 >(nPoolId + 10 - RES_POOLCOLL_TOX_IDX1);
+nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiIndexFirst -
RES_POOLCOLL_TOX_IDX1);
else if( nPoolId >= RES_POOLCOLL_TOX_CNTNT1 &&
nPoolId <= RES_POOLCOLL_TOX_CNTNT5 )
-nRet = static_cast< sal_uInt16 >(nPoolId + 19 -
RES_POOLCOLL_TOX_CNTNT1);
+nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiToc1 -
RES_POOLCOLL_TOX_CNTNT1);
else if( nPoolId >= RES_POOLCOLL_TOX_CNTNT6 &&
nPoolId <= RES_POOLCOLL_TOX_CNTNT9 )
-nRet = static_cast< sal_uInt16 >(nPoolId + 24 -
RES_POOLCOLL_TOX_CNTNT6);
+nRet = static_cast< sal_uInt16 >(nPoolId + ww::stiToc6 -
RES_POOLCOLL_TOX_CNTNT6);
else
switch( nPoolId )
{
-case RES_POOLCOLL_FOOTNOTE: nRet = 29; break;
-case RES_POOLCOLL_MARGINAL: nRet = 30; break;
-case RES_POOLCOLL_HEADER: nRet = 31; break;
-case RES_POOLCOLL_FOOTER: nRet = 32; break;
-case RES_POOLCOLL_TOX_IDXH: nRet = 33; break;
-case RES_POOLCOLL_LABEL:nRet = 34; break;
-case RES_POOLCOLL_LABEL_DRAWING:nRet = 35; break;
-case RES_POOLCOLL_ENVELOPE_ADDRESS: nRet = 36; break;
-case RES_POOLCOLL_SEND_ADDRESS: nRet = 37; break;
-case RES_POOLCOLL_ENDNOTE: nRet = 43; break;
-case RES_POOLCOLL_TOX_AUTHORITIESH: nRet = 44; break;
-case RES_POOLCOLL_TOX_CNTNTH: nRet = 46; break;
-case RES_POOLCOLL_BULLET_LEVEL1:nRet = 48; break;
-case RES_POOLCOLL_LISTS_BEGIN: nRet = 47; break;
-case RES_POOLCOLL_NUM_LEVEL1: nRet = 49; break;
-case RES_POOLCOLL_BULLET_LEVEL2:nRet = 54; break;
-case RES_POOLCOLL_BULLET_LEVEL3:nRet = 55; break;
-case RES_POOLCOLL_BULLET_LEVEL4:nRet = 56; break;
-case RES_POOLCOLL_BULLET_LEVEL5:nRet = 57; break;
-case RES_POOLCOLL_NUM_LEVEL2: nRet = 58; break;
-case RES_POOLCOLL_NUM_LEVEL3: nRet = 59; break;
-case RES_POOLCOLL_NUM_LEVEL4: nRet = 60; break;
-case RES_POOLCOLL_NUM_LEVEL5: nRet = 61; break;
-case RES_POOLCOLL_DOC_TITLE:nRet = 62; break;
-case RES_POOLCOLL_DOC_APPENDIX: nRet = 63; break;
-case RES_POOLCOLL_SIGNATURE:nRet = 64; break;
-case RES_POOLCOLL_TEXT: nRet = 66; break;
-case RES_POOLCOLL_TEXT_MOVE:nRet = 67; break;
-case RES_POOLCOLL_BULLET_NONUM1:nRet = 68; break;
-case RES_POOLCOLL_BULLET_NONUM2:nRet = 69; break;
-case RES_POOLCOLL_BULLET_NONUM3:nRet = 70; break;
-case RES_POOLCOLL_BULLET_NONUM4:nRet = 71; break;
-case RES_POOLCOLL_BULLET_NONUM5:nRet = 72; break;
-case RES_POOLCOLL_DOC_SUBTITLE: nRet = 74; break;
-case RES_POOLCOLL_GREETING: nRet = 75; break;
-case RES_POOLCOLL_TEXT_IDENT: nRet = 77; break;
-
-case RES_POOLCHR_FOOTNOTE_ANCHOR: nRet = 38; break;
-case RES_POOLCHR_ENDNOTE_ANCHOR:nRet = 42; break;
-case RES_POOLCHR_INET_NORMAL: nRet = 85; break;
-case RES_POOLCHR_INET_VISIT:nRet = 86; break;
-case RES_POOLCHR_HTML_STRONG: nRet = 87; break;
-case RES_POOLCHR_HTML_EMPHASIS: nRet =
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7dd22a11b67aef1a20453ed85f63f0fc486dbaf1
Author: Michael Stahl
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Xisco Fauli
CommitDate: Fri Dec 9 14:43:01 2022 +
python3: upgrade to release 3.8.16
Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.
Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 05f55b3898407828bb24347be56247f58803f7bb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143859
Reviewed-by: Xisco Fauli
diff --git a/configure.ac b/configure.ac
index e0b7d1a32812..3f38e8822f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9931,7 +9931,7 @@ if test \( "$cross_compiling" = yes -a -z
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index ef51c87192e0..b030cb616e34 100644
--- a/download.lst
+++ b/download.lst
@@ -216,8 +216,8 @@ export POPPLER_DATA_SHA256SUM :=
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
export POSTGRESQL_SHA256SUM :=
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM :=
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/dialogs/QrCodeGenDialog.cxx |6 +-
cui/uiconfig/ui/qrcodegen.ui |4
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 6683010b1a856c3894cc0a7172ac14fda0b76aa8
Author: Caolán McNamara
AuthorDate: Fri Dec 9 12:45:11 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 14:47:49 2022 +
Related: tdf#146395 drop default text
Change-Id: Iaeedf11df5f1d5739ec247222cc4fc1f10abe1e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143875
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index e028d4d10e94..f8cbac1d758d 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -171,18 +171,14 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference xModel
m_xEdittext->get_height_rows(6));
if (!bEditExisting)
{
-OUString sSelection;
// TODO: This only works in Writer doc. Should also work in shapes
Reference xSelections(m_xModel->getCurrentSelection(),
UNO_QUERY);
if (xSelections.is())
{
Reference xSelection(xSelections->getByIndex(0),
UNO_QUERY);
if (xSelection.is())
-sSelection = xSelection->getString();
+m_xEdittext->set_text(xSelection->getString());
}
-if (!sSelection.isEmpty())
-m_xEdittext->set_text(sSelection);
-m_xEdittext->select_region(0, -1);
return;
}
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 7078e3aa44a5..2a55eaa01901 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -8,9 +8,6 @@
1
10
-
-www.libreoffice.org
-
False
6
@@ -347,7 +344,6 @@
True
True
True
-textbuffer1
The text from which to generate the code.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/inc vcl/osx vcl/quartz
vcl/inc/quartz/salgdi.h |2 +-
vcl/osx/salprn.cxx |2 +-
vcl/quartz/salgdi.cxx | 11 +--
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 73de244aecd985d049da3be49e52cbeeb3b77a8e
Author: Patrick Luby
AuthorDate: Wed Dec 7 14:24:57 2022 -0500
Commit: Caolán McNamara
CommitDate: Fri Dec 9 14:48:19 2022 +
tdf#146842 Do not use Skia for printing
Skia does not work with a native print graphics contexts. I am not sure why
but from what I can see, the Skia implementation drawing to a bitmap buffer.
However, in an NSPrintOperation, the print view's backing buffer is
CGPDFContext so even if this bug could be solved by blitting the Skia bitmap
buffer, the printed PDF would not have selectable text so always disable Skia
for print graphics contexts.
Change-Id: I214ba83b6e368af3ef51ea770b093612d04047a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143798
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit de3f13e2175564316eb5a62dee65e9ff8f31b460)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143857
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 569a14a6d3fc..ca1438270eca 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -464,7 +464,7 @@ class AquaSalGraphics : public SalGraphicsAutoDelegateToImpl
rtl::Reference mpTextStyle[MAX_FALLBACK];
public:
-AquaSalGraphics();
+AquaSalGraphics(bool bPrinter = false);
virtual ~AquaSalGraphics() override;
voidSetVirDevGraphics(SalVirtualDevice*
pVirDev,CGLayerHolder const &rLayer, CGContextRef, int nBitDepth = 0);
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index bec30a35b562..e9101e390085 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -71,7 +71,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const
SalPrinterQueueInfo& i_rQueue ) :
[mpPrintInfo setOrientation: NSPaperOrientationPortrait];
}
-mpGraphics = new AquaSalGraphics();
+mpGraphics = new AquaSalGraphics(true);
const int nWidth = 100, nHeight = 100;
mpContextMemory.reset(new (std::nothrow) sal_uInt8[nWidth * 4 * nHeight]);
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 1ce488be9c4d..d4ecc85ccfb4 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -211,14 +211,21 @@ bool
CoreTextFontFace::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilit
return rFontCapabilities.oUnicodeRange || rFontCapabilities.oCodePageRange;
}
-AquaSalGraphics::AquaSalGraphics()
+AquaSalGraphics::AquaSalGraphics(bool bPrinter)
: mnRealDPIX( 0 )
, mnRealDPIY( 0 )
{
SAL_INFO( "vcl.quartz", "AquaSalGraphics::AquaSalGraphics() this=" << this
);
#if HAVE_FEATURE_SKIA
-if(SkiaHelper::isVCLSkiaEnabled())
+// tdf#146842 Do not use Skia for printing
+// Skia does not work with a native print graphics contexts. I am not sure
+// why but from what I can see, the Skia implementation drawing to a bitmap
+// buffer. However, in an NSPrintOperation, the print view's backing buffer
+// is CGPDFContext so even if this bug could be solved by blitting the
+// Skia bitmap buffer, the printed PDF would not have selectable text so
+// always disable Skia for print graphics contexts.
+if(!bPrinter && SkiaHelper::isVCLSkiaEnabled())
mpBackend.reset(new AquaSkiaSalGraphicsImpl(*this, maShared));
#else
if(false)
[Libreoffice-commits] core.git: sw/source
sw/source/core/frmedt/fetab.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit e5986baa983e1c7b5e07c45299fd84be2c230fbe
Author: László Németh
AuthorDate: Fri Dec 9 13:44:21 2022 +0100
Commit: László Németh
CommitDate: Fri Dec 9 15:12:51 2022 +
tdf#150578 sw track changes: fix table toolbar at row deletion
In Hide Changes mode with enabled change tracking, table row
deletion disabled the table toolbar, so it wasn't possible
to repeat the click on the toolbar deleting multiple rows
row by row.
Follow-up to commit 16c705ec0d1ab4b4428577ccb0ea3fc14ee0fc88
"tdf#148849 sw: fix cursor pos at tracked DeleteRow in Hide Changes".
Change-Id: I297bae405cb24f7090144344947c01a1dadf9261
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143876
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 19bee641b2cf..3c0c5a4848a7 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -520,7 +520,11 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
pPam->SetMark();// both want something
pPam->DeleteMark();
if ( SwWrtShell* pWrtShell = dynamic_cast(this) )
+{
pWrtShell->UpdateCursor();
+// tdf#150578 enable the disabled table toolbar by (zero)
cursor moving
+pWrtShell->Right( SwCursorSkipMode::Chars, false, 0, false
);
+}
EndUndo(bCompleteTable ? SwUndoId::UI_TABLE_DELETE :
SwUndoId::ROW_DELETE);
return true;
[Libreoffice-commits] core.git: offapi/com oox/source schema/libreoffice sw/inc sw/qa sw/source sw/uiconfig writerfilter/source xmloff/source
offapi/com/sun/star/text/BaseFrameProperties.idl| 10 + oox/source/token/namespaces-strict.txt |2 oox/source/token/namespaces.txt |2 oox/source/token/tokens.txt |1 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 10 + sw/inc/hintids.hxx | 32 +-- sw/qa/extras/globalfilter/data/tdf143311-1.docx |binary sw/qa/extras/globalfilter/globalfilter.cxx | 101 sw/source/core/bastyp/init.cxx |4 sw/source/core/text/EnhancedPDFExportHelper.cxx |3 sw/source/core/unocore/unoframe.cxx |9 + sw/source/core/unocore/unomapproperties.hxx |1 sw/source/filter/ww8/docxattributeoutput.cxx| 15 + sw/source/ui/frmdlg/frmpage.cxx | 10 + sw/source/uibase/inc/frmpage.hxx|1 sw/uiconfig/swriter/ui/frmaddpage.ui| 20 ++ writerfilter/source/dmapper/DomainMapper.cxx|3 writerfilter/source/dmapper/GraphicImport.cxx |6 writerfilter/source/dmapper/PropertyIds.cxx |1 writerfilter/source/dmapper/PropertyIds.hxx |1 writerfilter/source/ooxml/model.xml | 32 +++ xmloff/source/text/XMLTextFrameContext.cxx | 10 + xmloff/source/text/txtparae.cxx |6 23 files changed, 258 insertions(+), 22 deletions(-) New commits: commit 31084ebb59093be7dfe5ab53a20fdb3bcfde34b6 Author: Michael Stahl AuthorDate: Thu Dec 8 10:54:18 2022 +0100 Commit: Michael Stahl CommitDate: Fri Dec 9 16:03:20 2022 + tdf#143311 offapi,oox,writerfilter,xmloff,sw: decorative flag on flys * sw core RES_DECORATIVE as a FRMATR * sw API SwXFrame property "Decorative" * UI checkbox "Decorative" * ODF import/export as loext:decorative on draw:frame * DOCX export * DOCX import - very non-obvious how to get it from model.xml to dmapper * PDF/UA export: tag flys with this flag as Artifact * test for DOCX filters, ODF filters, PDF export Change-Id: I1ceb67fdd4e1cfa212aafdeb1c5f4ccd873d433e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143815 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl index 72bec7ffe63c..3108067a0ad5 100644 --- a/offapi/com/sun/star/text/BaseFrameProperties.idl +++ b/offapi/com/sun/star/text/BaseFrameProperties.idl @@ -363,6 +363,16 @@ published service BaseFrameProperties @since LibreOffice 7.4 */ [optional, property] string Tooltip; + +/** Determines if the frame is purely decorative. + +If `TRUE`, it is considered not part of the document content, +and may be ignored by assistive technologies. + +@since LibreOffice 7.5 +*/ +[optional, property] boolean Decorative; + }; diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 7449dca99a33..59631432eb2f 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -92,6 +92,8 @@ xr2 http://schemas.microsoft.com/office/spreadsheetml/2015/r # extlst namespaces +adec http://schemas.microsoft.com/office/drawing/2017/decorative + # xls14Lst for features introduced by excel 2010 xls14Lst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index 849caa547695..0790c65d8817 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -92,6 +92,8 @@ xr2 http://schemas.microsoft.com/office/spreadsheetml/2015/r # extlst namespaces +adec http://schemas.microsoft.com/office/drawing/2017/decorative + # xls14Lst for features introduced by excel 2010 xls14Lst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index d1a40140add9..8ed5687983b6 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -480,6 +480,7 @@ additive addlxml addressBook addressFieldName +adec adj adjLst adjust diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index 3b2e0d4b2bbc..ee9b89ded8a9 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng @@ -3304,4 +3304,14 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:l
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sd/qa xmloff/source
sd/qa/unit/misc-tests.cxx | 52 +
xmloff/source/table/XMLTableExport.cxx |4 +-
xmloff/source/table/XMLTableImport.cxx |2 -
3 files changed, 55 insertions(+), 3 deletions(-)
New commits:
commit 03a84f60e94edc803bc3825b3ccb81771d4e522a
Author: Maxim Monastirsky
AuthorDate: Wed Dec 7 15:51:01 2022 +0200
Commit: Xisco Fauli
CommitDate: Fri Dec 9 17:49:17 2022 +
Fix sd encoded table style name handling
Found this while looking into improving insertion of pages
with tables, as SdDrawDocument::InsertBookmarkAsPage uses "_"
as the rename suffix for styles with identical names but a
different content.
This commit fixes two issues:
- For import, cell styles with encoded names couldn't be found
by table styles. The reason is that styles are referenced in
ODF by encoded names, but at runtime by display names. Yet we
were searching the cell style family by encoded names. This was
already handled for sw in insertTabletemplate(), and now do the
same for sd.
- For export, table template names were encoded, but then
referenced by tables using their non-encoded names. This is
unlike the sw code that doesn't encode them, and therefore
doesn't have this problem. Looking at the schema, both
table:name attribute of a table template, and table:template-name
attribute of a table are of type "string", which suggests that
there is indeed no need to encode those names. This aligns with
the fact that table templates don't have a display-name attribute.
Change-Id: Ie61b6a1c95b033404ee98f3fc40d8e82434a6a6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143839
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
(cherry picked from commit 8bd31225d79f10993d0e0727ee7d27c729874b51)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143729
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index bc741c6ac2fe..ee03008dfb47 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -80,6 +81,7 @@ public:
void testTdf131033();
void testTdf129898LayerDrawnInSlideshow();
void testTdf136956();
+void testEncodedTableStyles();
CPPUNIT_TEST_SUITE(SdMiscTest);
CPPUNIT_TEST(testTdf99396);
@@ -101,6 +103,7 @@ public:
CPPUNIT_TEST(testTdf131033);
CPPUNIT_TEST(testTdf129898LayerDrawnInSlideshow);
CPPUNIT_TEST(testTdf136956);
+CPPUNIT_TEST(testEncodedTableStyles);
CPPUNIT_TEST_SUITE_END();
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -891,6 +894,55 @@ void SdMiscTest::testTdf136956()
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRowCount());
}
+void SdMiscTest::testEncodedTableStyles()
+{
+// Silence unrelated failure:
+// Error: element "table:table-template" is missing
"first-row-start-column" attribute
+skipValidation();
+
+createSdDrawDoc();
+
+{
+uno::Reference
xStyleFamiliesSupplier(mxComponent,
+
uno::UNO_QUERY_THROW);
+uno::Reference xTableStyleFamily(
+xStyleFamiliesSupplier->getStyleFamilies()->getByName("table"),
uno::UNO_QUERY_THROW);
+uno::Reference xCellStyleFamily(
+xStyleFamiliesSupplier->getStyleFamilies()->getByName("cell"),
uno::UNO_QUERY_THROW);
+
+uno::Reference
xTableStyle(xTableStyleFamily->createInstance(),
+ uno::UNO_QUERY_THROW);
+uno::Reference
xCellStyle(xCellStyleFamily->createInstance(),
+ uno::UNO_QUERY_THROW);
+
+uno::Reference(xTableStyleFamily,
uno::UNO_QUERY_THROW)
+->insertByName("table_1", uno::Any(xTableStyle));
+uno::Reference(xCellStyleFamily,
uno::UNO_QUERY_THROW)
+->insertByName("table-body_1", uno::Any(xCellStyle));
+uno::Reference(xTableStyle,
uno::UNO_QUERY_THROW)
+->replaceByName("body", uno::Any(xCellStyle));
+}
+
+saveAndReload("draw8");
+
+{
+uno::Reference
xStyleFamiliesSupplier(mxComponent,
+
uno::UNO_QUERY_THROW);
+uno::Reference xTableStyleFamily(
+xStyleFamiliesSupplier->getStyleFamilies()->getByName("table"),
uno::UNO_QUERY_THROW);
+// Such style used to be exported as "table_5f_1" instead.
+CPPUNIT_ASSERT(xTableStyleFamily->hasByName("table_1"));
+
+uno::Reference
xTableStyle(xTableStyleFamily->getByName("table_1"),
+
uno::UNO_QUERY_THROW);
+uno::Reference
xCellStyle(xTableStyle->getByName("body"), uno::UNO_QUERY);
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - external/zxing
external/zxing/UnpackedTarball_zxing.mk |1 +
external/zxing/msvc-lambdacapture.patch.0 | 11 +++
2 files changed, 12 insertions(+)
New commits:
commit 29c2f382c8bb72106c76c134c705878fab30e2ad
Author: Stephan Bergmann
AuthorDate: Thu Dec 8 16:50:32 2022 +0100
Commit: Xisco Fauli
CommitDate: Fri Dec 9 17:50:03 2022 +
external/zxing: Avoid MSVC 2022 error C2326
> workdir/UnpackedTarball/zxing/core/src/qrcode/QRDetector.cpp(431): error
C2326: 'auto ZXing::QRCode::SampleMQRoperator ()(int,bool)
const': function cannot access 'FORMAT_INFO_COORDS'
seen at least with VS 2022 17.4.2 and VS 2022 17.5.0 Preview 1.0, but not
with
VS 2019 16.11.21. It looks to me like a bug in MSVC, but then again it
doesn't
hurt to make that variable static, anyway.
Change-Id: I48fa22f9495791e60953f9f717ffc814de1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143826
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 3f564769446032825b20ca6414caa1c196076ddc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143854
Reviewed-by: Xisco Fauli
diff --git a/external/zxing/UnpackedTarball_zxing.mk
b/external/zxing/UnpackedTarball_zxing.mk
index 0d81d13f6411..ac0aff061d72 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/assume.__cpp_lib_string_view.patch.0 \
external/zxing/android_include.patch.0 \
external/zxing/missing-include.patch.0 \
+ external/zxing/msvc-lambdacapture.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/zxing/msvc-lambdacapture.patch.0
b/external/zxing/msvc-lambdacapture.patch.0
new file mode 100644
index ..390d1cc65502
--- /dev/null
+++ b/external/zxing/msvc-lambdacapture.patch.0
@@ -0,0 +1,11 @@
+--- core/src/qrcode/QRDetector.cpp
core/src/qrcode/QRDetector.cpp
+@@ -418,7 +418,7 @@
+
+ auto srcQuad = Rectangle(7, 7, 0.5);
+
+- constexpr PointI FORMAT_INFO_COORDS[] = {{0, 8}, {1, 8}, {2, 8}, {3,
8}, {4, 8}, {5, 8}, {6, 8}, {7, 8}, {8, 8},
++ static constexpr PointI FORMAT_INFO_COORDS[] = {{0, 8}, {1, 8}, {2, 8},
{3, 8}, {4, 8}, {5, 8}, {6, 8}, {7, 8}, {8, 8},
+
{8, 7}, {8, 6}, {8, 5}, {8, 4}, {8, 3}, {8, 2}, {8, 1}, {8, 0}};
+
+ FormatInformation bestFI;
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 19 commits - configure.ac download.lst external/libffi external/openssl external/postgresql external/python3 librelogo/s
RepositoryExternal.mk |7
configure.ac | 10
download.lst |8
external/libffi/ExternalPackage_libffi.mk | 20
external/libffi/ExternalProject_libffi.mk | 29
external/libffi/Module_libffi.mk |1
external/openssl/ExternalPackage_openssl.mk | 12
external/openssl/ExternalProject_openssl.mk | 15
external/openssl/UnpackedTarball_openssl.mk | 12
external/openssl/ccb0a11145ee72b042d10593a64eaf9e8a55ec12.patch.1 | 56
external/openssl/openssl-1.0.1h-win64.patch.1 | 47
external/openssl/openssl-1.0.2k-cve-2020-1971.patch.1 | 578
--
external/openssl/openssl-3650-masm.patch.1| 35
external/openssl/openssl-fixbuild.patch.1 | 23
external/openssl/openssl-no-multilib.patch.0 | 38
external/openssl/openssllnx.patch | 23
external/openssl/opensslsol.patch | 20
external/openssl/opensslwnt.patch | 167 --
external/openssl/opensslwnt_safeseh.patch | 23
external/postgresql/ExternalProject_postgresql.mk |2
external/postgresql/postgres-msvc-build.patch.1 |6
external/python3/ExternalPackage_python3.mk | 278 ++--
external/python3/ExternalProject_python3.mk | 28
external/python3/UnpackedTarball_python3.mk |1
external/python3/i100492-freebsd.patch.1 |6
external/python3/internal-zlib.patch.0| 22
external/python3/python-3.3.0-clang.patch.1 | 13
external/python3/python-3.3.0-darwin.patch.1 | 20
external/python3/python-3.3.3-disable-obmalloc.patch.0|4
external/python3/python-3.3.3-elf-rpath.patch.1 | 12
external/python3/python-3.5.4-msvc-disable.patch.1|8
external/python3/python-3.5.tweak.strip.soabi.patch |2
external/python3/python-3.7.6-msvc-ssl.patch.1| 27
external/python3/ubsan.patch.0| 23
librelogo/source/LibreLogo/LibreLogo.py | 34
pyuno/source/loader/pythonloader.py |4
scripting/source/pyprov/pythonscript.py |8
37 files changed, 359 insertions(+), 1263 deletions(-)
New commits:
commit 35942d66034d92cacd264fceca7f83860b9509c1
Author: Michael Stahl
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Dec 9 18:50:44 2022 +0100
python3: upgrade to release 3.8.16
Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 05f55b3898407828bb24347be56247f58803f7bb)
Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
diff --git a/configure.ac b/configure.ac
index 05a0417b6fde..7547cc781a0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8797,7 +8797,7 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index a3806d7de09a..8c83963fcb78 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export POPPLER_SHA256SUM :=
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb3
export POPPLER_TARBALL := poppler-22.09.0.tar.xz
export POSTGRESQL_SHA256SUM :=
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM :=
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
export QRCODEGEN_SHA256SUM :=
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
commit 5a2b888249ac6e43
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/data/page-remove-fly-table.odt |binary
sw/qa/core/layout/layout.cxx | 38 +++
sw/source/core/layout/flylay.cxx | 11 ++
3 files changed, 49 insertions(+)
New commits:
commit cf2c070de2bafeec3b476c6bff7bb4ac87ba46db
Author: Miklos Vajna
AuthorDate: Fri Dec 9 16:52:48 2022 +0100
Commit: Miklos Vajna
CommitDate: Fri Dec 9 18:08:59 2022 +
sw layout: invalidate margins of body content when moving a fly from page
The (simplified) bugdoc has 9 pages, and once the ToC is updated, the
two tables below the (only) bookmark in the document has a 5879 twips
gap between them for no reason. Adding a new paragraph to the second
table "fixes" the incremental layout.
What seems to happen is that there is an anchored image on page 8, but
the layout decides that it doesn't fit there so it gets moved to page 9.
Before this move happens, SwTabFrame::Format() handles the outer of the
nested table below the unwanted gap and its CalcFlyOffsets() notices
that a large upper margin is wanted so that the table wraps around the
anchored image. Later the image gets moved to the next page, but the
removal doesn't invalidate the print area of the table with the large
top margin, so the unwanted gap appears.
Fix the problem by looking at the old page in SwPageFrame::MoveFly() and
walking through the immediate children of the body frame: if the frame
print area is invalidated, then SetYMargins() is called from
SwTabFrame::Format(), which also invalidates the size of the outer table
frame, so it will use Shrink() to have a correct size.
This appears to be a regression from commit
b9ef71476fd70bc13f50ebe80390e0730d1b7afb (tdf#134298 sw: layout: remove
left-over page frame without content, 2020-11-13).
Change-Id: I0424d9eea4d8a030959f8534985950c7efad4686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143881
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/core/layout/data/page-remove-fly-table.odt
b/sw/qa/core/layout/data/page-remove-fly-table.odt
new file mode 100644
index ..6aaf230966ef
Binary files /dev/null and b/sw/qa/core/layout/data/page-remove-fly-table.odt
differ
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index f95cfcf09bc9..7a0f69bab815 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -14,6 +14,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -29,6 +31,12 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
/// Covers sw/source/core/layout/ fixes.
class SwCoreLayoutTest : public SwModelTestBase
@@ -883,6 +891,36 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest,
testFollowTextFlowWrapInBackground)
CPPUNIT_ASSERT_GREATER(static_cast(1000), nCellHeight);
}
+CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testPageRemoveFlyTable)
+{
+// Given a document with a ToC and several tables, one table marked with a
bookmark:
+createSwDoc("page-remove-fly-table.odt");
+SwDoc* pDoc = getSwDoc();
+
+// When updating the ToC and incrementally formatting the document:
+SwView* pView = pDoc->GetDocShell()->GetView();
+SfxDispatcher& rDispatcher = *pView->GetViewFrame()->GetDispatcher();
+rDispatcher.Execute(FN_UPDATE_TOX);
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Reformat();
+
+// Then make sure that the 2nd table below the bookmark has no unwanted
top margin:
+pWrtShell->GotoMark("test");
+pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1, /*bBasicCall=*/false);
+pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1, /*bBasicCall=*/false);
+SwCursor* pCursor = pWrtShell->GetCursor();
+SwTextNode* pTextNode = pCursor->GetPoint()->GetNode().GetTextNode();
+SwFrame* pTextFrame = pTextNode->getLayoutFrame(nullptr);
+SwTabFrame* pInnerTable = pTextFrame->FindTabFrame();
+SwTabFrame* pOuterTable = pInnerTable->GetUpper()->FindTabFrame();
+tools::Long nActual = pOuterTable->getFramePrintArea().Top();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0
+// - Actual : 5879
+// i.e. the problematic table had a large, unwanted/leftover top margin.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), nActual);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 193c678a2e18..d7c6969a4b6b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -989,6 +989,17 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove,
SwPageFrame *pDest )
{
m_pSortedObjs.reset();
}
+
+// Removing a fly from the page affects the margin of e.g. tables, s
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 19 commits - configure.ac download.lst external/libffi external/openssl external/postgresql external/python3 librelogo/source pyun
RepositoryExternal.mk |7
configure.ac | 10
download.lst |8
external/libffi/ExternalPackage_libffi.mk | 20
external/libffi/ExternalProject_libffi.mk | 29
external/libffi/Module_libffi.mk |1
external/openssl/ExternalPackage_openssl.mk | 12
external/openssl/ExternalProject_openssl.mk | 15
external/openssl/UnpackedTarball_openssl.mk | 12
external/openssl/ccb0a11145ee72b042d10593a64eaf9e8a55ec12.patch.1 | 56
external/openssl/openssl-1.0.1h-win64.patch.1 | 47
external/openssl/openssl-1.0.2k-cve-2020-1971.patch.1 | 578
--
external/openssl/openssl-3650-masm.patch.1| 35
external/openssl/openssl-fixbuild.patch.1 | 23
external/openssl/openssl-no-multilib.patch.0 | 38
external/openssl/openssllnx.patch | 23
external/openssl/opensslsol.patch | 20
external/openssl/opensslwnt.patch | 167 --
external/openssl/opensslwnt_safeseh.patch | 23
external/postgresql/ExternalProject_postgresql.mk |2
external/postgresql/postgres-msvc-build.patch.1 |6
external/python3/ExternalPackage_python3.mk | 278 ++--
external/python3/ExternalProject_python3.mk | 28
external/python3/UnpackedTarball_python3.mk |1
external/python3/i100492-freebsd.patch.1 |6
external/python3/internal-zlib.patch.0| 22
external/python3/python-3.3.0-clang.patch.1 | 13
external/python3/python-3.3.0-darwin.patch.1 | 20
external/python3/python-3.3.3-disable-obmalloc.patch.0|4
external/python3/python-3.3.3-elf-rpath.patch.1 | 12
external/python3/python-3.5.4-msvc-disable.patch.1|8
external/python3/python-3.5.tweak.strip.soabi.patch |2
external/python3/python-3.7.6-msvc-ssl.patch.1| 27
external/python3/ubsan.patch.0| 23
librelogo/source/LibreLogo/LibreLogo.py | 34
pyuno/source/loader/pythonloader.py |4
scripting/source/pyprov/pythonscript.py |8
37 files changed, 359 insertions(+), 1263 deletions(-)
New commits:
commit 0e36d99bb8fb04c88b15845b17ee705ed60d66b7
Author: Michael Stahl
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Dec 9 19:16:07 2022 +0100
python3: upgrade to release 3.8.16
Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 05f55b3898407828bb24347be56247f58803f7bb)
Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
diff --git a/configure.ac b/configure.ac
index 41227578a0bc..06923e7c0f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8796,7 +8796,7 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index 61e2919a9e52..33420ae3ceee 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM :=
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb3
export POPPLER_TARBALL := poppler-22.09.0.tar.xz
export POSTGRESQL_SHA256SUM :=
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM :=
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
export QRCODEGEN_SHA256SUM :=
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
commit 9ac10884373aaa81
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2539badc6c3c1c16ed0b73fcfbba51ba5b0be5d0
Author: Michael Stahl
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Dec 9 18:45:35 2022 +
python3: upgrade to release 3.8.16
Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.
Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 05f55b3898407828bb24347be56247f58803f7bb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143860
diff --git a/configure.ac b/configure.ac
index 3695d2528c88..c2a7159ea9e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9987,7 +9987,7 @@ if test \( "$cross_compiling" = yes -a -z
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index 814bbf7e744e..60af75d77aca 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export POPPLER_DATA_SHA256SUM :=
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
export POSTGRESQL_SHA256SUM :=
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM :=
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport17.cxx |6 ++
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx|4
sw/source/filter/ww8/docxattributeoutput.cxx | 10 ++
sw/source/filter/ww8/docxattributeoutput.hxx |2 ++
writerfilter/source/dmapper/DomainMapper.cxx | 20 +++-
5 files changed, 37 insertions(+), 5 deletions(-)
New commits:
commit 79944dae026f8f1dbb77ce0ebd13b025e7cddc50
Author: Justin Luth
AuthorDate: Wed Dec 7 13:44:01 2022 -0500
Commit: Xisco Fauli
CommitDate: Fri Dec 9 18:51:04 2022 +
tdf#149240 docx content controls: round-trip showingPlcHdr better
ShowingPlaceHolder causes all the text in the control to be
selected when the control gains the focus. Otherwise, just a
cursor is placed at the click point.
While round-tripping this attribute worked for inline SDTs,
it was lost for block SDTs. But BlockSDTs are very easy
to create. The MS templates are full of them.
Also, these are boolean, but it could have a val=0 specified,
in which case it is off, but we were importing it as on.
Change-Id: I167afa935311a63bba408ecd489ae819485a5cb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143818
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
(cherry picked from commit 78b5195d8add0679263a5e08ba34be9b27637a65)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143855
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index 87e7d0c68b21..d9d5802e0606 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -830,6 +830,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148111, "tdf148111.docx")
// No more fields
CPPUNIT_ASSERT(!xFields->hasMoreElements());
+
+if (!isExported())
+return;
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+// ShowingPlaceholder should be off for 0, false and "on". (This was 21
before the fix)
+assertXPath(pXmlDoc,"//w:p/w:sdt/w:sdtPr/w:showingPlcHdr", 12);
}
DECLARE_OOXMLEXPORT_TEST(TestTdf73499, "tdf73499.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 9930fa27b768..db2abe3513a7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1000,6 +1000,10 @@ CPPUNIT_TEST_FIXTURE(Test, testGlossaryWithEmail)
"and
@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'
"
"and @Target='mailto:emailgoesh...@example.com' "
"and @TargetMode='External']");
+
+// preserve the ShowingPlaceholder setting on both block SDTs.
+pXmlDoc = parseExport("word/document.xml");
+
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:sdt/w:sdtPr/w:showingPlcHdr", 2);
}
DECLARE_OOXMLEXPORT_TEST(testFdo71785, "fdo71785.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 92b13f34823c..dcafe422a0e8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -619,6 +619,7 @@ void SdtBlockHelper::DeleteAndResetTheLists()
m_aPlaceHolderDocPart.clear();
if (!m_aColor.isEmpty())
m_aColor.clear();
+m_bShowingPlaceHolder = false;
m_bHasId = false;
}
@@ -707,6 +708,10 @@ void SdtBlockHelper::WriteExtraParams(const
::sax_fastparser::FSHelperPtr& pSeri
pSerializer->singleElementNS(XML_w, XML_docPart, FSNS(XML_w, XML_val),
m_aPlaceHolderDocPart);
pSerializer->endElementNS(XML_w, XML_placeholder);
}
+
+if (m_bShowingPlaceHolder)
+pSerializer->singleElementNS(XML_w, XML_showingPlcHdr);
+
if (!m_aColor.isEmpty())
{
pSerializer->singleElementNS(XML_w15, XML_color, FSNS(XML_w, XML_val),
m_aColor);
@@ -813,6 +818,11 @@ void SdtBlockHelper::GetSdtParamsFromGrabBag(const
uno::Sequence>= m_bShowingPlaceHolder))
+SAL_WARN("sw.ww8", "DocxAttributeOutput::GrabBag: unexpected
sdt ShowingPlcHdr");
+}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_alias" &&
m_aAlias.isEmpty())
{
if (!(aPropertyValue.Value >>= m_aAlias))
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index fd14524f6e77..6e029cc9dfc4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -130,6 +130,7 @@ public:
SdtBlockHelper()
: m_bHasId(false)
, m_bStartedSdt(false)
+, m_bShowingPlaceHolder(false)
, m_nSdtPrToken(0)
{}
@@ -141,6 +142,7 @@ public:
rtl::Reference m_pDataBindingAttrs;
OUString m_aColor;
OUString m_aPlaceHolderDocPart;
+bool m_bShowingPlaceHolder;
OUString m_aAlias;
sal_Int3
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/model.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 01fc8ceef1946ca84d7cfef3801ad7f00e36042a Author: Andrea Gelmini AuthorDate: Fri Dec 9 20:51:18 2022 +0100 Commit: Julien Nabet CommitDate: Fri Dec 9 20:22:38 2022 + Fix typo Change-Id: I96297815043ea213f67d0ccc4224b12d7bcf7d36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143887 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 158b764f355e..4f2446aa5272 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -3492,7 +3492,7 @@ - +
[Libreoffice-commits] core.git: Branch 'feature/cib_contract138e' - 2 commits - extras/CustomTarget_libstdcpp.mk extras/Module_extras.mk extras/Package_libstdcpp.mk Repository.mk vcl/source
Rebased ref, commits from common ancestor:
commit 213bcd36037774ab21d6784db086cb05106d5153
Author: Thorsten Behrens
AuthorDate: Fri Dec 9 18:15:21 2022 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 9 21:22:36 2022 +0100
Try KF5 vcl plugin first, for unity/gnome desktop sessions too
Change-Id: Id8d52d0ce2423df7465400c790c84b334715eb10
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 7c2a91cec471..325456b9c835 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -183,6 +183,9 @@ SalInstance* autodetect_plugin()
static const char* const pStandardFallbackList[] =
{
+#if ENABLE_KF5
+"kf5",
+#endif
"gtk3", "gen", nullptr
};
commit 3221a7c20db96a04f09b49c9f86d815fe0013a06
Author: Thorsten Behrens
AuthorDate: Fri Dec 9 18:12:27 2022 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 9 21:22:35 2022 +0100
Add base system libstdc++ to package
Since g++-7 ships & requires libstdc++.6.0.28.so, exceptionally add
this as runtime dependency. Historically, we did that for Linux during
OOo times.
Change-Id: Ic113d724c21da49132d92b3fdca084d9e392200f
diff --git a/Repository.mk b/Repository.mk
index b796367ea735..ab4704f8946a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -880,6 +880,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_glade \
extras_labels \
$(if $(filter WNT,$(OS)),extras_newfiles) \
+ extras_libstdcpp \
extras_palettes \
extras_personas \
extras_persona_dark \
diff --git a/extras/CustomTarget_libstdcpp.mk b/extras/CustomTarget_libstdcpp.mk
new file mode 100644
index ..188394c1306b
--- /dev/null
+++ b/extras/CustomTarget_libstdcpp.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column:
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,extras/libstdcpp))
+
+$(call gb_CustomTarget_get_workdir,extras/libstdcpp)/libstdc++.so.6.0.28: \
+ /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.28 \
+ $(SRCDIR)/extras/CustomTarget_libstdcpp.mk \
+ | $(call gb_CustomTarget_get_workdir,extras/libstdcpp)/.dir
+
+$(call gb_CustomTarget_get_workdir,extras/libstdcpp)/libstdc++.so.6.0.28:
+ cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.28 $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index cf7177c21180..9246a95e737e 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autotextuser \
CustomTarget_glade \
CustomTarget_gallsystem \
+ CustomTarget_libstdcpp \
CustomTarget_tplofficorr \
CustomTarget_tploffimisc \
CustomTarget_tplpersonal \
@@ -27,6 +28,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_database \
Package_databasebiblio \
Package_fonts \
+ Package_libstdcpp \
Package_resource_fonts \
Package_gallbullets \
Package_gallmytheme \
diff --git a/extras/Package_libstdcpp.mk b/extras/Package_libstdcpp.mk
new file mode 100644
index ..5159d7329818
--- /dev/null
+++ b/extras/Package_libstdcpp.mk
@@ -0,0 +1,16 @@
+# -*- 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_Package_Package,extras_libstdcpp,$(call
gb_CustomTarget_get_workdir,extras/libstdcpp)))
+
+$(eval $(call
gb_ExternalPackage_add_file,extras_libstdcpp,$(LIBO_LIB_FOLDER)/libstdc++.so.6,libstdc++.so.6.0.28))
+
+$(eval $(call gb_Package_use_custom_target,extras_libstdcpp,extras/libstdcpp))
+
+# vim: set noet sw=4 ts=4:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - cui/source cui/uiconfig
cui/source/dialogs/QrCodeGenDialog.cxx |6 +-
cui/uiconfig/ui/qrcodegen.ui |4
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 2344f5ac296a6a29d031c6fadc67fad0523ac0e7
Author: Caolán McNamara
AuthorDate: Fri Dec 9 12:45:11 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 20:35:57 2022 +
Related: tdf#146395 drop default text
Change-Id: Iaeedf11df5f1d5739ec247222cc4fc1f10abe1e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143861
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index e028d4d10e94..f8cbac1d758d 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -171,18 +171,14 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference xModel
m_xEdittext->get_height_rows(6));
if (!bEditExisting)
{
-OUString sSelection;
// TODO: This only works in Writer doc. Should also work in shapes
Reference xSelections(m_xModel->getCurrentSelection(),
UNO_QUERY);
if (xSelections.is())
{
Reference xSelection(xSelections->getByIndex(0),
UNO_QUERY);
if (xSelection.is())
-sSelection = xSelection->getString();
+m_xEdittext->set_text(xSelection->getString());
}
-if (!sSelection.isEmpty())
-m_xEdittext->set_text(sSelection);
-m_xEdittext->select_region(0, -1);
return;
}
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 7078e3aa44a5..2a55eaa01901 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -8,9 +8,6 @@
1
10
-
-www.libreoffice.org
-
False
6
@@ -347,7 +344,6 @@
True
True
True
-textbuffer1
The text from which to generate the code.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - cui/source vcl/inc vcl/osx vcl/quartz
cui/source/customize/macropg.cxx | 49 +++
cui/source/inc/macropg.hxx |2 -
vcl/inc/quartz/salgdi.h |2 -
vcl/osx/salprn.cxx |2 -
vcl/quartz/salgdi.cxx| 11 +++-
5 files changed, 36 insertions(+), 30 deletions(-)
New commits:
commit f03a35c81f9b7f5a622e72229bd318eb9055ff20
Author: Caolán McNamara
AuthorDate: Fri Dec 9 10:30:34 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 20:36:37 2022 +
drop unnecessary pThis indirection
Change-Id: I28c338a4f09036c9365937af99cb85fd4be95901
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143858
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index db36fe10713a..a1fe3dab39dc 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -375,20 +375,19 @@ IMPL_LINK_NOARG( SvxMacroTabPage_, SelectEvent_Impl,
weld::TreeView&, void)
IMPL_LINK( SvxMacroTabPage_, AssignDeleteHdl_Impl, weld::Button&, rBtn, void )
{
-GenericHandler_Impl(this, &rBtn);
+GenericHandler_Impl(&rBtn);
}
IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, weld::TreeView&, bool)
{
-GenericHandler_Impl(this, nullptr);
+GenericHandler_Impl(nullptr);
return true;
}
// handler for double click on the listbox, and for the assign/delete buttons
-void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const
weld::Button* pBtn)
+void SvxMacroTabPage_::GenericHandler_Impl(const weld::Button* pBtn)
{
-SvxMacroTabPage_Impl*pImpl = pThis->mpImpl.get();
-weld::TreeView& rListBox = *pImpl->xEventLB;
+weld::TreeView& rListBox = *mpImpl->xEventLB;
int nEntry = rListBox.get_selected_index();
if (nEntry == -1)
{
@@ -396,16 +395,16 @@ void
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
return;
}
-const bool bAssEnabled = pBtn != pImpl->xDeletePB.get() &&
pImpl->xAssignPB->get_sensitive();
+const bool bAssEnabled = pBtn != mpImpl->xDeletePB.get() &&
mpImpl->xAssignPB->get_sensitive();
OUString sEventName = rListBox.get_id(nEntry);
OUString sEventURL;
OUString sEventType;
-if(pThis->bAppEvents)
+if (bAppEvents)
{
-EventsHash::iterator h_it = pThis->m_appEventsHash.find(sEventName);
-if(h_it != pThis->m_appEventsHash.end() )
+EventsHash::iterator h_it = m_appEventsHash.find(sEventName);
+if (h_it != m_appEventsHash.end() )
{
sEventType = h_it->second.first;
sEventURL = h_it->second.second;
@@ -413,8 +412,8 @@ void
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
}
else
{
-EventsHash::iterator h_it = pThis->m_docEventsHash.find(sEventName);
-if(h_it != pThis->m_docEventsHash.end() )
+EventsHash::iterator h_it = m_docEventsHash.find(sEventName);
+if (h_it != m_docEventsHash.end() )
{
sEventType = h_it->second.first;
sEventURL = h_it->second.second;
@@ -423,57 +422,57 @@ void
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
bool bDoubleClick = (pBtn == nullptr);
bool bUNOAssigned = sEventURL.startsWith( aVndSunStarUNO );
-if( pBtn == pImpl->xDeletePB.get() )
+if (pBtn == mpImpl->xDeletePB.get())
{
// delete pressed
sEventType = "Script" ;
sEventURL.clear();
-if(!pThis->bAppEvents)
-pThis->bDocModified = true;
+if (!bAppEvents)
+bDocModified = true;
}
else if ( ( ( pBtn != nullptr )
-&& ( pBtn == pImpl->xAssignComponentPB.get() )
+&& ( pBtn == mpImpl->xAssignComponentPB.get() )
)
|| ( bDoubleClick
&& bUNOAssigned
)
)
{
-AssignComponentDialog aAssignDlg(pThis->GetFrameWeld(), sEventURL);
+AssignComponentDialog aAssignDlg(GetFrameWeld(), sEventURL);
short ret = aAssignDlg.run();
if( ret )
{
sEventType = "UNO";
sEventURL = aAssignDlg.getURL();
-if(!pThis->bAppEvents)
-pThis->bDocModified = true;
+if (!bAppEvents)
+bDocModified = true;
}
}
else if( bAssEnabled )
{
// assign pressed
-SvxScriptSelectorDialog aDlg(pThis->GetFrameWeld(), pThis->GetFrame());
+SvxScriptSelectorDialog aDlg(GetFrameWeld(), GetFrame());
short ret = aDlg.run();
if ( ret )
{
sEventType = "Script";
sEventURL = aDlg.GetScriptURL();
-if(!pThis->bAppEvents)
-pThis->bDocModified = true;
+if (!bAppEvents)
+bDocModified = true;
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - extras/source
extras/source/templates/wizard/letter/pri-bottle_l/content.xml | 27 -- extras/source/templates/wizard/letter/pri-mail_l/content.xml| 27 -- extras/source/templates/wizard/letter/pri-marine_l/content.xml | 27 -- extras/source/templates/wizard/letter/pri-redline_l/content.xml | 27 -- 4 files changed, 108 deletions(-) New commits: commit d7f7ebe10242486217270a8f28167eb6fe88f3d1 Author: Caolán McNamara AuthorDate: Thu Dec 8 13:01:06 2022 + Commit: Caolán McNamara CommitDate: Fri Dec 9 20:37:37 2022 + Related: tdf#152266 remove office:scripts from wizard letter templates all the assignments are blank anyway, but its not desirable to have these. Change-Id: I5d7bd7bbdc65b286daad37cd6c368f86e0bb2785 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143821 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 20d3af853d327ab66cf55ccdfc5991a13993c47d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143733 diff --git a/extras/source/templates/wizard/letter/pri-bottle_l/content.xml b/extras/source/templates/wizard/letter/pri-bottle_l/content.xml index 83b418319d51..cbd8be3be7e5 100644 --- a/extras/source/templates/wizard/letter/pri-bottle_l/content.xml +++ b/extras/source/templates/wizard/letter/pri-bottle_l/content.xml @@ -1,32 +1,5 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="ht tp://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; office:version="1.0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/templates/wizard/letter/pri-mail_l/content.xml b/extras/source/templates/wizard/letter/pri-mail_l/content.xml index 345d92c9c9ab..184cc1a680ab 100644 --- a/extras/source/templates/wizard/letter/pri-mail_l/content.xml +++ b/extras/source/templates/wizard/letter/pri-mail_l/content.xml @@ -1,32 +1,5 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="ht tp://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; office:version="1.0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/templates/wizard/letter/pri-marine_l/content.xml b/extras/source/templates/wizard/letter/pri-marine_l/content.xml index 6f991ab3aff0..2174758c277b 100644 --- a/extras/source/templates/wizard/letter/pri-marine_l/content.xml +++ b/extras/source/templates/wizard/letter/pri-marine_l/content.xml @@ -1,32 +1,5 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="ht tp://openoffice.
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03080102.xhp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f5dc5a9dc64efa25a9553a0bcc4f1c94b775a15a
Author: Andrea Gelmini
AuthorDate: Fri Dec 9 21:05:12 2022 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Dec 9 23:08:02 2022 +
Fix typo
Change-Id: I859153f912a952e105e6d124fa85e7f81a702d83
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143891
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/source/text/sbasic/shared/03080102.xhp
b/source/text/sbasic/shared/03080102.xhp
index a1f827ad27..5a2ea0b912 100644
--- a/source/text/sbasic/shared/03080102.xhp
+++ b/source/text/sbasic/shared/03080102.xhp
@@ -65,7 +65,7 @@
Dim d1 As Double, dAngle As Double
d1 =
InputBox("Enter the length of the adjacent side: ","Adjacent")
dAngle =
InputBox("Enter the angle Alpha (in degrees): ","Alpha")
-Print "The
length of the hypothenuse is"; (d1 / cos (dAngle * Pi / 180))
+Print "The
length of the hypotenuse is"; (d1 / cos (dAngle * Pi / 180))
End Sub
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 26554db35487ac7a9d7c15e09653e4b842c775be Author: Andrea Gelmini AuthorDate: Sat Dec 10 00:08:02 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Dec 9 23:08:02 2022 + Update git submodules * Update helpcontent2 from branch 'master' to f5dc5a9dc64efa25a9553a0bcc4f1c94b775a15a - Fix typo Change-Id: I859153f912a952e105e6d124fa85e7f81a702d83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143891 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 9cd78ba1f7b7..f5dc5a9dc64e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9cd78ba1f7b77ed8a062906f2e553a4dbfca6ea4 +Subproject commit f5dc5a9dc64efa25a9553a0bcc4f1c94b775a15a
[Libreoffice-commits] core.git: configure.ac
configure.ac | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit 53f117492db82285b190a40dd432e2bb10899457 Author: Aurimas Fišeras AuthorDate: Fri Dec 9 20:21:28 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Dec 9 23:11:47 2022 + configure.ac: update links to avoid redirects, fix broken links. Change-Id: I7269205ecaac450123e153ea549036abd9a567d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143884 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/configure.ac b/configure.ac index 613604558eb8..6b5f50c2490e 100644 --- a/configure.ac +++ b/configure.ac @@ -1879,7 +1879,7 @@ libo_FUZZ_ARG_ENABLE(release-build, [Enable release build. Note that the "release build" choice is orthogonal to whether symbols are present, debug info is generated, or optimization is done. - See http://wiki.documentfoundation.org/Development/DevBuild]), + See https://wiki.documentfoundation.org/Development/DevBuild]), ,) AC_ARG_ENABLE(windows-build-signing, @@ -2587,7 +2587,7 @@ AC_ARG_WITH(bffvalidator, [Enables export validation for Microsoft Binary formats (doc, xls, ppt). Requires installed Microsoft Office Binary File Format Validator. Note: export-validation (--with-export-validation) is required to be turned on. - See https://www.microsoft.com/en-us/download/details.aspx?id=26794]), + See https://web.archive.org/web/20200804155745/https://www.microsoft.com/en-us/download/details.aspx?id=26794]), ,with_bffvalidator=no) libo_FUZZ_ARG_WITH(junit, @@ -3537,7 +3537,7 @@ if test $_os = Darwin; then if test "$enable_macosx_code_signing" = yes; then # By default use the first suitable certificate (?). -# http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application +# https://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application # says that the "Mac Developer" certificate is useful just for self-testing. For distribution # outside the Mac App Store, use the "Developer ID Application" one, and for distribution in # the App Store, the "3rd Party Mac Developer" one. I think it works best to the @@ -6980,7 +6980,7 @@ if test "$GXX" = "yes" -a -z "$COM_IS_CLANG"; then AC_MSG_RESULT([ok (g++ $_gpp_version)]) fi -dnl see https://code.google.com/p/android/issues/detail?id=41770 +dnl see https://issuetracker.google.com/issues/36962819 glibcxx_threads=no AC_LANG_PUSH([C++]) AC_REQUIRE_CPP @@ -9134,7 +9134,7 @@ if test "$enable_epm" = "yes"; then if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else -AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm]) +AC_MSG_ERROR([no. Install ESP Package Manager (https://jimjag.github.io/epm/) and/or specify the path to the right epm]) fi AC_MSG_CHECKING([epm version]) EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` @@ -9143,7 +9143,7 @@ if test "$enable_epm" = "yes"; then AC_MSG_RESULT([OK, >= 3.7]) else AC_MSG_RESULT([too old. epm >= 3.7 is required.]) -AC_MSG_ERROR([Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm]) +AC_MSG_ERROR([Install ESP Package Manager (https://jimjag.github.io/epm/) and/or specify the path to the right epm]) fi fi fi @@ -9508,7 +9508,7 @@ cd /opt/lo/bin wget https://dev-www.libreoffice.org/bin/cygwin/nasm.exe chmod +x nasm -or get and install one from http://www.nasm.us/ +or get and install one from https://www.nasm.us/ Then re-run autogen.sh @@ -9518,7 +9518,7 @@ Alternatively, you can install the 'new' nasm where ever you want and make sure _EOS else cat << _EOS -consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/BUILDING.md +consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/BUILDING.md _EOS fi @@ -9545,7 +9545,7 @@ if test "$SYSTEM_CLUCENE" = TRUE; then save_CPPFLAGS=$CPPFLAGS CXXFLAGS="$CXXFLAGS $CLUCENE_CFLAGS" CPPFLAGS="$CPPFLAGS $CLUCENE_CFLAGS" -dnl http://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446 +dnl https://sourceforge.net/p/clucene/bugs/200/ dnl https://bugzilla.redhat.com/show_bug.cgi?id=794795 AC_CHECK_HEADER([CLucene/analysis/cjk/CJKAnalyzer.h], [], [AC_MSG_ERROR([Your version of libclucene has contr
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - include/vcl sw/CppunitTest_sw_core_attr.mk sw/Module_sw.mk sw/qa sw/source
include/vcl/transfer.hxx |4 -
sw/CppunitTest_sw_core_attr.mk | 74 +++
sw/Module_sw.mk|1
sw/qa/core/attr/attr.cxx | 86 +
sw/qa/core/attr/data/attr-set.docx |binary
sw/source/core/attr/swatrset.cxx |3 -
6 files changed, 165 insertions(+), 3 deletions(-)
New commits:
commit 0d975e6d842d5e35e6ac83d4a9b87bcf2a7d8e7a
Author: Miklos Vajna
AuthorDate: Wed Mar 30 11:20:12 2022 +0200
Commit: Thorsten Behrens
CommitDate: Fri Dec 9 23:18:57 2022 +
sw: fix crash in SwAttrSet::CopyToModify()
Regression from commit 938a4d6624a78f3e272b3c4c07f314cb0c6db723
(tdf#128375 sw: fix copying RES_PARATR_LIST_AUTOFMT to different SwDoc,
2019-11-01), the problem is that we may get an autofmt pool item which
is set, but its style handle is empty. Assume that this is the same case
as having no autofmt at all.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132301
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit ddfafd9b67e6e61c144b29ac73bbafb413ddf03b)
Change-Id: I87494fd04687d31201b4ec712cb0fb1ec7362b46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143888
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 75af922a007c..2b4c3ecc2b97 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -176,8 +176,7 @@ protected:
const css::uno::Reference< css::datatransfer::clipboard::XClipboard >&
getOwnClipboard() const { return mxClipboard; }
-private:
-
+public:
// XTransferable
virtual css::uno::Any SAL_CALL getTransferData( const
css::datatransfer::DataFlavor& rFlavor ) override;
virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL
getTransferDataFlavors() override;
@@ -188,6 +187,7 @@ private:
const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc
) override;
virtual sal_Bool SAL_CALL isComplex() override;
+private:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
override;
diff --git a/sw/CppunitTest_sw_core_attr.mk b/sw/CppunitTest_sw_core_attr.mk
new file mode 100644
index ..91ae9c8b44e6
--- /dev/null
+++ b/sw/CppunitTest_sw_core_attr.mk
@@ -0,0 +1,74 @@
+# -*- 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_core_attr))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_attr))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_attr, \
+sw/qa/core/attr/attr \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_attr, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+sal \
+sfx \
+svl \
+svx \
+svxcore \
+sw \
+test \
+unotest \
+utl \
+vcl \
+tl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_attr,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_attr,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_attr,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_attr))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_attr))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_attr,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_attr,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_attr))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_attr, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_attr))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 79d90a649385..06ba2fef9a3a 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_core_unocore \
CppunitTest_sw_core_crsr \
CppunitTest_sw_core_edit \
+CppunitTest_sw_core_attr \
))
ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/core/attr/attr.cxx b/sw/qa/core/attr/attr.cxx
new file mode 100644
index ..a406a91f1f4b
--- /dev/null
+++ b/sw/qa/core/attr/attr.cxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0390479ccf454cd87997fe97d640caf9f8c45a13
Author: Julien Nabet
AuthorDate: Fri Dec 9 20:42:26 2022 +0100
Commit: Lionel Mamane
CommitDate: Sat Dec 10 06:17:58 2022 +
Related tdf#152381: fix "lengths do not match"
On console, I noticed these:
warn:dbaccess:111457:111457:dbaccess/source/ui/browser/unodatbr.cxx:754:
DBG_UNHANDLED_EXCEPTION in InitializeGridModel exception:
com.sun.star.lang.IllegalArgumentException message: "lengths do not match at
/home/julien/lo/libreoffice/cppuhelper/source/propshlp.cxx:872"
ArgumentPosition: -1
0
cppu::OPropertySetHelper::setPropertyValues(com::sun::star::uno::Sequence
const&, com::sun::star::uno::Sequence const&)
(this=0x55eca23d3b90, rPropertyNames=uno::Sequence of length 6 = {...},
rValues=uno::Sequence of length 7 = {...}) at cppuhelper/source/propshlp.cxx:872
1 0x7f39c7a7ecb6 in
comphelper::OPropertySetAggregationHelper::setPropertyValues(com::sun::star::uno::Sequence
const&, com::sun::star::uno::Sequence const&)
(this=0x55eca23d3b90, _rPropertyNames=uno::Sequence of length 6 =
{...}, _rValues=uno::Sequence of length 7 = {...}) at
comphelper/source/property/propagg.cxx:589
2 0x7f39ac81f057 in
dbaui::SbaTableQueryBrowser::InitializeGridModel(com::sun::star::uno::Reference
const&)
(this=0x55eca23b1960, xGrid=uno::Reference to (frm::OGridControlModel
*) 0x55eca23d3c30) at dbaccess/source/ui/browser/unodatbr.cxx:594
3 0x7f39ac834d46 in
dbaui::SbaTableQueryBrowser::implLoadAnything(rtl::OUString const&,
rtl::OUString const&, int, bool,
utl::SharedUNOComponent const&) (this=0x55eca23b1960,
_rDataSourceName="file:///tmp/Table_Default_Firebird.odb", _rCommand="Table2",
nCommandType=0, _bEscapeProcessing=true, _rxConnection=...)
at dbaccess/source/ui/browser/unodatbr.cxx:2384
4 0x7f39ac8312ee in
dbaui::SbaTableQueryBrowser::implSelect(weld::TreeIter const*)
(this=0x55eca23b1960, pEntry=0x55eca243bd90) at
dbaccess/source/ui/browser/unodatbr.cxx:2678
5 0x7f39ac8343e2 in
dbaui::SbaTableQueryBrowser::implSelect(rtl::OUString const&, rtl::OUString
const&, int, bool, utl::SharedUNOComponent const&, bool) (this=0x55eca23b1960,
_rDataSourceName="file:///tmp/Table_Default_Firebird.odb", _rCommand="Table2",
nCommandType=0, _bEscapeProcessing=true, _rxConnection=..., _bSelectDirect=true)
at dbaccess/source/ui/browser/unodatbr.cxx:2445
6 0x7f39ac8398c5 in dbaui::SbaTableQueryBrowser::impl_initialize()
(this=0x55eca23b1960) at dbaccess/source/ui/browser/unodatbr.cxx:3251
7 0x7f39ac7a3eee in
dbaui::OGenericUnoController::initialize(com::sun::star::uno::Sequence
const&) (this=0x55eca23b1960, aArguments=uno::Sequence of length 17 = {...})
at dbaccess/source/ui/browser/genericcontroller.cxx:259
8 0x7f39ac718dd7 in (anonymous
namespace)::DBContentLoader::load(com::sun::star::uno::Reference
const&, rtl::OUString const&,
com::sun::star::uno::Sequence const&,
com::sun::star::uno::Reference
const&)
(this=0x55eca23aacf0, rFrame=uno::Reference to ((anonymous
namespace)::XFrameImpl *) 0x55eca1f13750,
rURL=".component:DB/DataSourceBrowser", rArgs=uno::Sequence of length 16 =
{...}, rListener=uno::Reference to (framework::(anonymous
namespace)::LoadEnvListener *) 0x55eca23b0828) at
dbaccess/source/ui/browser/dbloader.cxx:230
9 0x7f39c65f5f13 in framework::LoadEnv::impl_loadContent()
(this=0x7fff7788a6e8) at framework/source/loadenv/loadenv.cxx:1154
At least from 59bc10eb4609c "INTEGRATION: CWS insight01 (1.152.38); FILE
MERGED" (2004-08-02)
this part seems the root pb:
-Sequence< ::rtl::OUString> aProperties(6);
-Sequence< Any> aValues(6);
+Sequence< ::rtl::OUString> aProperties(6 + ( m_bPreview ?
5 : 0 ));
+Sequence< Any> aValues(7 + ( m_bPreview ? 5 : 0 ));
if m_bPreview is false, there are only 6 attributes:
- PROPERTY_FONT
- PROPERTY_TEXTEMPHASIS
- PROPERTY_TEXTRELIEF
- PROPERTY_ROW_HEIGHT
- PROPERTY_TEXTCOLOR
- PROPERTY_TEXTLINECOLOR
Change-Id: I91cd81f87ae0685123e273fa6d106fdd22003147
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143889
Reviewed-by: Julien Nabet
Tested-by: Jenkins
Reviewed-by: Lionel Mamane
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index ee300a8862ed..0a54ccb4051d 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -547,7 +547,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const
Reference< css::form::XForm
if (m_xCurrentlyDisplayed)
{
Sequence< OUString> aProperties(6 + ( m_bPreview ? 5 : 0 ));
-Sequence< Any> aValues(7 + ( m_
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/scpdfexport.cxx | 71 +++
1 file changed, 71 insertions(+)
New commits:
commit c5844bad90dd056ca533ba86443e179ee4611f2c
Author: Xisco Fauli
AuthorDate: Fri Dec 9 20:52:18 2022 +0100
Commit: Xisco Fauli
CommitDate: Sat Dec 10 07:46:08 2022 +
tdf#120190: sc_pdf_export: Add unittest
Exporting to pdf is the only way I could find to test this issue
Change-Id: I1f75d841b09d13807fb1e9e4418a58638d985870
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143890
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx
index a3056965c733..a1babf5daa07 100644
--- a/sc/qa/extras/scpdfexport.cxx
+++ b/sc/qa/extras/scpdfexport.cxx
@@ -29,6 +29,7 @@
#include
#include
+#include
#if USE_TLS_NSS
#include
@@ -62,6 +63,7 @@ public:
void testUnoCommands_Tdf120161();
void testTdf64703_hiddenPageBreak();
void testTdf143978();
+void testTdf120190();
void testTdf84012();
void testTdf78897();
void testForcepoint97();
@@ -72,6 +74,7 @@ public:
CPPUNIT_TEST(testUnoCommands_Tdf120161);
CPPUNIT_TEST(testTdf64703_hiddenPageBreak);
CPPUNIT_TEST(testTdf143978);
+CPPUNIT_TEST(testTdf120190);
CPPUNIT_TEST(testTdf84012);
CPPUNIT_TEST(testTdf78897);
CPPUNIT_TEST(testForcepoint97);
@@ -426,6 +429,74 @@ void ScPDFExportTest::testTdf143978()
CPPUNIT_ASSERT_EQUAL(OUString("2021-11-17"), sText2);
}
+void ScPDFExportTest::testTdf120190()
+{
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+if (!pPDFium)
+{
+return;
+}
+
+mxComponent = loadFromDesktop("private:factory/scalc");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+uno::Reference xSheets(xDoc->getSheets(),
uno::UNO_SET_THROW);
+uno::Reference xIA(xSheets, uno::UNO_QUERY_THROW);
+uno::Reference xSheet0(xIA->getByIndex(0),
uno::UNO_QUERY_THROW);
+
+xSheet0->getCellByPosition(0, 0)->setFormula("=5&CHAR(10)&6");
+
+uno::Sequence aArgs
+= comphelper::InitPropertySequence({ { "ToPoint",
uno::Any(OUString("A1")) } });
+dispatchCommand(mxComponent, ".uno:GoToCell", aArgs);
+
+dispatchCommand(mxComponent, ".uno:ConvertFormulaToValue", {});
+Scheduler::ProcessEventsToIdle();
+
+// A1
+ScRange range1(0, 0, 0, 0, 0, 0);
+exportToPDF(xModel, range1);
+
+// Parse the export result with pdfium.
+std::unique_ptr pPdfDocument = parsePDFExport();
+CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount());
+
+// Get the first page
+std::unique_ptr pPdfPage =
pPdfDocument->openPage(/*nIndex=*/0);
+CPPUNIT_ASSERT(pPdfPage);
+std::unique_ptr pTextPage =
pPdfPage->getTextPage();
+
+int nPageObjectCount = pPdfPage->getObjectCount();
+CPPUNIT_ASSERT_EQUAL(5, nPageObjectCount);
+
+std::unique_ptr pPageObject1 =
pPdfPage->getObject(0);
+OUString sText1 = pPageObject1->getText(pTextPage);
+CPPUNIT_ASSERT_EQUAL(OUString("Sheet1"), sText1);
+
+std::unique_ptr pPageObject2 =
pPdfPage->getObject(1);
+OUString sText2 = pPageObject2->getText(pTextPage);
+CPPUNIT_ASSERT_EQUAL(OUString("Page "), sText2);
+
+std::unique_ptr pPageObject3 =
pPdfPage->getObject(2);
+OUString sText3 = pPageObject3->getText(pTextPage);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), sText3);
+
+std::unique_ptr pPageObject4 =
pPdfPage->getObject(3);
+OUString sText4 = pPageObject4->getText(pTextPage);
+
+// Without the fix in place, this test would have failed with
+// - Expected: 5
+// - Actual : 56
+CPPUNIT_ASSERT_EQUAL(OUString("5"), sText4);
+
+std::unique_ptr pPageObject5 =
pPdfPage->getObject(4);
+OUString sText5 = pPageObject5->getText(pTextPage);
+CPPUNIT_ASSERT_EQUAL(OUString("6"), sText5);
+}
+
void ScPDFExportTest::testTdf84012()
{
std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
