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 <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Dec 14 11:52:56 2023 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
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 <samuel.mehrbr...@allotropia.de>
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 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="Table" oor:type="xs:boolean" oor:nillable="false">
- <!-- UIHints: Tools - Options - Text document - Print - [Section]
Contents -->
- <info>
- <desc>Specifies whether tables are printed.</desc>
- <label>Tables</label>
- </info>
- <value>true</value>
- </prop>
<prop oor:name="Drawing" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options - Text document - Print - [Section]
Contents -->
<info>
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_bPrintPageBackground &&
@@ -127,7 +125,6 @@ public:
void SetRenderData( const SwRenderData *pData ) {
m_pRenderData = pData; }
bool IsPrintGraphic() const { return m_bPrintGraphic; }
- bool IsPrintTable() const { return m_bPrintTable; }
bool IsPrintDraw() const { return m_bPrintDraw; }
bool IsPrintControl() const { return m_bPrintControl; }
bool IsPrintLeftPage() const { return m_bPrintLeftPages; }
@@ -145,7 +142,6 @@ public:
bool IsPrintTextPlaceholder() const { return m_bPrintTextPlaceholder; }
void SetPrintGraphic( bool b ) { doSetModified();
m_bPrintGraphic = b; }
- void SetPrintTable( bool b ) { doSetModified();
m_bPrintTable = b; }
void SetPrintDraw( bool b ) { doSetModified();
m_bPrintDraw = b; }
void SetPrintControl( bool b ) { doSetModified();
m_bPrintControl = b; }
void SetPrintLeftPage( bool b ) { doSetModified();
m_bPrintLeftPages = b; }
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index a1e467e8895b..2dcbe0cdc44c 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -129,7 +129,6 @@ void SwRenderData::MakeSwPrtOptions(
// get print options to use from provided properties
rOptions.m_bPrintGraphic = pOpt->IsPrintGraphics();
- rOptions.m_bPrintTable = true; // for now it was decided that
tables should always be printed
rOptions.m_bPrintDraw = pOpt->IsPrintDrawings();
rOptions.m_bPrintControl = pOpt->IsPrintFormControls();
rOptions.m_bPrintLeftPages = pOpt->IsPrintLeftPages();
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index bc5dd5bd6c86..f97a39ee3861 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -651,7 +651,6 @@ SwDrawViewSave::~SwDrawViewSave()
void SwViewShell::PrepareForPrint( const SwPrintData &rOptions, bool
bIsPDFExport )
{
mpOpt->SetGraphic ( rOptions.m_bPrintGraphic );
- mpOpt->SetTable ( rOptions.m_bPrintTable );
mpOpt->SetDraw ( rOptions.m_bPrintDraw );
mpOpt->SetControl ( rOptions.m_bPrintControl );
mpOpt->SetPageBack ( rOptions.m_bPrintPageBackground );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 17d153910c8f..0fcef5daddac 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1258,7 +1258,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence
< PropertyValue > & aC
"PrintRightPages",
"PrintFaxName",
"PrintPaperFromSetup",
- "PrintTables",
"PrintTextPlaceholder",
"UpdateFromTemplate",
"PrinterIndependentLayout",
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 77ff2b43fbac..9a63d3f44358 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -541,7 +541,6 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet*
rCoreSet )
{
SwAddPrinterItem aAddPrinterAttr;
aAddPrinterAttr.m_bPrintGraphic = m_xGrfCB->get_active();
- aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS
printerpullgpages /*m_xTabCB->get_active();*/
aAddPrinterAttr.m_bPrintDraw = m_xGrfCB->get_active(); // UI
merged with m_xGrfCB in CWS printerpullgpages
aAddPrinterAttr.m_bPrintControl = m_xCtrlFieldCB->get_active();
aAddPrinterAttr.m_bPrintPageBackground = m_xBackgroundCB->get_active();
diff --git a/sw/source/uibase/config/prtopt.cxx
b/sw/source/uibase/config/prtopt.cxx
index 2ec2493354ad..6fb4e6890e2d 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -32,24 +32,23 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() const
static const char* aPropNames[] =
{
"Content/Graphic", // 0
- "Content/Table", // 1
- "Content/Control", // 2
- "Content/Background", // 3
- "Content/PrintBlack", // 4
- "Content/Note", // 5
- "Page/Reversed", // 6
- "Page/Brochure", // 7
- "Page/BrochureRightToLeft", // 8
- "Output/Fax", // 9
- "Papertray/FromPrinterSetup", // 10
- "Content/Drawing", // 11 not in SW/Web
- "Page/LeftPage", // 12 not in SW/Web
- "Page/RightPage", // 13 not in SW/Web
- "EmptyPages", // 14 not in SW/Web
- "Content/PrintPlaceholders", // 15 not in Sw/Web
- "Content/PrintHiddenText" // 16 not in Sw/Web
+ "Content/Control", // 1
+ "Content/Background", // 2
+ "Content/PrintBlack", // 3
+ "Content/Note", // 4
+ "Page/Reversed", // 5
+ "Page/Brochure", // 6
+ "Page/BrochureRightToLeft", // 7
+ "Output/Fax", // 8
+ "Papertray/FromPrinterSetup", // 9
+ "Content/Drawing", // 10 not in SW/Web
+ "Page/LeftPage", // 11 not in SW/Web
+ "Page/RightPage", // 12 not in SW/Web
+ "EmptyPages", // 13 not in SW/Web
+ "Content/PrintPlaceholders", // 14 not in Sw/Web
+ "Content/PrintHiddenText" // 15 not in Sw/Web
};
- const int nCount = m_bIsWeb ? 11 : 17;
+ const int nCount = m_bIsWeb ? 10 : 16;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -83,28 +82,27 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
switch(nProp)
{
case 0: m_bPrintGraphic =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 1: m_bPrintTable =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 2: m_bPrintControl =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 3: m_bPrintPageBackground=
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 4: m_bPrintBlackFont =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 5:
+ case 1: m_bPrintControl =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 2: m_bPrintPageBackground=
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 3: m_bPrintBlackFont =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 4:
{
sal_Int32 nTmp = 0;
pValues[nProp] >>= nTmp;
m_nPrintPostIts = static_cast<SwPostItMode>(nTmp);
}
break;
- case 6: m_bPrintReverse =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 7: m_bPrintProspect =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 8: m_bPrintProspectRTL =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 9: pValues[nProp] >>= m_sFaxName; break;
- case 10: m_bPaperFromSetup =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 11: m_bPrintDraw =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 12: m_bPrintLeftPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 13: m_bPrintRightPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 14: m_bPrintEmptyPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 15: m_bPrintTextPlaceholder =
*o3tl::doAccess<bool>(pValues[nProp]); break;
- case 16: m_bPrintHiddenText =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 5: m_bPrintReverse =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 6: m_bPrintProspect =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 7: m_bPrintProspectRTL =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 8: pValues[nProp] >>= m_sFaxName; break;
+ case 9: m_bPaperFromSetup =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 10: m_bPrintDraw =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 11: m_bPrintLeftPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 12: m_bPrintRightPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 13: m_bPrintEmptyPages =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 14: m_bPrintTextPlaceholder =
*o3tl::doAccess<bool>(pValues[nProp]); break;
+ case 15: m_bPrintHiddenText =
*o3tl::doAccess<bool>(pValues[nProp]); break;
}
}
}
@@ -135,22 +133,21 @@ void SwPrintOptions::ImplCommit()
switch(nProp)
{
case 0: pValues[nProp] <<= m_bPrintGraphic; break;
- case 1: pValues[nProp] <<= m_bPrintTable; break;
- case 2: pValues[nProp] <<= m_bPrintControl; break;
- case 3: pValues[nProp] <<= m_bPrintPageBackground; break;
- case 4: pValues[nProp] <<= m_bPrintBlackFont; break;
- case 5: pValues[nProp] <<=
static_cast<sal_Int32>(m_nPrintPostIts) ; break;
- case 6: pValues[nProp] <<= m_bPrintReverse; break;
- case 7: pValues[nProp] <<= m_bPrintProspect; break;
- case 8: pValues[nProp] <<= m_bPrintProspectRTL; break;
- case 9: pValues[nProp] <<= m_sFaxName; break;
- case 10: pValues[nProp] <<= m_bPaperFromSetup; break;
- case 11: pValues[nProp] <<= m_bPrintDraw; break;
- case 12: pValues[nProp] <<= m_bPrintLeftPages; break;
- case 13: pValues[nProp] <<= m_bPrintRightPages; break;
- case 14: pValues[nProp] <<= m_bPrintEmptyPages; break;
- case 15: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
- case 16: pValues[nProp] <<= m_bPrintHiddenText; break;
+ case 1: pValues[nProp] <<= m_bPrintControl; break;
+ case 2: pValues[nProp] <<= m_bPrintPageBackground; break;
+ case 3: pValues[nProp] <<= m_bPrintBlackFont; break;
+ case 4: pValues[nProp] <<=
static_cast<sal_Int32>(m_nPrintPostIts) ; break;
+ case 5: pValues[nProp] <<= m_bPrintReverse; break;
+ case 6: pValues[nProp] <<= m_bPrintProspect; break;
+ case 7: pValues[nProp] <<= m_bPrintProspectRTL; break;
+ case 8: pValues[nProp] <<= m_sFaxName; break;
+ case 9: pValues[nProp] <<= m_bPaperFromSetup; break;
+ case 10: pValues[nProp] <<= m_bPrintDraw; break;
+ case 11: pValues[nProp] <<= m_bPrintLeftPages; break;
+ case 12: pValues[nProp] <<= m_bPrintRightPages; break;
+ case 13: pValues[nProp] <<= m_bPrintEmptyPages; break;
+ case 14: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
+ case 15: pValues[nProp] <<= m_bPrintHiddenText; break;
}
}
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 3c57e20c6c8c..49812654a553 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -322,7 +322,7 @@ void SwXPrintSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo,
break;
case HANDLE_PRINTSET_TABLES:
{
- mpPrtOpt->SetPrintTable(tryBoolAccess(rInfo.maName, rValue));
+ // no action
}
break;
case HANDLE_PRINTSET_DRAWINGS:
@@ -437,7 +437,7 @@ void SwXPrintSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo,
rValue <<= mpPrtOpt->IsPrintGraphic();
break;
case HANDLE_PRINTSET_TABLES:
- rValue <<= mpPrtOpt->IsPrintTable();
+ rValue <<= true;
break;
case HANDLE_PRINTSET_DRAWINGS:
rValue <<= mpPrtOpt->IsPrintDraw();
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 75d4776e4b18..0509b5ca4a94 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2439,7 +2439,6 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData(
SwPrintData aDocPrintData( rDoc.getIDocumentDeviceAccess().getPrintData()
);
aDocPrintData.SetPrintGraphic( rPrintUIOptions.IsPrintGraphics() );
- aDocPrintData.SetPrintTable( true ); // for now it was decided that tables
should always be printed
aDocPrintData.SetPrintDraw( rPrintUIOptions.IsPrintDrawings() );
aDocPrintData.SetPrintControl( rPrintUIOptions.IsPrintFormControls() );
aDocPrintData.SetPrintLeftPage( rPrintUIOptions.IsPrintLeftPages() );
diff --git a/test/source/text/textprintersettings.cxx
b/test/source/text/textprintersettings.cxx
index b28c652413e5..1ceb11e07967 100644
--- a/test/source/text/textprintersettings.cxx
+++ b/test/source/text/textprintersettings.cxx
@@ -21,7 +21,6 @@ void TextPrinterSettings::testPrinterSettingsProperties()
css::uno::UNO_QUERY_THROW);
testBooleanProperty(xPrinterSettings, "PrintGraphics");
- testBooleanProperty(xPrinterSettings, "PrintTables");
testBooleanProperty(xPrinterSettings, "PrintDrawings");
testBooleanProperty(xPrinterSettings, "PrintLeftPages");
testBooleanProperty(xPrinterSettings, "PrintRightPages");
