mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[API CHANGE] tdf#158041 Remove unused reverse printing option from sw

Browse Source 
Change-Id: I8b4597dbafc78e881fe556de8ce8221e50a673bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160777
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
This commit is contained in:
Samuel Mehrbrodt
2023-12-14 14:13:07 +01:00
parent 3930366328
commit 6dbc5e2bf4
11 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
offapi/com/sun/star/text/PrintSettings.idl
View File

@@ -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;

8
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
View File

@@ -1823,14 +1823,6 @@
</info>
<value>true</value>
</prop>
<prop oor:name="Reversed" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options - Text document - Print - [Section] Pages -->
<info>
<desc>Reverses the printing order.</desc>
<label>Reversed</label>
</info>
<value>false</value>
</prop>
<prop oor:name="Brochure" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options - Text document - Print - [Section] Pages -->
<info>

13
qadevOOo/tests/java/ifc/text/_PrintSettings.java
View File

@@ -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;
}
}) ;
}
}

6
sw/inc/printdata.hxx
View File

@@ -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 IsPrintProspect() const { return m_bPrintProspect; }
@@ -142,7 +139,6 @@ public:
void SetPrintControl( bool b ) { doSetModified(); m_bPrintControl = b; }
void SetPrintLeftPage( bool b ) { doSetModified(); m_bPrintLeftPages = b; }
void SetPrintRightPage( bool b ) { doSetModified(); m_bPrintRightPages = b; }
void SetPrintReverse( bool b ) { doSetModified(); m_bPrintReverse = b; }
void SetPaperFromSetup( bool b ) { doSetModified(); m_bPaperFromSetup = b; }
void SetPrintEmptyPages( bool b ) { doSetModified(); m_bPrintEmptyPages = b; }
void SetPrintPostIts( SwPostItMode n ) { doSetModified(); m_nPrintPostIts = n; }

1
sw/source/core/view/printdata.cxx
View File

@@ -136,7 +136,6 @@ void SwRenderData::MakeSwPrtOptions(
rOptions.m_bPrintEmptyPages = pOpt->IsPrintEmptyPages( bIsPDFExport );
// bUpdateFieldsInPrinting <-- not set here; mail merge only
rOptions.m_bPaperFromSetup = pOpt->IsPaperFromSetup();
rOptions.m_bPrintReverse = false; /*handled by print dialog now*/
rOptions.m_bPrintProspect = pOpt->IsPrintProspect();
rOptions.m_bPrintProspectRTL = pOpt->IsPrintProspectRTL();
// bModified <-- not set here; mail merge only

1
sw/source/filter/xml/xmlimp.cxx
View File

@@ -1253,7 +1253,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
"PrintLeftPages",
"PrintPageBackground",
"PrintProspect",
"PrintReversed",
"PrintRightPages",
"PrintFaxName",
"PrintPaperFromSetup",

1
sw/source/ui/config/optpage.cxx
View File

@@ -549,7 +549,6 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
aAddPrinterAttr.m_bPrintLeftPages = m_xLeftPageCB->get_active();
aAddPrinterAttr.m_bPrintRightPages = m_xRightPageCB->get_active();
aAddPrinterAttr.m_bPrintReverse = false; // handled by vcl itself since CWS printerpullpages /*m_xReverseCB->get_active()*/;
aAddPrinterAttr.m_bPrintProspect = m_xProspectCB->get_active();
aAddPrinterAttr.m_bPrintProspectRTL = m_xProspectCB_RTL->get_active();
aAddPrinterAttr.m_bPaperFromSetup = m_xPaperFromSetupCB->get_active();

59
sw/source/uibase/config/prtopt.cxx
View File

@@ -36,18 +36,17 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() const
"Content/Background", // 2
"Content/PrintBlack", // 3
"Content/Note", // 4
"Page/Reversed", // 5
"Page/Brochure", // 6
"Page/BrochureRightToLeft", // 7
"Output/Fax", // 8
"Papertray/FromPrinterSetup", // 9
"Page/LeftPage", // 10 not in SW/Web
"Page/RightPage", // 11 not in SW/Web
"EmptyPages", // 12 not in SW/Web
"Content/PrintPlaceholders", // 13 not in Sw/Web
"Content/PrintHiddenText" // 14 not in Sw/Web
"Page/Brochure", // 5
"Page/BrochureRightToLeft", // 6
"Output/Fax", // 7
"Papertray/FromPrinterSetup", // 8
"Page/LeftPage", // 9 not in SW/Web
"Page/RightPage", // 10 not in SW/Web
"EmptyPages", // 11 not in SW/Web
"Content/PrintPlaceholders", // 12 not in Sw/Web
"Content/PrintHiddenText" // 13 not in Sw/Web
};
const int nCount = m_bIsWeb ? 10 : 15;
const int nCount = m_bIsWeb ? 9 : 14;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -91,16 +90,15 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
m_nPrintPostIts = static_cast<SwPostItMode>(nTmp);
}
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_bPrintLeftPages = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 11: m_bPrintRightPages = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 12: m_bPrintEmptyPages = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 13: m_bPrintTextPlaceholder = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 14: m_bPrintHiddenText = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 5: m_bPrintProspect = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 6: m_bPrintProspectRTL = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 7: pValues[nProp] >>= m_sFaxName; break;
case 8: m_bPaperFromSetup = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 9: m_bPrintLeftPages = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 10: m_bPrintRightPages = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 11: m_bPrintEmptyPages = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 12: m_bPrintTextPlaceholder = *o3tl::doAccess<bool>(pValues[nProp]); break;
case 13: m_bPrintHiddenText = *o3tl::doAccess<bool>(pValues[nProp]); break;
}
}
}
@@ -129,16 +127,15 @@ void SwPrintOptions::ImplCommit()
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_bPrintLeftPages; break;
case 11: pValues[nProp] <<= m_bPrintRightPages; break;
case 12: pValues[nProp] <<= m_bPrintEmptyPages; break;
case 13: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
case 14: pValues[nProp] <<= m_bPrintHiddenText; break;
case 5: pValues[nProp] <<= m_bPrintProspect; break;
case 6: pValues[nProp] <<= m_bPrintProspectRTL; break;
case 7: pValues[nProp] <<= m_sFaxName; break;
case 8: pValues[nProp] <<= m_bPaperFromSetup; break;
case 9: pValues[nProp] <<= m_bPrintLeftPages; break;
case 10: pValues[nProp] <<= m_bPrintRightPages; break;
case 11: pValues[nProp] <<= m_bPrintEmptyPages; break;
case 12: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
case 13: pValues[nProp] <<= m_bPrintHiddenText; break;
}
}

4
sw/source/uibase/uno/unomod.cxx
View File

@@ -307,7 +307,7 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo,
break;
case HANDLE_PRINTSET_REVERSED:
{
mpPrtOpt->SetPrintReverse(tryBoolAccess(rInfo.maName, rValue));
// no action
}
break;
case HANDLE_PRINTSET_PROSPECT:
@@ -428,7 +428,7 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo,
rValue <<= mpPrtOpt->IsPrintRightPage();
break;
case HANDLE_PRINTSET_REVERSED:
rValue <<= mpPrtOpt->IsPrintReverse();
rValue <<= false;
break;
case HANDLE_PRINTSET_PROSPECT:
rValue <<= mpPrtOpt->IsPrintProspect();

1
sw/source/uibase/uno/unotxdoc.cxx
View File

@@ -2442,7 +2442,6 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData(
aDocPrintData.SetPrintControl( rPrintUIOptions.IsPrintFormControls() );
aDocPrintData.SetPrintLeftPage( rPrintUIOptions.IsPrintLeftPages() );
aDocPrintData.SetPrintRightPage( rPrintUIOptions.IsPrintRightPages() );
aDocPrintData.SetPrintReverse( false ); /*handled by print dialog now*/
aDocPrintData.SetPaperFromSetup( rPrintUIOptions.IsPaperFromSetup() );
aDocPrintData.SetPrintEmptyPages( rPrintUIOptions.IsPrintEmptyPages( bIsPDFEXport ) );
aDocPrintData.SetPrintPostIts( rPrintUIOptions.GetPrintPostItsType() );

1
test/source/text/textprintersettings.cxx
View File

@@ -24,7 +24,6 @@ void TextPrinterSettings::testPrinterSettingsProperties()
testBooleanProperty(xPrinterSettings, "PrintLeftPages");
testBooleanProperty(xPrinterSettings, "PrintRightPages");
testBooleanProperty(xPrinterSettings, "PrintControls");
testBooleanProperty(xPrinterSettings, "PrintReversed");
testBooleanProperty(xPrinterSettings, "PrintControls");
testStringProperty(xPrinterSettings, "PrintFaxName", "FaxName");
testBooleanProperty(xPrinterSettings, "PrintProspect");