core.git: Branch 'distro/allotropia/zeta-24-2' - external/gpgmepp
external/gpgmepp/w32-build-fixes.patch.1 | 154 ---
1 file changed, 81 insertions(+), 73 deletions(-)
New commits:
commit d65f02b059ef13567e7e78e469f59e112d42863f
Author: Christian Lohmaier
AuthorDate: Thu Jul 25 18:24:07 2024 +0200
Commit: Stephan Bergmann
CommitDate: Sat Sep 28 17:15:58 2024 +0200
fix pid_t type mismatch on win64 between libassuan and gpgmepp
typedef long long pid_t in case of #ifdef _WIN64 is the only change,
the rest of the change to the patch is just rediffing
Change-Id: Iaad34bf42ad06fc6a636b773535f199a19c863e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171023
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
(cherry picked from commit c671e999f8b84c15d012dbfcf37b3a54acd26cba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174010
Tested-by: Stephan Bergmann
Reviewed-by: Stephan Bergmann
diff --git a/external/gpgmepp/w32-build-fixes.patch.1
b/external/gpgmepp/w32-build-fixes.patch.1
index a0a83910bbb6..9f634c182901 100644
--- a/external/gpgmepp/w32-build-fixes.patch.1
+++ b/external/gpgmepp/w32-build-fixes.patch.1
@@ -1,7 +1,7 @@
-diff -ru gpgme.orig/src/debug.h gpgme/src/debug.h
gpgme.orig/src/debug.h
-+++ gpgme/src/debug.h
-@@ -180,7 +180,7 @@ static inline gpgme_ssize_t
+diff -ur gpgmepp.org/src/debug.h gpgmepp/src/debug.h
+--- gpgmepp.org/src/debug.h2024-07-25 17:58:02.489364600 +0200
gpgmepp/src/debug.h2024-07-25 18:00:39.361407200 +0200
+@@ -180,7 +180,7 @@
_trace_sysres_ssize_t (gpgme_ssize_t res, int lvl, const char *func, int line)
{
if (res >= 0)
@@ -10,10 +10,10 @@ diff -ru gpgme.orig/src/debug.h gpgme/src/debug.h
else
_gpgme_debug (NULL, lvl, -1, NULL, NULL, NULL,
"%s:%d: error: %s (%d)
",
-diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
gpgme.orig/src/dirinfo.c 2017-03-21 11:09:41.0 +0100
-+++ gpgme/src/dirinfo.c2017-09-30 08:36:13.239279300 +0200
-@@ -34,6 +34,10 @@
+diff -ur gpgmepp.org/src/dirinfo.c gpgmepp/src/dirinfo.c
+--- gpgmepp.org/src/dirinfo.c 2024-07-25 17:58:02.484361100 +0200
gpgmepp/src/dirinfo.c 2024-07-25 18:00:39.363419600 +0200
+@@ -40,6 +40,10 @@
DEFINE_STATIC_LOCK (dirinfo_lock);
@@ -24,10 +24,10 @@ diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
/* Constants used internally to select the data. */
enum
{
-diff -ru gpgme.orig/src/gpgme-w32spawn.c gpgme/src/gpgme-w32spawn.c
gpgme.orig/src/gpgme-w32spawn.c2023-10-27 21:27:30.0 +0900
-+++ gpgme/src/gpgme-w32spawn.c 2024-02-26 17:32:59.949338645 +0900
-@@ -52,6 +52,9 @@
+diff -ur gpgmepp.org/src/gpgme-w32spawn.c gpgmepp/src/gpgme-w32spawn.c
+--- gpgmepp.org/src/gpgme-w32spawn.c 2024-07-25 17:58:02.487363200 +0200
gpgmepp/src/gpgme-w32spawn.c 2024-07-25 18:00:39.365388700 +0200
+@@ -53,6 +53,9 @@
#define mystderr stderr
#endif
@@ -37,61 +37,9 @@ diff -ru gpgme.orig/src/gpgme-w32spawn.c
gpgme/src/gpgme-w32spawn.c
static wchar_t *
-diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c
gpgme.orig/src/mbox-util.c 2016-11-16 13:22:41.0 +0100
-+++ gpgme/src/mbox-util.c 2017-09-30 08:18:29.270567500 +0200
-@@ -29,7 +29,9 @@
- #include
- #include
- #include
-+#if HAVE_UNISTD_H
- #include
-+#endif
- #include
-
- #include "mbox-util.h"
-diff -ru gpgme.orig/src/priv-io.h gpgme/src/priv-io.h
gpgme.orig/src/priv-io.h 2016-11-16 13:23:14.0 +0100
-+++ gpgme/src/priv-io.h2017-09-30 08:20:38.770562400 +0200
-@@ -33,6 +33,9 @@
- #ifdef HAVE_SYS_TYPES_H
- # include
- #endif
-+#if _MSC_VER
-+typedef int pid_t;
-+#endif
-
-
- /* A single file descriptor passed to spawn. For child fds, dup_to
-diff -ru gpgme.orig/src/util.h gpgme/src/util.h
gpgme.orig/src/util.h 2017-03-28 11:41:30.0 +0200
-+++ gpgme/src/util.h 2017-09-30 08:10:54.194049100 +0200
-@@ -36,6 +36,9 @@
- # include
- #endif
- #include
-+#ifdef _MSC_VER
-+typedef int pid_t;
-+#endif
-
-
- #include "gpgme.h"
-diff -ru gpgme.orig/src/w32-util.c gpgme/src/w32-util.c
gpgme.orig/src/w32-util.c 2017-03-09 09:01:10.0 +0100
-+++ gpgme/src/w32-util.c 2017-09-30 08:32:02.114330500 +0200
-@@ -772,7 +772,8 @@
- v /= 62;
- XX[5] = letters[v % 62];
-
-- fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-+ //fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-+ fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL);
- if (fd >= 0)
- {
- gpg_err_set_errno (save_errno);
-diff -ru gpgme.orig/src/Makefile.am gpgme/src/Makefile.am
gpgme.orig/src/Makefile.am 2017-09-30 11:50:07.45696 +0200
-+++ gpgme/src/Makefile.am 2017-09-30 11:51:29.609649400 +0200
+diff -ur gpgmepp.org/src/Makefile.am gpgmepp/src/Makefile.am
+--- gpgmepp.org/src/Makefile.am2024-07-25 17:58:02.485362200 +0200
gpgmepp/src/Makefile.am2024-07-25
help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1 source/text/scalc/00/0412.xhp |5 ++ source/text/scalc/01/HandleDuplicateRecords.xhp | 44 3 files changed, 50 insertions(+) New commits: commit 0d61990c85ed2135a6064b6caf1e989e820cd65c Author: Sahil Gautam AuthorDate: Tue Sep 10 21:52:04 2024 +0530 Commit: Olivier Hallot CommitDate: Sat Sep 28 18:45:48 2024 +0200 tdf#85976 Help page for HandleDuplicateRecords dialog https: //gerrit.libreoffice.org/c/core/+/160685/comments/9dd92aa8_beae1c5f Change-Id: I4ce7ad0022ed34b3704a3a5b17416eabcf91dd03 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/173142 Reviewed-by: Olivier Hallot Tested-by: Jenkins Tested-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index c823b10f24..e291a4a258 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -292,6 +292,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_workday \ helpcontent2/source/text/scalc/01/func_year \ helpcontent2/source/text/scalc/01/func_yearfrac \ +helpcontent2/source/text/scalc/01/HandleDuplicateRecords \ helpcontent2/source/text/scalc/01/HideNote \ helpcontent2/source/text/scalc/01/hide_sheet \ helpcontent2/source/text/scalc/01/InsertCurrentDate \ diff --git a/source/text/scalc/00/0412.xhp b/source/text/scalc/00/0412.xhp index b6e82bce21..10d214d08f 100644 --- a/source/text/scalc/00/0412.xhp +++ b/source/text/scalc/00/0412.xhp @@ -103,6 +103,11 @@ + + +Choose Data - Duplicate Records + + Choose Data - Sort Ascending diff --git a/source/text/scalc/01/HandleDuplicateRecords.xhp b/source/text/scalc/01/HandleDuplicateRecords.xhp new file mode 100644 index 00..0f2e9e6aab --- /dev/null +++ b/source/text/scalc/01/HandleDuplicateRecords.xhp @@ -0,0 +1,44 @@ + + + + + + +Handle Duplicate Records +/text/scalc/01/HandleDuplicateRecords.xhp + + + + + + + +duplicate;remove +duplicate;select + + + +Handle Duplicate Records + + + Selects or Removes the duplicate records from the selection. The duplicate records dialog has various options. + + + + + +Orientation: to specify whether to operate on rows or columns. +Header: to specify if the selected data includes table headers. If checked, then the table headers (the first row or column) will be ignored. +Items: shows the headers for the selected records. If "data includes headers" checkbox is checked, then it contains the headers of the records, else it's either the row number or the column name depending on the orientation. The user can select/unselect the records to be compared. In the column header, it contains a checkbox to toggle state for all the records in the treeview. +Action: to specify whether to select or reomve the duplicate records out of the checked records in Items. + + + +
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 54fe022f298c98ea40b175e5e671363a5a413160 Author: Sahil Gautam AuthorDate: Sat Sep 28 22:15:48 2024 +0530 Commit: Gerrit Code Review CommitDate: Sat Sep 28 18:45:48 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 0d61990c85ed2135a6064b6caf1e989e820cd65c - tdf#85976 Help page for HandleDuplicateRecords dialog https: //gerrit.libreoffice.org/c/core/+/160685/comments/9dd92aa8_beae1c5f Change-Id: I4ce7ad0022ed34b3704a3a5b17416eabcf91dd03 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/173142 Reviewed-by: Olivier Hallot Tested-by: Jenkins Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 14476c266b80..0d61990c85ed 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 14476c266b8097805df0292dc9a07468024c12f0 +Subproject commit 0d61990c85ed2135a6064b6caf1e989e820cd65c
core.git: sd/source
sd/source/ui/view/outlview.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 4ff5a7b810d293e3d9d457049145ef5c3b1d95d0
Author: Noel Grandin
AuthorDate: Sat Sep 28 15:16:19 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 20:09:48 2024 +0200
cid#1607680 Overflowed constant
Change-Id: I8522cfe5422c187b9045858c2f94753d0f2c8714
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174123
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 07c55d7c3ee7..33d8f78ba3c5 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1176,7 +1176,9 @@ Paragraph* OutlineView::GetParagraphForPage( ::Outliner
const & rOutl, SdPage co
{
// get the number of paragraphs with ident 0 we need to skip before
// we find the actual page
-sal_uInt32 nPagesToSkip = (pPage->GetPageNum() - 1) >> 1;
+sal_uInt16 nPageNum = pPage->GetPageNum();
+assert(nPageNum > 0);
+sal_uInt32 nPagesToSkip = (nPageNum - 1) >> 1;
sal_Int32 nParaPos = 0;
Paragraph* pPara = rOutl.GetParagraph( 0 );
core.git: 2 commits - sw/source xmlhelp/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |6 --
xmlhelp/source/cxxhelp/provider/databases.cxx |2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 2596131a1fcb40cd134200035049c23113d3e141
Author: Noel Grandin
AuthorDate: Sat Sep 28 15:11:10 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 20:09:32 2024 +0200
cid#1607687 Overflowed constant
This code does not appear to be handling the case where there
is no anchor correctly, all the way back to
commit c5718b941491ffaa937767c579627444c0957b86
Author: Andreas Bille
Date: Wed Oct 31 12:08:14 2001 +
#83054#
Now reading the necessary variables( provider.cxx ),
Change-Id: Ia8f514a95ca2e3ae17129b34f0ed444cd9d0ade8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174122
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 86d521f11d89..6119d8373f92 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -592,7 +592,7 @@ void KeywordInfo::KeywordElement::init( Databases const
*pDatabases,helpdatafile
if( idx == std::u16string_view::npos )
break;
size_t h = ids.find( '#', k );
-if( h == std::u16string_view::npos || h < idx )
+if( h != std::u16string_view::npos && h < idx )
{
// found an anchor
id.push_back( OUString(ids.substr( k, h-k )) );
commit 2264538ec245839651de4e34cec45958460c4021
Author: Noel Grandin
AuthorDate: Sat Sep 28 14:59:14 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 20:09:18 2024 +0200
cid#1607691 Overflowed constant
Change-Id: Ib3f32065334769298483d4cf9131040ab28a3a1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174121
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 0f24abd95bc3..79ad75ea2007 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -828,7 +828,7 @@ namespace
// iterate over relevant redlines and decide for each whether it should
// be saved, or split + saved
SwRedlineTable& rRedlineTable =
rDoc.getIDocumentRedlineAccess().GetRedlineTable();
-for( ; nCurrentRedline < rRedlineTable.size(); nCurrentRedline++ )
+for( ; nCurrentRedline < rRedlineTable.size(); )
{
SwRangeRedline* pCurrent = rRedlineTable[ nCurrentRedline ];
SwComparePosition eCompare =
@@ -843,7 +843,7 @@ namespace
eCompare == SwComparePosition::Inside ||
eCompare == SwComparePosition::Equal )
{
-rRedlineTable.Remove( nCurrentRedline-- );
+rRedlineTable.Remove( nCurrentRedline );
// split beginning, if necessary
if( eCompare == SwComparePosition::OverlapBefore ||
@@ -868,6 +868,8 @@ namespace
// save the current redline
rArr.emplace_back( pCurrent, *pStart );
}
+else
+nCurrentRedline++;
}
// restore old redline mode
core.git: vcl/source
vcl/source/filter/imet/ios2met.cxx | 38 -
1 file changed, 17 insertions(+), 21 deletions(-)
New commits:
commit 980f28fce8ccf317ee099179b07e68a50119dc6e
Author: Noel Grandin
AuthorDate: Sat Sep 28 14:53:46 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 20:08:57 2024 +0200
cid#1607692 Overflowed constant
use less convoluted logic here
Change-Id: I786d7f857c7104358559782247c4272914299314
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174112
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/vcl/source/filter/imet/ios2met.cxx
b/vcl/source/filter/imet/ios2met.cxx
index 3b6077a648a3..0a16c07f5671 100644
--- a/vcl/source/filter/imet/ios2met.cxx
+++ b/vcl/source/filter/imet/ios2met.cxx
@@ -748,31 +748,27 @@ void OS2METReader::SetPen( const Color& rColor,
sal_uInt16 nLineWidth, PenStyle
pVirDev->SetLineColor( rColor );
aLineInfo.SetWidth( nLineWidth );
-sal_uInt16 nDotCount = 0;
-sal_uInt16 nDashCount = 0;
-switch ( ePenStyle )
+if (ePenStyle == PEN_NULL)
+eLineStyle = LineStyle::NONE;
+else if (ePenStyle == PEN_DASHDOT || ePenStyle == PEN_DOT || ePenStyle ==
PEN_DASH)
{
-case PEN_NULL :
-eLineStyle = LineStyle::NONE;
-break;
-case PEN_DASHDOT :
+sal_uInt16 nDotCount = 0;
+sal_uInt16 nDashCount = 0;
+if (ePenStyle == PEN_DASHDOT)
+{
nDashCount++;
-[[fallthrough]];
-case PEN_DOT :
nDotCount++;
-nDashCount--;
-[[fallthrough]];
-case PEN_DASH :
+}
+else if (ePenStyle == PEN_DOT)
+nDotCount++;
+else // (ePenStyle == PEN_DASH)
nDashCount++;
-aLineInfo.SetDotCount( nDotCount );
-aLineInfo.SetDashCount( nDashCount );
-aLineInfo.SetDistance( nLineWidth );
-aLineInfo.SetDotLen( nLineWidth );
-aLineInfo.SetDashLen( nLineWidth << 2 );
-eLineStyle = LineStyle::Dash;
-break;
-case PEN_SOLID:
-break; // -Wall not handled...
+aLineInfo.SetDotCount( nDotCount );
+aLineInfo.SetDashCount( nDashCount );
+aLineInfo.SetDistance( nLineWidth );
+aLineInfo.SetDotLen( nLineWidth );
+aLineInfo.SetDashLen( nLineWidth << 2 );
+eLineStyle = LineStyle::Dash;
}
aLineInfo.SetStyle( eLineStyle );
}
core.git: 2 commits - sc/source unoxml/source
sc/source/ui/inc/duplicaterecordsdlg.hxx |6 ++
unoxml/source/dom/documentbuilder.cxx| 17 +
unoxml/source/dom/documentbuilder.hxx|8 +---
3 files changed, 20 insertions(+), 11 deletions(-)
New commits:
commit 8e02696b32588e3a1eca3885450873f62213244e
Author: Caolán McNamara
AuthorDate: Fri Sep 27 21:27:10 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 20:21:02 2024 +0200
cid#1557088 Data race condition
since:
commit d181d8acbf49e2fe87c8cf53a9431e503ccced55
CommitDate: Fri Aug 25 12:44:33 2017 +0200
tdf#84237 use XErrorHandler in CDocumentBuilder
Change-Id: Iac1d2b88f2910298d30de4d12798bb38c36a0de9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174102
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/unoxml/source/dom/documentbuilder.cxx
b/unoxml/source/dom/documentbuilder.cxx
index 3be49adcd899..d24b1d7364f7 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -254,14 +254,15 @@ namespace DOM
CDocumentBuilder * const pDocBuilder =
static_cast(pctx->_private);
-if (pDocBuilder->getErrorHandler().is()) // if custom error
handler is set (using setErrorHandler ())
+Reference xErrorHandler =
pDocBuilder->getErrorHandler();
+if (xErrorHandler.is()) // if custom error handler is set (using
setErrorHandler ())
{
// Prepare SAXParseException to be passed to custom
XErrorHandler::warning function
css::xml::sax::SAXParseException
saxex(make_error_message(pctx), {}, {}, {}, {},
pctx->lastError.line,
pctx->lastError.int2);
// Call custom warning function
-
pDocBuilder->getErrorHandler()->warning(::css::uno::Any(saxex));
+xErrorHandler->warning(::css::uno::Any(saxex));
}
}
catch (const css::uno::Exception &)
@@ -284,14 +285,15 @@ namespace DOM
CDocumentBuilder * const pDocBuilder =
static_cast(pctx->_private);
-if (pDocBuilder->getErrorHandler().is()) // if custom error
handler is set (using setErrorHandler ())
+Reference xErrorHandler =
pDocBuilder->getErrorHandler();
+if (xErrorHandler.is()) // if custom error handler is set (using
setErrorHandler ())
{
// Prepare SAXParseException to be passed to custom
XErrorHandler::error function
css::xml::sax::SAXParseException
saxex(make_error_message(pctx), {}, {}, {}, {},
pctx->lastError.line,
pctx->lastError.int2);
// Call custom warning function
-pDocBuilder->getErrorHandler()->error(::css::uno::Any(saxex));
+xErrorHandler->error(::css::uno::Any(saxex));
}
}
catch (const css::uno::Exception &)
@@ -412,6 +414,13 @@ namespace DOM
m_xErrorHandler = xEH;
}
+
+Reference< XErrorHandler > CDocumentBuilder::getErrorHandler()
+{
+std::scoped_lock const g(m_Mutex);
+
+return m_xErrorHandler;
+}
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/unoxml/source/dom/documentbuilder.hxx
b/unoxml/source/dom/documentbuilder.hxx
index 7b93b170d4c1..c63a8970d289 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -104,7 +104,6 @@ namespace DOM
/// @throws css::uno::RuntimeException
css::uno::Reference< css::xml::sax::XEntityResolver >
getEntityResolver();
-
/**
Specify the ErrorHandler to be used to report errors present in
the XML document to be parsed.
@@ -115,12 +114,7 @@ namespace DOM
Get the ErrorHandler to be used to report errors present in
the XML document to be parsed.
*/
-
-const css::uno::Reference< css::xml::sax::XErrorHandler >&
getErrorHandler() const
-{
-return m_xErrorHandler;
-}
-
+css::uno::Reference< css::xml::sax::XErrorHandler > getErrorHandler();
};
}
commit 9bd20c306e3a7d049b656a96e5eef9c65a8e7994
Author: Caolán McNamara
AuthorDate: Sat Sep 28 10:36:50 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 20:20:52 2024 +0200
cid#1620316 Uninitialized scalar variable
Change-Id: I3ef7f30dc2045b0386bd7f14c0e9be34f7e67726
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174101
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
diff --git a/sc/source/ui/inc/duplicaterecordsdlg.hxx
b/sc/source/ui/inc/duplicaterecordsdlg.hxx
index aaa253af7348..07a9f64a992b 100644
--- a/sc/source/ui/inc/duplicaterecordsdlg.hxx
+++ b/sc/source/ui/inc/duplicaterecordsdlg.hxx
@@ -30,6 +30,12 @@ struct DuplicatesResponse
bool bRemove; //
core.git: 2 commits - connectivity/source wizards/com
connectivity/source/drivers/dbase/dindexnode.cxx | 22
+-
wizards/com/sun/star/wizards/report/DBColumn.java |7 ++-
wizards/com/sun/star/wizards/report/ReportTextDocument.java |2
wizards/com/sun/star/wizards/report/ReportTextImplementation.java |2
4 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit d8d4efbe1faf6e3a4a048ab4bb8f23516ce13268
Author: Caolán McNamara
AuthorDate: Sat Sep 28 11:22:38 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 20:22:40 2024 +0200
cid#1607041 PA: Public Attribute
Change-Id: I8ec74e943232f98c861e035c0da11e8d75f8fa29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174106
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java
b/wizards/com/sun/star/wizards/report/DBColumn.java
index 35bd99429a9a..d993ded1b1b0 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -46,7 +46,7 @@ public class DBColumn
private XCell xValCell;
private XTextRange xValTextCell;
private XTextCursor xValCellCursor;
-public XCell xNameCell;
+private XCell xNameCell;
private XTextRange xNameTextCell;
private boolean bAlignLeft;
private String CharFontName;
@@ -183,6 +183,11 @@ public class DBColumn
}
}
+public XCell getNameCell()
+{
+return xNameCell;
+}
+
private void getTableColumns(String TableName)
{
try
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 52d8e6d2ae96..8e1e325b874d 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -448,7 +448,7 @@ class ReportTextDocument extends
com.sun.star.wizards.text.TextDocument implemen
}
CurDBColumn = new DBColumn(CurRecordTable,
oTextTableHandler, CurDBMetaData, i -
CurDBMetaData.getGroupFieldNames().length);
}
-if (CurDBColumn.xNameCell != null)
+if (CurDBColumn.getNameCell() != null)
{
DBColumnsVector.add(CurDBColumn);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9f8e77cd05ce..ead591e5e352 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -436,7 +436,7 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
for (int i = 0; i < iCount; i++)
{
CurDBColumn = getDoc().DBColumnsVector.get(i);
-xNameCellCursor =
ReportTextDocument.createTextCursor(CurDBColumn.xNameCell);
+xNameCellCursor =
ReportTextDocument.createTextCursor(CurDBColumn.getNameCell());
xNameCellCursor.gotoStart(false);
FieldContent =
getDoc().oTextFieldHandler.getUserFieldContent(xNameCellCursor);
if (!FieldContent.equals(PropertyNames.EMPTY_STRING))
commit 645ae19dfc1645cd49df620cc62857f399974e99
Author: Caolán McNamara
AuthorDate: Thu Sep 26 08:56:35 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 20:22:30 2024 +0200
cid#1606705 Overflowed constant
and
cid#1607841 Overflowed constant
Change-Id: Ia84d2c0d29e485379fe6338a784306bc8ff5343b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx
b/connectivity/source/drivers/dbase/dindexnode.cxx
index 6857679c98f1..ba439d77bef4 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -969,28 +969,28 @@ bool ONDXPage::IsFull() const
return Count() == rIndex.getHeader().db_maxkeys;
}
-
sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
{
// binary search later
-sal_uInt16 i = NODE_NOTFOUND;
-while (++i < Count())
-if ((*this)[i].GetKey() == rSearch)
-break;
+for (sal_uInt16 i = 0, nSize = Count(); i < nSize; ++i)
+{
+if (((*this)[i]).GetKey() == rSearch)
+return i;
+}
-return (i < Count()) ? i : NODE_NOTFOUND;
+return NODE_NOTFOUND;
}
-
sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
{
-sal_uInt16 i = NODE_NOTFOUND;
-while (++i < Count())
+for (sal_uInt16 i = 0, nSize = Count(); i < nSize; ++i)
+{
if (((*this)[i]).GetChild() == pPage)
-break;
+return i;
+}
// if not found, then we assume, that the page itself points to the page
-return (i < Count())
core.git: sw/source
sw/source/filter/ww8/wrtw8sty.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8536bb07ac92ecf5a4046d5bacd968c4f8ed5763
Author: Caolán McNamara
AuthorDate: Fri Sep 27 19:27:34 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 20:22:07 2024 +0200
cid#1607672 silence Overflowed constant
Change-Id: I8f66304c961d78c9f8745c68f2e7c6a3d8283586
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174104
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index ff7d30bd84dc..c5868b517211 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -219,7 +219,7 @@ sal_uInt16 MSWordStyles::GetSlot( const SwFormat* pFormat )
const
/// Get reserved slot number during building the style table.
static sal_uInt16 BuildGetSlot(const SwFormat& rFormat)
{
-switch (sal_uInt16 nRet = rFormat.GetPoolFormatId())
+switch (sal_uInt16 nId = rFormat.GetPoolFormatId())
{
case RES_POOLCOLL_STANDARD:
return 0;
@@ -233,9 +233,11 @@ static sal_uInt16 BuildGetSlot(const SwFormat& rFormat)
case RES_POOLCOLL_HEADLINE7:
case RES_POOLCOLL_HEADLINE8:
case RES_POOLCOLL_HEADLINE9:
-nRet -= RES_POOLCOLL_HEADLINE1-1;
+{
+sal_uInt16 nRet = nId - (RES_POOLCOLL_HEADLINE1 - 1);
assert(nRet < WW8_RESERVED_SLOTS);
return nRet;
+}
}
return 0xfff;
}
core.git: sw/source
sw/source/core/unocore/unochart.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 33c4af119d9e6370316727a5b2271f80e4eef1fb
Author: Caolán McNamara
AuthorDate: Fri Sep 27 20:57:53 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 20:21:32 2024 +0200
cid#1608030 Check of thread-shared field evades lock acquisition
and
cid#1608103 Check of thread-shared field evades lock acquisition
Change-Id: Ifb3191512434f4938f02bfa1a1b6ed038b3e555e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174103
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/core/unocore/unochart.cxx
b/sw/source/core/unocore/unochart.cxx
index bd7c95880c50..10c79c82cd10 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2215,7 +2215,6 @@ void SAL_CALL SwChartDataSequence::dispose( )
if (!bMustDispose)
return;
-m_bDisposed = true;
if (m_xDataProvider.is())
{
const SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
@@ -2664,8 +2663,6 @@ void SAL_CALL SwChartLabeledDataSequence::dispose( )
if (!bMustDispose)
return;
-m_bDisposed = true;
-
// require listeners to release references to this object
lang::EventObject aEvtObj( static_cast< chart2::data::XLabeledDataSequence
* >(this) );
std::unique_lock aGuard( GetChartMutex() );
core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |6 +-
sw/qa/extras/ww8export/ww8export3.cxx| 12 ++--
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 13 -
3 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 7f84c993d3d2b5f05b18e740fea960901da57f80
Author: Justin Luth
AuthorDate: Fri Sep 27 17:03:53 2024 -0400
Commit: Justin Luth
CommitDate: Sat Sep 28 20:46:42 2024 +0200
tdf#163154 revert "tdf120224 writerfilter: consume excess bookmark
... from fields"
The intention of my 6.2 commit 579c0749bef8c980507229439715e72060c1b077
hack was to avoid importing duplicate LO-exported bookmarks.
(LO exported the bookmarks inside the field definition,
while MS normally has the bookmarks outside the field.)
So the impact of this revert should be neglible,
affecting mainly documents that LO round-tripped before 6.2
which would just import one more "Copy" of a bookmark.
The reason for doing the revert is also not terribly important.
For a few odd documents that otherwise wouldn't import a bookmark
around a field, it will allow the LO navigator a way to quickly
jump to the field (since Legacy Fields are not included
in the Navigator's field list).
Note that what I am reverting was a HACK any way.
It did a pretty good job of only ignoring LO-exported bookmarks,
since MS Word usually puts the bookmark around the OUTSIDE
of the field, while LO always puts the bookmark
inside the field definition (and thus IsOpenField())
make CppunitTest_sw_ww8export3 \
CPPUNIT_TEST_NAME=testTdf79435_legacyInputFields
make CppunitTest_sw_ooxmlexport12 \
CPPUNIT_TEST_NAME=testTdf120224_textControlCrossRef
Change-Id: Iefaf1173794c66b2a6f3e5c2143ed594de7efe35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174081
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index f5af7f65d8bc..821fe9ea6074 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -801,6 +801,10 @@
DECLARE_OOXMLEXPORT_TEST(testTdf120224_textControlCrossRef, "tdf120224_textContr
xRunEnum->nextElement(); //Text
uno::Reference xPropertySet(xRunEnum->nextElement(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(u"Bookmark"_ustr,
+ getProperty(xPropertySet,
u"TextPortionType"_ustr));
+
+xPropertySet.set(xRunEnum->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(u"TextFieldStart"_ustr,
getProperty(xPropertySet,
u"TextPortionType"_ustr));
uno::Reference xBookmark(
@@ -821,7 +825,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf120224_textControlCrossRef,
"tdf120224_textContr
uno::Reference
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(),
uno::UNO_QUERY);
// TextFields should not be turned into real bookmarks.
-CPPUNIT_ASSERT_EQUAL(static_cast(1),
xBookmarksByIdx->getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(2),
xBookmarksByIdx->getCount());
// The actual name isn't critical, but if it fails, it is worth asking why.
CPPUNIT_ASSERT_EQUAL(u"Text1"_ustr, sTextFieldName);
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index a4ba58d4c37a..c4d7276c16d1 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -416,7 +416,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf79435_legacyInputFields)
{
loadAndReload("tdf79435_legacyInputFields.docx");
//using .docx input file to verify cross-format compatibility.
-uno::Reference xFormField = getProperty<
uno::Reference >(getRun(getParagraph(5), 3),
u"Bookmark"_ustr);
+uno::Reference xFormField = getProperty<
uno::Reference >(getRun(getParagraph(5), 4),
u"Bookmark"_ustr);
uno::Reference
xParameters(xFormField->getParameters());
OUString sTmp;
@@ -440,27 +440,27 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf79435_legacyInputFields)
CPPUNIT_ASSERT_EQUAL_MESSAGE("Max Length", sal_uInt16(10), nMaxLength);
// too bad this is based on character runs - just found try trial and
error.
-xFormField = getProperty< uno::Reference
>(getRun(getParagraph(6), 2), u"Bookmark"_ustr);
+xFormField = getProperty< uno::Reference
>(getRun(getParagraph(6), 3), u"Bookmark"_ustr);
xParameters.set(xFormField->getParameters());
xParameters->getByName(u"Type"_ustr) >>= sTmp;
CPPUNIT_ASSERT_EQUAL(u"calculated"_ustr, sTmp);
-xFormField = getProperty< uno::Reference
>(getRun(getParagraph(7), 2), u"Bookmark"_ustr);
+xFormField = getProperty< uno::Reference
>(getRun(getParagraph(7), 3), u"Bookmark"_ustr);
xParameters.set(xFormField->getParameters());
xParameters
core.git: sfx2/source
sfx2/source/doc/docinf.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8535d6741ec9bd5d6105181af28f0500148d034f
Author: Noel Grandin
AuthorDate: Sat Sep 28 20:16:04 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 21:22:16 2024 +0200
cid#1607100 Overflowed constant
Change-Id: I930e8661845c3c089e8d3d5b180815b1d65d4423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174153
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index 4e8e3663707f..8a4558760ed2 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -116,6 +116,7 @@ ErrCode LoadOlePropertySet(
&& aDateTime.Day == 0 && aDateTime.Month == 0
&& aDateTime.Year == 0) )
{
+assert(aDateTime.Day <= 31);
// subtract offset 1601-01-01
aDateTime.Year -= 1601;
aDateTime.Month -= 1;
core.git: sw/source
sw/source/core/layout/pagechg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e76c7bc413af5ca1d74acb71a5a8bb6095605a89
Author: Noel Grandin
AuthorDate: Sat Sep 28 20:08:38 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 21:25:31 2024 +0200
Revert "cid#1607805 Overflowed constant"
This reverts commit f063ea562c6ba14db15b9773bdcbb18af4a72ff8.
Reason for revert: bad idea. We're not going to re-evalute the loop
condition if we use a goto
Change-Id: I8b892cd35c3560396f65619cd095a9b186ecbd24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174011
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 351ad146d6e0..d086166caaef 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -411,7 +411,6 @@ static void lcl_MakeObjs(const
sw::FrameFormats& rSpzs, SwP
// formats are in the special table of the document
for(size_t i = 0; i < rSpzs.size(); ++i )
{
-LOOP_START:
auto pSpz = rSpzs[i];
const SwFormatAnchor &rAnch = pSpz->GetAnchor();
if ( rAnch.GetPageNum() == pPage->GetPhyPageNum() )
@@ -435,7 +434,8 @@ static void lcl_MakeObjs(const
sw::FrameFormats& rSpzs, SwP
{
OSL_FAIL( "DrawObject not found." );
pSpz->GetDoc()->DelFrameFormat( pSpz );
-goto LOOP_START;
+--i;
+continue;
}
// The object might be anchored to another page, e.g. when
inserting
// a new page due to a page descriptor change. In such cases, the
core.git: starmath/inc starmath/source
starmath/inc/node.hxx| 24
starmath/inc/rect.hxx|2 +-
starmath/source/node.cxx | 22 +++---
starmath/source/visitors.cxx |2 +-
4 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit c7c52f60657baa65e104530247ed05a90479e99e
Author: Deepanshu Sharma <129deepanshusha...@gmail.com>
AuthorDate: Fri Sep 27 02:17:29 2024 +0530
Commit: Hossein
CommitDate: Sat Sep 28 23:21:40 2024 +0200
tdf#114441 change width,height to tools::Long in starmath
Change-Id: I69e0968643c5c30fbe7f67dfb392d176ab796fa4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174000
Reviewed-by: Hossein
Tested-by: Jenkins
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index f59c23ea426f..778c11c2a968 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -369,8 +369,8 @@ public:
void SetScaleMode(SmScaleMode eMode) { meScaleMode = eMode; }
//visual stuff TODO comment
-virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth);
-virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight);
+virtual void AdaptToX(OutputDevice &rDev, tools::Long nWidth);
+virtual void AdaptToY(OutputDevice &rDev, tools::Long nHeight);
/**
* Gets the node type.
@@ -671,8 +671,8 @@ public:
{}
//visual stuff TODO comment
-virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth) override;
-virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override;
+virtual void AdaptToX(OutputDevice &rDev, tools::Long nWidth) override;
+virtual void AdaptToY(OutputDevice &rDev, tools::Long nHeight) override;
/**
* Prepares the SmRect to render.
@@ -718,8 +718,8 @@ public:
tools::Polygon &GetPolygon() { return maPoly; }
//visual stuff TODO comment
-virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth) override;
-virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override;
+virtual void AdaptToX(OutputDevice &rDev, tools::Long nWidth) override;
+virtual void AdaptToY(OutputDevice &rDev, tools::Long nHeight) override;
/**
* Prepares the SmRect to render.
@@ -962,8 +962,8 @@ public:
explicit SmMathSymbolNode(const SmToken &rNodeToken);
//visual stuff TODO comment
-virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth) override;
-virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override;
+virtual void AdaptToX(OutputDevice &rDev, tools::Long nWidth) override;
+virtual void AdaptToY(OutputDevice &rDev, tools::Long nHeight) override;
/**
* Prepare preliminary settings about font and text
@@ -1016,7 +1016,7 @@ public:
*/
class SmRootSymbolNode final : public SmMathSymbolNode
{
-sal_uLong mnBodyWidth; // width of body (argument) of root sign
+tools::Long mnBodyWidth; // width of body (argument) of root sign
public:
explicit SmRootSymbolNode(const SmToken &rNodeToken)
@@ -1028,11 +1028,11 @@ public:
* Allows to know how long is the root and paint it.
* @return body width
*/
-sal_uLong GetBodyWidth() const {return mnBodyWidth;};
+tools::Long GetBodyWidth() const {return mnBodyWidth;};
//visual stuff TODO comment
-virtual void AdaptToX(OutputDevice &rDev, sal_uLong nHeight) override;
-virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override;
+virtual void AdaptToX(OutputDevice &rDev, tools::Long nHeight) override;
+virtual void AdaptToY(OutputDevice &rDev, tools::Long nHeight) override;
/**
* Accept a visitor.
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 0b28581a00f9..5960e1b48f65 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -114,7 +114,7 @@ public:
void SetItalicSpaces(tools::Long nLeftSpace, tools::Long
nRightSpace);
-void SetWidth(sal_uLong nWidth) { aSize.setWidth(nWidth); }
+void SetWidth(tools::Long nWidth) { aSize.setWidth(nWidth); }
void SetLeft(tools::Long nLeft);
void SetRight(tools::Long nRight);
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 022596b4e2d2..983fa174c7d9 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -240,12 +240,12 @@ void SmNode::Move(const Point& rVector)
ForEachNonNull(this, [&rVector](SmNode *pNode){pNode->Move(rVector);});
}
-void SmNode::AdaptToX(OutputDevice &/*rDev*/, sal_uLong /*nWidth*/)
+void SmNode::AdaptToX(OutputDevice &/*rDev*/, tools::Long /*nWidth*/)
{
}
-void SmNode::AdaptToY(OutputDevice &/*rDev*/, sal_uLong /*nHeight*/)
+void SmNode::AdaptToY(OutputDevice &/*rDev*/, tools::Long /*nHeight*/)
{
}
@@ -1715,13 +1715,13 @@ SmPolyLineNode::SmPolyLineNode(const SmToken
&rNodeToken)
}
-void SmPolyLineNode::AdaptToX(OutputDevice &/*rDev*/, sal_uLong nNewWidth)
+void SmPolyLineNode::AdaptToX(OutputDevice &/*rDev*/
core.git: filter/source
filter/source/config/cache/basecontainer.hxx |9 - 1 file changed, 4 insertions(+), 5 deletions(-) New commits: commit b01d057df75096792c53ba7f7a80c3db5afb1ba5 Author: Caolán McNamara AuthorDate: Sat Sep 28 19:54:50 2024 +0100 Commit: Caolán McNamara CommitDate: Sat Sep 28 22:01:20 2024 +0200 This can be protected instead of public Change-Id: I8389173bd155d7334445b991754e54c7641e63e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174155 Reviewed-by: Caolán McNamara Tested-by: Jenkins diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index f1f63b10bc42..f27d027a8ad4 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -118,6 +118,10 @@ class BaseContainer : public ::cppu::WeakImplHelper< css::lang::XServiceInfo virtual ~BaseContainer() override; +// helper + +protected: + /** @short initialize this generic instance with some specialized values from our derived object. @@ -147,11 +151,6 @@ class BaseContainer : public ::cppu::WeakImplHelper< css::lang::XServiceInfo FilterCache::EItemType eType ); -// helper - -protected: - - /** @short check if the underlying configuration data was already loaded and do it if necessary automatically. */
help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk |1 source/text/scalc/01/0505.xhp | 55 -- 2 files changed, 56 deletions(-) New commits: commit b038ab4ef42ff67d505cdf5deddfe492852ad56b Author: Olivier Hallot AuthorDate: Sat Sep 28 11:08:34 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 16:48:10 2024 +0200 tdf#162607 disambiguate hid2file.js, uno:SheetMenu + Remove singleton help file used nowhere (superseeded by scalc/main0116.xhp) Change-Id: I5e675d84c9e54fcf0d2bf7c3f0c46bd6de6d43aa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174143 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 628b2da17a..c823b10f24 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -97,7 +97,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/05030300 \ helpcontent2/source/text/scalc/01/05030400 \ helpcontent2/source/text/scalc/01/0504 \ -helpcontent2/source/text/scalc/01/0505 \ helpcontent2/source/text/scalc/01/05050100 \ helpcontent2/source/text/scalc/01/05050300 \ helpcontent2/source/text/scalc/01/0506 \ diff --git a/source/text/scalc/01/0505.xhp b/source/text/scalc/01/0505.xhp deleted file mode 100644 index 0bb80198ac..00 --- a/source/text/scalc/01/0505.xhp +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - -Sheet -/text/scalc/01/0505.xhp - - -Sun Microsystems, Inc. - - - - -CTL;right-to-left sheets -sheets;right-to-left -right-to-left text;spreadsheets -mw changed "right-to-left;..." - -Sheet -Sets the sheet name and hides or shows selected sheets. - - - - -Rename - - -Show - -If a sheet has been hidden, the Show Sheet dialog opens, which allows you to select a sheet to be shown again. - -Right-To-Left -Changes the orientation of the current sheet to Right-To-Left if CTL support is enabled. - -
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7a43dd7a85efeb1febf822101c6828cf4050660 Author: Olivier Hallot AuthorDate: Sat Sep 28 11:48:11 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 16:48:11 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to b038ab4ef42ff67d505cdf5deddfe492852ad56b - tdf#162607 disambiguate hid2file.js, uno:SheetMenu + Remove singleton help file used nowhere (superseeded by scalc/main0116.xhp) Change-Id: I5e675d84c9e54fcf0d2bf7c3f0c46bd6de6d43aa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174143 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6ad81aa6d12b..b038ab4ef42f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6ad81aa6d12b615374b39d0eb7e2dec4e12ebcbc +Subproject commit b038ab4ef42ff67d505cdf5deddfe492852ad56b
Alexandru Soponar license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
help.git: 2 commits - source/text
source/text/sdatabase/menuedit.xhp |6 +++--- source/text/simpress/00/0004.xhp |1 - 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 909308152bef7ce6bc4bdac384aaf55f2431b7eb Author: Olivier Hallot AuthorDate: Sat Sep 28 11:45:27 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 16:50:23 2024 +0200 tdf#162607 disambiguate hid2file.js, paste special + Removed bookmark from sdatabase file Change-Id: I9922d86768ea79ed7fa652fb0af62ba165d82aee Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174147 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdatabase/menuedit.xhp b/source/text/sdatabase/menuedit.xhp index db5bf769fe..431f229878 100644 --- a/source/text/sdatabase/menuedit.xhp +++ b/source/text/sdatabase/menuedit.xhp @@ -35,9 +35,9 @@ Copies the selected object to the clipboard. Paste Inserts an item from the clipboard. If you want, you can insert forms and reports, including subfolders, from one database file to another. - -Paste Special -Inserts an item from the clipboard. If you want, you can insert forms and reports, including subfolders, from one database file to another. + + + commit ac18fb999e675f78ce6f2b687a67ea001edf5ccd Author: Olivier Hallot AuthorDate: Sat Sep 28 11:33:47 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 16:50:11 2024 +0200 tdf#162607 disambiguate hid2file.js, SaveGraphic + Removed bookmark from simpress file Change-Id: Ia9ddb3cd9f2c1d6b8a611e958d5b966d882092d9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174146 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/simpress/00/0004.xhp b/source/text/simpress/00/0004.xhp index 29280fa6c5..144b7408f3 100644 --- a/source/text/simpress/00/0004.xhp +++ b/source/text/simpress/00/0004.xhp @@ -28,7 +28,6 @@ To access this command - Save as Picture context menu, #i63795 Opens a dialog to save the selected bitmap picture as a file. The default file format is the internal format of the image. Custom Animation context menu
help.git: source/text
source/text/shared/01/scrollbars.xhp | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit 446f60711a2d62504ac3011987ad22fb64af6ffc Author: Olivier Hallot AuthorDate: Sat Sep 28 11:20:39 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 16:49:40 2024 +0200 tdf#162607 disambiguate hid2file.js, uno:ScrollBar + Remove useless bookmark Change-Id: I38689febf073c29353fb1b7e089617eed3d52b69 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174144 Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/source/text/shared/01/scrollbars.xhp b/source/text/shared/01/scrollbars.xhp index ff64a7d6de..03e988c901 100644 --- a/source/text/shared/01/scrollbars.xhp +++ b/source/text/shared/01/scrollbars.xhp @@ -10,20 +10,19 @@ --> - + Scroll Bars /text/shared/01/scrollbars.xhp - - + tooltips;in scroll bars Scroll Bars -Show or hide the horizontal and vertical scroll bars that are used to change the viewable area of a document that doesn't fit within the window. +Show or hide the horizontal and vertical scroll bars that are used to change the viewable area of a document that doesn't fit within the window. @@ -33,7 +32,7 @@ -Icon Scroll Bars +Icon Scroll Bars @@ -54,7 +53,7 @@ -Icon Horizontal Scroll Bar +Icon Horizontal Scroll Bar @@ -79,7 +78,7 @@ -Icon Vertical Scroll Bar +Icon Vertical Scroll Bar
core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b6236cb8f79c2d149e8f66753602a335fd0e97c Author: Olivier Hallot AuthorDate: Sat Sep 28 11:49:56 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 16:49:56 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d81dc3348d3ac27155b0f9b021d95c7599848150 - tdf#162607 disambiguate hid2file.js, TableBoundaries + Removed bookmark from the options help page Change-Id: If3b3aa13283e0f6733640676137d834fb8662475 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174145 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 446f60711a2d..d81dc3348d3a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 446f60711a2d62504ac3011987ad22fb64af6ffc +Subproject commit d81dc3348d3ac27155b0f9b021d95c7599848150 commit 52d1da1f9a163bcee3954e4a78fa4014f7c5edfc Author: Olivier Hallot AuthorDate: Sat Sep 28 11:49:40 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 16:49:40 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 446f60711a2d62504ac3011987ad22fb64af6ffc - tdf#162607 disambiguate hid2file.js, uno:ScrollBar + Remove useless bookmark Change-Id: I38689febf073c29353fb1b7e089617eed3d52b69 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174144 Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index b038ab4ef42f..446f60711a2d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b038ab4ef42ff67d505cdf5deddfe492852ad56b +Subproject commit 446f60711a2d62504ac3011987ad22fb64af6ffc
core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5297f109ae5748867f65df795e9452a4abdad21b Author: Olivier Hallot AuthorDate: Sat Sep 28 11:50:24 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 16:50:24 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 909308152bef7ce6bc4bdac384aaf55f2431b7eb - tdf#162607 disambiguate hid2file.js, paste special + Removed bookmark from sdatabase file Change-Id: I9922d86768ea79ed7fa652fb0af62ba165d82aee Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174147 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ac18fb999e67..909308152bef 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ac18fb999e675f78ce6f2b687a67ea001edf5ccd +Subproject commit 909308152bef7ce6bc4bdac384aaf55f2431b7eb commit a80a28f4d325087a1e482b699aa09bab65596d06 Author: Olivier Hallot AuthorDate: Sat Sep 28 11:50:12 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 16:50:12 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to ac18fb999e675f78ce6f2b687a67ea001edf5ccd - tdf#162607 disambiguate hid2file.js, SaveGraphic + Removed bookmark from simpress file Change-Id: Ia9ddb3cd9f2c1d6b8a611e958d5b966d882092d9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174146 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d81dc3348d3a..ac18fb999e67 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d81dc3348d3ac27155b0f9b021d95c7599848150 +Subproject commit ac18fb999e675f78ce6f2b687a67ea001edf5ccd
help.git: source/text
source/text/shared/optionen/01040200.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d81dc3348d3ac27155b0f9b021d95c7599848150 Author: Olivier Hallot AuthorDate: Sat Sep 28 11:28:44 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 16:49:56 2024 +0200 tdf#162607 disambiguate hid2file.js, TableBoundaries + Removed bookmark from the options help page Change-Id: If3b3aa13283e0f6733640676137d834fb8662475 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174145 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/01040200.xhp b/source/text/shared/optionen/01040200.xhp index 44d48ca5b8..957aa4321e 100644 --- a/source/text/shared/optionen/01040200.xhp +++ b/source/text/shared/optionen/01040200.xhp @@ -68,7 +68,7 @@ Tables Displays the tables contained in your document. -To display the table boundaries, right-click any table and choose Table Boundaries, or choose Table - Table Boundaries in a Writer document. +To display the table boundaries, right-click any table and choose Table Boundaries, or choose Table - Table Boundaries in a Writer document. Drawings and controls Displays the drawings and controls contained in your document. Comments
help.git: source/text
source/text/sdatabase/menuinsert.xhp | 36 +- source/text/sdatabase/toolbar_form.xhp | 32 source/text/sdatabase/toolbar_query.xhp | 36 +- source/text/sdatabase/toolbar_report.xhp | 38 +-- source/text/sdatabase/toolbar_table.xhp | 60 +++ 5 files changed, 101 insertions(+), 101 deletions(-) New commits: commit 14476c266b8097805df0292dc9a07468024c12f0 Author: Olivier Hallot AuthorDate: Sat Sep 28 12:40:46 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 17:47:42 2024 +0200 tdf#162607 disambiguate hid2file.js, DBNew* + Removed bookmark from the toolbars help page + refactor Change-Id: Ie51d6b61f735f041b677d711203729476af4625d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174148 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdatabase/menuinsert.xhp b/source/text/sdatabase/menuinsert.xhp index 14be6017b7..b41d34a46c 100644 --- a/source/text/sdatabase/menuinsert.xhp +++ b/source/text/sdatabase/menuinsert.xhp @@ -19,7 +19,7 @@ -Insert +Insert /text/sdatabase/menuinsert.xhp @@ -27,22 +27,22 @@ Insert -The Insert menu of a database window. -Form -Opens a new text document in form mode. -Report -Starts the Report Builder window for the selected table, view, or query. -Query (Design View) -Opens a new query in design mode. -Query (SQL View) -Opens a new query in SQL mode. -Table Design -Opens the table design view. -View Design -Opens a new view in design mode. -View (Simple) -Opens a new view in SQL mode. -Folder -Opens a dialog where you can save a new folder in the database file. +The Insert menu of a database window. +Form +Opens a new text document in form mode. +Report +Starts the Report Builder window for the selected table, view, or query. +Query (Design View) +Opens a new query in design mode. +Query (SQL View) +Opens a new query in SQL mode. +Table Design +Opens the table design view. +View Design +Opens a new view in design mode. +View (Simple) +Opens a new view in SQL mode. +Folder +Opens a dialog where you can save a new folder in the database file. diff --git a/source/text/sdatabase/toolbar_form.xhp b/source/text/sdatabase/toolbar_form.xhp index 7e8701bf8f..847db245ad 100644 --- a/source/text/sdatabase/toolbar_form.xhp +++ b/source/text/sdatabase/toolbar_form.xhp @@ -11,83 +11,83 @@ -Database Form Toolbar +Database Form Toolbar /text/sdatabase/toolbar_form.xhp Database Form Toolbar - + New database form -Icon New Database Form +Icon New Database Form -Creates a new database form. +Creates a new database form. - + Open database form -Icon Open Form +Icon Open Form -Opens the selected form so you can enter, edit, or delete records. +Opens the selected form so you can enter, edit, or delete records. - + Edit -Icon Edit Form +Icon Edit Form -Opens the selected form so you can change the layout. +Opens the selected form so you can change the layout. - + Delete -Icon Delete Form +Icon Delete Form -Deletes the selected form. +Deletes the selected form. - + Rename -Icon Rename Form +Icon Rename Form -Renames the selected form. +Renames the selected form. diff --git a/source/text/sdatabase/toolbar_query.xhp b/source/text/sdatabase/toolbar_query.xhp index 0aa32514c0..30a53b0dae 100644 --- a/source/text/sdatabase/toolbar_query.xhp +++ b/source/text/sdatabase/toolbar_query.xhp @@ -11,24 +11,24 @@ -Database Query Toolbar +Database Query Toolbar /text/sdatabase/toolbar_query.xhp Database Query Toolbar - + New database query -Icon New Database Query +Icon New Database Query
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a49cbbebe11a7394bcfc9145794f8659a8c9471 Author: Olivier Hallot AuthorDate: Sat Sep 28 12:47:42 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 17:47:42 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 14476c266b8097805df0292dc9a07468024c12f0 - tdf#162607 disambiguate hid2file.js, DBNew* + Removed bookmark from the toolbars help page + refactor Change-Id: Ie51d6b61f735f041b677d711203729476af4625d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174148 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 909308152bef..14476c266b80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 909308152bef7ce6bc4bdac384aaf55f2431b7eb +Subproject commit 14476c266b8097805df0292dc9a07468024c12f0
core.git: 2 commits - dbaccess/source sw/source
dbaccess/source/filter/hsqldb/utils.cxx |3 ++-
sw/source/core/layout/pagechg.cxx |4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit c2306ddbac82e643cf05773ce39fe09195937af6
Author: Noel Grandin
AuthorDate: Sat Sep 28 14:24:50 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 18:08:33 2024 +0200
cid#1607790 Overflowed constant
Change-Id: Ia2b180d6a93f139a0f83653ee45b4ad929ccef45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174110
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/filter/hsqldb/utils.cxx
b/dbaccess/source/filter/hsqldb/utils.cxx
index d8addd33623e..4ed05ae5075a 100644
--- a/dbaccess/source/filter/hsqldb/utils.cxx
+++ b/dbaccess/source/filter/hsqldb/utils.cxx
@@ -90,7 +90,7 @@ OUString utils::convertToUTF8(std::string_view original)
OUString utils::getTableNameFromStmt(std::u16string_view sSql)
{
-auto stmtComponents = comphelper::string::split(sSql, sal_Unicode(u' '));
+std::vector stmtComponents = comphelper::string::split(sSql,
sal_Unicode(u' '));
assert(stmtComponents.size() > 2);
auto wordIter = stmtComponents.begin();
@@ -105,6 +105,7 @@ OUString utils::getTableNameFromStmt(std::u16string_view
sSql)
if (wordIter->indexOf("\"") >= 0)
{
size_t nAposBegin = sSql.find('"');
+assert(nAposBegin != std::u16string_view::npos); // make coverity happy
size_t nAposEnd = nAposBegin;
bool bProperEndAposFound = false;
while (!bProperEndAposFound)
commit f063ea562c6ba14db15b9773bdcbb18af4a72ff8
Author: Noel Grandin
AuthorDate: Sat Sep 28 14:19:23 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 18:08:25 2024 +0200
cid#1607805 Overflowed constant
Change-Id: Id146853a86a54597a1e07efba6c86abc10d93796
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174109
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index d086166caaef..351ad146d6e0 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -411,6 +411,7 @@ static void lcl_MakeObjs(const
sw::FrameFormats& rSpzs, SwP
// formats are in the special table of the document
for(size_t i = 0; i < rSpzs.size(); ++i )
{
+LOOP_START:
auto pSpz = rSpzs[i];
const SwFormatAnchor &rAnch = pSpz->GetAnchor();
if ( rAnch.GetPageNum() == pPage->GetPhyPageNum() )
@@ -434,8 +435,7 @@ static void lcl_MakeObjs(const
sw::FrameFormats& rSpzs, SwP
{
OSL_FAIL( "DrawObject not found." );
pSpz->GetDoc()->DelFrameFormat( pSpz );
---i;
-continue;
+goto LOOP_START;
}
// The object might be anchored to another page, e.g. when
inserting
// a new page due to a page descriptor change. In such cases, the
core.git: sc/source
sc/source/core/tool/chartpos.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit aea48c1eb8f42ba620008a1b2119f80dbbb9c4ba
Author: Noel Grandin
AuthorDate: Sat Sep 28 14:41:33 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 28 18:08:41 2024 +0200
cid#1607751 Overflowed constant
help out coverity by asserting what should be true here
Change-Id: I1c98c29cccf0fd40eb6cc19699428872a5bf56a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174111
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index 780b8f4ac982..51736ecd23a3 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -142,6 +142,7 @@ void ScChartPositioner::GlueState()
if ( i < nRanges )
pR = &(*aRangeListRef)[i];
}
+assert(nEndCol >= nStartCol);
SCCOL nC = nEndCol - nStartCol + 1;
if ( nC == 1 )
{
core.git: 2 commits - vcl/inc vcl/qt5
vcl/inc/qt5/QtInstanceDialog.hxx|6 ++
vcl/inc/qt5/QtInstanceMessageDialog.hxx |6 --
vcl/qt5/QtBuilder.cxx | 22 +-
vcl/qt5/QtInstanceDialog.cxx|2 ++
vcl/qt5/QtInstanceMessageDialog.cxx |2 --
5 files changed, 29 insertions(+), 9 deletions(-)
New commits:
commit 8f5d8342e47852eac0fd5f42b69b6ac28ebfe7c5
Author: Michael Weghorn
AuthorDate: Sat Sep 28 00:30:29 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:35:58 2024 +0200
tdf#130857 qt weld: Move button response prop to QtInstanceDialog
It will be used for QDialog as well, not just QMessageBox
Change-Id: I887b3fe45beea40cc92f2b0b77f316ad73d7f922
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174078
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/inc/qt5/QtInstanceDialog.hxx b/vcl/inc/qt5/QtInstanceDialog.hxx
index 6efa77818745..dcfa0197aab0 100644
--- a/vcl/inc/qt5/QtInstanceDialog.hxx
+++ b/vcl/inc/qt5/QtInstanceDialog.hxx
@@ -47,6 +47,12 @@ public:
virtual void set_default_response(int) override;
virtual weld::Container* weld_content_area() override;
+
+/**
+* Name of the property to set on a QPushButton that holds the
+* int VCL response code of that button.
+*/
+static const char* const PROPERTY_VCL_RESPONSE_CODE;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/QtInstanceMessageDialog.hxx
b/vcl/inc/qt5/QtInstanceMessageDialog.hxx
index 2b73566bf574..5c09d5090781 100644
--- a/vcl/inc/qt5/QtInstanceMessageDialog.hxx
+++ b/vcl/inc/qt5/QtInstanceMessageDialog.hxx
@@ -52,12 +52,6 @@ public:
const std::function& func) override;
virtual void response(int nResponse) override;
-/**
-* Name of the property to set on a QPushButton that holds the
-* int VCL response code of that button.
-*/
-static const char* const PROPERTY_VCL_RESPONSE_CODE;
-
private:
virtual QPushButton* buttonForResponseCode(int nResponse);
diff --git a/vcl/qt5/QtInstanceDialog.cxx b/vcl/qt5/QtInstanceDialog.cxx
index 3f1df87f2741..2fd0e0900a31 100644
--- a/vcl/qt5/QtInstanceDialog.cxx
+++ b/vcl/qt5/QtInstanceDialog.cxx
@@ -9,6 +9,8 @@
#include
+const char* const QtInstanceDialog::PROPERTY_VCL_RESPONSE_CODE =
"response-code";
+
QtInstanceDialog::QtInstanceDialog(QDialog* pDialog)
: QtInstanceWindow(pDialog)
, m_pDialog(pDialog)
diff --git a/vcl/qt5/QtInstanceMessageDialog.cxx
b/vcl/qt5/QtInstanceMessageDialog.cxx
index 76e370ea10d7..a907f6740960 100644
--- a/vcl/qt5/QtInstanceMessageDialog.cxx
+++ b/vcl/qt5/QtInstanceMessageDialog.cxx
@@ -12,8 +12,6 @@
#include
-const char* const QtInstanceMessageDialog::PROPERTY_VCL_RESPONSE_CODE =
"response-code";
-
QtInstanceMessageDialog::QtInstanceMessageDialog(QMessageBox* pMessageDialog)
: QtInstanceDialog(pMessageDialog)
, m_pMessageDialog(pMessageDialog)
commit 70bbd7f6bd6719ecde1dd3fbb1c2a89e68575a2e
Author: Michael Weghorn
AuthorDate: Sat Sep 28 00:26:52 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:35:48 2024 +0200
tdf#130857 qt weld: Ensure dialog button box is last in layout
For QDialog, make sure that if a button box is included in
the dialog's layout, that this is the last item in the layout,
by removing from the layout and adding it at the end again.
I don't see any explicit child index explicitly being set in
the .ui file for the "Help" -> "License Information" dialog
("sfx/ui/licensedialog.ui").
Potentially GTK implicitly visually makes the dialog's
button box the last item in the dialog.
Corresponding child is this one:
Potentially the ``
identifies this as the dialog's button box that should
be last, at least dialog newly created in glade
also has that set.
For QMessageBox, which is a QDialog subclass, this
special handling is not needed, as its default
button box is used, which is already at the right
place.
This addresses the first aspect mentioned in
previous commit:
Change-Id: Ic9393755ec474f77ff22a1115e3cccba9d7b26cb
Author: Michael Weghorn
Date: Sat Sep 28 00:07:28 2024 +0200
tdf#130857 qt weld: Add initial support for dialog and label
> However, currently buttons and the label with the text
> are in the wrong order (i.e. buttons are above the text)
Still missing:
> and clicking the buttons doesn't yet have any effect.
Change-Id: Id991551548c1e54fdf2e169886a6c67fc307931f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174077
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 095b3b9c0b20..63fa67869d6d 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.
core.git: 2 commits - vcl/inc vcl/qt5
vcl/inc/qt5/QtBuilder.hxx |2 +-
vcl/inc/qt5/QtInstanceBuilder.hxx |2 +-
vcl/qt5/QtBuilder.cxx | 29 +
vcl/qt5/QtInstanceBuilder.cxx |8 +---
4 files changed, 32 insertions(+), 9 deletions(-)
New commits:
commit 4c7f4ed28e093963f58130c52ebcd5f6c66b4bbc
Author: Michael Weghorn
AuthorDate: Sat Sep 28 00:07:28 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:35:41 2024 +0200
tdf#130857 qt weld: Add initial support for dialog and label
Add initial support for the "GtkDialog" and "GtkLabel" objects
in .ui files by creating corresponding Qt widgets
(QDialog for "GtkDialog" and QLabel for "GtkLabel").
This makes the elements of the "Help" -> "License Information"
show up once the .ui file of that that dialog
("sfx/ui/licensedialog.ui") is added to the set of supported
.ui files.
However, currently buttons and the label with the text
are in the wrong order (i.e. buttons are above the text)
and clicking the buttons doesn't yet have any effect.
Those aspects will be addressed in separate commits
before actually claiming support for the dialog
in QtInstanceBuilder::IsUIFileSupported.
Change-Id: Ic9393755ec474f77ff22a1115e3cccba9d7b26cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174076
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/inc/qt5/QtInstanceBuilder.hxx
b/vcl/inc/qt5/QtInstanceBuilder.hxx
index 3c9fec8b1189..d98c85c1dee4 100644
--- a/vcl/inc/qt5/QtInstanceBuilder.hxx
+++ b/vcl/inc/qt5/QtInstanceBuilder.hxx
@@ -30,7 +30,7 @@ public:
static bool IsUIFileSupported(const OUString& rUIFile);
virtual std::unique_ptr weld_message_dialog(const
OUString& id) override;
-virtual std::unique_ptr weld_dialog(const OUString&)
override;
+virtual std::unique_ptr weld_dialog(const OUString& rId)
override;
virtual std::unique_ptr weld_assistant(const OUString&)
override;
virtual std::unique_ptr create_screenshot_window() override;
virtual std::unique_ptr weld_widget(const OUString&)
override;
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 36eaa3f6e96e..095b3b9c0b20 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -16,6 +16,7 @@
#include
#include
+#include
#include
#include
@@ -133,6 +134,14 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
pObject = new QPushButton(pParentWidget);
}
}
+else if (sName == u"GtkDialog")
+{
+pObject = new QDialog(pParentWidget);
+}
+else if (sName == u"GtkLabel")
+{
+pObject = new QLabel(pParentWidget);
+}
else
{
SAL_WARN("vcl.qt", "Widget type not supported yet: "
@@ -212,6 +221,16 @@ void QtBuilder::setProperties(QObject* pObject, stringmap&
rProps)
}
}
}
+else if (QLabel* pLabel = qobject_cast(pObject))
+{
+for (auto const & [ rKey, rValue ] : rProps)
+{
+if (rKey == u"label")
+pLabel->setText(toQString(rValue));
+else if (rKey == u"wrap")
+pLabel->setWordWrap(toBool(rValue));
+}
+}
else if (QPushButton* pButton = qobject_cast(pObject))
{
for (auto const & [ rKey, rValue ] : rProps)
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 611d5899063b..ee40033cfa86 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -47,10 +47,12 @@ std::unique_ptr
QtInstanceBuilder::weld_message_dialog(cons
return xRet;
}
-std::unique_ptr QtInstanceBuilder::weld_dialog(const OUString&)
+std::unique_ptr QtInstanceBuilder::weld_dialog(const OUString&
rId)
{
-assert(false && "Not implemented yet");
-return nullptr;
+QDialog* pDialog = m_xBuilder->get(rId);
+std::unique_ptr xRet(pDialog ?
std::make_unique(pDialog)
+ : nullptr);
+return xRet;
}
std::unique_ptr QtInstanceBuilder::weld_assistant(const
OUString&)
commit f14b6a9c2d906f11049326a69cd4bddd072ab626
Author: Michael Weghorn
AuthorDate: Fri Sep 27 23:00:46 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:35:33 2024 +0200
tdf#130857 qt weld: Use QDialog* as param for findButtonBox
Don't restrict to QMessageBox, but allow using the
method with any QDialog, and don't assert that
the dialog has a layout set in this case.
The method will be reused in an upcoming commit.
Change-Id: I1992f2eb4f34b25e487bbd349631b6ecd4365c95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174075
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/inc/qt5/QtBuilder.hxx b/vcl/inc/qt5/QtBuilder.hxx
index 3617f45f57fd..6ae06e3536b8 100644
--- a/vcl/inc/qt5/QtBuilder.hxx
+++ b/vcl/inc/qt5/QtBuilder.hxx
@@ -
core.git: 2 commits - sc/uiconfig vcl/qt5
sc/uiconfig/scalc/ui/checkwarningdialog.ui | 38 ++---
vcl/qt5/QtBuilder.cxx |4 +++
2 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit 0d927b52a079e73a0ab8760f583360466628db0b
Author: Michael Weghorn
AuthorDate: Fri Sep 27 20:15:11 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:49 2024 +0200
tdf#130857 qt weld: Ignore placeholders
In QtBuilder, ignore placeholders as encountered e.g. in
"sc/uiconfig/scalc/ui/checkwarningdialog.ui" (that's not
yet in the list of supported .ui files for QtInstanceBuilder
yet).
VclBuilder mostly ignores them as well, see
VclBuilder::makeObject.
Change-Id: I68481e31365561719af5e72ee20adb428b642941
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174071
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 09e90354fc6e..58263b981cf8 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -70,6 +70,10 @@ QObject* QtBuilder::insertObject(QObject* pParent, const
OUString& rClass, const
QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName,
const OUString& sID,
stringmap& rMap)
{
+// ignore placeholders
+if (sName.empty())
+return nullptr;
+
QWidget* pParentWidget = qobject_cast(pParent);
QObject* pObject = nullptr;
commit 4dc918239879fe3252d803b62834592c6d1c495b
Author: Michael Weghorn
AuthorDate: Fri Sep 27 20:04:43 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:42 2024 +0200
sc: Resave checkwarningdialog.ui with glade 3.40
Change-Id: Idb8efd7a8be06436b16572bfcf1d352a823e2497
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174070
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/sc/uiconfig/scalc/ui/checkwarningdialog.ui
b/sc/uiconfig/scalc/ui/checkwarningdialog.ui
index f1813e48b254..06a410129592 100644
--- a/sc/uiconfig/scalc/ui/checkwarningdialog.ui
+++ b/sc/uiconfig/scalc/ui/checkwarningdialog.ui
@@ -1,30 +1,30 @@
-
+
-False
+False
False
True
-dialog
-warning
+dialog
+warning
You are pasting data into cells
that already contain data.
-Do you really want to overwrite
the existing data?
+Do you really want to overwrite
the existing data?
-False
+False
vertical
2
-False
+False
True
_Help
True
-True
-True
+True
+True
True
@@ -38,8 +38,8 @@
_No
True
-True
-True
+True
+True
True
@@ -52,10 +52,10 @@
_Yes
True
-True
-True
-True
-True
+True
+True
+True
+True
True
@@ -75,12 +75,12 @@
Warn me about this in the future.
True
-True
-False
+True
+False
start
-True
+True
True
-True
+True
False
core.git: 3 commits - vcl/qt5
vcl/qt5/QtBuilder.cxx | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 592665ce867d51ed3dcf95fd0f06fd22dc2804e8
Author: Michael Weghorn
AuthorDate: Fri Sep 27 21:56:34 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:35:13 2024 +0200
tdf#130857 qt weld: Avoid unnecessary OUString copy
Change-Id: I36802f84070e579b714b696144536a2f130e2f7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174074
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index b93e59c15a63..5d434dc58d71 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -183,10 +183,8 @@ void QtBuilder::setProperties(QObject* pObject, stringmap&
rProps)
{
if (QMessageBox* pMessageBox = qobject_cast(pObject))
{
-for (auto const & [ Key, rValue ] : rProps)
+for (auto const & [ rKey, rValue ] : rProps)
{
-OUString rKey = Key;
-
if (rKey == u"text")
{
pMessageBox->setText(toQString(rValue));
commit a9c637da431485f2e0e27045ccae10866c587538
Author: Michael Weghorn
AuthorDate: Fri Sep 27 21:52:18 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:35:05 2024 +0200
tdf#130857 qt weld: Use "p" prefix for pointer param name
Change-Id: I732b67ef6f864fcbb1724b6d6bc3290417660dcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174073
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 23f5e59c4f84..b93e59c15a63 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -179,9 +179,9 @@ void QtBuilder::set_response(std::u16string_view sID, short
nResponse)
pPushButton->setProperty(QtInstanceMessageDialog::PROPERTY_VCL_RESPONSE_CODE,
int(nResponse));
}
-void QtBuilder::setProperties(QObject* obj, stringmap& rProps)
+void QtBuilder::setProperties(QObject* pObject, stringmap& rProps)
{
-if (QMessageBox* pMessageBox = qobject_cast(obj))
+if (QMessageBox* pMessageBox = qobject_cast(pObject))
{
for (auto const & [ Key, rValue ] : rProps)
{
@@ -214,7 +214,7 @@ void QtBuilder::setProperties(QObject* obj, stringmap&
rProps)
}
}
}
-else if (QPushButton* pButton = qobject_cast(obj))
+else if (QPushButton* pButton = qobject_cast(pObject))
{
for (auto const & [ rKey, rValue ] : rProps)
{
commit 0aa5380c22e19ae43a251a2d2fae12a31069b8d9
Author: Michael Weghorn
AuthorDate: Fri Sep 27 21:41:43 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:58 2024 +0200
tdf#130857 qt weld: Set widget layout and add to parent layout
When creating a QLayout, pass the parent widget
to the ctor as well, which makes the layout be
set for the widget. Quoting from the QVBoxLayout ctor doc [1]
> Constructs a new top-level vertical box with parent parent.
>
> The layout is set directly as the top-level layout for parent.
> There can be only one top-level layout for a widget. It is returned
> by QWidget::layout().
Also add widgets to their parent layout if the parent
is a QLayout, and not a QWidget.
This makes the items of the "Help" -> "License" dialog
actually be part of the dialog in a WIP branch
that has "QtInstanceBuilder::IsUIFileSupported" in
the set of supported files in QtInstanceBuilder::IsUIFileSupported.
[1] https://doc.qt.io/qt-6/qvboxlayout.html#QVBoxLayout-1
Change-Id: Ib823896a28520b6f7e1e89244239d3204d1d10e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174072
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 58263b981cf8..23f5e59c4f84 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -75,6 +75,7 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
return nullptr;
QWidget* pParentWidget = qobject_cast(pParent);
+QLayout* pParentLayout = qobject_cast(pParent);
QObject* pObject = nullptr;
@@ -94,9 +95,9 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
{
const bool bVertical = hasOrientationVertical(rMap);
if (bVertical)
-pObject = new QVBoxLayout();
+pObject = new QVBoxLayout(pParentWidget);
else
-pObject = new QHBoxLayout();
+pObject = new QHBoxLayout(pParentWidget);
}
}
else if (sName == u"GtkButtonBox")
@@ -108,6 +109,9 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
QDialogButtonBox* pButtonBox = findButtonBox(pMessageBox);
assert(pButtonBox && "Could not find QMessageBox's button box");
core.git: 2 commits - vcl/qt5
vcl/qt5/QtFrame.cxx | 53 +++-
1 file changed, 24 insertions(+), 29 deletions(-)
New commits:
commit be0d89bea01fe89f619f701cd4e5e40420c9a1e2
Author: Michael Weghorn
AuthorDate: Fri Sep 27 11:06:55 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:13 2024 +0200
qt: Query screen on demand in QtFrame
Similar to how
Change-Id: Ifa0eff271c7d3fa2b6db9bdc1669e62333bd3094
Author: Michael Weghorn
Date: Thu Sep 26 18:22:12 2024 +0200
tdf#160837 qt: Rely on toolkit for frame positions, drop menubar
hack
implements it for the frame/widget position and size,
also retrieve the current screen number by querying
the QWidget for it's current screen instead of doing
own bookkeeping of the current screen in SalFrame::maGeometry
by getting/setting it using `SalFrameGeometry::{getS,s}creen.
Only set it in the returend SalGeometry when
the current SalGeometry explicitly gets requested
by calling QtFrame::GetUnmirroredGeometry.
Change-Id: Icaf712c956297dbc7a774bbd995d42eb8a63a1bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174034
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 03a04b459244..09807c941638 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -474,7 +474,7 @@ Size QtFrame::CalcDefaultSize()
{
if (!m_bFullScreenSpanAll)
{
-aSize =
toSize(QGuiApplication::screens().at(maGeometry.screen())->size());
+aSize = toSize(screen()->size());
}
else
{
@@ -575,6 +575,8 @@ SalFrameGeometry QtFrame::GetUnmirroredGeometry() const
aGeometry.setWidth(m_pQWidget->width() * fRatio);
aGeometry.setHeight(m_pQWidget->height() * fRatio);
+aGeometry.setScreen(std::max(sal_Int32(0), screenNumber()));
+
return aGeometry;
}
@@ -712,7 +714,7 @@ void QtFrame::ShowFullScreen(bool bFullScreen, sal_Int32
nScreen)
if (m_bFullScreen)
{
m_aRestoreGeometry = m_pTopLevel->geometry();
-m_nRestoreScreen = maGeometry.screen();
+m_nRestoreScreen = std::max(sal_Int32(0), screenNumber());
SetScreenNumber(m_bFullScreenSpanAll ? m_nRestoreScreen : nScreen);
if (!m_bFullScreenSpanAll)
windowHandle()->showFullScreen();
@@ -1310,14 +1312,11 @@ void QtFrame::SetScreenNumber(unsigned int nScreen)
screenGeo = pScreen->availableVirtualGeometry();
pWindow->setScreen(pScreen);
pWindow->setGeometry(screenGeo);
-nScreen = screenNumber();
}
// setScreen by itself has no effect, explicitly move the widget to
// the new screen
asChild()->move(screenGeo.topLeft());
-
-maGeometry.setScreen(nScreen);
}
void QtFrame::SetApplicationID(const OUString& rWMClass)
commit 95283b72cf60208fb1df0fd1eb5ec021cd43eb9e
Author: Michael Weghorn
AuthorDate: Fri Sep 27 10:11:02 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:06 2024 +0200
qt: Just ignore request to set frame to invalid screen number
Instead of setting the screen to the primary screen,
just ignore the request when QtFrame::SetScreenNumber
gets called with an invalid screen number.
The previous handling was introduced in
commit f806a2832aee62efc0e0404f7c24d53aaaf814d0
Date: Mon Oct 22 16:35:21 2018 +0200
tdf#120451: Use primary screen if requested screen doesn't exist
to fix a crash, but just ignoring the request
avoids crashing, too.
(`git show --ignore-space-change` helps to see
the "actual" change more easily.)
Change-Id: I272ec64f89ef835161fa68c7fdc8cd0e407b7495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174033
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 1c2e81938ecb..03a04b459244 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -1288,39 +1288,35 @@ void QtFrame::SetScreenNumber(unsigned int nScreen)
return;
QList screens = QApplication::screens();
-if (static_cast(nScreen) < screens.size() || m_bFullScreenSpanAll)
+if (static_cast(nScreen) >= screens.size() && !m_bFullScreenSpanAll)
{
-QRect screenGeo;
+SAL_WARN("vcl.qt", "Ignoring request to set invalid screen number");
+return;
+}
-if (!m_bFullScreenSpanAll)
-{
-screenGeo = QGuiApplication::screens().at(nScreen)->geometry();
-pWindow->setScreen(QApplication::screens().at(nScreen));
-}
-else // special case: fullscreen over all available screens
-{
-assert(m_bFullScreen);
-// left-most screen
-QScreen* pScreen = QGuiApplication::screenAt(QPoint(0, 0));
-// entire virtual
core.git: 2 commits - vcl/inc vcl/qt5 vcl/unx
vcl/inc/qt5/QtFrame.hxx |1 +
vcl/qt5/QtFrame.cxx | 20 +---
vcl/unx/generic/window/salframe.cxx |6 +++---
3 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 0218519537f6b77e06ae1e3020ed681b5a4f812c
Author: Michael Weghorn
AuthorDate: Fri Sep 27 09:54:20 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:33:55 2024 +0200
qt: Make screenNumber() a QtFrame method
Don't explicitly pass a QScreen, but use the
current one. Both callers set the screen
just before calling the method.
Change-Id: I57b3ffc4341cabc0370dda3c26d85f2f63ec9292
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174032
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx
index a54af3547c52..be0b0ee36757 100644
--- a/vcl/inc/qt5/QtFrame.hxx
+++ b/vcl/inc/qt5/QtFrame.hxx
@@ -132,6 +132,7 @@ class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public
SalFrame
bool isWindow() const;
QWindow* windowHandle() const;
QScreen* screen() const;
+sal_Int32 screenNumber() const;
bool isMinimized() const;
bool isMaximized() const;
void SetWindowStateImpl(Qt::WindowStates eState);
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 218af25130e0..1c2e81938ecb 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -74,15 +74,6 @@ static void SvpDamageHandler(void* handle, sal_Int32
nExtentsX, sal_Int32 nExten
pThis->Damage(nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight);
}
-namespace
-{
-sal_Int32 screenNumber(QScreen* pScreen)
-{
-const QList screens = QApplication::screens();
-return screens.indexOf(pScreen);
-}
-}
-
QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
: m_pTopLevel(nullptr)
, m_bUseCairo(bUseCairo)
@@ -292,6 +283,13 @@ QWindow* QtFrame::windowHandle() const
QScreen* QtFrame::screen() const { return asChild()->screen(); }
+sal_Int32 QtFrame::screenNumber() const
+{
+QScreen* pScreen = screen();
+const QList screens = QApplication::screens();
+return screens.indexOf(pScreen);
+}
+
bool QtFrame::GetUseDarkMode() const
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
@@ -1308,7 +1306,7 @@ void QtFrame::SetScreenNumber(unsigned int nScreen)
screenGeo = pScreen->availableVirtualGeometry();
pWindow->setScreen(pScreen);
pWindow->setGeometry(screenGeo);
-nScreen = screenNumber(pScreen);
+nScreen = screenNumber();
}
// setScreen by itself has no effect, explicitly move the widget to
@@ -1320,7 +1318,7 @@ void QtFrame::SetScreenNumber(unsigned int nScreen)
// index outta bounds, use primary screen
QScreen* primaryScreen = QApplication::primaryScreen();
pWindow->setScreen(primaryScreen);
-nScreen = static_cast(screenNumber(primaryScreen));
+nScreen = static_cast(screenNumber());
}
maGeometry.setScreen(nScreen);
commit bce84c97257b986dfdfeaf69042278128d005a8c
Author: Michael Weghorn
AuthorDate: Fri Sep 27 09:36:01 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:33:48 2024 +0200
gen: Use std::vector::at instead of operator[]
std::vector::at does bounds checking.
Change-Id: Id173ad08fb3bf54e4b3e625b45bc439c59b4d9d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174031
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index f845b691cdcd..c18c74244cfd 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1847,8 +1847,8 @@ void X11SalFrame::SetScreenNumber( unsigned int
nNewScreen )
if( nNewScreen >= GetDisplay()->GetXineramaScreens().size() )
return;
-tools::Rectangle aOldScreenRect(
GetDisplay()->GetXineramaScreens()[maGeometry.screen()] );
-tools::Rectangle aNewScreenRect(
GetDisplay()->GetXineramaScreens()[nNewScreen] );
+tools::Rectangle
aOldScreenRect(GetDisplay()->GetXineramaScreens().at(maGeometry.screen()));
+tools::Rectangle
aNewScreenRect(GetDisplay()->GetXineramaScreens().at(nNewScreen));
bool bVisible = bMapped_;
if( bVisible )
Show( false );
@@ -1910,7 +1910,7 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen,
sal_Int32 nScreen )
if( nScreen < 0 || o3tl::make_unsigned(nScreen) >=
GetDisplay()->GetXineramaScreens().size() )
aRect = AbsoluteScreenPixelRectangle(
AbsoluteScreenPixelPoint(0,0), GetDisplay()->GetScreenSize( m_nXScreen ) );
else
-aRect = GetDisplay()->GetXineramaScreens()[nScreen];
+aRect = GetDisplay()->GetXineramaScreens().at(nScreen);
m_bIsPartialFullScreen = true;
bool bVisible = bMappe
core.git: 2 commits - vcl/qt5
vcl/qt5/QtBuilder.cxx |6 ++
vcl/qt5/QtFrame.cxx |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit e9761fb11c41f18655e33fce82171e3737111686
Author: Michael Weghorn
AuthorDate: Fri Sep 27 19:22:53 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:34 2024 +0200
tdf#130857 qt weld: SAL_WARN and assert on unsupported widget type
Change-Id: I45b0eac84a5820d0ef8a3bb36de35827f0ae1e33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174069
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index cda2d5866c58..09e90354fc6e 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -125,6 +125,12 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
pObject = new QPushButton(pParentWidget);
}
}
+else
+{
+SAL_WARN("vcl.qt", "Widget type not supported yet: "
+ << OUStringToOString(sName,
RTL_TEXTENCODING_UTF8));
+assert(false && "Widget type not supported yet");
+}
m_aChildren.emplace_back(sID, pObject);
commit 685c4aea78af552418e072a2951da31f91149fd4
Author: Michael Weghorn
AuthorDate: Fri Sep 27 11:17:05 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:34:21 2024 +0200
qt: No longer use SalFrame::maGeometry in QtFrame at all
With previous commit
Change-Id: Icaf712c956297dbc7a774bbd995d42eb8a63a1bb
Author: Michael Weghorn
Date: Fri Sep 27 11:06:55 2024 +0200
qt: Query screen on demand in QtFrame
in place, all relevant members are explicitly set
for the returned SalFrameGeometry in
QtFrame::GetUnmirroredGeometry, so there's no more
reason to start with a copy of `maGeometry` instead of
a default-constructed SalFrameGeometry.
Margins for decorations are never set for the Qt-based
VCL plugins (using methods like SalFrameGeometry::setLeftDecoration),
so the default of 0 is fine for all of these.
Change-Id: Ibed98c665e61a4ba06bf9087a159048417598798
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174035
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 09807c941638..d8afccf189de 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -566,7 +566,7 @@ void QtFrame::GetClientSize(tools::Long& rWidth,
tools::Long& rHeight)
SalFrameGeometry QtFrame::GetUnmirroredGeometry() const
{
-SalFrameGeometry aGeometry = maGeometry;
+SalFrameGeometry aGeometry;
const qreal fRatio = devicePixelRatioF();
const QPoint aScreenPos = m_pQWidget->mapToGlobal(QPoint(0, 0));
core.git: vcl/qt5
vcl/qt5/QtFrame.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be28117cf6ac2b9d433f0990d26fe9590cd61345
Author: Michael Weghorn
AuthorDate: Fri Sep 27 09:32:46 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:33:14 2024 +0200
qt: Use QList::at instead of operator[]
Change-Id: I366ec4439d2647f433a9dc480c6efa6160a451a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174030
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index b7691bc4d00d..218af25130e0 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -1297,7 +1297,7 @@ void QtFrame::SetScreenNumber(unsigned int nScreen)
if (!m_bFullScreenSpanAll)
{
screenGeo = QGuiApplication::screens().at(nScreen)->geometry();
-pWindow->setScreen(QApplication::screens()[nScreen]);
+pWindow->setScreen(QApplication::screens().at(nScreen));
}
else // special case: fullscreen over all available screens
{
core.git: extras/source
extras/source/tipoftheday/sum_sheets.svg |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 157ce1e1278ab03e2276f7a4c22978d80255bd79 Author: Bogdan Buzea AuthorDate: Fri Sep 27 21:07:24 2024 +0200 Commit: Ilmari Lauhakangas CommitDate: Sat Sep 28 11:43:56 2024 +0200 tdf#163183 Improve Tip of the day 8/225 Change-Id: Ib9bb049afc56a889d764aa9d3a9c0bcf5a1ea1f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174009 Reviewed-by: Ilmari Lauhakangas Tested-by: Jenkins diff --git a/extras/source/tipoftheday/sum_sheets.svg b/extras/source/tipoftheday/sum_sheets.svg index fa6d2943eebc..621dc99daf25 100644 --- a/extras/source/tipoftheday/sum_sheets.svg +++ b/extras/source/tipoftheday/sum_sheets.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>Sum (A1:A3)Sheet 1Sheet 2 \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>Sum (A1:A3)Sheet1Sheet2 \ No newline at end of file
core.git: ucb/source
ucb/source/ucp/tdoc/tdoc_stgelems.cxx |8
ucb/source/ucp/tdoc/tdoc_stgelems.hxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 247aeeebc9add39e13b05ac9a7dbc852633b5d92
Author: Caolán McNamara
AuthorDate: Fri Sep 27 21:08:50 2024 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 28 11:37:13 2024 +0200
setParentStorage is always called with an empty reference
Change-Id: I973811b3e8aa41bc331362a96a7cb519aec363a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174068
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index dff9bf590902..e1eda21a2b7f 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -574,7 +574,7 @@ OutputStream::closeOutput( )
// Release parent storage.
// Now, that the stream is closed/disposed it is not needed any longer.
-setParentStorage( uno::Reference< embed::XStorage >() );
+clearParentStorage();
}
@@ -589,7 +589,7 @@ OutputStream::dispose()
// Release parent storage.
// Now, that the stream is closed/disposed it is not needed any longer.
-setParentStorage( uno::Reference< embed::XStorage >() );
+clearParentStorage();
}
@@ -768,7 +768,7 @@ void SAL_CALL Stream::closeOutput()
// Release parent storage.
// Now, that the stream is closed/disposed it is not needed any longer.
-setParentStorage( uno::Reference< embed::XStorage >() );
+clearParentStorage();
}
@@ -836,7 +836,7 @@ void SAL_CALL Stream::dispose()
// Release parent storage.
// Now, that the stream is closed/disposed it is not needed any longer.
-setParentStorage( uno::Reference< embed::XStorage >() );
+clearParentStorage();
}
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 6229923f226c..40dd7f723705 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -51,10 +51,10 @@ public:
const css::uno::Reference< css::embed::XStorage >&
getParentStorage() const
{ return m_xParentStorage; }
-void setParentStorage( const css::uno::Reference< css::embed::XStorage > &
xStg )
+void clearParentStorage()
{
std::scoped_lock aGuard( m_aMutex );
-m_xParentStorage = xStg;
+m_xParentStorage = nullptr;
}
private:
core.git: sc/source
sc/source/ui/unoobj/solveruno.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9f50e047135cd104a9b5081239617a679bb5610d
Author: Julien Nabet
AuthorDate: Sat Sep 28 11:17:04 2024 +0200
Commit: Julien Nabet
CommitDate: Sat Sep 28 12:50:24 2024 +0200
cid#1620326 UNINIT
Change-Id: Ic99797c2e286e25e7803668480a1aabd26cdca27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174086
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/unoobj/solveruno.cxx
b/sc/source/ui/unoobj/solveruno.cxx
index b4472874d0ff..1538c3d50bbf 100644
--- a/sc/source/ui/unoobj/solveruno.cxx
+++ b/sc/source/ui/unoobj/solveruno.cxx
@@ -777,7 +777,7 @@ void SAL_CALL ScSolverSettings::solve()
else
{
// Test if the right side is a numeric value
-sal_uInt32 nFormat;
+sal_uInt32 nFormat = 0;
double fValue(0);
if (m_rDoc.GetFormatTable()->IsNumberFormat(rConstr.aRightStr,
nFormat, fValue))
aConstraint.Right <<= fValue;
@@ -834,7 +834,7 @@ void SAL_CALL ScSolverSettings::solve()
else
{
// Test if the right side is a numeric value
-sal_uInt32 nFormat;
+sal_uInt32 nFormat = 0;
double fValue(0);
if (m_rDoc.GetFormatTable()->IsNumberFormat(aValStr, nFormat,
fValue))
aConstraint.Right <<= fValue;
core.git: sc/source
sc/source/ui/unoobj/solveruno.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit bb22876320b47c009898fee548df47ed772463ec Author: Julien Nabet AuthorDate: Sat Sep 28 11:07:46 2024 +0200 Commit: Julien Nabet CommitDate: Sat Sep 28 12:50:40 2024 +0200 cid#1620328 UNINIT_CTOR Change-Id: I4c56bf457920bb3800413d5e2289e49e5d64eb0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174085 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/source/ui/unoobj/solveruno.cxx b/sc/source/ui/unoobj/solveruno.cxx index 1538c3d50bbf..4151e637cf42 100644 --- a/sc/source/ui/unoobj/solveruno.cxx +++ b/sc/source/ui/unoobj/solveruno.cxx @@ -124,6 +124,7 @@ ScSolverSettings::ScSolverSettings(ScDocShell* pDocSh, uno::ReferencegetName();
core.git: sc/source
sc/source/ui/inc/duplicaterecordsdlg.hxx |2 +-
sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx |4 ++--
sc/source/ui/view/tabvwsh3.cxx|6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1f578b6244b9e2e434e4a746490047007acf330b
Author: Julien Nabet
AuthorDate: Sat Sep 28 11:32:25 2024 +0200
Commit: Julien Nabet
CommitDate: Sat Sep 28 12:49:28 2024 +0200
Typo: bDuplicatRows->bDuplicateRows
Change-Id: I307c81013723d6b47cf2e7f98ce9ac2e179136f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174100
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/sc/source/ui/inc/duplicaterecordsdlg.hxx
b/sc/source/ui/inc/duplicaterecordsdlg.hxx
index 29bcd22e8e2f..aaa253af7348 100644
--- a/sc/source/ui/inc/duplicaterecordsdlg.hxx
+++ b/sc/source/ui/inc/duplicaterecordsdlg.hxx
@@ -29,7 +29,7 @@ struct DuplicatesResponse
std::vector vEntries;
bool bRemove; // false ==> Select
bool bIncludesHeaders;
-bool bDuplicatRows; // false ==> DuplicateColumns
+bool bDuplicateRows; // false ==> DuplicateColumns
};
class ScDuplicateRecordsDlg : public weld::GenericDialogController
diff --git a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
index 3dd0eebc6ad5..11cbfbbbd4c3 100644
--- a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
+++ b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
@@ -198,9 +198,9 @@ IMPL_LINK_NOARG(ScDuplicateRecordsDlg, AllCheckBtnHdl,
weld::Toggleable&, void)
IMPL_LINK_NOARG(ScDuplicateRecordsDlg, OkHdl, weld::Button&, void)
{
maResponse.bRemove = m_xRadioRemove->get_active();
-maResponse.bDuplicatRows = m_xRadioRow->get_active();
+maResponse.bDuplicateRows = m_xRadioRow->get_active();
maResponse.bIncludesHeaders = m_xIncludesHeaders->get_active();
-int nCount = (maResponse.bDuplicatRows ? mrCellData[0].size() :
mrCellData.size());
+int nCount = (maResponse.bDuplicateRows ? mrCellData[0].size() :
mrCellData.size());
for (int i = 0; i < nCount; ++i)
{
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index ddaf0fd31fc6..4702091e82dc 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -829,7 +829,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if (pReqArgs->HasItem(FN_PARAM_1, &pItem))
aResponse.bIncludesHeaders = static_cast(pItem)->GetValue();
if (pReqArgs->HasItem(FN_PARAM_2, &pItem))
-aResponse.bDuplicatRows = static_cast(pItem)->GetValue();
+aResponse.bDuplicateRows = static_cast(pItem)->GetValue();
if (pReqArgs->HasItem(FN_PARAM_3, &pItem))
aCellRange.StartColumn = static_cast(pItem)->GetValue();
if (pReqArgs->HasItem(FN_PARAM_4, &pItem))
@@ -859,7 +859,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
}
int nLenEntries
-= (aResponse.bDuplicatRows ? aCellRange.EndColumn -
aCellRange.StartColumn
+= (aResponse.bDuplicateRows ? aCellRange.EndColumn -
aCellRange.StartColumn
: aCellRange.EndRow -
aCellRange.StartRow);
for (int i = 0; i <= nLenEntries; ++i)
aResponse.vEntries.push_back(i);
@@ -916,7 +916,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if (bHasData)
GetViewData().GetViewShell()->HandleDuplicateRecords(
xActiveSheet, aCellRange, aResponse.bRemove,
aResponse.bIncludesHeaders,
-aResponse.bDuplicatRows, aResponse.vEntries);
+aResponse.bDuplicateRows, aResponse.vEntries);
rReq.Done();
}
core.git: 2 commits - sc/source
sc/source/ui/unoobj/solveruno.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 32fccb862ff54558895b147e387bfa048d4dea17 Author: Julien Nabet AuthorDate: Sat Sep 28 11:26:00 2024 +0200 Commit: Julien Nabet CommitDate: Sat Sep 28 13:33:11 2024 +0200 cid#1620317 COPY_INSTEAD_OF_MOVE Change-Id: I7d31cf2a977cb095a6d3cd89f9cadf82bea3bddd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174099 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/sc/source/ui/unoobj/solveruno.cxx b/sc/source/ui/unoobj/solveruno.cxx index 09b5dcac8b0c..7257b109edd3 100644 --- a/sc/source/ui/unoobj/solveruno.cxx +++ b/sc/source/ui/unoobj/solveruno.cxx @@ -535,7 +535,7 @@ uno::Sequence SAL_CALL ScSolverSettings::getConstraints( // Adds the constraint to the sequence aRet.realloc(nCount + 1); auto pArrConstraints = aRet.getArray(); -pArrConstraints[nCount] = aConstraint; +pArrConstraints[nCount] = std::move(aConstraint); nCount++; } commit 6a2333c1663d862dec7b3e0450148c31afd83ca5 Author: Julien Nabet AuthorDate: Sat Sep 28 11:22:32 2024 +0200 Commit: Julien Nabet CommitDate: Sat Sep 28 13:33:02 2024 +0200 cid#1620321 COPY_INSTEAD_OF_MOVE Change-Id: I9030fafe12bb48d43049493102de23ca8212cd9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174087 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/source/ui/unoobj/solveruno.cxx b/sc/source/ui/unoobj/solveruno.cxx index 4151e637cf42..09b5dcac8b0c 100644 --- a/sc/source/ui/unoobj/solveruno.cxx +++ b/sc/source/ui/unoobj/solveruno.cxx @@ -620,7 +620,7 @@ ScSolverSettings::setConstraints(const uno::Sequence& aC vRetConstraints.push_back(aNewConst); } -m_pSettings->SetConstraints(vRetConstraints); +m_pSettings->SetConstraints(std::move(vRetConstraints)); } sal_Int32 SAL_CALL ScSolverSettings::getConstraintCount()
core.git: Branch 'distro/collabora/co-24.04.7' - vcl/source
vcl/source/window/event.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit f57fc348f59121d63177a3db048d7298450e0fd2
Author: Caolán McNamara
AuthorDate: Thu Sep 26 12:03:07 2024 +0100
Commit: Andras Timar
CommitDate: Sat Sep 28 09:47:16 2024 +0200
null-deref seen in testing
#2 0x00ac8c3e in std::__glibcxx_assert_fail(char const*, int,
char const*, char const*) ()
#3 0x7fa92f2fa26f in std::unique_ptr >::operator* (this=)
at /opt/rh/devtoolset-12/root/usr/include/c++/12/bits/unique_ptr.h:443
#4 std::unique_ptr
>::operator* (this=) at
/opt/rh/devtoolset-12/root/usr/include/c++/12/bits/unique_ptr.h:443
#5 vcl::Window::CallEventListeners (this=this@entry=0x34eb4f40,
nEvent=nEvent@entry=VclEventId::ObjectDying, pData=pData@entry=0x0)
at libreoffice/vcl/source/window/event.cxx:272
#6 0x7fa92f38277a in vcl::Window::dispose (this=0x34eb4f40) at
libreoffice/vcl/source/window/window.cxx:159
#7 0x7fa92f678064 in VclPtr::disposeAndClear
(this=) at libreoffice/include/rtl/ref.hxx:88
#8 ImplDestroyHelpWindow (rHelpData=..., bUpdateHideTime=)
at libreoffice/vcl/source/app/help.cxx:576
#9 0x7fa92f6780f8 in ImplDestroyHelpWindow
(bUpdateHideTime=) at libreoffice/vcl/source/app/help.cxx:565
#10 0x7fa92f679125 in ImplShowHelpWindow (pParent=0x334cfb90,
nHelpWinStyle=, nStyle=QuickHelpFlags::NONE, rHelpText="Chart
Area", rScreenPos=Point = {...}, rHelpArea=...)
at libreoffice/vcl/source/app/help.cxx:532
#11 0x7fa92f679544 in Help::ShowQuickHelp
(pParent=pParent@entry=0x334cfb90, rScreenRect=..., rHelpText="Chart Area",
nStyle=nStyle@entry=QuickHelpFlags::NONE)
at libreoffice/vcl/source/app/help.cxx:189
#12 0x7fa91ae862e0 in chart::ChartWindow::RequestHelp
(this=0x334cfb90, rHEvt=...)
at libreoffice/chart2/source/controller/main/ChartWindow.cxx:227
#13 0x7fa92e2e88a0 in (anonymous namespace)::LOKPostAsyncEvent
(pEv=0x35b4a320) at libreoffice/sfx2/source/view/lokhelper.cxx:1103
#14 0x7fa92e2e076a in LokChartHelper::postMouseEvent
(this=this@entry=0x7ffd226dd650, nType=nType@entry=2, nX=nX@entry=15405,
nY=nY@entry=4089, nCount=nCount@entry=1,
nButtons=nButtons@entry=0, nModifier=0,
fScaleX=fScaleX@entry=0.10001,
fScaleY=fScaleY@entry=0.10001)
at libreoffice/sfx2/source/view/lokcharthelper.cxx:294
#15 0x7fa92e2e5b80 in SfxLokHelper::testInPlaceComponentMouseEventHit
(pViewShell=pViewShell@entry=0x337e52a0, nType=nType@entry=2,
nX=nX@entry=15405, nY=nY@entry=4089,
nCount=nCount@entry=1, nButtons=nButtons@entry=0, nModifier=0,
fScaleX=0.10001, fScaleY=0.10001, bNegativeX=false)
at libreoffice/include/rtl/ref.hxx:69
#16 0x7fa91dba1e0e in ScModelObj::postMouseEvent (this=0x4593d10,
nType=2, nX=15405, nY=4089, nCount=1, nButtons=0, nModifier=0)
at libreoffice/sc/source/ui/unoobj/docuno.cxx:799
#17 0x7fa92e39567f in doc_postMouseEvent (pThis=0x334b8290, nType=2,
nX=15405, nY=4089, nCount=1, nButtons=0, nModifier=0)
at libreoffice/desktop/source/lib/init.cxx:5597
#18 0x00578631 in lok::Document::postMouseEvent (nModifier=0,
nButtons=0, nCount=1, nY=, nX=, nType=, this=)
at libreoffice/include/LibreOfficeKit/LibreOfficeKit.hxx:297
#19 ChildSession::mouseEvent (this=this@entry=0x317e3cf0, tokens=...,
target=target@entry=LokEventTargetEnum::Document) at kit/ChildSession.cpp:1906
#20 0x00588485 in ChildSession::_handleInput (this=, buffer=, length=) at
kit/ChildSession.cpp:634
Change-Id: Ic67c8b7c4553853d0ab36dd448642564b6b6fb69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173986
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 23d910112a74..de6772615453 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -269,6 +269,9 @@ void Window::CallEventListeners( VclEventId nEvent, void*
pData )
if ( !bIgnoreDisposed && xWindow->isDisposed() )
return;
+if (!xWindow->mpWindowImpl)
+break;
+
auto& rWindowImpl = *xWindow->mpWindowImpl;
if (!rWindowImpl.maChildEventListeners.empty())
{
core.git: Branch 'distro/collabora/co-24.04.7' - sw/uiconfig
sw/uiconfig/sglobal/menubar/menubar.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 21b15e5994b1fa34dd984989a630c03e71cf19b8 Author: Andrea Gelmini AuthorDate: Wed Sep 25 17:39:45 2024 +0200 Commit: Andras Timar CommitDate: Sat Sep 28 09:48:00 2024 +0200 Fix typo in code Change-Id: Id3115847fec65fea5a4060ec0f65fe752eef8f16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173950 Reviewed-by: Julien Nabet Tested-by: Jenkins (cherry picked from commit 47dda09d3e6046d4da96518e0ec2ee22dba7ab38) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174008 Reviewed-by: Mike Kaganski Tested-by: Jenkins CollaboraOffice diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index b9968638edd1..d19f8ac129cf 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -146,7 +146,7 @@ - +
core.git: 2 commits - vcl/qt5
vcl/qt5/QtBuilder.cxx | 24
vcl/qt5/QtInstanceBuilder.cxx |1 +
2 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 178430733b0687a0f9334dda9a66e9b58ec8e7b0
Author: Michael Weghorn
AuthorDate: Sat Sep 28 00:43:21 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:36:14 2024 +0200
tdf#130857 qt weld: Declare support for "License Information" dialog
Now that previous commits have implemented what's
needed to display the dialog and for button clicks
to result in the expected action, add the .ui file
for the "Help" -> "License Information" dialog to the
list of supported .ui files for QtInstanceBuilder, so
native Qt widgets will be used for that one with
the Qt-based VCL plugins unless starting LO with
the SAL_VCL_QT_NO_WELDED_WIDGETS environment variable set.
Change-Id: I8a2dff1c751739567a3c9c0728e3357859069a9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174080
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index ee40033cfa86..4e791d771125 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -33,6 +33,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
// weld API at once.
static std::unordered_set aSupportedUIFiles = {
u"modules/swriter/ui/inforeadonlydialog.ui"_ustr,
+u"sfx/ui/licensedialog.ui"_ustr,
u"sfx/ui/querysavedialog.ui"_ustr,
};
commit 08b55df5c9e42c1ccb78a156261811875629342a
Author: Michael Weghorn
AuthorDate: Sat Sep 28 00:32:15 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:36:07 2024 +0200
tdf#130857 qt weld: Close dialog on button click
For QDialogs (created for "GtkDialog" objects in .ui files)
that have a button box, let clicking any of the buttons
that have a response code set close the dialog with
that response code by connecting to the
QAbstractButton::clicked signal.
This addresses the remaining aspect for the
"Help" -> "License Information" dialog
mentioned in earlier commit
Change-Id: Ic9393755ec474f77ff22a1115e3cccba9d7b26cb
Author: Michael Weghorn
Date: Sat Sep 28 00:07:28 2024 +0200
tdf#130857 qt weld: Add initial support for dialog and label
> However, currently (...) clicking the buttons doesn't yet have any
> effect.
Actually using Qt(InstanceBuilder) for that dialog
will be enabled in an upcoming commit.
Change-Id: Ie3c26963318fd5832688e3ed73f6952e09da4bb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174079
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 63fa67869d6d..ce36fab8925d 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -165,20 +165,36 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, cons
void QtBuilder::tweakInsertedChild(QObject*, QObject* pCurrentChild,
std::string_view,
std::string_view)
{
-// ensure that button box is the last item in QDialog's layout
-// (that seems to be implicitly the case for GtkDialog)
-// no action needed for QMessageBox, where the default button box is used,
-// which is at the right place
if (QDialog* pDialog = qobject_cast(pCurrentChild))
{
+// no action needed for QMessageBox, where the default button box is
used
+// and button click is handled in QtInstanceMessageDialog
if (!qobject_cast(pDialog))
{
if (QDialogButtonBox* pButtonBox = findButtonBox(pDialog))
{
+// ensure that button box is the last item in QDialog's layout
+// (that seems to be implicitly the case for GtkDialog in GTK)
QLayout* pLayout = pDialog->layout();
assert(pLayout && "dialog has no layout");
pLayout->removeWidget(pButtonBox);
pLayout->addWidget(pButtonBox);
+
+// let button click close dialog if response code is set
+const QList aButtons = pButtonBox->buttons();
+for (const QAbstractButton* pButton : aButtons)
+{
+QVariant aResponseProperty
+=
pButton->property(QtInstanceDialog::PROPERTY_VCL_RESPONSE_CODE);
+if (aResponseProperty.isValid())
+{
+assert(aResponseProperty.canConvert());
+const int nResponseCode = aResponseProperty.toInt();
+QObject::connect(
+pButton, &QAbstractButton::clicked, pDialog,
+[pDialog, nResponseCode] {
pDialog->done(nResponseCode); });
+
core.git: 2 commits - vcl/inc vcl/qt5 vcl/unx
vcl/inc/qt5/QtFrame.hxx |2
vcl/inc/qt5/QtInstance.hxx |7 ++
vcl/inc/salframe.hxx|8 ++
vcl/qt5/QtClipboard.cxx |4 -
vcl/qt5/QtFilePicker.cxx| 100 +--
vcl/qt5/QtFrame.cxx | 99 --
vcl/qt5/QtGraphics_Controls.cxx |7 +-
vcl/qt5/QtInstance.cxx | 17 ++
vcl/qt5/QtInstanceButton.cxx| 12 ++--
vcl/qt5/QtInstanceDialog.cxx| 21 +++
vcl/qt5/QtInstanceMessageDialog.cxx | 78 +--
vcl/qt5/QtInstanceWidget.cxx| 102 ++--
vcl/qt5/QtInstanceWindow.cxx| 12 ++--
vcl/qt5/QtMenu.cxx |9 +--
vcl/qt5/QtTransferable.cxx |9 +--
vcl/qt5/QtWidget.cxx| 12 +---
vcl/unx/kf5/KFFilePicker.cxx|7 +-
17 files changed, 225 insertions(+), 281 deletions(-)
New commits:
commit 25e5f050756bb25d67b6a90433c0a50a149d5dc0
Author: Michael Weghorn
AuthorDate: Fri Sep 27 09:08:43 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:32:44 2024 +0200
qt: Let GetQtInstance return ref instead of pointer
The return value was dereferenced in all callers
anyway.
Change-Id: Ib91eddd23222d086f9a4edac980a05cd96c75ad7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174026
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx
index f82def9c830c..4eb88e26d3f2 100644
--- a/vcl/inc/qt5/QtInstance.hxx
+++ b/vcl/inc/qt5/QtInstance.hxx
@@ -197,6 +197,11 @@ public:
void setActivePopup(QtFrame*);
};
-inline QtInstance* GetQtInstance() { return
static_cast(GetSalInstance()); }
+inline QtInstance& GetQtInstance()
+{
+QtInstance* pInstance = static_cast(GetSalInstance());
+assert(pInstance);
+return *pInstance;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/QtClipboard.cxx b/vcl/qt5/QtClipboard.cxx
index 2181079a1988..430af1f96efa 100644
--- a/vcl/qt5/QtClipboard.cxx
+++ b/vcl/qt5/QtClipboard.cxx
@@ -59,9 +59,9 @@ css::uno::Reference
QtClipboard::create(const OUString& aM
void QtClipboard::flushClipboard()
{
-auto* pSalInst(GetQtInstance());
SolarMutexGuard g;
-pSalInst->RunInMainThread([this]() {
+QtInstance& rQtInstance = GetQtInstance();
+rQtInstance.RunInMainThread([this]() {
if (!isOwner(m_aClipboardMode))
return;
diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx
index 70fa7ef96483..93b16057e5dd 100644
--- a/vcl/qt5/QtFilePicker.cxx
+++ b/vcl/qt5/QtFilePicker.cxx
@@ -126,9 +126,7 @@
QtFilePicker::QtFilePicker(css::uno::Reference cont
QtFilePicker::~QtFilePicker()
{
SolarMutexGuard g;
-auto* pSalInst(GetQtInstance());
-assert(pSalInst);
-pSalInst->RunInMainThread([this]() {
+GetQtInstance().RunInMainThread([this]() {
// must delete it in main thread, otherwise
// QSocketNotifier::setEnabled() will crash us
m_pFileDialog.reset();
@@ -151,9 +149,7 @@ void SAL_CALL QtFilePicker::removeFilePickerListener(const
uno::ReferenceRunInMainThread(
+GetQtInstance().RunInMainThread(
[this, &title]() { m_pFileDialog->setWindowTitle(toQString(title)); });
}
@@ -209,12 +205,11 @@ void QtFilePicker::finished(int nResult)
sal_Int16 SAL_CALL QtFilePicker::execute()
{
SolarMutexGuard g;
-auto* pSalInst(GetQtInstance());
-assert(pSalInst);
-if (!pSalInst->IsMainThread())
+QtInstance& rQtInstance = GetQtInstance();
+if (!rQtInstance.IsMainThread())
{
sal_uInt16 ret;
-pSalInst->RunInMainThread([&ret, this]() { ret = execute(); });
+rQtInstance.RunInMainThread([&ret, this]() { ret = execute(); });
return ret;
}
@@ -240,9 +235,7 @@ QtFilePicker::startExecuteModal(const
ReferenceRunInMainThread([this, multiSelect]() {
+GetQtInstance().RunInMainThread([this, multiSelect]() {
if (m_bIsFolderPicker || m_pFileDialog->acceptMode() ==
QFileDialog::AcceptSave)
return;
@@ -254,17 +247,14 @@ void SAL_CALL
QtFilePicker::setMultiSelectionMode(sal_Bool multiSelect)
void SAL_CALL QtFilePicker::setDefaultName(const OUString& name)
{
SolarMutexGuard g;
-auto* pSalInst(GetQtInstance());
-assert(pSalInst);
-pSalInst->RunInMainThread([this, &name]() {
m_pFileDialog->selectFile(toQString(name)); });
+GetQtInstance().RunInMainThread(
+[this, &name]() { m_pFileDialog->selectFile(toQString(name)); });
}
void SAL_CALL QtFilePicker::setDisplayDirectory(const OUString& dir)
{
SolarMutexGuard g;
-auto* pSalInst(GetQtInstance());
-assert(pSalInst);
-pSalInst->RunInMainThread([this, &dir]() {
+GetQtInstance().RunInMainThread([this, &dir]() {
QString qDir(toQString(dir));
m_pFileDia
core.git: android/source
android/source/build.gradle |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9b7d8cc749884ce2c26a1b944413a1d301fbf1a
Author: Michael Weghorn
AuthorDate: Fri Sep 27 13:45:55 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:20:17 2024 +0200
android: Update Android Gradle Plugin to 8.6.1
as suggested by Android Studio.
Change-Id: Idbd71e7766d44374b4972362fb917f385b4fc5a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174042
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/android/source/build.gradle b/android/source/build.gradle
index e96fac18f43f..84b9f4233bd0 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -21,7 +21,7 @@ buildscript {
google()
}
dependencies {
-classpath 'com.android.tools.build:gradle:8.5.1'
+classpath 'com.android.tools.build:gradle:8.6.1'
}
}
core.git: 2 commits - vcl/inc vcl/qt5 vcl/source
vcl/inc/salframe.hxx|4 ++--
vcl/qt5/QtFrame.cxx | 17 +
vcl/source/gdi/salgdilayout.cxx | 13 +++--
3 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit b2743ac25485f0909838fae370401e21ee85950f
Author: Michael Weghorn
AuthorDate: Thu Sep 26 15:33:29 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:31:55 2024 +0200
tdf#160837 SalFrame: Replace direct uses of maGeometry member
Call `GetUnmirroredGeometry()` instead of directly
using the `maGeometry` member in order to get the
current SalFrameGeometry.
This is in preparation of allowing to override
`SalFrame::GetUnmirroredGeometry` in subclasses in
an upcoming commit.
No change in behavior intended (yet).
Change-Id: I72b44052ba5e8ed61a1c54130ea088f1bb0b3941
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173995
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index aec104b43175..e5e833c68796 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -126,8 +126,8 @@ public:
virtual ~SalFrame() override;
// SalGeometryProvider
-virtual tools::Long GetWidth() const override { return maGeometry.width();
}
-virtual tools::Long GetHeight() const override { return
maGeometry.height(); }
+virtual tools::Long GetWidth() const override { return
GetUnmirroredGeometry().width(); }
+virtual tools::Long GetHeight() const override { return
GetUnmirroredGeometry().height(); }
virtual bool IsOffScreen() const override { return false; }
// SalGraphics or NULL, but two Graphics for all SalFrames
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 0a5eb5140a39..9678c7ee674e 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -36,17 +36,18 @@
SalFrameGeometry SalFrame::GetGeometry() const
{
+SalFrameGeometry aGeometry = GetUnmirroredGeometry();
+
// mirror frame coordinates at parent
SalFrame *pParent = GetParent();
if( pParent && AllSettings::GetLayoutRTL() )
{
-SalFrameGeometry aGeom = maGeometry;
-const int nParentX = aGeom.x() - pParent->maGeometry.x();
-aGeom.setX(pParent->maGeometry.x() + pParent->maGeometry.width() -
maGeometry.width() - nParentX);
-return aGeom;
+SalFrameGeometry aParentGeometry = pParent->GetUnmirroredGeometry();
+const int nParentX = aGeometry.x() - aParentGeometry.x();
+aGeometry.setX(aParentGeometry.x() + aParentGeometry.width() -
aGeometry.width() - nParentX);
}
-else
-return maGeometry;
+
+return aGeometry;
}
SalGraphics::SalGraphics()
commit 54bdc8cb95584aba8de06564ea45f05d0babc032
Author: Michael Weghorn
AuthorDate: Thu Sep 26 15:20:57 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:31:47 2024 +0200
tdf#160837 qt: QtFrame: Use getters instead of SalFrame::maGeometry
Replace some direct uses of SalFrame::maGeometry
in QtFrame with corresponding getters:
* SalFrame::GetUnmirroredGeometry() to get the
SalFrameGeometry
* the more specific SalFrame::GetWidth() and
SalFrame::GetHeight() where only the width/
height is of interest
No change in behavior intended yet.
Change-Id: I1b4e13c5efef7b78f082f6444e1e8d0ee591db41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173994
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 2e2bd9dd59ec..99375eb72a7f 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -546,9 +546,9 @@ void QtFrame::SetPosSize(tools::Long nX, tools::Long nY,
tools::Long nWidth, too
if (isChild(false) || !m_pQWidget->isMaximized())
{
if (!(nFlags & SAL_FRAME_POSSIZE_WIDTH))
-nWidth = maGeometry.width();
+nWidth = GetWidth();
else if (!(nFlags & SAL_FRAME_POSSIZE_HEIGHT))
-nHeight = maGeometry.height();
+nHeight = GetHeight();
if (nWidth > 0 && nHeight > 0)
{
@@ -579,18 +579,18 @@ void QtFrame::SetPosSize(tools::Long nX, tools::Long nY,
tools::Long nWidth, too
if (m_pParent)
{
-const SalFrameGeometry& aParentGeometry = m_pParent->maGeometry;
+const SalFrameGeometry aParentGeometry =
m_pParent->GetUnmirroredGeometry();
if (QGuiApplication::isRightToLeft())
-nX = aParentGeometry.x() + aParentGeometry.width() - nX -
maGeometry.width() - 1;
+nX = aParentGeometry.x() + aParentGeometry.width() - nX -
GetWidth() - 1;
else
nX += aParentGeometry.x();
nY += aParentGeometry.y() + menuBarOffset();
}
if (!(nFlags & SAL_FRAME_POSSIZE_X))
-nX = maGeometry.x();
+
core.git: vcl/qt5
vcl/qt5/QtFrame.cxx | 17 ++---
1 file changed, 2 insertions(+), 15 deletions(-)
New commits:
commit be6312f8c5ce4003d3e299493db7b4eb1c498d7d
Author: Michael Weghorn
AuthorDate: Fri Sep 27 09:28:33 2024 +0200
Commit: Michael Weghorn
CommitDate: Sat Sep 28 09:32:55 2024 +0200
qt: Use QList::indexOf instead of reimplementing logic
Change-Id: If78bc419ccffd874e47419bc06ed2841ffbeab96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174029
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 3308ea2e..b7691bc4d00d 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -76,23 +76,10 @@ static void SvpDamageHandler(void* handle, sal_Int32
nExtentsX, sal_Int32 nExten
namespace
{
-sal_Int32 screenNumber(const QScreen* pScreen)
+sal_Int32 screenNumber(QScreen* pScreen)
{
const QList screens = QApplication::screens();
-
-sal_Int32 nScreen = 0;
-bool bFound = false;
-for (const QScreen* pCurScreen : screens)
-{
-if (pScreen == pCurScreen)
-{
-bFound = true;
-break;
-}
-nScreen++;
-}
-
-return bFound ? nScreen : -1;
+return screens.indexOf(pScreen);
}
}
help.git: helpers/xmlhelp.dtd
helpers/xmlhelp.dtd | 49 - 1 file changed, 28 insertions(+), 21 deletions(-) New commits: commit 6ad81aa6d12b615374b39d0eb7e2dec4e12ebcbc Author: Olivier Hallot AuthorDate: Fri Sep 27 08:04:53 2024 -0300 Commit: Olivier Hallot CommitDate: Sat Sep 28 12:21:52 2024 +0200 More tweaks in XHP DTD Added more entities Change-Id: Idc529efd6f26496e22ac56586622c4b54742531f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174037 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd index bd702d7722..2dba4b02b9 100644 --- a/helpers/xmlhelp.dtd +++ b/helpers/xmlhelp.dtd @@ -26,6 +26,17 @@ Version Nov 2018 Added extensions: H1, .. H6, menuitem, keycode, literal input, widget, note, tip, warning Added extensions: pycode, sqlcode, bascode --> + + + + + + + + + + + - - - - + - + @@ -82,7 +90,7 @@ Version Nov 2018 date CDATA #REQUIRED > - + @@ -117,24 +125,23 @@ Version Nov 2018 - - + - + - + - + - + - + @@ -176,7 +183,7 @@ Version Nov 2018 sorted (asc | desc) #IMPLIED > - + - + - + @@ -211,7 +218,7 @@ Version Nov 2018 @@ -234,7 +241,7 @@ Version Nov 2018 id CDATA #REQUIRED > - + - + - + - +
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e9b04320c79b0105444242d0c8209bcb50d8dcc Author: Olivier Hallot AuthorDate: Sat Sep 28 07:21:53 2024 -0300 Commit: Gerrit Code Review CommitDate: Sat Sep 28 12:21:53 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6ad81aa6d12b615374b39d0eb7e2dec4e12ebcbc - More tweaks in XHP DTD Added more entities Change-Id: Idc529efd6f26496e22ac56586622c4b54742531f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/174037 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8cdedc988068..6ad81aa6d12b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8cdedc9880681f9c51c0d54f7d1109c173ddb75d +Subproject commit 6ad81aa6d12b615374b39d0eb7e2dec4e12ebcbc
core.git: sd/source sw/source
sd/source/ui/view/drtxtob1.cxx | 21 -
sw/source/uibase/shells/drwtxtex.cxx | 17 +
sw/source/uibase/uiview/viewtab.cxx | 14 --
3 files changed, 41 insertions(+), 11 deletions(-)
New commits:
commit 4cc532c0393914a743c11e806bd25dfa3d28fb5c
Author: Kira Tubo
AuthorDate: Thu Sep 26 22:15:15 2024 -0700
Commit: Mike Kaganski
CommitDate: Sun Sep 29 02:40:18 2024 +0200
tdf#156374: Create hanging indent on paragraph without one
If the paragraph has no First Line Indent applied, create a hanging
indent.
- In Writer: the indentation distance is based on the default tab
distance.
- In Draw/Impress: the indentation distance is based on the distance set
for the Increase/Decrease Indent buttons (1000 twips), which is
different from the default tab distance.
Change-Id: Ifc36c63ad7e6aa852a4b10aca22b7b4de6e10e95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174001
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 210362f16de1..7a4e49e6177b 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include
#include
@@ -82,6 +83,9 @@ void TextObjectBar::ExecuteImpl(ViewShell* mpViewShell,
::sd::View* mpView, SfxR
sal_uInt16 nSlot = rReq.GetSlot();
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+// Default indent used e.g. in SID_DEC_INDENT, SID_INC_INDENT and
SID_HANGING_INDENT
+const ::tools::Long nIndentDefaultDist = 1000; // 1000 twips
+
std::unique_ptr> aGuard;
assert(mpViewShell);
@@ -155,10 +159,10 @@ void TextObjectBar::ExecuteImpl(ViewShell* mpViewShell,
::sd::View* mpView, SfxR
::tools::Long nLeft = pNewItem->GetLeft();
if( nSlot == SID_INC_INDENT )
-nLeft += 1000;
+nLeft += nIndentDefaultDist;
else
{
-nLeft -= 1000;
+nLeft -= nIndentDefaultDist;
nLeft = std::max<::tools::Long>( nLeft, 0 );
}
pNewItem->SetLeftValue( static_cast(nLeft)
);
@@ -341,9 +345,16 @@ void TextObjectBar::ExecuteImpl(ViewShell* mpViewShell,
::sd::View* mpView, SfxR
SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( EE_PARA_LRSPACE ) );
SvxLRSpaceItem aNewMargin( EE_PARA_LRSPACE );
-aNewMargin.SetTextLeft( aParaMargin.GetTextLeft() +
aParaMargin.GetTextFirstLineOffset() );
-aNewMargin.SetRight( aParaMargin.GetRight() );
-aNewMargin.SetTextFirstLineOffset( (
aParaMargin.GetTextFirstLineOffset() ) * -1 );
+
+::tools::Long nIndentDist = aParaMargin.GetTextFirstLineOffset();
+
+if (nIndentDist == 0)
+nIndentDist = nIndentDefaultDist;
+
+aNewMargin.SetTextLeft(aParaMargin.GetTextLeft() + nIndentDist);
+aNewMargin.SetRight(aParaMargin.GetRight());
+aNewMargin.SetTextFirstLineOffset(nIndentDist * -1);
+
aLRSpaceSet.Put( aNewMargin );
mpView->SetAttributes( aLRSpaceSet );
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index e3dff9857c0a..c53fa4b8bfc8 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -209,10 +209,19 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
{
SvxLRSpaceItem aParaMargin = aEditAttr.Get(
EE_PARA_LRSPACE );
aParaMargin.SetWhich( EE_PARA_LRSPACE );
-short int nFirstLineOffset =
aParaMargin.GetTextFirstLineOffset();
-aParaMargin.SetTextLeft( aParaMargin.GetTextLeft() +
nFirstLineOffset );
-aParaMargin.SetRight( aParaMargin.GetRight() );
-aParaMargin.SetTextFirstLineOffset( nFirstLineOffset * -1
);
+
+tools::Long nIndentDist =
aParaMargin.GetTextFirstLineOffset();
+
+if (nIndentDist == 0)
+{
+const SvxTabStopItem& rDefTabItem =
rSh.GetDefault(RES_PARATR_TABSTOP);
+nIndentDist = ::GetTabDist(rDefTabItem);
+}
+
+aParaMargin.SetTextLeft(aParaMargin.GetTextLeft() +
nIndentDist);
+aParaMargin.SetRight(aParaMargin.GetRight());
+aParaMargin.SetTextFirstLineOffset(nIndentDist * -1);
+
aNewAttr.Put(aParaMargin);
rReq.Done();
}
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index fb1cec99c40c..761df9d72f59 100644
--- a/sw/so
