diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-30 23:20:36 +0200 |
---|---|---|
committer | خالد حسني <khaled@libreoffice.org> | 2023-07-31 02:18:25 +0200 |
commit | 3564e11a41c8d3f06c8be387691d5997942e9738 (patch) | |
tree | 123dbe3236c1f6e6334aad46f3ac3ae63d6f6e77 /vcl | |
parent | d7b8dc9f3f866d65c2e1ae3727b3738ae954e325 (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')
-rw-r--r-- | vcl/inc/ppdparser.hxx | 8 | ||||
-rw-r--r-- | vcl/inc/printerinfomanager.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/salinst.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/strhelper.hxx | 16 | ||||
-rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/geninst.h | 1 | ||||
-rw-r--r-- | vcl/inc/unx/genprn.h | 6 | ||||
-rw-r--r-- | vcl/ios/dummies.cxx | 4 | ||||
-rw-r--r-- | vcl/null/printerinfomanager.cxx | 2 | ||||
-rw-r--r-- | vcl/source/fontsubset/ttcr.hxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 31 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 3 |
14 files changed, 0 insertions, 106 deletions
diff --git a/vcl/inc/ppdparser.hxx b/vcl/inc/ppdparser.hxx index 7ef864bc9cfc..6d2f8c060c5d 100644 --- a/vcl/inc/ppdparser.hxx +++ b/vcl/inc/ppdparser.hxx @@ -101,7 +101,6 @@ public: const OUString& getKey() const { return m_aKey; } bool isUIKey() const { return m_bUIOption; } - SetupType getSetupType() const { return m_eSetupType; } int getOrderDependency() const { return m_nOrderDependency; } }; @@ -145,9 +144,6 @@ private: // the full path of the PPD file OUString m_aFile; // some basic attributes - bool m_bColorDevice; - bool m_bType42Capable; - sal_uLong m_nLanguageLevel; rtl_TextEncoding m_aFileEncoding; @@ -192,10 +188,6 @@ public: const ::std::vector< PPDConstraint >& getConstraints() const { return m_aConstraints; } - bool isColorDevice() const { return m_bColorDevice; } - bool isType42Capable() const { return m_bType42Capable; } - sal_uLong getLanguageLevel() const { return m_nLanguageLevel; } - OUString getDefaultPaperDimension() const; void getDefaultPaperDimension( int& rWidth, int& rHeight ) const { getPaperDimension( getDefaultPaperDimension(), rWidth, rHeight ); } diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx index a89cff1118a5..67dd8e59b2e0 100644 --- a/vcl/inc/printerinfomanager.hxx +++ b/vcl/inc/printerinfomanager.hxx @@ -110,8 +110,6 @@ protected: m_pQueueInfo; Type m_eType; - bool m_bUseIncludeFeature; - bool m_bUseJobPatch; OUString m_aSystemDefaultPaper; PrinterInfoManager( Type eType = Type::Default ); @@ -157,9 +155,6 @@ public: // returns true on success virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString &rFaxNumber ); - bool getUseIncludeFeature() const { return m_bUseIncludeFeature; } - bool getUseJobPatch() const { return m_bUseJobPatch; } - // check whether a printer's feature string contains a subfeature bool checkFeatureToken( const OUString& rPrinterName, std::string_view pToken ) const; diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 98e962d8c637..124118f4e609 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -195,7 +195,6 @@ public: // callbacks for printer updates virtual void updatePrinterUpdate() {} - virtual void jobStartedPrinterUpdate() {} virtual void jobEndedPrinterUpdate() {} /// Set the app's (somewhat) magic/main-thread to this one. diff --git a/vcl/inc/strhelper.hxx b/vcl/inc/strhelper.hxx index c0cff31afc4f..8654400b2222 100644 --- a/vcl/inc/strhelper.hxx +++ b/vcl/inc/strhelper.hxx @@ -49,22 +49,6 @@ namespace psp return rtl::math::stringToDouble(rStr, u'.', u'\0'); } - inline double StringToDouble(std::string_view rStr) - { - return rtl::math::stringToDouble(rStr, '.', static_cast<char>(0)); - } - - // fills a character buffer with the string representation of a double - // the buffer has to be long enough (e.g. 128 bytes) - // returns the string len - inline int getValueOfDouble( char* pBuffer, double f, int nPrecision = 0) - { - OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) ); - int nLen = aStr.getLength(); - std::strncpy( pBuffer, aStr.getStr(), nLen+1 ); // copy string including terminating zero - return nLen; - } - } // namespace #endif // INCLUDED_VCL_STRHELPER_HXX diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 1a9ef6e3be21..89bf5508879b 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -143,11 +143,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager auto it = m_aFonts.find( nID ); return it == m_aFonts.end() ? nullptr : &it->second; } - PrintFont* getFont( fontID nID ) - { - auto it = m_aFonts.find( nID ); - return it == m_aFonts.end() ? nullptr : &it->second; - } static void fillPrintFontInfo(const PrintFont& rFont, FastPrintFontInfo& rInfo); OString getDirectory( int nAtom ) const; diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h index 6ef559d4137b..32f0a61d1cc7 100644 --- a/vcl/inc/unx/geninst.h +++ b/vcl/inc/unx/geninst.h @@ -63,7 +63,6 @@ public: virtual OUString GetDefaultPrinter() override; virtual void PostPrintersChanged() = 0; virtual void updatePrinterUpdate() override; - virtual void jobStartedPrinterUpdate() override; virtual void jobEndedPrinterUpdate() override; bool isPrinterInit() const { return mbPrinterInit; } virtual std::unique_ptr<GenPspGraphics> CreatePrintGraphics() = 0; diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index 5b022e8e8ee1..fc77250aea8b 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -53,14 +53,8 @@ public: class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter { public: - OUString m_aFileName; - OUString m_aTmpFile; SalInfoPrinter* m_pInfoPrinter; psp::JobData m_aJobData; - sal_uInt32 m_nCopies; - bool m_bCollate; - bool m_bPdf; - bool m_bIsPDFWriterJob; PspSalPrinter( SalInfoPrinter *pPrinter ); virtual ~PspSalPrinter() override; diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx index 51fd5c26164a..a1d3cbcb674e 100644 --- a/vcl/ios/dummies.cxx +++ b/vcl/ios/dummies.cxx @@ -99,10 +99,6 @@ void SalGenericInstance::updatePrinterUpdate() { } -void SalGenericInstance::jobStartedPrinterUpdate() -{ -} - void SalGenericInstance::jobEndedPrinterUpdate() { } diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index 7b95d3b28e11..55d81e65a2f4 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -43,8 +43,6 @@ PrinterInfoManager& PrinterInfoManager::get() PrinterInfoManager::PrinterInfoManager( Type eType ) : m_pQueueInfo( nullptr ), m_eType( eType ), - m_bUseIncludeFeature( false ), - m_bUseJobPatch( true ), m_aSystemDefaultPaper( "A4" ) { // initSystemDefaultPaper(); diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index 31dbc1b1f97b..4dd78b05444f 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -224,12 +224,6 @@ struct TableEntry; */ sal_uInt32 glyfAdd(std::unique_ptr<GlyphData> glyphdata, AbstractTrueTypeFont *fnt); - /** - * Query the number of glyphs currently stored in the 'glyf' table - * - */ - sal_uInt32 glyfCount() { return m_list.size(); } - std::vector<std::unique_ptr<GlyphData>> m_list; }; 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; |