core.git: configure.ac external/pdfium
configure.ac | 19 +--
external/pdfium/Library_pdfium.mk |5 +
external/pdfium/UnpackedTarball_pdfium.mk |2 ++
external/pdfium/system-abseil.diff| 15 +++
4 files changed, 23 insertions(+), 18 deletions(-)
New commits:
commit d7577174b541e68158d228aa41192227c10a252f
Author: Rene Engelhard
AuthorDate: Fri Dec 15 23:45:04 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Dec 18 08:51:38 2023 +0100
fix system-abseil build even with 2022 version
actually it seems it was a internal abseil header from pdfium vs. system
header mismatch. Include proper absl/container/inlined_vector.h if using
system-abseil.
While at it we can also just use pkg-config, no idea why I did it
without back then. Also gets the advantage that it knows that the libs
needed for absl_inlined_vector is actually
-labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity
This effectively reverts e89723103313ec4366ee58144c47d7a5c16bf838
Change-Id: Ide4f79860b4e0673c5c6587d503058bdd2930744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160846
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/configure.ac b/configure.ac
index 97de2b514d3a..586e31f8bae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12234,24 +12234,7 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
AC_MSG_RESULT([external])
SYSTEM_ABSEIL=TRUE
AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(absl/types/bad_optional_access.h, [],
-[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_HEADER(absl/types/bad_variant_access.h, [],
-[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_LIB([absl_bad_optional_access], [main], [],
- [AC_MSG_ERROR([libabsl_bad_optional_access library not
found.])])
-AC_CHECK_LIB([absl_bad_variant_access], [main], [],
- [AC_MSG_ERROR([libabsl_bad_variant_access library not
found.])])
-ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
- AC_MSG_CHECKING([whether abseil is >= 20230125])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include
- #if ABSL_LTS_RELEASE_VERSION < 20230125
- #error Too old.
-#endif
- ])],
-[AC_MSG_RESULT([ok])],
-[AC_MSG_ERROR([too old. Need >= 20230125])])
+PKG_CHECK_MODULES(ABSEIL, absl_bad_optional_access
absl_bad_variant_access absl_inlined_vector )
AC_LANG_POP([C++])
ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
FilterLibs "${ABSEIL_LIBS}"
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index fc0903d873d1..85f9d953b752 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -40,6 +40,11 @@ $(eval $(call gb_Library_add_defs,pdfium,\
-DUSE_SYSTEM_LIBOPENJPEG2 \
))
endif
+ifeq ($(SYSTEM_ABSEIL),TRUE)
+$(eval $(call gb_Library_add_defs,pdfium,\
+-DUSE_SYSTEM_ABSEIL \
+))
+endif
$(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp))
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk
b/external/pdfium/UnpackedTarball_pdfium.mk
index 924bbe23a8b8..f8d95d2785c7 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -16,6 +16,8 @@ pdfium_patches += c++20-comparison.patch
pdfium_patches += constexpr-template.patch
+pdfium_patches += system-abseil.diff
+
$(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
$(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL)))
diff --git a/external/pdfium/system-abseil.diff
b/external/pdfium/system-abseil.diff
new file mode 100644
index ..841bc8ce9468
--- /dev/null
+++ b/external/pdfium/system-abseil.diff
@@ -0,0 +1,15 @@
+--- core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:10.955659091
+0100
core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:43.420136476
+0100
+@@ -16,8 +16,11 @@
+ #include "core/fxcrt/cfx_bitstream.h"
+ #include "core/fxcrt/fx_memory_wrappers.h"
+ #include "core/fxcrt/fx_safe_types.h"
++#ifdef USE_SYSTEM_ABSEIL
++#include
++#else
+ #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
+-
++#endif
+ namespace {
+
+ // See PDF Reference 1.7, page 170, table 3.36.
core.git: reportbuilder/registry
reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu | 147 - reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu| 35 -- reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu | 62 --- reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu | 158 -- reportbuilder/registry/data/org/openoffice/Setup.xcu| 44 -- 5 files changed, 446 deletions(-) New commits: commit b548dff45019c631e084dd4990a23b5b87f8818d Author: Andras Timar AuthorDate: Sun Dec 17 13:03:31 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Dec 18 07:57:24 2023 +0100 reportbuilder: remove unused config files Change-Id: I9133dbae9183f17c82286f32cb5a55241f3ed714 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160883 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu deleted file mode 100644 index 9395abdc4a7f.. --- a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu +++ /dev/null @@ -1,147 +0,0 @@ - - -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; oor:package="org.openoffice.Office" oor:name="Accelerators"> - - - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:SelectReport - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:ControlProperties - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:ControlProperties - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:ReportNavigator - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:AddField - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:Escape - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:DbSortingAndGrouping - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:ExecuteReport - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:SelectAllInSection - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:SelectAllLabels - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:SelectAllEdits - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:Redo - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:Undo - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:NextMark - - - - - -L10N SHORTCUTS - NO TRANSLATE -.uno:PrevMark - - - - - -.uno:CollapseSection -L10N SHORTCUTS - NO TRANSLATE - - - - - -.uno:ExpandSection -L10N SHORTCUTS - NO TRANSLATE - - - - - - - diff --git a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu deleted file mode 100644 index dc22b85744a6.. --- a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu +++ /dev/null @@ -1,35 +0,0 @@ - - -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; oor:name="DataAccess" oor:package="org.openoffice.Office"> - - -Pentaho Reporting Flow Engine - - - - -Pentaho Reporting Flow Engine - - - org.libreoffice.report.pentaho.SOReportJobFactory - - - - - diff --git a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu deleted file mode 100644 index fd0c61916f87.. --- a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu +++ /dev/null @@ -1,62 +0,0 @@ - - -http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:install="http://openoffice.org/2004/installation; oor:package="org.openoffice.Office" oor:name="Embedding"> - - - -com.sun.star.embed.OOoEmbeddedObjectFactory - - -com.sun.star.report.ReportDefinition - - -1 - - -PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE - - - - -com.sun.star.embed.OOoEmbeddedObjectFactory - -
core.git: offapi/com officecfg/registry sw/inc sw/source sw/uiconfig
offapi/com/sun/star/text/MailMerge.idl|2 officecfg/registry/schema/org/openoffice/Office/Writer.xcs| 15 -- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |8 - sw/inc/modcfg.hxx |4 sw/inc/printdata.hxx |6 - sw/inc/unoprnms.hxx |1 sw/source/core/unocore/unomap.cxx |1 sw/source/core/view/printdata.cxx |1 sw/source/filter/xml/xmlimp.cxx |1 sw/source/ui/config/optpage.cxx |1 sw/source/ui/envelp/mailmrge.cxx | 11 -- sw/source/uibase/config/modcfg.cxx| 52 - sw/source/uibase/config/prtopt.cxx| 53 -- sw/source/uibase/inc/unomailmerge.hxx |1 sw/source/uibase/uno/unomailmerge.cxx | 12 -- sw/source/uibase/uno/unomod.cxx | 10 - sw/source/uibase/uno/unotxdoc.cxx |1 sw/uiconfig/swriter/ui/mailmerge.ui | 15 -- 18 files changed, 52 insertions(+), 143 deletions(-) New commits: commit c9d5bf3fe0e6b59f30107c42eac3d4603bf8f2b6 Author: Samuel Mehrbrodt AuthorDate: Thu Dec 14 10:21:31 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 07:48:05 2023 +0100 [API CHANGE] tdf#158041 Remove unused SinglePrintJobs config option from sw This is handled by the print dialog directly Change-Id: Ieb4221d97444216f332501da9a3aba7dc6b8500a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160762 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl index 843cb44104cf..68809e081407 100644 --- a/offapi/com/sun/star/text/MailMerge.idl +++ b/offapi/com/sun/star/text/MailMerge.idl @@ -181,6 +181,8 @@ published service MailMerge /** determines whether single print jobs will be generated per output document. This property is only evaluated for printer output. + +@deprecated since 24.8, use ::com::sun::star::view::PrintOptions::SinglePrintJobs instead. */ [property] boolean SinglePrintJobs; diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 2bd5995a1e5d..b014281aed9d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1868,14 +1868,6 @@ Contains other output settings. - - - -Controls the print output to avoid problems with duplex printing and odd page numbers. -Create single print jobs - - false - @@ -5662,13 +5654,6 @@ Specifies the settings for form letter output to printer. - - - -Prints each form letter individually with the selected printer (true). - - false - Determines whether printing a document that contains database fields triggers a 'do you want to call mailmerge' query diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index 4ecee7fa61e3..32b2c52e3ae7 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -610,14 +610,6 @@ Contains output-specific settings. - - - -Controls the print output. -Create single print jobs - - false - diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 16862c5536c7..abfea9159e29 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -180,7 +180,6 @@ class SAL_DLLPUBLIC_RTTI SwMiscConfig final : public utl::ConfigItem boolm_bShowIndexPreview; // Index/ShowPreview boolm_bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink boolm_bNumAlignSize; // Numbering/Graphic/KeepRatio -boolm_bSinglePrintJob;// FormLetter/PrintOutput/SinglePrintJobs boolm_bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation boolm_bIsPasswordFromColumn; // FormLetter/FileOutput/FilePassword/Generation boolm_bAskForMailMergeInPrint;// Ask if documents containing fields should be 'mailmerged' @@ -325,9 +324,6 @@ public: void
core.git: Branch 'distro/collabora/co-23.05' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2891 1 file changed, 1363 insertions(+), 1528 deletions(-) New commits: commit 79c981440c15c7c8997256571631b177e4453eef Author: Xisco Fauli AuthorDate: Tue Nov 28 12:56:36 2023 +0100 Commit: Andras Timar CommitDate: Sun Dec 17 23:26:52 2023 +0100 update credits Change-Id: I086375044292658c7bfb7b7d4a99d4d1e1313ac3 (cherry picked from commit 7b96db51608e237155a37c7b5d31ef408a19019b) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index da64bd3a45fe..046a641c4764 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.6.2.1$Linux_X86_64 LibreOffice_project/56f7684011345957bbf33a7ee678afaf4d2ba3332012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.4.7.2$Linux_X86_64 LibreOffice_project/40$Build-22012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 550 + 1751198 501 - 55167 - 26989 + 48182 + 21592 true true view2 - 3649 - 3434 + 24075 + 1772020 501 - 550 - 55667 - 27538 + 1751198 + 48682 + 1772788 0 0 false @@ -26,53 +26,68 @@ false false false - false - false - false - true - false + false + false + false true - false + true true - false + true + true false 0 - false - false - false - false + false + false false - false + false true - true true + false false - - false + false false - false - false - false + false true + true true false + false + false false false - false false false + false true - false + false + false + true false - 1557161 - false - Adressen + false + false true - false + 0 + 1 + true + false + + high-resolution + false + + Adressen + false + false + true + false + false + true + true + false + true hu @@ -82,73 +97,54 @@ - false - 12768688 - true - false - false - false - 1 - true - true - false - false - false - false - true + true - true + 12866985 + true - false - true - 0 - - true + false + true true - false - false - 0 - true - false - false - false - high-resolution -
core.git: include/tools tools/source
include/tools/bigint.hxx| 127 --
tools/source/generic/bigint.cxx | 500 ++--
2 files changed, 238 insertions(+), 389 deletions(-)
New commits:
commit bcbc0857bf4bc24b5ea36e445a367cce0a382da4
Author: Mike Kaganski
AuthorDate: Sun Dec 17 21:11:31 2023 +0300
Commit: Mike Kaganski
CommitDate: Sun Dec 17 22:34:02 2023 +0100
Simplify BigInt
Change-Id: I1b88648a84760ea16f32566fe0d88e402c328987
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160888
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index f8f57fc45de7..a880f81c748b 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -23,9 +23,11 @@
#include
#include
+#include
+#include
#include
-#define MAX_DIGITS 8
+#define MAX_DIGITS 4
class SAL_WARN_UNUSED TOOLS_DLLPUBLIC BigInt
{
@@ -33,21 +35,20 @@ private:
// we only use one of these two fields at a time
union {
sal_Int32 nVal;
-sal_uInt16 nNum[MAX_DIGITS];
+sal_uInt32 nNum[MAX_DIGITS];
};
-sal_uInt8 nLen: 5;// current length, if 0, data is in
nVal, otherwise data is in nNum
-boolbIsNeg : 1;// Is Sign negative?
+sal_uInt8 nLen;// current length, if 0, data is in nVal,
otherwise data is in nNum
+boolbIsNeg;// Is Sign negative?
-TOOLS_DLLPRIVATE void MakeBigInt(BigInt const &);
+TOOLS_DLLPRIVATE BigInt MakeBig() const;
TOOLS_DLLPRIVATE void Normalize();
-TOOLS_DLLPRIVATE void Mult(BigInt const &, sal_uInt16);
-TOOLS_DLLPRIVATE void Div(sal_uInt16, sal_uInt16 &);
-TOOLS_DLLPRIVATE bool IsLess(BigInt const &) const;
+TOOLS_DLLPRIVATE static BigInt Mult(BigInt const &, sal_uInt32);
+TOOLS_DLLPRIVATE void Div(sal_uInt32, sal_uInt32 &);
+TOOLS_DLLPRIVATE bool ABS_IsLessLong(BigInt const &) const;
TOOLS_DLLPRIVATE void AddLong(BigInt &, BigInt &);
TOOLS_DLLPRIVATE void SubLong(BigInt &, BigInt &);
TOOLS_DLLPRIVATE void MultLong(BigInt const &, BigInt &) const;
-TOOLS_DLLPRIVATE void DivLong(BigInt const &, BigInt &) const;
-TOOLS_DLLPRIVATE void ModLong(BigInt const &, BigInt &) const;
+TOOLS_DLLPRIVATE void DivLong(BigInt const &, BigInt &, BigInt * =
nullptr) const;
TOOLS_DLLPRIVATE bool ABS_IsLess(BigInt const &) const;
public:
@@ -65,32 +66,42 @@ public:
{
}
-#if SAL_TYPES_SIZEOFLONG == 4
-BigInt(int nValue)
-: nVal(nValue)
-, nLen(0)
-, bIsNeg(false)
-{
-}
-#endif
-
BigInt( double nVal );
BigInt( sal_uInt32 nVal );
BigInt( sal_Int64 nVal );
BigInt( const BigInt& rBigInt );
BigInt( std::u16string_view rString );
+template
+requires(std::is_integral_v && std::is_signed_v && sizeof(N) <=
sizeof(sal_Int32))
+BigInt(N val)
+: BigInt(sal_Int32(val))
+{
+}
+
+template
+requires(std::is_integral_v && std::is_unsigned_v && sizeof(N)
<= sizeof(sal_uInt32))
+BigInt(N val)
+: BigInt(sal_uInt32(val))
+{
+}
+
+template
+requires(std::is_integral_v && std::is_signed_v && sizeof(N) ==
sizeof(sal_Int64))
+BigInt(N val)
+: BigInt(sal_Int64(val))
+{
+}
+
operatorsal_Int16() const;
operatorsal_uInt16() const;
operatorsal_Int32() const;
operatorsal_uInt32() const;
operatordouble() const;
-#if SAL_TYPES_SIZEOFPOINTER == 8
-operatortools::Long() const;
-#endif
+operatorsal_Int64() const;
-boolIsNeg() const;
-boolIsZero() const;
+boolIsNeg() const { return !IsLong() ? bIsNeg : nVal < 0; }
+boolIsZero() const { return IsLong() && nVal == 0; }
boolIsLong() const { return nLen == 0; }
voidAbs();
@@ -107,20 +118,8 @@ public:
/* Scale and round value */
static tools::Long Scale(tools::Long nVal, tools::Long nMult, tools::Long
nDiv);
-friend inline BigInt operator +( const BigInt& rVal1, const BigInt&
rVal2 );
-friend inline BigInt operator -( const BigInt& rVal1, const BigInt&
rVal2 );
-friend inline BigInt operator *( const BigInt& rVal1, const BigInt&
rVal2 );
-friend inline BigInt operator /( const BigInt& rVal1, const BigInt&
rVal2 );
-friend inline BigInt operator %( const BigInt& rVal1, const BigInt&
rVal2 );
-
TOOLS_DLLPUBLIC friend bool operator==( const BigInt& rVal1,
const BigInt& rVal2 );
-friend inline bool operator!=( const BigInt& rVal1, const BigInt& rVal2
);
-TOOLS_DLLPUBLIC friend bool operator< ( const BigInt& rVal1,
const BigInt& rVal2 );
-friend inline bool operator> ( const BigInt& rVal1, const BigInt& rVal2
);
-friend inline bool operator<=( const BigInt&
core.git: android/source
android/source/res/values-ast/strings.xml| 26 + android/source/res/values-cs/strings.xml |5 + android/source/res/values-dsb/strings.xml| 121 +++ android/source/res/values-fr/strings.xml | 36 android/source/res/values-hsb/strings.xml| 121 +++ android/source/res/values-hy/strings.xml | 18 ++-- android/source/res/values-is/strings.xml | 121 +++ android/source/res/values-it/strings.xml | 10 ++ android/source/res/values-nl/strings.xml |2 android/source/res/values-pl/strings.xml |2 android/source/res/values-pt-rBR/strings.xml | 60 + android/source/res/values-uk/strings.xml |2 12 files changed, 513 insertions(+), 11 deletions(-) New commits: commit 5e3a3671596ea4f8aaecd8e1b428bcc63a627e2d Author: Weblate AuthorDate: Sun Dec 17 17:52:01 2023 +0100 Commit: Michael Weghorn CommitDate: Sun Dec 17 21:39:05 2023 +0100 android-viewer translated using Weblate Lower Sorbian currently translated at 100.0% (118 of 118 strings) Change-Id: Ic20ccfbdde8de842548b79e3b5dfde85f300dc90 android-viewer translated using Weblate Upper Sorbian currently translated at 100.0% (118 of 118 strings) Change-Id: Iddaca4eedc9f022377c81929814856c31067f50d android-viewer translated using Weblate Italian currently translated at 5.9% (7 of 118 strings) Change-Id: I9e0f677f79c7496211959a3360eb166af6226aee Added translation for android-viewer using Weblate (Ukrainian) Change-Id: I130f051543b758544ac3b2a069899870ac16058d android-viewer translated using Weblate Upper Sorbian currently translated at 100.0% (118 of 118 strings) Change-Id: I8655aa3d29866b006f839c93d242332e1102fb4a android-viewer translated using Weblate Czech currently translated at 1.6% (2 of 118 strings) Change-Id: Ib3f028432a47679478f17cadcf031f425293e745 Added translation for android-viewer using Weblate (Lower Sorbian) Change-Id: I1978530538c3808b939729c15fd9a16ed2ab8b3d android-viewer translated using Weblate Icelandic currently translated at 100.0% (118 of 118 strings) Change-Id: Ib7f514c6082fe1b85f6c40f70024cefab8f4b103 android-viewer translated using Weblate Asturian currently translated at 19.4% (23 of 118 strings) Change-Id: I726ac83b54a25b2c12747992f425ac713e33825d android-viewer translated using Weblate Portuguese (Brazil) currently translated at 100.0% (118 of 118 strings) Change-Id: Ib03330ad83be7cd6bf01f99a51870b5eb5c0a316 android-viewer translated using Weblate Armenian currently translated at 100.0% (118 of 118 strings) Change-Id: Idbdaeed85c0cbcfb037de074d34558c10fd978bb Added translation for android-viewer using Weblate (Upper Sorbian) Change-Id: I2f5ca2465e7d788f290656f728da1a3ed001ba19 Added translation for android-viewer using Weblate (Dutch) Change-Id: I9cfed846807c16dd7c9c92d32ada641d89082579 Added translation for android-viewer using Weblate (Icelandic) Change-Id: I120a3e1603867ae60b25531686dbbac5a8086bf2 Added translation for android-viewer using Weblate (Italian) Change-Id: I16661f95066ee125409b7e939721b0070c59cf2d Added translation for android-viewer using Weblate (Asturian) Change-Id: I561826cd41e1de13f8c683a9ffe005cccb2e1246 android-viewer translated using Weblate Czech currently translated at 0.8% (1 of 118 strings) Change-Id: I1fbb418d0c82e587e56dca7b1e751f05fbe256e9 android-viewer translated using Weblate Polish currently translated at 100.0% (118 of 118 strings) Change-Id: I4d9f8bf30b3a084940356258ae929bf061dba129 android-viewer translated using Weblate French currently translated at 32.2% (38 of 118 strings) Change-Id: I327ef925fc254142b4668385a79f502ef0bb888d Added translation for android-viewer using Weblate (Czech) Change-Id: I1215d7ba1a3d4fac3ebf00de9d55ef31753a356e Co-authored-by: Adam Rak Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Elisabetta Manuele Co-authored-by: Michael Wolf Co-authored-by: Olivier Hallot Co-authored-by: Stanislav Horáček Co-authored-by: Sveinn í Felli Co-authored-by: Tigran Zargaryan Co-authored-by: Weblate Co-authored-by: Weblate Co-authored-by: raal Co-authored-by: sophie Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/ast/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/cs/ Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings/dsb/
core.git: Branch 'libreoffice-7-6' - android/source
android/source/res/values-ast/strings.xml| 26 + android/source/res/values-cs/strings.xml |5 + android/source/res/values-dsb/strings.xml| 133 +++ android/source/res/values-fr/strings.xml | 32 ++ android/source/res/values-hsb/strings.xml| 133 +++ android/source/res/values-hy/strings.xml | 29 + android/source/res/values-is/strings.xml | 133 +++ android/source/res/values-it/strings.xml | 19 +++ android/source/res/values-nl/strings.xml |2 android/source/res/values-pl/strings.xml |8 - android/source/res/values-pt-rBR/strings.xml | 61 android/source/res/values-sl/strings.xml | 133 ++- android/source/res/values-uk/strings.xml |2 13 files changed, 710 insertions(+), 6 deletions(-) New commits: commit a81feee7b3e427bb435e75b4f92aa23b974b9071 Author: Weblate AuthorDate: Sun Dec 17 17:59:26 2023 +0100 Commit: Michael Weghorn CommitDate: Sun Dec 17 21:38:45 2023 +0100 android-viewer translated using Weblate Italian currently translated at 12.3% (16 of 130 strings) Change-Id: Ia2e4b3baa1d19f2f9e4f851fda134f8e6ba9f747 android-viewer translated using Weblate Italian currently translated at 12.3% (16 of 130 strings) Change-Id: I09775ac1ba4aaf52a84f1bf7db9e88c03a89797a android-viewer translated using Weblate Italian currently translated at 7.6% (10 of 130 strings) Change-Id: I78f3ada49dcfffd26e682b7f9b4b9165473c381c android-viewer translated using Weblate Italian currently translated at 7.6% (10 of 130 strings) Change-Id: Iff9f02de53ca373a687f0377887359f36ee857d4 android-viewer translated using Weblate Italian currently translated at 6.9% (9 of 130 strings) Change-Id: I6a1e9ef743d237544a49cbf17892c5cd3970b473 Added translation for android-viewer using Weblate (Ukrainian) Change-Id: I81662bc06c11598826315533bfed939431f0d4e4 android-viewer translated using Weblate Italian currently translated at 6.1% (8 of 130 strings) Change-Id: Ia99d7b6af341b833ff4973bf35e9b357279f4526 android-viewer translated using Weblate Italian currently translated at 6.1% (8 of 130 strings) Change-Id: I017fcfa0cb819c7286ade4d2b1e5bc50a9ebb633 android-viewer translated using Weblate Italian currently translated at 6.1% (8 of 130 strings) Change-Id: I0e64e5a02dacc1504c15d18e229a126f9f005e36 android-viewer translated using Weblate Italian currently translated at 5.3% (7 of 130 strings) Change-Id: I9b776b69821cfe1df9f3618a46db0f332354be27 android-viewer translated using Weblate Italian currently translated at 5.3% (7 of 130 strings) Change-Id: I393d8da42f2089a13398bb57f8bb0fd2e49b5147 android-viewer translated using Weblate Italian currently translated at 4.6% (6 of 130 strings) Change-Id: I426c51711a0ea599770a6c7cc385f7af84207d32 android-viewer translated using Weblate Italian currently translated at 4.6% (6 of 130 strings) Change-Id: I52d0ece99e22dce5b1f37d9e07cf029cdb23d5ed android-viewer translated using Weblate Italian currently translated at 3.8% (5 of 130 strings) Change-Id: I285794dead1b36387dabc34000f721fb19ccb6e5 android-viewer translated using Weblate Italian currently translated at 3.8% (5 of 130 strings) Change-Id: I45f003df69a7c4c68a82f19669116490a37cdd35 android-viewer translated using Weblate Lower Sorbian currently translated at 100.0% (130 of 130 strings) Change-Id: I657d19fe63bf1befb4950da503068fbd42472939 android-viewer translated using Weblate Upper Sorbian currently translated at 100.0% (130 of 130 strings) Change-Id: Ib3bdbfefe44ac946b0b3b8b2dc1c5d6aa7d3a71e android-viewer translated using Weblate Italian currently translated at 2.3% (3 of 130 strings) Change-Id: Ic3fbc16577de7203ac8ac037897e324c38645f70 Added translation for android-viewer using Weblate (Lower Sorbian) Change-Id: I3c184788da95055f89257f4584b19e9f42af4c06 android-viewer translated using Weblate Upper Sorbian currently translated at 100.0% (130 of 130 strings) Change-Id: I0abf9385824120b44fc1340753dfee45c482e762 android-viewer translated using Weblate Czech currently translated at 1.5% (2 of 130 strings) Change-Id: I02f3a8455d937cf376ebf7a3790c683a89774bba Added translation for android-viewer using Weblate (Upper Sorbian) Change-Id: I5b0d8355b3459819d15cf07753c4898e1dbab59d android-viewer translated using Weblate Icelandic currently translated at 100.0% (130 of 130 strings)
core.git: Branch 'libreoffice-24-2' - vcl/qa
vcl/qa/cppunit/a11y/atspi2/atspi2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0034d2ab9382da86340738137218791a4ccc9c90
Author: Rene Engelhard
AuthorDate: Sun Dec 17 12:38:11 2023 +0100
Commit: Michael Weghorn
CommitDate: Sun Dec 17 20:36:47 2023 +0100
fix 32 bit build
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:
In static member function 'static void Atspi2TestTree::compareObjects(const
com::sun::star::uno::Reference&,
const Atspi::Accessible&, sal_uInt16)':
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
error: no matching function for call to 'assertEquals(const long int&, int,
CppUnit::SourceLine, const char [1])'
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
/usr/include/cppunit/TestAssert.h:161:6: note: candidate: 'template void CppUnit::assertEquals(const T&, const T&, SourceLine, const
std::string&)'
161 | void assertEquals( const T& expected,
| ^~~~
/usr/include/cppunit/TestAssert.h:161:6: note: template argument
deduction/substitution failed:
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
note: deduced conflicting types for parameter 'const T' ('long int' and
'int')
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
make: ***
[/home/rene/LibreOffice/git/libreoffice-24-2/solenv/gbuild/LinkTarget.mk:340:
/home/rene/LibreOffice/git/libreoffice-24-2/workdir/CxxObject/vcl/qa/cppunit/a11y/atspi2/atspi2.o]
Error 1
Change-Id: I7b7e3e756b135d1066af631e92738e7dfc1ede4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160882
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit ffa28c3565ca0474312c0fabca18689e8a80381b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160865
Tested-by: René Engelhard
diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index 85110eeddecb..7ef2efeca0ef 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -359,7 +359,7 @@ void Atspi2TestTree::compareObjects(const
uno::Reference(pAtspiRelation.getNTargets()));
if (recurseFlags & RecurseFlags::RELATIONS_TARGETS)
{
core.git: Branch 'libreoffice-24-2' - tools/qa
tools/qa/cppunit/test_bigint.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 448276b27d5239eca0173b3c7a1c8563040d1db6
Author: Mike Kaganski
AuthorDate: Sat Dec 16 18:48:40 2023 +0100
Commit: René Engelhard
CommitDate: Sun Dec 17 19:52:57 2023 +0100
Drop incorrect conditional compilation
Since commit 396196d6143e377f83a81557f4630ac7e7ad9471 (BigInt's
non-big value type is currently sal_Int32, 2020-11-14), fixed-size
sal_Int32 is used in the unit test; so it must not depend on size
of unrelated long type.
Change-Id: Ida276e87b927381d093796f4137774a18acded82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160857
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 1d2f9683c664bd3af9331fb2901eaa4dbff29351)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160858
Tested-by: René Engelhard
Reviewed-by: René Engelhard
diff --git a/tools/qa/cppunit/test_bigint.cxx b/tools/qa/cppunit/test_bigint.cxx
index 140562df0e23..3c7740fb7651 100644
--- a/tools/qa/cppunit/test_bigint.cxx
+++ b/tools/qa/cppunit/test_bigint.cxx
@@ -22,6 +22,8 @@
#include
+#include
+
namespace tools
{
class BigIntTest : public CppUnit::TestFixture
@@ -54,7 +56,6 @@ void BigIntTest::testConstructionFromLongLong()
CPPUNIT_ASSERT_EQUAL(static_cast(-42),
static_cast(bi));
}
-#if SAL_TYPES_SIZEOFLONG < SAL_TYPES_SIZEOFLONGLONG
// positive number just fitting to sal_Int32
{
BigInt
bi(static_cast(std::numeric_limits::max()));
@@ -88,7 +89,6 @@ void BigIntTest::testConstructionFromLongLong()
CPPUNIT_ASSERT(bi.IsNeg());
CPPUNIT_ASSERT(!bi.IsLong());
}
-#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(BigIntTest);
core.git: vcl/qa
vcl/qa/cppunit/a11y/atspi2/atspi2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7f298e8e35935de86ea0373fa68eabc343ee091
Author: Rene Engelhard
AuthorDate: Sun Dec 17 12:38:11 2023 +0100
Commit: Michael Weghorn
CommitDate: Sun Dec 17 19:45:17 2023 +0100
fix 32 bit build
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:
In static member function 'static void Atspi2TestTree::compareObjects(const
com::sun::star::uno::Reference&,
const Atspi::Accessible&, sal_uInt16)':
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
error: no matching function for call to 'assertEquals(const long int&, int,
CppUnit::SourceLine, const char [1])'
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
/usr/include/cppunit/TestAssert.h:161:6: note: candidate: 'template void CppUnit::assertEquals(const T&, const T&, SourceLine, const
std::string&)'
161 | void assertEquals( const T& expected,
| ^~~~
/usr/include/cppunit/TestAssert.h:161:6: note: template argument
deduction/substitution failed:
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
note: deduced conflicting types for parameter 'const T' ('long int' and
'int')
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
make: ***
[/home/rene/LibreOffice/git/libreoffice-24-2/solenv/gbuild/LinkTarget.mk:340:
/home/rene/LibreOffice/git/libreoffice-24-2/workdir/CxxObject/vcl/qa/cppunit/a11y/atspi2/atspi2.o]
Error 1
Change-Id: I7b7e3e756b135d1066af631e92738e7dfc1ede4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160882
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index 85110eeddecb..7ef2efeca0ef 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -359,7 +359,7 @@ void Atspi2TestTree::compareObjects(const
uno::Reference(pAtspiRelation.getNTargets()));
if (recurseFlags & RecurseFlags::RELATIONS_TARGETS)
{
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a774cfcc2f7e29af58b64555297b9068dbb6c7f Author: Stanislav Horacek AuthorDate: Sun Dec 17 15:43:34 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:43:34 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 12ca81577572bb0bb3f974956d6ea174cdc3dff8 - use correct space character on Document service page Change-Id: Iadd798bbd73c470b165e0812f86ce855524018d4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160885 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 6fcdab427a017089e19b6d6d236f316f9efe) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160864 diff --git a/helpcontent2 b/helpcontent2 index ec425b5e6b6d..12ca81577572 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ec425b5e6b6d6b2a8ef512e87f41f650785717d3 +Subproject commit 12ca81577572bb0bb3f974956d6ea174cdc3dff8
help.git: Branch 'libreoffice-24-2' - source/text
source/text/sbasic/shared/03/sf_document.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12ca81577572bb0bb3f974956d6ea174cdc3dff8 Author: Stanislav Horacek AuthorDate: Sun Dec 17 14:11:27 2023 +0100 Commit: Olivier Hallot CommitDate: Sun Dec 17 15:43:34 2023 +0100 use correct space character on Document service page Change-Id: Iadd798bbd73c470b165e0812f86ce855524018d4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160885 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 6fcdab427a017089e19b6d6d236f316f9efe) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160864 diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index eb4893dfc1..3397dd67b7 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -531,7 +531,7 @@ Document service;DeleteStyles DeleteStyles - Suppresses a single style or an array of styles given by their names within a specific styles family. Only user-defined styles may be deleted, built-in styles are ignored. It applies to all document types except Base and FormDocument. + Suppresses a single style or an array of styles given by their names within a specific styles family. Only user-defined styles may be deleted, built-in styles are ignored. It applies to all document types except Base and FormDocument. svc.DeleteStyles(family: str, stylelist: str[1..*])
help.git: Branch 'libreoffice-24-2' - source/text
source/text/scalc/01/0402.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec425b5e6b6d6b2a8ef512e87f41f650785717d3 Author: Stanislav Horacek AuthorDate: Sat Dec 16 19:37:34 2023 +0100 Commit: Olivier Hallot CommitDate: Sun Dec 17 15:43:15 2023 +0100 fix menu path to delete cells command Change-Id: I19cdb8441d9b1dfea4a79ac0bf8a7332494f9ffc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160873 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 66324e6b05d29232c8c008ca269531aff113173e) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160863 diff --git a/source/text/scalc/01/0402.xhp b/source/text/scalc/01/0402.xhp index 05766c6ff7..d5327c2544 100644 --- a/source/text/scalc/01/0402.xhp +++ b/source/text/scalc/01/0402.xhp @@ -35,7 +35,7 @@ Insert Cells Opens the Insert Cells dialog, in which you can insert new cells according to the options that you specify. -You can delete cells by choosing Edit - Delete Cells. +You can delete cells by choosing Sheet - Delete Cells.
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6f106d47410d0029142264007f1c2ffa1efbaa87 Author: Stanislav Horacek AuthorDate: Sun Dec 17 15:43:16 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:43:16 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to ec425b5e6b6d6b2a8ef512e87f41f650785717d3 - fix menu path to delete cells command Change-Id: I19cdb8441d9b1dfea4a79ac0bf8a7332494f9ffc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160873 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 66324e6b05d29232c8c008ca269531aff113173e) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160863 diff --git a/helpcontent2 b/helpcontent2 index b8d853c9b126..ec425b5e6b6d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b8d853c9b126d6d7a26843c400f18db93b1ce929 +Subproject commit ec425b5e6b6d6b2a8ef512e87f41f650785717d3
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55d079aa250a6c64120780d0f9a6117d71887b2b Author: Stanislav Horacek AuthorDate: Sun Dec 17 15:42:45 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:42:45 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ef45f87dbeeaada230b31b5790fc1542a3c236f4 - localize bookmarks and code comments in SF Dataset service Change-Id: I0d2fbcbb88f97930c60f1eafa26efa4997bf965d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160540 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 929c069b42a5..ef45f87dbeea 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 929c069b42a5d9f0ae528ed009e8f2c79b15c857 +Subproject commit ef45f87dbeeaada230b31b5790fc1542a3c236f4
help.git: source/text
source/text/sbasic/shared/03/sf_dataset.xhp | 42 ++--
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit ef45f87dbeeaada230b31b5790fc1542a3c236f4
Author: Stanislav Horacek
AuthorDate: Sun Dec 10 14:42:19 2023 +0100
Commit: Olivier Hallot
CommitDate: Sun Dec 17 15:42:45 2023 +0100
localize bookmarks and code comments in SF Dataset service
Change-Id: I0d2fbcbb88f97930c60f1eafa26efa4997bf965d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160540
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp
b/source/text/sbasic/shared/03/sf_dataset.xhp
index 47158a535e..a3b7ae61a3 100644
--- a/source/text/sbasic/shared/03/sf_dataset.xhp
+++ b/source/text/sbasic/shared/03/sf_dataset.xhp
@@ -18,7 +18,7 @@
-
+
Dataset service
@@ -42,7 +42,7 @@
The
Dataset service is invoked using the
CreateDataset method, which can be called either from a
Database service instance or from another
Dataset instance.
-
+
The following example
creates a Dataset from the table "Customers" stored in a
database file.
@@ -61,7 +61,7 @@
oNewDataset = oDataset.CreateDataset(Filter :=
"[City]='New York'")
-
+
database = CreateScriptService("Database",
r"C:\MyDatabase.odb")
@@ -348,7 +348,7 @@
CloseDataset
-
+
Dataset service;CloseDataset
CloseDataset
@@ -375,7 +375,7 @@
CreateDataset
--
-
+
Dataset service;CreateDataset
CreateDataset
@@ -390,26 +390,26 @@
- '
Use an empty string to remove the current filter
+ ' Use an empty
string to remove the current filter
oNewDataset = oDataset.CreateDataset(Filter :=
"")
- '
Examples of common filters
+ ' Examples of
common filters
oNewDataset = oDataset.CreateDataset(Filter :=
"[Name] = 'John'")
oNewDataset = oDataset.CreateDataset(Filter :=
"[Name] LIKE 'A'")
- '
It is possible to append additional conditions to the current filter
+ ' It is possible to
append additional conditions to the current filter
oNewDataset = oDataset.CreateDataset(Filter := "("
oDataset.Filter ") AND [Name] LIKE 'A'")
- new_dataset =
dataset.CreateDataset(filter = "")
- new_dataset =
dataset.CreateDataset(filter = "[Name] = 'John'")
- new_dataset =
dataset.CreateDataset(filter = "[Name] LIKE 'A'")
- new_dataset =
dataset.CreateDataset(filter = f"({dataset.Filter}) AND [Name] LIKE
'A'")
+ new_dataset = dataset.CreateDataset(filter =
"")
+ new_dataset = dataset.CreateDataset(filter = "[Name]
= 'John'")
+ new_dataset = dataset.CreateDataset(filter = "[Name]
LIKE 'A'")
+ new_dataset = dataset.CreateDataset(filter =
f"({dataset.Filter}) AND [Name] LIKE 'A'")
Delete
-
-
+
Dataset service;Delete
Delete
@@ -432,7 +432,7 @@
ExportValueToFile
---
-
+
Dataset service;ExportValueToFile
ExportValueToFile
@@ -460,7 +460,7 @@
GetRows
-
+
Dataset service;GetRows
GetRows
@@ -500,7 +500,7 @@
GetValue
---
-
+
Dataset service;GetValue
GetValue
@@ -525,7 +525,7 @@
Insert
--
-
+
Dataset service;Insert
Insert
@@ -570,7 +570,7 @@
MoveFirstLast
--
-
+
Dataset service;MoveFirst
Dataset service;MoveLast
@@ -598,7 +598,7 @@
MoveNextPrevious
-
+
Dataset service;MoveNext
Dataset service;MovePrevious
@@ -630,7 +630,7 @@
Reload
-
-
+
Dataset service;Reload
Reload
@@ -659,7 +659,7 @@
Update
-
-
+
Dataset service;Update
Update
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fcf3b9d426999299fcde8440716e93211d9c558c Author: Stanislav Horacek AuthorDate: Sun Dec 17 15:41:29 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:41:29 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 929c069b42a5d9f0ae528ed009e8f2c79b15c857 - use correct space character on Document service page Change-Id: Iadd798bbd73c470b165e0812f86ce855524018d4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160885 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3840b15dd7fa..929c069b42a5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3840b15dd7fac37566c41f5579d333f3a1f655c2 +Subproject commit 929c069b42a5d9f0ae528ed009e8f2c79b15c857
help.git: source/text
source/text/sbasic/shared/03/sf_document.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 929c069b42a5d9f0ae528ed009e8f2c79b15c857 Author: Stanislav Horacek AuthorDate: Sun Dec 17 14:11:27 2023 +0100 Commit: Olivier Hallot CommitDate: Sun Dec 17 15:41:28 2023 +0100 use correct space character on Document service page Change-Id: Iadd798bbd73c470b165e0812f86ce855524018d4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160885 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index eb4893dfc1..3397dd67b7 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -531,7 +531,7 @@ Document service;DeleteStyles DeleteStyles - Suppresses a single style or an array of styles given by their names within a specific styles family. Only user-defined styles may be deleted, built-in styles are ignored. It applies to all document types except Base and FormDocument. + Suppresses a single style or an array of styles given by their names within a specific styles family. Only user-defined styles may be deleted, built-in styles are ignored. It applies to all document types except Base and FormDocument. svc.DeleteStyles(family: str, stylelist: str[1..*])
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c0a6fe55b495e0652696653868836c3afb65c31 Author: Stanislav Horacek AuthorDate: Sun Dec 17 15:40:47 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:40:47 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3840b15dd7fac37566c41f5579d333f3a1f655c2 - fix menu path to delete cells command Change-Id: I19cdb8441d9b1dfea4a79ac0bf8a7332494f9ffc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160873 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 58ac48c0056e..3840b15dd7fa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 58ac48c0056e70c9e1e44e9ef84355dddb13784a +Subproject commit 3840b15dd7fac37566c41f5579d333f3a1f655c2
help.git: source/text
source/text/scalc/01/0402.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3840b15dd7fac37566c41f5579d333f3a1f655c2 Author: Stanislav Horacek AuthorDate: Sat Dec 16 19:37:34 2023 +0100 Commit: Olivier Hallot CommitDate: Sun Dec 17 15:40:47 2023 +0100 fix menu path to delete cells command Change-Id: I19cdb8441d9b1dfea4a79ac0bf8a7332494f9ffc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160873 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0402.xhp b/source/text/scalc/01/0402.xhp index 05766c6ff7..d5327c2544 100644 --- a/source/text/scalc/01/0402.xhp +++ b/source/text/scalc/01/0402.xhp @@ -35,7 +35,7 @@ Insert Cells Opens the Insert Cells dialog, in which you can insert new cells according to the options that you specify. -You can delete cells by choosing Edit - Delete Cells. +You can delete cells by choosing Sheet - Delete Cells.
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e02d1df8087f07948e7e6ba45daf51c7372e8d3 Author: Olivier Hallot AuthorDate: Sun Dec 17 11:40:20 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:40:20 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to b8d853c9b126d6d7a26843c400f18db93b1ce929 - Fix online help xapian build + refactor of browserhelp.xhp Change-Id: Iaba2ac4c8951bfb65fb237fa9eab95269826c544 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160886 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 58ac48c0056e70c9e1e44e9ef84355dddb13784a) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160862 diff --git a/helpcontent2 b/helpcontent2 index fc54b052a9b5..b8d853c9b126 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fc54b052a9b51da8954d90250958b08c20ab9e19 +Subproject commit b8d853c9b126d6d7a26843c400f18db93b1ce929
help.git: Branch 'libreoffice-24-2' - help3xsl/xap_templ_query.xsl source/text
help3xsl/xap_templ_query.xsl|2 source/text/shared/help/browserhelp.xhp | 160 2 files changed, 81 insertions(+), 81 deletions(-) New commits: commit b8d853c9b126d6d7a26843c400f18db93b1ce929 Author: Olivier Hallot AuthorDate: Sun Dec 17 10:49:47 2023 -0300 Commit: Olivier Hallot CommitDate: Sun Dec 17 15:40:19 2023 +0100 Fix online help xapian build + refactor of browserhelp.xhp Change-Id: Iaba2ac4c8951bfb65fb237fa9eab95269826c544 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160886 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 58ac48c0056e70c9e1e44e9ef84355dddb13784a) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160862 diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl index ec42e84cf7..88dae9c03a 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -24,7 +24,7 @@ xsltproc xap_template_query.xsl - + diff --git a/source/text/shared/help/browserhelp.xhp b/source/text/shared/help/browserhelp.xhp index 1981123291..11d9e87330 100644 --- a/source/text/shared/help/browserhelp.xhp +++ b/source/text/shared/help/browserhelp.xhp @@ -11,93 +11,93 @@ -Help Page Strings +Help Page Strings /text/shared/help/browserhelp.xhp -Module -Language -Contents -Search in bookmarks for all modules -Search in bookmarks for chosen module -Search in all help pages -Please support us! -%PRODUCTNAME %PRODUCTVERSION Help -Click on text to copy to clipboard -Select Module -Select Language -Search help contents +Module +Language +Contents +Search in bookmarks for all modules +Search in bookmarks for chosen module +Search in all help pages +Please support us! +%PRODUCTNAME %PRODUCTVERSION Help +Click on text to copy to clipboard +Select Module +Select Language +Search help contents Enable JavaScript in the browser to display %PRODUCTNAME Help pages. -English (USA) -Albanian -Amharic -Arabic -Asturian -Bengali -Bengali (India) -Bosnian -Bulgarian -Catalan -Catalan (Valencia) -Chinese (Simplified) -Chinese (Traditional) -Croatian -Czech -Danish -Dutch -Dzongkha -English (UK) -English (SA) -Esperanto -Estonian -Basque -Finnish -French -Galician -Georgian -German -Greek -Gujarati -Hebrew -Hindi -Hungarian -Indonesian -Icelandic -Italian -Japanese -Khmer -Korean -Lao -Latvian -Lithuanian -Macedonian -Nepali -Norwegian Nynorsk -Norwegian Bokmål -Oromo -Polish -Portuguese -Portuguese (Brazil) -Romanian -Russian -Sidama -Sinhala -Slovak -Slovenian -Sorbian (Lower) -Sorbian (Upper) -Spanish -Swedish -Tajik -Tamil -Tibetan -Turkish -Uyghur -Ukrainian -Vietnamese +English (USA) +Albanian +Amharic +Arabic +Asturian +Bengali +Bengali (India) +Bosnian +Bulgarian +Catalan +Catalan (Valencia) +Chinese (Simplified) +Chinese (Traditional) +Croatian +Czech +Danish +Dutch +Dzongkha +English (UK) +English (SA) +Esperanto +Estonian +Basque +Finnish +French +Galician +Georgian +German +Greek +Gujarati +Hebrew +Hindi +Hungarian +Indonesian +Icelandic +Italian +Japanese +Khmer +Korean +Lao +Latvian +Lithuanian +Macedonian +Nepali +Norwegian Nynorsk +Norwegian Bokmål +Oromo +Polish +Portuguese +Portuguese (Brazil) +Romanian +Russian +Sidama +Sinhala +Slovak +Slovenian +Sorbian (Lower) +Sorbian (Upper) +Spanish +Swedish +Tajik +Tamil +Tibetan +Turkish +Uyghur +Ukrainian +Vietnamese Next Previous
help.git: Branch 'libreoffice-24-2' - source/text
source/text/shared/guide/builtin_help.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc54b052a9b51da8954d90250958b08c20ab9e19 Author: Stanislav Horacek AuthorDate: Sun Dec 17 13:28:58 2023 +0100 Commit: Olivier Hallot CommitDate: Sun Dec 17 15:39:14 2023 +0100 fix file extension on help installation page Change-Id: Ia2564f487caea7bfdba2548525661c1ff5963ece Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160884 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 2e408bb03f95da32746601a722a7d0bad3d37e9f) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160861 diff --git a/source/text/shared/guide/builtin_help.xhp b/source/text/shared/guide/builtin_help.xhp index b5a11e973c..fd284c462a 100644 --- a/source/text/shared/guide/builtin_help.xhp +++ b/source/text/shared/guide/builtin_help.xhp @@ -61,7 +61,7 @@ RPM installer The .rpm installer is meant for Red Hat-based Linux distributions and it is available as a .tar.gz compressed file. Download the .tar.gz file to your device and extract it. The .rpm file will be inside a folder named RPMS. - Open the Terminal application, use the cd command to navigate to the folder where the .deb file is located and run the following command: + Open the Terminal application, use the cd command to navigate to the folder where the .rpm file is located and run the following command: $ sudo rpm -i libobasis7.6-en-US-help-7.6.4.1-1.x86_64.rpm After installation, restart %PRODUCTNAME to be able to use the built-in help.
core.git: Branch 'libreoffice-24-2' - 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 779b30b85f77f22cf0bff8fe50eba1c45e7b4976 Author: Stanislav Horacek AuthorDate: Sun Dec 17 15:39:14 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:39:14 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to fc54b052a9b51da8954d90250958b08c20ab9e19 - fix file extension on help installation page Change-Id: Ia2564f487caea7bfdba2548525661c1ff5963ece Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160884 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 2e408bb03f95da32746601a722a7d0bad3d37e9f) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160861 diff --git a/helpcontent2 b/helpcontent2 index 6d45710a3569..fc54b052a9b5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6d45710a35698fbab9b416b728d6cf0c78549542 +Subproject commit fc54b052a9b51da8954d90250958b08c20ab9e19 commit ae1afdc75cfd34f1e7ce3f5595c741f45d46b1c0 Author: Ilmari Lauhakangas AuthorDate: Sun Dec 17 16:38:58 2023 +0200 Commit: Gerrit Code Review CommitDate: Sun Dec 17 15:38:58 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 6d45710a35698fbab9b416b728d6cf0c78549542 - Make Help navigation layout less busy Bookmarks don't have to be visible all the time, so make them a dropdown and move the search box to header. Move Xapian search to the top of the content area. Make Contents tree appear on the left side in 960px and wider screens. Simplify/clean up some CSS and JS, for example for module colours. Change-Id: Ic50a834b758d50098868866e4b8d3e8085755423 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160870 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 25f39b53fb292ec90368f2afd3678884a1a8bb27) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160860 diff --git a/helpcontent2 b/helpcontent2 index 31578053608c..6d45710a3569 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 31578053608cf51098aed652b47aaffc1676d4b9 +Subproject commit 6d45710a35698fbab9b416b728d6cf0c78549542
help.git: Branch 'libreoffice-24-2' - help3xsl/default.css help3xsl/help2.js help3xsl/online_transform.xsl help3xsl/paginathing.js help3xsl/xap_templ_query.xsl source/text
help3xsl/default.css| 183
help3xsl/help2.js | 15 --
help3xsl/online_transform.xsl | 86 +++
help3xsl/paginathing.js |3
help3xsl/xap_templ_query.xsl|9 -
source/text/shared/help/browserhelp.xhp | 22 +--
6 files changed, 157 insertions(+), 161 deletions(-)
New commits:
commit 6d45710a35698fbab9b416b728d6cf0c78549542
Author: Ilmari Lauhakangas
AuthorDate: Sat Dec 16 15:49:32 2023 +0200
Commit: Olivier Hallot
CommitDate: Sun Dec 17 15:38:57 2023 +0100
Make Help navigation layout less busy
Bookmarks don't have to be visible all the time, so make them a
dropdown and move the search box to header.
Move Xapian search to the top of the content area.
Make Contents tree appear on the left side in 960px and wider screens.
Simplify/clean up some CSS and JS, for example for module colours.
Change-Id: Ic50a834b758d50098868866e4b8d3e8085755423
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160870
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
(cherry picked from commit 25f39b53fb292ec90368f2afd3678884a1a8bb27)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160860
diff --git a/help3xsl/default.css b/help3xsl/default.css
index b54f9fe725..5f3276fb5b 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -32,6 +32,7 @@ do not break anything related to layout by scaling.
--font_mono: Menlo, "Cascadia Mono", "Cascadia Code", Consolas, "DejaVu Sans
Mono", monospace;
--font_body: Ubuntu, Cantarell, "Segoe UI Variable", "Segoe UI", "Noto
Sans", "DejaVu Sans", "Lucida Grande", sans-serif, FreeSerif, NanumGothic,
"Noto Sans Tibetan", Taprom;
--background-color: #f7f8f7;
+ --module-color: #18A303;
}
body,
@@ -226,6 +227,7 @@ html[dir=ltr] th {
margin-top: 0px;
}
.tableheadcell {
+background: var(--module-color);
color: white;
vertical-align:top;
}
@@ -252,7 +254,8 @@ h4,
h5,
h6 {
margin-bottom: 0.67rem;
-color: #148603;
+color: var(--module-color);
+border-bottom-color: var(--module-color);
}
p,
ol,
@@ -263,7 +266,7 @@ td {
h1 {
font-size: 1.83rem;
font-weight: 300;
-border-bottom: 2px solid #148603;
+border-bottom: 2px solid;
margin-bottom: 1.67rem;
}
h1 a {
@@ -326,14 +329,15 @@ h6 {
margin-top: 15px;
margin-bottom: 15px;
}
-
#DisplayArea {
background-color: #FCFCFC;
overflow: auto;
padding: 10px 10px 40px 10px;
grid-area: main;
}
-
+#omega-autofocus {
+width: 274px;
+}
.mediabutton {
background-color: cyan;
}
@@ -360,6 +364,7 @@ h6 {
.embedded {}
#TopLeftHeader {
+background: var(--module-color);
grid-area: header;
position: sticky;
top: 0px;
@@ -379,6 +384,7 @@ h6 {
display: flex;
justify-content: space-between;
flex-direction: column;
+width: 100%;
}
.symbol, .logo, .logo:hover, .logo:visited {
color: #fff;
@@ -495,9 +501,8 @@ footer p {
label[for=accordion-1] {
color: #26;
display: block;
-padding: 10px 0 10px 20px;
+margin: 0 0 10px 10px;
font-size: 22px;
-line-height: .6;
}
label[for=accordion-1]:after {
font-size: 44px;
@@ -510,7 +515,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
color: #333;
z-index: 6;
display: block;
-margin: 0 20px 0 20px;
+margin: 0 20px 20px 20px;
}
.index-label {
font-size: 22px;
@@ -518,7 +523,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
padding-left: 20px;
margin: 20px 0 0 0;
}
-#Index, .index {
+.index {
margin-top: 10px;
}
.index {
@@ -532,7 +537,8 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
display: none;
}
#Bookmarks {
-padding: 0 20px;
+width: 300px;
+margin-left: 10px;
}
#Bookmarks p {
font-size: 22px;
@@ -628,7 +634,6 @@ li.disabled a {
box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
box-sizing: border-box;
line-height: 1.5em;
-margin-top: 10px;
outline: none;
padding: 0 .25em;
transition: all 0.30s ease-in-out;
@@ -642,13 +647,25 @@ li.disabled a {
#search-bar::placeholder {
font-style: italic;
}
+#SearchFrame .nav-container {
+display: none;
+position: absolute;
+background-color: var(--background-color);
+overflow-y: auto;
+-webkit-overflow-scrolling: touch;
+max-height: 80svh;
+width: 300px;
+}
+#SearchFrame:focus-within .nav-container {
+display: block;
+}
.xapian-donation {
border-top: 2px solid #148603;
background-color: #FCFCFC;
box-shadow: 0 2px 8px 0 rgba(0,0,0,.05);
}
#DonationFrame {
-background: #18A303;
+background: var(--module-color);
position: sticky;
top: 0px;
}
@@ -672,10 +689,9 @@ li.disabled a {
text-align: center;
}
#SearchFrame {
-background: #18A303;
top:
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit faa4e8d5c54a3492e32b17b49660801e019630af Author: Olivier Hallot AuthorDate: Sun Dec 17 10:52:32 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Dec 17 14:52:32 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 58ac48c0056e70c9e1e44e9ef84355dddb13784a - Fix online help xapian build + refactor of browserhelp.xhp Change-Id: Iaba2ac4c8951bfb65fb237fa9eab95269826c544 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160886 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2e408bb03f95..58ac48c0056e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2e408bb03f95da32746601a722a7d0bad3d37e9f +Subproject commit 58ac48c0056e70c9e1e44e9ef84355dddb13784a
help.git: help3xsl/xap_templ_query.xsl source/text
help3xsl/xap_templ_query.xsl|2 source/text/shared/help/browserhelp.xhp | 160 2 files changed, 81 insertions(+), 81 deletions(-) New commits: commit 58ac48c0056e70c9e1e44e9ef84355dddb13784a Author: Olivier Hallot AuthorDate: Sun Dec 17 10:49:47 2023 -0300 Commit: Olivier Hallot CommitDate: Sun Dec 17 14:52:32 2023 +0100 Fix online help xapian build + refactor of browserhelp.xhp Change-Id: Iaba2ac4c8951bfb65fb237fa9eab95269826c544 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160886 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl index ec42e84cf7..88dae9c03a 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -24,7 +24,7 @@ xsltproc xap_template_query.xsl - + diff --git a/source/text/shared/help/browserhelp.xhp b/source/text/shared/help/browserhelp.xhp index 1981123291..11d9e87330 100644 --- a/source/text/shared/help/browserhelp.xhp +++ b/source/text/shared/help/browserhelp.xhp @@ -11,93 +11,93 @@ -Help Page Strings +Help Page Strings /text/shared/help/browserhelp.xhp -Module -Language -Contents -Search in bookmarks for all modules -Search in bookmarks for chosen module -Search in all help pages -Please support us! -%PRODUCTNAME %PRODUCTVERSION Help -Click on text to copy to clipboard -Select Module -Select Language -Search help contents +Module +Language +Contents +Search in bookmarks for all modules +Search in bookmarks for chosen module +Search in all help pages +Please support us! +%PRODUCTNAME %PRODUCTVERSION Help +Click on text to copy to clipboard +Select Module +Select Language +Search help contents Enable JavaScript in the browser to display %PRODUCTNAME Help pages. -English (USA) -Albanian -Amharic -Arabic -Asturian -Bengali -Bengali (India) -Bosnian -Bulgarian -Catalan -Catalan (Valencia) -Chinese (Simplified) -Chinese (Traditional) -Croatian -Czech -Danish -Dutch -Dzongkha -English (UK) -English (SA) -Esperanto -Estonian -Basque -Finnish -French -Galician -Georgian -German -Greek -Gujarati -Hebrew -Hindi -Hungarian -Indonesian -Icelandic -Italian -Japanese -Khmer -Korean -Lao -Latvian -Lithuanian -Macedonian -Nepali -Norwegian Nynorsk -Norwegian Bokmål -Oromo -Polish -Portuguese -Portuguese (Brazil) -Romanian -Russian -Sidama -Sinhala -Slovak -Slovenian -Sorbian (Lower) -Sorbian (Upper) -Spanish -Swedish -Tajik -Tamil -Tibetan -Turkish -Uyghur -Ukrainian -Vietnamese +English (USA) +Albanian +Amharic +Arabic +Asturian +Bengali +Bengali (India) +Bosnian +Bulgarian +Catalan +Catalan (Valencia) +Chinese (Simplified) +Chinese (Traditional) +Croatian +Czech +Danish +Dutch +Dzongkha +English (UK) +English (SA) +Esperanto +Estonian +Basque +Finnish +French +Galician +Georgian +German +Greek +Gujarati +Hebrew +Hindi +Hungarian +Indonesian +Icelandic +Italian +Japanese +Khmer +Korean +Lao +Latvian +Lithuanian +Macedonian +Nepali +Norwegian Nynorsk +Norwegian Bokmål +Oromo +Polish +Portuguese +Portuguese (Brazil) +Romanian +Russian +Sidama +Sinhala +Slovak +Slovenian +Sorbian (Lower) +Sorbian (Upper) +Spanish +Swedish +Tajik +Tamil +Tibetan +Turkish +Uyghur +Ukrainian +Vietnamese Next Previous
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c42157398a0dc551b77173d2bfeb20f71c177fe Author: Stanislav Horacek AuthorDate: Sun Dec 17 13:49:40 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 17 13:49:40 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 2e408bb03f95da32746601a722a7d0bad3d37e9f - fix file extension on help installation page Change-Id: Ia2564f487caea7bfdba2548525661c1ff5963ece Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160884 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 25f39b53fb29..2e408bb03f95 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 25f39b53fb292ec90368f2afd3678884a1a8bb27 +Subproject commit 2e408bb03f95da32746601a722a7d0bad3d37e9f
help.git: source/text
source/text/shared/guide/builtin_help.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e408bb03f95da32746601a722a7d0bad3d37e9f Author: Stanislav Horacek AuthorDate: Sun Dec 17 13:28:58 2023 +0100 Commit: Olivier Hallot CommitDate: Sun Dec 17 13:49:39 2023 +0100 fix file extension on help installation page Change-Id: Ia2564f487caea7bfdba2548525661c1ff5963ece Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160884 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/guide/builtin_help.xhp b/source/text/shared/guide/builtin_help.xhp index b5a11e973c..fd284c462a 100644 --- a/source/text/shared/guide/builtin_help.xhp +++ b/source/text/shared/guide/builtin_help.xhp @@ -61,7 +61,7 @@ RPM installer The .rpm installer is meant for Red Hat-based Linux distributions and it is available as a .tar.gz compressed file. Download the .tar.gz file to your device and extract it. The .rpm file will be inside a folder named RPMS. - Open the Terminal application, use the cd command to navigate to the folder where the .deb file is located and run the following command: + Open the Terminal application, use the cd command to navigate to the folder where the .rpm file is located and run the following command: $ sudo rpm -i libobasis7.6-en-US-help-7.6.4.1-1.x86_64.rpm After installation, restart %PRODUCTNAME to be able to use the built-in help.
core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpnumericfmt.hxx | 99 +--
1 file changed, 48 insertions(+), 51 deletions(-)
New commits:
commit 250f6d0caf71c13e53076fb8eee4eaf1b0ec4156
Author: Julien Nabet
AuthorDate: Sun Dec 17 12:19:56 2023 +0100
Commit: Julien Nabet
CommitDate: Sun Dec 17 13:47:00 2023 +0100
Static map initialization in lotuswordpro/lwpnumericfmt
Change-Id: I7894e8b7bf9b4d4c25e1c75551cae2b58b26d6a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160881
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx
b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index c3b6bfb2b187..4bc0a345071c 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -178,63 +178,60 @@ enum
class LwpCurrencyPool
{
public:
-LwpCurrencyPool(){InitCurrencySymbol();}
+LwpCurrencyPool(){};
OUString GetCurrencySymbol(sal_uInt16 nFormat);
bool IsShowSpace(sal_uInt16 nFormat);
bool IsSymbolPost(sal_uInt16 nFormat);
private:
-std::map m_aCurrencyInfo;
-void InitCurrencySymbol()
+std::map m_aCurrencyInfo
{
-sal_uInt16 nC=FMT_ARGENTINEANPESO;
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("A");
//FMT_ARGENTINEANPESO = 1,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("A$");
//FMT_AUSTRALIANDOLLAR = 2,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("oS",true,
true);//FMT_AUSTRIANSCHILLING = 3,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("BF",true,
true);//FMT_BELGIANFRANC = 4,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R$",false,
true);//FMT_BRAZILIANCRUZEIRO= 5,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"\uFFE1"_ustr);
//FMT_BRITISHPOUND = 6,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("C$");
//FMT_CANADIANDOLLAR= 7,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"PRC\uFFE5"_ustr,false,true);
//FMT_CHINESEYUAN = 8,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Kc",true,
true);//FMT_CZECHKORUNA = 9,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dkr",false,
true);//FMT_DANISHKRONE = 10,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("ECU",true, true);//FMT_ECU
= 11,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("mk",true,
true);//FMT_FINNISHMARKKA = 12,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",true,
true);//FMT_FRENCHFRANC= 13,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("DM",true,
true);//FMT_GERMANMARK= 14,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dr",true,
true);//FMT_GREEKDRACHMA = 15,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("HK$");
//FMT_HONGKONGDOLLAR= 16,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Ft",true,
true);//FMT_HUNGARIANFORINT = 17,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rs",false,
true);//FMT_INDIANRUPEE = 18,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rp",false,
true);//FMT_INDONESIANRUPIAH = 19,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"IR\uFFE1"_ustr);
//FMT_IRISHPUNT = 20,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("L.",false,
true);//FMT_ITALIANLIRA = 21,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"\uFFE5"_ustr);
//FMT_JAPANESEYEN = 22,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("LF",true,
true);//FMT_LUXEMBOURGFRANC = 23,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rm",false,
true);//FMT_MALAYSIANRINGGIT = 24,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Mex$");
//FMT_MEXICANPESO = 25,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",false,
true);//FMT_NETHERLANDSGUILDER= 26,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("NZ$");
//FMT_NEWZEALANDDOLLAR = 27,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Nkr",false,
true);//FMT_NORWEGIANKRONE = 28,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Zl",true,
true);//FMT_POLISHZLOTY = 29,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Esc.",true,
true);//FMT_PORTUGUESEESCUDO= 30,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Leu",true,
true);//FMT_ROMANIANLEI = 31,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R",true,
true);//FMT_RUSSIANRUBLE = 32,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("S$");
//FMT_SINGAPOREDOLLAR = 33,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Sk",true,
true);//FMT_SLOVAKIANKORUNA = 34,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SIT",false,
true);//FMT_SLOVENIANTHOLAR = 35,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R");
//FMT_SOUTHAFRICANRAND = 36,
-m_aCurrencyInfo[nC++]=LwpCurrencyInfo("W");
//FMT_SOUTHKOREANWON= 37,
-
core.git: Branch 'libreoffice-24-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e91d0caeb408231c43cc3cc3cad2440efafd96ed Author: Julien Nabet AuthorDate: Sat Dec 16 22:46:31 2023 +0100 Commit: Julien Nabet CommitDate: Sun Dec 17 12:00:11 2023 +0100 tdf#150695: The string "IgnoreAll" is probably wrong Change-Id: I93dc97d36dbd1c61ce8a851c4065944cb3fd9fc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160877 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 03691a623d491bcb4fac6862d9a25b674ccbef0c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160859 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 5235cfea8946..83e6611922da 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2723,7 +2723,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - IgnoreAll + Ignore All
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32b437559abcf7582f113dcb5c87f1a2dd2ba3ac Author: Julien Nabet AuthorDate: Sat Dec 16 22:46:31 2023 +0100 Commit: Julien Nabet CommitDate: Sun Dec 17 11:11:13 2023 +0100 tdf#150695: The string "IgnoreAll" is probably wrong Change-Id: I93dc97d36dbd1c61ce8a851c4065944cb3fd9fc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160877 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 6ffdabf967a5..98332bbb434e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2741,7 +2741,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - IgnoreAll + Ignore All
core.git: chart2/source
chart2/source/controller/inc/AxisItemConverter.hxx |
5 -
chart2/source/controller/inc/CharacterPropertyItemConverter.hxx |
2
chart2/source/controller/inc/DataPointItemConverter.hxx |
6 -
chart2/source/controller/inc/LegendItemConverter.hxx|
6 -
chart2/source/controller/inc/MultipleChartConverters.hxx|
5 -
chart2/source/controller/inc/RegressionEquationItemConverter.hxx|
6 -
chart2/source/controller/inc/TextLabelItemConverter.hxx |
5 -
chart2/source/controller/inc/TitleItemConverter.hxx |
5 -
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |
2
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx |
2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |
2
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx |
2
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |
6 -
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx |
2
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |
2
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx |
6 -
chart2/source/controller/main/ChartController_Properties.cxx|
42 +-
17 files changed, 55 insertions(+), 51 deletions(-)
New commits:
commit 40cec25c21f3ea5d7348d778c1ab5343fa7bb456
Author: Noel Grandin
AuthorDate: Fri Dec 15 21:37:04 2023 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 17 10:33:52 2023 +0100
unique_ptr to optional in chart2
Change-Id: I642f6f1fb7df9f0a7525155b22a99344a02d9cf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160839
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx
b/chart2/source/controller/inc/AxisItemConverter.hxx
index c9f3049356a0..c14ef82bd595 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -19,11 +19,12 @@
#pragma once
#include "ItemConverter.hxx"
+#include
#include
+#include
#include
-namespace com::sun::star::awt { struct Size; }
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::chart2 { class XAxis; }
namespace com::sun::star::chart2 { class XChartDocument; }
@@ -45,7 +46,7 @@ public:
const rtl::Reference<::chart::ChartModel> & xChartDoc,
ExplicitScaleData const * pScale,
ExplicitIncrementData const * pIncrement,
-const css::awt::Size* pRefSize );
+const std::optional& pRefSize );
virtual ~AxisItemConverter() override;
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index a3d6ed6b26b3..65ff58ea45ab 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -35,7 +35,7 @@ public:
CharacterPropertyItemConverter(
const css::uno::Reference& rPropertySet,
SfxItemPool& rItemPool,
-const css::awt::Size* pRefSize,
+const std::optional& pRefSize,
OUString aRefSizePropertyName,
const css::uno::Reference& rRefSizePropSet =
css::uno::Reference() );
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx
b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 3c6e276ff763..720cc0fef2e7 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -20,14 +20,14 @@
#include "ItemConverter.hxx"
#include "GraphicPropertyItemConverter.hxx"
+#include
#include
#include
#include
-
+#include
#include
-namespace com::sun::star::awt { struct Size; }
namespace com::sun::star::chart2 { class XDataSeries; }
namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
@@ -49,7 +49,7 @@ public:
SdrModel& rDrawModel,
const css::uno::Reference&
xNamedPropertyContainerFactory,
GraphicObjectType eMapTo,
-const css::awt::Size* pRefSize = nullptr,
+const std::optional& pRefSize = std::nullopt,
bool bDataSeries = false,
bool bUseSpecialFillColor = false,
sal_Int32 nSpecialFillColor = 0,
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx
b/chart2/source/controller/inc/LegendItemConverter.hxx
index 3e9315acc20d..cbb657edf0d3 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -19,10 +19,10 @@
#pragma once
#include "ItemConverter.hxx"
-
+#include
+#include
#include
