diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 14:48:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-17 15:07:07 +0200 |
commit | f9d5da8b491e30a08fa6996164e12e4d8715af46 (patch) | |
tree | 2362d2c036744f419757f0a56d33c61531e6a112 /vcl | |
parent | 8914595d4623390e4bac9ebbdf0d5ae9ab69aa8a (diff) |
loplugin:unusedfields in vcl part2
Change-Id: Icd02f63e9738c0bb91348e2084649f9edc281e67
Reviewed-on: https://gerrit.libreoffice.org/38833
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
43 files changed, 26 insertions, 235 deletions
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index b37bb909d1f2..01c061c565cc 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -46,14 +46,11 @@ class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics psp::PrinterGfx* m_pPrinterGfx; FreetypeFont* m_pFreetypeFont[ MAX_FALLBACK ]; - bool m_bFontVertical; - SalInfoPrinter* m_pInfoPrinter; public: GenPspGraphics(); virtual ~GenPspGraphics() override; - void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx, - SalInfoPrinter* pInfoPrinter ); + void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx ); // helper methods static const void * DoGetEmbedFontData(psp::fontID aFont, long* pDataLen); diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index eb350ef0abd1..05095e5c9eca 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -190,7 +190,6 @@ private: bool mbFaceOk; bool mbArtItalic; bool mbArtBold; - bool mbUseGamma; hb_font_t* mpHbFont; }; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 37a4facabd0c..e5b89619efbc 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -188,7 +188,6 @@ class GtkSalFrame : public SalFrame bool m_bGraphics; ModKeyFlags m_nKeyModifiers; GdkCursor *m_pCurrentCursor; - GdkVisibilityState m_nVisibility; PointerStyle m_ePointerStyle; ScreenSaverInhibitor m_ScreenSaverInhibitor; int m_nWorkArea; diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx index ceaf53eb3826..5ba32eea0fb0 100644 --- a/vcl/inc/unx/i18n_cb.hxx +++ b/vcl/inc/unx/i18n_cb.hxx @@ -50,13 +50,11 @@ struct preedit_text_t { sal_Unicode *pUnicodeBuffer; XIMFeedback *pCharStyle; - unsigned int nCursorPos; unsigned int nLength; unsigned int nSize; preedit_text_t() : pUnicodeBuffer(nullptr) , pCharStyle(nullptr) - , nCursorPos(0) , nLength(0) , nSize(0) { diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index 69d0303f0309..d3641312f3da 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -27,9 +27,8 @@ class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension { private: - bool mbUseExtension; + bool mbUseExtension; sal_uInt32 mnDefaultGroup; - sal_uInt32 mnGroup; int mnEventBase; int mnErrorBase; Display* mpDisplay; diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index f1fc5229ced3..a232d68de2f9 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -170,7 +170,6 @@ private: bool mbColor; bool mbUploadPS42Fonts; - osl::File* mpPageHeader; osl::File* mpPageBody; /* text/font related data, for a type1 font it has to be checked diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index d28326e389bb..31b11b470530 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -260,8 +260,6 @@ protected: SalXLib *pXLib_; SalI18N_KeyboardExtension *mpKbdExtension; - AttributeProvider *mpFactory; - Display *pDisp_; // X Display SalX11Screen m_nXDefaultScreen; @@ -279,7 +277,6 @@ protected: // Keyboard bool bNumLockFromXS_; // Num Lock handled by X Server int nNumLockIndex_; // modifier index in modmap - int nNumLockMask_; // keyevent state mask for KeySym nShiftKeySym_; // first shift modifier KeySym nCtrlKeySym_; // first control modifier KeySym nMod1KeySym_; // first mod1 modifier diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 4263581a979f..175b25a81bef 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -86,8 +86,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl X11SalGraphics *pGraphics_; // current frame graphics X11SalGraphics *pFreeGraphics_; // first free frame graphics - sal_uInt16 nKeyCode_; // last key code - sal_uInt16 nKeyState_; // last key state bool mbSendExtKeyModChange; ModKeyFlags mnExtKeyMod; @@ -114,7 +112,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl // data for WMAdaptor WMWindowType meWindowType; - int mnDecorationFlags; bool mbMaximizedVert; bool mbMaximizedHorz; bool mbShaded; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 0825ccfed464..c55f650b6e2b 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -264,7 +264,6 @@ public: WinBits mnStyle; WinBits mnPrevStyle; WinBits mnExtendedStyle; - WinBits mnPrevExtendedStyle; WindowType mnType; ControlPart mnNativeBackground; sal_uInt16 mnWaitCount; @@ -309,7 +308,6 @@ public: mbNoPtrVisible:1, mbPaintFrame:1, mbInPaint:1, - mbMouseMove:1, mbMouseButtonDown:1, mbMouseButtonUp:1, mbKeyInput:1, diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx b/vcl/qa/cppunit/wmf/wmfimporttest.cxx index ca9900c18ad9..4b9c46d51471 100644 --- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx +++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx @@ -253,15 +253,11 @@ void WmfTest::testTdf99402() logfontw.lfHeight = 0; logfontw.lfWidth = 0; logfontw.lfEscapement = 0; - logfontw.lfOrientation = 0; logfontw.lfWeight = 0; logfontw.lfItalic = 0; logfontw.lfUnderline = 0; logfontw.lfStrikeOut = 0; logfontw.lfCharSet = OEM_CHARSET; - logfontw.lfOutPrecision = 0; // OUT_DEFAULT_PRECIS - logfontw.lfClipPrecision = 0; // CLIP_DEFAULT_PRECIS - logfontw.lfQuality = 0; // DEFAULT_QUALITY logfontw.lfPitchAndFamily = FF_ROMAN | DEFAULT_PITCH; logfontw.alfFaceName = "Symbol"; diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 22125d747dbe..0a22ab3762fd 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1523,18 +1523,20 @@ bool EnhWMFReader::ReadEnhWMF() if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { LOGFONTW aLogFont; + sal_Int32 nTmp; + unsigned char nTmp2; pWMF->ReadInt32( aLogFont.lfHeight ) .ReadInt32( aLogFont.lfWidth ) .ReadInt32( aLogFont.lfEscapement ) - .ReadInt32( aLogFont.lfOrientation ) + .ReadInt32( nTmp ) // lfOrientation .ReadInt32( aLogFont.lfWeight ) .ReadUChar( aLogFont.lfItalic ) .ReadUChar( aLogFont.lfUnderline ) .ReadUChar( aLogFont.lfStrikeOut ) .ReadUChar( aLogFont.lfCharSet ) - .ReadUChar( aLogFont.lfOutPrecision ) - .ReadUChar( aLogFont.lfClipPrecision ) - .ReadUChar( aLogFont.lfQuality ) + .ReadUChar( nTmp2 ) // lfOutPrecision + .ReadUChar( nTmp2 ) // lfClipPrecision + .ReadUChar( nTmp2 ) // lfQuality .ReadUChar( aLogFont.lfPitchAndFamily ); sal_Unicode lfFaceName[LF_FACESIZE+1]; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index a10d5f158da2..ff7d3d5307e9 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -109,15 +109,11 @@ struct LOGFONTW sal_Int32 lfHeight; sal_Int32 lfWidth; sal_Int32 lfEscapement; - sal_Int32 lfOrientation; sal_Int32 lfWeight; sal_uInt8 lfItalic; sal_uInt8 lfUnderline; sal_uInt8 lfStrikeOut; sal_uInt8 lfCharSet; - sal_uInt8 lfOutPrecision; - sal_uInt8 lfClipPrecision; - sal_uInt8 lfQuality; sal_uInt8 lfPitchAndFamily; OUString alfFaceName; }; @@ -692,7 +688,6 @@ private: sal_uInt32 nEMFSize; sal_uInt32 nSkipActions; - sal_uInt32 nCurrentAction; WMF_EXTERNALHEADER* pExternalHeader; diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index c1cd0901b5b1..b9d2f8d27615 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -912,6 +912,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) sal_Int16 lfWeight = 0; LOGFONTW aLogFont; + unsigned char nTmp; aFontSize = ReadYXExt(); pWMF->ReadInt16( lfEscapement ); pWMF->ReadInt16( lfOrientation ); @@ -920,16 +921,15 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) pWMF->ReadUChar( aLogFont.lfUnderline ); pWMF->ReadUChar( aLogFont.lfStrikeOut ); pWMF->ReadUChar( aLogFont.lfCharSet ); - pWMF->ReadUChar( aLogFont.lfOutPrecision ); - pWMF->ReadUChar( aLogFont.lfClipPrecision ); - pWMF->ReadUChar( aLogFont.lfQuality ); + pWMF->ReadUChar( nTmp ); // lfOutPrecision + pWMF->ReadUChar( nTmp ); // lfClipPrecision + pWMF->ReadUChar( nTmp ); // lfQuality pWMF->ReadUChar( aLogFont.lfPitchAndFamily ); size_t nRet = pWMF->ReadBytes( lfFaceName, LF_FACESIZE ); lfFaceName[nRet] = 0; aLogFont.lfWidth = aFontSize.Width(); aLogFont.lfHeight = aFontSize.Height(); aLogFont.lfEscapement = lfEscapement; - aLogFont.lfOrientation = lfOrientation; aLogFont.lfWeight = lfWeight; rtl_TextEncoding eCharSet; @@ -1330,7 +1330,6 @@ void WMFReader::ReadWMF() sal_uLong nPos, nPercent, nLastPercent; nSkipActions = 0; - nCurrentAction = 0; pEMFStream.reset(); nEMFRecCount = 0; @@ -1355,7 +1354,6 @@ void WMFReader::ReadWMF() bool bEMFAvailable = false; while( true ) { - nCurrentAction++; nPercent = ( nPos - nStartPos ) * 100 / ( nEndPos - nStartPos ); if( nLastPercent + 4 <= nPercent ) @@ -1829,7 +1827,6 @@ WMFReader::WMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, , nEMFRec(0) , nEMFSize(0) , nSkipActions(0) - , nCurrentAction(0) , pExternalHeader(pExtHeader) {} diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index f01bf6446305..d996ce7a1bcb 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -162,29 +162,6 @@ static const char* pDictEscs[] = { "nFDArray", "nFDSelect", "sFontName" }; -static const char* pType1Ops[] = { - nullptr, "2hstem", nullptr, "2vstem", - "1vmoveto", "Arlineto", "1hlineto", "1vlineto", - "Crrcurveto", "0closepath", "Lcallsubr", "0return", - "xT1ESC", "2hsbw", "0endchar", nullptr, - nullptr, nullptr, nullptr, nullptr, - nullptr, "2rmoveto", "1hmoveto", nullptr, - nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, "4vhcurveto", "4hvcurveto" -}; - -static const char* pT1EscOps[] = { - "0dotsection", "6vstem3", "6hstem3", nullptr, - nullptr, nullptr, "5seac", "4sbw", - nullptr, "1abs", "2add", "2sub", - "2div", nullptr, nullptr, nullptr, - "Gcallothersubr", "1pop", nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, - nullptr, "2setcurrentpoint" -}; - struct TYPE1OP { enum OPS @@ -204,30 +181,6 @@ struct TYPE1OP }; }; -static const char* pType2Ops[] = { - nullptr, "hhstem", nullptr, "vvstem", - "mvmoveto", "Arlineto", "Ehlineto", "Evlineto", - "Crrcurveto", nullptr, "Lcallsubr", "Xreturn", - "xT2ESC", nullptr, "eendchar", nullptr, - nullptr, nullptr, "Hhstemhm", "Khintmask", - "Kcntrmask", "Mrmoveto", "mhmoveto", "Vvstemhm", - ".rcurveline", ".rlinecurve", ".vvcurveto", ".hhcurveto", - ".shortint", "Gcallgsubr", ".vhcurveto", ".hvcurveto" -}; - -static const char* pT2EscOps[] = { - nullptr, nullptr, nullptr, "2and", - "2or", "1not", nullptr, nullptr, - nullptr, "1abs", "2add", "2sub", - "2div", nullptr, "1neg", "2eq", - nullptr, nullptr, "1drop", nullptr, - "1put", "1get", "4ifelse", "0random", - "2mul", nullptr, "1sqrt", "1dup", - "2exch", "Iindex", "Rroll", nullptr, - nullptr, nullptr, "7hflex", "Fflex", - "9hflex1", "fflex1" -}; - struct TYPE2OP { enum OPS @@ -257,13 +210,10 @@ struct CffGlobal explicit CffGlobal(); int mnNameIdxBase; - int mnNameIdxCount; int mnStringIdxBase; - int mnStringIdxCount; bool mbCIDFont; int mnCharStrBase; int mnCharStrCount; - int mnEncodingBase; int mnCharsetBase; int mnGlobalSubrBase; int mnGlobalSubrCount; @@ -277,7 +227,6 @@ struct CffGlobal int mnFontNameSID; int mnFullNameSID; - int mnFamilyNameSID; }; struct CffLocal @@ -326,8 +275,6 @@ public: const sal_GlyphId* pGlyphIds, const U8* pEncoding, GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ); - // used by charstring converter - void setCharStringType( int); protected: int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops); private: @@ -352,9 +299,6 @@ private: void seekIndexEnd( int nIndexBase); private: - const char** mpCharStringOps; - const char** mpCharStringEscs; - CffLocal maCffLocal[256]; CffLocal* mpCffLocal; @@ -415,8 +359,6 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) , mbNeedClose(false) , mbIgnoreHints(false) , mnCntrMask(0) - , mpCharStringOps(nullptr) - , mpCharStringEscs(nullptr) , mnStackIdx(0) , mnValStack{} , mnTransVals{} @@ -484,15 +426,6 @@ void CffSubsetterContext::addHints( bool bVerticalHints) mnStackIdx = 0; } -void CffSubsetterContext::setCharStringType( int nVal) -{ - switch( nVal) { - case 1: mpCharStringOps=pType1Ops; mpCharStringEscs=pT1EscOps; break; - case 2: mpCharStringOps=pType2Ops; mpCharStringEscs=pT2EscOps; break; - default: fprintf( stderr, "Unknown CharstringType=%d\n",nVal); break; - } -} - void CffSubsetterContext::readDictOp() { const U8 c = *mpReadPtr; @@ -529,7 +462,7 @@ void CffSubsetterContext::readDictOp() case 10: mpCffLocal->maStemStdHW = nVal; break; // "StdHW" case 11: mpCffLocal->maStemStdVW = nVal; break; // "StdVW" case 15: mnCharsetBase = nInt; break; // "charset" - case 16: mnEncodingBase = nInt; break; // "nEncoding" + case 16: break; // "nEncoding" case 17: mnCharStrBase = nInt; break; // "nCharStrings" case 19: mpCffLocal->mnLocalSubrOffs = nInt; break;// "nSubrs" case 20: setDefaultWidth( nVal ); break; // "defaultWidthX" @@ -580,7 +513,7 @@ void CffSubsetterContext::readDictOp() nInt = popInt(); switch( nOpId ) { case 2: mnFullNameSID = nInt; break; // "FullName" - case 3: mnFamilyNameSID = nInt; break; // "FamilyName" + case 3: break; // "FamilyName" case 938: mnFontNameSID = nInt; break; // "FontName" default: break; // TODO: handle more string dictops? } @@ -599,7 +532,6 @@ void CffSubsetterContext::readDictOp() } break; case 't': // CharstringType nInt = popInt(); - setCharStringType( nInt ); break; } } else if( (c >= 32) || (c == 28) ) { @@ -1370,13 +1302,10 @@ CffLocal::CffLocal() CffGlobal::CffGlobal() : mnNameIdxBase( 0) -, mnNameIdxCount( 0) , mnStringIdxBase( 0) -, mnStringIdxCount( 0) , mbCIDFont( false) , mnCharStrBase( 0) , mnCharStrCount( 0) -, mnEncodingBase( 0) , mnCharsetBase( 0) , mnGlobalSubrBase( 0) , mnGlobalSubrCount( 0) @@ -1386,7 +1315,6 @@ CffGlobal::CffGlobal() , mnFDAryCount( 1) , mnFontNameSID( 0) , mnFullNameSID( 0) -, mnFamilyNameSID( 0) { } @@ -1405,7 +1333,6 @@ bool CffSubsetterContext::initialCffRead() // prepare access to the NameIndex mnNameIdxBase = nHeaderSize; mpReadPtr = mpBasePtr + nHeaderSize; - mnNameIdxCount = (mpReadPtr[0]<<8) + mpReadPtr[1]; seekIndexEnd( mnNameIdxBase); // get the TopDict index @@ -1422,7 +1349,6 @@ bool CffSubsetterContext::initialCffRead() // prepare access to the String index mnStringIdxBase = getReadOfs(); - mnStringIdxCount = (mpReadPtr[0]<<8) + mpReadPtr[1]; seekIndexEnd( mnStringIdxBase); // prepare access to the GlobalSubr index diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 140b4903991f..bd46a9289057 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1129,13 +1129,11 @@ PDFWriterImpl::PDFPage::PDFPage( PDFWriterImpl* pWriter, double nPageWidth, doub m_nPageHeight( nPageHeight ), m_eOrientation( eOrientation ), m_nPageObject( 0 ), // invalid object number - m_nPageIndex( -1 ), // invalid index m_nStreamLengthObject( 0 ), m_nBeginStreamPos( 0 ), m_eTransition( PDFWriter::PageTransition::Regular ), m_nTransTime( 0 ), - m_nDuration( 0 ), - m_bHasWidgets( false ) + m_nDuration( 0 ) { // object ref must be only ever updated in emit() m_nPageObject = m_pWriter->createObject(); @@ -2259,7 +2257,6 @@ void PDFWriterImpl::newPage( double nPageWidth, double nPageHeight, PDFWriter::O endPage(); m_nCurrentPage = m_aPages.size(); m_aPages.push_back( PDFPage(this, nPageWidth, nPageHeight, eOrientation ) ); - m_aPages.back().m_nPageIndex = m_nCurrentPage; m_aPages.back().beginStream(); // setup global graphics state @@ -13552,9 +13549,6 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa // insert widget to page's annotation list m_aPages[ nPageNr ].m_aAnnotations.push_back( rNewWidget.m_nObject ); - // mark page as having widgets - m_aPages[ nPageNr ].m_bHasWidgets = true; - return nNewWidget; } diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index e356024106c9..50c7e157b29f 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -139,7 +139,6 @@ public: double m_nPageHeight; // in inch/72 PDFWriter::Orientation m_eOrientation; sal_Int32 m_nPageObject; - sal_Int32 m_nPageIndex; std::vector<sal_Int32> m_aStreamObjects; sal_Int32 m_nStreamLengthObject; sal_uInt64 m_nBeginStreamPos; @@ -148,7 +147,6 @@ public: PDFWriter::PageTransition m_eTransition; sal_uInt32 m_nTransTime; sal_uInt32 m_nDuration; - bool m_bHasWidgets; PDFPage( PDFWriterImpl* pWriter, double nPageWidth, double nPageHeight, PDFWriter::Orientation eOrientation ); ~PDFPage(); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 40d4085f56ff..9bebfb324d85 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -124,7 +124,6 @@ private: bool mbzCodecInUse : 1; bool mbStatus : 1; bool mbIDAT : 1; // true if finished with enough IDAT chunks - bool mbGamma : 1; // true if Gamma Correction available bool mbpHYs : 1; // true if physical size of pixel available bool mbIgnoreGammaChunk : 1; @@ -202,7 +201,6 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mbzCodecInUse ( false ), mbStatus( true ), mbIDAT( false ), - mbGamma ( false ), mbpHYs ( false ), mbIgnoreGammaChunk ( false ), #if OSL_DEBUG_LEVEL > 0 @@ -818,8 +816,6 @@ void PNGReaderImpl::ImplGetGamma() if ( fInvGamma != 1.0 ) { - mbGamma = true; - if ( mpColorTable == mpDefaultColorTable ) mpColorTable = new sal_uInt8[ 256 ]; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 1ee6bdc309a3..a0621c405345 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -420,7 +420,6 @@ tools::Rectangle DockingManager::GetPosSizePixel( const vcl::Window *pWindow ) class ImplPopupFloatWin : public FloatingWindow { private: - ImplDockingWindowWrapper* mpDockingWin; bool mbMoving; bool mbTrackingEnabled; Point maDelta; @@ -428,9 +427,8 @@ private: void ImplSetBorder(); public: - ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); + ImplPopupFloatWin( vcl::Window* pParent, bool bHasGrip ); virtual ~ImplPopupFloatWin() override; - virtual void dispose() override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; @@ -448,12 +446,11 @@ public: bool hasGrip() const { return mbHasGrip; } }; -ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) : +ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, bool bHasGrip ) : FloatingWindow( pParent, WB_NOBORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) { mpWindowImpl->mbToolbarFloatingWindow = true; // indicate window type, required for accessibility // which should not see this window as a toplevel window - mpDockingWin = pDockingWin; mbMoving = false; mbTrackingEnabled = false; mbHasGrip = bHasGrip; @@ -466,12 +463,6 @@ ImplPopupFloatWin::~ImplPopupFloatWin() disposeOnce(); } -void ImplPopupFloatWin::dispose() -{ - mpDockingWin = nullptr; - FloatingWindow::dispose(); -} - css::uno::Reference< css::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible() { // switch off direct accessibility support for this window @@ -965,7 +956,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin if ( bUseStdPopup ) pWin = VclPtr<FloatingWindow>::Create( mpParent, WB_STDPOPUP ); else - pWin = VclPtr<ImplPopupFloatWin>::Create( mpParent, this, bAllowTearOff ); + pWin = VclPtr<ImplPopupFloatWin>::Create( mpParent, bAllowTearOff ); pWin->SetPopupModeEndHdl( LINK( this, ImplDockingWindowWrapper, PopupModeEnd ) ); pWin->SetText( GetWindow()->GetText() ); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index bbc2c702928c..3e1f88c0578a 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -1120,7 +1120,6 @@ sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link<Me } while( it != m_aAddButtons.end() && nId < 128 ); SAL_WARN_IF( nId >= 128, "vcl", "too many addbuttons in menubar" ); AddButtonEntry& rNewEntry = m_aAddButtons[nId]; - rNewEntry.m_nId = nId; rNewEntry.m_aSelectLink = i_rLink; aCloseBtn->InsertItem(nId, i_rImage, ToolBoxItemBits::NONE, 0); aCloseBtn->calcMinSize(); diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index e1e3d36cb8b9..da097587cbf3 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -63,11 +63,8 @@ class MenuBarWindow : public vcl::Window, public MenuWindow private: struct AddButtonEntry { - sal_uInt16 m_nId; Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aSelectLink; Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aHighlightLink; - - AddButtonEntry() : m_nId( 0 ) {} }; VclPtr<Menu> pMenu; diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 5852b1980505..a30653f1c6cb 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -38,7 +38,6 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBit nMBDownPos = ITEMPOS_INVALID; nPosInParent = ITEMPOS_INVALID; nScrollerHeight = 0; - nBorder = EXTRASPACEY; nFirstEntry = 0; bScrollUp = false; bScrollDown = false; diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index d53a92964fe3..a65c3fbfb172 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -46,7 +46,6 @@ private: sal_uInt16 nMBDownPos; sal_uInt16 nScrollerHeight; sal_uInt16 nFirstEntry; - sal_uInt16 nBorder; sal_uInt16 nPosInParent; bool bInExecute : 1; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 9f258feb7362..4f1fe06782b6 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -406,8 +406,7 @@ void Window::ImplGrabFocusToDocument( GetFocusFlags nFlags ) void Window::MouseMove( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( MouseNotifyEvent::MOUSEMOVE, this, &rMEvt ); - if (!EventNotify(aNEvt)) - mpWindowImpl->mbMouseMove = true; + EventNotify(aNEvt); } void Window::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 11b32886232a..69f1b604de1b 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -93,7 +93,6 @@ private: Accelerator maAccel; sal_uInt16 mnLineMode; ToolBox::ImplToolItems::size_type mnStartLines; - bool mbShowDragRect; ImplTBDragMgr(const ImplTBDragMgr&) = delete; ImplTBDragMgr& operator=(const ImplTBDragMgr&) = delete; @@ -1036,7 +1035,6 @@ ImplTBDragMgr::ImplTBDragMgr() : mpDragBox(nullptr) , mnLineMode(0) , mnStartLines(0) - , mbShowDragRect(false) { maAccel.InsertItem( KEY_RETURN, vcl::KeyCode( KEY_RETURN ) ); maAccel.InsertItem( KEY_ESCAPE, vcl::KeyCode( KEY_ESCAPE ) ); @@ -1060,7 +1058,6 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, maMouseOff.Y() = rRect.Top() - rPos.Y(); maRect = rRect; maStartRect = rRect; - mbShowDragRect = true; pToolBox->ShowTracking( maRect ); } @@ -1080,7 +1077,6 @@ void ImplTBDragMgr::EndDragging( bool bOK ) if (mpDragBox->IsMouseCaptured()) mpDragBox->ReleaseMouse(); mpDragBox->mbDragging = false; - mbShowDragRect = false; Application::RemoveAccel( &maAccel ); if ( !bOK ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index eb5e72e6d30b..19fcebba9c48 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -643,7 +643,6 @@ WindowImpl::WindowImpl( WindowType nType ) mnStyle = 0; // style (init in ImplInitWindow) mnPrevStyle = 0; // prevstyle (set in SetStyle) mnExtendedStyle = 0; // extended style (init in ImplInitWindow) - mnPrevExtendedStyle = 0; // prevstyle (set in SetExtendedStyle) mnType = nType; // type mnGetFocusFlags = GetFocusFlags::NONE; // Flags fuer GetFocus()-Aufruf mnWaitCount = 0; // Wait-Count (>1 == Warte-MousePointer) @@ -690,7 +689,6 @@ WindowImpl::WindowImpl( WindowType nType ) mbInInitShow = false; // true: we are in InitShow mbChildPtrOverwrite = false; // true: PointerStyle overwrites Child-Pointer mbNoPtrVisible = false; // true: ShowPointer( false ) called - mbMouseMove = false; // true: BaseMouseMove called mbPaintFrame = false; // true: Paint is visible, but not painted mbInPaint = false; // true: Inside PaintHdl mbMouseButtonDown = false; // true: BaseMouseButtonDown called @@ -2001,7 +1999,6 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle ) pWindow->ImplGetFrame()->SetExtendedFrameStyle( nExt ); } - mpWindowImpl->mnPrevExtendedStyle = mpWindowImpl->mnExtendedStyle; mpWindowImpl->mnExtendedStyle = nExtendedStyle; CompatStateChanged( StateChangedType::ExtendedStyle ); } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ba0d133ec0a9..a892734d97d2 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -680,7 +680,6 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& xWindow, MouseNotifyEvent // if the MouseMove handler changes the help window's visibility // the HelpRequest handler should not be called anymore vcl::Window* pOldHelpTextWin = pSVData->maHelpData.mpHelpWin; - pChild->ImplGetWindowImpl()->mbMouseMove = false; pChild->MouseMove( aMEvt ); if ( pOldHelpTextWin != pSVData->maHelpData.mpHelpWin ) bCallHelpRequest = false; diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index f291e2b6bf1b..9b8a51a693f3 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -45,7 +45,6 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) if ( pPreeditData->eState == PreeditStatus::ActivationRequired ) { pPreeditData->eState = PreeditStatus::Active; - pPreeditData->aText.nCursorPos = 0; pPreeditData->aText.nLength = 0; } diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 2532e9f8b094..ec2f1a5fbf7d 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -182,7 +182,6 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.pCharStyle = static_cast<XIMFeedback*>(malloc(PREEDIT_BUFSZ * sizeof(XIMFeedback))); maClientData.aText.nSize = PREEDIT_BUFSZ; - maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; // Status attributes diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 40c89dd83519..7e59021a031b 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -81,7 +81,6 @@ class XIMStatusWindow : public StatusWindow // for delayed showing bool m_bDelayedShow; - I18NStatus::ShowReason m_eDelayedReason; ImplSVEvent * m_nDelayedEvent; // for toggling bool m_bOn; @@ -113,7 +112,6 @@ XIMStatusWindow::XIMStatusWindow( bool bOn ) : m_pLastParent( nullptr ), m_bAnchoredAtRight( false ), m_bDelayedShow( false ), - m_eDelayedReason( I18NStatus::contextmap ), m_nDelayedEvent( nullptr ), m_bOn( bOn ) { @@ -276,13 +274,12 @@ IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl, void*, void) } } -void XIMStatusWindow::show( bool bShow, I18NStatus::ShowReason eReason ) +void XIMStatusWindow::show( bool bShow, I18NStatus::ShowReason ) { if( bShow && m_aStatusText->GetText().isEmpty() ) bShow = false; m_bDelayedShow = bShow; - m_eDelayedReason = eReason; if( ! m_nDelayedEvent ) m_nDelayedEvent = Application::PostUserEvent( LINK( this, XIMStatusWindow, DelayedShowHdl ), nullptr, true ); } diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index 79739be87249..16dbc6067543 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -28,7 +28,6 @@ SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) : mbUseExtension(true) , mnDefaultGroup(0) - , mnGroup(0) , mnEventBase(0) , mnErrorBase(0) , mpDisplay(pDisplay) @@ -78,7 +77,6 @@ SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) { XkbStateRec aStateRecord; XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord ); - mnGroup = aStateRecord.group; } } @@ -96,8 +94,6 @@ SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent ) switch ( nXKBType ) { case XkbStateNotify: - - mnGroup = reinterpret_cast<XkbStateNotifyEvent*>(pEvent)->group; break; default: diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 59b9069a578c..9d64d665648a 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -277,14 +277,12 @@ bool SalDisplay::BestVisual( Display *pDisplay, SalDisplay::SalDisplay( Display *display ) : pXLib_( nullptr ), mpKbdExtension( nullptr ), - mpFactory( nullptr ), pDisp_( display ), m_nXDefaultScreen( 0 ), nMaxRequestSize_( 0 ), meServerVendor( vendor_unknown ), bNumLockFromXS_( false ), nNumLockIndex_( 0 ), - nNumLockMask_( 0 ), nShiftKeySym_( 0 ), nCtrlKeySym_( 0 ), nMod1KeySym_( 0 ), @@ -580,7 +578,6 @@ void SalDisplay::Init() for( Cursor & aCsr : aPointerCache_ ) aCsr = None; - mpFactory = nullptr; m_bXinerama = false; int nDisplayScreens = ScreenCount( pDisp_ ); @@ -805,7 +802,6 @@ void SalDisplay::ModifierMapping() { bNumLockFromXS_ = False; nNumLockIndex_ = i; - nNumLockMask_ = 1<<i; break; } } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 7b4cc062f854..85152168aa3c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1261,7 +1261,6 @@ void GnomeWMAdaptor::setGnomeWMState( X11SalFrame* pFrame ) const void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pReferenceFrame ) const { pFrame->meWindowType = eType; - pFrame->mnDecorationFlags = nDecorationFlags; if( ! pFrame->mbFullScreen ) { diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index aac753a6da74..0d3b58ee49cb 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -221,7 +221,6 @@ SelectionManager::SelectionManager() : m_nLastDropAction( 0 ), m_nLastX( 0 ), m_nLastY( 0 ), - m_nDropTimestamp( 0 ), m_bDropWaitingForCompletion( false ), m_aDropWindow( None ), m_aDropProxy( None ), @@ -241,21 +240,18 @@ SelectionManager::SelectionManager() : m_bDropSent( false ), m_nDropTimeout( 0 ), m_bWaitingForPrimaryConversion( false ), - m_nDragTimestamp( None ), m_aMoveCursor( None ), m_aCopyCursor( None ), m_aLinkCursor( None ), m_aNoneCursor( None ), m_aCurrentCursor( None ), m_nCurrentProtocolVersion( nXdndProtocolRevision ), - m_nCLIPBOARDAtom( None ), m_nTARGETSAtom( None ), m_nTIMESTAMPAtom( None ), m_nTEXTAtom( None ), m_nINCRAtom( None ), m_nCOMPOUNDAtom( None ), m_nMULTIPLEAtom( None ), - m_nUTF16Atom( None ), m_nImageBmpAtom( None ), m_nXdndAware( None ), m_nXdndEnter( None ), @@ -271,7 +267,6 @@ SelectionManager::SelectionManager() : m_nXdndActionMove( None ), m_nXdndActionLink( None ), m_nXdndActionAsk( None ), - m_nXdndActionPrivate( None ), m_bShutDown( false ) { memset(&m_aDropEnterEvent, 0, sizeof(m_aDropEnterEvent)); @@ -361,9 +356,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) #ifdef SYNCHRONIZE XSynchronize( m_pDisplay, True ); #endif - // clipboard selection - m_nCLIPBOARDAtom = getAtom( "CLIPBOARD" ); - // special targets m_nTARGETSAtom = getAtom( "TARGETS" ); m_nTIMESTAMPAtom = getAtom( "TIMESTAMP" ); @@ -371,7 +363,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) m_nINCRAtom = getAtom( "INCR" ); m_nCOMPOUNDAtom = getAtom( "COMPOUND_TEXT" ); m_nMULTIPLEAtom = getAtom( "MULTIPLE" ); - m_nUTF16Atom = getAtom( "ISO10646-1" ); m_nImageBmpAtom = getAtom( "image/bmp" ); // Atoms for Xdnd protocol @@ -389,7 +380,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) m_nXdndActionMove = getAtom( "XdndActionMove" ); m_nXdndActionLink = getAtom( "XdndActionLink" ); m_nXdndActionAsk = getAtom( "XdndActionAsk" ); - m_nXdndActionPrivate= getAtom( "XdndActionPrivate" ); // initialize map with member none m_aAtomToString[ 0 ]= "None"; @@ -2143,8 +2133,6 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) { bHandled = true; m_nDropTime = m_nCurrentProtocolVersion > 0 ? rMessage.data.l[3] : CurrentTime; - if( ! m_bDropEnterSent ) - m_nDropTimestamp = m_nDropTime; ::Window aChild; XTranslateCoordinates( m_pDisplay, @@ -2623,7 +2611,6 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) int root_x = rMessage.type == MotionNotify ? rMessage.xmotion.x_root : rMessage.xcrossing.x_root; int root_y = rMessage.type == MotionNotify ? rMessage.xmotion.y_root : rMessage.xcrossing.y_root; ::Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root; - m_nDragTimestamp = rMessage.type == MotionNotify ? rMessage.xmotion.time : rMessage.xcrossing.time; aGuard.clear(); if( rMessage.type == MotionNotify ) @@ -3830,7 +3817,6 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt Selection* pNewSelection = new Selection(); pNewSelection->m_pAdaptor = &rAdaptor; - pNewSelection->m_aAtom = selection; m_aSelections[ selection ] = pNewSelection; } diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 550e24a31a9f..1aac1ab253a4 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -182,7 +182,6 @@ namespace x11 { State m_eState; SelectionAdaptor* m_pAdaptor; - Atom m_aAtom; ::osl::Condition m_aDataArrived; css::uno::Sequence< sal_Int8 > m_aData; css::uno::Sequence< css::datatransfer::DataFlavor > @@ -206,7 +205,6 @@ namespace x11 { Selection() : m_eState( Inactive ), m_pAdaptor( nullptr ), - m_aAtom( None ), m_aRequestedType( None ), m_nLastTimestamp( 0 ), m_bHaveUTF16( false ), @@ -273,7 +271,6 @@ namespace x11 { css::uno::Reference< css::datatransfer::XTransferable > m_xDropTransferable; int m_nLastX, m_nLastY; - Time m_nDropTimestamp; // set to true when calling drop() // if another XdndEnter is received this shows that // someone forgot to call dropComplete - we should reset @@ -308,7 +305,6 @@ namespace x11 { bool m_bDropSent; time_t m_nDropTimeout; bool m_bWaitingForPrimaryConversion; - Time m_nDragTimestamp; // drag cursors Cursor m_aMoveCursor; @@ -324,14 +320,12 @@ namespace x11 { m_aDropTargets; // some special atoms that are needed often - Atom m_nCLIPBOARDAtom; Atom m_nTARGETSAtom; Atom m_nTIMESTAMPAtom; Atom m_nTEXTAtom; Atom m_nINCRAtom; Atom m_nCOMPOUNDAtom; Atom m_nMULTIPLEAtom; - Atom m_nUTF16Atom; Atom m_nImageBmpAtom; Atom m_nXdndAware; Atom m_nXdndEnter; @@ -347,7 +341,6 @@ namespace x11 { Atom m_nXdndActionMove; Atom m_nXdndActionLink; Atom m_nXdndActionAsk; - Atom m_nXdndActionPrivate; // caching for atoms std::unordered_map< Atom, OUString > diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index c4341fe27176..8ff1c72c8835 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -380,7 +380,6 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI mbFaceOk( false ), mbArtItalic( false ), mbArtBold( false ), - mbUseGamma( false ), mpHbFont( nullptr ) { // TODO: move update of mpFontInstance into FontEntry class when @@ -432,20 +431,6 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI mbArtItalic = (rFSD.GetItalic() != ITALIC_NONE && pFI->GetFontAttributes().GetItalic() == ITALIC_NONE); mbArtBold = (rFSD.GetWeight() > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM); - if( mbArtBold ) - { - //static const int TT_CODEPAGE_RANGE_874 = (1L << 16); // Thai - //static const int TT_CODEPAGE_RANGE_932 = (1L << 17); // JIS/Japan - //static const int TT_CODEPAGE_RANGE_936 = (1L << 18); // Chinese: Simplified - //static const int TT_CODEPAGE_RANGE_949 = (1L << 19); // Korean Wansung - //static const int TT_CODEPAGE_RANGE_950 = (1L << 20); // Chinese: Traditional - //static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab - static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above - const TT_OS2* pOs2 = static_cast<const TT_OS2*>(FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 )); - if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT ) - && rFSD.mnHeight < 20) - mbUseGamma = true; - } if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) ) mnLoadFlags |= FT_LOAD_NO_BITMAP; diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index b06767308b7a..9b9f5dd8abb8 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -55,7 +55,6 @@ GraphicsStatus::GraphicsStatus() : void PrinterGfx::Init (PrinterJob &rPrinterJob) { - mpPageHeader = rPrinterJob.GetCurrentPageHeader (); mpPageBody = rPrinterJob.GetCurrentPageBody (); mnDepth = rPrinterJob.GetDepth (); mnPSLevel = rPrinterJob.GetPostscriptLevel (); @@ -70,7 +69,6 @@ PrinterGfx::Init (PrinterJob &rPrinterJob) void PrinterGfx::Init (const JobData& rData) { - mpPageHeader = nullptr; mpPageBody = nullptr; mnDepth = rData.m_nColorDepth; mnPSLevel = rData.m_nPSLevel ? rData.m_nPSLevel : (rData.m_pParser ? rData.m_pParser->getLanguageLevel() : 2 ); @@ -92,7 +90,6 @@ PrinterGfx::PrinterGfx() , mnPSLevel(0) , mbColor(false) , mbUploadPS42Fonts(false) - , mpPageHeader(nullptr) , mpPageBody(nullptr) , mnFontID(0) , mnTextAngle(0) @@ -116,7 +113,6 @@ PrinterGfx::~PrinterGfx() void PrinterGfx::Clear() { - mpPageHeader = nullptr; mpPageBody = nullptr; mnFontID = 0; maVirtualStatus = GraphicsStatus(); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 4674ae771182..bef1a71fea1d 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -524,7 +524,7 @@ SalGraphics* PspSalInfoPrinter::AcquireGraphics() if( ! m_pGraphics ) { m_pGraphics = GetGenericInstance()->CreatePrintGraphics(); - m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx, this); + m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx); pRet = m_pGraphics; } return pRet; @@ -943,7 +943,7 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool ) JobData::constructFromStreamBuffer( pJobSetup->GetDriverData(), pJobSetup->GetDriverDataLen(), m_aJobData ); m_pGraphics = GetGenericInstance()->CreatePrintGraphics(); - m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx, m_pInfoPrinter); + m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx); if( m_nCopies > 1 ) { diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index ed50638a45b4..6e30a1da8591 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -243,20 +243,16 @@ SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const GenPspGraphics::GenPspGraphics() : m_pJobData( nullptr ), - m_pPrinterGfx( nullptr ), - m_bFontVertical( false ), - m_pInfoPrinter( nullptr ) + m_pPrinterGfx( nullptr ) { for(FreetypeFont* & rp : m_pFreetypeFont) rp = nullptr; } -void GenPspGraphics::Init(psp::JobData* pJob, psp::PrinterGfx* pGfx, - SalInfoPrinter* pInfoPrinter) +void GenPspGraphics::Init(psp::JobData* pJob, psp::PrinterGfx* pGfx) { m_pJobData = pJob; m_pPrinterGfx = pGfx; - m_pInfoPrinter = pInfoPrinter; SetLayout( SalLayoutFlags::NONE ); } @@ -651,7 +647,6 @@ void GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) } // also set the serverside font for layouting - m_bFontVertical = pEntry->mbVertical; if( pEntry->mpFontData ) { // requesting a font provided by builtin rasterizer diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 580766b44b0a..ed7f626ab7fe 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -51,7 +51,6 @@ GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical) PrintFontManager &rMgr = PrintFontManager::get(); maBaseName = OUStringToOString (rMgr.getPSName(mnFontID), RTL_TEXTENCODING_ASCII_US); - mnBaseEncoding = rMgr.getFontEncoding(mnFontID); } GlyphSet::~GlyphSet () diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx index c7b023cc2610..4b47f6fdd442 100644 --- a/vcl/unx/generic/print/glyphset.hxx +++ b/vcl/unx/generic/print/glyphset.hxx @@ -43,7 +43,6 @@ private: sal_Int32 mnFontID; bool mbVertical; OString maBaseName; - rtl_TextEncoding mnBaseEncoding; typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; typedef std::list< glyph_map_t > glyph_list_t; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 24232b5800b8..0988307119c3 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -837,8 +837,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, hCursor_ = None; nCaptured_ = 0; - nKeyCode_ = 0; - nKeyState_ = 0; mbSendExtKeyModChange = false; mnExtKeyMod = ModKeyFlags::NONE; @@ -868,7 +866,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, maAlwaysOnTopRaiseTimer.SetDebugName( "vcl::X11SalFrame maAlwaysOnTopRaiseTimer" ); meWindowType = WMWindowType::Normal; - mnDecorationFlags = WMAdaptor::decoration_All; mbMaximizedVert = false; mbMaximizedHorz = false; mbShaded = false; @@ -3906,8 +3903,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) switch( pEvent->type ) { case KeyPress: - nKeyCode_ = pEvent->xkey.keycode; - nKeyState_ = pEvent->xkey.state; nRet = HandleKeyEvent( &pEvent->xkey ); break; diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index b980749f2ad4..42b4754da6bf 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -969,7 +969,6 @@ void GtkSalFrame::InitCommon() m_bFullscreen = false; m_bSpanMonitorsWhenFullscreen = false; m_nState = GDK_WINDOW_STATE_WITHDRAWN; - m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_pIMHandler = nullptr; m_pRegion = nullptr; m_ePointerStyle = static_cast<PointerStyle>(0xffff); @@ -3267,10 +3266,8 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*, GdkEvent* pEvent, gpointer return false; } -gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) +gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* /*pEvent*/, gpointer /*frame*/ ) { - GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - pThis->m_nVisibility = pEvent->state; return true; } diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 784c2a8d542f..25b3570d32e6 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1081,7 +1081,6 @@ void GtkSalFrame::InitCommon() m_bFullscreen = false; m_bSpanMonitorsWhenFullscreen = false; m_nState = GDK_WINDOW_STATE_WITHDRAWN; - m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_pIMHandler = nullptr; m_pRegion = nullptr; m_pDropTarget = nullptr; @@ -3256,10 +3255,8 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*, GdkEvent* pEvent, gpointer return false; } -gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) +gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* /*pEvent*/, gpointer /*frame*/ ) { - GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - pThis->m_nVisibility = pEvent->state; return true; } |