summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-07-30 23:20:36 +0200
committerخالد حسني <khaled@libreoffice.org>2023-07-31 02:18:25 +0200
commit3564e11a41c8d3f06c8be387691d5997942e9738 (patch)
tree123dbe3236c1f6e6334aad46f3ac3ae63d6f6e77 /vcl/unx/generic
parentd7b8dc9f3f866d65c2e1ae3727b3738ae954e325 (diff)
tdf#156230 remove now unused various bit and pieces
Change-Id: I0ad88d402329bbc6882f53f6c20c22b97189a27f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155077 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@libreoffice.org>
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx8
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx10
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx31
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx3
4 files changed, 0 insertions, 52 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 015493828acb..78f3af4292c0 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -694,8 +694,6 @@ sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, Pr
*/
PspSalPrinter::PspSalPrinter( SalInfoPrinter* pInfoPrinter )
: m_pInfoPrinter( pInfoPrinter )
- , m_nCopies( 1 )
- , m_bCollate( false )
{
}
@@ -1026,7 +1024,6 @@ class PrinterUpdate
DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Timer*, void );
public:
static void update(SalGenericInstance const &rInstance);
- static void jobStarted() { nActiveJobs++; }
static void jobEnded();
};
@@ -1083,11 +1080,6 @@ void SalGenericInstance::updatePrinterUpdate()
PrinterUpdate::update(*this);
}
-void SalGenericInstance::jobStartedPrinterUpdate()
-{
- PrinterUpdate::jobStarted();
-}
-
void PrinterUpdate::jobEnded()
{
nActiveJobs--;
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 051023c82255..b81f630cd788 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -326,16 +326,6 @@ void CUPSManager::initialize()
// this is needed to check for %%IncludeFeature support
// (#i65684#, #i65491#)
cups_dest_t* pDest = static_cast<cups_dest_t*>(m_pDests);
- const char* pOpt = cupsGetOption( "printer-info",
- pDest->num_options,
- pDest->options );
- if( pOpt )
- m_bUseIncludeFeature = true;
-
- // do not send include JobPatch; CUPS will insert that itself
- // TODO: currently unknown which versions of CUPS insert JobPatches
- // so currently it is assumed CUPS = don't insert JobPatch files
- m_bUseJobPatch = false;
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
int nPrinter = m_nDests;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 6563b55b56e0..6ec967c0a06a 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -592,9 +592,6 @@ const PPDParser* PPDParser::getParser( const OUString& rFile )
PPDParser::PPDParser(OUString aFile, const std::vector<PPDKey*>& keys)
: m_aFile(std::move(aFile))
- , m_bColorDevice(false)
- , m_bType42Capable(false)
- , m_nLanguageLevel(0)
, m_aFileEncoding(RTL_TEXTENCODING_MS_1252)
, m_pImageableAreas(nullptr)
, m_pDefaultPaperDimension(nullptr)
@@ -685,17 +682,10 @@ PPDParser::PPDParser(OUString aFile, const std::vector<PPDKey*>& keys)
m_pDefaultInputSlot = pInputSlots->getDefaultValue();
SAL_INFO_IF(!pInputSlots, "vcl.unx.print", "no InputSlot in " << m_aFile);
SAL_INFO_IF(!m_pDefaultInputSlot, "vcl.unx.print", "no DefaultInputSlot in " << m_aFile);
-
- // fill in direct values
- if( (pKey = getKey( "print-color-mode" )) )
- m_bColorDevice = pKey->countValues() > 1;
}
PPDParser::PPDParser( OUString aFile ) :
m_aFile(std::move( aFile )),
- m_bColorDevice( false ),
- m_bType42Capable( false ),
- m_nLanguageLevel( 0 ),
m_aFileEncoding( RTL_TEXTENCODING_MS_1252 ),
m_pImageableAreas( nullptr ),
m_pDefaultPaperDimension( nullptr ),
@@ -806,9 +796,6 @@ PPDParser::PPDParser( OUString aFile ) :
}
#endif
- // fill in shortcuts
- const PPDKey* pKey;
-
m_pImageableAreas = getKey( "ImageableArea" );
const PPDValue * pDefaultImageableArea = nullptr;
if( m_pImageableAreas )
@@ -843,24 +830,6 @@ PPDParser::PPDParser( OUString aFile ) :
m_pDefaultInputSlot = pInputSlots->getDefaultValue();
SAL_INFO_IF(!pInputSlots, "vcl.unx.print", "no InputSlot in " << m_aFile);
SAL_INFO_IF(!m_pDefaultInputSlot, "vcl.unx.print", "no DefaultInputSlot in " << m_aFile);
-
- // fill in direct values
- if ((pKey = getKey("ColorDevice")))
- {
- if (const PPDValue* pValue = pKey->getValue(0))
- m_bColorDevice = pValue->m_aValue.startsWithIgnoreAsciiCase("true");
- }
-
- if ((pKey = getKey("LanguageLevel")))
- {
- if (const PPDValue* pValue = pKey->getValue(0))
- m_nLanguageLevel = pValue->m_aValue.toInt32();
- }
- if ((pKey = getKey("TTRasterizer")))
- {
- if (const PPDValue* pValue = pKey->getValue(0))
- m_bType42Capable = pValue->m_aValue.equalsIgnoreAsciiCase( "Type42" );
- }
}
PPDParser::~PPDParser()
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 473645a96b8a..944cd8db153e 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -96,8 +96,6 @@ PrinterInfoManager& PrinterInfoManager::get()
PrinterInfoManager::PrinterInfoManager( Type eType ) :
m_eType( eType ),
- m_bUseIncludeFeature( false ),
- m_bUseJobPatch( true ),
m_aSystemDefaultPaper( "A4" )
{
if( eType == Type::Default )
@@ -175,7 +173,6 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
void PrinterInfoManager::initialize()
{
- m_bUseIncludeFeature = false;
m_aPrinters.clear();
m_aWatchFiles.clear();
OUString aDefaultPrinter;