[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/NOTICE | 40 ++-- 1 file changed, 2 insertions(+), 38 deletions(-) New commits: commit 503b14eee1f05e987fb415d25da1086defe8c772 Author: Andras Timar AuthorDate: Mon Feb 27 13:18:51 2023 +0100 Commit: Andras Timar CommitDate: Tue Mar 7 07:29:40 2023 + Remove mention of apr and apr-util from NOTICE cause we don't use them... since commit f45b7871e7d31dfc6ed31d1b79928990bba0d0dd Author: Michael Stahl Date: Tue Dec 14 16:03:46 2021 +0100 ucb: remove --with-webdav=serf Remove code in ucb/source/ucp/webdav, and now unused externals apr, apr-util, serf. Change-Id: Idfb1f921c0d048f18f23263c04ac718ca1c95ebf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147886 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE index e33e3fa30f84..15a5e5ad4101 100644 --- a/readlicense_oo/license/NOTICE +++ b/readlicense_oo/license/NOTICE @@ -23,8 +23,6 @@ As part of the base system this product also includes code from the following Apache projects: - Apache Lucene -- Apache Portable Runtime -- Apache Portable Runtime Utility Library - Apache Jakarta HttpClient - used by MediaWiki Publisher extension - Apache Tomcat - used by MediaWiki Publisher extension @@ -42,40 +40,6 @@ were developed by Martin Porter and Richard Boulton. The full snowball package is available from http://snowball.tartarus.org/ - -Apache Portable Runtime -Copyright (c) 2011 The Apache Software Foundation. - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -Portions of this software were developed at the National Center -for Supercomputing Applications (NCSA) at the University of -Illinois at Urbana-Champaign. - -This software contains code derived from the RSA Data Security -Inc. MD5 Message-Digest Algorithm. - -This software contains code derived from UNIX V7, Copyright(C) -Caldera International Inc. - - -Apache Portable Runtime Utility Library -Copyright (c) 2011 The Apache Software Foundation. - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -Portions of this software were developed at the National Center -for Supercomputing Applications (NCSA) at the University of -Illinois at Urbana-Champaign. - -This software contains code derived from the RSA Data Security -Inc. MD5 Message-Digest Algorithm, including various -modifications by Spyglass Inc., Carnegie Mellon University, and -Bell Communications Research, Inc (Bellcore). - - Apache Tomcat Copyright 1999-2012 The Apache Software Foundation @@ -87,8 +51,8 @@ the MX4J package, which is open source software. The original software and related information is available at http://mx4j.sourceforge.net/. -Java compilation software for JSP pages is provided by Eclipse, -which is open source software. The original software and +Java compilation software for JSP pages is provided by Eclipse, +which is open source software. The original software and related information is available at http://www.eclipse.org/.
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/frame.hxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit aa55c773ee1f8e756de6959781a293bcfc243952 Author: Miklos Vajna AuthorDate: Mon Mar 6 20:03:23 2023 +0100 Commit: Miklos Vajna CommitDate: Tue Mar 7 07:12:56 2023 + sw: document SwFrame::MakePos() I.e. the simplest SwLayoutFrame::MakeAll() mostly just calls MakePos() and Format(). Change-Id: I13d37c2bddfdd57503c1de974e34acd004e57195 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148360 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index f1433a10f590..ec47266ec468 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -457,6 +457,8 @@ protected: SwPageFrame *InsertPage( SwPageFrame *pSibling, bool bFootnote ); void PrepareMake(vcl::RenderContext* pRenderContext); void OptPrepareMake(); +/// Calculates the frame area position, in case it's invalid. The frame area size and the print +/// area is not considered here. virtual void MakePos(); // Format next frame of table frame to assure keeping attributes. // In case of nested tables method is called to @@ -658,7 +660,7 @@ public: bool IsFootnoteAllowed() const; /// Calculates the frame area size and the print area, in case they are invalid. -/// The frame are position is not considered here. +/// The frame area position is not considered here. virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ); virtual void CheckDirection( bool bVert );
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - xmloff/source
xmloff/source/text/txtparae.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 26e945d22e597d84666225c8d0e9590412e404d7
Author: Miklos Vajna
AuthorDate: Mon Mar 6 08:18:41 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 7 07:12:40 2023 +
xmloff: fix -Wmaybe-uninitialized
In case operator >>=() of uno::Any fails, it leaves nTabIndex
uninitialized and it seems gcc notices this sometimes:
In file included from include/com/sun/star/uno/Any.h:30,
from include/com/sun/star/uno/Any.hxx:35,
from include/o3tl/any.hxx:21,
from xmloff/source/text/txtparae.cxx:22:
include/rtl/ustring.hxx: In member function ‘void
XMLTextParagraphExport::ExportContentControl(const
com::sun::star::uno::Reference&, bool,
bool, bool&)’:
include/rtl/ustring.hxx:3044:22: warning: ‘nTabIndex’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
3044 | return number( static_cast< unsigned long long >( i ),
radix );
|
~~^
xmloff/source/text/txtparae.cxx:3999:20: note: ‘nTabIndex’ was declared here
3999 | sal_uInt32 nTabIndex;
|^
Change-Id: Ia39e85575bde4011247583265497ddf4d0d4c52b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148294
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Justin Luth
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 957c64a25bb3..c1a6f9b5bffa 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3996,7 +3996,7 @@ void XMLTextParagraphExport::ExportContentControl(
GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_ID,
OUString::number(nId));
}
-sal_uInt32 nTabIndex;
+sal_uInt32 nTabIndex = 0;
xPropertySet->getPropertyValue("TabIndex") >>= nTabIndex;
if (nTabIndex)
{
[Libreoffice-commits] core.git: include/xmloff sw/inc sw/qa sw/source sw/uiconfig vcl/source xmloff/source
include/xmloff/xmltoken.hxx |2
sw/inc/authfld.hxx |5
sw/inc/helpids.h|2
sw/inc/strings.hrc |2
sw/inc/toxe.hxx |2
sw/qa/core/text/text.cxx| 154
sw/source/core/fields/authfld.cxx | 30
sw/source/core/fields/fldbas.cxx| 10 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 149 +++
sw/source/ui/index/cnttab.cxx |2
sw/source/ui/index/swuiidxmrk.cxx | 34 +
sw/source/uibase/docvw/edtwin2.cxx | 10 +
sw/source/uibase/shells/textsh1.cxx | 14 +-
sw/source/uibase/utlui/initui.cxx |2
sw/source/uibase/wrtsh/wrtsh2.cxx | 74 ++-
sw/uiconfig/swriter/ui/bibliofragment.ui| 24 +++
vcl/source/gdi/pdfwriter_impl.cxx |7 -
xmloff/source/core/xmltoken.cxx |2
xmloff/source/text/txtflde.cxx | 10 +
xmloff/source/text/txtfldi.cxx |8 +
xmloff/source/token/tokens.txt |2
21 files changed, 495 insertions(+), 50 deletions(-)
New commits:
commit 7b99871635cd48c2a8a1d0afbd7afc60a45cc2ff
Author: Vojtěch Doležal
AuthorDate: Mon Feb 27 08:52:35 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 7 07:12:31 2023 +
tdf#153396 - Bibliography marks improvements
Adds option to separate function of "URL" into (listed) "URL" and "Target
URL" to allow for more flexibility (in that case if target URL is empty,
bibliography mark hyperlink leads to bibliography table row if possible)
When writing tests also found and fixed bug where exporting new file with
anchor link bibliography mark crashes LO.
Change-Id: Ic1b5c8c9590c0338dcfc4fa3a981142bddae0113
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147868
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 7c6cea0482d3..5262f3b3ab5e 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3465,6 +3465,8 @@ namespace xmloff::token {
XML_MARGIN_GUTTER,
XML_LOCAL_URL,
+XML_TARGET_URL,
+XML_USE_TARGET_URL,
// Math ml
XML_DIR,
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index def78f913e14..26e4843a6ad2 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -199,8 +199,13 @@ public:
OUString GetAuthority(const SwRootFrame *pLayout,
const SwForm *pTOX = nullptr) const;
+bool UseTargetURL() const;
+
bool HasURL() const;
OUString GetAbsoluteURL() const;
+
+bool HasTargetURL() const;
+OUString GetAbsoluteTargetURL() const;
/**
* Returns full URI for the URL, relative if specified
* \param bRelative whether the path should be relative (when dealing
with local files)
diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h
index 65c49e22f311..78f52fd436ea 100644
--- a/sw/inc/helpids.h
+++ b/sw/inc/helpids.h
@@ -76,6 +76,8 @@ inline constexpr OStringLiteral HID_EDIT_FORMULA =
"SW_HID_EDIT_FORMULA";
#define HID_AUTH_FIELD_CUSTOM5
"SW_HID_AUTH_FIELD_CUSTOM5"
#define HID_AUTH_FIELD_ISBN
"SW_HID_AUTH_FIELD_ISBN"
#define HID_AUTH_FIELD_LOCAL_URL
"SW_HID_AUTH_FIELD_LOCAL_URL"
+#define HID_AUTH_FIELD_TARGET_URL
"SW_HID_AUTH_FIELD_TARGET_URL"
+#define HID_AUTH_FIELD_USE_TARGET_URL
"SW_HID_AUTH_FIELD_USE_TARGET_URL"
inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE =
"SW_HID_BUSINESS_FMT_PAGE";
inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_CONT =
"SW_HID_BUSINESS_FMT_PAGE_CONT";
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 96e58d395164..8af6eef01a4d 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -816,6 +816,8 @@
#define STR_AUTH_FIELD_CUSTOM5 NC_("STR_AUTH_FIELD_CUSTOM5",
"User-defined5")
#define STR_AUTH_FIELD_ISBN NC_("STR_AUTH_FIELD_ISBN",
"ISBN")
#define STR_AUTH_FIELD_LOCAL_URL
NC_("STR_AUTH_FIELD_LOCAL_URL", "Local copy")
+#define STR_AUTH_FIELD_TARGET_URL
NC_("STR_AUTH_FIELD_TARGET_URL", "Target URL")
+#define STR_AUTH_FIELD_USE_TARGET_URL
NC_("STR_AUTH_FIELD_USE_TARGET_URL", "Use Target URL as hyperlink")
#define STR_IDXMRK_EDIT NC_("STR_IDXMRK_EDIT", "Edit
Index Entry")
#define STR_IDXMRK_INSERT NC_("STR_IDXMRK_INSERT",
"Insert Index Entry")
diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx
index b2f08e66c320..05084c84c2e8 100644
--- a/sw/inc/toxe.hxx
+++ b/sw/inc/toxe.hxx
@@ -1
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/toolkit/field.hxx |2 +-
vcl/source/control/field2.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cc45d748e241ea96fd0c81154e3dd49f9fc58357
Author: Caolán McNamara
AuthorDate: Mon Mar 6 17:10:31 2023 +
Commit: Noel Grandin
CommitDate: Tue Mar 7 06:59:52 2023 +
eFormat modified inside GetDateArea, but change not propogated to the caller
regression from:
commit 6e7e19d9c300dbdd279789b09f94781e946fad52
Date: Wed Jul 15 12:10:32 2020 +0100
weld DateControl
Change-Id: I74bc01383f04fd4e54a45058fbbc3bc082eef0e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148359
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 10f9cc3b571d..c127f91ccbb4 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -423,7 +423,7 @@ protected:
public:
static OUString FormatDate(const Date& rNewDate,
ExtDateFieldFormat eFormat, const LocaleDataWrapper& rLocaleData, const
Formatter::StaticFormatter& rStaticFormatter);
static bool TextToDate(const OUString& rStr, Date& rTime,
ExtDateFieldFormat eFormat, const LocaleDataWrapper& rLocaleDataWrapper, const
CalendarWrapper& rCalendarWrapper);
-static int GetDateArea(ExtDateFieldFormat eFormat,
std::u16string_view rText, int nCursor, const LocaleDataWrapper&
rLocaleDataWrapper);
+static int GetDateArea(ExtDateFieldFormat& eFormat,
std::u16string_view rText, int nCursor, const LocaleDataWrapper&
rLocaleDataWrapper);
virtual ~DateFormatter() override;
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index bc84c381d3b7..be02536ef513 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1618,7 +1618,7 @@ bool DateFormatter::ImplAllowMalformedInput() const
return !IsEnforceValidValue();
}
-int DateFormatter::GetDateArea(ExtDateFieldFormat eFormat, std::u16string_view
rText, int nCursor, const LocaleDataWrapper& rLocaleDataWrapper)
+int DateFormatter::GetDateArea(ExtDateFieldFormat& eFormat,
std::u16string_view rText, int nCursor, const LocaleDataWrapper&
rLocaleDataWrapper)
{
sal_Int8 nDateArea = 0;
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/window/salframe.cxx | 68
1 file changed, 68 deletions(-)
New commits:
commit 25c19f896b327cac4fa4ed248fcc0410a9fe55ab
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:14:08 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 7 06:59:15 2023 +
remove dead code in X11SalFrame::SetIcon
ever since
commit a11cabb47249257d8b6510fe91063ade03d0c636
Author: Caolán McNamara
Date: Wed Jan 11 12:22:17 2023 +
rely on support for NET_WM_ICON
found by clang-tidy dead-code
Change-Id: I4b762361a7937d087dab8c5cb0f57131ce3650d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148346
Reviewed-by: Caolán McNamara
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 4721c9c96c12..528bb91e065a 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -915,74 +915,6 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon )
mnIconID = nIcon;
-XIconSize *pIconSize = nullptr;
-int nSizes = 0;
-int iconSize = 32;
-if ( XGetIconSizes( GetXDisplay(), GetDisplay()->GetRootWindow( m_nXScreen
), &pIconSize, &nSizes ) )
-{
-#if OSL_DEBUG_LEVEL > 1
-SAL_INFO("vcl.window", "X11SalFrame::SetIcon(): found "
-<< nSizes
-<< " IconSizes:");
-#endif
-int i;
-for( i=0; i iconSize )
-{
-iconSize = pIconSize[i].max_width;
-}
-
-#if OSL_DEBUG_LEVEL > 1
-SAL_INFO("vcl.window", "min: "
-<< pIconSize[i].min_width
-<< ", "
-<< pIconSize[i].min_height);
-SAL_INFO("vcl.window", "max: "
-<< pIconSize[i].max_width
-<< ", "
-<< pIconSize[i].max_height);
-SAL_INFO("vcl.window", "inc: "
-<< pIconSize[i].width_inc
-<< ", "
-<< pIconSize[i].height_inc);
-#endif
-}
-
-XFree( pIconSize );
-}
-else
-{
-const OUString& rWM( pDisplay_->getWMAdaptor()->getWindowManagerName()
);
-if( rWM == "KWin" ) // assume KDE is running
-iconSize = 48;
-static bool bGnomeIconSize = false;
-static bool bGnomeChecked = false;
-if( ! bGnomeChecked )
-{
-bGnomeChecked=true;
-int nCount = 0;
-Atom* pProps = XListProperties( GetXDisplay(),
-GetDisplay()->GetRootWindow(
m_nXScreen ),
-&nCount );
-for( int i = 0; i < nCount && !bGnomeIconSize; i++ )
-{
-char* pName = XGetAtomName( GetXDisplay(), pProps[i] );
-if( pName )
-{
-if( !strcmp( pName, "GNOME_PANEL_DESKTOP_AREA" ) )
-bGnomeIconSize = true;
-XFree( pName );
-}
-}
-if( pProps )
-XFree( pProps );
-}
-if( bGnomeIconSize )
-iconSize = 48;
-}
-
NetWmIconData netwm_icon;
CreateNetWmAppIcon( nIcon, netwm_icon );
[Libreoffice-commits] core.git: filter/source vcl/unx
filter/source/graphicfilter/icgm/class1.cxx |3 ---
vcl/unx/gtk3/salnativewidgets-gtk.cxx |1 -
2 files changed, 4 deletions(-)
New commits:
commit 0b92356a6c1844aef9ed49927fa4da310ee5bb2e
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:24:16 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 7 06:58:51 2023 +
clang-tidy dead-store
Change-Id: Id7c48e995b4f92f081fbd4d1af257e1b81e6a421
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148347
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/graphicfilter/icgm/class1.cxx
b/filter/source/graphicfilter/icgm/class1.cxx
index 07a6fe253e4e..4304d142b5e5 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -151,9 +151,6 @@ void CGM::ImplDoClass1()
}
break;
case 0x0a : /*Color Value Extent*/
-{
-nI1 = 6;
-}
break;
case 0x0b : /*MetaFile Element List */break;
case 0x0c : /*MetaFile Default Replacement*/
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index f55b45a8b92b..b5efe1b59ddc 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -782,7 +782,6 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext
*context,
tools::Rectangle buttonRect = NWGetSpinButtonRect( nPart, aAreaRect );
gtk_style_context_set_state(context, stateFlags);
-stateFlags = gtk_style_context_get_state(context);
style_context_get_padding(context, &padding);
style_context_get_border(context, &border);
[Libreoffice-commits] core.git: 3 commits - filter/source sd/source sfx2/source sw/inc sw/qa sw/source vcl/source
filter/source/msfilter/msdffimp.cxx |1
filter/source/t602/t602filter.cxx|2 -
sd/source/ui/app/sdxfer.cxx | 18 -
sd/source/ui/inc/sdxfer.hxx |4 +-
sfx2/source/control/templatedlglocalview.cxx |1
sfx2/source/dialog/StyleList.cxx |2 -
sw/inc/ToxLinkProcessor.hxx |3 +
sw/inc/breakit.hxx |7 ++-
sw/qa/core/test_ToxLinkProcessor.cxx |4 +-
sw/source/core/bastyp/breakit.cxx|2 -
sw/source/core/tox/ToxLinkProcessor.cxx | 13 +++
sw/source/core/unocore/unoidx.cxx| 30
sw/source/filter/ww8/ww8graf.cxx |4 +-
sw/source/filter/ww8/ww8par.cxx |4 +-
sw/source/filter/ww8/ww8par.hxx |2 -
sw/source/filter/ww8/ww8par3.cxx |2 -
sw/source/filter/ww8/ww8par6.cxx |6 +--
sw/source/ui/index/cntex.cxx | 22 ++--
sw/source/ui/index/cnttab.cxx|2 -
sw/source/uibase/dochdl/swdtflvr.cxx | 14 +++
sw/source/uibase/inc/conttree.hxx|4 +-
sw/source/uibase/inc/swdtflvr.hxx|4 +-
sw/source/uibase/inc/swuicnttab.hxx |2 -
sw/source/uibase/sidebar/TableEditPanel.cxx | 49 ---
sw/source/uibase/sidebar/TableEditPanel.hxx |4 +-
sw/source/uibase/utlui/glbltree.cxx | 16
vcl/source/fontsubset/sft.cxx|1
27 files changed, 107 insertions(+), 116 deletions(-)
New commits:
commit 20ab6da2ce6ed5728683b6cfc1dbe11a2f676ae0
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:04:35 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 7 06:58:42 2023 +
no need to allocate these separately
they are all one or two words in size
Change-Id: I701be7fd8bd4402af9c7b1473c9f4b3c8a9c0e90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148339
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 2e048542f9b6..a6cf586eef65 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -130,7 +130,7 @@ SdTransferable::~SdTransferable()
delete mpSdDrawDocumentIntern;
moGraphic.reset();
-mpBookmark.reset();
+moBookmark.reset();
mpImageMap.reset();
mpVDev.disposeAndClear();
@@ -147,7 +147,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
mpOLEDataHelper.reset();
moGraphic.reset();
-mpBookmark.reset();
+moBookmark.reset();
mpImageMap.reset();
if( auto pOleObj = dynamic_cast< SdrOle2Obj* >( pObj ) )
@@ -200,7 +200,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
xPropSet->getPropertyValue( "Label" ) >>= aLabel;
xPropSet->getPropertyValue( "TargetURL" ) >>= aURL;
-mpBookmark.reset( new INetBookmark( aURL, aLabel ) );
+moBookmark.emplace( aURL, aLabel );
}
}
}
@@ -226,7 +226,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
// when both are unused
if(!pObj->HasFillStyle() && !pObj->HasLineStyle())
{
-mpBookmark.reset( new INetBookmark( pURL->GetURL(),
pURL->GetRepresentation() ) );
+moBookmark.emplace( pURL->GetURL(),
pURL->GetRepresentation() );
}
}
}
@@ -413,7 +413,7 @@ void SdTransferable::AddSupportedFormats()
AddFormat( SotClipboardFormatId::BITMAP );
}
}
-else if( mpBookmark )
+else if( moBookmark )
{
AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
AddFormat( SotClipboardFormatId::STRING );
@@ -518,9 +518,9 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
mpSdDrawDocumentIntern->SetOnlineSpell(true);
}
}
-else if( ( nFormat == SotClipboardFormatId::STRING ) && mpBookmark )
+else if( ( nFormat == SotClipboardFormatId::STRING ) && moBookmark )
{
-bOK = SetString( mpBookmark->GetURL() );
+bOK = SetString( moBookmark->GetURL() );
}
else if( ( nFormat == SotClipboardFormatId::SVXB ) && moGraphic )
{
@@ -530,9 +530,9 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
{
bOK = SetImageMap( *mpImageMap );
}
-else if( mpBookmark )
+else if( moBookmark )
{
-bOK = SetINetBookmark( *mpBookmark, rFlavor );
+bOK = SetINetBookmark( *moBookmark, rFlavor );
}
else if( nFormat == SotClipboardFormatId::EMBED_SOURCE )
{
diff --git a/sd/source/
[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_dark icon-themes/sukapura_dark_svg icon-themes/sukapura_svg
icon-themes/sukapura/cmd/lc_framedialog.png |binary icon-themes/sukapura/sd/res/placeholder_chart_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_chart_small_hover.png |binary icon-themes/sukapura/sd/res/placeholder_image_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_image_small_hover.png |binary icon-themes/sukapura/sd/res/placeholder_movie_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_movie_small_hover.png |binary icon-themes/sukapura/sd/res/placeholder_table_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_table_small_hover.png |binary icon-themes/sukapura_dark/cmd/lc_framedialog.png |binary icon-themes/sukapura_dark/sd/res/placeholder_chart_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_chart_small_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_image_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_image_small_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_movie_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_movie_small_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_table_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_table_small_hover.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-Background.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderBottom.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderBottomLeft.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderBottomRight.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderLeft.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderRight.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderTop.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderTopLeft.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderTopRight.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextSelected.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonExitPresenterNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameCenterNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameLeftNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameRightMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameRightNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonHelpMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonHelpNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusSelected.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesSelected.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonPauseTimerMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonPauseTimerNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-
[Libreoffice-commits] core.git: 2 commits - dbaccess/uiconfig sw/inc
dbaccess/uiconfig/ui/copytablepage.ui |3 +++
sw/inc/AccessibilityCheckStrings.hrc |6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 0484a9a3f5e2ecb678f6fb41bbb251529e89c00d
Author: Adolfo Jayme Barrientos
AuthorDate: Mon Mar 6 15:58:57 2023 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Mar 6 23:48:05 2023 +
tdf#150045 Spotted another secondary label
Change-Id: Ic39bb5c61f01d340a1ce59ad320d94efdb341f14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148369
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/dbaccess/uiconfig/ui/copytablepage.ui
b/dbaccess/uiconfig/ui/copytablepage.ui
index c6eea4f00b61..e2e71e476413 100644
--- a/dbaccess/uiconfig/ui/copytablepage.ui
+++ b/dbaccess/uiconfig/ui/copytablepage.ui
@@ -164,6 +164,9 @@
72
72
0
+
+
+
0
commit 0a45150c3da431bf0764b82fb109596880f4dbcb
Author: Adolfo Jayme Barrientos
AuthorDate: Mon Mar 6 14:56:47 2023 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Mar 6 23:47:57 2023 +
The word “fake” is ambiguous
Change-Id: I051c42904ff20d9d12f8821fcb7eedb3642276ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148366
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sw/inc/AccessibilityCheckStrings.hrc
b/sw/inc/AccessibilityCheckStrings.hrc
index 089aac470033..bfd0557d8a98 100644
--- a/sw/inc/AccessibilityCheckStrings.hrc
+++ b/sw/inc/AccessibilityCheckStrings.hrc
@@ -15,14 +15,14 @@
#define STR_NO_ALT NC_("STR_NO_ALT", "No alt text for
graphic “%OBJECT_NAME%”.")
#define STR_TABLE_MERGE_SPLIT NC_("STR_TABLE_MERGE_SPLIT", "Table
“%OBJECT_NAME%” contains merges or splits.")
-#define STR_FAKE_NUMBERING NC_("STR_FAKE_NUMBERING", "Fake
numbering “%NUMBERING%”.")
+#define STR_FAKE_NUMBERING NC_("STR_FAKE_NUMBERING", "Simulated
numbering “%NUMBERING%”.")
#define STR_HYPERLINK_TEXT_IS_LINK NC_("STR_HYPERLINK_TEXT_IS_LINK",
"Hyperlink text is the same as the link address “%LINK%”.")
#define STR_HYPERLINK_TEXT_IS_SHORT NC_("STR_HYPERLINK_TEXT_IS_SHORT",
"Hyperlink text is too short.")
#define STR_TEXT_CONTRAST NC_("STR_TEXT_CONTRAST", "Text
contrast is too low.")
#define STR_TEXT_BLINKING NC_("STR_TEXT_BLINKING", "Blinking
text.")
#define STR_AVOID_FOOTNOTES NC_("STR_AVOID_FOOTNOTES", "Avoid
footnotes.")
-#define STR_AVOID_FAKE_FOOTNOTESNC_("STR_AVOID_FAKE_FOOTNOTES", "Avoid
fake footnotes.")
-#define STR_AVOID_FAKE_CAPTIONS NC_("STR_AVOID_FAKE_CAPTIONS", "Avoid
fake captions.")
+#define STR_AVOID_FAKE_FOOTNOTESNC_("STR_AVOID_FAKE_FOOTNOTES", "Avoid
simulated footnotes.")
+#define STR_AVOID_FAKE_CAPTIONS NC_("STR_AVOID_FAKE_CAPTIONS", "Avoid
simulated captions.")
#define STR_AVOID_ENDNOTES NC_("STR_AVOID_ENDNOTES", "Avoid
endnotes.")
#define STR_AVOID_BACKGROUND_IMAGES NC_("STR_AVOID_BACKGROUND_IMAGES",
"Avoid background images.")
#define STR_AVOID_NEWLINES_SPACENC_("STR_AVOID_NEWLINES_SPACE", "Avoid
newlines to create space.")
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f48d238ce8d5e22642324c456c83b424b3dcb446
Author: Adolfo Jayme Barrientos
AuthorDate: Mon Feb 20 05:47:56 2023 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Mar 6 23:47:10 2023 +
The quotation marks aren’t needed here
Change-Id: Id89b5e161d1d02da66138b16bc8ea34417c554c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148365
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 96ecb57913d5..9dc6a3d81488 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -121,7 +121,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer can insert a blank page between two
odd (even) pages that follow. Check “Print automatically inserted blank pages”
in the print dialog’s %PRODUCTNAME Writer tab."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You do not want to print all columns? Hide
or group the ones you do not need."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To modify an AutoPlay presentation, open it
and after it starts, right click and select Edit in the context menu."), "",
"tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to position precisely? “%MOD2+arrow”
keys move objects (shapes, pictures, formulas) by one pixel."), "",
"tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to position precisely? %MOD2+arrow
keys move objects (shapes, pictures, formulas) by one pixel."), "",
"tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Embedded help is available by pressing F1,
if you have installed it. Otherwise check online at:"),
"https://help.libreoffice.org";, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Right-click in the status bar in
%PRODUCTNAME Calc and select “Selection count” to display the number of
selected cells."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to have two or more columns for just a
part of a %PRODUCTNAME Writer page? Insert ▸ Section, set with Columns tab, and
place text in that section."), "", "tipoftheday_w.png"},
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source
sc/source/core/inc/interpre.hxx | 12
sc/source/core/tool/interpr1.cxx |4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 5215f48c394ec8ed697be010e5a0493b77445e1d
Author: Eike Rathke
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Andras Timar
CommitDate: Mon Mar 6 23:10:57 2023 +
Stack check safety belt before fishing in muddy waters
Have it hit hard in debug builds.
Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147245
Reviewed-by: Caolán McNamara
(cherry picked from commit 166a07062dd4ffedca6106f439a6fcddaeee5eb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147903
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4e986daf8453..3bcc9ef19fc2 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -235,6 +235,7 @@ private:
inline bool MustHaveParamCount( short nAct, short nMust );
inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
inline bool MustHaveParamCountMin( short nAct, short nMin );
+inline bool MustHaveParamCountMinWithStackCheck( short nAct, short nMin );
void PushParameterExpected();
void PushIllegalParameter();
void PushIllegalArgument();
@@ -1089,6 +1090,17 @@ inline bool ScInterpreter::MustHaveParamCountMin( short
nAct, short nMin )
return false;
}
+inline bool ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct,
short nMin )
+{
+assert(sp >= nAct);
+if (sp < nAct)
+{
+PushParameterExpected();
+return false;
+}
+return MustHaveParamCountMin( nAct, nMin);
+}
+
inline bool ScInterpreter::CheckStringPositionArgument( double & fVal )
{
if (!std::isfinite( fVal))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 74bcf76768b6..1a7a970c2e48 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7547,7 +7547,7 @@ void ScInterpreter::ScVLookup()
void ScInterpreter::ScSubTotal()
{
sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 2 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 2 ) )
return;
// We must fish the 1st parameter deep from the stack! And push it on top.
@@ -7594,7 +7594,7 @@ void ScInterpreter::ScSubTotal()
void ScInterpreter::ScAggregate()
{
sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 3 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 3 ) )
return;
const FormulaError nErr = nGlobalError;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source
sc/source/core/inc/interpre.hxx | 12
sc/source/core/tool/interpr1.cxx |4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 35db27e97190d71e861895940ca3e6fdc57c66fa
Author: Eike Rathke
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Andras Timar
CommitDate: Mon Mar 6 23:10:35 2023 +
Stack check safety belt before fishing in muddy waters
Have it hit hard in debug builds.
Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147902
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 322b2e32d5a0..2bad90aa12cb 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -231,6 +231,7 @@ private:
inline bool MustHaveParamCount( short nAct, short nMust );
inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
inline bool MustHaveParamCountMin( short nAct, short nMin );
+inline bool MustHaveParamCountMinWithStackCheck( short nAct, short nMin );
void PushParameterExpected();
void PushIllegalParameter();
void PushIllegalArgument();
@@ -1082,6 +1083,17 @@ inline bool ScInterpreter::MustHaveParamCountMin( short
nAct, short nMin )
return false;
}
+inline bool ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct,
short nMin )
+{
+assert(sp >= nAct);
+if (sp < nAct)
+{
+PushParameterExpected();
+return false;
+}
+return MustHaveParamCountMin( nAct, nMin);
+}
+
inline bool ScInterpreter::CheckStringPositionArgument( double & fVal )
{
if (!std::isfinite( fVal))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 42d6dde67df2..27917500254a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7524,7 +7524,7 @@ void ScInterpreter::ScVLookup()
void ScInterpreter::ScSubTotal()
{
sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 2 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 2 ) )
return;
// We must fish the 1st parameter deep from the stack! And push it on top.
@@ -7571,7 +7571,7 @@ void ScInterpreter::ScSubTotal()
void ScInterpreter::ScAggregate()
{
sal_uInt8 nParamCount = GetByte();
-if ( !MustHaveParamCountMin( nParamCount, 3 ) )
+if ( !MustHaveParamCountMinWithStackCheck( nParamCount, 3 ) )
return;
const FormulaError nErr = nGlobalError;
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data/tdf151605.odt |binary
sw/qa/extras/uiwriter/uiwriter7.cxx | 27 +++
2 files changed, 27 insertions(+)
New commits:
commit 55360ba58f33f3f45c83decce092c43d25c4e48c
Author: Xisco Fauli
AuthorDate: Mon Mar 6 18:03:09 2023 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 6 22:50:25 2023 +
tdf#151605: sw_uiwriter7: Add unittest
Change-Id: I629a531d5ee34a0ab3ef888254bf987df716d4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148357
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/data/tdf151605.odt
b/sw/qa/extras/uiwriter/data/tdf151605.odt
new file mode 100644
index ..6d2d9f9da060
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf151605.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index 6684940700ca..cd6f9f240be3 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -1793,6 +1793,33 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf88899)
CPPUNIT_ASSERT_EQUAL(OUString("11/10/14 03:03 AM"),
xTextField->getPresentation(false));
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf151605)
+{
+createSwDoc("tdf151605.odt");
+
+// disable IncludeHiddenText
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::FilterFlags::ASCII::IncludeHiddenText::set(false,
batch);
+batch->commit();
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+
+uno::Sequence aPropertyValues =
comphelper::InitPropertySequence(
+{ { "SelectedFormat",
uno::Any(static_cast(SotClipboardFormatId::STRING)) } });
+
+// Paste as Unformatted text
+dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Before"), getParagraph(1)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("After"), getParagraph(2)->getString());
+
+// re-enable it
+
officecfg::Office::Writer::FilterFlags::ASCII::IncludeHiddenText::set(true,
batch);
+batch->commit();
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf90362)
{
createSwDoc("tdf90362.fodt");
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf153819.fodt | 174 ++ sw/qa/extras/uiwriter/uiwriter8.cxx | 23 +++ sw/source/core/docnode/ndtbl.cxx |7 - 3 files changed, 202 insertions(+), 2 deletions(-) New commits: commit 415b6b7e692122af679ab74979cbe475e3b19679 Author: László Németh AuthorDate: Mon Mar 6 14:02:02 2023 +0100 Commit: László Németh CommitDate: Mon Mar 6 21:45:21 2023 + tdf#153819 sw: fix crashing MakeFramesForAdjacentContentNode() In Hide Changes mode, copying cells before a tracked deleted table crashed in SwTableNode::MakeFramesForAdjacentContentNode(). Regression from commit 794fd10af7361d5a64a0f8bfbe5c8b5f308617a5 "tdf#147347 sw: hide deleted table at deletion in Hide Changes". Change-Id: I3ac070d35006e61b01a065359431e302e6974e17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148344 Tested-by: Jenkins Reviewed-by: László Németh (cherry picked from commit 317ed3e81a5aa7826176a5122c2d8ea76aa0fb37) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148323 Tested-by: László Németh diff --git a/sw/qa/extras/uiwriter/data/tdf153819.fodt b/sw/qa/extras/uiwriter/data/tdf153819.fodt new file mode 100644 index ..910807825204 --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf153819.fodt @@ -0,0 +1,174 @@ + + +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"> + 2023-03-06T12:23:04.8519275222023-03-06T12:26:09.438416733PT1M28S2LibreOfficeDev/7.6.0.0.alpha0$Linux_X86_64 LibreOffice_project/e29c2b96b1aaba0fef5c83de7be18448e5903d08 + + + false + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unknown Author + 2023-03-06T12:26:07 + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + + + + diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 42eaad1fb53a..eb1e94c54efb 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -318,6 +318,29 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf147347) assertXPath(pXmlDoc, "/
[Libreoffice-commits] core.git: vcl/source
vcl/source/bitmap/BitmapFastScaleFilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 593037e37d0db08138c5ef32041007b65052a55f
Author: Caolán McNamara
AuthorDate: Mon Mar 6 17:06:41 2023 +
Commit: Caolán McNamara
CommitDate: Mon Mar 6 21:17:31 2023 +
ofz#56734 Abrt
Change-Id: I0426c0d3a56789b2f2d24fc87ed9e88653700ca5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148358
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/bitmap/BitmapFastScaleFilter.cxx
b/vcl/source/bitmap/BitmapFastScaleFilter.cxx
index 5a9250400d99..b8a8617d606f 100644
--- a/vcl/source/bitmap/BitmapFastScaleFilter.cxx
+++ b/vcl/source/bitmap/BitmapFastScaleFilter.cxx
@@ -38,7 +38,7 @@ BitmapEx BitmapFastScaleFilter::execute(BitmapEx const&
rBitmapEx) const
SAL_INFO("vcl.gdi", "New width: " << nNewWidth << "\nNew height: " <<
nNewHeight);
-if (nNewWidth && nNewHeight)
+if (nNewWidth > 0 && nNewHeight > 0)
{
Bitmap::ScopedReadAccess pReadAcc(aBitmap);
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/fldvarpage.ui | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 3b995c0a73215b974437f63c1081daebf7ecec48 Author: Seth Chaiklin AuthorDate: Fri Feb 24 15:32:03 2023 + Commit: Seth Chaiklin CommitDate: Mon Mar 6 20:24:31 2023 + tdf#153243 update dialog for Insert/Edit number range type field - "Numbering by Chapter" -> "With Heading Number Before" - change "Level" to "Outline level" - revise tooltip and extended tip for "Outline Level" - add tooltip and revise extended tip for "Separator" Change-Id: Ifda841fc8cd05660a4a2aed1e2c7037224f858ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147637 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui index 67ce63bce6f9..16346835da59 100644 --- a/sw/uiconfig/swriter/ui/fldvarpage.ui +++ b/sw/uiconfig/swriter/ui/fldvarpage.ui @@ -402,7 +402,7 @@ True False -_Level: +_Outline level: True 0 @@ -429,13 +429,13 @@ True False -Choose the maximum outline level of the heading number to prepend to the displayed field. +Choose the heading number to prepend to the displayed field, where the number comes from the first prior heading with the selected outline level. If “None” is selected, then no heading number is displayed. None -Specify the number of outline levels to show before the displayed field. The heading numbers are taken from the heading immediately before with the specified outline level or less. If [None] is selected, then no heading number is displayed. +Choose the heading number to prepend to the displayed field. The number comes from the first prior heading with the selected outline level. For example, select “2” to use the heading number of the first prior heading with outline level 2. If “None” is selected, then no heading number is displayed. To use this option, heading numbers must be enabled. Use “Tools - Heading Numbering”. @@ -452,9 +452,10 @@ 2 . True +Enter the character to use as a separator between the heading number and the field number. -Type the character to use as a separator between the heading or chapter levels and the field. +Enter the character to use as a separator between the heading number and the field number. @@ -469,7 +470,7 @@ True False -Numbering by Chapter +With Heading Number Before True 0
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - cui/qa
cui/qa/uitest/dialogs/macroselectordlg.py | 29 ++---
1 file changed, 18 insertions(+), 11 deletions(-)
New commits:
commit 97766e9a67f5f36cd824bdbfab290177b3d5a05a
Author: Xisco Fauli
AuthorDate: Mon Feb 20 16:00:03 2023 +0100
Commit: Andras Timar
CommitDate: Mon Mar 6 20:14:10 2023 +
fix build tests: cui: rework uitest to work with --without-java
This fixes make UITest_cui_dialogs on Ubuntu 20.04/gcc 9.4.0.
Change-Id: I6ed187f515b47b7e54ed85c08ee9523f1b777575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147335
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148361
Reviewed-by: Justin Luth
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cui/qa/uitest/dialogs/macroselectordlg.py
b/cui/qa/uitest/dialogs/macroselectordlg.py
index cb0d1928ba46..96ba11a2d888 100644
--- a/cui/qa/uitest/dialogs/macroselectordlg.py
+++ b/cui/qa/uitest/dialogs/macroselectordlg.py
@@ -9,29 +9,36 @@ from uitest.uihelper.common import get_state_as_dict
class tdf145978(UITestCase):
def test_tdf145978(self):
-with self.ui_test.execute_dialog_through_command(".uno:RunMacro",
close_button="") as xDialog:
+with self.ui_test.execute_dialog_through_command(".uno:RunMacro") as
xDialog:
xCategoriesTree = xDialog.getChild("categories")
xCategoriesTreeEntry = xCategoriesTree.getChild('1') #Application
Macros
xCategoriesTreeEntry.executeAction("EXPAND", tuple())
-xCategoriesTreeEntry = xCategoriesTreeEntry.getChild('8')
#HelloWorld
-xCategoriesTreeEntry.executeAction("SELECT", tuple())
-aCategoriesTreeEntryText =
get_state_as_dict(xCategoriesTreeEntry)["Text"]
+xSubCategoriesTreeEntry = None
+for i in xCategoriesTreeEntry.getChildren():
+xChild = xCategoriesTreeEntry.getChild(i)
+if get_state_as_dict(xChild)["Text"] == "HelloWorld":
+xSubCategoriesTreeEntry = xChild
+break
+
+xSubCategoriesTreeEntry.executeAction("SELECT", tuple())
xCommandsTree = xDialog.getChild("commands")
-xCommandsTreeEntry = xCommandsTree.getChild('2') #HelloWorld Python
-xCommandsTreeEntry.executeAction("SELECT", tuple())
-aCommandsTreeEntryText =
get_state_as_dict(xCommandsTreeEntry)["Text"]
+xCommandsTreeEntry = None
+for i in xCommandsTree.getChildren():
+xChild = xCommandsTree.getChild(i)
+if get_state_as_dict(xChild)["Text"] == "HelloWorldPython":
+xCommandsTreeEntry = xChild
+break
-xOKBtn = xDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
+xCommandsTreeEntry.executeAction("SELECT", tuple())
#Verify the dialog reloads with previous run macro selected
with self.ui_test.execute_dialog_through_command(".uno:RunMacro") as
xDialog:
xTree = xDialog.getChild("categories")
-self.assertEqual(get_state_as_dict(xTree)["SelectEntryText"],
aCategoriesTreeEntryText)
+self.assertEqual("HelloWorld",
get_state_as_dict(xTree)["SelectEntryText"])
xTree = xDialog.getChild("commands")
-self.assertEqual(get_state_as_dict(xTree)["SelectEntryText"],
aCommandsTreeEntryText)
+self.assertEqual("HelloWorldPython",
get_state_as_dict(xTree)["SelectEntryText"])
# vim: set shiftwidth=4 softtabstop=4 expandtab:
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa
sw/qa/extras/tiledrendering/tiledrendering.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 24e8473094839ca43a4347f843c55cfd2e12cc67 Author: Justin Luth AuthorDate: Thu Mar 2 22:14:36 2023 -0500 Commit: Andras Timar CommitDate: Mon Mar 6 20:12:33 2023 + fix build tests: make CppunitTest_sw_tiledrendering The problem appears to be that the backporting was done from 22.05's patch instead of from master's patch. Change-Id: I2446fa190fc3b21def10df05a615664896ef8dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148151 Reviewed-by: Justin Luth Tested-by: Andras Timar diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 4799612d120d..d756998d470a 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -3868,7 +3868,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testAuthorField) xmlDocUniquePtr pXmlDoc = parseLayoutDump(); -assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText", sAuthor); +assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/SwParaPortion[1]/SwLineLayout[1]/SwFieldPortion[1]", "expand", sAuthor); } CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSavedAuthorField) @@ -3884,7 +3884,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSavedAuthorField) Scheduler::ProcessEventsToIdle(); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); -assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText", sAuthor); +assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/SwParaPortion[1]/SwLineLayout[1]/SwFieldPortion[1]", "expand", sAuthor); } CPPUNIT_PLUGIN_IMPLEMENT();
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/drwtrans.cxx | 10 +-
sc/source/ui/inc/drwtrans.hxx |4 ++--
sc/source/ui/inc/navipi.hxx|4 ++--
sc/source/ui/navipi/navipi.cxx | 20 ++--
4 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 8655fe6b9e19411f109c0dd75bfae0c734380e31
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:05:10 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 6 19:58:14 2023 +
no need to allocate these separately
they are all one or two words in size
Change-Id: If233dfb315c4acc63849f92e5340d5e6561b5b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148340
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index bdcddd616063..569fd6e0ab6a 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -167,7 +167,7 @@ ScDrawTransferObj::ScDrawTransferObj(
std::unique_ptr pClipModel, ScDo
aLabel = sTmp;
}
}
-m_pBookmark.reset( new INetBookmark( aAbs,
aLabel ) );
+m_oBookmark.emplace( aAbs, aLabel );
}
}
}
@@ -225,7 +225,7 @@ ScDrawTransferObj::~ScDrawTransferObj()
m_pModel.reset();
m_aDrawPersistRef.clear();// after the model
-m_pBookmark.reset();
+m_oBookmark.reset();
m_pDragSourceView.reset();
}
@@ -285,7 +285,7 @@ void ScDrawTransferObj::AddSupportedFormats()
AddFormat( SotClipboardFormatId::PNG );
AddFormat( SotClipboardFormatId::BITMAP );
}
-else if ( m_pBookmark ) // url button
+else if ( m_oBookmark ) // url button
{
// AddFormat( SotClipboardFormatId::EMBED_SOURCE );
AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
@@ -410,9 +410,9 @@ bool ScDrawTransferObj::GetData( const
css::datatransfer::DataFlavor& rFlavor, c
bOK = SetObject( pEmbObj, SCDRAWTRANS_TYPE_DOCUMENT, rFlavor );
}
}
-else if( m_pBookmark )
+else if( m_oBookmark )
{
-bOK = SetINetBookmark( *m_pBookmark, rFlavor );
+bOK = SetINetBookmark( *m_oBookmark, rFlavor );
}
}
return bOK;
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 49ec9e1e34d3..71213739dd2b 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -23,11 +23,11 @@
#include
#include
+#include
#include
class SdrModel;
class ScDocShell;
-class INetBookmark;
class SdrObject;
class SdrView;
class ScDrawView;
@@ -45,7 +45,7 @@ private:
// extracted from model in ctor:
Sizem_aSrcSize;
-std::unique_ptr m_pBookmark;
+std::optional m_oBookmark;
boolm_bGraphic;
boolm_bGrIsBit;
boolm_bOleObj;
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index ecfe71cfd06d..95de25f267da 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -25,12 +25,12 @@
#include
#include
#include
+#include
#include "content.hxx"
class SfxPoolItem;
class ScTabViewShell;
class ScViewData;
-class ScArea;
class ScScenarioWindow;
class ScNavigatorControllerItem;
class ScNavigatorDlg;
@@ -114,7 +114,7 @@ private:
OUStringaStrHidden;
OUStringaStrActiveWin;
-std::unique_ptr pMarkArea;
+std::optional moMarkArea;
ScViewData* pViewData;
NavListMode eListMode;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6340c1a80f33..a5816dc7c045 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -464,7 +464,7 @@ ScNavigatorDlg::~ScNavigatorDlg()
for (auto & p : mvBoundItems)
p.reset();
-pMarkArea.reset();
+moMarkArea.reset();
EndListening( *(SfxGetpApp()) );
EndListening( rBindings );
@@ -811,7 +811,7 @@ void ScNavigatorDlg::SetListMode(NavListMode eMode)
}
}
-if (pMarkArea)
+if (moMarkArea)
UnmarkDataArea();
}
@@ -894,16 +894,16 @@ void ScNavigatorDlg::MarkDataArea()
if ( !pViewSh )
return;
-if ( !pMarkArea )
-pMarkArea.reset( new ScArea );
+if ( !moMarkArea )
+moMarkArea.emplace();
pViewSh->MarkDataArea();
const ScRange& aMarkRange =
pViewSh->GetViewData().GetMarkData().GetMarkArea();
-pMarkArea->nColStart = aMarkRange.aStart.Col();
-pMarkArea->nRowStart = aMarkRange.aStart.Row();
-pMarkArea->nColEnd = aMarkRange.aEnd.Col();
-pMarkArea->nRowEnd = aMarkRange.aEnd.Row();
-
[Libreoffice-commits] core.git: 2 commits - forms/source lotuswordpro/inc lotuswordpro/source
forms/source/component/clickableimage.cxx | 14 +++---
forms/source/component/clickableimage.hxx |5 ++---
forms/source/helper/formnavigation.cxx | 10 +-
forms/source/inc/formnavigation.hxx|6 +++---
lotuswordpro/inc/lwpfoundry.hxx|5 ++---
lotuswordpro/source/filter/lwpdoc.cxx |6 +++---
lotuswordpro/source/filter/lwpdoc.hxx |3 ++-
lotuswordpro/source/filter/lwpfoundry.cxx |1 -
lotuswordpro/source/filter/lwpfribptr.cxx |2 +-
lotuswordpro/source/filter/lwplayout.cxx |3 +--
lotuswordpro/source/filter/lwplayout.hxx |2 +-
lotuswordpro/source/filter/lwppara.cxx |2 +-
lotuswordpro/source/filter/lwpsilverbullet.cxx |3 +--
lotuswordpro/source/filter/lwpsilverbullet.hxx |2 +-
14 files changed, 30 insertions(+), 34 deletions(-)
New commits:
commit bb92647934cd4c925e0db13c7ab78fdd8eec69ec
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:05:52 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 6 19:58:02 2023 +
no need to allocate these separately
they are all one or two words in size
Change-Id: Idc76cb87d1dae7ef245f327dc4afebaf71190f6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148342
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index 03329382f5c0..e1f6f068faf0 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -85,10 +85,10 @@ namespace frm
OClickableImageBaseControl::OClickableImageBaseControl(const
Reference& _rxFactory, const OUString& _aService)
:OControl(_rxFactory, _aService)
,m_aSubmissionVetoListeners( m_aMutex )
+,m_aFeatureInterception( _rxFactory )
,m_aApproveActionListeners( m_aMutex )
,m_aActionListeners( m_aMutex )
{
-m_pFeatureInterception.reset( new ControlFeatureInterception(
_rxFactory ) );
}
@@ -129,13 +129,13 @@ namespace frm
void SAL_CALL
OClickableImageBaseControl::registerDispatchProviderInterceptor( const
Reference< XDispatchProviderInterceptor >& _rxInterceptor )
{
-m_pFeatureInterception->registerDispatchProviderInterceptor(
_rxInterceptor );
+m_aFeatureInterception.registerDispatchProviderInterceptor(
_rxInterceptor );
}
void SAL_CALL
OClickableImageBaseControl::releaseDispatchProviderInterceptor( const
Reference< XDispatchProviderInterceptor >& _rxInterceptor )
{
-m_pFeatureInterception->releaseDispatchProviderInterceptor(
_rxInterceptor );
+m_aFeatureInterception.releaseDispatchProviderInterceptor(
_rxInterceptor );
}
// OComponentHelper
@@ -146,7 +146,7 @@ namespace frm
m_aApproveActionListeners.disposeAndClear( aEvent );
m_aActionListeners.disposeAndClear( aEvent );
m_aSubmissionVetoListeners.disposeAndClear( aEvent );
-m_pFeatureInterception->dispose();
+m_aFeatureInterception.dispose();
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -234,7 +234,7 @@ namespace frm
case FormButtonType_SUBMIT:
{
// if some outer component can provide an interaction handler,
use it
-Reference< XInteractionHandler > xHandler(
m_pFeatureInterception->queryDispatch( "private:/InteractionHandler" ),
UNO_QUERY );
+Reference< XInteractionHandler > xHandler(
m_aFeatureInterception.queryDispatch( "private:/InteractionHandler" ),
UNO_QUERY );
try
{
implSubmit( rEvt, xHandler );
@@ -292,7 +292,7 @@ namespace frm
xSet->getPropertyValue(PROPERTY_DISPATCHURLINTERNAL) >>=
bDispatchUrlInternal;
if ( bDispatchUrlInternal )
{
-
m_pFeatureInterception->getTransformer().parseSmartWithProtocol( aURL,
INET_FILE_SCHEME );
+
m_aFeatureInterception.getTransformer().parseSmartWithProtocol( aURL,
INET_FILE_SCHEME );
OUString aTargetFrame;
xSet->getPropertyValue(PROPERTY_TARGET_FRAME) >>=
aTargetFrame;
@@ -308,7 +308,7 @@ namespace frm
}
else
{
-URL aHyperLink =
m_pFeatureInterception->getTransformer().getStrictURL( ".uno:OpenHyperlink" );
+URL aHyperLink =
m_aFeatureInterception.getTransformer().getStrictURL( ".uno:OpenHyperlink" );
Reference< XDispatch > xDisp = Reference<
XDispatchProvider > (xFrame,UNO_QUERY_THROW)->queryDispatch(aHyperLink,
OUString() , 0);
diff --git a/forms/source/component/clickableimage.hxx
b/forms/source/component/clickableimage.hxx
index 48b511c86a5f..2ec7b921224b 100644
--- a/forms/source/component/clickableimage.h
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/QtAccessibleWidget.cxx | 52 +
1 file changed, 7 insertions(+), 45 deletions(-)
New commits:
commit 02266202e5e5a97d3c97a3d502c59db884a99901
Author: Michael Weghorn
AuthorDate: Mon Mar 6 15:52:44 2023 +0100
Commit: Michael Weghorn
CommitDate: Mon Mar 6 19:48:09 2023 +
qt a11y: Handle all QAccessible::Relation flags
The bits/flags in `QAccessible::Relation` can be set in
any combination, while the previous code would only properly
handle the case that `QAccessible::AllRelations` is set.
This would e.g. mean that
QtAccessibleWidget::relations(QAccessible::FlowsTo |
QAccessible::FlowsFrom)
would not return both relations as it should.
The previous handling of the case that just a single flag is set
also looks odd, since it would use the sal_Int16 value of the
UNO relation as an index into the set of relations...
Fix this by always iterating over all relations and
applying the filter in `lcl_appendRelation` (only
append those that match the filter).
(At least for AT-SPI, the previous handling should not have
caused any issues in practice, since Qt's AT-SPI bridge always
passes `QAccessible::AllRelations` from what I can see.)
Change-Id: Icc21ac252db026f607fe8d6041252916b1d9e3a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148352
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index 13823006b6cd..237b2db64735 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -251,42 +251,12 @@ QAccessible::Relation lcl_matchUnoRelation(short
relationType)
}
}
-short lcl_matchQtRelation(QAccessible::Relation relationType)
-{
-// Qt semantics is the other way around
-switch (relationType)
-{
-case QAccessible::Controlled:
-return AccessibleRelationType::CONTROLLER_FOR;
-case QAccessible::Controller:
-return AccessibleRelationType::CONTROLLED_BY;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-case QAccessible::DescriptionFor:
-return AccessibleRelationType::DESCRIBED_BY;
-case QAccessible::FlowsFrom:
-return AccessibleRelationType::CONTENT_FLOWS_TO;
-case QAccessible::FlowsTo:
-return AccessibleRelationType::CONTENT_FLOWS_FROM;
-#endif
-case QAccessible::Labelled:
-return AccessibleRelationType::LABEL_FOR;
-case QAccessible::Label:
-return AccessibleRelationType::LABELED_BY;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-case QAccessible::Described:
-#endif
-default:
-SAL_WARN("vcl.qt", "Unmatched relation: " << relationType);
-}
-return 0;
-}
-
void lcl_appendRelation(QVector>* relations,
-AccessibleRelation aRelation)
+AccessibleRelation aRelation, QAccessible::Relation
match)
{
QAccessible::Relation aQRelation =
lcl_matchUnoRelation(aRelation.RelationType);
-// skip in case there's no matching Qt relation
-if (!(aQRelation & QAccessible::AllRelations))
+// skip in case there's no Qt relation matching the filter
+if (!(aQRelation & match))
return;
sal_uInt32 nTargetCount = aRelation.TargetSet.getLength();
@@ -313,19 +283,11 @@ QtAccessibleWidget::relations(QAccessible::Relation
match) const
Reference xRelationSet =
xAc->getAccessibleRelationSet();
if (xRelationSet.is())
{
-if (match == QAccessible::AllRelations)
-{
-int count = xRelationSet->getRelationCount();
-for (int i = 0; i < count; i++)
-{
-AccessibleRelation aRelation = xRelationSet->getRelation(i);
-lcl_appendRelation(&relations, aRelation);
-}
-}
-else
+int count = xRelationSet->getRelationCount();
+for (int i = 0; i < count; i++)
{
-AccessibleRelation aRelation =
xRelationSet->getRelation(lcl_matchQtRelation(match));
-lcl_appendRelation(&relations, aRelation);
+AccessibleRelation aRelation = xRelationSet->getRelation(i);
+lcl_appendRelation(&relations, aRelation, match);
}
}
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr3.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 79aed20c3d48b2be5cdee5de42559649db0eb5fa
Author: Eike Rathke
AuthorDate: Mon Mar 6 00:34:29 2023 +0100
Commit: Eike Rathke
CommitDate: Mon Mar 6 17:53:12 2023 +
For LARGE() the rank is to be rounded up, not down
See
https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part4-formula/OpenDocument-v1.3-os-part4-formula.html#LARGE
vs
https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part4-formula/OpenDocument-v1.3-os-part4-formula.html#SMALL
Change-Id: Ib2c9aa11c41da5ce7f9872a949017035a7b70758
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148289
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 578ff4584eb3..0153ee612e1c 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3650,8 +3650,8 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
std::vector aRankArray;
aRankArray.reserve(nRankArraySize);
std::transform(aArray.begin(), aArray.end(),
std::back_inserter(aRankArray),
-[](double f) {
-f = rtl::math::approxFloor(f);
+[bSmall](double f) {
+f = (bSmall ? rtl::math::approxFloor(f) :
rtl::math::approxCeil(f));
// Valid ranks are >= 1.
if (f < 1.0 || !o3tl::convertsToAtMost(f,
std::numeric_limits::max()))
return static_cast(0);
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf153819.fodt | 174 ++
sw/qa/extras/uiwriter/uiwriter8.cxx | 23 +++
sw/source/core/docnode/ndtbl.cxx |7 -
3 files changed, 202 insertions(+), 2 deletions(-)
New commits:
commit 317ed3e81a5aa7826176a5122c2d8ea76aa0fb37
Author: László Németh
AuthorDate: Mon Mar 6 14:02:02 2023 +0100
Commit: László Németh
CommitDate: Mon Mar 6 17:47:22 2023 +
tdf#153819 sw: fix crashing MakeFramesForAdjacentContentNode()
In Hide Changes mode, copying cells before a tracked deleted
table crashed in SwTableNode::MakeFramesForAdjacentContentNode().
Regression from commit 794fd10af7361d5a64a0f8bfbe5c8b5f308617a5
"tdf#147347 sw: hide deleted table at deletion in Hide Changes".
Change-Id: I3ac070d35006e61b01a065359431e302e6974e17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148344
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/uiwriter/data/tdf153819.fodt
b/sw/qa/extras/uiwriter/data/tdf153819.fodt
new file mode 100644
index ..910807825204
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf153819.fodt
@@ -0,0 +1,174 @@
+
+
+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">
+
2023-03-06T12:23:04.8519275222023-03-06T12:26:09.438416733PT1M28S2LibreOfficeDev/7.6.0.0.alpha0$Linux_X86_64
LibreOffice_project/e29c2b96b1aaba0fef5c83de7be18448e5903d08
+
+
+ false
+
+
+
+
+ http://openoffice.org/2004/office";
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unknown Author
+ 2023-03-06T12:26:07
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ x
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx
b/sw/qa/extras/uiwriter/uiwriter8.cxx
index b37af6899df2..7c39bbacaa7a 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -302,6 +302,29 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf147347)
assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 2);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf153819)
+{
+// copy a table before a deleted table in Hide Changes mode
+cre
[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
include/svx/AccessibilityCheckDialog.hxx |1 +
svx/source/dialog/AccessibilityCheckDialog.cxx | 12 +++-
svx/uiconfig/ui/accessibilitycheckdialog.ui|4 +++-
svx/uiconfig/ui/accessibilitycheckentry.ui | 16 +---
4 files changed, 24 insertions(+), 9 deletions(-)
New commits:
commit 4a88c5840e022ca896ce26ce1dfde2db7fb7df29
Author: Caolán McNamara
AuthorDate: Thu Mar 2 17:15:06 2023 +0100
Commit: Caolán McNamara
CommitDate: Mon Mar 6 16:54:48 2023 +
tdf#148776 for scrolling set step size as height of a row
similar to FontFeaturesDialog.
FWIW gtk's viewport implementation automatically overwrites the step
size to be 10% of the visible height (and page size of 90% of the
visible height)
Change-Id: If356724a47b0a10069f129bed4a40cfdee57bfa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148138
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/AccessibilityCheckDialog.hxx
b/include/svx/AccessibilityCheckDialog.hxx
index f2e3c567351b..65b100064f87 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -45,6 +45,7 @@ private:
std::vector>
m_aAccessibilityCheckEntries;
// Controls
+std::unique_ptr m_xScrolledWindow;
std::unique_ptr m_xAccessibilityCheckBox;
std::unique_ptr m_xRescanBtn;
diff --git a/svx/source/dialog/AccessibilityCheckDialog.cxx
b/svx/source/dialog/AccessibilityCheckDialog.cxx
index ac34f7306da4..010f3af0bb81 100644
--- a/svx/source/dialog/AccessibilityCheckDialog.cxx
+++ b/svx/source/dialog/AccessibilityCheckDialog.cxx
@@ -25,9 +25,10 @@ AccessibilityCheckEntry::AccessibilityCheckEntry(
, m_pAccessibilityIssue(rAccessibilityIssue)
{
m_xLabel->set_label(m_pAccessibilityIssue->m_aIssueText);
+// lock in the height as including the button so all rows are the same
height
+m_xContainer->set_size_request(-1,
m_xContainer->get_preferred_size().Height());
m_xGotoButton->set_visible(m_pAccessibilityIssue->canGotoIssue());
m_xGotoButton->connect_clicked(LINK(this, AccessibilityCheckEntry,
GotoButtonClicked));
-m_xContainer->show();
}
IMPL_LINK_NOARG(AccessibilityCheckEntry, GotoButtonClicked, weld::Button&,
void)
@@ -42,6 +43,7 @@ AccessibilityCheckDialog::AccessibilityCheckDialog(
"AccessibilityCheckDialog")
, m_aIssueCollection(std::move(aIssueCollection))
, m_getIssueCollection(getIssueCollection)
+, m_xScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow"))
, m_xAccessibilityCheckBox(m_xBuilder->weld_box("accessibilityCheckBox"))
, m_xRescanBtn(m_xBuilder->weld_button("rescan"))
{
@@ -62,6 +64,14 @@ void AccessibilityCheckDialog::populateIssues()
m_xAccessibilityCheckBox->reorder_child(xEntry->get_widget(), i++);
m_aAccessibilityCheckEntries.push_back(std::move(xEntry));
}
+
+if (!m_aAccessibilityCheckEntries.empty())
+{
+auto nRowHeight
+=
m_aAccessibilityCheckEntries.back()->get_widget()->get_preferred_size().Height();
+// 6 is the spacing set in the .ui
+m_xScrolledWindow->vadjustment_set_step_increment(nRowHeight + 6);
+}
}
IMPL_LINK_NOARG(AccessibilityCheckDialog, RescanButtonClicked, weld::Button&,
void)
diff --git a/svx/uiconfig/ui/accessibilitycheckdialog.ui
b/svx/uiconfig/ui/accessibilitycheckdialog.ui
index fecab2fbb31f..b19a1e35e738 100644
--- a/svx/uiconfig/ui/accessibilitycheckdialog.ui
+++ b/svx/uiconfig/ui/accessibilitycheckdialog.ui
@@ -97,7 +97,7 @@
True
vertical
-
+
True
True
True
@@ -114,6 +114,8 @@
True
False
vertical
+6
+True
diff --git a/svx/uiconfig/ui/accessibilitycheckentry.ui
b/svx/uiconfig/ui/accessibilitycheckentry.ui
index 0fe33322b11f..3d60179f16b5 100644
--- a/svx/uiconfig/ui/accessibilitycheckentry.ui
+++ b/svx/uiconfig/ui/accessibilitycheckentry.ui
@@ -1,20 +1,22 @@
-
+
True
-False
-3
+False
+3
+3
+6
True
-False
+False
True
True
0
-
+
static
@@ -29,8 +31,8 @@
Go to
Issue
True
-True
-True
+True
+True
False
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/queryiter.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f60a48af7df68c8704154297eca5b7159f839ffc
Author: Caolán McNamara
AuthorDate: Sun Mar 5 20:42:54 2023 +
Commit: Caolán McNamara
CommitDate: Mon Mar 6 16:53:24 2023 +
these can be const
Change-Id: I8601beb007f1e0b043e2217e5dfe8b40925335ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148313
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/core/data/queryiter.cxx
b/sc/source/core/data/queryiter.cxx
index 5d8a3695f7d1..35e8e2a85169 100644
--- a/sc/source/core/data/queryiter.cxx
+++ b/sc/source/core/data/queryiter.cxx
@@ -122,7 +122,7 @@ void ScQueryCellIteratorBase< accessType, queryType
>::PerformQuery()
bAdvanceQuery = true;
}
-ScColumn* pCol = &(rDoc.maTabs[nTab])->aCol[nCol];
+const ScColumn* pCol = &(rDoc.maTabs[nTab])->aCol[nCol];
while (true)
{
bool bNextColumn = maCurPos.first == pCol->maCells.end();
@@ -347,7 +347,7 @@ bool ScQueryCellIteratorBase< accessType, queryType
>::BinarySearch( SCCOL col,
if (nCol >= rDoc.maTabs[nTab]->GetAllocatedColumnsCount())
return false;
-ScColumn* pCol = &(rDoc.maTabs[nTab])->aCol[nCol];
+const ScColumn* pCol = &(rDoc.maTabs[nTab])->aCol[nCol];
if (pCol->IsEmptyData())
return false;
[Libreoffice-commits] core.git: basegfx/source sax/source ucb/source vcl/source vcl/unx
basegfx/source/polygon/b2dpolygontools.cxx|1 -
basegfx/source/polygon/b3dpolygontools.cxx|1 -
sax/source/fastparser/fastparser.cxx |2 +-
ucb/source/cacher/contentresultsetwrapper.cxx |3 ---
vcl/source/filter/ipict/ipict.cxx |2 +-
vcl/source/outdev/bitmapex.cxx|2 --
vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx |2 +-
7 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 363512d39ba1543b7e91af1d59dadb5378da7649
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:09:25 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 6 16:48:15 2023 +
clang-tidy dead-store
Change-Id: I842114880c43dfcc342b6255b7d17befb905bccb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148345
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index 03f5299ca505..900ab735a1e0 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -1255,7 +1255,6 @@ namespace basegfx::utils
// to enlarge these as needed
const double fFactor(fCandidateLength / fAllowedLength);
std::for_each(aDotDashArray.begin(), aDotDashArray.end(),
[&fFactor](double &f){ f *= fFactor; });
-fDotDashLength *= fFactor;
}
// prepare current edge's start
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx
b/basegfx/source/polygon/b3dpolygontools.cxx
index a1f65bef2f48..3b3779d7460a 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -219,7 +219,6 @@ namespace basegfx::utils
// to enlarge these as needed
const double fFactor(fCandidateLength / fAllowedLength);
std::for_each(aDotDashArray.begin(), aDotDashArray.end(),
[&fFactor](double &f){ f *= fFactor; });
-fDotDashLength *= fFactor;
}
// prepare current edge's start
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index aae3c1162d47..06e2fb1e3e92 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1565,7 +1565,7 @@ static void NormalizeURI( OUString& rName )
// try OASIS + W3 URI normalization
bool bSuccess = NormalizeOasisURN( rName );
if( ! bSuccess )
-bSuccess = NormalizeW3URI( rName );
+NormalizeW3URI( rName );
}
constexpr OUStringLiteral XML_URI_W3_PREFIX(u"http://www.w3.org/";);
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx
b/ucb/source/cacher/contentresultsetwrapper.cxx
index f6e7c0058a65..72388222f12d 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -275,10 +275,7 @@ void SAL_CALL ContentResultSetWrapper::dispose()
}
if (isCleared)
-{
aGuard.lock();
-isCleared = false;
-}
if( m_aDisposeEventListeners.getLength(aGuard) )
{
EventObject aEvt;
diff --git a/vcl/source/filter/ipict/ipict.cxx
b/vcl/source/filter/ipict/ipict.cxx
index fcdef08e3592..2d9be6f8cd9c 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -783,7 +783,7 @@ sal_uInt64 PictReader::ReadPixMapEtc( BitmapEx &rBitmap,
bool bBaseAddr, bool bC
else
{
nRowBytes &= 0x3fff;
-nPixelSize = nCmpCount = nCmpSize = 1;
+nPixelSize = nCmpCount = 1;
nDataSize += 10;
aPalette.resize(2);
aPalette[0] = Color(0xff, 0xff, 0xff);
diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx
index 57851f943f51..9935a18bdee6 100644
--- a/vcl/source/outdev/bitmapex.cxx
+++ b/vcl/source/outdev/bitmapex.cxx
@@ -522,8 +522,6 @@ void OutputDevice::DrawTransformedBitmapEx(
aAlpha.BlendWith( bitmapEx.GetAlphaMask());
bitmapEx = BitmapEx( bitmapEx.GetBitmap(), aAlpha );
}
-if(rtl::math::approxEqual( fAlpha, 1.0 ))
-fAlpha = 1.0; // avoid the need for approxEqual in backends
// If the backend's implementation is known to not need any optimizations
here, pass to it directly.
// With most backends it's more performant to try to simplify to
DrawBitmapEx() first.
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index 9afb55f0eb21..36278074c446 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -1677,7 +1677,7 @@ void SalGtkFilePicker::impl_initialize(GtkWidget*
pParentWidget, sal_Int16 templ
GtkFileChooserAction eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
OString sOpen = getOpenText();
OString sSave = getSaveText();
-const gchar *first_button_text = sOpen.getStr();
+const gchar *first_button_text;
SolarMutexGuard
[Libreoffice-commits] core.git: unoxml/source
unoxml/source/dom/attr.cxx | 18 +-
unoxml/source/dom/attr.hxx |3 ++-
unoxml/source/dom/document.cxx |2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit c0f69aa125081c31ca2b79e9e29e13bc91a21be7
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:03:55 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 6 16:28:51 2023 +
no need to allocate these separately
they are all one or two words in size
Change-Id: I9bbe80a1be4d138f00d864352896d61d0df6366d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148337
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 4988aa4211ec..dd974d910edb 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -46,14 +46,14 @@ namespace DOM
xmlNsPtr CAttr::GetNamespace(xmlNodePtr const pNode)
{
-if (!m_pNamespace)
+if (!m_oNamespace)
{
return nullptr;
}
xmlChar const*const pUri(reinterpret_cast(
-m_pNamespace->first.getStr()));
+m_oNamespace->first.getStr()));
xmlChar const*const pPrefix(reinterpret_cast(
-m_pNamespace->second.getStr()));
+m_oNamespace->second.getStr()));
xmlNsPtr pNs = xmlSearchNs(pNode->doc, pNode, pPrefix);
if (pNs && (0 != xmlStrcmp(pNs->href, pUri))) {
return pNs;
@@ -214,10 +214,10 @@ namespace DOM
if (!m_aNodePtr) { return; }
-if (m_pNamespace)
+if (m_oNamespace)
{
OSL_ASSERT(!m_aNodePtr->parent);
-m_pNamespace->second =
+m_oNamespace->second =
OUStringToOString(prefix, RTL_TEXTENCODING_UTF8);
}
else
@@ -232,11 +232,11 @@ namespace DOM
if (!m_aNodePtr) { return OUString(); }
-if (m_pNamespace)
+if (m_oNamespace)
{
OSL_ASSERT(!m_aNodePtr->parent);
OUString const ret(OStringToOUString(
-m_pNamespace->second, RTL_TEXTENCODING_UTF8));
+m_oNamespace->second, RTL_TEXTENCODING_UTF8));
return ret;
}
else
@@ -251,11 +251,11 @@ namespace DOM
if (!m_aNodePtr) { return OUString(); }
-if (m_pNamespace)
+if (m_oNamespace)
{
OSL_ASSERT(!m_aNodePtr->parent);
OUString const ret(OStringToOUString(
-m_pNamespace->first, RTL_TEXTENCODING_UTF8));
+m_oNamespace->first, RTL_TEXTENCODING_UTF8));
return ret;
}
else
diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx
index f30b25896158..5c32968e2860 100644
--- a/unoxml/source/dom/attr.hxx
+++ b/unoxml/source/dom/attr.hxx
@@ -20,6 +20,7 @@
#pragma once
#include
+#include
#include
@@ -43,7 +44,7 @@ namespace DOM
friend class CDocument;
xmlAttrPtr m_aAttrPtr;
-::std::unique_ptr< stringpair_t > m_pNamespace;
+::std::optional< stringpair_t > m_oNamespace;
CAttr(CDocument const& rDocument, ::osl::Mutex const& rMutex,
xmlAttrPtr const pAttr);
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 413f764815e5..cb48bd1635f8 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -456,7 +456,7 @@ namespace DOM
reinterpret_cast(pAttr)).get()));
if (!pCAttr.is()) { throw RuntimeException(); }
// store the namespace data!
-pCAttr->m_pNamespace.reset( new stringpair_t(oUri, oPrefix) );
+pCAttr->m_oNamespace.emplace( oUri, oPrefix );
pCAttr->m_bUnlinked = true;
return pCAttr;
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/svdata.hxx|7 ---
vcl/source/app/svmain.cxx |4 ++--
vcl/source/treelist/transfer2.cxx | 13 +
vcl/source/window/layout.cxx | 10 +-
4 files changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 6c2542306bcc7caaab947664f252265058964fc2
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:03:18 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 6 15:51:09 2023 +
no need to allocate these separately
they are all one or two words in size
Change-Id: Iec508d917d05b3ca762723bdc99be8c68b974aaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148336
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 06d0aeb9b9af..c514df09422c 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -42,6 +43,7 @@
#include "displayconnectiondispatch.hxx"
#include
+#include
#include
#include
#include "ControlCacheKey.hxx"
@@ -72,7 +74,6 @@ class Timer;
class AutoTimer;
class Idle;
class Help;
-class Image;
class PopupMenu;
class Application;
class OutputDevice;
@@ -278,8 +279,8 @@ struct ImplSVCtrlData
{
std::vector maCheckImgList; // ImageList for
CheckBoxes
std::vector maRadioImgList; // ImageList for
RadioButtons
-std::unique_ptr mpDisclosurePlus;
-std::unique_ptr mpDisclosureMinus;
+std::optionalmoDisclosurePlus;
+std::optionalmoDisclosureMinus;
ImplTBDragMgr* mpTBDragMgr = nullptr; // DragMgr for
ToolBox
sal_uInt16 mnCheckStyle = 0; // CheckBox-Style
for ImageList-Update
sal_uInt16 mnRadioStyle = 0; // Radio-Style for
ImageList-Update
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 7c5505f364cb..571be29579bc 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -486,8 +486,8 @@ void DeInitVCL()
pSVData->mpWinData->maMsgBoxImgList.clear();
pSVData->maCtrlData.maCheckImgList.clear();
pSVData->maCtrlData.maRadioImgList.clear();
-pSVData->maCtrlData.mpDisclosurePlus.reset();
-pSVData->maCtrlData.mpDisclosureMinus.reset();
+pSVData->maCtrlData.moDisclosurePlus.reset();
+pSVData->maCtrlData.moDisclosureMinus.reset();
pSVData->mpDefaultWin.disposeAndClear();
#if defined _WIN32
diff --git a/vcl/source/treelist/transfer2.cxx
b/vcl/source/treelist/transfer2.cxx
index 05183b9c0485..1c53be66f1c6 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -318,7 +318,7 @@ struct TransferDataContainer_Impl
{
std::vector< TDataCntnrEntry_Impl > aFmtList;
Link aFinishedLnk;
-std::unique_ptr pBookmk;
+std::optional moBookmk;
TransferDataContainer_Impl()
{
@@ -368,8 +368,8 @@ bool TransferDataContainer::GetData(
case SotClipboardFormatId::FILECONTENT:
case SotClipboardFormatId::FILEGRPDESCRIPTOR:
case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
-if( pImpl->pBookmk )
-bFnd = SetINetBookmark( *pImpl->pBookmk, rFlavor );
+if( pImpl->moBookmk )
+bFnd = SetINetBookmark( *pImpl->moBookmk, rFlavor );
break;
default: break;
@@ -381,10 +381,7 @@ bool TransferDataContainer::GetData(
void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk )
{
-if( !pImpl->pBookmk )
-pImpl->pBookmk.reset( new INetBookmark( rBkmk ) );
-else
-*pImpl->pBookmk = rBkmk;
+pImpl->moBookmk = rBkmk;
AddFormat( SotClipboardFormatId::STRING );
AddFormat( SotClipboardFormatId::SOLK );
@@ -441,7 +438,7 @@ void TransferDataContainer::CopyString( const OUString&
rStr )
bool TransferDataContainer::HasAnyData() const
{
return !pImpl->aFmtList.empty() ||
-nullptr != pImpl->pBookmk;
+pImpl->moBookmk.has_value();
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index a650a0bf92ab..881d3e6ed465 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1594,13 +1594,13 @@ class DisclosureButton final : public CheckBox
return;
ImplSVCtrlData& rCtrlData(ImplGetSVData()->maCtrlData);
-if (!rCtrlData.mpDisclosurePlus)
-rCtrlData.mpDisclosurePlus.reset(new Image(StockImage::Yes,
SV_DISCLOSURE_PLUS));
-if (!rCtrlData.mpDisclosureMinus)
-rCtrlData.mpDisclosureMinus.reset(new Image(StockImage::Yes,
SV_DISCLOSURE_MINUS));
+if (!rCtrlData.moDisclosurePlus)
+rCtrlData.moDisclosurePlus.emplace(StockImage::Yes,
SV_DISCLOSURE_PLUS);
+if (!rCtrlData.moDisclosureMinus)
+rCtrlData.moDisclosureMinus.emplace(StockImage::Yes,
SV_DISCLOSURE_MINUS);
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/tdf153924.ods |binary
sc/qa/unit/subsequent_filters_test4.cxx | 17 +
2 files changed, 17 insertions(+)
New commits:
commit d951f9cafbc4674e4bf6fc174f5fd28e451c59ae
Author: Xisco Fauli
AuthorDate: Mon Mar 6 11:14:14 2023 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 6 15:10:02 2023 +
tdf#153924: sc_subsequent_filters_test4: Add unittest
Change-Id: I32e07ab36b2ee3873cf6fc6d9831be9b772a29e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148300
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/tdf153924.ods
b/sc/qa/unit/data/ods/tdf153924.ods
new file mode 100644
index ..1373ded691ef
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf153924.ods differ
diff --git a/sc/qa/unit/subsequent_filters_test4.cxx
b/sc/qa/unit/subsequent_filters_test4.cxx
index c1a0f9c17e88..ec22e998d611 100644
--- a/sc/qa/unit/subsequent_filters_test4.cxx
+++ b/sc/qa/unit/subsequent_filters_test4.cxx
@@ -1487,6 +1487,23 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4,
testSharedFormulaRefUpdateXLSX)
}
}
+CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testTdf153924)
+{
+createScDoc("ods/tdf153924.ods");
+ScDocument* pDoc = getScDoc();
+
+double aCheck[6][2] = { { 148.0, 195.0 }, { 144.0, 200.0 }, { 151.0, 192.0
},
+{ 154.0, 189.0 }, { 165.0, 183.0 }, { 0.0, 0.0 } };
+for (size_t i = 0; i < 6; ++i)
+{
+for (size_t j = 0; j < 2; ++j)
+{
+// Without the fix in place, the output from LARGE()/SMALL() would
have been 0
+CPPUNIT_ASSERT_EQUAL(aCheck[i][j], pDoc->GetValue(ScAddress(j, i +
8, 0)));
+}
+}
+}
+
CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testSheetNamesXLSX)
{
createScDoc("xlsx/sheet-names.xlsx");
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - linguistic/source
linguistic/source/gciterator.cxx | 49 ++-
linguistic/source/gciterator.hxx | 14 ---
2 files changed, 44 insertions(+), 19 deletions(-)
New commits:
commit 21db28345999ee840542532224d67f1f2527f16e
Author: Mike Kaganski
AuthorDate: Sun Mar 5 11:06:29 2023 +0300
Commit: Xisco Fauli
CommitDate: Mon Mar 6 14:49:14 2023 +
tdf#152459: fallback to language-only when looking for grammar checker
LanguageTool registers itself for languages like "en-US", "es-AR", "de-DE";
but also for generic "en", "es", "de". When the requested language, like
"fr-CH" or "es-PH", is not found in the registered grammar checkers, the
fallback strings will be attempted.
Change-Id: Id460db8d378f246ea98191d22bdb3537fd1aee1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148201
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit e7ae5b4793fb74309d5d1f32c3c696d07071d676)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148232
Reviewed-by: Xisco Fauli
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 581f356f215e..993b0258db32 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -488,8 +488,30 @@ void GrammarCheckingIterator::ProcessResult(
}
+std::pair>
+GrammarCheckingIterator::getServiceForLocale(const lang::Locale& rLocale) const
+{
+if (!rLocale.Language.isEmpty())
+{
+const OUString sBcp47 = LanguageTag::convertToBcp47(rLocale, false);
+GCImplNames_t::const_iterator
aLangIt(m_aGCImplNamesByLang.find(sBcp47));
+if (aLangIt != m_aGCImplNamesByLang.end())
+return { aLangIt->second, {} };
+
+for (const auto& sFallbackBcp47 :
LanguageTag(rLocale).getFallbackStrings(false))
+{
+aLangIt = m_aGCImplNamesByLang.find(sFallbackBcp47);
+if (aLangIt != m_aGCImplNamesByLang.end())
+return { aLangIt->second, sFallbackBcp47 };
+}
+}
+
+return {};
+}
+
+
uno::Reference< linguistic2::XProofreader >
GrammarCheckingIterator::GetGrammarChecker(
-const lang::Locale &rLocale )
+lang::Locale &rLocale )
{
uno::Reference< linguistic2::XProofreader > xRes;
@@ -503,11 +525,11 @@ uno::Reference< linguistic2::XProofreader >
GrammarCheckingIterator::GetGrammarC
m_bGCServicesChecked = true;
}
-const LanguageType nLang = LanguageTag::convertToLanguageType( rLocale,
false);
-GCImplNames_t::const_iterator aLangIt( m_aGCImplNamesByLang.find( nLang )
);
-if (aLangIt != m_aGCImplNamesByLang.end()) // matching configured
language found?
+if (const auto& [aSvcImplName, oFallbackBcp47] =
getServiceForLocale(rLocale);
+!aSvcImplName.isEmpty()) // matching configured language found?
{
-OUString aSvcImplName( aLangIt->second );
+if (oFallbackBcp47)
+rLocale = LanguageTag::convertToLocale(*oFallbackBcp47, false);
GCReferences_t::const_iterator aImplNameIt(
m_aGCReferencesByService.find( aSvcImplName ) );
if (aImplNameIt != m_aGCReferencesByService.end()) // matching impl
name found?
{
@@ -1086,8 +1108,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl()
{
// only the first entry is used, there should be only one
grammar checker per language
const OUString aImplName( aImplNames[0] );
-const LanguageType nLang =
LanguageTag::convertToLanguageType( rElementName );
-aTmpGCImplNamesByLang[ nLang ] = aImplName;
+aTmpGCImplNamesByLang[rElementName] = aImplName;
}
}
else
@@ -1135,17 +1156,17 @@ void GrammarCheckingIterator::SetServiceList(
{
::osl::Guard< ::osl::Mutex > aGuard( MyMutex() );
-LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
+OUString sBcp47 = LanguageTag::convertToBcp47(rLocale, false);
OUString aImplName;
if (rSvcImplNames.hasElements())
aImplName = rSvcImplNames[0]; // there is only one grammar checker
per language
-if (!LinguIsUnspecified(nLanguage) && nLanguage != LANGUAGE_DONTKNOW)
+if (!LinguIsUnspecified(sBcp47) && !sBcp47.isEmpty())
{
if (!aImplName.isEmpty())
-m_aGCImplNamesByLang[ nLanguage ] = aImplName;
+m_aGCImplNamesByLang[sBcp47] = aImplName;
else
-m_aGCImplNamesByLang.erase( nLanguage );
+m_aGCImplNamesByLang.erase(sBcp47);
}
}
@@ -1155,11 +1176,7 @@ uno::Sequence< OUString >
GrammarCheckingIterator::GetServiceList(
{
::osl::Guard< ::osl::Mutex > aGuard( MyMutex() );
-OUString aImplName; // there is only one grammar checker per language
-LanguageType nLang = LinguLocaleToLanguage( rLocale );
-GCImplNames_t::const_iterator aIt( m_aGCImplNamesByLang.find( nL
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/tiledrendering/tiledrendering.cxx | 236 ++- 1 file changed, 58 insertions(+), 178 deletions(-) New commits: commit a78d1b359966a2ab829fe13eaac7821894a96d91 Author: Xisco Fauli AuthorDate: Mon Mar 6 12:31:09 2023 +0100 Commit: Xisco Fauli CommitDate: Mon Mar 6 14:20:41 2023 + CppunitTest_sd_tiledrendering: use CPPUNIT_TEST_FIXTURE() This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: Icd7b2bfc98a5d27146ff8025d03e4c33a0c3abfe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148306 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index f8ca37932edd..12d7159e9faa 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -72,125 +72,7 @@ public: virtual void setUp() override; virtual void tearDown() override; -void testCreateDestroy(); -void testCreateView(); -void testRegisterCallback(); -void testPostKeyEvent(); -void testPostMouseEvent(); -void testSetTextSelection(); -void testGetTextSelection(); -void testSetGraphicSelection(); -void testUndoShells(); -void testResetSelection(); -void testInsertDeletePage(); -void testInsertTable(); -void testPartHash(); -void testResizeTable(); -void testResizeTableColumn(); -void testViewCursors(); -void testViewCursorParts(); -void testCursorViews(); -void testCursorVisibility_SingleClick(); -void testCursorVisibility_DoubleClick(); -void testCursorVisibility_MultiView(); -void testCursorVisibility_Escape(); -void testViewLock(); -void testUndoLimiting(); -void testCreateViewGraphicSelection(); -void testCreateViewTextCursor(); -void testTdf102223(); -void testTdf118354(); -void testPostKeyEventInvalidation(); -void testTdf103083(); -void testTdf104405(); -void testTdf81754(); -void testTdf105502(); -void testCommentCallbacks(); -void testCommentChangeImpress(); -void testCommentChangeDraw(); -void testMultiViewInsertDeletePage(); -void testMultiViewInsertDeletePage2(); -void testDisableUndoRepair(); -void testDocumentRepair(); -void testLanguageStatus(); -void testDefaultView(); -void testIMESupport(); -void testTdf115783(); -void testPasteTextOnSlide(); -void testTdf115873(); -void testTdf115873Group(); -void testCutSelectionChange(); -void testRegenerateDiagram(); -void testLanguageAllText(); -void testInsertDeletePageInvalidation(); -void testSpellOnlineRenderParameter(); -void testSlideDuplicateUndo(); -void testMoveShapeHandle(); -void testDeleteTable(); -void testPasteUndo(); -void testShapeEditInMultipleViews(); - -CPPUNIT_TEST_SUITE(SdTiledRenderingTest); -CPPUNIT_TEST(testCreateDestroy); -CPPUNIT_TEST(testCreateView); -CPPUNIT_TEST(testRegisterCallback); -CPPUNIT_TEST(testPostKeyEvent); -CPPUNIT_TEST(testPostMouseEvent); -CPPUNIT_TEST(testSetTextSelection); -CPPUNIT_TEST(testGetTextSelection); -CPPUNIT_TEST(testSetGraphicSelection); -CPPUNIT_TEST(testUndoShells); -CPPUNIT_TEST(testResetSelection); -CPPUNIT_TEST(testInsertDeletePage); -CPPUNIT_TEST(testInsertTable); -CPPUNIT_TEST(testPartHash); -CPPUNIT_TEST(testResizeTable); -CPPUNIT_TEST(testResizeTableColumn); -CPPUNIT_TEST(testViewCursors); -CPPUNIT_TEST(testViewCursorParts); -CPPUNIT_TEST(testCursorViews); -CPPUNIT_TEST(testCursorVisibility_SingleClick); -CPPUNIT_TEST(testCursorVisibility_DoubleClick); -CPPUNIT_TEST(testCursorVisibility_MultiView); -CPPUNIT_TEST(testCursorVisibility_Escape); -CPPUNIT_TEST(testViewLock); -CPPUNIT_TEST(testUndoLimiting); -CPPUNIT_TEST(testCreateViewGraphicSelection); -CPPUNIT_TEST(testCreateViewTextCursor); -CPPUNIT_TEST(testTdf102223); -CPPUNIT_TEST(testTdf118354); -CPPUNIT_TEST(testPostKeyEventInvalidation); -CPPUNIT_TEST(testTdf103083); -CPPUNIT_TEST(testTdf104405); -CPPUNIT_TEST(testTdf81754); -CPPUNIT_TEST(testTdf105502); -CPPUNIT_TEST(testCommentCallbacks); -CPPUNIT_TEST(testCommentChangeImpress); -CPPUNIT_TEST(testCommentChangeDraw); -CPPUNIT_TEST(testMultiViewInsertDeletePage); -CPPUNIT_TEST(testMultiViewInsertDeletePage2); -CPPUNIT_TEST(testDisableUndoRepair); -CPPUNIT_TEST(testDocumentRepair); -CPPUNIT_TEST(testLanguageStatus); -CPPUNIT_TEST(testDefaultView); -CPPUNIT_TEST(testIMESupport); -CPPUNIT_TEST(testTdf115783); -CPPUNIT_TEST(testPasteTextOnSlide); -CPPUNIT_TEST(testTdf115873); -CPPUNIT_TEST(testTdf115873Group); -CPPUNIT_TEST(testCutSelectionChange); -CPPUNIT_TEST(testRegenerateDiagram); -
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/inc sc/source
sc/inc/columnspanset.hxx |1 +
sc/source/core/data/columnspanset.cxx |4
2 files changed, 5 insertions(+)
New commits:
commit b032101f1e253e83dbed58632882853021d11647
Author: Kohei Yoshida
AuthorDate: Thu Mar 2 23:29:15 2023 -0500
Commit: Kohei Yoshida
CommitDate: Mon Mar 6 13:38:28 2023 +
tdf#148143: Reset the position hint when flat_segment_tree gets copied
std::optional stores the wrapped object as part of its memory footprint,
and when it gets copied, it copy-constructs the wrapped object too. We
need to be aware of this when using std::optional inside std::vector
which may reallocate its internal buffer and copy the stored elements.
Change-Id: Ib8fab1295388ae2ee9ef3d044943ac3c2bc8e529
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148152
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
(cherry picked from commit c4187189060a104cf36d8a8c9b2958b8c28cde0b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148233
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index d8cfc41f524b..5a3dc7645a43 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -58,6 +58,7 @@ private:
ColumnSpansType::const_iterator miPos;
ColumnType(SCROW nStart, SCROW nEnd, bool bInit);
+ColumnType(const ColumnType& rOther);
};
typedef std::vector> TableType;
diff --git a/sc/source/core/data/columnspanset.cxx
b/sc/source/core/data/columnspanset.cxx
index eb09ea26be98..bec9c8a7e270 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -53,6 +53,9 @@ ColRowSpan::ColRowSpan(SCCOLROW nStart, SCCOLROW nEnd) :
mnStart(nStart), mnEnd(
ColumnSpanSet::ColumnType::ColumnType(SCROW nStart, SCROW nEnd, bool bInit) :
maSpans(nStart, nEnd+1, bInit), miPos(maSpans.begin()) {}
+ColumnSpanSet::ColumnType::ColumnType(const ColumnType& rOther) :
+maSpans(rOther.maSpans), miPos(maSpans.begin()) {} // NB: copying maSpans
invalidates miPos - reset it
+
ColumnSpanSet::Action::~Action() {}
void ColumnSpanSet::Action::startColumn(SCTAB /*nTab*/, SCCOL /*nCol*/) {}
@@ -142,6 +145,7 @@ void ColumnSpanSet::scan(
ColumnNonEmptyRangesScanner aScanner(rCol.maSpans, bVal);
ParseBlock(rSrcCells.begin(), rSrcCells, aScanner, nRow1, nRow2);
+rCol.miPos = rCol.maSpans.begin();
}
}
[Libreoffice-commits] core.git: external/fontconfig
external/fontconfig/ubsan.patch | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 7e2d269bad64694c33cb3bc693c7df9917a4fac0 Author: Stephan Bergmann AuthorDate: Sun Mar 5 23:41:16 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Mar 6 13:37:32 2023 + external/fontconfig: Silence UBSan nullptr-with-offset ...during CppunitTest_cppcanvas_test, > fcserialize.c:166:54: runtime error: applying zero offset to null pointer > #0 in FcSerializeResize at workdir/UnpackedTarball/fontconfig/src/fcserialize.c:166:54 > #1 in FcSerializeSet at workdir/UnpackedTarball/fontconfig/src/fcserialize.c:204:7 > #2 in FcSerializeAlloc at workdir/UnpackedTarball/fontconfig/src/fcserialize.c:228:10 > #3 in FcStrSerializeAlloc at workdir/UnpackedTarball/fontconfig/src/fcserialize.c:274:12 > #4 in FcDirCacheBuild at workdir/UnpackedTarball/fontconfig/src/fccache.c:1255:10 > #5 in FcDirCacheScan at workdir/UnpackedTarball/fontconfig/src/fcdir.c:360:13 > #6 in FcDirCacheRead at workdir/UnpackedTarball/fontconfig/src/fcdir.c:462:10 > #7 in FcConfigAddDirList at workdir/UnpackedTarball/fontconfig/src/fccfg.c:516:10 > #8 in FcConfigAppFontAddDir at workdir/UnpackedTarball/fontconfig/src/fccfg.c:2891:10 > #9 in psp::PrintFontManager::addFontconfigDir(rtl::OString const&) at vcl/unx/generic/fontmanager/fontconfig.cxx:745:20 > #10 in psp::PrintFontManager::initialize() at vcl/unx/generic/fontmanager/fontmanager.cxx:683:17 > #11 in GenericUnixSalData::InitPrintFontManager() at vcl/unx/generic/app/gendata.cxx:65:26 > #12 in GenericUnixSalData::GetPrintFontManager() at vcl/inc/unx/gendata.hxx:100:13 > #13 in psp::PrintFontManager::get() at vcl/unx/generic/fontmanager/fontmanager.cxx:105:23 > #14 in GenPspGraphics::GetDevFontListHelper(vcl::font::PhysicalFontCollection*) at vcl/unx/generic/print/genpspgraphics.cxx:248:35 > #15 in FreeTypeTextRenderImpl::GetDevFontList(vcl::font::PhysicalFontCollection*) at vcl/unx/generic/gdi/freetypetextrender.cxx:110:5 > #16 in SvpSalGraphics::GetDevFontList(vcl::font::PhysicalFontCollection*) at vcl/headless/svptext.cxx:51:23 > #17 in OutputDevice::ImplInitFontList() const at vcl/source/outdev/font.cxx:643:17 > #18 in OutputDevice::ImplNewFont() const at vcl/source/outdev/font.cxx:700:5 > #19 in OutputDevice::InitFont() const at vcl/source/outdev/font.cxx:660:10 > #20 in OutputDevice::GetTextHeight() const at vcl/source/outdev/text.cxx:899:10 > #21 in vcl::Window::GetTextHeight() const at vcl/source/window/window3.cxx:65:65 > #22 in vcl::Window::ImplInitAppFontData(vcl::Window const*) at vcl/source/window/window.cxx:1188:40 > #23 in vcl::Window::ImplInit(vcl::Window*, long, SystemParentData*) at vcl/source/window/window.cxx:1182:9 > #24 in ImplBorderWindow::ImplInit(vcl::Window*, long, BorderWindowStyle, SystemParentData*) at vcl/source/window/brdwin.cxx:1557:13 > #25 in ImplBorderWindow::ImplBorderWindow(vcl::Window*, SystemParentData*, long, BorderWindowStyle) at vcl/source/window/brdwin.cxx:1586:5 > #26 in VclPtrInstance::VclPtrInstance(vcl::Window*&, SystemParentData*&, long&, BorderWindowStyle&) at include/vcl/vclptr.hxx:280:39 > #27 in WorkWindow::ImplInit(vcl::Window*, long, SystemParentData*) at vcl/source/window/wrkwin.cxx:51:38 > #28 in WorkWindow::WorkWindow(vcl::Window*, long) at vcl/source/window/wrkwin.cxx:95:5 > #29 in ScopedVclPtrInstance::ScopedVclPtrInstance(std::nullptr_t&&, long const&) at include/vcl/vclptr.hxx:412:45 > #30 in CanvasTest::testComposite() at cppcanvas/qa/unit/test.cxx:38:38 Change-Id: I90c86931ae5d4dfb32a1a95a5eb660484b54f09a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148287 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/fontconfig/ubsan.patch b/external/fontconfig/ubsan.patch index 5951f09fe6dd..91586b093480 100644 --- a/external/fontconfig/ubsan.patch +++ b/external/fontconfig/ubsan.patch @@ -9,3 +9,14 @@ /* * Scan file files to build font patterns +--- src/fcserialize.c src/fcserialize.c +@@ -163,7 +163,7 @@ + size_t old_used = serialize->buckets_used; + size_t old_count = serialize->buckets_count; + FcSerializeBucket *old_buckets = serialize->buckets; +-FcSerializeBucket *old_buckets_end = old_buckets + old_count; ++FcSerializeBucket *old_buckets_end = old_count == 0 ? old_buckets : old_buckets + old_count; + + FcSerializeBucket *new_buckets = malloc (new_count * sizeof (*old_buckets)); + if (!new_buckets)
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 5d4749b5c29cdbfb9ea87db3402d9ada8df7c1c1 Author: Samuel Mehrbrodt AuthorDate: Mon Mar 6 09:52:43 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Mar 6 13:18:13 2023 + Remove trailing blanks Change-Id: Iaf04b6bd650801c05f83e664d71f26a3d306873e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148302 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index ea8fde42d833..91436b860c63 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2827,7 +2827,7 @@ - Action needed for opening document with macro with Windows zone + Action needed for opening document with macro with Windows zone identifier URLZONE_LOCAL_MACHINE (0, local machine). @@ -2851,7 +2851,7 @@ - Action needed for opening document with macro with Windows zone + Action needed for opening document with macro with Windows zone identifier URLZONE_INTRANET (1, local machine). @@ -2875,7 +2875,7 @@ - Action needed for opening document with macro with Windows zone + Action needed for opening document with macro with Windows zone identifier URLZONE_TRUSTED (2, trusted). @@ -2899,7 +2899,7 @@ - Action needed for opening document with macro with Windows zone + Action needed for opening document with macro with Windows zone identifier URLZONE_INTERNET (3, internet). @@ -2923,7 +2923,7 @@ - Action needed for opening document with macro with Windows zone + Action needed for opening document with macro with Windows zone identifier URLZONE_UNTRUSTED (3, untrusted source).
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/tiledrendering/tiledrendering.cxx | 29 ---
1 file changed, 29 deletions(-)
New commits:
commit 27d4e27a6ab317cbc7eb1fb5d73cebdc36ffbb34
Author: Xisco Fauli
AuthorDate: Mon Mar 6 12:13:33 2023 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 6 12:55:35 2023 +
CppunitTest_sc_tiledrendering: remove commented out code
This was added with 235136c17868627412db8dda148d3c4103907c0c
"sc lok: Don't interact with the user during .uno:SortAscending or
Descending."
and never needed since then
Change-Id: I7c6822d1f187632f608821cbcd208624deca103a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148305
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index f92d88d8acf6..84771a2c555c 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -252,35 +252,6 @@ void ScTiledRenderingTest::callback(int nType, const char*
pPayload, void* pData
static_cast(pData)->callbackImpl(nType, pPayload);
}
-/* TODO when needed...
-static std::vector lcl_convertSeparated(const OUString& rString,
sal_Unicode nSeparator)
-{
-std::vector aRet;
-
-sal_Int32 nIndex = 0;
-do
-{
-OUString aToken = rString.getToken(0, nSeparator, nIndex);
-aToken = aToken.trim();
-if (!aToken.isEmpty())
-aRet.push_back(aToken);
-}
-while (nIndex >= 0);
-
-return aRet;
-}
-
-static void lcl_convertRectangle(const OUString& rString, Rectangle&
rRectangle)
-{
-uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(rString);
-CPPUNIT_ASSERT_EQUAL(static_cast(4), aSeq.getLength());
-rRectangle.SetLeft(aSeq[0].toInt32());
-rRectangle.SetTop(aSeq[1].toInt32());
-rRectangle.setWidth(aSeq[2].toInt32());
-rRectangle.setHeight(aSeq[3].toInt32());
-}
-*/
-
void ScTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
{
switch (nType)
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/hdrcont.cxx |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 9ba89c54076990b21b8e052fdd8d43bf8688edbe
Author: Supriyo Paul
AuthorDate: Fri Mar 3 23:41:54 2023 +0530
Commit: Hossein
CommitDate: Mon Mar 6 12:38:57 2023 +
tdf#148251 Use std::swap instead of using temporary values
Part of the code uses a temporary variable for swapping variables.
This is hard to read, so we are now using std::swap which improves
readability. We also remove the temporary local variable.
Change-Id: If6e97f7d464aa21cf4b9c64e630769949cfaa6af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148197
Reviewed-by: Hossein
Tested-by: Hossein
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 805326330ae4..305ada306856 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -270,12 +270,8 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
tools::Long nInitScrPos = 0;
if ( bLayoutRTL )
{
-tools::Long nTemp = nPStart; // swap nPStart / nPEnd
-nPStart = nPEnd;
-nPEnd = nTemp;
-nTemp = nTransStart;// swap nTransStart / nTransEnd
-nTransStart = nTransEnd;
-nTransEnd = nTemp;
+std::swap(nPStart, nPEnd);
+std::swap(nTransStart, nTransEnd);
if ( bVertical )// start loops from the end
nInitScrPos = GetSizePixel().Height() - 1;
else
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de236de7fded4b6d1eb5f4623d411e674125ebb9 Author: Alain Romedenne AuthorDate: Mon Mar 6 12:22:42 2023 + Commit: Gerrit Code Review CommitDate: Mon Mar 6 12:22:42 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 6f339f367d1ee6aa8d13b41eaf3ca19bca9926e6 - tdf#141474 Incorrect parameter names for Basic functions in help Remaining pages up to included Join function Change-Id: Id6aad2fbdf3ace72fdaa33136fc71a6107abeadd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147986 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c76109de2734..6f339f367d1e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c76109de27348a1b751ac398b978ebfa3a8825dc +Subproject commit 6f339f367d1ee6aa8d13b41eaf3ca19bca9926e6
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03020404.xhp | 10 --- source/text/sbasic/shared/03020405.xhp | 14 +-- source/text/sbasic/shared/03020406.xhp |8 +++--- source/text/sbasic/shared/03090103.xhp |8 +++--- source/text/sbasic/shared/03120315.xhp |6 ++-- source/text/sbasic/shared/03120401.xhp | 17 ++--- source/text/sbasic/shared/03120411.xhp | 10 +++ source/text/sbasic/shared/03132300.xhp | 42 + source/text/sbasic/shared/03140003.xhp | 28 +++--- source/text/sbasic/shared/0315.xhp |6 ++-- 10 files changed, 87 insertions(+), 62 deletions(-) New commits: commit 6f339f367d1ee6aa8d13b41eaf3ca19bca9926e6 Author: Alain Romedenne AuthorDate: Wed Mar 1 08:50:21 2023 + Commit: Alain Romedenne CommitDate: Mon Mar 6 12:22:42 2023 + tdf#141474 Incorrect parameter names for Basic functions in help Remaining pages up to included Join function Change-Id: Id6aad2fbdf3ace72fdaa33136fc71a6107abeadd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147986 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03020404.xhp b/source/text/sbasic/shared/03020404.xhp index dc18b5af80..6f1d84acc4 100644 --- a/source/text/sbasic/shared/03020404.xhp +++ b/source/text/sbasic/shared/03020404.xhp @@ -38,15 +38,15 @@ -Dir [(Text As String [, Attrib As Integer])] +Dir [(PathName As String [, Attributes As Integer])] -Return value: + String - Text: Any string expression that specifies the search path, directory or file. This argument can only be specified the first time that you call the Dir function. If you want, you can enter the path in URL notation. - Attrib: Any integer expression that specifies bitwise file attributes. The Dir function only returns files or directories that match the specified attributes. You can combine several attributes by adding the attribute values: + PathName: Any string expression that specifies the search path, directory or file. This argument can only be specified the first time that you call the Dir function. If you want, you can enter the path in URL notation. + Attributes:Any integer expression that specifies bitwise file attributes. The Dir function only returns files or directories that match the specified attributes. You can combine several attributes by adding the attribute values: 0 : Normal files. 16 : Returns the name of the directory only. Use this attribute to check if a file or directory exists, or to determine all files and folders in a specific directory. @@ -80,6 +80,8 @@ + + diff --git a/source/text/sbasic/shared/03020405.xhp b/source/text/sbasic/shared/03020405.xhp index f1ba3fb4d5..0a61715239 100644 --- a/source/text/sbasic/shared/03020405.xhp +++ b/source/text/sbasic/shared/03020405.xhp @@ -34,25 +34,25 @@ -FileAttr Function +FileAttr Function Returns the access mode or the file access number of a file that was opened with the Open statement. The file access number is dependent on the operating system (OSH = Operating System Handle). -If you use a 32-Bit operating system, you cannot use the FileAttr-Function to determine the file access number. +If you use a 32-Bit operating system, you cannot use the FileAttr function to determine the file access number. See also: Open -FileAttr (FileNumber As Integer, Attribute As Integer) + FileAttr (Channel As Integer, Attributes As Integer) Integer - FileNumber: The number of the file that was opened with the Open statement. - Attribute: Integer expression that indicates the type of file information that you want to return. The following values are possible: -1: The FileAttr-Function indicates the access mode of the file. -2: The FileAttr-Function returns the file access number of the operating system. + Channel: The number of the file that was opened with the Open statement. + Attributes: Integer expression that indicates the type of file information that you want to return. The following values are possible: +1: FileAttr indicates the access mode of the file. +2: FileAttr returns the file access number of the operating system. If you specify a parameter attribute with a value of 1, the following return values apply: 1 - INPUT (file open for input) 2 - OUTPUT (file open for output) diff --git a/source/text/sbasic/shared/03020406.xhp b/source/text/sbasic/shared/03020406.xhp index b7a762f9a7..04b32654dd 100644 --- a/source/text/sbasic/shared/03020406.xhp +++ b/source/text/sbasic/shared/03020406.xhp @@ -34,18 +34,18 @@ -FileCopy Statement +FileCopy Statement Copies a file. Syntax: -FileCopy TextFrom As String, TextTo As String +FileCopy Source As String, Destination As String Parameters: - TextFrom: Any string expression that specifies the name of the file that you want to copy. The expression can contain optional path and
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - icon-themes/sukapura icon-themes/sukapura_dark icon-themes/sukapura_dark_svg icon-themes/sukapura_svg
icon-themes/sukapura/sd/res/placeholder_chart_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_chart_small_hover.png |binary icon-themes/sukapura/sd/res/placeholder_image_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_image_small_hover.png |binary icon-themes/sukapura/sd/res/placeholder_movie_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_movie_small_hover.png |binary icon-themes/sukapura/sd/res/placeholder_table_large_hover.png |binary icon-themes/sukapura/sd/res/placeholder_table_small_hover.png |binary icon-themes/sukapura_dark/cmd/lc_framedialog.png |binary icon-themes/sukapura_dark/sd/res/placeholder_chart_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_chart_small_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_image_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_image_small_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_movie_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_movie_small_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_table_large_hover.png |binary icon-themes/sukapura_dark/sd/res/placeholder_table_small_hover.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-Background.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderBottom.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderBottomLeft.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderBottomRight.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderLeft.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderRight.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderTop.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderTopLeft.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-BorderTopRight.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonEffectNextSelected.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonExitPresenterNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameCenterNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameLeftNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameRightMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonFrameRightNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonHelpMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonHelpNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonMinusSelected.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonNotesSelected.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonPauseTimerMouseOver.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonPauseTimerNormal.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-ButtonPlusDisabled.png |binary icon-themes/sukapura_dark/sd/res/presenterscreen-
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/QtAccessibleWidget.cxx | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 46a03cb528860c7571c2ff046bef307bb7b04ac2
Author: Michael Weghorn
AuthorDate: Mon Mar 6 08:49:03 2023 +0100
Commit: Michael Weghorn
CommitDate: Mon Mar 6 12:17:55 2023 +
qt a11y: Add mapping for relations added in Qt 6.6
Map `AccessibleRelationType::CONTENT_FLOWS_FROM`,
`AccessibleRelationType::CONTENT_FLOWS_TO` and
`AccessibleRelationType::DESCRIBED_BY` to the
Qt equivalents added in Qt 6.6 and vice versa.
As described in more detail in
commit e55713dffbe8d8eba18068f6c2af14c10b787220
Date: Fri Feb 17 15:25:37 2023 +0100
qt a11y: Invert relation type to match Qt's semantic
, the "inverse" relation needs to be used when
mapping to/from the Qt relation.
For example the Orca screen reader on Linux makes
use of the FlOWS_FROM and FLOWS_TO relations.
So far, when using the qt6 VCL plugin with Orca
running, moving focus to a Writer paragraph resulted
in these warnings being emitted:
warn:vcl.qt:220606:220606:vcl/qt6/../qt5/QtAccessibleWidget.cxx:218:
Unmatched relation: 1
warn:vcl.qt:220606:220606:vcl/qt6/../qt5/QtAccessibleWidget.cxx:218:
Unmatched relation: 2
and thus Orca not being able to make use of those relations.
Sample use in Accerciser's Python console, with a Writer document
having three paragraphs with texts "First", "second", and "third"
and the a11y object of the second paragraph's a11y object selected
in Accerciser's a11y tree view:
In [1]: acc.queryText().getStringAtOffset(0,
pyatspi.TEXT_GRANULARITY_PARAGRAPH)
Out[1]: ('second', 0, 6)
In [2]: acc.get_relation_set()
Out[2]:
[,
]
In [3]: first_relation = acc.get_relation_set()[0]
In [4]: first_relation.get_n_targets()
Out[4]: 1
In [5]: first_relation.get_relation_type()
Out[5]:
In [6]: first_relation.get_target(0)
Out[6]:
In [7]: first_relation.get_target(0).queryText().getStringAtOffset(0, 1)
Out[7]: ('First', 0, 5)
In [8]: second_relation = acc.get_relation_set()[1]
In [9]: second_relation.get_n_targets()
Out[9]: 1
In [10]: second_relation.get_relation_type()
Out[10]:
In [11]:
second_relation.get_target(0).queryText().getStringAtOffset(0,1)
Out[11]: ('third', 0, 5)
(QTBUG-105864 [1] also has a sample doc and pyatspi script that can be used
for testing.)
Qt commit adding the relations [2]:
commit f5358e5932bc8701621389c265c4ea86c92c536c
Author: Michael Weghorn
Date: Fri Feb 17 13:48:38 2023 +0100
a11y: Add new relations DescriptionFor, Described, Flows{From,To}
This is equivalent to the corresponding relation types defined
in the IAccessible2 spec [1] (IA2_RELATION_DESCRIPTION_FOR,
IA2_RELATION_DESCRIBED_BY, IA2_RELATION_FLOWS_FROM,
IA2_RELATION_FLOWS_TO) and for AT-SPI on Linux [2]
(relation types ATSPI_RELATION_DESCRIPTION_FOR,
ATSPI_RELATION_DESCRIBED_BY, ATSPI_RELATION_FLOWS_FROM,
ATSPI_RELATION_FLOWS_TO).
User Interface Automation (UIA) on Windows also has corresponding
properties for 3 of them [3]: UIA_DescribedByPropertyId,
UIA_FlowsFromPropertyId, UIA_FlowsToPropertyId.
This commit adds the new flags and implements the mapping for
the AT-SPI case.
Note that the relation type is conceptually always "inverted"
when comparing Qt and AT-SPI (or Qt and UIA)
as clarified in afbfe30093d49eff0ec4c28c220d33c233b9f807.
"QAccessible::Description" instead of "QAccessible::DescriptionFor"
would align better with the naming scheme of the other relations,
but
that is already used in the Text enum.
[1]
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/group__grp_relations.html
[2]
https://lazka.github.io/pgi-docs/Atspi-2.0/enums.html#Atspi.RelationType
[3]
https://docs.microsoft.com/en-us/windows/win32/winauto/uiauto-automation-element-propids
[ChangeLog][QtGui][QAccessible::RelationFlag] Added new relation
flags DescriptionFor, Described, FlowsFrom and FlowsTo.
Fixes: QTBUG-105864
Change-Id: If2d46099eeea75e177358c821d1ae833a553bd0e
Reviewed-by: Jan Arve Sæther
[1] https://bugreports.qt.io/browse/QTBUG-105864
[2]
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f5358e5932bc8701621389c265c4ea86c92c536c
Change-Id: I6e5d78fb26f62a6f1745d4f94647e8dc0fe2abfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLPropertySet.cxx |6 +++---
writerfilter/source/ooxml/OOXMLPropertySet.hxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 078f5064dd09e5228f1a54b4f45ae90fc06bd99f
Author: Miklos Vajna
AuthorDate: Mon Mar 6 08:09:44 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 6 12:13:30 2023 +
writerfilter: prefix members of OOXMLStarMathValue
See tdf#94879 for motivation. With this, writerfilter/ is done, I think.
Change-Id: Ia2ae5394e41688049b0a639aa5ad922980928cf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148293
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index e060d2da2d6c..930fa5a7f85b 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -721,7 +721,7 @@ OOXMLValue * OOXMLShapeValue::clone() const
OOXMLStarMathValue::OOXMLStarMathValue( uno::Reference< embed::XEmbeddedObject
> c )
-: component(std::move(c))
+: m_component(std::move(c))
{
}
@@ -731,7 +731,7 @@ OOXMLStarMathValue::~OOXMLStarMathValue()
uno::Any OOXMLStarMathValue::getAny() const
{
-return uno::Any(component);
+return uno::Any(m_component);
}
#ifdef DBG_UTIL
@@ -743,7 +743,7 @@ std::string OOXMLStarMathValue::toString() const
OOXMLValue * OOXMLStarMathValue::clone() const
{
-return new OOXMLStarMathValue( component );
+return new OOXMLStarMathValue( m_component );
}
/*
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 3393050afa23..2c851ab53823 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -351,7 +351,7 @@ public:
class OOXMLStarMathValue final : public OOXMLValue
{
-css::uno::Reference component;
+css::uno::Reference m_component;
public:
explicit
OOXMLStarMathValue(css::uno::Reference component);
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a1f86eb7cc5b3eaaec74501f472dfd0358b463c Author: Ilmari Lauhakangas AuthorDate: Mon Mar 6 13:49:36 2023 +0200 Commit: Ilmari Lauhakangas CommitDate: Mon Mar 6 11:52:25 2023 + sw/qa/extras/README: update test suite name Change-Id: If4e944bd325b0c271f91792bf24a854669d3ffd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148309 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/sw/qa/extras/README b/sw/qa/extras/README index 284979d8a90d..66bca01e63a0 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -144,7 +144,7 @@ If you want to run only a single test to allow quick development iteration, then use `CPPUNIT_TEST_NAME` to specify the name of the single test: -CPPUNIT_TEST_NAME="testTdf91074" make -sr CppunitTest_sw_rtfimport +CPPUNIT_TEST_NAME="testTdf91074" make -sr CppunitTest_sw_rtfexport6 == UNO, in more details, various tips:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa
sw/qa/core/text/text.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 24fcb3d16d28ac78d5ce80e46c2cc8f4300242ca
Author: Caolán McNamara
AuthorDate: Fri Mar 3 12:29:02 2023 +
Commit: Michael Stahl
CommitDate: Mon Mar 6 11:38:07 2023 +
don't crash with --disable-pdfium
Change-Id: I8a02e9c5367a5fc73674963d31c48a6114e92299
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148177
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index 9ffae51f175f..0ddc9a0885d8 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -681,6 +681,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPDF)
CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPlaceholderPDF)
{
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+if (!pPDFium)
+return;
+
// Given a file with a content control, in placeholder mode:
createSwDoc();
SwDoc* pDoc = getSwDoc();
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/itrform2.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit aac624d1e3cd6fc023e25fedbfe48ed330a308ec
Author: Miklos Vajna
AuthorDate: Mon Mar 6 08:22:40 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 6 09:53:27 2023 +
sw floattable: clean up not needed scope in SwTextFormatter::FormatLine()
Leftover from commit 25a16e7543965565a4227506003adc916deea500 (sw
floattable: fix cid#1520804, 2023-02-09).
Change-Id: Iecf4d8708c6acc3a49a0a987370911f32e6ac3e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148295
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e9e9e0f685a2..3e5d03ff7521 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1933,13 +1933,11 @@ TextFrameIndex
SwTextFormatter::FormatLine(TextFrameIndex const nStartPos)
m_pCurr->Height( GetFrameRstHeight() + 1, false );
m_pCurr->SetRealHeight( GetFrameRstHeight() + 1 );
+// Don't oversize the line in case of split flys, so we don't try
to move the anchor
+// of a precede fly forward, next to its follow.
+if (m_pFrame->HasNonLastSplitFlyDrawObj())
{
-// Don't oversize the line in case of split flys, so we don't
try to move the anchor
-// of a precede fly forward, next to its follow.
-if (m_pFrame->HasNonLastSplitFlyDrawObj())
-{
-m_pCurr->SetRealHeight(GetFrameRstHeight());
-}
+m_pCurr->SetRealHeight(GetFrameRstHeight());
}
m_pCurr->Width(0);
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/inc vcl/jsdialog
sw/source/ui/chrdlg/chardlg.cxx |6 +- vcl/inc/jsdialog/jsdialogbuilder.hxx |2 ++ vcl/jsdialog/enabled.cxx | 14 +- vcl/jsdialog/jsdialogbuilder.cxx | 12 4 files changed, 32 insertions(+), 2 deletions(-) New commits: commit f3aca61de33b396bad10d08ddbb6f83e1a29ac13 Author: Pranam Lashkari AuthorDate: Fri Mar 3 02:30:55 2023 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 6 09:47:08 2023 + jsdialog: enabled format Character dialog (writer) can be found from: Tabbed view > Format > Character Sidebar > Character Compact view > Format > Character Change-Id: I43f9dc63a1941345a7ef55bfecd8bb38f652208e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148242 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 0cf38a652bec..efa16ce22797 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -167,7 +168,10 @@ SwCharURLPage::SwCharURLPage(weld::Container* pPage, weld::DialogController* pCo m_xCharStyleContainer->hide(); } -m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl)); +if(comphelper::LibreOfficeKit::isActive()) +m_xURLPB->hide(); // Hide browse button in online (not supported yet) +else +m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl)); m_xEventPB->connect_clicked(LINK( this, SwCharURLPage, EventHdl)); SwView *pView = ::GetActiveView(); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 9a10f5bc0079..b76bd70597b0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -34,12 +34,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) } if (// cui -rUIFile == u"cui/ui/formatnumberdialog.ui" +rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/borderpage.ui" +|| rUIFile == u"cui/ui/charnamepage.ui" +|| rUIFile == u"cui/ui/colorpage.ui" +|| rUIFile == u"cui/ui/effectspage.ui" +|| rUIFile == u"cui/ui/eventassigndialog.ui" +|| rUIFile == u"cui/ui/fontfeaturesdialog.ui" +|| rUIFile == u"cui/ui/formatnumberdialog.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/positionpage.ui" +|| rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" +|| rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui" @@ -78,6 +88,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/schart/ui/wizelementspage.ui" // swriter || rUIFile == u"modules/swriter/ui/captionoptions.ui" +|| rUIFile == u"modules/swriter/ui/characterproperties.ui" +|| rUIFile == u"modules/swriter/ui/charurlpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" commit 26486cd12f47090fbd505b4b51828ee9e79bf3b7 Author: Szymon Kłos AuthorDate: Sat Mar 4 15:14:49 2023 +0100 Commit: Szymon Kłos CommitDate: Mon Mar 6 09:47:02 2023 + jsdialog: send full update when showing BuilderPage BuilderPage when created welds only container. Detect that case when full update wasn't sent in weld_dialog or weld_assistant so we show new tab pages. Fixes problem in Characters -> Higlight -> Color Change-Id: Iab38493a12feb4fc5e8b258125987856485275a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148221 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index b7b0e941f2e0..f9dea1a3987d 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -221,6 +221,8 @@ class JSInstanceBuilder final : public SalInstanceBuilder, public JSDialogSender std::string m_sTypeOfJSON; bool m_bHasTopLevelDialog; bool m_bIsNotebookbar; +/// used to detect when we have to send Full Update in container handler +bool m_bSentInitialUpdate; /// When LOKNotifier is set by jsdialogs code we need to release it VclPtr m_aWindowToRelease; diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index cc1ca91262c8..db2481897fa3 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialog
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf153891.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|5 +
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4 +++-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d93c8a047fbb7ace91761bdf8b7b818b5f62aff1
Author: László Németh
AuthorDate: Wed Mar 1 14:11:30 2023 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 6 09:45:16 2023 +
tdf#153891 DOCX import: crash fix at missing cell properties
Regression from commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c
"tdf#132514 DOCX import: fix lost table style with footer".
Note: no crash without this fix by removing styles.xml from
the test document.
Change-Id: I7fd7edfc8f62e6b17c0c8f7a3bdec7d986ba57eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148053
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit e34074feeb1b918ab9f26a18c5fdb0b1f2e35f94)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148105
Reviewed-by: Xisco Fauli
(cherry picked from commit 2a7ec5f17e01041418262dcb0229fe537fa8139f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148109
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153891.docx
b/sw/qa/extras/ooxmlexport/data/tdf153891.docx
new file mode 100644
index ..6fe8092982b6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf153891.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index c54580ee766a..2f0da6cfa0a0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -518,6 +518,11 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf132514)
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:p[2]/w:pPr/w:spacing", "after",
"0");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf153891, "tdf153891.docx")
+{
+// This document simply crashed the importer.
+}
+
CPPUNIT_TEST_FIXTURE(Test, testFdo69636)
{
loadAndSave("fdo69636.docx");
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 0f0f3c5d1d1a..bf170d9ccf61 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1429,7 +1429,9 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel, bool bTab
if (bApply)
{
bool bEndOfApply =
(xTextRangeCompare->compareRegionEnds(rEndPara, aIt->m_rEndParagraph) == 0);
-ApplyParagraphPropertiesFromTableStyle(*aIt,
aAllTableParaProperties, aCellProperties[nRow][nCell]);
+// tdf#153891 handle missing cell properties
(exception in style handling?)
+if ( nCell <
sal::static_int_cast(aCellProperties[nRow].getLength()) )
+
ApplyParagraphPropertiesFromTableStyle(*aIt, aAllTableParaProperties,
aCellProperties[nRow][nCell]);
// erase processed paragraph from list of
pending paragraphs
aIt = pTableParagraphs->erase(aIt);
if (bEndOfApply)
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/shellio.hxx|8
sw/source/filter/ascii/parasc.cxx | 11 +++
2 files changed, 19 insertions(+)
New commits:
commit 13e34393e4564ef67d990c6dbe1991a0a6b288dd
Author: László Németh
AuthorDate: Thu Mar 2 11:50:17 2023 +0100
Commit: László Németh
CommitDate: Mon Mar 6 09:38:30 2023 +
tdf#154000 tdf#70423 sw: fix crash/freezing with huge text files
It was not possible to load or edit text files with very long
lines any more, because removed wrapping of the lines resulted
freezing and crash.
This reverts commit 745898eb2af2686ffbdfdc0e44984db67b172a59
"tdf#70423 Remove txtimport break in 10k chars line",
keeping only its unit test.
Fix also tdf#70423 by increasing the wrap limit from 1
to 25 characters, which still permit to load e.g. 50 MB
character or longer text lines, and to edit 5 MB or longer
text lines without crash or freezing.
Details: trying to load a relatively short 76 MB character
length text line shows a non-linear slowing down during the
load, resulting program crash after freezing 10 minutes.
Now this file is opened within seconds again, allowing to modify,
select and copy of the text before the full load of the document
(with linear speed). Loading a much shorter 5 MB character
length text line resulted an unusably slow editing previously:
waiting half minutes for changing, selecting or copying text
parts.
Manual test
Create a text file with a 76 MB character long line, and
open it:
$ seq 1000 | tr '\n' ' ' >numbers.txt
$ soffice numbers.txt
Note: the reverted commit had also a paragraph limit exceeded
error using unlimited paragraph length, because that is limited
in 4 GiB characters since version 4.3, see tdf#30668 and commit
ba27366f3d6bc6b209ecd5c5cb79a9ee5315316a "Resolves: #i17171#
Writer paragraph cannot be longer than 65534 characters".
Change-Id: If91e340a8aac4d4ebc4097b19cfa854b5659da3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148169
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index e666442d19a9..b3a18e65f510 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -51,6 +51,14 @@ struct Writer_Impl;
namespace sw::mark { class IMark; }
namespace com::sun::star::embed { class XStorage; }
+// Defines the count of chars at which a paragraph read via ASCII/W4W-Reader
+// is forced to wrap. It has to be always greater than 200!!!
+// Note: since version 4.3, maximum character count changed to 4 GiB from 64
KiB
+// in a paragraph, but because of the other limitations, we set a lower wrap
value
+// to get a working text editor e.g. without freezing and crash during loading
of
+// a 50 MB text line, or unusably slow editing of a 5 MB text line.
+#define MAX_ASCII_PARA 25
+
class SW_DLLPUBLIC SwAsciiOptions
{
OUString m_sFont;
diff --git a/sw/source/filter/ascii/parasc.cxx
b/sw/source/filter/ascii/parasc.cxx
index eab7a59e898b..b29251bcbd8b 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -474,6 +474,17 @@ ErrCode SwASCIIParser::ReadChars()
if( bIns )
{
+if( ( nLineLen >= MAX_ASCII_PARA - 100 ) &&
+( ( *pStt == ' ' ) || ( nLineLen >= MAX_ASCII_PARA - 1 ) ) )
+{
+sal_Unicode c = *pStt;
+*pStt = 0;
+InsertText( OUString( pLastStt ));
+
m_rDoc.getIDocumentContentOperations().SplitNode(*m_oPam->GetPoint(), false);
+pLastStt = pStt;
+nLineLen = 0;
+*pStt = c;
+}
++pStt;
++nLineLen;
}
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bf2ba1f2f2ad1c5e3897de879dc932967a0c588f Author: Seth Chaiklin AuthorDate: Mon Mar 6 09:04:46 2023 + Commit: Gerrit Code Review CommitDate: Mon Mar 6 09:04:46 2023 + Update git submodules * Update helpcontent2 from branch 'master' to c76109de27348a1b751ac398b978ebfa3a8825dc - tdf#153653 general update of Styles correct icon for Assign command * simplifications and corrections in the existing descriptions * add icon table for Assign icon * refactor ,, * rename German ID Change-Id: Iabedafe2b73e9540dda22464b504e953efee4388 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147115 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index ad78ad1596ee..c76109de2734 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ad78ad1596eecb0adead6fac10058e2ae1b7ba77 +Subproject commit c76109de27348a1b751ac398b978ebfa3a8825dc
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0404.xhp |2 - source/text/swriter/01/04120201.xhp | 46 +--- 2 files changed, 29 insertions(+), 19 deletions(-) New commits: commit c76109de27348a1b751ac398b978ebfa3a8825dc Author: Seth Chaiklin AuthorDate: Wed Feb 15 22:34:05 2023 + Commit: Seth Chaiklin CommitDate: Mon Mar 6 09:04:46 2023 + tdf#153653 general update of Styles correct icon for Assign command * simplifications and corrections in the existing descriptions * add icon table for Assign icon * refactor ,, * rename German ID Change-Id: Iabedafe2b73e9540dda22464b504e953efee4388 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147115 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/00/0404.xhp b/source/text/swriter/00/0404.xhp index b032e577cf..0ca135f195 100644 --- a/source/text/swriter/00/0404.xhp +++ b/source/text/swriter/00/0404.xhp @@ -233,7 +233,7 @@ Choose Insert - Table of Contents and Index - Bibliography Entry and click Edit -Choose Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Styles tab +Choose Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Styles tab Choose Insert - Envelope diff --git a/source/text/swriter/01/04120201.xhp b/source/text/swriter/01/04120201.xhp index 197765d7a4..7988195041 100644 --- a/source/text/swriter/01/04120201.xhp +++ b/source/text/swriter/01/04120201.xhp @@ -1,6 +1,5 @@ - - + - -Styles +Styles (table of contents/indexes/bibliography) /text/swriter/01/04120201.xhp @@ -33,27 +31,39 @@ -Styles -You can assign different paragraph styles to change the formatting of index titles, separators and index entries. You can also modify paragraph styles in this dialog. +Styles +Assign paragraph styles to index titles and index entries in Table of Contents, Indexes, and Bibliography. For Alphabetical Indexes, paragraph styles can be assigned to separators. You can also edit paragraph styles from this dialog. - + -Assignment +Assignment -Levels -Select the index level that you change the formatting of. +Levels +Select the index level to assign a paragraph style. -Paragraph Styles -Select the paragraph style that you want to apply to the selected index level, and then click the Assign (<) button. +Paragraph Styles +Select the paragraph style that you want to apply to the selected index level. -< -Formats the selected index level with the selected paragraph style. +Assign +Click the Assign icon to assign the selected paragraph style to the selected index level. + + + + +Assign Icon + + + + Assign + + + -Default -Resets the formatting of the selected level to the "Default" paragraph style. +Default +Removes the assigned paragraph style for the selected index level. “Default paragraph style” is used when no paragraph style is assigned. -Edit -Opens the Paragraph Style dialog, where you can modify the selected paragraph style. +Edit +Opens a dialog for editing the selected paragraph style.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 4 commits - include/xmloff schema/libreoffice sw/Library_msword.mk sw/source xmloff/qa xmloff/source
include/xmloff/xmltoken.hxx |2
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |8
sw/Library_msword.mk|1
sw/source/core/layout/fly.cxx | 56
sw/source/filter/ww8/docxattributeoutput.cxx| 842 ---
sw/source/filter/ww8/docxattributeoutput.hxx| 26
sw/source/filter/ww8/docxtableexport.cxx| 869
xmloff/qa/unit/data/floattable.fodt | 31
xmloff/qa/unit/text.cxx | 51
xmloff/source/core/xmltoken.cxx |2
xmloff/source/text/XMLTextFrameContext.cxx | 10
xmloff/source/text/txtparae.cxx |6
xmloff/source/token/tokens.txt |1
13 files changed, 1081 insertions(+), 824 deletions(-)
New commits:
commit 5b2d34e8e0869a9c8a7581b628c3f93e45e7d68f
Author: Miklos Vajna
AuthorDate: Mon Feb 27 08:21:01 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 6 09:51:23 2023 +0100
sw floattable: allow extra space on top of child content in
SwFlyFrame::Grow_()
Once a floating table with a single cell wanted to span over two pages
("split row"), SwTextFrame::SplitFrame() was called, but then the table
split failed because everything moved to the next page.
The reason for this was that we tried to grow the text frame (and all of
its parents: cell, row, table, fly), but a non-test growing a fly
normally just works by recalculating its size based on the content,
ignoring what growth is wanted.
This is fine in the non-split fly case, but we do want to increase the
size of a split fly to control what content remains in the current fly
frame and what goes to a follow fly frame.
Fix this by extending SwFlyFrame::Grow_() so it grows more than just its
own content in the split fly case if the request wanted that. Now a
single row can split, but the position of the follow fly frame is still
bad.
(cherry picked from commit 7677e16217349a0a0e94edb6a90b00089432c6ce)
Change-Id: I1c6aa61996dab058c291331a795627d3fae1bca8
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index efeb2cea8a5c..6918f630f511 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2054,7 +2054,37 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst )
InvalidatePos();
if ( bOldLock )
Lock();
-const SwRect aNew( GetObjRectWithSpaces() );
+SwRect aNew(GetObjRectWithSpaces());
+if (IsFlySplitAllowed() && aNew.Height() - aOld.Height() < nDist)
+{
+// We are allowed to split and the actual growth is less than
the requested growth.
+const SwFrame* pAnchor = GetAnchorFrame();
+if (SwFrame* pAnchorChar = FindAnchorCharFrame())
+{
+pAnchor = pAnchorChar;
+}
+const SwFrame* pAnchorUpper = pAnchor ? pAnchor->GetUpper() :
nullptr;
+if (pAnchorUpper)
+{
+SwTwips nDeadline = aRectFnSet.GetPrtBottom(*pAnchorUpper);
+SwTwips nTop = aRectFnSet.GetTop(getFrameArea());
+SwTwips nBottom = nTop +
aRectFnSet.GetHeight(getFrameArea());
+SwTwips nMaxGrow = nDeadline - nBottom;
+if (nDist > nMaxGrow)
+{
+// The requested growth is more than what we can
provide, limit it.
+nDist = nMaxGrow;
+}
+// Grow & invalidate the size.
+SwTwips nRemaining = nDist - (aNew.Height() -
aOld.Height());
+{
+SwFrameAreaDefinition::FrameAreaWriteAccess
aFrm(*this);
+aRectFnSet.AddBottom(aFrm, nRemaining);
+}
+InvalidateObjRectWithSpaces();
+aNew = GetObjRectWithSpaces();
+}
+}
if ( aOld != aNew )
::Notify( this, FindPageFrame(), aOld );
return aRectFnSet.GetHeight(aNew)-aRectFnSet.GetHeight(aOld);
commit 52953d35e2f65894fcc879d6c0c2ca5231a22f46
Author: Miklos Vajna
AuthorDate: Fri Feb 24 08:21:22 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 6 09:51:23 2023 +0100
sw floattable: don't promise infinite growth in SwFlyFrame::Grow_()
In case the document has a single cell in the floating table with
multiple lines, we may need to split the cell, but currently we don't.
One problem is that SwTabFrame::MakeAll() for the master table gets an
error from Split(). Diggi
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/test/unreffun.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit c9b0dcb767343865fc374c712b2fe768cd8aca32
Author: Stephan Bergmann
AuthorDate: Thu Mar 2 20:53:45 2023 +0100
Commit: Stephan Bergmann
CommitDate: Mon Mar 6 08:38:39 2023 +
The mentioned bug is fixed in Clang 17 trunk now
Change-Id: Idb62b1b71a9f6fefc9225706655ca016304f1c42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148191
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/test/unreffun.cxx
b/compilerplugins/clang/test/unreffun.cxx
index fc202b80f378..315c699b7748 100644
--- a/compilerplugins/clang/test/unreffun.cxx
+++ b/compilerplugins/clang/test/unreffun.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "config_clang.h"
+
#include "unreffun.hxx"
template struct S
@@ -38,10 +40,10 @@ void l() // expected-error {{Unreferenced externally
visible function definition
void m()
{
-//TODO: The below would produce a false "Unreferenced externally invisible
function definition" for
-// Local::f due to the Clang bug addressed at
"Call
-// MarkVirtualMembersReferenced on an actual class definition":
-#if 0
+// The below produced a false "Unreferenced externally invisible function
definition" for Local::f
+// prior to
+// "Call MarkVirtualMembersReferenced on an actual class definition" in Clang
17:
+#if CLANG_VERSION >= 17
struct Local;
#endif
struct Local
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf153613_sdtAfterPgBreak.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx |5 +
writerfilter/source/dmapper/DomainMapper.cxx | 31 +++
3 files changed, 36 insertions(+)
New commits:
commit af8fd3cfc71d404ae570c04b8e6540bcf6089009
Author: Justin Luth
AuthorDate: Thu Mar 2 19:32:27 2023 -0500
Commit: Miklos Vajna
CommitDate: Mon Mar 6 08:33:54 2023 +
tdf#153613 writerfilter: handle defered break before SDT start
If there are deferred column or page breaks before an SDT,
then before starting the SDT we need to determine if the
existing run needs to split - same as everywhere else.
There was only one existing unit test that had any defered
page or column breaks, so only two example documents to work from.
That was tdf125778_lostPageBreakTOX.docx.
Change-Id: I02d71577af13399d8aaf3ba0ce40fc6bed5e6e3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148148
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148195
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153613_sdtAfterPgBreak.docx
b/sw/qa/extras/ooxmlexport/data/tdf153613_sdtAfterPgBreak.docx
new file mode 100644
index ..fa62b475cfaa
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf153613_sdtAfterPgBreak.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index 129e42325640..7ab327f7e007 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -63,6 +63,11 @@ CPPUNIT_TEST_FIXTURE(Test, testInlineSdtHeader)
loadAndSave("inline-sdt-header.docx");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf153613_sdtAfterPgBreak,
"tdf153613_sdtAfterPgBreak.docx")
+{
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf152636_lostPageBreak2)
{
loadAndReload("tdf152636_lostPageBreak2.docx");
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c3a371fe6ec3..a3e50d8ea87d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1058,7 +1058,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_ooxml::LN_CT_SdtBlock_sdtContent:
case NS_ooxml::LN_CT_SdtRun_sdtContent:
+{
m_pImpl->m_pSdtHelper->SetSdtType(nName);
+
if (m_pImpl->m_pSdtHelper->getControlType() ==
SdtControlType::unknown)
{
// Still not determined content type? and it is even not
unsupported? Then it is plain text field
@@ -1076,11 +1078,40 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
}
}
+PropertyMapPtr pContext =
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
+if (pContext && m_pImpl->isBreakDeferred(PAGE_BREAK))
+{
+if (!m_pImpl->GetFootnoteContext() && !m_pImpl->IsInShape()
+&& !m_pImpl->IsInComments())
+{
+if (m_pImpl->GetIsFirstParagraphInSection() ||
!m_pImpl->IsFirstRun())
+{
+m_pImpl->m_bIsSplitPara = true;
+finishParagraph();
+lcl_startParagraphGroup();
+}
+pContext->Insert(PROP_BREAK_TYPE,
uno::Any(style::BreakType_PAGE_BEFORE));
+m_pImpl->clearDeferredBreaks();
+}
+}
+else if (pContext && m_pImpl->isBreakDeferred(COLUMN_BREAK))
+{
+if (m_pImpl->GetIsFirstParagraphInSection() ||
!m_pImpl->IsFirstRun())
+{
+mbIsSplitPara = true;
+finishParagraph();
+lcl_startParagraphGroup();
+}
+pContext->Insert(PROP_BREAK_TYPE,
uno::Any(style::BreakType_COLUMN_BEFORE));
+m_pImpl->clearDeferredBreaks();
+}
+
m_pImpl->m_pSdtHelper->setControlType(SdtControlType::richText);
m_pImpl->PushSdt();
break;
}
m_pImpl->SetSdt(true);
+}
break;
case NS_ooxml::LN_CT_SdtBlock_sdtEndContent:
case NS_ooxml::LN_CT_SdtRun_sdtEndContent:
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source
sw/source/core/crsr/bookmark.cxx |9 +
sw/source/core/inc/bookmark.hxx |1 +
sw/source/uibase/docvw/edtwin.cxx |8
3 files changed, 18 insertions(+)
New commits:
commit 10b360a7b773b4b03243002bfb205e5997263741
Author: Justin Luth
AuthorDate: Mon Oct 17 22:24:06 2022 -0400
Commit: Miklos Vajna
CommitDate: Mon Mar 6 08:27:30 2023 +
related tdf#151548 sw: KEY_DOWN access to FieldmarkWithDropDownButton
There was no way to use only a keyboard to access
dropdown formfields. (This should also work for LO's
unique DateFieldMark - however you get one of those.)
Change-Id: I2b0b2bd38a43817bbbf1801910815ebe87614f94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141488
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147680
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/crsr/bookmark.cxx b/sw/source/core/crsr/bookmark.cxx
index 50557f044fdc..1cd5752e2bf1 100644
--- a/sw/source/core/crsr/bookmark.cxx
+++ b/sw/source/core/crsr/bookmark.cxx
@@ -762,6 +762,15 @@ namespace sw::mark
m_pButton.disposeAndClear();
}
+void FieldmarkWithDropDownButton::LaunchPopup()
+{
+if (!m_pButton)
+return
+
+m_pButton->Invalidate();
+m_pButton->LaunchPopup();
+}
+
DropDownFieldmark::DropDownFieldmark(const SwPaM& rPaM, const OUString&
rName)
: FieldmarkWithDropDownButton(rPaM)
{
diff --git a/sw/source/core/inc/bookmark.hxx b/sw/source/core/inc/bookmark.hxx
index 7c5ce9361ca9..334d13c2d663 100644
--- a/sw/source/core/inc/bookmark.hxx
+++ b/sw/source/core/inc/bookmark.hxx
@@ -286,6 +286,7 @@ namespace sw::mark {
virtual void ShowButton(SwEditWin* pEditWin) = 0;
virtual void RemoveButton();
+virtual void LaunchPopup();
protected:
VclPtr m_pButton;
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 615278a769b3..6d2ea5c6a1fd 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -65,6 +65,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1868,6 +1869,13 @@ KEYINPUT_CHECKTABLE:
bool bMod1 = 0 != (rKeyCode.GetModifier() & KEY_MOD1);
if(!bMod1)
{
+::sw::mark::IFieldmark* pMark =
rSh.GetCurrentFieldmark();
+if (auto pDropDown =
dynamic_cast(pMark))
+{
+pDropDown->LaunchPopup();
+eKeyState = SwKeyState::End;
+break;
+}
eFlyState = SwKeyState::Fly_Change;
nDir = MOVE_DOWN_BIG;
}
