core.git: sd/qa
sd/qa/unit/data/odp/tdf156955.odp |binary
sd/qa/unit/layout-tests.cxx |8
2 files changed, 8 insertions(+)
New commits:
commit 16da2bc87145f07f6f84fa69c76d461a31aea139
Author: Samuel Mehrbrodt
AuthorDate: Thu May 16 14:03:30 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu May 16 15:57:59 2024 +0200
tdf#156955 Add test
Change-Id: I02d2f437c3847970441dd489cc60beaf278b8d78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167741
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/qa/unit/data/odp/tdf156955.odp
b/sd/qa/unit/data/odp/tdf156955.odp
new file mode 100644
index ..ae8af600aa6d
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf156955.odp differ
diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx
index 8143b82e5a1b..7c15cad69954 100644
--- a/sd/qa/unit/layout-tests.cxx
+++ b/sd/qa/unit/layout-tests.cxx
@@ -323,6 +323,14 @@ CPPUNIT_TEST_FIXTURE(SdLayoutTest,
testFitToFrameTextFitting)
#endif
}
+CPPUNIT_TEST_FIXTURE(SdLayoutTest, testTdf156955)
+{
+xmlDocUniquePtr pXmlDoc = load("odp/tdf156955.odp");
+
+// Make sure text box has the right size - without the fix it was 2759.
+assertXPath(pXmlDoc, "/metafile/push/push/textarray[5]"_ostr, "y"_ostr,
"3183");
+}
+
CPPUNIT_TEST_FIXTURE(SdLayoutTest, testTdf148966)
{
// Test related to IgnoreBreakAfterMultilineField compatibility flag.
core.git: include/svx sd/source svx/sdi svx/source svx/uiconfig sw/inc sw/sdi sw/source
include/svx/nbdtmg.hxx |3
include/svx/numvset.hxx |7 ++
include/svx/svxids.hrc |7 +-
sd/source/ui/func/fuolbull.cxx |2
svx/sdi/svx.sdi | 18 +
svx/source/dialog/svxbmpnumvalueset.cxx | 26 +++-
svx/source/sidebar/nbdtmg.cxx| 24 +++
svx/source/tbxctrls/bulletsnumbering.cxx | 100 +--
svx/uiconfig/ui/numberingwindow.ui | 69 +
sw/inc/doc.hxx |1
sw/inc/editsh.hxx|1
sw/sdi/_textsh.sdi |5 +
sw/source/core/doc/docnum.cxx| 20 ++
sw/source/core/edit/ednumber.cxx |5 +
sw/source/uibase/shells/textsh1.cxx | 10 +++
sw/source/uibase/shells/txtnum.cxx | 18 -
16 files changed, 300 insertions(+), 16 deletions(-)
New commits:
commit c8a5dc46d11f2ef1e3a66d633730d9a700ced24a
Author: Samuel Mehrbrodt
AuthorDate: Mon May 6 09:20:58 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu May 16 09:17:09 2024 +0200
tdf#161056 Show bullets used in document in bullets dropdown
Change-Id: I40cfc39501006146f7c6c04a1f3c7cf877c6f1c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167186
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 894304e4c37d..8979b736e40c 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -145,7 +145,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
};
-class BulletsTypeMgr final : public NBOTypeMgrBase
+class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
friend class NumberingTypeMgr;
@@ -161,6 +161,7 @@ class BulletsTypeMgr final : public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0) override;
virtual void ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel) override;
virtual void ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel, bool isDefault=false,bool isResetSize=false) override;
+void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet,
std::u16string_view sFont, sal_uInt16 mLevel,bool isResetSize=false);
virtual OUString GetDescription(sal_uInt16 nIndex, bool isDefault)
override;
virtual bool IsCustomized(sal_uInt16 nIndex) override;
static BulletsTypeMgr& GetInstance();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 059d6b7bc558..d3b6e71a69e1 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -40,6 +40,7 @@ namespace com::sun::star {
enum class NumberingPageType
{
+DOCBULLET,
BULLET,
SINGLENUM,
OUTLINE,
@@ -55,6 +56,9 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
css::uno::Reference xFormatter;
css::lang::Locale aLocale;
+// Pair of bullet chars (first), and their respective font (second)
+std::vector> maCustomBullets;
+
css::uno::Sequence<
css::uno::Sequence<
css::beans::PropertyValue> > aNumSettings;
@@ -82,6 +86,9 @@ public:
css::uno::Reference const &
xFormatter,
const css::lang::Locale& rLocale);
+std::vector> GetCustomBullets() { return
maCustomBullets; }
+void SetCustomBullets(std::vector>
aCustomBullets);
+
virtual FactoryFunction GetUITestFactory() const override;
};
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index b4e1a91d386a..68d02d4a86fc 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -185,6 +185,7 @@ class XFillGradientItem;
#define FN_BUL_NUM_RULE_INDEX TypedWhichId(FN_EDIT + 120) //
achieving num rule index
#define FN_NUM_NUM_RULE_INDEX TypedWhichId(FN_EDIT + 121)
#define FN_OUTLINE_RULE_INDEX TypedWhichId(FN_EDIT + 122)
+#define FN_BUL_GET_DOC_BULLETS TypedWhichId(FN_EDIT + 123)
#define FN_INSERT (SID_SW_START + 300) // 20300
#define FN_DELETE_BOOKMARK TypedWhichId(FN_INSERT + 1)
@@ -1058,8 +1059,12 @@ class XFillGradientItem;
#define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1210
)
#define SID_SET_DOCUMENT_LANGUAGE
TypedWhichId( SID_SVX_START + 1211 )
+#define SID_ATTR_BULLET_CHAR
TypedWhichId(SID_SVX_START + 1212)
+#define SID_ATTR_BULLET_FONT
TypedWhichId(SID_SVX_START + 1213)
+#define SID_ATTR_BULLET_INDEX
TypedWhichId(SID_SVX_START + 1214)
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1211
+ 1 )
+#define SID_SVX_FIRSTFREE ( SID_SVX_START + 121
core.git: Branch 'libreoffice-24-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Paths.xcu |5 + 1 file changed, 5 insertions(+) New commits: commit 81bc6152fecfb9220ec1a36b8a7edc8634467e19 Author: Samuel Mehrbrodt AuthorDate: Thu May 2 10:23:22 2024 +0200 Commit: Xisco Fauli CommitDate: Tue May 7 18:17:02 2024 +0200 tdf#160153 Restore Storage config item Revert "[API CHANGE] Remove deprecated Storage config item" This reverts commit 3cee7edeb31ac64e078159c7a63ebf4f54793da7. As documented in the bug report, the config item is still used. Thus, remove the deprecation notice, too. Change-Id: Ia9beefe8e98bce8d70c546d27999d81c5cc9fd62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166904 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins (cherry picked from commit 80fcd2290dfc9748bb7f4e322b22b773b61daa67) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167219 Reviewed-by: Xisco Fauli diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index a0aae4547ba8..b5b304b8f362 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -153,6 +153,11 @@ + + +$(userpath)/store + + true
core.git: svx/sdi
svx/sdi/svx.sdi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 505803e2cb4d60153be2218a17ede8e34d95b42e Author: Samuel Mehrbrodt AuthorDate: Mon May 6 14:02:34 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 22:13:00 2024 +0200 Point to TDF wiki Change-Id: Ib20ecddcdbbfbb39b1160508349e092db4a04e4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167200 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index bc53f325914c..d1eea8e2ca68 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -17,7 +17,7 @@ */ /* - * See https://wiki.openoffice.org/wiki/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2#Slot_definitions + * See https://wiki.documentfoundation.org/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2#Slot_definitions * for details on what these mean, and what values to use. * Likely many of the existing ones are not defined correctly. *
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Paths.xcu |5 + 1 file changed, 5 insertions(+) New commits: commit 80fcd2290dfc9748bb7f4e322b22b773b61daa67 Author: Samuel Mehrbrodt AuthorDate: Thu May 2 10:23:22 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 22:12:40 2024 +0200 tdf#160153 Restore Storage config item Revert "[API CHANGE] Remove deprecated Storage config item" This reverts commit 3cee7edeb31ac64e078159c7a63ebf4f54793da7. As documented in the bug report, the config item is still used. Thus, remove the deprecation notice, too. Change-Id: Ia9beefe8e98bce8d70c546d27999d81c5cc9fd62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166904 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index a0aae4547ba8..b5b304b8f362 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -153,6 +153,11 @@ + + +$(userpath)/store + + true
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog4.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 2f141c543494f44eab05db79533c60d342213901 Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:45:44 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 22:12:19 2024 +0200 tdf#99528 Use vertical tabs in frame style dialog Change-Id: Iae4fa2ef7050f963a85b8f348269cbe8f2f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166861 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui index 76911e0709c8..453e75bc92b3 100644 --- a/sw/uiconfig/swriter/ui/templatedialog4.ui +++ b/sw/uiconfig/swriter/ui/templatedialog4.ui @@ -122,6 +122,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog8.ui |1 + 1 file changed, 1 insertion(+) New commits: commit e5e9ed7b87072c3c6366f50127cf2b9cf6bf4499 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:01:22 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 14:03:46 2024 +0200 tdf#99528 Use vertical tabs in page dialog Change-Id: Ie4a905be356848c998b3fca457abfec9856c9383 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166746 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui index ad3a600c5f04..61c439ff6488 100644 --- a/sw/uiconfig/swriter/ui/templatedialog8.ui +++ b/sw/uiconfig/swriter/ui/templatedialog8.ui @@ -122,6 +122,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/paratemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 2a41f854ceb2860239b1d7ec8fbc3d460c7499a1 Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:34:45 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 13:45:05 2024 +0200 tdf#99528 Use vertical tabs in Calc paragraph styles dialog Change-Id: I1528a3b38dac3c69b80b294a156359b5dc34f5bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166859 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui b/sc/uiconfig/scalc/ui/paratemplatedialog.ui index 83d7ff8da59e..903884b72156 100644 --- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui @@ -106,6 +106,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/formatcellsdialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 2199e603691a770ea6b67cbaba4ce1e0ce7b1919 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:10:15 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 13:14:35 2024 +0200 tdf#99528 Use vertical tabs in 'Format cells' dialog Change-Id: Id3ea15b1ae2ea22762f9c645e42548399eec3b0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166748 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui index ea0daf8e9fd5..d4104ef99913 100644 --- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui +++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui @@ -92,6 +92,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/pagetemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit d71ea85d286a9a89e6cf784da90a820a09c0db2e Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:32:30 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 13:06:27 2024 +0200 tdf#99528 Use vertical tabs in Calc page styles dialog Change-Id: Ia08a7351470a1561269238c29af3da58fc0b8e20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166858 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui index e8b40d391540..09910e0d3776 100644 --- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui @@ -107,6 +107,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog16.ui |1 + 1 file changed, 1 insertion(+) New commits: commit d9bcf481b40d2a20169a98eb53caf7b19a03f3b8 Author: Samuel Mehrbrodt AuthorDate: Mon Apr 29 08:18:23 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 11:55:37 2024 +0200 tdf#99528 Use vertical tabs in list style dialog Change-Id: Ia9bcf82a3966e01fab2181235313c54f6898f0c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166862 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui index f769a21ddd90..e3026565f5ac 100644 --- a/sw/uiconfig/swriter/ui/templatedialog16.ui +++ b/sw/uiconfig/swriter/ui/templatedialog16.ui @@ -122,6 +122,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/drawtemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 971db10d73a0fe80cceca70d19edd02de30be414 Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:27:31 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 11:02:36 2024 +0200 tdf#99528 Use vertical tabs in Calc draw styles dialog Change-Id: Idff126955c7b4721a2009febbde6a138bc4af93e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166857 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui index b20a03b54dae..df4c63ccfaa7 100644 --- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui @@ -106,6 +106,7 @@ True True True +left True True
core.git: sd/uiconfig
sd/uiconfig/simpress/ui/templatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 67dc0edb688d345607ae6afe3ad849f143804e28 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 16:39:14 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 10:18:43 2024 +0200 tdf#99528 Use vertical tabs in 'Edit Style' dialog Change-Id: Ia581c92952d16d71ace8511b502304cdb9014479 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166760 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui index 9e424e03d349..43ffe5db66ff 100644 --- a/sd/uiconfig/simpress/ui/templatedialog.ui +++ b/sd/uiconfig/simpress/ui/templatedialog.ui @@ -106,6 +106,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/framedialog.ui |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d700acbcba68e8b56e22db53bfcdfeb4c5777b9c Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 14:49:58 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 09:13:04 2024 +0200 tdf#99528 Use vertical tabs in Frame dialog Change-Id: Ie0de985765cd00e376b6e15782fb8ba666af8bf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166741 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui index f5725f3cdfc8..7e8979f0f451 100644 --- a/sw/uiconfig/swriter/ui/framedialog.ui +++ b/sw/uiconfig/swriter/ui/framedialog.ui @@ -1,5 +1,5 @@ - + @@ -92,6 +92,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog1.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 62172db2d71fdc49a3ad9c177b8635353b90a7eb Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:43:43 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 13:14:24 2024 +0200 tdf#99528 Use vertical tabs in character style dialog Change-Id: If6ae98f7d1ca1e92e38b1a277b528fa436791174 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166860 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui index e97d41ab80d2..a2228d743f17 100644 --- a/sw/uiconfig/swriter/ui/templatedialog1.ui +++ b/sw/uiconfig/swriter/ui/templatedialog1.ui @@ -127,6 +127,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog8.ui | 361 -- 1 file changed, 59 insertions(+), 302 deletions(-) New commits: commit 951562bc555a6011b39f3c5c02a784d541f01224 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:00:59 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 11:18:00 2024 +0200 Save with newer Glade version Change-Id: Id4d172ebb5265e418b9b3c8bea0a4dacf2ae27cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166745 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui index 10455153fd4a..ad3a600c5f04 100644 --- a/sw/uiconfig/swriter/ui/templatedialog8.ui +++ b/sw/uiconfig/swriter/ui/templatedialog8.ui @@ -1,34 +1,31 @@ - + -False -False -6 +False +6 Page Style +False True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Help True -True -True +True +True True @@ -42,8 +39,8 @@ _Reset True -True -True +True +True True @@ -56,9 +53,9 @@ _Apply True -True -True -True +True +True +True True @@ -71,9 +68,9 @@ Standard True -True -True -True +True +True +True False @@ -85,10 +82,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -101,8 +98,8 @@ _Cancel True -True -True +True +True True @@ -115,47 +112,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -164,42 +137,18 @@ True -True +True Organizer -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -211,43 +160,19 @@ True -True +True Page 1 -False +False True -False
core.git: 2 commits - sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/ui/formatcellsdialog.ui | 287 ++-- sd/uiconfig/simpress/ui/templatedialog.ui | 533 -- 2 files changed, 119 insertions(+), 701 deletions(-) New commits: commit 7e553a56c6a5aa7f4b1f01df52ed9607d3397cfc Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:09:59 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 08:30:53 2024 +0200 Save with newer Glade version Change-Id: Ib1380e4771bbeeaebece1bb5bae0617e588ec378 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166747 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui index b18ec5c62814..ea0daf8e9fd5 100644 --- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui +++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui @@ -1,33 +1,30 @@ - + -False -6 +False +6 Format Cells True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True True @@ -40,10 +37,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -56,8 +53,8 @@ _Cancel True -True -True +True +True True @@ -70,8 +67,8 @@ _Help True -True -True +True +True True @@ -85,47 +82,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -134,42 +107,18 @@ True -False +False Numbers -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -181,43 +130,19 @@ True -False +False Font 1 -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -229,43 +154,19 @@ True -False +False Font
core.git: sc/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/drawtemplatedialog.ui | 503 - sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 265 ++- sc/uiconfig/scalc/ui/paratemplatedialog.ui | 325 +++--- sw/uiconfig/swriter/ui/templatedialog1.ui | 273 ++- sw/uiconfig/swriter/ui/templatedialog16.ui | 287 +++- sw/uiconfig/swriter/ui/templatedialog4.ui | 333 +++ 6 files changed, 336 insertions(+), 1650 deletions(-) New commits: commit 9ec6bfb598f39ebdb3e6698b5411ace951a53a8d Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:15:25 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 08:30:22 2024 +0200 Save with newer Glade version Change-Id: I0b3c4d263cef98ae9b28b863e25def3819ca9186 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166772 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui index 2a2ca1f3e632..b20a03b54dae 100644 --- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui @@ -1,33 +1,30 @@ - + -False -6 +False +6 Drawing Style True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True True @@ -40,9 +37,9 @@ _Standard True -True -True -True +True +True +True False @@ -54,10 +51,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -70,8 +67,8 @@ _Cancel True -True -True +True +True True @@ -84,8 +81,8 @@ _Help True -True -True +True +True True @@ -99,47 +96,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -148,42 +121,18 @@ True -False +False Organizer -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -195,43 +144,19 @@ True -True +True Line 1 -False +False True -False
core.git: cui/uiconfig vcl/inc vcl/source
cui/uiconfig/ui/hyperlinkdialog.ui |1
vcl/inc/verticaltabctrl.hxx|2 -
vcl/source/control/imivctl.hxx |2 -
vcl/source/control/imivctl1.cxx| 67 +
vcl/source/control/ivctrl.cxx |4 +-
vcl/source/window/builder.cxx | 14 +++
6 files changed, 50 insertions(+), 40 deletions(-)
New commits:
commit b64751ba28fd69fb2a93a21b10a92b68f4dd2097
Author: Samuel Mehrbrodt
AuthorDate: Fri Apr 26 10:47:00 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Apr 29 07:52:27 2024 +0200
tdf#99528 Properly layout vertical tabs without icons
Implement a proper list mode for VerticalTabControl.
Before this was only used in the Hyperlink dialog with large icons.
Change-Id: I227643392ef4840a70b379734e2993db0f13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166702
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui
b/cui/uiconfig/ui/hyperlinkdialog.ui
index b8819f74d31a..c0eb4f085906 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -123,6 +123,7 @@
True
True
left
+icons
diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx
index c5942799b381..666bef474172 100644
--- a/vcl/inc/verticaltabctrl.hxx
+++ b/vcl/inc/verticaltabctrl.hxx
@@ -49,7 +49,7 @@ class VerticalTabControl final : public VclHBox
VerticalTabPageData* GetPageData(const SvxIconChoiceCtrlEntry* pEntry)
const;
public:
-VerticalTabControl(vcl::Window* pParent);
+VerticalTabControl(vcl::Window* pParent, bool bWithIcons);
virtual ~VerticalTabControl() override;
virtual void dispose() override;
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index 5a052c083efa..c29068442728 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -303,7 +303,7 @@ public:
SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; }
voidSetCursor( SvxIconChoiceCtrlEntry* );
-SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false
);
+SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos );
voidMakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool
bBound = true );
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 1364dc4f44d0..6508c4fe12c3 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -92,7 +92,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
Clear( true );
-Size gridSize(100,70);
+Size gridSize((nWinStyle & WB_DETAILS) ? 200 : 100, (nWinStyle &
WB_DETAILS) ? 20 : 70);
if(pView->GetDPIScaleFactor() > 1)
{
gridSize.setHeight( gridSize.Height() * ( pView->GetDPIScaleFactor()) );
@@ -157,11 +157,6 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle )
eSelectionMode = SelectionMode::NONE;
if( !(nWinStyle & (WB_ALIGN_TOP | WB_ALIGN_LEFT)))
nWinBits |= WB_ALIGN_LEFT;
-if( nWinStyle & WB_DETAILS )
-{
-if (!m_pColumns)
-SetColumn( 0, SvxIconChoiceCtrlColumnInfo() );
-}
}
IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar,
void )
@@ -608,7 +603,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const
MouseEvent& rMEvt)
if(aDocPos.X()>=aOutputSize.Width() || aDocPos.Y()>=aOutputSize.Height())
return false;
ToDocPos( aDocPos );
-SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos, true );
+SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos );
if( pEntry )
MakeEntryVisible( pEntry, false );
@@ -785,7 +780,7 @@ bool SvxIconChoiceCtrl_Impl::MouseMove( const MouseEvent&
rMEvt )
return false;
else if( nWinBits & WB_HIGHLIGHTFRAME )
{
-SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos, true );
+SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos );
SetEntryHighlightFrame( pEntry, false );
}
else
@@ -1513,7 +1508,7 @@ void SvxIconChoiceCtrl_Impl::SetNoSelection()
}
}
-SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point&
rDocPos, bool bHit )
+SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos
)
{
CheckBoundingRects();
// search through z-order list from the end
@@ -1522,24 +1517,9 @@ SvxIconChoiceCtrlEntry*
SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos,
{
nCount--;
SvxIconChoiceCtrlEntry* pEntry = maZOrderList[ nCount ];
-if( pEntry->aRect.Contains( rDocPos ) )
-{
-if( bHit )
-
core.git: cui/uiconfig
cui/uiconfig/ui/hyperlinkdialog.ui | 222 ++--- 1 file changed, 63 insertions(+), 159 deletions(-) New commits: commit 535391b31abafb02e5a4451e30a14a5605d05ff4 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 10:09:06 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Sat Apr 27 09:29:14 2024 +0200 Save with newer Glade version Change-Id: If36d812ba976bc3331086b5beb5493f20c0556ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166701 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index c598e02093e4..b8819f74d31a 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -1,33 +1,33 @@ - + -False +False True True -6 +6 Hyperlink -0 -0 -dialog +0 +0 +dialog -False +False True True vertical 6 -False -end +False +end Reset True -True -True +True +True Resets the entries in the dialog to their original state. @@ -44,8 +44,8 @@ Apply True -True -True +True +True Applies the data to your document. @@ -62,10 +62,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +78,8 @@ _Cancel True -True -True +True +True True @@ -97,8 +97,8 @@ _Help True -True -True +True +True True @@ -112,46 +112,22 @@ False True -end +end 0 True -True +True True True -left +left True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -160,14 +136,14 @@ True -False +False vertical True -False -This is where you create a hyperlink to a Web page. -res/hlinettp.png +False +This is where you create a hyperlink to a Web page. +res/hlinettp.png 6 @@ -179,10 +155,10 @@ True -False +False _Internet -True -internet +True +internet False @@ -192,38 +168,14 @@ -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False
core.git: editeng/source
editeng/source/editeng/impedit3.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit d84c900bb78168dd9bd0fd1ea02c0769a5ba5f14 Author: Samuel Mehrbrodt AuthorDate: Mon Jan 15 16:53:50 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Fri Apr 26 11:36:35 2024 +0200 tdf#156955 Properly align text when tabstop is outside of textbox Co-authored-by: Tibor Nagy Change-Id: I9f7ead01d93e0701f8df30ad1dcfe24ef0af7067 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162113 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 72bc2022b1ea..c0a8b1fc734c 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1096,6 +1096,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) aCurrentTab.nTabPortion = nTmpPortion; } +if (nMaxLineWidth < aCurrentTab.nTabPos && nTmpWidth != nMaxLineWidth - 1) +aCurrentTab.nTabPos = nMaxLineWidth - 1; + pPortion->SetKind(PortionKind::TAB); pPortion->SetExtraValue( aCurrentTab.aTabStop.GetFill() ); pPortion->setWidth( aCurrentTab.nTabPos - (nTmpWidth+nStartX) );
core.git: 2 commits - sw/uiconfig
sw/uiconfig/swriter/ui/paradialog.ui | 364 +++--- sw/uiconfig/swriter/ui/templatedialog2.ui | 575 -- 2 files changed, 142 insertions(+), 797 deletions(-) New commits: commit 7bbeba7fe8b094e218bd57f613eaefdf47ff88de Author: Samuel Mehrbrodt AuthorDate: Thu Apr 25 14:46:16 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Fri Apr 26 08:45:02 2024 +0200 Save with newer Glade version Change-Id: I37188d82d87724c70b8e33bc65e56f091d5587e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166623 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui index 0014cf943ddd..3f12d683e6fa 100644 --- a/sw/uiconfig/swriter/ui/paradialog.ui +++ b/sw/uiconfig/swriter/ui/paradialog.ui @@ -1,36 +1,33 @@ - + -False -False -6 +False +6 Paragraph +False True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True +Unsaved modifications to this tab are reverted. True -Unsaved modifications to this tab are reverted. Revert any changes made on the tab shown here to the settings that were present when this dialog was opened. @@ -45,12 +42,11 @@ -_Standard -False -True -True -True -True +_Standard +True +True +True +True False @@ -62,10 +58,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +74,8 @@ _Cancel True -True -True +True +True True @@ -92,8 +88,8 @@ _Help True -True -True +True +True True @@ -107,47 +103,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -156,42 +128,18 @@ True -False +False Indents Spacing -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -203,44 +151,20 @@ True -False +False Alignment 0.5 1 -False +False True
core.git: 2 commits - helpcontent2 officecfg/registry sd/source
helpcontent2|2 +- officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |2 +- sd/source/ui/view/ToolBarManager.cxx|3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) New commits: commit dee3e2d7c8d412951099e4425e6ece24431cd98d Author: Samuel Mehrbrodt AuthorDate: Thu Apr 25 13:53:18 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Apr 25 18:23:40 2024 +0200 Related tdf#87676 Enable text formatting toolbar when in a text box Use the second row (hiding the shapes toolbar) to show the text formatting toolbar when the user is inside a text box. This helps users to do basic text formatting at the place where they expect the controls from Writer, Calc, etc. Otherwise, when the Sidebar is switched to another Deck, finding the text formatting functions can be hard in the classic toolbar layout. Change-Id: I8d6f54e6f3f44917b0c89ae699c2798e4f6b86a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166621 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index 234502d43185..8475ac8c9847 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -755,7 +755,7 @@ true - false + true Text Formatting diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 7dd95c962499..5296b7bd94ef 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1079,6 +1079,8 @@ void ToolBarRules::SelectionHasChanged ( case ::sd::ViewShell::ST_HANDOUT: mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Function, ToolBarManager::msDrawingObjectToolBar); + mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Permanent, + ToolBarManager::msToolBar); break; default: break; @@ -1122,6 +1124,7 @@ void ToolBarRules::SubShellAdded ( break; case ToolbarId::Draw_Text_Toolbox_Sd: + mpToolBarManager->RemoveToolBar(ToolBarManager::ToolBarGroup::Permanent, ToolBarManager::msToolBar); mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTextObjectBar); break; commit bdc90ee923fc68f57fc7234192be2ba512797775 Author: Olivier Hallot AuthorDate: Thu Apr 25 13:23:35 2024 -0300 Commit: Gerrit Code Review CommitDate: Thu Apr 25 18:23:35 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to db688bf5d40a94939f8e6ab35744c267d35b39ab - tdf#132253 Hyperlink tab in Characters is gone. Change-Id: Ic146695c24e488fc5c0d0cebce2e43769ac37a7a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166640 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 686da2a7ece1..db688bf5d40a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 686da2a7ece1ce03db28cfba2747870c88a9ca2e +Subproject commit db688bf5d40a94939f8e6ab35744c267d35b39ab
core.git: include/svx svx/source
include/svx/nbdtmg.hxx|1 -
svx/source/sidebar/nbdtmg.cxx | 11 ++-
2 files changed, 2 insertions(+), 10 deletions(-)
New commits:
commit a600cb4865f2b4bce872a000c2614cf6478b1ee0
Author: Samuel Mehrbrodt
AuthorDate: Thu Apr 25 09:06:57 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Apr 25 13:47:04 2024 +0200
Remove unused fields
Unused since f944648e0f5d52605a267ed50bba4bfc035aecc6
Change-Id: Id5f5a77df8afdf15d99989b86bb04179d86ae92b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166614
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 81ef80223496..894304e4c37d 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -72,7 +72,6 @@ class SVX_DLLPUBLIC BulletsSettings
{
public:
vcl::Font aFont;
-OUStringsDescription;
sal_UCS4cBulletChar;
boolbIsCustomized;
BulletsSettings() : cBulletChar(0), bIsCustomized(false) {}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index ced78fe6bc61..26e26c8a3152 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -341,16 +341,9 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uInt1
}
}
-OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/)
+OUString BulletsTypeMgr::GetDescription(sal_uInt16 /*nIndex*/, bool
/*isDefault*/)
{
-OUString sRet;
-
-if ( nIndex >= DEFAULT_BULLET_TYPES )
-return sRet;
-else
-sRet = pActualBullets[nIndex]->sDescription;
-
-return sRet;
+return OUString();
}
bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex)
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e212d987a76f5df1091a1f70ff9557568402d4ba Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 11:24:22 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:23:24 2024 +0200 tdf#33603 Typo: 'Notes Panel' -> 'Notes Pane' Similiar to 'Slide Pane' Change-Id: If96afc4c054bbbff7c9bf8c5f4309e8eeb419d77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166005 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Sarper Akdemir diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 358190e43fae..caffed00b5d4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -26,7 +26,7 @@ - Notes Panel + Notes Pane 1
core.git: sd/sdi
sd/sdi/sdraw.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 39803b859ac935aaec1ad4d66038d3c92d907ae3 Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 10:55:31 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:23:03 2024 +0200 tdf#33603 Allow adding Notes Panel to toolbar/menubar/keyboard shortcuts Change-Id: Ic3e8f6b5a0cc8697c62e8f10f69ff53859f33d3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166004 Tested-by: Jenkins Reviewed-by: Sarper Akdemir diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 5a5d192a212a..9c2493ea2476 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4401,9 +4401,9 @@ SfxBoolItem BottomPaneImpress SID_BOTTOM_PANE_IMPRESS Asynchron; -AccelConfig = FALSE, -MenuConfig = FALSE, -ToolBoxConfig = FALSE, +AccelConfig = TRUE, +MenuConfig = TRUE, +ToolBoxConfig = TRUE, GroupId = SfxGroupId::View; ]
core.git: 2 commits - officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 sd/Library_sd.mk | 1 sd/inc/app.hrc | 1 sd/sdi/ViewShellBase.sdi | 2 sd/sdi/sdraw.sdi | 4 sd/source/ui/app/sddll.cxx | 2 sd/source/ui/dlg/NotesChildWindow.cxx| 631 -- sd/source/ui/inc/NotesChildWindow.hxx| 107 - sd/source/ui/view/GraphicViewShellBase.cxx | 2 sd/source/ui/view/ViewShellBase.cxx | 4 sd/source/ui/view/drvwshrg.cxx | 4 sd/uiconfig/simpress/menubar/menubar.xml | 2 12 files changed, 10 insertions(+), 752 deletions(-) New commits: commit 933d9d8b4b9e90f3c3f3842af27588a251a699df Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 10:55:01 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:22:53 2024 +0200 tdf#33603 Make notes panel available in readonly mode Change-Id: I2dd10802f3798b2e87833d3cd8ebd21366e0f546 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166003 Tested-by: Jenkins Reviewed-by: Sarper Akdemir diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 924f60f61a69..5a5d192a212a 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4393,7 +4393,7 @@ SfxBoolItem BottomPaneImpress SID_BOTTOM_PANE_IMPRESS [ AutoUpdate = TRUE, FastCall = FALSE, -ReadOnlyDoc = FALSE, +ReadOnlyDoc = TRUE, Toggle = FALSE, Container = TRUE, RecordAbsolute = FALSE, commit ede2f1e6eefbc6471f0163c21430c2f747bb0e67 Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 10:19:40 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:22:45 2024 +0200 tdf#33603 Fix Close button not working in Notes Pane Remove duplicate command and now unused NotesChildWindow Change-Id: Idef94086ca91dd1474070c426c37ef921ad4fa03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166002 Tested-by: Jenkins Reviewed-by: Sarper Akdemir diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 370984a7e5d9..358190e43fae 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -24,7 +24,7 @@ S~lide - + Notes Panel diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index cd1dba8ac8ca..9180714846d2 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -231,7 +231,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/dlg/AnimationChildWindow \ sd/source/ui/dlg/LayerTabBar \ sd/source/ui/dlg/NavigatorChildWindow \ - sd/source/ui/dlg/NotesChildWindow \ sd/source/ui/dlg/PaneChildWindows \ sd/source/ui/dlg/PaneShells \ sd/source/ui/dlg/SpellDialogChildWindow \ diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 45d20f874d38..7a2334b47ed8 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -422,7 +422,6 @@ #define SID_LEFT_PANE_IMPRESS (SID_SD_START+414) #define SID_LEFT_PANE_DRAW (SID_SD_START+415) #define SID_BOTTOM_PANE_IMPRESS (SID_SD_START+416) -#define SID_NOTES_WINDOW(SID_SD_START+417) // FREE #define SID_NORMAL_MULTI_PANE_GUI TypedWhichId(SID_SD_START+420) #define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421) diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index f39368368f1d..f196e549ba25 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -32,7 +32,7 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] -SID_NOTES_WINDOW +SID_BOTTOM_PANE_IMPRESS [ ExecMethod = Execute; StateMethod = GetState; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index ce0eb521e9ec..924f60f61a69 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4388,7 +4388,7 @@ SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW GroupId = SfxGroupId::Modify; ] -SfxVoidItem NotesChildWindow SID_NOTES_WINDOW +SfxBoolItem BottomPaneImpress SID_BOTTOM_PANE_IMPRESS [ AutoUpdate = TRUE, diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 67019328b6e2..c1e76ee7e0a7 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include
core.git: Branch 'feature/cib_contract49' - 2 commits - cui/source include/svx officecfg/registry sc/source svx/source sw/qa
cui/source/tabpages/numpages.cxx | 23 +-
include/svx/strings.hrc|9 --
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 35 +
sc/source/ui/view/output2.cxx | 14 ++-
svx/source/dialog/svxbmpnumvalueset.cxx| 48 -
svx/source/sidebar/nbdtmg.cxx | 26 ++-
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py |3
7 files changed, 74 insertions(+), 84 deletions(-)
New commits:
commit 22abd40d51fd6be26eae529a3380c09a5b647cec
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 11:55:30 2024 +0100
Commit: Thorsten Behrens
CommitDate: Sun Apr 7 01:00:16 2024 +0200
tdf#108697 Allow modifying default bullet selection
Allow to change bullets in configuration.
Change-Id: Iab26118dd597417997d6f0a7355f516a4da97ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163735
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 2179ad2cf107..efd1192bc03d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
@@ -119,19 +120,6 @@ static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const
SequenceGetSelectedItemId() - 1];
-const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
+sal_Unicode cChar =
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get()[nIndex].toChar();
+vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+rActBulletFont.SetFamilyName(
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get()[nIndex]);
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 80066b3d33f3..75e0c42cffbb 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1367,15 +1367,6 @@
#define RID_SVXSTR_ERR_OLD_PASSWD
NC_("RID_SVXSTR_ERR_OLD_PASSWD", "Invalid password")
#define RID_SVXSTR_ERR_REPEAT_PASSWD
NC_("RID_SVXSTR_ERR_REPEAT_PASSWD", "Passwords do not match")
-#define RID_SVXSTR_BULLET_DESCRIPTION_0
NC_("RID_SVXSTR_BULLET_DESCRIPTION_0", "Solid small circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_1
NC_("RID_SVXSTR_BULLET_DESCRIPTION_1", "Solid large circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_2
NC_("RID_SVXSTR_BULLET_DESCRIPTION_2", "Solid diamond bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_3
NC_("RID_SVXSTR_BULLET_DESCRIPTION_3", "Solid large square bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_4
NC_("RID_SVXSTR_BULLET_DESCRIPTION_4", "Right pointing arrow bullets filled
out")
-#define RID_SVXSTR_BULLET_DESCRIPTION_5
NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_6
NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Cross mark bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_7
NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Check mark bullets")
-
// do not translate this; instead describe the nth numbering style
(LC_NumberingLevel) defined by your locale
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 9fe1915a8b9c..616ae5bf2955 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3343,6 +3343,41 @@
+
+
+Contains Favorite characters
+
+
+
+ List of default bullets
+
+
+ •
+ ●
+
+
+ ➔
+ ➢
+ ✗
+ ✔
+
+
+
+
+ List of default bullet fonts. Matching font for
`DefaultBullets`.
+
+
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+
core.git: Branch 'libreoffice-24-2' - sw/qa sw/source
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx | 11 +++
sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt |binary
sw/source/core/access/AccessibilityCheck.cxx |5 +
3 files changed, 16 insertions(+)
New commits:
commit 7a61065bb8ccf33fb1918218bf2febd30e786bf4
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 18 15:19:42 2024 +0100
Commit: Caolán McNamara
CommitDate: Sun Mar 31 22:37:34 2024 +0200
tdf#159918 a11y check: Don't warn about tabs in ToC
Change-Id: Ifde41deb66c8dcb72842e18e539609ff351be832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164972
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit c6075e716200e9c6bae1b10be2cf10013958e83a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165424
Reviewed-by: Caolán McNamara
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index 117b48d01661..bfe2e08d8543 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -251,6 +251,17 @@ scanAccessibilityIssuesOnNodes(SwDoc* pDocument)
return aIssues;
}
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckTabsinTOC)
+{
+createSwDoc("Tabs-in-TOC.odt");
+SwDoc* pDoc = getSwDoc();
+CPPUNIT_ASSERT(pDoc);
+sw::AccessibilityCheck aCheck(pDoc);
+aCheck.check();
+auto& aIssues = aCheck.getIssueCollection().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(0), aIssues.size());
+}
+
void checkIssuePosition(std::shared_ptr const&
pIssue, int nLine,
sal_Int32 nStart, sal_Int32 nEnd, SwNodeOffset nIndex)
{
diff --git a/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
new file mode 100644
index ..2b3ce54cc5a3
Binary files /dev/null and b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
differ
diff --git a/sw/source/core/access/AccessibilityCheck.cxx
b/sw/source/core/access/AccessibilityCheck.cxx
index e515b5cae7ed..dfa94c3ed9ab 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -901,6 +901,11 @@ public:
}
case ' ':
{
+// Don't warn about tabs in ToC
+auto pSection =
SwDoc::GetCurrSection(SwPosition(*pTextNode, 0));
+if (pSection && pSection->GetTOXBase())
+continue;
+
if (bPreviousWasChar)
{
++nTabCount;
core.git: sw/qa sw/source
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx | 11 +++
sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt |binary
sw/source/core/access/AccessibilityCheck.cxx |5 +
3 files changed, 16 insertions(+)
New commits:
commit c6075e716200e9c6bae1b10be2cf10013958e83a
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 18 15:19:42 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Mar 28 10:43:17 2024 +0100
tdf#159918 a11y check: Don't warn about tabs in ToC
Change-Id: Ifde41deb66c8dcb72842e18e539609ff351be832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164972
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index 117b48d01661..bfe2e08d8543 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -251,6 +251,17 @@ scanAccessibilityIssuesOnNodes(SwDoc* pDocument)
return aIssues;
}
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckTabsinTOC)
+{
+createSwDoc("Tabs-in-TOC.odt");
+SwDoc* pDoc = getSwDoc();
+CPPUNIT_ASSERT(pDoc);
+sw::AccessibilityCheck aCheck(pDoc);
+aCheck.check();
+auto& aIssues = aCheck.getIssueCollection().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(0), aIssues.size());
+}
+
void checkIssuePosition(std::shared_ptr const&
pIssue, int nLine,
sal_Int32 nStart, sal_Int32 nEnd, SwNodeOffset nIndex)
{
diff --git a/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
new file mode 100644
index ..2b3ce54cc5a3
Binary files /dev/null and b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
differ
diff --git a/sw/source/core/access/AccessibilityCheck.cxx
b/sw/source/core/access/AccessibilityCheck.cxx
index d43a6919adf2..a1fed7c1ffd1 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -907,6 +907,11 @@ public:
}
case ' ':
{
+// Don't warn about tabs in ToC
+auto pSection =
SwDoc::GetCurrSection(SwPosition(*pTextNode, 0));
+if (pSection && pSection->GetTOXBase())
+continue;
+
if (bPreviousWasChar)
{
++nTabCount;
core.git: Branch 'feature/allo_contract45533' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0bda223a7e5d31d02c974f3ad0c4073176a385a6 Author: Samuel Mehrbrodt AuthorDate: Tue Mar 19 08:33:41 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Tue Mar 19 08:33:41 2024 +0100 Release 7.6.6.3 diff --git a/configure.ac b/configure.ac index ca0808baea3e..db853c345ef8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.6.6.1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.6.6.3],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Branch 'feature/cib_contract49' - 6 commits - sd/source svx/source sw/qa sw/source
sd/source/ui/func/fuformatpaintbrush.cxx| 11 -
svx/source/svdraw/svdedxv.cxx |4
sw/qa/extras/uiwriter/uiwriter6.cxx | 98
sw/source/core/doc/DocumentContentOperationsManager.cxx | 86 +++---
sw/source/core/txtnode/txatritr.cxx |9 -
sw/source/uibase/shells/textsh.cxx | 15 ++
6 files changed, 189 insertions(+), 34 deletions(-)
New commits:
commit 8d5440ff250cc5c9f071f312f5d6d48c91cdb068
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 7 22:51:51 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:33:50 2024 +0100
tdf#160071 Don't clone formatting to whole boxes
when clicking into an empty area of that box
Change-Id: I383f1584f446e29454eda2177c8bae0f6587e42d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164555
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index ef1ea258c78f..d4476f4b7ca6 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -146,13 +146,6 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent&
rMEvt)
}
unmarkimpl( mpView );
-
-if (aVEvt.mpObj)
-{
-sal_uInt16 nHitLog = sal_uInt16 (
mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),
nHitLog, false/*bToggle*/);
-return true;
-}
}
return false;
}
commit 792b099e9de18f7c6e2099199452827a4b8401bf
Author: Oliver Specht
AuthorDate: Thu Mar 7 12:47:22 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:32:52 2024 +0100
tdf#159726 Improve Clone formatting
Paragraph attributes and lists are copied if there is no source
selection or the source selection includes at least a full paragraph.
They are only applied to an empty or a paragraph selection.
As in tdf#160069 requested the clone formatting function is only enabled
in text edit mode.
Change-Id: I789402a7928837bb85ec941fd6f958d12585ac40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164533
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
(cherry picked from commit 456d0216aae69c39b12a5df749525589871272a7)
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 9bbd30939d53..ef1ea258c78f 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -290,7 +290,9 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats,
bool bNoParagraphForma
if( rMarkList.GetMarkCount() == 1 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-if( pObj &&
SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier())
)
+const OutlinerView* pOLV =
rDrawViewShell.GetDrawView()->GetTextEditOutlinerView();
+if( pObj && pOLV &&
+
SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier())
)
return;
}
rSet.DisableItem( SID_FORMATPAINTBRUSH );
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 6955e52b3fc7..7a8d71e0d34b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2814,7 +2814,9 @@ sal_Int32
SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr& rFor
OutlinerView* pOLV = GetTextEditOutlinerView();
-bool isParaSelection = pOLV ? pOLV->GetEditView().IsSelectionFullPara() :
false;
+bool isParaSelection
+= pOLV ? !pOLV->GetEditView().HasSelection() ||
pOLV->GetEditView().IsSelectionFullPara()
+ : false;
rFormatSet = std::make_shared(GetModel().GetItemPool(),
GetFormatRangeImpl(pOLV !=
nullptr, isParaSelection));
if (pOLV)
commit 3c3022ba86cedc083d2f22c2517c6de9a9bef676
Author: Stephan Bergmann
AuthorDate: Mon Nov 6 15:44:46 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:29:11 2024 +0100
Fix SwLanguageIterator::Next for RES_TXTATR_AUTOFMT
...following advice by mstahl, as discussed in the comments starting at
<https://gerrit.libreoffice.org/c/core/+/158732/2#message-053bc195667ee3ba396ed12a85f3af8d4b7e5efc>
"tdf#157667 sw track changes: fix cycle case on multiple words", which had
started to cause
> /sw/inc/txatritr.hxx:69:18: runtime error: downcast of address
0x603001b45d90 which does not point to an object of type 'const SvxLanguageItem'
> 0x603001b45d90: note: object is of type 'SwFormatAutoFormat'
> 00 00 0
core.git: sd/source
sd/source/ui/func/fuformatpaintbrush.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 9476f5ae4bff9817b9e699f7abea5690ec7ffd87
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 7 22:51:51 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:33:29 2024 +0100
tdf#160071 Don't clone formatting to whole boxes
when clicking into an empty area of that box
Change-Id: I383f1584f446e29454eda2177c8bae0f6587e42d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164555
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 89eecc13f989..d66e00466072 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -145,13 +145,6 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent&
rMEvt)
}
unmarkimpl( mpView );
-
-if (aVEvt.mpObj)
-{
-sal_uInt16 nHitLog = sal_uInt16 (
mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),
nHitLog, false/*bToggle*/);
-return true;
-}
}
return false;
}
core.git: cui/source include/svx officecfg/registry svx/source sw/qa
cui/source/tabpages/numpages.cxx | 23 +-
include/svx/strings.hrc|9 --
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 35 +
svx/source/dialog/svxbmpnumvalueset.cxx| 48 -
svx/source/sidebar/nbdtmg.cxx | 26 ++-
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py |3
6 files changed, 66 insertions(+), 78 deletions(-)
New commits:
commit f944648e0f5d52605a267ed50bba4bfc035aecc6
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 11:55:30 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 26 13:26:20 2024 +0100
tdf#108697 Allow modifying default bullet selection
Allow to change bullets in configuration.
Change-Id: Iab26118dd597417997d6f0a7355f516a4da97ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163735
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 36868e3579ab..8bba652c594e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -55,6 +55,7 @@
#include
#include
#include
+#include
#include
#include
@@ -122,19 +123,6 @@ static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const
SequenceGetSelectedItemId() - 1];
-const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
+sal_Unicode cChar =
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get()[nIndex].toChar();
+vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+rActBulletFont.SetFamilyName(
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get()[nIndex]);
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index eb8e06f0c4c7..3813f9dfceca 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1367,15 +1367,6 @@
#define RID_SVXSTR_ERR_OLD_PASSWD
NC_("RID_SVXSTR_ERR_OLD_PASSWD", "Invalid password")
#define RID_SVXSTR_ERR_REPEAT_PASSWD
NC_("RID_SVXSTR_ERR_REPEAT_PASSWD", "Passwords do not match")
-#define RID_SVXSTR_BULLET_DESCRIPTION_0
NC_("RID_SVXSTR_BULLET_DESCRIPTION_0", "Solid small circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_1
NC_("RID_SVXSTR_BULLET_DESCRIPTION_1", "Solid large circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_2
NC_("RID_SVXSTR_BULLET_DESCRIPTION_2", "Solid diamond bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_3
NC_("RID_SVXSTR_BULLET_DESCRIPTION_3", "Solid large square bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_4
NC_("RID_SVXSTR_BULLET_DESCRIPTION_4", "Right pointing arrow bullets filled
out")
-#define RID_SVXSTR_BULLET_DESCRIPTION_5
NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_6
NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Cross mark bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_7
NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Check mark bullets")
-
// do not translate this; instead describe the nth numbering style
(LC_NumberingLevel) defined by your locale
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index adfa422f01b0..e43a6ac23765 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3327,6 +3327,41 @@
+
+
+Contains Favorite characters
+
+
+
+ List of default bullets
+
+
+ •
+ ●
+
+
+ ➔
+ ➢
+ ✗
+ ✔
+
+
+
+
+ List of default bullet fonts. Matching font for
`DefaultBullets`.
+
+
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+
+
+
Contains settings that specify the common
core.git: svx/source
svx/source/dialog/svxbmpnumvalueset.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit db54b44c15ed234b54ed81998ec824f0770b1b3c
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 12:42:52 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 26 07:41:41 2024 +0100
Fix indentation
Change-Id: If70ef4b92e6998be5d18b8b557fab27c17bb11bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163747
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index 802e881ec1da..29dc2ddcc3df 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -440,9 +440,9 @@ void SvxNumValueSet::SetNumberingSettings(
SetStyle( GetStyle()|WB_VSCROLL);
for ( sal_Int32 i = 0; i < aNum.getLength(); i++ )
{
-InsertItem( i + 1, i );
-if( i < 8 )
-SetItemText(i + 1,
SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]));
+InsertItem(i + 1, i);
+if (i < 8)
+SetItemText(i + 1, SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]));
}
}
core.git: include/svx svx/source svx/uiconfig
include/svx/strings.hrc |1 -
svx/source/tbxctrls/bulletsnumbering.cxx |2 --
svx/uiconfig/ui/numberingwindow.ui |3 ++-
3 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit fe4cd0cebdbf9412e26f8182e79f97bb844d94af
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 14:09:12 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 26 07:41:02 2024 +0100
Set button label directly in ui file
Change-Id: If9e22982f4f7c276d19167ff365e1b4e290e3de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163748
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c43bf8203981..eb8e06f0c4c7 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1108,7 +1108,6 @@
#define RID_SVXSTR_DEFAULT
NC_("RID_SVXSTR_DEFAULT", "Default")
#define RID_SVXSTR_FRAME
NC_("RID_SVXSTR_FRAME", "Borders")
#define RID_SVXSTR_FRAME_STYLE
NC_("RID_SVXSTR_FRAME_STYLE", "Border Style")
-#define RID_SVXSTR_CUSTOMIZE
NC_("RID_SVXSTR_CUSTOMIZE", "Customize...")
#define RID_SVXSTR_BY_AUTHOR
NC_("RID_SVXSTR_BY_AUTHOR", "By author")
#define RID_SVXSTR_PAGES
NC_("RID_SVXSTR_PAGES", "Pages")
#define RID_SVXSTR_CLEARFORM
NC_("RID_SVXSTR_CLEARFORM", "Clear formatting")
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx
b/svx/source/tbxctrls/bulletsnumbering.cxx
index e1a55a112346..e7ccc6238800 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -107,7 +107,6 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl&
rController,
mxValueSet->SetOutputSizePixel(aSize);
mxValueSet->SetColor(Application::GetSettings().GetStyleSettings().GetFieldColor());
-OUString aMoreItemText = SvxResId( RID_SVXSTR_CUSTOMIZE );
if ( mePageType == NumberingPageType::BULLET )
AddStatusListener( ".uno:CurrentBulletListType" );
else if ( mePageType == NumberingPageType::SINGLENUM )
@@ -117,7 +116,6 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl&
rController,
auto xImage =
vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:OutlineBullet",
mrController.getFrameInterface());
mxMoreButton->set_image(xImage);
-mxMoreButton->set_label(aMoreItemText);
mxMoreButton->connect_clicked(LINK(this, NumberingPopup,
VSButtonClickSetHdl));
mxValueSet->SetSelectHdl(LINK(this, NumberingPopup, VSSelectValueSetHdl));
diff --git a/svx/uiconfig/ui/numberingwindow.ui
b/svx/uiconfig/ui/numberingwindow.ui
index e303830fc01e..db44aeee4d8c 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -1,5 +1,5 @@
-
+
@@ -51,6 +51,7 @@
+Customize...
True
True
True
core.git: cui/uiconfig
cui/uiconfig/ui/securityoptionsdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 132abb81ce48e43a23266345e4c4494c5e200a4f Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 12:25:56 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 19 08:00:11 2024 +0100 Adapt tooltip to recent changes This option is not the equivalent of resetting the user properties in File->Properties, so remove that information from the tooltip. Change-Id: I0718443452b9285c8e7ba0d742aed790ed6a2403 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163433 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui index aa23fef47395..dd09839d8335 100644 --- a/cui/uiconfig/ui/securityoptionsdialog.ui +++ b/cui/uiconfig/ui/securityoptionsdialog.ui @@ -294,7 +294,7 @@ True -Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General. +Select to remove user data from file properties, comments and tracked changes when saving.
core.git: include/sfx2
include/sfx2/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70b287d599a2bbddd8c67f51809a0513c2bdb2e6
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 15 16:11:12 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Feb 15 21:22:33 2024 +0100
Improve wording for security warning infobar
Change-Id: I385ec268f4848f02d8fe49d24e32b0b9729acded
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163444
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d28fa1cc22b7..1c3fafa074c0 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -42,7 +42,7 @@
#define STR_AUTOMATICVERSIONNC_("STR_AUTOMATICVERSION",
"Automatically saved version")
#define STR_EXPORTBUTTONNC_("STR_EXPORTBUTTON",
"Export")
#define STR_LABEL_FILEFORMATNC_("STR_LABEL_FILEFORMAT",
"File format:")
-#define STR_HIDDENINFO_CONTAINS NC_("STR_HIDDENINFO_CONTAINS",
"This document contains:
")
+#define STR_HIDDENINFO_CONTAINS NC_("STR_HIDDENINFO_CONTAINS",
"The document contains the following potentially sensitive elements:")
#define STR_HIDDENINFO_RECORDCHANGES
NC_("STR_HIDDENINFO_RECORDCHANGES", "Recorded changes")
#define STR_HIDDENINFO_NOTESNC_("STR_HIDDENINFO_NOTES",
"Notes")
#define STR_HIDDENINFO_DOCVERSIONS
NC_("STR_HIDDENINFO_DOCVERSIONS", "Document versions")
core.git: Branch 'feature/cib_contract49' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1a78c310d641e8ef2c1dce7c23ba12ea6301196 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:57:29 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Feb 15 14:57:29 2024 +0100 Update git submodules * Update translations from branch 'feature/cib_contract49' to fc16cea11ae46d68031e19e78fe897b888ea4028 - Better translation for hidden info warndialog Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10 diff --git a/translations b/translations index 8c644e56a715..fc16cea11ae4 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 8c644e56a715d9a35c2ad30bae112836451e88fa +Subproject commit fc16cea11ae46d68031e19e78fe897b888ea4028
translations.git: Branch 'feature/cib_contract49' - source/de source/fr
source/de/sfx2/messages.po |2 +- source/fr/sfx2/messages.po |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fc16cea11ae46d68031e19e78fe897b888ea4028 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:57:10 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 15 14:57:10 2024 +0100 Better translation for hidden info warndialog Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10 diff --git a/source/de/sfx2/messages.po b/source/de/sfx2/messages.po index 24ec2ee0843..a849981a697 100644 --- a/source/de/sfx2/messages.po +++ b/source/de/sfx2/messages.po @@ -147,7 +147,7 @@ msgid "" "This document contains: " " " msgstr "" -"Das Dokument enthält: " +"Das Dokument enthält folgende möglicherweise sicherheitsrelevante Elemente: " " " #. 8tujE diff --git a/source/fr/sfx2/messages.po b/source/fr/sfx2/messages.po index daa4936507e..ad25a4ccb55 100644 --- a/source/fr/sfx2/messages.po +++ b/source/fr/sfx2/messages.po @@ -147,7 +147,7 @@ msgid "" "This document contains: " " " msgstr "" -"Ce document contient : " +"Ce document contient les éléments suivants susceptibles d'avoir une incidence sur la sécurité: " " " #. 8tujE
core.git: Branch 'feature/cib_contract49' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 07e60be2ca49a60deb448e606c361153c0b251a2 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:37:25 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Feb 15 14:37:25 2024 +0100 Update git submodules * Update translations from branch 'feature/cib_contract49' to 8c644e56a715d9a35c2ad30bae112836451e88fa - Adjust tooltip translations Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e - Add missing fr translations Follow-up to 79f9243e81eda3ab113d75538686ab81770c2c5d Change-Id: I83351fe0d0ef6c1c17b48e99d1e80ab2cdb03e05 - Add fr translations for f950036a89c46ce50bd7d62896cb6e4a690d323a Change-Id: I497f6270322380d2d05716e81949434f75df8602 - Backport fr translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d Change-Id: I955422a5fd582c6ff9909d89fda76dbbd956a1c5 - Version 7.6.3.2, tag libreoffice-7.6.3.2 Change-Id: I4772fc0f2abffbb8015ee096bb9a4fc6d257d7cb - update translations for 7.6.3 rc2 and force-fix errors using pocheck Change-Id: If5b89e12a3fdc3f94dd4159a89fe0a9c3a1bcf1c (cherry picked from commit 9a36aad0f1471adcb3a93d9be53f9e19aef8b8cf) - Branch libreoffice-7-6-3 This is 'libreoffice-7-6-3' - the stable branch for the 7.6.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I145b9af8d0a5c8319c63b139562c86caa94670e2 - Add translations for f950036a89c46ce50bd7d62896cb6e4a690d323a Change-Id: Ida57eb3b5034ec57266e8b95928c59a1d5efd065 - Backport translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d Change-Id: I597ba186fb8736a50e141da34aea5dbc475f8652 diff --git a/translations b/translations index 102138605bd8..8c644e56a715 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 102138605bd81680ce6b3e4645b956225b9a2b0a +Subproject commit 8c644e56a715d9a35c2ad30bae112836451e88fa
translations.git: Branch 'feature/cib_contract49' - source/de source/fr
source/de/cui/messages.po |4 ++-- source/fr/cui/messages.po |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 8c644e56a715d9a35c2ad30bae112836451e88fa Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:36:33 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 15 14:37:14 2024 +0100 Adjust tooltip translations Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e diff --git a/source/de/cui/messages.po b/source/de/cui/messages.po index 8ea424a18f5..b7d6bebb8c5 100644 --- a/source/de/cui/messages.po +++ b/source/de/cui/messages.po @@ -19569,8 +19569,8 @@ msgstr "Persönliche _Informationen beim Speichern entfernen" #. kjZqN #: cui/uiconfig/ui/securityoptionsdialog.ui:297 msgctxt "extended_tip|removepersonal" -msgid "Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General." -msgstr "Aktivieren, damit Benutzerdaten immer aus den Datei-Eigenschaften entfernt werden. Ist diese Option nicht aktiviert, können Sie die persönlichen Informationen für das aktuelle Dokument immer noch unter »Datei ▸ Eigenschaften… ▸ Register: Allgemein« mit der Schaltfläche »Zurücksetzen« entfernen." +msgid "Select to always remove user data from the file properties." +msgstr "Aktivieren, damit Benutzerdaten beim Speichern aus den Datei-Eigenschaften entfernt werden." #. y5FFs #: cui/uiconfig/ui/securityoptionsdialog.ui:308 diff --git a/source/fr/cui/messages.po b/source/fr/cui/messages.po index bf5ff22b2a1..8d4d5b4d838 100644 --- a/source/fr/cui/messages.po +++ b/source/fr/cui/messages.po @@ -19567,8 +19567,8 @@ msgstr "_Supprimer les informations personnelles lors de l'enregistrement" #. kjZqN #: cui/uiconfig/ui/securityoptionsdialog.ui:297 msgctxt "extended_tip|removepersonal" -msgid "Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General." -msgstr "Cliquez ici pour que les données d'utilisateur soient toujours supprimées des propriétés du fichier. Si cette option n'est pas sélectionnée, vous avez toujours la possibilité de supprimer les informations personnelles du document actif en choisissant Fichier - Propriétés - Général, puis en cliquant sur le bouton Réinitialiser les propriétés." +msgid "Select to always remove user data from the file properties." +msgstr "Cliquez ici pour que les données d'utilisateur soient toujours supprimées des propriétés du fichier." #. y5FFs #: cui/uiconfig/ui/securityoptionsdialog.ui:308
core.git: Branch 'feature/cib_contract49' - cui/uiconfig
cui/uiconfig/ui/securityoptionsdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 25bbcea1b875ab0a93972ef34c26f9533f559de3 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:32:08 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 15 14:32:08 2024 +0100 Adjust tooltip after recent changes Change-Id: I5690bca0f6bea31b9cf1cf4f00501fdb0b56 diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui index 62c4c7be93da..1d10b7191cc7 100644 --- a/cui/uiconfig/ui/securityoptionsdialog.ui +++ b/cui/uiconfig/ui/securityoptionsdialog.ui @@ -294,7 +294,7 @@ True -Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General. +Select to always remove user data from the file properties.
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5d06a8032b1eec029f408411f432d76addbdf76 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 13:19:20 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Feb 15 13:19:20 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c1725e2c3209e09c04c22bdfbe4e933d6aec67dc - Adapt help to recent changes This option is not the equivalent of resetting the user properties in File->Properties, so remove that information from the tooltip. Change-Id: I1f02667cc8aff9f74b84a0ee2f4e06ba8ded4be2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163435 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index ac406bcc9472..c1725e2c3209 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ac406bcc94724248ab5d2327a65dd0bf821e18c3 +Subproject commit c1725e2c3209e09c04c22bdfbe4e933d6aec67dc
help.git: source/text
source/text/shared/optionen/securityoptionsdialog.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1725e2c3209e09c04c22bdfbe4e933d6aec67dc Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 12:45:27 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Feb 15 13:19:19 2024 +0100 Adapt help to recent changes This option is not the equivalent of resetting the user properties in File->Properties, so remove that information from the tooltip. Change-Id: I1f02667cc8aff9f74b84a0ee2f4e06ba8ded4be2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163435 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/optionen/securityoptionsdialog.xhp b/source/text/shared/optionen/securityoptionsdialog.xhp index 162a856f79..385ec61f53 100644 --- a/source/text/shared/optionen/securityoptionsdialog.xhp +++ b/source/text/shared/optionen/securityoptionsdialog.xhp @@ -56,7 +56,7 @@ Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments. Remove personal information on saving - Select to always remove user data from file properties, comments and tracked changes. The names of authors in comments and changes will be replaced by generic values as "Author1", "Author2" and so forth. Time values will also be reset to a single standard value. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General. + Select to remove user data from file properties, comments and tracked changes when saving. The names of authors in comments and changes will be replaced by generic values as "Author1", "Author2" and so forth. Time values will also be reset to a single standard value. No personal metadata will be exported. Recommend password protection on saving Select to always enable the Save with password option in the file save dialogs. Deselect the option to save files by default without password.
core.git: Branch 'distro/cib/libreoffice-6-4' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +
sfx2/source/doc/docfile.cxx|3 +++
2 files changed, 12 insertions(+)
New commits:
commit dcb2e2515bad3028918e0121068fac7b1d6881d3
Author: Samuel Mehrbrodt
AuthorDate: Mon Feb 5 14:12:53 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Feb 8 08:48:08 2024 +0100
tdf#158975 Add option to not write temp file next to local file
This causes permission issues in some setups.
See bug report for details.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163003
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit cf616121ed48c8df96104bc35abf3b55b8862043)
Change-Id: If97030f95185ab96e21cec968b734fba8a811f9d
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 3fdf08d9e19a..b47794f128c4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5489,6 +5489,15 @@
true
+
+
+ Determines if temp files are placed next to the local file
when a file is saved.
+ If this is false, the temp file will be placed in the default temp
directory.
+ Placing the temp file next to the local file will increase
performance, but it might lead
+ to permission issues such as described in this bug:
https://bugs.documentfoundation.org/show_bug.cgi?id=158975
+
+true
+
Allows to specify whether the OOo document file locking
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 8c0d101c4ea9..5c4116f2308e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3674,6 +3674,9 @@ OUString GetLogicBase(std::unique_ptr
const & pImpl)
// permission only to create the specifically named output file in that
directory.
#if !HAVE_FEATURE_MACOSX_SANDBOX
+if (!officecfg::Office::Common::Misc::TempFileNextToLocalFile::get())
+return aLogicBase;
+
if (comphelper::isFileUrl(pImpl->m_aLogicName) && !pImpl->m_pInStream)
{
// Try to create the temp file in the same directory when storing.
core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 + sfx2/source/doc/docfile.cxx|2 ++ 2 files changed, 11 insertions(+) New commits: commit cf616121ed48c8df96104bc35abf3b55b8862043 Author: Samuel Mehrbrodt AuthorDate: Mon Feb 5 14:12:53 2024 +0100 Commit: Miklos Vajna CommitDate: Thu Feb 8 08:29:09 2024 +0100 tdf#158975 Add option to not write temp file next to local file This causes permission issues in some setups. See bug report for details. Change-Id: If97030f95185ab96e21cec968b734fba8a811f9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163003 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 3b66f6a8394b..adfa422f01b0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5218,6 +5218,15 @@ true + + + Determines if temp files are placed next to the local file when a file is saved. + If this is false, the temp file will be placed in the default temp directory. + Placing the temp file next to the local file will increase performance, but it might lead + to permission issues such as described in this bug: https://bugs.documentfoundation.org/show_bug.cgi?id=158975 + +true + Allows to specify whether the OOo document file locking diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index fe1f5d0b773c..88f712e6989b 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -4006,6 +4006,8 @@ OUString GetLogicBase(const INetURLObject& rURL, std::unique_ptr (void) rURL; (void) pImpl; #else +if (!officecfg::Office::Common::Misc::TempFileNextToLocalFile::get()) +return aLogicBase; if (!pImpl->m_bHasEmbeddedObjects // Embedded objects would mean a special base, ignore that. && rURL.GetProtocol() == INetProtocol::File && !pImpl->m_pInStream)
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c58f42c1bd2ec1b24f02a27c952e88d43ee07beb Author: Samuel Mehrbrodt AuthorDate: Mon Feb 5 12:24:58 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 5 14:47:11 2024 +0100 Tabs to spaces Change-Id: I794548f4a5c18c3cbf100940adf3ec5095293ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162996 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index f1f947324c12..3b66f6a8394b 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5167,8 +5167,8 @@ DIN Light,1509,-503,1509,-483,1997,483 - B Nazanin,1343,-705,1990,-1045,1990,1045 - B Nazanin,1341,-707,2126,-1120,2126,1120 + B Nazanin,1343,-705,1990,-1045,1990,1045 + B Nazanin,1341,-707,2126,-1120,2126,1120
core.git: sd/source
sd/source/ui/view/DocumentRenderer.cxx |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit 5f9ce732300d3301b574b569fe331e8a93057e73 Author: Samuel Mehrbrodt AuthorDate: Mon Feb 5 12:23:26 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 5 14:33:20 2024 +0100 Fix typo in comment Also relayout the text Change-Id: Id774c5a5089e1c031ae705e6b23281e882b6739f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162995 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index c7587a1d2d40..a8d5a6f1de25 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2123,13 +2123,10 @@ private: else nPaperBin = rInfo.mpPrinter->GetPaperBin(); -// For pages larger then the printable area there -// are three options: +// For pages larger than the printable area there are three options: // 1. Scale down to the page to the printable area. -// 2. Print only the upper left part of the page -//(without the unprintable borders). -// 3. Split the page into parts of the size of the -// printable area. +// 2. Print only the upper left part of the page (without the unprintable borders). +// 3. Split the page into parts of the size of the printable area. const bool bScalePage (mpOptions->IsPageSize()); const bool bCutPage (mpOptions->IsCutPage()); MapMode aMap (rInfo.maMap);
core.git: sw/qa sw/source
sw/qa/uitest/data/tdf159428.odt |binary
sw/qa/uitest/navigator/tdf159428.py | 49 +++
sw/source/uibase/utlui/content.cxx | 111 +---
3 files changed, 104 insertions(+), 56 deletions(-)
New commits:
commit 070b4ddda4983773e8a989a116924bee0f651f25
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 29 16:04:45 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 5 07:50:17 2024 +0100
tdf#159428 Prefer heading over bookmarks in Navigator
When a bookmark is in a heading, highlighting the heading
is more important than highlighting the bookmark.
Change-Id: I6348e42b14ece226a25961bd3145193645972e79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162694
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/uitest/data/tdf159428.odt b/sw/qa/uitest/data/tdf159428.odt
new file mode 100644
index ..6b30d6bf0cdc
Binary files /dev/null and b/sw/qa/uitest/data/tdf159428.odt differ
diff --git a/sw/qa/uitest/navigator/tdf159428.py
b/sw/qa/uitest/navigator/tdf159428.py
new file mode 100644
index ..3a8634a57629
--- /dev/null
+++ b/sw/qa/uitest/navigator/tdf159428.py
@@ -0,0 +1,49 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
+class tdf159428(UITestCase):
+
+def test_tdf159428(self):
+global selectionChangedResult
+with self.ui_test.load_file(get_url_for_data_file('tdf159428.odt')):
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.xUITest.executeCommand(".uno:Sidebar")
+xWriterEdit.executeAction("SIDEBAR", mkPropertyValues({"PANEL":
"SwNavigatorPanel"}))
+
+xNavigatorPanel =
self.ui_test.wait_until_child_is_available('NavigatorPanel')
+xContentTree = xNavigatorPanel.getChild("contenttree")
+
+# select fist bookmark - Heading "H1" should be tracked
+self.xUITest.executeCommand(".uno:GoToNextPara")
+self.xUITest.executeCommand(".uno:GoToNextPara")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"111", "END_POS": "119"}))
+self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "H1")
+
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "H1")
+
+# select second bookmark - Heading "H1 mit Lesezeichen" should be
tracked
+self.xUITest.executeCommand(".uno:GoToNextPara")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"0", "END_POS": "18"}))
+self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "H1 mit Lesezeichen")
+
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "H1 mit
Lesezeichen")
+
+# select third bookmark - no heading tracked
+self.xUITest.executeCommand(".uno:GoToPrevPara")
+self.xUITest.executeCommand(".uno:GoToPrevPara")
+self.xUITest.executeCommand(".uno:GoToPrevPara")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"141", "END_POS": "146"}))
+self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "Lesezeichen 3")
+
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"],
"Lesezeichen 3")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 5655b67ceab1..b058cf46c464 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4305,52 +4305,6 @@ void SwContentTree::UpdateTracking()
aContentAtPos.pFndTextAttr);
return;
}
-// bookmarks - track first bookmark at cursor
-if (mTrackContentType[ContentTypeId::BOOKMARK] &&
-(m_pActiveShell->GetSelectionType() & SelectionType::Text))
-{
-SwPaM* pCursor = m_pActi
core.git: oox/source sw/CppunitTest_sw_ooxmlexport21.mk sw/qa
oox/source/core/xmlfilterbase.cxx | 43 +++-
sw/CppunitTest_sw_ooxmlexport21.mk |4 +
sw/qa/extras/ooxmlexport/data/personalmetadata.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 39 ++
4 files changed, 77 insertions(+), 9 deletions(-)
New commits:
commit 1e49f469afcbf3d1abec25451117f5f10d3ba825
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 29 11:25:17 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 29 13:18:04 2024 +0100
Don't export personal metadata to OOXML in privacy mode
Change-Id: Iac0985783a0c7334bd6ee3cfcaf37c135ac452ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162682
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 2e7ce9a75cbc..7afb84cad2c6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -622,6 +623,12 @@ writeElement( const FSHelperPtr& pDoc, sal_Int32
nXmlElement, const LanguageTag&
static void
writeCoreProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >& xProperties )
{
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo);
+bool bRemoveUserInfo
+= bRemovePersonalInfo
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo);
+
OUString sValue;
if( rSelf.getVersion() == oox::core::ISOIEC_29500_2008 )
{
@@ -670,8 +677,11 @@ writeCoreProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties
if (it->second >>= aValue)
writeElement( pCoreProps, FSNS( XML_cp, XML_contentType ), aValue
);
}
-writeElement( pCoreProps, FSNS( XML_dcterms, XML_created ),
xProperties->getCreationDate() );
-writeElement( pCoreProps, FSNS( XML_dc, XML_creator ),
xProperties->getAuthor() );
+if (!bRemoveUserInfo)
+{
+writeElement(pCoreProps, FSNS(XML_dcterms, XML_created),
xProperties->getCreationDate());
+writeElement(pCoreProps, FSNS(XML_dc, XML_creator),
xProperties->getAuthor());
+}
writeElement( pCoreProps, FSNS( XML_dc, XML_description ),
xProperties->getDescription() );
it = aUserDefinedProperties.find("OOXMLCorePropertyIdentifier");
@@ -683,10 +693,18 @@ writeCoreProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties
}
writeElement( pCoreProps, FSNS( XML_cp, XML_keywords ),
xProperties->getKeywords() );
writeElement( pCoreProps, FSNS( XML_dc, XML_language ),
LanguageTag( xProperties->getLanguage()) );
-writeElement( pCoreProps, FSNS( XML_cp, XML_lastModifiedBy ),
xProperties->getModifiedBy() );
-writeElement( pCoreProps, FSNS( XML_cp, XML_lastPrinted ),
xProperties->getPrintDate() );
-writeElement( pCoreProps, FSNS( XML_dcterms, XML_modified ),
xProperties->getModificationDate() );
-writeElement( pCoreProps, FSNS( XML_cp, XML_revision ),
xProperties->getEditingCycles() );
+
+if (!bRemoveUserInfo)
+{
+writeElement(pCoreProps, FSNS(XML_cp, XML_lastModifiedBy),
xProperties->getModifiedBy());
+writeElement(pCoreProps, FSNS(XML_cp, XML_lastPrinted),
xProperties->getPrintDate());
+writeElement(pCoreProps, FSNS(XML_dcterms, XML_modified),
+ xProperties->getModificationDate());
+}
+if (!bRemovePersonalInfo)
+{
+writeElement(pCoreProps, FSNS(XML_cp, XML_revision),
xProperties->getEditingCycles());
+}
writeElement( pCoreProps, FSNS( XML_dc, XML_subject ),
xProperties->getSubject() );
writeElement( pCoreProps, FSNS( XML_dc, XML_title ),
xProperties->getTitle() );
@@ -706,6 +724,11 @@ writeCoreProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties
static void
writeAppProperties( XmlFilterBase& rSelf, const Reference< XDocumentProperties
>& xProperties )
{
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo);
+bool bRemoveUserInfo
+= bRemovePersonalInfo
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo);
rSelf.addRelation(
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties;,
u"docProps/app.xml" );
@@ -720,7 +743,8 @@ writeAppProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >
comphelper::SequenceAsHashMap
aUserDefinedProperties(xUserDefinedPro
core.git: cui/source cui/uiconfig include/unotools officecfg/registry sw/qa unotools/source xmloff/source
cui/source/inc/securityoptions.hxx |3
cui/source/options/securityoptions.cxx |6 +
cui/uiconfig/ui/securityoptionsdialog.ui | 48 ++---
include/unotools/securityoptions.hxx |1
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 ++
sw/qa/extras/odfexport/odfexport2.cxx | 18
unotools/source/config/securityoptions.cxx |9 ++
xmloff/source/core/SettingsExportHelper.cxx| 10 ++
8 files changed, 93 insertions(+), 10 deletions(-)
New commits:
commit ba8911931c18e6a4cc737ffc9f0f415f1ba794d7
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 25 13:01:24 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Fri Jan 26 07:08:19 2024 +0100
Don't export printer name & config in privacy mode
Don't export printer name & printer config when
RemovePersonalInfoOnSaving is enabled, as it might contain
sensitive data such as printer location.
Add an option to export printer settings even when
RemovePersonalInfoOnSaving is enabled.
Change-Id: I3d2ca91ad2032050c919d382c11c9ceabf331770
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162577
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/inc/securityoptions.hxx
b/cui/source/inc/securityoptions.hxx
index 981c9ac29bf8..a86b4f0c605a 100644
--- a/cui/source/inc/securityoptions.hxx
+++ b/cui/source/inc/securityoptions.hxx
@@ -53,6 +53,8 @@ namespace svx
std::unique_ptr m_xNoteAuthorImg;
std::unique_ptr m_xDocumentVersionCB;
std::unique_ptr m_xDocumentVersionImg;
+std::unique_ptr m_xPrinterSettingsCB;
+std::unique_ptr m_xPrinterSettingsImg;
public:
SecurityOptionsDialog(weld::Window* pParent);
@@ -68,6 +70,7 @@ namespace svx
bool IsRemoveDocUserInfoChecked() const { return
m_xDocPropertiesCB->get_active(); }
bool IsRemoveNoteAuthorInfoChecked() const { return
m_xNoteAuthorCB->get_active(); }
bool IsRemoveDocVersionInfoChecked() const { return
m_xDocumentVersionCB->get_active(); }
+bool IsKeepPrinterSettingsChecked() const { return
m_xPrinterSettingsCB->get_active(); }
bool IsRecommPasswdChecked() const { return
m_xRecommPasswdCB->get_active(); }
bool IsCtrlHyperlinkChecked() const { return
m_xCtrlHyperlinkCB->get_active(); }
bool IsBlockUntrustedRefererLinksChecked() const { return
m_xBlockUntrustedRefererLinksCB->get_active(); }
diff --git a/cui/source/options/securityoptions.cxx
b/cui/source/options/securityoptions.cxx
index f42b0c35dd4b..d99ad64e545e 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -73,6 +73,8 @@ SecurityOptionsDialog::SecurityOptionsDialog(weld::Window*
pParent)
, m_xNoteAuthorImg(m_xBuilder->weld_widget("locknoteauthor"))
, m_xDocumentVersionCB(m_xBuilder->weld_check_button("documentversion"))
, m_xDocumentVersionImg(m_xBuilder->weld_widget("lockdocumentversion"))
+, m_xPrinterSettingsCB(m_xBuilder->weld_check_button("printersettings"))
+, m_xPrinterSettingsImg(m_xBuilder->weld_widget("lockprintersettings"))
{
m_xRemovePersInfoCB->connect_toggled(LINK(this, SecurityOptionsDialog,
ShowPersonalInfosToggle));
init();
@@ -103,6 +105,8 @@ void SecurityOptionsDialog::init()
*m_xNoteAuthorImg);
enableAndSet(SvtSecurityOptions::EOption::DocWarnKeepDocVersionInfo,
*m_xDocumentVersionCB,
*m_xDocumentVersionImg);
+enableAndSet(SvtSecurityOptions::EOption::DocKeepPrinterSettings,
*m_xPrinterSettingsCB,
+*m_xPrinterSettingsImg);
enableAndSet(SvtSecurityOptions::EOption::DocWarnRecommendPassword,
*m_xRecommPasswdCB,
*m_xRecommPasswdImg);
enableAndSet(SvtSecurityOptions::EOption::CtrlClickHyperlink,
*m_xCtrlHyperlinkCB,
@@ -128,6 +132,7 @@ bool SecurityOptionsDialog::SetSecurityOptions()
CheckAndSave(SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo,
IsRemoveDocUserInfoChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo,
IsRemoveNoteAuthorInfoChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::DocWarnKeepDocVersionInfo,
IsRemoveDocVersionInfoChecked(), bModified);
+CheckAndSave(SvtSecurityOptions::EOption::DocKeepPrinterSettings,
IsKeepPrinterSettingsChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::DocWarnRecommendPassword,
IsRecommPasswdChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::CtrlClickHyperlink,
IsCtrlHyperlinkChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::BlockUntrustedRefererLinks,
IsBlockUntrustedRefererLinksChecked(), bModified);
@@ -143,6 +148,7 @@ void Secur
core.git: sw/qa xmloff/source
sw/qa/extras/odfexport/data/personalmetadata.odt |binary
sw/qa/extras/odfexport/odfexport2.cxx| 39 ++
xmloff/source/meta/xmlmetae.cxx | 40 ---
3 files changed, 61 insertions(+), 18 deletions(-)
New commits:
commit c479944eb4f9f5a22c7b248185f22c86ea85d12a
Author: Samuel Mehrbrodt
AuthorDate: Tue Jan 23 15:53:28 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 25 16:51:06 2024 +0100
Don't export personal metadata when user wishes not to
Currently the metadata is only reset to default when the option
to remove personal metadata is active.
And some metadata was still exported which might contain personal data.
Now the following elements won't be exported anymore when the
RemovePersonalInfoOnSaving
option is set to true:
* meta:initial-creator
* meta:creation-date
* dc:date
* dc:creator
* meta:printed-by
* meta:print-date
* meta:editing-duration
* meta:editing-cycles
* meta:template
Change-Id: Ibad57fdbff04bf285881826820ec3ddb01ffbb36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162553
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/extras/odfexport/data/personalmetadata.odt
b/sw/qa/extras/odfexport/data/personalmetadata.odt
new file mode 100644
index ..9af4e0a3442f
Binary files /dev/null and b/sw/qa/extras/odfexport/data/personalmetadata.odt
differ
diff --git a/sw/qa/extras/odfexport/odfexport2.cxx
b/sw/qa/extras/odfexport/odfexport2.cxx
index 708a4f94cba0..4160f48ab388 100644
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -27,9 +27,11 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
#include
@@ -565,6 +567,43 @@ CPPUNIT_TEST_FIXTURE(Test, tdf150927)
assertXPath(pXmlDoc,
"/office:document-styles/office:automatic-styles/style:style[@style:family='table']"_ostr,
2);
}
+CPPUNIT_TEST_FIXTURE(Test, testPersonalMetaData)
+{
+// 1. Remove personal info, keep user info
+auto pBatch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+
officecfg::Office::Common::Security::Scripting::KeepDocUserInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+
+loadAndReload("personalmetadata.odt");
+xmlDocUniquePtr pXmlDoc = parseExport("meta.xml");
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:initial-creator"_ostr, 1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:creation-date"_ostr, 1);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:date"_ostr, 1);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:creator"_ostr,
1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:printed-by"_ostr, 1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:print-date"_ostr, 1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-duration"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-cycles"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:template"_ostr, 0);
+
+// 2. Remove user info too
+
officecfg::Office::Common::Security::Scripting::KeepDocUserInfoOnSaving::set(false,
pBatch);
+pBatch->commit();
+
+loadAndReload("personalmetadata.odt");
+pXmlDoc = parseExport("meta.xml");
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:initial-creator"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:creation-date"_ostr, 0);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:date"_ostr, 0);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:creator"_ostr,
0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:printed-by"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:print-date"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-duration"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-cycles"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:template"_ostr, 0);
+}
+
CPPUNIT_TEST_FIXTURE(Test, tdf151100)
{
// Similar to tdf135942
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 395772ab2aca..608ba86de7da 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -95,6 +95,9 @@ void SvXMLMetaExport::SimpleDateTimeElement( const
util::DateTime & r
core.git: Branch 'libreoffice-24-2-0' - cui/source
cui/source/options/optaboutconfig.cxx | 28
cui/source/options/optaboutconfig.hxx |5 +++--
2 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 89807b69090d657bbd52dce74be4bfe024179036
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 15 08:15:46 2024 +0100
Commit: Xisco Fauli
CommitDate: Wed Jan 24 09:49:59 2024 +0100
tdf#159186 Use changed value when editing string-list a second time
Change-Id: I0e26a053b3b5fb04abf87894bcfebccea8bdd26f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162074
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 76ce6466b814bb9ff119f4f83795a2aeefc28793)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162097
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
(cherry picked from commit 395c8cfb770e7424fd99b884f568a32fcc7a728f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162145
Reviewed-by: Michael Stahl
Reviewed-by: Michael Weghorn
Reviewed-by: Ilmari Lauhakangas
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 1b02642e6d00..f927363f8650 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -70,15 +70,18 @@ struct UserData
bool bIsReadOnly;
bool bWasModified;
OUString sPropertyPath;
+Any aPropertyValue;
OUString sTooltip;
int aLineage;
Reference aXNameAccess;
-explicit UserData(OUString aPropertyPath, OUString aTooltip, bool
isReadOnly, bool wasModified)
+explicit UserData(OUString aPropertyPath, Any aPropValue, OUString
aTooltip, bool isReadOnly,
+ bool wasModified)
: bIsPropertyPath(true)
, bIsReadOnly(isReadOnly)
, bWasModified(wasModified)
, sPropertyPath(std::move(aPropertyPath))
+, aPropertyValue(aPropValue)
, sTooltip(std::move(aTooltip))
, aLineage(0)
{
@@ -187,9 +190,10 @@ IMPL_STATIC_LINK_NOARG(CuiAboutConfigTabPage,
ValidNameHdl, SvxNameDialog&, bool
CuiAboutConfigTabPage::~CuiAboutConfigTabPage() {}
-void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const
OUString& rProp,
-const OUString& rStatus, const
OUString& rType,
-const OUString& rValue, const
OUString& rTooltip,
+void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, Any
aPropertyValue,
+const OUString& rProp, const OUString&
rStatus,
+const OUString& rType, const OUString&
rValue,
+const OUString& rTooltip,
const weld::TreeIter* pParentEntry,
bool bInsertToPrefBox,
bool bIsReadOnly, bool bWasModified)
{
@@ -197,8 +201,8 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rPropertyPath, const OUS
if (bOnlyModified && !bWasModified)
return;
-m_vectorUserData.push_back(
-std::make_unique(rPropertyPath, rTooltip, bIsReadOnly,
bWasModified));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath,
aPropertyValue, rTooltip,
+ bIsReadOnly,
bWasModified));
if (bInsertToPrefBox)
{
OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -689,8 +693,9 @@ void CuiAboutConfigTabPage::FillItems(const
Reference& xNameAccess,
for (int j = 1; j < lineage; ++j)
index = sPath.indexOf("/", index + 1);
-InsertEntry(sPath, sPath.copy(index + 1), item, sType,
sValue.makeStringAndClear(),
-sTooltip, pParentEntry, !bLoadAll, bReadOnly,
bWasModified);
+InsertEntry(sPath, aNode, sPath.copy(index + 1), item, sType,
+sValue.makeStringAndClear(), sTooltip, pParentEntry,
!bLoadAll, bReadOnly,
+bWasModified);
}
}
}
@@ -940,10 +945,8 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
else if (sPropertyType == "string-list")
{
SvxListDialog aListDialog(m_xDialog.get());
-Reference xConfigAccess
-= getConfigAccess(pUserData->sPropertyPath, false);
-Any aNode = xConfigAccess->getByName(sPropertyName);
-uno::Sequence aList =
aNode.get>();
+uno::Sequence aList
+= pUserData->aPropertyValue.get>();
aListDialog.SetEntries(
comphelper::sequenceToContainer>(aList));
core.git: sw/inc sw/source
sw/inc/PostItMgr.hxx |4 +
sw/source/uibase/docvw/PostItMgr.cxx | 84 +++
sw/source/uibase/docvw/edtwin.cxx| 19 +++
sw/source/uibase/inc/edtwin.hxx |1
sw/source/uibase/misc/swruler.cxx|3 -
5 files changed, 80 insertions(+), 31 deletions(-)
New commits:
commit b9368eab798a766b5a24658c783a6ee73dbf2caa
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 22 10:57:06 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 22 12:19:47 2024 +0100
tdf#159145 Allow changing width of comment column on right border
not only on the ruler as implemented in
ac2720dcbe4e51e7f6733a385b5f7b571c6431e9
Change-Id: Ib3709e97be312a7e20302ffa703e847f9efa3110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162365
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index ec6604c43a23..2278ae05ea6f 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -150,7 +150,8 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool ShowScrollbar(const tools::ULong aPage) const;
bool HasNotes() const ;
bool ShowNotes() const;
-void SetSidebarWidth(sal_uInt16 nPx);
+void SetSidebarWidth(Point aPoint);
+tools::Rectangle GetSidebarRect(const Point& rPointLogic);
tools::ULong GetSidebarWidth(bool bPx = false) const;
tools::ULong GetSidebarBorderWidth(bool bPx = false) const;
@@ -183,6 +184,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool IsHit(const Point );
/// Get the matching window that is responsible for handling mouse
events of rPointLogic, if any.
vcl::Window* IsHitSidebarWindow(const Point& rPointLogic);
+bool IsHitSidebarDragArea(const Point& rPointLogic);
Color GetArrowColor(sal_uInt16 aDirection, tools::ULong aPage) const;
sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField*
pField) const;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 24abcc14a2a5..7af447a63a5d 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1979,32 +1979,25 @@ bool SwPostItMgr::ShowScrollbar(const tools::ULong
aPage) const
return false;
}
-bool SwPostItMgr::IsHit(const Point )
+bool SwPostItMgr::IsHit(const Point& aPointPixel)
{
-if (HasNotes() && ShowNotes())
-{
-const Point aPoint = mpEditWin->PixelToLogic(aPointPixel);
-const SwRootFrame* pLayout = mpWrtShell->GetLayout();
-SwRect aPageFrame;
-const tools::ULong nPageNum = SwPostItHelper::getPageInfo( aPageFrame,
pLayout, aPoint );
-if( nPageNum )
-{
-tools::Rectangle aRect;
-OSL_ENSURE(mPages.size()>nPageNum-1,"SwPostitMgr:: page container
size wrong");
-aRect = mPages[nPageNum-1]->eSidebarPosition ==
sw::sidebarwindows::SidebarPosition::LEFT
-?
tools::Rectangle(Point(aPageFrame.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrame.Top()),Size(GetSidebarWidth(),aPageFrame.Height()))
-: tools::Rectangle(
Point(aPageFrame.Right()+GetSidebarBorderWidth(),aPageFrame.Top()) ,
Size(GetSidebarWidth(),aPageFrame.Height()));
-if (aRect.Contains(aPoint))
-{
-// we hit the note's sidebar
-// lets now test for the arrow area
-if (mPages[nPageNum-1]->bScrollbar)
-return ScrollbarHit(nPageNum,aPoint);
-else
-return false;
-}
-}
-}
+if (!HasNotes() || !ShowNotes())
+return false;
+
+const Point aPoint = mpEditWin->PixelToLogic(aPointPixel);
+tools::Rectangle aRect(GetSidebarRect(aPoint));
+if (!aRect.Contains(aPoint))
+return false;
+
+// we hit the note's sidebar
+// lets now test for the arrow area
+SwRect aPageFrame;
+const tools::ULong nPageNum
+= SwPostItHelper::getPageInfo(aPageFrame, mpWrtShell->GetLayout(),
aPoint);
+if (!nPageNum)
+return false;
+if (mPages[nPageNum - 1]->bScrollbar)
+return ScrollbarHit(nPageNum, aPoint);
return false;
}
@@ -2038,6 +2031,38 @@ vcl::Window* SwPostItMgr::IsHitSidebarWindow(const
Point& rPointLogic)
return pRet;
}
+tools::Rectangle SwPostItMgr::GetSidebarRect(const Point& rPointLogic)
+{
+const SwRootFrame* pLayout = mpWrtShell->GetLayout();
+SwRect aPageFrame;
+const tools::ULong nPageNum = SwPostItHelper::getPageInfo(aPageFrame,
pLayout, rPointLogic);
+if (!nPageNum)
+return tools::Rectangle();
+
+OSL_ENSURE(mPages.size() > nPageNum - 1, "SwPostitMgr:: page container
size wrong");
+return mP
core.git: Branch 'libreoffice-24-2' - chart2/qa oox/inc oox/source
chart2/qa/extras/chart2import.cxx | 11 +++
chart2/qa/extras/data/pptx/tdf146487.pptx |binary
oox/inc/drawingml/chart/plotareaconverter.hxx |3 +++
oox/inc/drawingml/chart/typegroupconverter.hxx |3 +++
oox/source/drawingml/chart/chartspaceconverter.cxx | 14 +-
oox/source/drawingml/chart/plotareaconverter.cxx | 10 +-
oox/source/drawingml/chart/typegroupconverter.cxx |9 +
7 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit 13be76e4d58db7ff892dff900e7734ac424bd8dd
Author: Samuel Mehrbrodt
AuthorDate: Mon Aug 14 15:59:18 2023 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jan 22 08:28:13 2024 +0100
tdf#146487 Don't show generic diagram title when there is an empty title
given
Bugdoc has autoTitleDeleted set to false (so title should be visible), but
then an empty title is given.
In this case no default string should be added to the title, only in case
of Pie Charts.
Any other Chart types show the default title in MS-Office.
Co-authored-by: Balazs Varga
Change-Id: Ib445099a4a3d113cff6b1ffdfd093fe41c34716b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155681
Tested-by: Samuel Mehrbrodt
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit c205194b8c54011af4b2cd34fbc00f4885883643)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162270
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index f7324c94754f..7c24ff6110ba 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1979,6 +1979,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205)
CPPUNIT_ASSERT_EQUAL(OUString("Firstline
Secondline
Thirdline"), aTitle);
}
+CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146487)
+{
+loadFromFile(u"pptx/tdf146487.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+
+Reference xTitled(xChartDoc, uno::UNO_QUERY_THROW);
+uno::Reference xTitle = xTitled->getTitleObject();
+CPPUNIT_ASSERT_MESSAGE("chart doc should not have a title", !xTitle.is());
+}
+
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel)
{
// Bar chart area size is fixed (not automatic) so we can't resize
diff --git a/chart2/qa/extras/data/pptx/tdf146487.pptx
b/chart2/qa/extras/data/pptx/tdf146487.pptx
new file mode 100644
index ..2a78ae5d859b
Binary files /dev/null and b/chart2/qa/extras/data/pptx/tdf146487.pptx differ
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx
b/oox/inc/drawingml/chart/plotareaconverter.hxx
index b520c6b4816c..988405b3247c 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -74,6 +74,8 @@ public:
/** Returns the automatic chart title if the chart contains only one
series. */
const OUString& getAutomaticTitle() const { return maAutoTitle; }
+/** Returns true, if the chart contains only one series and have title
textbox (even empty). */
+boolisSingleSeriesTitle() const { return
mbSingleSeriesTitle; }
/** Returns true, if chart type supports wall and floor format in 3D mode.
*/
boolisWall3dChart() const { return mbWall3dChart; }
@@ -82,6 +84,7 @@ private:
boolmb3dChart;
boolmbWall3dChart;
boolmbPieChart;
+boolmbSingleSeriesTitle;;
};
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx
b/oox/inc/drawingml/chart/typegroupconverter.hxx
index 2e3aae5a2a10..6b780dd0ae15 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -133,6 +133,9 @@ public:
/** Returns series title, if the chart type group contains only one single
series. */
OUStringgetSingleSeriesTitle() const;
+/** Returns true, if the chart contains only one series and have title
textbox (even empty). */
+boolisSingleSeriesTitle() const;
+
/** Creates a coordinate system according to the contained chart type. */
css::uno::Reference< css::chart2::XCoordinateSystem >
createCoordinateSystem();
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index c83ed37e9c02..f9b370e04d8f 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -183,7 +184,18 @@ void ChartSpaceConverter::co
core.git: chart2/qa oox/inc oox/source
chart2/qa/extras/chart2import.cxx | 11 +++
chart2/qa/extras/data/pptx/tdf146487.pptx |binary
oox/inc/drawingml/chart/plotareaconverter.hxx |3 +++
oox/inc/drawingml/chart/typegroupconverter.hxx |3 +++
oox/source/drawingml/chart/chartspaceconverter.cxx | 14 +-
oox/source/drawingml/chart/plotareaconverter.cxx | 10 +-
oox/source/drawingml/chart/typegroupconverter.cxx |9 +
7 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit 135ce256ce9e879663d828ec6e699de521fad867
Author: Samuel Mehrbrodt
AuthorDate: Mon Aug 14 15:59:18 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 18 15:33:10 2024 +0100
tdf#146487 Don't show generic diagram title when there is an empty title
given
Bugdoc has autoTitleDeleted set to false (so title should be visible), but
then an empty title is given.
In this case no default string should be added to the title, only in case
of Pie Charts.
Any other Chart types show the default title in MS-Office.
Co-authored-by: Balazs Varga
Change-Id: Ib445099a4a3d113cff6b1ffdfd093fe41c34716b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155681
Tested-by: Samuel Mehrbrodt
Reviewed-by: Samuel Mehrbrodt
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 678518d1c88a..fc8042a38393 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1979,6 +1979,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205)
CPPUNIT_ASSERT_EQUAL(OUString("Firstline
Secondline
Thirdline"), aTitle);
}
+CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146487)
+{
+loadFromFile(u"pptx/tdf146487.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+
+Reference xTitled(xChartDoc, uno::UNO_QUERY_THROW);
+uno::Reference xTitle = xTitled->getTitleObject();
+CPPUNIT_ASSERT_MESSAGE("chart doc should not have a title", !xTitle.is());
+}
+
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel)
{
// Bar chart area size is fixed (not automatic) so we can't resize
diff --git a/chart2/qa/extras/data/pptx/tdf146487.pptx
b/chart2/qa/extras/data/pptx/tdf146487.pptx
new file mode 100644
index ..2a78ae5d859b
Binary files /dev/null and b/chart2/qa/extras/data/pptx/tdf146487.pptx differ
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx
b/oox/inc/drawingml/chart/plotareaconverter.hxx
index b520c6b4816c..988405b3247c 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -74,6 +74,8 @@ public:
/** Returns the automatic chart title if the chart contains only one
series. */
const OUString& getAutomaticTitle() const { return maAutoTitle; }
+/** Returns true, if the chart contains only one series and have title
textbox (even empty). */
+boolisSingleSeriesTitle() const { return
mbSingleSeriesTitle; }
/** Returns true, if chart type supports wall and floor format in 3D mode.
*/
boolisWall3dChart() const { return mbWall3dChart; }
@@ -82,6 +84,7 @@ private:
boolmb3dChart;
boolmbWall3dChart;
boolmbPieChart;
+boolmbSingleSeriesTitle;;
};
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx
b/oox/inc/drawingml/chart/typegroupconverter.hxx
index 2e3aae5a2a10..6b780dd0ae15 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -133,6 +133,9 @@ public:
/** Returns series title, if the chart type group contains only one single
series. */
OUStringgetSingleSeriesTitle() const;
+/** Returns true, if the chart contains only one series and have title
textbox (even empty). */
+boolisSingleSeriesTitle() const;
+
/** Creates a coordinate system according to the contained chart type. */
css::uno::Reference< css::chart2::XCoordinateSystem >
createCoordinateSystem();
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index c83ed37e9c02..f9b370e04d8f 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -183,7 +184,18 @@ void ChartSpaceConverter::convertFromModel( const
Reference< XShapes >& rxExtern
OUString aAutoTitle = aPlotAreaConv.getAutomaticTitle();
if( mrModel.mxTitle.is() || !aAutoTitle.isEmpty() )
{
-
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca704f49ea82dd69e0df059f6a80214fb77f026d Author: Samuel Mehrbrodt AuthorDate: Thu Jan 4 16:01:50 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Jan 18 11:14:25 2024 +0100 tdf#159120 Show only documents from the current module by default Treat individual LO modules as such. Suggesting spreadsheets in Writer's recent document list confuses the user. Start center shows all recent documents while the lists in Writer, Calc, Impress, etc only show the types supported by the current module. Change-Id: I9f95463424d9cc9bf2b1910aeed6e8e84a52aef2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161782 Reviewed-by: Heiko Tietze Tested-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 73de7af3a267..79c419b79a18 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1953,7 +1953,7 @@ The entry specifies if the recent document list should show only files that can be handled by the current module. -false +true
core.git: Branch 'distro/collabora/co-24.04' - cui/source
cui/source/options/optaboutconfig.cxx | 28
cui/source/options/optaboutconfig.hxx |5 +++--
2 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit fb295e919a7d311670bf7f07f20cd459e1163e9f
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 15 08:15:46 2024 +0100
Commit: Andras Timar
CommitDate: Wed Jan 17 10:04:39 2024 +0100
tdf#159186 Use changed value when editing string-list a second time
Change-Id: I0e26a053b3b5fb04abf87894bcfebccea8bdd26f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162074
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 76ce6466b814bb9ff119f4f83795a2aeefc28793)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162097
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 1b02642e6d00..f927363f8650 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -70,15 +70,18 @@ struct UserData
bool bIsReadOnly;
bool bWasModified;
OUString sPropertyPath;
+Any aPropertyValue;
OUString sTooltip;
int aLineage;
Reference aXNameAccess;
-explicit UserData(OUString aPropertyPath, OUString aTooltip, bool
isReadOnly, bool wasModified)
+explicit UserData(OUString aPropertyPath, Any aPropValue, OUString
aTooltip, bool isReadOnly,
+ bool wasModified)
: bIsPropertyPath(true)
, bIsReadOnly(isReadOnly)
, bWasModified(wasModified)
, sPropertyPath(std::move(aPropertyPath))
+, aPropertyValue(aPropValue)
, sTooltip(std::move(aTooltip))
, aLineage(0)
{
@@ -187,9 +190,10 @@ IMPL_STATIC_LINK_NOARG(CuiAboutConfigTabPage,
ValidNameHdl, SvxNameDialog&, bool
CuiAboutConfigTabPage::~CuiAboutConfigTabPage() {}
-void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const
OUString& rProp,
-const OUString& rStatus, const
OUString& rType,
-const OUString& rValue, const
OUString& rTooltip,
+void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, Any
aPropertyValue,
+const OUString& rProp, const OUString&
rStatus,
+const OUString& rType, const OUString&
rValue,
+const OUString& rTooltip,
const weld::TreeIter* pParentEntry,
bool bInsertToPrefBox,
bool bIsReadOnly, bool bWasModified)
{
@@ -197,8 +201,8 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rPropertyPath, const OUS
if (bOnlyModified && !bWasModified)
return;
-m_vectorUserData.push_back(
-std::make_unique(rPropertyPath, rTooltip, bIsReadOnly,
bWasModified));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath,
aPropertyValue, rTooltip,
+ bIsReadOnly,
bWasModified));
if (bInsertToPrefBox)
{
OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -689,8 +693,9 @@ void CuiAboutConfigTabPage::FillItems(const
Reference& xNameAccess,
for (int j = 1; j < lineage; ++j)
index = sPath.indexOf("/", index + 1);
-InsertEntry(sPath, sPath.copy(index + 1), item, sType,
sValue.makeStringAndClear(),
-sTooltip, pParentEntry, !bLoadAll, bReadOnly,
bWasModified);
+InsertEntry(sPath, aNode, sPath.copy(index + 1), item, sType,
+sValue.makeStringAndClear(), sTooltip, pParentEntry,
!bLoadAll, bReadOnly,
+bWasModified);
}
}
}
@@ -940,10 +945,8 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
else if (sPropertyType == "string-list")
{
SvxListDialog aListDialog(m_xDialog.get());
-Reference xConfigAccess
-= getConfigAccess(pUserData->sPropertyPath, false);
-Any aNode = xConfigAccess->getByName(sPropertyName);
-uno::Sequence aList =
aNode.get>();
+uno::Sequence aList
+= pUserData->aPropertyValue.get>();
aListDialog.SetEntries(
comphelper::sequenceToContainer>(aList));
aListDialog.SetMode(ListMode::String);
@@ -962,6 +965,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
if (bSaveChanges)
{
AddToModifiedVector(pProperty);
+pUserData->aPropertyValue = pProperty->Value;
core.git: Branch 'libreoffice-24-2' - cui/source
cui/source/options/optaboutconfig.cxx | 28
cui/source/options/optaboutconfig.hxx |5 +++--
2 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 395c8cfb770e7424fd99b884f568a32fcc7a728f
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 15 08:15:46 2024 +0100
Commit: Gabor Kelemen
CommitDate: Tue Jan 16 15:42:11 2024 +0100
tdf#159186 Use changed value when editing string-list a second time
Change-Id: I0e26a053b3b5fb04abf87894bcfebccea8bdd26f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162074
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 76ce6466b814bb9ff119f4f83795a2aeefc28793)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162097
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 1b02642e6d00..f927363f8650 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -70,15 +70,18 @@ struct UserData
bool bIsReadOnly;
bool bWasModified;
OUString sPropertyPath;
+Any aPropertyValue;
OUString sTooltip;
int aLineage;
Reference aXNameAccess;
-explicit UserData(OUString aPropertyPath, OUString aTooltip, bool
isReadOnly, bool wasModified)
+explicit UserData(OUString aPropertyPath, Any aPropValue, OUString
aTooltip, bool isReadOnly,
+ bool wasModified)
: bIsPropertyPath(true)
, bIsReadOnly(isReadOnly)
, bWasModified(wasModified)
, sPropertyPath(std::move(aPropertyPath))
+, aPropertyValue(aPropValue)
, sTooltip(std::move(aTooltip))
, aLineage(0)
{
@@ -187,9 +190,10 @@ IMPL_STATIC_LINK_NOARG(CuiAboutConfigTabPage,
ValidNameHdl, SvxNameDialog&, bool
CuiAboutConfigTabPage::~CuiAboutConfigTabPage() {}
-void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const
OUString& rProp,
-const OUString& rStatus, const
OUString& rType,
-const OUString& rValue, const
OUString& rTooltip,
+void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, Any
aPropertyValue,
+const OUString& rProp, const OUString&
rStatus,
+const OUString& rType, const OUString&
rValue,
+const OUString& rTooltip,
const weld::TreeIter* pParentEntry,
bool bInsertToPrefBox,
bool bIsReadOnly, bool bWasModified)
{
@@ -197,8 +201,8 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rPropertyPath, const OUS
if (bOnlyModified && !bWasModified)
return;
-m_vectorUserData.push_back(
-std::make_unique(rPropertyPath, rTooltip, bIsReadOnly,
bWasModified));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath,
aPropertyValue, rTooltip,
+ bIsReadOnly,
bWasModified));
if (bInsertToPrefBox)
{
OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -689,8 +693,9 @@ void CuiAboutConfigTabPage::FillItems(const
Reference& xNameAccess,
for (int j = 1; j < lineage; ++j)
index = sPath.indexOf("/", index + 1);
-InsertEntry(sPath, sPath.copy(index + 1), item, sType,
sValue.makeStringAndClear(),
-sTooltip, pParentEntry, !bLoadAll, bReadOnly,
bWasModified);
+InsertEntry(sPath, aNode, sPath.copy(index + 1), item, sType,
+sValue.makeStringAndClear(), sTooltip, pParentEntry,
!bLoadAll, bReadOnly,
+bWasModified);
}
}
}
@@ -940,10 +945,8 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
else if (sPropertyType == "string-list")
{
SvxListDialog aListDialog(m_xDialog.get());
-Reference xConfigAccess
-= getConfigAccess(pUserData->sPropertyPath, false);
-Any aNode = xConfigAccess->getByName(sPropertyName);
-uno::Sequence aList =
aNode.get>();
+uno::Sequence aList
+= pUserData->aPropertyValue.get>();
aListDialog.SetEntries(
comphelper::sequenceToContainer>(aList));
aListDialog.SetMode(ListMode::String);
@@ -962,6 +965,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
if (bSaveChanges)
{
AddToModifiedVector(pProperty);
+pUserData->aPropertyValue = pProperty->Val
core.git: cui/source
cui/source/options/optaboutconfig.cxx | 28
cui/source/options/optaboutconfig.hxx |5 +++--
2 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 71296fd27dd9e3e5609b4fd41f3842673231a3ad
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 15 08:15:46 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 15 12:46:18 2024 +0100
tdf#159186 Use changed value when editing string-list a second time
Change-Id: I0e26a053b3b5fb04abf87894bcfebccea8bdd26f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162074
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 78dc234ffbe6..de64f45b4260 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -70,15 +70,18 @@ struct UserData
bool bIsReadOnly;
bool bWasModified;
OUString sPropertyPath;
+Any aPropertyValue;
OUString sTooltip;
int aLineage;
Reference aXNameAccess;
-explicit UserData(OUString aPropertyPath, OUString aTooltip, bool
isReadOnly, bool wasModified)
+explicit UserData(OUString aPropertyPath, Any aPropValue, OUString
aTooltip, bool isReadOnly,
+ bool wasModified)
: bIsPropertyPath(true)
, bIsReadOnly(isReadOnly)
, bWasModified(wasModified)
, sPropertyPath(std::move(aPropertyPath))
+, aPropertyValue(aPropValue)
, sTooltip(std::move(aTooltip))
, aLineage(0)
{
@@ -186,9 +189,10 @@ IMPL_STATIC_LINK_NOARG(CuiAboutConfigTabPage,
ValidNameHdl, SvxNameDialog&, bool
CuiAboutConfigTabPage::~CuiAboutConfigTabPage() {}
-void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const
OUString& rProp,
-const OUString& rStatus, const
OUString& rType,
-const OUString& rValue, const
OUString& rTooltip,
+void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, Any
aPropertyValue,
+const OUString& rProp, const OUString&
rStatus,
+const OUString& rType, const OUString&
rValue,
+const OUString& rTooltip,
const weld::TreeIter* pParentEntry,
bool bInsertToPrefBox,
bool bIsReadOnly, bool bWasModified)
{
@@ -196,8 +200,8 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rPropertyPath, const OUS
if (bOnlyModified && !bWasModified)
return;
-m_vectorUserData.push_back(
-std::make_unique(rPropertyPath, rTooltip, bIsReadOnly,
bWasModified));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath,
aPropertyValue, rTooltip,
+ bIsReadOnly,
bWasModified));
if (bInsertToPrefBox)
{
OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -688,8 +692,9 @@ void CuiAboutConfigTabPage::FillItems(const
Reference& xNameAccess,
for (int j = 1; j < lineage; ++j)
index = sPath.indexOf("/", index + 1);
-InsertEntry(sPath, sPath.copy(index + 1), item, sType,
sValue.makeStringAndClear(),
-sTooltip, pParentEntry, !bLoadAll, bReadOnly,
bWasModified);
+InsertEntry(sPath, aNode, sPath.copy(index + 1), item, sType,
+sValue.makeStringAndClear(), sTooltip, pParentEntry,
!bLoadAll, bReadOnly,
+bWasModified);
}
}
}
@@ -939,10 +944,8 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
else if (sPropertyType == "string-list")
{
SvxListDialog aListDialog(m_xDialog.get());
-Reference xConfigAccess
-= getConfigAccess(pUserData->sPropertyPath, false);
-Any aNode = xConfigAccess->getByName(sPropertyName);
-uno::Sequence aList =
aNode.get>();
+uno::Sequence aList
+= pUserData->aPropertyValue.get>();
aListDialog.SetEntries(
comphelper::sequenceToContainer>(aList));
aListDialog.SetMode(ListMode::String);
@@ -961,6 +964,7 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
if (bSaveChanges)
{
AddToModifiedVector(pProperty);
+pUserData->aPropertyValue = pProperty->Value;
//update listbox value.
m_xPrefBox->set_text(*m_xScratchIter, sPropertyType, 2);
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/o
core.git: Branch 'feature/allo_contract45533' - desktop/source
desktop/source/app/app.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 17113410c22c1dadce05b517507a6fc0891d95ee
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 12 16:47:40 2017 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 11 16:19:50 2024 +0100
Disable CrashReportUI
since we don't offer upload - only want the dumps
Change-Id: I6d084757d83204cb960905d7eb78571b13f8f875
(cherry picked from commit 261862f000dce95013843d4a183ad09fe1639041)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c0b30c2ae2fd..30835deefcea 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -889,7 +889,8 @@ namespace {
#if HAVE_FEATURE_BREAKPAD
void handleCrashReport()
{
-static constexpr OUStringLiteral SERVICENAME_CRASHREPORT =
u"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static constexpr OUStringLiteral SERVICENAME_CRASHREPORT =
u"com.sun.star.comp.svx.CrashReportUI";
css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
@@ -903,7 +904,7 @@ void handleCrashReport()
css::util::URL aURL;
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyValue >());
bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
}
#endif
core.git: officecfg/registry sw/qa
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +- sw/qa/extras/uiwriter/uiwriter8.cxx|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit cf9d8631ee5d4b894425446a9e6a8c939ab0309c Author: Samuel Mehrbrodt AuthorDate: Mon Jan 8 14:51:02 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Jan 11 14:01:47 2024 +0100 Related tdf#73953 Increase default comment width Now that it can be resized, we can use a bit more space to increase readability for longer comments, and to match other software. Change-Id: Ia994d7288986a5cb206070b5066c42b59a9980e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161788 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index ead842b58e91..22f1481286b9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -4916,7 +4916,7 @@ Defines the width of the comment bar in Writer. Factor between 1 and 8. -1.8 +3.0 diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 4aebc11b237a..ecf8e2f9bf80 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -765,7 +765,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152575) std::unique_ptr pPdfPage = pPdfDocument->openPage(/*nIndex=*/1); CPPUNIT_ASSERT(pPdfPage); // Without the fix for tdf#152575 this would be only 42 objects -CPPUNIT_ASSERT_EQUAL(51, pPdfPage->getObjectCount()); +CPPUNIT_ASSERT_EQUAL(50, pPdfPage->getObjectCount()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731)
core.git: Branch 'feature/allo_contract45533' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7711b3369ccda6d04eda8211a6e7068ed1e3724d Author: Samuel Mehrbrodt AuthorDate: Thu Jan 11 13:13:48 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jan 11 13:13:48 2024 +0100 Update git submodules * Update dictionaries from branch 'feature/allo_contract45533' to c13eb080daf643f007424750d324fb62d6adfe3e - Add new word "Ratenvereinbarung" And put "Rattenvereinbarung" on the blacklist Change-Id: Ie4d7b8fd93c5758316b5a60539c2a42152725537 diff --git a/dictionaries b/dictionaries index 7aa013596e97..c13eb080daf6 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7aa013596e97ce58bb4def48e6952062ae52cf5f +Subproject commit c13eb080daf643f007424750d324fb62d6adfe3e
dictionaries.git: Branch 'feature/allo_contract45533' - de/de_AT_frami.dic de/de_DE_frami.dic
de/de_AT_frami.dic |2 ++ de/de_DE_frami.dic |2 ++ 2 files changed, 4 insertions(+) New commits: commit c13eb080daf643f007424750d324fb62d6adfe3e Author: Samuel Mehrbrodt AuthorDate: Mon Nov 6 21:44:48 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Jan 11 13:13:38 2024 +0100 Add new word "Ratenvereinbarung" And put "Rattenvereinbarung" on the blacklist Change-Id: Ie4d7b8fd93c5758316b5a60539c2a42152725537 diff --git a/de/de_AT_frami.dic b/de/de_AT_frami.dic index af01bc7..7858516 100644 --- a/de/de_AT_frami.dic +++ b/de/de_AT_frami.dic @@ -73905,6 +73905,7 @@ Rattenplage/Nm Rattenplage/m Rattensparplan/dSTp Rattenzahlungsplan/dSTp +Rattenvereinbarung/dSTp Ratterger�usch/EPSTm Rattern/S Ratzeburg/Sm @@ -212030,6 +212031,7 @@ ratenzahlungspl ratenzahlungsplan/STozm ratenzahlungsvereinbarung/Pozm ratenzahlungszuschlag/STpozm +ratenvereinbarung/Pozm ratespiel/EPSTozm ratewahrscheinlichkeit/Pozm ratgeber/FNSozm diff --git a/de/de_DE_frami.dic b/de/de_DE_frami.dic index 7e08137..3d02c29 100644 --- a/de/de_DE_frami.dic +++ b/de/de_DE_frami.dic @@ -74124,6 +74124,7 @@ Ratenzahlungspl Ratenzahlungsplan/STm Ratenzahlungsvereinbarung/Pm Ratenzahlungszuschlag/STpm +ratenvereinbarung/Pm Ratespiel/EPSTm Ratewahrscheinlichkeit/Pm Ratgeber/FNSm @@ -74229,6 +74230,7 @@ Rattenplage/Nm Rattenplage/m Rattensparplan/dSTp Rattenzahlungsplan/dSTp +Rattenvereinbarung/dSTp Ratterger�usch/EPSTm Rattern/S Ratzeburg/Sm
core.git: sw/inc sw/source
sw/inc/PostItMgr.hxx | 41 --
sw/source/uibase/docvw/AnnotationWin2.cxx |3 +-
sw/source/uibase/docvw/PostItMgr.cxx |9 --
3 files changed, 3 insertions(+), 50 deletions(-)
New commits:
commit fb443c6d4d210d73795bdb3b7cb392765726f3a1
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 4 15:04:06 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 11 12:44:39 2024 +0100
Use officecfg instead of utl::ConfigItem
Change-Id: If6fa84bcdb56873df288d216b157ad669c45bca1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161622
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 510a4fa55a2a..ec6604c43a23 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -82,45 +82,6 @@ struct FieldShadowState
}
};
-class SwNoteProps final : public utl::ConfigItem
-{
-private:
-bool m_bIsShowAnchor;
-
-virtual void ImplCommit() override;
-
-public:
-SwNoteProps()
-: ConfigItem("Office.Writer/Notes")
-, m_bIsShowAnchor(false)
-{
-const css::uno::Sequence< OUString >& rNames = GetPropertyNames();
-css::uno::Sequence< css::uno::Any > aValues =
GetProperties(rNames);
-const css::uno::Any* pValues = aValues.getConstArray();
-SAL_WARN_IF(aValues.getLength() != rNames.getLength(), "sw",
"GetProperties failed");
-if (aValues.hasElements())
-pValues[0]>>=m_bIsShowAnchor;
-}
-
-bool IsShowAnchor() const
-{
-return m_bIsShowAnchor;
-}
-static css::uno::Sequence< OUString >& GetPropertyNames()
-{
-static css::uno::Sequence< OUString > aNames;
-if(!aNames.hasElements())
-{
-aNames.realloc(1);
-OUString* pNames = aNames.getArray();
-pNames[0] = "ShowAnkor";
-}
-return aNames;
-}
-
-virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames
) override;
-};
-
class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public SfxListener
{
private:
@@ -140,7 +101,6 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
FieldShadowStatemShadowState;
std::optional mpAnswer;
OUStringmaAnswerText;
-boolmbIsShowAnchor;
// data structure to collect the instances for
certain instances.
std::unique_ptr
mpFrameSidebarWinContainer;
@@ -190,7 +150,6 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool ShowScrollbar(const tools::ULong aPage) const;
bool HasNotes() const ;
bool ShowNotes() const;
-bool IsShowAnchor() const { return mbIsShowAnchor;}
void SetSidebarWidth(sal_uInt16 nPx);
tools::ULong GetSidebarWidth(bool bPx = false) const;
tools::ULong GetSidebarBorderWidth(bool bPx = false) const;
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index e3bc460d941c..5588b9cc2644 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -79,6 +79,7 @@
#include
#include
+#include
#include
#include
#include
@@ -953,7 +954,7 @@ void SwAnnotationWin::HideNote()
Window::Hide();
if (mpAnchor)
{
-if (mrMgr.IsShowAnchor())
+if (officecfg::Office::Writer::Notes::ShowAnkor::get())
mpAnchor->SetAnchorState(AnchorState::Tri);
else
mpAnchor->setVisible(false);
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index e50641a9176e..24abcc14a2a5 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -56,7 +56,6 @@
#include
#include
#include
-#include
#include
#include
@@ -77,6 +76,7 @@
#include
#include
+#include
#include
#include
@@ -205,14 +205,10 @@ SwPostItMgr::SwPostItMgr(SwView* pView)
, mbLayouting(false)
, mbReadOnly(mpView->GetDocShell()->IsReadOnly())
, mbDeleteNote(true)
-, mbIsShowAnchor( false )
{
if(!mpView->GetDrawView() )
mpView->GetWrtShell().MakeDrawView();
-SwNoteProps aProps;
-mbIsShowAnchor = aProps.IsShowAnchor();
-
//make sure we get the colour yellow always, even if not the first one of
comments or redlining
SW_MOD()->GetRedlineAuthor();
@@ -2548,7 +2544,4 @@ void SwPostItMgr::UpdateResolvedStatus(const
sw::annotation::SwAnnotationWin* to
}
}
-void SwNoteProps::ImplCommit() {}
-void SwNoteProps::Notify( const css::uno::Sequence< OUString >& ) {}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
core.git: Branch 'feature/cib_contract57d' - 5 commits - configure.ac sw/qa sw/source
configure.ac|2
dev/null|binary
sw/qa/extras/layout/data/tdf156725.fodt | 163
sw/qa/extras/layout/layout.cxx | 70 -
sw/source/core/layout/layact.cxx|6 -
sw/source/core/layout/sectfrm.cxx |5
6 files changed, 5 insertions(+), 241 deletions(-)
New commits:
commit a424f77bf317871faa62ee086d1f8e1182201a14
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 11 12:07:21 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 11 12:07:21 2024 +0100
Release 6.3.6.29
Change-Id: Ibb70c89f1bc1cc58470a9df3e4a62f7ae34b99ee
diff --git a/configure.ac b/configure.ac
index e7779a82ce49..107a3505d54f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.3.6.28],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.29],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 298b86fd148d40dd9bc3c673dd03e2b9a979a91b
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 11 12:05:54 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 11 12:05:54 2024 +0100
Revert "tdf#156724 tdf#156722 tdf#156745 sw: layout: partially remove
IsPaintLocked()"
This reverts commit 46274983c3ac31a0580a4baeb26e3b5d79ed3c91.
diff --git a/sw/qa/extras/layout/data/fdo56797-2-min.odt
b/sw/qa/extras/layout/data/fdo56797-2-min.odt
deleted file mode 100644
index 624149ec0248..
Binary files a/sw/qa/extras/layout/data/fdo56797-2-min.odt and /dev/null differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index f72715fcba43..11c502d4c09d 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3641,37 +3641,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf155324)
assertXPath(pXmlDoc, "/root/page[5]/ftncont/ftn", 5);
}
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156724)
-{
-discardDumpedLayout();
-if (mxComponent.is())
-mxComponent->dispose();
-
-OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY) +
"/fdo56797-2-min.odt");
-
-// note: must set Hidden property, so that
SfxFrameViewWindow_Impl::Resize()
-// does *not* forward initial VCL Window Resize and thereby triggers a
-// layout which does not happen on soffice --convert-to pdf.
-std::vector aFilterOptions = {
-{ beans::PropertyValue("Hidden", -1, uno::Any(true),
beans::PropertyState_DIRECT_VALUE) },
-};
-
-// inline the loading because currently properties can't be passed...
-mxComponent = loadFromDesktop(url, "com.sun.star.text.TextDocument",
-
comphelper::containerToSequence(aFilterOptions));
-save("writer_pdf_Export", maTempFile);
-
-xmlDocPtr pXmlDoc = parseLayoutDump();
-// both pages have a tab frame and one footnote
-assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
-assertXPath(pXmlDoc, "/root/page[1]/ftncont", 1);
-assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn", 1);
-assertXPath(pXmlDoc, "/root/page[2]/body/tab", 1);
-assertXPath(pXmlDoc, "/root/page[2]/ftncont", 1);
-assertXPath(pXmlDoc, "/root/page[2]/ftncont/ftn", 1);
-assertXPath(pXmlDoc, "/root/page", 2);
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 88185c8de95a..6a2fd2046ffb 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1365,10 +1365,10 @@ bool SwLayAction::FormatLayout( OutputDevice
*pRenderContext, SwLayoutFrame *pLa
else if( !pLow->IsSctFrame() ||
static_cast(pLow)->GetSection() )
bChanged |= FormatLayout( pRenderContext,
static_cast(pLow), bAddRect );
}
-else if (m_pImp->GetShell()->IsPaintLocked() ||
!pLay->IsColBodyFrame())
-{ // tdf#156724 unconditionally for frames in tables, so their
footnotes exist before trying to split
+else if ( m_pImp->GetShell()->IsPaintLocked() )
+// Shortcut to minimize the cycles. With Lock, the
+// paint is coming either way (primarily for browse)
pLow->OptCalc();
-}
if ( IsAgain() )
return false;
commit 56012f32b0d59c59f30d4aef4832e04b26780af0
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 11 12:
core.git: officecfg/registry sw/inc sw/source
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 11 ++
sw/inc/PostItMgr.hxx |1
sw/source/uibase/docvw/AnnotationWin2.cxx |3
sw/source/uibase/docvw/PostItMgr.cxx | 15 +++
sw/source/uibase/inc/swruler.hxx |6 +
sw/source/uibase/misc/swruler.cxx | 51 +++--
6 files changed, 79 insertions(+), 8 deletions(-)
New commits:
commit ac2720dcbe4e51e7f6733a385b5f7b571c6431e9
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 4 14:23:21 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 11 09:03:38 2024 +0100
tdf#73953 sw: Allow resizing the comment section
Change-Id: If2920b31a82b3f3d42038e75f3637be9802711fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161616
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index c3908721cbc3..ead842b58e91 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4911,6 +4911,17 @@
false
+
+
+
+ Defines the width of the comment bar in Writer. Factor between
1 and 8.
+
+1.8
+
+
+
+
+
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 98d9f4f2ef30..510a4fa55a2a 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -191,6 +191,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool HasNotes() const ;
bool ShowNotes() const;
bool IsShowAnchor() const { return mbIsShowAnchor;}
+void SetSidebarWidth(sal_uInt16 nPx);
tools::ULong GetSidebarWidth(bool bPx = false) const;
tools::ULong GetSidebarBorderWidth(bool bPx = false) const;
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index a1780f9132c8..e3bc460d941c 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -564,7 +564,10 @@ void SwAnnotationWin::SetPosAndSize()
{
bChange = true;
SetPosPixel(mPosSize.TopLeft());
+}
+if (bChange)
+{
Point aLineStart;
Point aLineEnd ;
switch ( meSidebarPosition )
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 12c5e4f52d11..e50641a9176e 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#include
@@ -2154,6 +2155,17 @@ bool SwPostItMgr::HasNotes() const
return !mvPostItFields.empty();
}
+void SwPostItMgr::SetSidebarWidth(sal_uInt16 nPx)
+{
+sal_uInt16 nZoom = mpWrtShell->GetViewOptions()->GetZoom();
+double nFactor = static_cast(nPx) / static_cast(nZoom);
+nFactor = std::clamp(nFactor, 1.0, 8.0);
+std::shared_ptr
xChanges(comphelper::ConfigurationChanges::create());
+officecfg::Office::Writer::Notes::DisplayWidthFactor::set(nFactor,
xChanges);
+xChanges->commit();
+LayoutPostIts();
+}
+
tools::ULong SwPostItMgr::GetSidebarWidth(bool bPx) const
{
bool bEnableMapMode = !mpWrtShell->GetOut()->IsMapModeEnabled();
@@ -2164,7 +2176,8 @@ tools::ULong SwPostItMgr::GetSidebarWidth(bool bPx) const
double fScaleX =
double(mpWrtShell->GetOut()->GetMapMode().GetScaleX());
nZoom = fScaleX * 100;
}
-tools::ULong aWidth = static_cast(nZoom * 1.8);
+tools::ULong aWidth = static_cast(
+nZoom * officecfg::Office::Writer::Notes::DisplayWidthFactor::get());
if (bPx)
return aWidth;
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx
index 6c903f9ca9a5..f18f8721fc8a 100644
--- a/sw/source/uibase/inc/swruler.hxx
+++ b/sw/source/uibase/inc/swruler.hxx
@@ -48,6 +48,8 @@ public:
private:
SwViewShell * mpViewShell; //< Shell to check if there is any comments
on doc and their visibility
VclPtr mpSwWin; //< Used to get SwView to change the
SideBar visibility
+/// User is currently dragging the thing
+boolmbIsDrag;
boolmbIsHighlighted; //< If comment control is highlighted (mouse
is over it)
Timer maFadeTimer; //< Timer for high/'low'light fading
int mnFadeRate; //< From 0 to 100. 0 means not highlighted.
@@ -60,6 +62,8 @@ private:
* When on comment control, it toggles the comment panel visibility.
*/
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+
+virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
core.git: Branch 'libreoffice-24-2' - vcl/source
vcl/source/window/dlgctrl.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 7c7507e9319e65f7e9a16cbb66ffdea859403d19
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 8 13:58:03 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 8 17:45:55 2024 +0100
tdf#157649 Allow omitting Alt key in Windows only
Follow-up for ea1421747985bd09ad40565da8536e857b5c2e9a
Change-Id: Ifdfeb8a0a9507f66af26607efc31438169452b46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161787
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 90cdf353f8c0..ac75333d9011 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -952,9 +952,13 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool
bKeyInput )
GetFocusFlags nGetFocusFlags = GetFocusFlags::Mnemonic;
if ( pSWindow == ::ImplFindAccelWindow( this, i, c,
nFormStart, nFormEnd ) )
nGetFocusFlags |= GetFocusFlags::UniqueMnemonic;
+#ifdef _WIN32
// tdf#157649 Allow omitting the Alt key when focus is in
the dialog action area:
bool bIsButtonBox =
dynamic_cast(pSWindow->GetParent()) != nullptr;
if ((bIsButtonBox &&
pSWindow->GetParent()->HasChildPathFocus(true)) || aKeyCode.IsMod2())
+#else
+if (aKeyCode.IsMod2())
+#endif
{
pSWindow->ImplControlFocus( nGetFocusFlags );
return true;
core.git: Branch 'libreoffice-24-2' - vcl/source
vcl/source/window/dlgctrl.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit aaefd2080ecb39a3deade23368a83acee91367ef
Author: Samuel Mehrbrodt
AuthorDate: Fri Dec 22 09:25:53 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 8 17:45:48 2024 +0100
tdf#157649 Allow omitting Alt key when focus is in dialog action area
Adapt to usual Windows experience: Allow triggering the Ok, Cancel, etc
buttons in the dialog action area without pressing the Alt key - when
the focus is in that area (and the accelerator is unique in that dialog).
Change-Id: I85b544867cf5507a15240b2972a26a1c248c4f82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161146
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit ea1421747985bd09ad40565da8536e857b5c2e9a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161568
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index adf416b21769..90cdf353f8c0 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -941,7 +941,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool
bKeyInput )
}
}
}
-else if (aKeyCode.IsMod2()) // tdf#151385
+else
{
sal_Unicode c = rKEvt.GetCharCode();
if ( c )
@@ -952,8 +952,13 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool
bKeyInput )
GetFocusFlags nGetFocusFlags = GetFocusFlags::Mnemonic;
if ( pSWindow == ::ImplFindAccelWindow( this, i, c,
nFormStart, nFormEnd ) )
nGetFocusFlags |= GetFocusFlags::UniqueMnemonic;
-pSWindow->ImplControlFocus( nGetFocusFlags );
-return true;
+// tdf#157649 Allow omitting the Alt key when focus is in
the dialog action area:
+bool bIsButtonBox =
dynamic_cast(pSWindow->GetParent()) != nullptr;
+if ((bIsButtonBox &&
pSWindow->GetParent()->HasChildPathFocus(true)) || aKeyCode.IsMod2())
+{
+pSWindow->ImplControlFocus( nGetFocusFlags );
+return true;
+}
}
}
}
core.git: vcl/source
vcl/source/window/dlgctrl.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 3ad0f2317492f5a11ed9786e849f18a5fa817480
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 8 13:58:03 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 8 17:45:36 2024 +0100
tdf#157649 Allow omitting Alt key in Windows only
Follow-up for ea1421747985bd09ad40565da8536e857b5c2e9a
Change-Id: Ifdfeb8a0a9507f66af26607efc31438169452b46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161786
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 90cdf353f8c0..ac75333d9011 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -952,9 +952,13 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool
bKeyInput )
GetFocusFlags nGetFocusFlags = GetFocusFlags::Mnemonic;
if ( pSWindow == ::ImplFindAccelWindow( this, i, c,
nFormStart, nFormEnd ) )
nGetFocusFlags |= GetFocusFlags::UniqueMnemonic;
+#ifdef _WIN32
// tdf#157649 Allow omitting the Alt key when focus is in
the dialog action area:
bool bIsButtonBox =
dynamic_cast(pSWindow->GetParent()) != nullptr;
if ((bIsButtonBox &&
pSWindow->GetParent()->HasChildPathFocus(true)) || aKeyCode.IsMod2())
+#else
+if (aKeyCode.IsMod2())
+#endif
{
pSWindow->ImplControlFocus( nGetFocusFlags );
return true;
core.git: sw/source
sw/source/uibase/misc/swruler.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 97b3925354ac4ba9439bcbb5e463e27ddca23507
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 4 14:12:55 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 8 16:00:50 2024 +0100
Add some left margin for the comment triangle
Add the same margin to the left as to the right
Change-Id: Iac1865f72c495d911580c06064c4b738607bd15a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161615
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index 0ccdec2f46a5..59c28e0ca201 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -152,7 +152,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext&
rRenderContext)
// calculate label and arrow positions
const OUString aLabel = SwResId(STR_COMMENTS_LABEL);
const tools::Long nTriangleSize = maVirDev->GetTextHeight() / 2 + 1;
-const tools::Long nTrianglePad = maVirDev->GetTextHeight() / 4;
+const tools::Long nTrianglePad = maVirDev->GetTextHeight() / 2;
Point aLabelPos(0, (aControlRect.GetHeight() - maVirDev->GetTextHeight())
/ 2);
Point aArrowPos(0, (aControlRect.GetHeight() - nTriangleSize) / 2);
@@ -160,7 +160,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext&
rRenderContext)
if (!AllSettings::GetLayoutRTL()) // | > Comments |
{
aArrowPos.setX(nTrianglePad);
-aLabelPos.setX(aArrowPos.X() + nTriangleSize + nTrianglePad);
+aLabelPos.setX(aArrowPos.X() + nTriangleSize + nTrianglePad / 2);
}
else // RTL => | Comments < |
{
core.git: vcl/source
vcl/source/window/dlgctrl.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit ea1421747985bd09ad40565da8536e857b5c2e9a
Author: Samuel Mehrbrodt
AuthorDate: Fri Dec 22 09:25:53 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Sat Dec 23 17:37:02 2023 +0100
tdf#157649 Allow omitting Alt key when focus is in dialog action area
Adapt to usual Windows experience: Allow triggering the Ok, Cancel, etc
buttons in the dialog action area without pressing the Alt key - when
the focus is in that area (and the accelerator is unique in that dialog).
Change-Id: I85b544867cf5507a15240b2972a26a1c248c4f82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161146
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index adf416b21769..90cdf353f8c0 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -941,7 +941,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool
bKeyInput )
}
}
}
-else if (aKeyCode.IsMod2()) // tdf#151385
+else
{
sal_Unicode c = rKEvt.GetCharCode();
if ( c )
@@ -952,8 +952,13 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool
bKeyInput )
GetFocusFlags nGetFocusFlags = GetFocusFlags::Mnemonic;
if ( pSWindow == ::ImplFindAccelWindow( this, i, c,
nFormStart, nFormEnd ) )
nGetFocusFlags |= GetFocusFlags::UniqueMnemonic;
-pSWindow->ImplControlFocus( nGetFocusFlags );
-return true;
+// tdf#157649 Allow omitting the Alt key when focus is in
the dialog action area:
+bool bIsButtonBox =
dynamic_cast(pSWindow->GetParent()) != nullptr;
+if ((bIsButtonBox &&
pSWindow->GetParent()->HasChildPathFocus(true)) || aKeyCode.IsMod2())
+{
+pSWindow->ImplControlFocus( nGetFocusFlags );
+return true;
+}
}
}
}
core.git: Branch 'libreoffice-24-2' - cui/source
cui/source/options/optaboutconfig.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 89fe91ec83c8c5d690d753bc4011e2e3f9e3da89 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 15:28:27 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 22:26:16 2023 +0100 tdf#158720 Fix crash when searching expert config with gen vcl plugin Change-Id: Ida2f17c8dfb638bb6791dba32ae3b190b06254de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160920 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit 9e02641932992cad3f8d4e363414b2756f0f8e52) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160931 diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 6e3bdd9b2747..1b02642e6d00 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -1073,7 +1073,6 @@ void CuiAboutConfigTabPage::InsertEntry(const prefBoxEntry& rEntry) m_xPrefBox->set_text(*xParentEntry, "", 1); m_xPrefBox->set_text(*xParentEntry, "", 2); m_xPrefBox->set_text(*xParentEntry, "", 3); -m_xPrefBox->set_text_emphasis(*m_xScratchIter, rEntry.pUserData->bWasModified, -1); m_xPrefBox->set_sensitive(*xParentEntry, true); }
core.git: Branch 'libreoffice-24-2' - editeng/source
editeng/source/misc/acorrcfg.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c2de1babeaa4cee171afadd6d337ffd1f17664a7 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 14:36:39 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 20:40:39 2023 +0100 tdf#158186 Fix saving ApplyNumberingAfterSpace Change-Id: I6880f75c140f6e800bbdb6c56dd1ff166a3191d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160916 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit cefe7488930895a971dce41a286144dae39f57d4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160930 diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 47f634d4347f..fcafbfca6f0c 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -421,9 +421,9 @@ Sequence SvxSwAutoCorrCfg::GetPropertyNames() "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", //45 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", //46 "Format/Option/SetDOIAttribute",//47 -"Format/ByInput/ApplyNumberingAfterSpace", //48 +"Format/ByInput/ApplyBulletsAfterSpace",//48 }; -const int nCount = 48; +const int nCount = 49; Sequence aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++)
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 42 +++ 1 file changed, 42 insertions(+) New commits: commit 62d80667f5b164e7a6377c22b0f37407ccf8eb59 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 11:38:56 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 20:40:16 2023 +0100 Revert "[API CHANGE] Remove unused CrossFading group" This reverts commit cbc6bb9fdaf4acc815b9f11fba73c33d25a81e8f. Reason for revert: This config group is supposed to be used, see tdf#158304 for details. Bug reference now added to the config group. Change-Id: Id8d15b3f3c6abdec541e8ed7d3965259428b64fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160866 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs index 290d8148bd1a..c7ce19c2d6f4 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs @@ -336,6 +336,48 @@ false + + + Contains a specification of how to morph between objects (e.g. how many steps and whether to regard the object's attributes). + These settings are supposed to be saved, see https://bugs.documentfoundation.org/show_bug.cgi?id=158304 + + + + +Specifies the number of intermediate morphing steps between two objects. +Steps + + + + +Specifies that there has to be at least one morphing step. + + + + +Specifies that there may be at least this many morphing steps. + + + + 16 + + + + +Indicates whether two objects to be morphed shall have the same orientation. +Orientation + + true + + + + +Indicates whether to consider objects' attributes (e.g. colors) when morphing one object into another. +Attributes + + true + +
core.git: cui/source
cui/source/options/optaboutconfig.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 3174749bb826fd653c923cadc98c7045a70bfd2f Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 15:28:27 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 17:31:44 2023 +0100 tdf#158720 Fix crash when searching expert config with gen vcl plugin Change-Id: Ida2f17c8dfb638bb6791dba32ae3b190b06254de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160920 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index dc4e8ffeb67c..78dc234ffbe6 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -1072,7 +1072,6 @@ void CuiAboutConfigTabPage::InsertEntry(const prefBoxEntry& rEntry) m_xPrefBox->set_text(*xParentEntry, "", 1); m_xPrefBox->set_text(*xParentEntry, "", 2); m_xPrefBox->set_text(*xParentEntry, "", 3); -m_xPrefBox->set_text_emphasis(*m_xScratchIter, rEntry.pUserData->bWasModified, -1); m_xPrefBox->set_sensitive(*xParentEntry, true); }
core.git: editeng/source
editeng/source/misc/acorrcfg.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0a431e89b743bc3b29716b4ef2ae863beff90f80 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 14:36:39 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 16:36:37 2023 +0100 tdf#158186 Fix saving ApplyNumberingAfterSpace Change-Id: I6880f75c140f6e800bbdb6c56dd1ff166a3191d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160916 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 47f634d4347f..fcafbfca6f0c 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -421,9 +421,9 @@ Sequence SvxSwAutoCorrCfg::GetPropertyNames() "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", //45 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", //46 "Format/Option/SetDOIAttribute",//47 -"Format/ByInput/ApplyNumberingAfterSpace", //48 +"Format/ByInput/ApplyBulletsAfterSpace",//48 }; -const int nCount = 48; +const int nCount = 49; Sequence aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++)
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 1 file changed, 8 insertions(+) New commits: commit 79bf66ee7bab7beac54be62f5dcfe9eeb8ca932d Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 14:15:10 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 16:34:03 2023 +0100 Revert "[API CHANGE] Remove unused ApplyBulletsAfterSpace" This reverts commit a3a9ae3f564be4dd6549fe5708a593ea09d1e79c. Reason: This is required for tdf#158186 Change-Id: I850cb277d1a6de0191f6249e2701454460a43e5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160915 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 4e7e4e92ebd4..c3908721cbc3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -4100,6 +4100,14 @@ Delete Blanks and Tabs between lineend and -begin true + + + + + Specifies whether a numbered or bulleted text is created automatically while typing * or - and then space + Bulleted and numbered lists immediate after pressing space + +false
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b715d6633e4c6aad7aa3e68e7036b3827852f54c Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 15:09:32 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 16:32:21 2023 +0100 TileExtent: Add bug reference Change-Id: Ia5994c49bc517230dc35485778d6a2d935fb2091 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160918 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 02ba637269d1..537220b79be2 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3465,7 +3465,8 @@ Specifies the extent of background tiles that are used for - vectorizing [UNIT=pixel]. + vectorizing [UNIT=pixel]. + This setting is supposed to be saved, see https://bugs.documentfoundation.org/show_bug.cgi?id=158305 Tile extent
core.git: test/source
test/source/text/textprintersettings.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 5aba83e7c1bc177270b585253ef27e6995f41f23 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 09:19:20 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 14:56:24 2023 +0100 Remove duplicate test for PrintControls property Change-Id: I9f4a832cab84bd5815e696397fea3b7668386a36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160898 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/test/source/text/textprintersettings.cxx b/test/source/text/textprintersettings.cxx index 6694b4bd0a07..da94c20203c1 100644 --- a/test/source/text/textprintersettings.cxx +++ b/test/source/text/textprintersettings.cxx @@ -24,7 +24,6 @@ void TextPrinterSettings::testPrinterSettingsProperties() testBooleanProperty(xPrinterSettings, "PrintLeftPages"); testBooleanProperty(xPrinterSettings, "PrintRightPages"); testBooleanProperty(xPrinterSettings, "PrintControls"); -testBooleanProperty(xPrinterSettings, "PrintControls"); testStringProperty(xPrinterSettings, "PrintFaxName", "FaxName"); testBooleanProperty(xPrinterSettings, "PrintProspect"); testBooleanProperty(xPrinterSettings, "PrintPageBackground");
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c683f38dcc202af9c261b18deaf27d3ee9743966 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 11:43:34 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 13:22:13 2023 +0100 Add bug reference to unused config prop Change-Id: Icfc1378c4c7ff075af939c46701fe2d1a5e568ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160867 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index b39f4f720216..02ba637269d1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3432,7 +3432,8 @@ Specifies the number of pixels that you want to combine as a - single pixel when creating a vector graphic. + single pixel when creating a vector graphic. + This setting is supposed to be saved, see https://bugs.documentfoundation.org/show_bug.cgi?id=158305 Point reduction
core.git: offapi/com officecfg/registry qadevOOo/tests sw/inc sw/source test/source
offapi/com/sun/star/text/PrintSettings.idl |4
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 -
qadevOOo/tests/java/ifc/text/_PrintSettings.java | 13 ++
sw/inc/printdata.hxx |6 -
sw/source/core/view/printdata.cxx |1
sw/source/filter/xml/xmlimp.cxx|1
sw/source/ui/config/optpage.cxx|1
sw/source/uibase/config/prtopt.cxx | 59 ++---
sw/source/uibase/uno/unomod.cxx|4
sw/source/uibase/uno/unotxdoc.cxx |1
test/source/text/textprintersettings.cxx |1
11 files changed, 48 insertions(+), 51 deletions(-)
New commits:
commit 6dbc5e2bf4bd24c53ae3b906a5f74fb7ceed6ab9
Author: Samuel Mehrbrodt
AuthorDate: Thu Dec 14 14:13:07 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Dec 18 13:21:55 2023 +0100
[API CHANGE] tdf#158041 Remove unused reverse printing option from sw
Change-Id: I8b4597dbafc78e881fe556de8ce8221e50a673bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160777
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/offapi/com/sun/star/text/PrintSettings.idl
b/offapi/com/sun/star/text/PrintSettings.idl
index f43fc899f299..e1596fe16290 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -56,6 +56,10 @@ published service PrintSettings
[property] boolean PrintControls;
/** determines if the pages are printed in the reverse order, starting
with the last page.
+ *
+ * @deprecated since 24.8.
+ *
+ * The functionality behind this property is removed. Use
com::sun::star::view::PrintSettings::PrintReversed instead.
*/
[property] boolean PrintReversed;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index b6a26e4bf11f..4e7e4e92ebd4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1823,14 +1823,6 @@
true
-
-
-
-Reverses the printing order.
-Reversed
-
- false
-
diff --git a/qadevOOo/tests/java/ifc/text/_PrintSettings.java
b/qadevOOo/tests/java/ifc/text/_PrintSettings.java
index 9cbf1fdb53d2..55da07d2ab8d 100644
--- a/qadevOOo/tests/java/ifc/text/_PrintSettings.java
+++ b/qadevOOo/tests/java/ifc/text/_PrintSettings.java
@@ -55,5 +55,18 @@ public class _PrintSettings extends MultiPropertyTest {
}) ;
}
+/**
+* This property returns always false.
+*/
+public void _PrintReversed() {
+testProperty("PrintReversed", new PropertyTester() {
+@Override
+protected Object getNewValue(String p, Object old) {
+return Boolean.FALSE;
+}
+}) ;
+}
+
+
}
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 7dcdbdbb964a..cd330d802796 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -59,7 +59,7 @@ public:
m_bPrintBlackFont,
//#i81434# - printing of hidden text
m_bPrintHiddenText, m_bPrintTextPlaceholder,
- m_bPrintLeftPages, m_bPrintRightPages, m_bPrintReverse,
m_bPrintProspect,
+ m_bPrintLeftPages, m_bPrintRightPages, m_bPrintProspect,
m_bPrintProspectRTL,
m_bPaperFromSetup,
/// Print empty pages
@@ -80,7 +80,6 @@ public:
m_bPrintEmptyPages= true;
m_bPaperFromSetup =
-m_bPrintReverse =
m_bPrintProspect =
m_bPrintProspectRTL =
m_bPrintBlackFont =
@@ -106,7 +105,6 @@ public:
m_bPrintBlackFont == rData.m_bPrintBlackFont &&
m_bPrintLeftPages == rData.m_bPrintLeftPages &&
m_bPrintRightPages== rData.m_bPrintRightPages &&
-m_bPrintReverse == rData.m_bPrintReverse&&
m_bPrintProspect == rData.m_bPrintProspect &&
m_bPrintProspectRTL == rData.m_bPrintProspectRTL&&
m_bPaperFromSetup == rData.m_bPaperFromSetup &&
@@ -126,7 +124,6 @@ public:
bool IsPrintControl() const { return m_bPrintControl; }
bool IsPrintLeftPage() const{ return m_bPrintLeftPages; }
bool IsPrintRightPage() const { return m_bPrintRightPages; }
-bool IsPrintReverse() const { return m_bPrintReverse; }
bool IsPaperFromSetup() const { return m_bPaperFromSetup; }
bool IsPrintEm
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 41 --- 1 file changed, 41 deletions(-) New commits: commit cbc6bb9fdaf4acc815b9f11fba73c33d25a81e8f Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 08:42:04 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 10:41:30 2023 +0100 [API CHANGE] Remove unused CrossFading group Change-Id: I88869154b025a1eebb7b1bcf03decc4db02a3f24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160895 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs index 7fdbf9f05801..290d8148bd1a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs @@ -336,47 +336,6 @@ false - - - Contains a specification of how to morph between objects (e.g. how many steps and whether to regard the object's attributes). - - - - -Specifies the number of intermediate morphing steps between two objects. -Steps - - - - -Specifies that there has to be at least one morphing step. - - - - -Specifies that there may be at least this many morphing steps. - - - - 16 - - - - -Indicates whether two objects to be morphed shall have the same orientation. -Orientation - - true - - - - -Indicates whether to consider objects' attributes (e.g. colors) when morphing one object into another. -Attributes - - true - -
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs |6 -- 1 file changed, 6 deletions(-) New commits: commit a13d138b8fd7d341a231b02efb76d8ad96d4b44f Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 08:48:56 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 10:26:57 2023 +0100 [API CHANGE] Remove unused ShowAlienFilterWarning Change-Id: I36efe1d33cda83b6d063b30d9009aa79a3960ef3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160896 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs index 7fd9dddccf73..31682a7b3960 100644 --- a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs @@ -138,12 +138,6 @@ com.sun.star.comp.office.FrameLoader - - - Displays a warning when a user tries to set a third-party filter as the default filter in "Tools - Options". - -true -
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 1 file changed, 8 deletions(-) New commits: commit 4e53ccfba168aa0f234121905b1b988695d55bce Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 08:35:19 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 10:26:40 2023 +0100 [API CHANGE] Remove unused PaintBuffer_Writer Change-Id: I3047de8576bc85b6852568343d0239738b189552 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160892 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 27e7eba04007..b39f4f720216 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -820,14 +820,6 @@ true - - - Similar to PaintBuffer, but only for Writer Application. - PaintBuffer is the global switch. - Writer Repaint is allowed to use Pre-Rendering Buffer - -true - Similar to PaintBuffer, but only for Draw/Impress Applications.
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu |5 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs | 12 -- 2 files changed, 17 deletions(-) New commits: commit bf817a071fab8c70f601745c5996618d65185df4 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 08:54:05 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 10:11:05 2023 +0100 [API CHANGE] Remove unused EvolutionPreferences Change-Id: I71ab84f945576753a27b6a3df375c736fd8815d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160897 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu index 41a64f0f0e43..251fa6ac3577 100644 --- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu +++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu @@ -429,11 +429,6 @@ - - - file:///usr/share/evolution/*/evolution-addressbook-export - - given_name diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs index db6dc122984f..5e9558dd5ac3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs @@ -315,18 +315,6 @@ Specifies the driver settings for the evolution database driver. - - -Specifies the evolution preferences. - - - - Specifies the evolution full path exporting command name. - - - - - Specifies the column alias names used.
core.git: offapi/com officecfg/registry sw/inc sw/source test/source
offapi/com/sun/star/text/PrintSettings.idl |2
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 --
sw/inc/printdata.hxx |7 -
sw/source/core/doc/notxtfrm.cxx|2
sw/source/core/inc/cellfrm.hxx |3
sw/source/core/inc/flyfrm.hxx |3
sw/source/core/inc/frame.hxx |3
sw/source/core/inc/layfrm.hxx |3
sw/source/core/inc/notxtfrm.hxx|3
sw/source/core/inc/rootfrm.hxx |3
sw/source/core/inc/tabfrm.hxx |3
sw/source/core/inc/txtfrm.hxx |3
sw/source/core/inc/viewimp.hxx |1
sw/source/core/layout/paintfrm.cxx | 20 ++---
sw/source/core/layout/unusedf.cxx |2
sw/source/core/text/frmpaint.cxx |2
sw/source/core/view/printdata.cxx | 13 ---
sw/source/core/view/vdraw.cxx |7 -
sw/source/core/view/vprint.cxx |4 -
sw/source/filter/xml/xmlimp.cxx|1
sw/source/ui/config/optpage.cxx|3
sw/source/uibase/config/prtopt.cxx | 46 -
sw/source/uibase/uno/unomod.cxx|4 -
sw/source/uibase/uno/unotxdoc.cxx |1
test/source/text/textprintersettings.cxx |1
25 files changed, 45 insertions(+), 103 deletions(-)
New commits:
commit 6cdf523f179f3e7ed94267502a5fe3d1247398cc
Author: Samuel Mehrbrodt
AuthorDate: Thu Dec 14 12:36:46 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Dec 18 09:35:29 2023 +0100
[API CHANGE] tdf#158041 Remove unused drawing printing option from sw
Change-Id: I95f81f166ab9d75622c83672101925894b2f2e7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160774
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/offapi/com/sun/star/text/PrintSettings.idl
b/offapi/com/sun/star/text/PrintSettings.idl
index 4050d82877a2..f43fc899f299 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -38,6 +38,8 @@ published service PrintSettings
[property] boolean PrintTables;
/** determines if shapes are printed.
+ *
+ * @deprecated since 24.8. Use PrintGraphics instead.
*/
[property] boolean PrintDrawings;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index eeb00060c54d..b6a26e4bf11f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1728,14 +1728,6 @@
true
-
-
-
-Specifies whether drawings are printed.
-Drawings
-
- true
-
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index b6be2951f611..7dcdbdbb964a 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -55,7 +55,7 @@ class SwPrintData
public:
-bool m_bPrintGraphic, m_bPrintDraw, m_bPrintControl,
m_bPrintPageBackground,
+bool m_bPrintGraphic, m_bPrintControl, m_bPrintPageBackground,
m_bPrintBlackFont,
//#i81434# - printing of hidden text
m_bPrintHiddenText, m_bPrintTextPlaceholder,
@@ -73,7 +73,6 @@ public:
m_pRenderData= nullptr;
m_bPrintGraphic =
-m_bPrintDraw =
m_bPrintControl =
m_bPrintLeftPages =
m_bPrintRightPages=
@@ -102,7 +101,6 @@ public:
{
return
m_bPrintGraphic == rData.m_bPrintGraphic&&
-m_bPrintDraw == rData.m_bPrintDraw &&
m_bPrintControl == rData.m_bPrintControl&&
m_bPrintPageBackground== rData.m_bPrintPageBackground &&
m_bPrintBlackFont == rData.m_bPrintBlackFont &&
@@ -125,7 +123,6 @@ public:
void SetRenderData( const SwRenderData *pData ){
m_pRenderData = pData; }
bool IsPrintGraphic() const { return m_bPrintGraphic; }
-bool IsPrintDraw() const{ return m_bPrintDraw; }
bool IsPrintControl() const { return m_bPrintControl; }
bool IsPrintLeftPage() const{ return m_bPrintLeftPages; }
bool IsPrintRightPage() const { return m_bPrintRightPages; }
@@ -142,7 +139,6 @@ public:
bool IsP
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 1 file changed, 8 deletions(-) New commits: commit a3a9ae3f564be4dd6549fe5708a593ea09d1e79c Author: Samuel Mehrbrodt AuthorDate: Mon Dec 18 08:16:35 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 09:26:08 2023 +0100 [API CHANGE] Remove unused ApplyBulletsAfterSpace Change-Id: I40e8361f31f834383fdc1762f58137c5326adaa5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160890 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 35d8b609e6c1..eeb00060c54d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -4116,14 +4116,6 @@ Delete Blanks and Tabs between lineend and -begin true - - - - - Specifies whether a numbered or bulleted text is created automatically while typing * or - and then space - Bulleted and numbered lists immediate after pressing space - -false
core.git: offapi/com officecfg/registry qadevOOo/tests sw/inc sw/source test/source
offapi/com/sun/star/text/PrintSettings.idl |4
offapi/com/sun/star/view/PrintSettings.idl |4
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 -
qadevOOo/tests/java/ifc/text/_PrintSettings.java | 12 +
sw/inc/printdata.hxx |6
sw/source/core/view/printdata.cxx |1
sw/source/core/view/vprint.cxx |1
sw/source/filter/xml/xmlimp.cxx|1
sw/source/ui/config/optpage.cxx|1
sw/source/uibase/config/prtopt.cxx | 95 ++---
sw/source/uibase/uno/unomod.cxx|4
sw/source/uibase/uno/unotxdoc.cxx |1
test/source/text/textprintersettings.cxx |1
13 files changed, 69 insertions(+), 70 deletions(-)
New commits:
commit a0782355c212b8237a6bfa3ce1c5bb010bd4caba
Author: Samuel Mehrbrodt
AuthorDate: Thu Dec 14 11:52:56 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Dec 18 09:24:35 2023 +0100
[API CHANGE] tdf#158041 Remove unused table printing option from sw
"for now it was decided that tables should always be printed"
-> make this decision from 2015 permanent
Change-Id: Ica5958a74ec6766040ab59f2c91224b75df4d807
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160766
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/offapi/com/sun/star/text/PrintSettings.idl
b/offapi/com/sun/star/text/PrintSettings.idl
index e7bd26bf3ad2..4050d82877a2 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -30,6 +30,10 @@ published service PrintSettings
[property] boolean PrintGraphics;
/** determines if text tables are printed.
+ *
+ * @deprecated since 24.8.
+ *
+ * The functionality behind this property is removed.
*/
[property] boolean PrintTables;
diff --git a/offapi/com/sun/star/view/PrintSettings.idl
b/offapi/com/sun/star/view/PrintSettings.idl
index 093480523d18..3c5976bf3b71 100644
--- a/offapi/com/sun/star/view/PrintSettings.idl
+++ b/offapi/com/sun/star/view/PrintSettings.idl
@@ -56,6 +56,10 @@ published service PrintSettings
[property] boolean PrintRightPages;
/** If `TRUE`, tables are included in printing.
+ *
+ * @deprecated since 24.8.
+ *
+ * The functionality behind this property is removed.
*/
[property] boolean PrintTables;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index b014281aed9d..35d8b609e6c1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1728,14 +1728,6 @@
true
-
-
-
-Specifies whether tables are printed.
-Tables
-
- true
-
diff --git a/qadevOOo/tests/java/ifc/text/_PrintSettings.java
b/qadevOOo/tests/java/ifc/text/_PrintSettings.java
index a1736adab835..9cbf1fdb53d2 100644
--- a/qadevOOo/tests/java/ifc/text/_PrintSettings.java
+++ b/qadevOOo/tests/java/ifc/text/_PrintSettings.java
@@ -43,5 +43,17 @@ import lib.MultiPropertyTest;
*/
public class _PrintSettings extends MultiPropertyTest {
+/**
+* This property returns always true.
+*/
+public void _PrintTables() {
+testProperty("PrintTables", new PropertyTester() {
+@Override
+protected Object getNewValue(String p, Object old) {
+return Boolean.TRUE;
+}
+}) ;
+}
+
}
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 3063b4eb0d07..b6be2951f611 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -55,7 +55,7 @@ class SwPrintData
public:
-bool m_bPrintGraphic, m_bPrintTable, m_bPrintDraw, m_bPrintControl,
m_bPrintPageBackground,
+bool m_bPrintGraphic, m_bPrintDraw, m_bPrintControl,
m_bPrintPageBackground,
m_bPrintBlackFont,
//#i81434# - printing of hidden text
m_bPrintHiddenText, m_bPrintTextPlaceholder,
@@ -73,7 +73,6 @@ public:
m_pRenderData= nullptr;
m_bPrintGraphic =
-m_bPrintTable =
m_bPrintDraw =
m_bPrintControl =
m_bPrintLeftPages =
@@ -103,7 +102,6 @@ public:
{
return
m_bPrintGraphic == rData.m_bPrintGraphic&&
-m_bPrintTable == rData.m_bPrintTable &&
m_bPrintDraw == rData.m_bPrintDraw &&
m_bPrintControl == rData.m_bPrintCo
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 'libreoffice-24-2' - uui/inc uui/source
uui/inc/strings.hrc |1 +
uui/source/secmacrowarnings.cxx | 16 +---
uui/source/secmacrowarnings.hxx |1 +
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit db8d97a1906870f8b83415ef8335822da0179a64
Author: Samuel Mehrbrodt
AuthorDate: Thu Dec 14 08:30:15 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 14 16:12:45 2023 +0100
tdf#158576 Explain why OK btn is disabled
User needs to view (verify) the cert first
Change-Id: I52ce64678abc3b9f95a384e4082eaee1abf0549a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160755
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index db6c83e777fb..6a26f10ac69b 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -79,5 +79,6 @@
#define STR_RELOADEDITABLE_MSG NC_("STR_RELOADEDITABLE_MSG",
"Document file '$(ARG1)' is now editable \n\nReload this document for editing?")
#define STR_RELOADEDITABLE_BTN NC_("STR_RELOADEDITABLE_BTN",
"~Reload")
#define STR_LOADREADONLY_MSGNC_("STR_LOADREADONLY_MSG",
"The author would like you to open '$(ARG1)' as read-only unless you need to
make changes. Open as read-only?")
+#define STR_VERIFIY_CERTNC_("STR_VERIFIY_CERT", "You
need to view the certificate first.")
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index eb93c9d13815..f1cddb11cb9f 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -26,11 +26,14 @@
#include
#include
#include
+#include
#include
#include
#include "secmacrowarnings.hxx"
+#include
+
using namespace ::com::sun::star::security;
using namespace ::com::sun::star;
@@ -116,7 +119,7 @@ IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl,
weld::Button&, void)
return;
mxAlwaysTrustCB->set_sensitive(true);
-mxEnableBtn->set_sensitive(true);
+EnableOkBtn(true);
}
IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, weld::Button&, void)
@@ -148,7 +151,7 @@ IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, weld::Button&,
void)
IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::Toggleable&, void)
{
const bool bEnable = (mnActSecLevel < 3 || mxAlwaysTrustCB->get_active());
-mxEnableBtn->set_sensitive(bEnable);
+EnableOkBtn(bEnable);
mxDisableBtn->set_sensitive(!mxAlwaysTrustCB->get_active());
}
@@ -166,7 +169,7 @@ void MacroWarning::InitControls()
mnActSecLevel = SvtSecurityOptions::GetMacroSecurityLevel();
if ( mnActSecLevel >= 2 )
-mxEnableBtn->set_sensitive(false);
+EnableOkBtn(false);
}
else
{
@@ -174,6 +177,13 @@ void MacroWarning::InitControls()
}
}
+void MacroWarning::EnableOkBtn(bool bEnable)
+{
+mxEnableBtn->set_sensitive(bEnable);
+std::locale aResLocale(Translate::Create("uui"));
+mxEnableBtn->set_tooltip_text(bEnable ? "" :
Translate::get(STR_VERIFIY_CERT, aResLocale));
+}
+
void MacroWarning::SetStorage( const css::uno::Reference <
css::embed::XStorage >& rxStore,
const OUString& aODFVersion,
const css::uno::Sequence<
security::DocumentSignatureInformation >& rInfos )
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 80f1fb76599e..463ccf1d9091 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -55,6 +55,7 @@ private:
DECL_STATIC_LINK(MacroWarning, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*);
voidInitControls();
+void EnableOkBtn(bool bEnable);
public:
MacroWarning(weld::Window* pParent, bool _bShowSignatures);
core.git: Branch 'libreoffice-24-2' - uui/source uui/uiconfig
uui/source/secmacrowarnings.cxx| 13 +
uui/source/secmacrowarnings.hxx|1 +
uui/uiconfig/ui/macrowarnmedium.ui | 19 ++-
3 files changed, 28 insertions(+), 5 deletions(-)
New commits:
commit 7bf02b035033c87ebd61742dbd3f71da0229114f
Author: Samuel Mehrbrodt
AuthorDate: Mon Dec 11 14:11:42 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 14 16:12:26 2023 +0100
tdf#158576 This button shows a certificate when only one signature found
"Show signatures" should only be shown when there are multiple signatures,
otherwise the button label must be "Show certificate"
Change-Id: Iaed2d10b8e94bf6decad937dafef4795b7ed40dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160596
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit a383794fba07cb6a356274febd55968fb25f77e4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160754
Reviewed-by: Thorsten Behrens
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 6ccf48ba4945..eb93c9d13815 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -68,6 +68,7 @@ MacroWarning::MacroWarning(weld::Window* pParent, bool
_bWithSignatures)
, mxNotYetValid(m_xBuilder->weld_label("certNotYetValidLabel"))
, mxNoLongerValid(m_xBuilder->weld_label("certNoLongerValidLabel"))
, mxViewSignsBtn(m_xBuilder->weld_button("viewSignsButton"))
+, mxViewCertBtn(m_xBuilder->weld_button("viewCertButton"))
, mxAlwaysTrustCB(m_xBuilder->weld_check_button("alwaysTrustCheckbutton"))
, mxEnableBtn(m_xBuilder->weld_button("ok"))
, mxDisableBtn(m_xBuilder->weld_button("cancel"))
@@ -156,10 +157,12 @@ void MacroWarning::InitControls()
// show signature controls?
if (mbShowSignatures)
{
+mxAlwaysTrustCB->connect_toggled(LINK(this, MacroWarning,
AlwaysTrustCheckHdl));
mxAlwaysTrustCB->set_sensitive(false);
mxViewSignsBtn->connect_clicked(LINK(this, MacroWarning,
ViewSignsBtnHdl));
-mxViewSignsBtn->set_sensitive(false);
-mxAlwaysTrustCB->connect_toggled(LINK(this, MacroWarning,
AlwaysTrustCheckHdl));
+mxViewSignsBtn->set_visible(false);
+mxViewCertBtn->connect_clicked(LINK(this, MacroWarning,
ViewSignsBtnHdl));
+mxViewCertBtn->set_visible(false);
mnActSecLevel = SvtSecurityOptions::GetMacroSecurityLevel();
if ( mnActSecLevel >= 2 )
@@ -192,7 +195,8 @@ void MacroWarning::SetStorage( const css::uno::Reference <
css::embed::XStorage
}
mxSignsFI->set_label(s.makeStringAndClear());
-mxViewSignsBtn->set_sensitive(true);
+mxViewSignsBtn->set_visible(true);
+mxViewCertBtn->set_visible(false);
}
void MacroWarning::SetCertificate( const css::uno::Reference<
css::security::XCertificate >& _rxCert )
@@ -210,7 +214,8 @@ void MacroWarning::SetCertificate( const
css::uno::Reference< css::security::XCe
utl::typeConvert( mxCert->getNotValidAfter(), aDateTimeEnd );
mxNotYetValid->set_visible(now < aDateTimeStart);
mxNoLongerValid->set_visible(now > aDateTimeEnd);
-mxViewSignsBtn->set_sensitive(true);
+mxViewSignsBtn->set_visible(false);
+mxViewCertBtn->set_visible(true);
}
}
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 1a6e7f0b7380..80f1fb76599e 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -35,6 +35,7 @@ private:
std::unique_ptr mxNotYetValid;
std::unique_ptr mxNoLongerValid;
std::unique_ptr mxViewSignsBtn;
+std::unique_ptr mxViewCertBtn;
std::unique_ptr mxAlwaysTrustCB;
std::unique_ptr mxEnableBtn;
std::unique_ptr mxDisableBtn;
diff --git a/uui/uiconfig/ui/macrowarnmedium.ui
b/uui/uiconfig/ui/macrowarnmedium.ui
index 810fbbb6d12b..4d7a416e83e9 100644
--- a/uui/uiconfig/ui/macrowarnmedium.ui
+++ b/uui/uiconfig/ui/macrowarnmedium.ui
@@ -125,7 +125,7 @@ Macros may contain viruses. Disabling macros for a document
is always safe. If y
-_View Signatures…
+_Show Signatures…
True
True
True
@@ -140,6 +140,23 @@ Macros may contain viruses. Disabling macros for a
document is always safe. If y
1
+
+
+_Show Certificate…
+True
+True
+True
+end
+start
+True
+True
+
+
+False
+True
+2
+
+
0
core.git: Branch 'libreoffice-24-2' - uui/source
uui/source/secmacrowarnings.cxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 9e7eddb07f6bed1ddf6054725fb45458c9d1ee6f Author: Samuel Mehrbrodt AuthorDate: Mon Dec 11 12:47:07 2023 +0100 Commit: Thorsten Behrens CommitDate: Thu Dec 14 16:12:04 2023 +0100 This dialog is no longer called when MacroTrustedAuthors is readonly Change-Id: I73bc43cf57f6a1ed3613f2cf30e469ce6d841248 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160591 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit 4a859b3d2ffa4f427cd24bc4aacdc055d4c7826e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160753 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index d7a5b257b341..6ccf48ba4945 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -159,11 +159,7 @@ void MacroWarning::InitControls() mxAlwaysTrustCB->set_sensitive(false); mxViewSignsBtn->connect_clicked(LINK(this, MacroWarning, ViewSignsBtnHdl)); mxViewSignsBtn->set_sensitive(false); - -if (!SvtSecurityOptions::IsReadOnly(SvtSecurityOptions::EOption::MacroTrustedAuthors)) -mxAlwaysTrustCB->connect_toggled(LINK(this, MacroWarning, AlwaysTrustCheckHdl)); -else -mxAlwaysTrustCB->set_visible(false); +mxAlwaysTrustCB->connect_toggled(LINK(this, MacroWarning, AlwaysTrustCheckHdl)); mnActSecLevel = SvtSecurityOptions::GetMacroSecurityLevel(); if ( mnActSecLevel >= 2 )
core.git: Branch 'libreoffice-24-2' - uui/source
uui/source/secmacrowarnings.cxx | 29 ++---
1 file changed, 14 insertions(+), 15 deletions(-)
New commits:
commit a75a17219d95b6180a03d02a526234ef461c9172
Author: Samuel Mehrbrodt
AuthorDate: Mon Dec 11 15:06:54 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 14 16:11:42 2023 +0100
tdf#158576 Allow trusting certificates only once
Macro mode "high" says that only signed macros from trusted sources can be
run.
When opening a document with a signed macro from an untrusted certificate,
the user can either disable macros, or add the certificate to the list of
trusted sources permanently and enable macros.
This adds the possibility to trust the certificate only for the current
document
in the given scenario.
Change-Id: Idf272498d930afc8a3f8be7f30889b77bf402d52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160598
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 37b381e2877c60c84547b22117663a72ab02fadc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160752
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 7e62c8556a66..d7a5b257b341 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -103,20 +103,19 @@ IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl,
weld::Button&, void)
uno::Reference< security::XDocumentDigitalSignatures > xD(
security::DocumentDigitalSignatures::createWithVersion(comphelper::getProcessComponentContext(),
maODFVersion));
-if( xD.is() )
-{
-xD->setParentWindow(m_xDialog->GetXWindow());
-if( mxCert.is() )
-{
-xD->showCertificate( mxCert );
-mxAlwaysTrustCB->set_sensitive(true);
-}
-else if( mxStore.is() )
-{
-xD->showScriptingContentSignatures( mxStore, uno::Reference<
io::XInputStream >() );
-mxAlwaysTrustCB->set_sensitive(true);
-}
-}
+if( !xD.is() )
+return;
+
+xD->setParentWindow(m_xDialog->GetXWindow());
+if( mxCert.is() )
+xD->showCertificate( mxCert );
+else if( mxStore.is() )
+xD->showScriptingContentSignatures( mxStore, uno::Reference<
io::XInputStream >() );
+else
+return;
+
+mxAlwaysTrustCB->set_sensitive(true);
+mxEnableBtn->set_sensitive(true);
}
IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, weld::Button&, void)
@@ -147,7 +146,7 @@ IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, weld::Button&,
void)
IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::Toggleable&, void)
{
-const bool bEnable = (mnActSecLevel < 2 || mxAlwaysTrustCB->get_active());
+const bool bEnable = (mnActSecLevel < 3 || mxAlwaysTrustCB->get_active());
mxEnableBtn->set_sensitive(bEnable);
mxDisableBtn->set_sensitive(!mxAlwaysTrustCB->get_active());
}
core.git: Branch 'libreoffice-24-2' - solenv/sanitizers uui/source uui/uiconfig
solenv/sanitizers/ui/uui.suppr |2 ++
uui/source/secmacrowarnings.cxx| 12
uui/source/secmacrowarnings.hxx|2 ++
uui/uiconfig/ui/macrowarnmedium.ui | 28 ++--
4 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 9b56334615d9cdb42542aba746caaa8985566001
Author: Samuel Mehrbrodt
AuthorDate: Mon Dec 11 11:00:44 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 14 16:10:38 2023 +0100
tdf#158576 Show warning when cert is not yet/no longer valid
Change-Id: I4f517a5e2b33d508d1a501323c4d97dc025edfbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160566
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 69814fc26fe21a258cf32fca021945f5bc69f59c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160751
Reviewed-by: Thorsten Behrens
diff --git a/solenv/sanitizers/ui/uui.suppr b/solenv/sanitizers/ui/uui.suppr
index 96d00fc94920..3c7ab206bbe2 100644
--- a/solenv/sanitizers/ui/uui.suppr
+++ b/solenv/sanitizers/ui/uui.suppr
@@ -12,6 +12,8 @@ uui/uiconfig/ui/logindialog.ui://GtkLabel[@id='requestinfo']
orphan-label
uui/uiconfig/ui/logindialog.ui://GtkLabel[@id='errorinfo'] orphan-label
uui/uiconfig/ui/macrowarnmedium.ui://GtkLabel[@id='descr1Label'] orphan-label
uui/uiconfig/ui/macrowarnmedium.ui://GtkLabel[@id='signsLabel'] orphan-label
+uui/uiconfig/ui/macrowarnmedium.ui://GtkLabel[@id='certNotYetValidLabel']
orphan-label
+uui/uiconfig/ui/macrowarnmedium.ui://GtkLabel[@id='certNoLongerValidLabel']
orphan-label
uui/uiconfig/ui/setmasterpassworddlg.ui://GtkLabel[@id='label1'] orphan-label
uui/uiconfig/ui/setmasterpassworddlg.ui://GtkLabel[@id='label4'] orphan-label
uui/uiconfig/ui/simplenameclash.ui://GtkLabel[@id='warning'] orphan-label
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 6b4102632755..7e62c8556a66 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -23,7 +23,9 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
@@ -63,6 +65,8 @@ MacroWarning::MacroWarning(weld::Window* pParent, bool
_bWithSignatures)
: MessageDialogController(pParent, "uui/ui/macrowarnmedium.ui",
"MacroWarnMedium", "grid")
, mxGrid(m_xBuilder->weld_widget("grid"))
, mxSignsFI(m_xBuilder->weld_label("signsLabel"))
+, mxNotYetValid(m_xBuilder->weld_label("certNotYetValidLabel"))
+, mxNoLongerValid(m_xBuilder->weld_label("certNoLongerValidLabel"))
, mxViewSignsBtn(m_xBuilder->weld_button("viewSignsButton"))
, mxAlwaysTrustCB(m_xBuilder->weld_check_button("alwaysTrustCheckbutton"))
, mxEnableBtn(m_xBuilder->weld_button("ok"))
@@ -203,6 +207,14 @@ void MacroWarning::SetCertificate( const
css::uno::Reference< css::security::XCe
{
OUString s( GetContentPart( mxCert->getSubjectName(), u"CN" ) );
mxSignsFI->set_label(s);
+
+::DateTime now( ::DateTime::SYSTEM );
+DateTime aDateTimeStart( DateTime::EMPTY );
+DateTime aDateTimeEnd( DateTime::EMPTY );
+utl::typeConvert( mxCert->getNotValidBefore(), aDateTimeStart );
+utl::typeConvert( mxCert->getNotValidAfter(), aDateTimeEnd );
+mxNotYetValid->set_visible(now < aDateTimeStart);
+mxNoLongerValid->set_visible(now > aDateTimeEnd);
mxViewSignsBtn->set_sensitive(true);
}
}
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 300a5477bea5..1a6e7f0b7380 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -32,6 +32,8 @@ class MacroWarning : public weld::MessageDialogController
private:
std::unique_ptr mxGrid;
std::unique_ptr mxSignsFI;
+std::unique_ptr mxNotYetValid;
+std::unique_ptr mxNoLongerValid;
std::unique_ptr mxViewSignsBtn;
std::unique_ptr mxAlwaysTrustCB;
std::unique_ptr mxEnableBtn;
diff --git a/uui/uiconfig/ui/macrowarnmedium.ui
b/uui/uiconfig/ui/macrowarnmedium.ui
index d3a00f7a0d0a..810fbbb6d12b 100644
--- a/uui/uiconfig/ui/macrowarnmedium.ui
+++ b/uui/uiconfig/ui/macrowarnmedium.ui
@@ -75,7 +75,7 @@ Macros may contain viruses. Disabling macros for a document
is always safe. If y
-
+
True
False
@@ -104,7 +104,7 @@ Macros may contain viruses. Disabling macros for a document
is always safe. If y
0
-2
+4
@@ -146,6 +146,30 @@ Macros may contain viruses. Disabling macros for a
document is always safe. If y
1
+
+
+Fal
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/mailmerge.ui | 383 +--- 1 file changed, 190 insertions(+), 193 deletions(-) New commits: commit 2486eaf671f38ada76c500116ee061e9d8240f4d Author: Samuel Mehrbrodt AuthorDate: Thu Dec 14 11:29:39 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Dec 14 16:06:02 2023 +0100 Save with newer Glade Change-Id: Id506e00f737b72f40448aacb6c23e64c09a0670d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160763 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui index 58b3fb7b8b89..f81e6f052d9a 100644 --- a/sw/uiconfig/swriter/ui/mailmerge.ui +++ b/sw/uiconfig/swriter/ui/mailmerge.ui @@ -1,40 +1,40 @@ - + 1 -1 +1 1 -1 +1 -False -5 +False +5 Mail Merge True -0 -0 -dialog +0 +0 +dialog -False +False vertical 12 -False -end +False +end _OK True -True -True -True -True +True +True +True +True True @@ -47,8 +47,8 @@ _Cancel True -True -True +True +True True @@ -61,8 +61,8 @@ _Help True -True -True +True +True True @@ -76,23 +76,23 @@ False True -end +end 0 True -False +False True True vertical 6 -150 +150 True -False +False True True @@ -105,36 +105,36 @@ True -False +False True True 12 True -False +False True True -0 -none +0 +none True -False +False start -vertical -6 12 6 +vertical +6 _All True -True -False -True +True +False +True True -True +True Processes all the records from the database. @@ -151,10 +151,10 @@ _Selected records True -True -False -True -True +True +False +True +True all @@ -171,16 +171,16 @@ True -False +False 12 _From: True -True -False -True -True +True +False +True +True all
core.git: Branch 'libreoffice-24-2' - uui/uiconfig
uui/uiconfig/ui/macrowarnmedium.ui | 79 + 1 file changed, 38 insertions(+), 41 deletions(-) New commits: commit 571cf8617866a541de8ac564827bc73847c2e8d8 Author: Samuel Mehrbrodt AuthorDate: Mon Dec 11 10:57:03 2023 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Dec 14 13:48:55 2023 +0100 macrowarnmedium: Save with newer Glade Change-Id: Ida8f4be081fb3b695a6c87354b2862ec103bd432 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160565 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit 53c21bbea05fbd36bf605414350a554753cdfa17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160750 Reviewed-by: Adolfo Jayme Barrientos diff --git a/uui/uiconfig/ui/macrowarnmedium.ui b/uui/uiconfig/ui/macrowarnmedium.ui index 83694b549fc1..d3a00f7a0d0a 100644 --- a/uui/uiconfig/ui/macrowarnmedium.ui +++ b/uui/uiconfig/ui/macrowarnmedium.ui @@ -1,36 +1,36 @@ - + -False +False %PRODUCTNAME - Security Warning True -0 -0 -dialog -warning -The document contains document macros. +0 +0 +dialog +warning +The document contains document macros. Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros. -False +False vertical 2 -False +False True _Disable Macros True -True -True -True -True -True +True +True +True +True +True False @@ -42,9 +42,9 @@ Macros may contain viruses. Disabling macros for a document is always safe. If y _Enable Macros True -True -True -True +True +True +True False @@ -56,8 +56,8 @@ Macros may contain viruses. Disabling macros for a document is always safe. If y _Help True -True -True +True +True True @@ -75,47 +75,47 @@ Macros may contain viruses. Disabling macros for a document is always safe. If y - + True -False -6 +False +6 True -False +False start True The document contains document macros signed by: -0 -0 +0 +0 _Always trust macros from this source True -True -False -True -True +True +False +True +True -0 -2 +0 +2 True -False +False 12 True -False +False False @@ -127,12 +127,12 @@ Macros may contain viruses. Disabling macros for a document is always safe. If y _View Signatures… True -True -True +True +True end start True -True +True False @@ -142,8 +142,8 @@ Macros may contain viruses. Disabling macros for a document is always safe. If y -0 -1 +0 +1 @@ -159,8 +159,5 @@ Macros may contain viruses. Disabling macros for a document is always safe. If y cancel help - - -
core.git: uui/inc uui/source
uui/inc/strings.hrc |1 +
uui/source/secmacrowarnings.cxx | 16 +---
uui/source/secmacrowarnings.hxx |1 +
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 2ee0500b6033e7dbfef221e28042f23da361869e
Author: Samuel Mehrbrodt
AuthorDate: Thu Dec 14 08:30:15 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Dec 14 12:15:06 2023 +0100
tdf#158576 Explain why OK btn is disabled
User needs to view (verify) the cert first
Change-Id: I52ce64678abc3b9f95a384e4082eaee1abf0549a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160747
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index db6c83e777fb..6a26f10ac69b 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -79,5 +79,6 @@
#define STR_RELOADEDITABLE_MSG NC_("STR_RELOADEDITABLE_MSG",
"Document file '$(ARG1)' is now editable \n\nReload this document for editing?")
#define STR_RELOADEDITABLE_BTN NC_("STR_RELOADEDITABLE_BTN",
"~Reload")
#define STR_LOADREADONLY_MSGNC_("STR_LOADREADONLY_MSG",
"The author would like you to open '$(ARG1)' as read-only unless you need to
make changes. Open as read-only?")
+#define STR_VERIFIY_CERTNC_("STR_VERIFIY_CERT", "You
need to view the certificate first.")
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index e526b6da8b99..a14f34cebd6f 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -27,11 +27,14 @@
#include
#include
#include
+#include
#include
#include
#include "secmacrowarnings.hxx"
+#include
+
using namespace ::com::sun::star::security;
using namespace ::com::sun::star;
using namespace comphelper;
@@ -91,7 +94,7 @@ IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl, weld::Button&,
void)
return;
mxAlwaysTrustCB->set_sensitive(true);
-mxEnableBtn->set_sensitive(true);
+EnableOkBtn(true);
}
IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, weld::Button&, void)
@@ -123,7 +126,7 @@ IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, weld::Button&,
void)
IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::Toggleable&, void)
{
const bool bEnable = (mnActSecLevel < 3 || mxAlwaysTrustCB->get_active());
-mxEnableBtn->set_sensitive(bEnable);
+EnableOkBtn(bEnable);
mxDisableBtn->set_sensitive(!mxAlwaysTrustCB->get_active());
}
@@ -141,7 +144,7 @@ void MacroWarning::InitControls()
mnActSecLevel = SvtSecurityOptions::GetMacroSecurityLevel();
if ( mnActSecLevel >= 2 )
-mxEnableBtn->set_sensitive(false);
+EnableOkBtn(false);
}
else
{
@@ -149,6 +152,13 @@ void MacroWarning::InitControls()
}
}
+void MacroWarning::EnableOkBtn(bool bEnable)
+{
+mxEnableBtn->set_sensitive(bEnable);
+std::locale aResLocale(Translate::Create("uui"));
+mxEnableBtn->set_tooltip_text(bEnable ? "" :
Translate::get(STR_VERIFIY_CERT, aResLocale));
+}
+
void MacroWarning::SetStorage( const css::uno::Reference <
css::embed::XStorage >& rxStore,
const OUString& aODFVersion,
const css::uno::Sequence<
security::DocumentSignatureInformation >& rInfos )
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 80f1fb76599e..463ccf1d9091 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -55,6 +55,7 @@ private:
DECL_STATIC_LINK(MacroWarning, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*);
voidInitControls();
+void EnableOkBtn(bool bEnable);
public:
MacroWarning(weld::Window* pParent, bool _bShowSignatures);
core.git: uui/source uui/uiconfig
uui/source/secmacrowarnings.cxx| 13 +
uui/source/secmacrowarnings.hxx|1 +
uui/uiconfig/ui/macrowarnmedium.ui | 19 ++-
3 files changed, 28 insertions(+), 5 deletions(-)
New commits:
commit a383794fba07cb6a356274febd55968fb25f77e4
Author: Samuel Mehrbrodt
AuthorDate: Mon Dec 11 14:11:42 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Dec 14 08:19:35 2023 +0100
tdf#158576 This button shows a certificate when only one signature found
"Show signatures" should only be shown when there are multiple signatures,
otherwise the button label must be "Show certificate"
Change-Id: Iaed2d10b8e94bf6decad937dafef4795b7ed40dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160596
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index e5e1a46fdb97..e526b6da8b99 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -43,6 +43,7 @@ MacroWarning::MacroWarning(weld::Window* pParent, bool
_bWithSignatures)
, mxNotYetValid(m_xBuilder->weld_label("certNotYetValidLabel"))
, mxNoLongerValid(m_xBuilder->weld_label("certNoLongerValidLabel"))
, mxViewSignsBtn(m_xBuilder->weld_button("viewSignsButton"))
+, mxViewCertBtn(m_xBuilder->weld_button("viewCertButton"))
, mxAlwaysTrustCB(m_xBuilder->weld_check_button("alwaysTrustCheckbutton"))
, mxEnableBtn(m_xBuilder->weld_button("ok"))
, mxDisableBtn(m_xBuilder->weld_button("cancel"))
@@ -131,10 +132,12 @@ void MacroWarning::InitControls()
// show signature controls?
if (mbShowSignatures)
{
+mxAlwaysTrustCB->connect_toggled(LINK(this, MacroWarning,
AlwaysTrustCheckHdl));
mxAlwaysTrustCB->set_sensitive(false);
mxViewSignsBtn->connect_clicked(LINK(this, MacroWarning,
ViewSignsBtnHdl));
-mxViewSignsBtn->set_sensitive(false);
-mxAlwaysTrustCB->connect_toggled(LINK(this, MacroWarning,
AlwaysTrustCheckHdl));
+mxViewSignsBtn->set_visible(false);
+mxViewCertBtn->connect_clicked(LINK(this, MacroWarning,
ViewSignsBtnHdl));
+mxViewCertBtn->set_visible(false);
mnActSecLevel = SvtSecurityOptions::GetMacroSecurityLevel();
if ( mnActSecLevel >= 2 )
@@ -168,7 +171,8 @@ void MacroWarning::SetStorage( const css::uno::Reference <
css::embed::XStorage
}
mxSignsFI->set_label(s.makeStringAndClear());
-mxViewSignsBtn->set_sensitive(true);
+mxViewSignsBtn->set_visible(true);
+mxViewCertBtn->set_visible(false);
}
void MacroWarning::SetCertificate( const css::uno::Reference<
css::security::XCertificate >& _rxCert )
@@ -186,7 +190,8 @@ void MacroWarning::SetCertificate( const
css::uno::Reference< css::security::XCe
utl::typeConvert( mxCert->getNotValidAfter(), aDateTimeEnd );
mxNotYetValid->set_visible(now < aDateTimeStart);
mxNoLongerValid->set_visible(now > aDateTimeEnd);
-mxViewSignsBtn->set_sensitive(true);
+mxViewSignsBtn->set_visible(false);
+mxViewCertBtn->set_visible(true);
}
}
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 1a6e7f0b7380..80f1fb76599e 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -35,6 +35,7 @@ private:
std::unique_ptr mxNotYetValid;
std::unique_ptr mxNoLongerValid;
std::unique_ptr mxViewSignsBtn;
+std::unique_ptr mxViewCertBtn;
std::unique_ptr mxAlwaysTrustCB;
std::unique_ptr mxEnableBtn;
std::unique_ptr mxDisableBtn;
diff --git a/uui/uiconfig/ui/macrowarnmedium.ui
b/uui/uiconfig/ui/macrowarnmedium.ui
index 810fbbb6d12b..4d7a416e83e9 100644
--- a/uui/uiconfig/ui/macrowarnmedium.ui
+++ b/uui/uiconfig/ui/macrowarnmedium.ui
@@ -125,7 +125,7 @@ Macros may contain viruses. Disabling macros for a document
is always safe. If y
-_View Signatures…
+_Show Signatures…
True
True
True
@@ -140,6 +140,23 @@ Macros may contain viruses. Disabling macros for a
document is always safe. If y
1
+
+
+_Show Certificate…
+True
+True
+True
+end
+start
+True
+True
+
+
+False
+True
+2
+
+
0
