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 IsPrintEmptyPages() const { return m_bPrintEmptyPages; }
bool IsP
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_bPrintControl&&
m_bPrintPageBackground== rData.m_b
