diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-22 10:52:53 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-22 11:23:05 +0100 |
commit | f9556fc409cb87097aec5c46332e6eac2d9c66a2 (patch) | |
tree | 6598d59182d0e605d91324444d0e3ed425c82524 | |
parent | b1facbf894a9870f501049409effa937a4ff3488 (diff) |
loplugin:unusedfields in svtools
Change-Id: Ie8b34530e6113ae382500c153f204b1cf1957f27
Reviewed-on: https://gerrit.libreoffice.org/68194
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | include/svtools/brwbox.hxx | 6 | ||||
-rw-r--r-- | include/svtools/ctrlbox.hxx | 13 | ||||
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 1 | ||||
-rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.cxx | 4 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.hxx | 1 | ||||
-rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 1 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 15 | ||||
-rw-r--r-- | svtools/source/filter/SvFilterOptionsDialog.cxx | 4 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 28 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.hxx | 2 |
11 files changed, 1 insertions, 76 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index eecf189cca84..068fe89399c4 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -206,7 +206,6 @@ private: bool bHLines; // draw lines between rows bool bVLines; // draw lines between columns - Color aGridLineColor; // color for lines, default dark grey bool bBootstrapped; // child windows resized etc. long nTopRow; // no. of first visible row (0...) long nCurRow; // no. of row with cursor @@ -218,8 +217,6 @@ private: bool bRowDividerDrag; bool bHit; bool mbInteractiveRowHeight; - Point a1stPoint; - Point a2ndPoint; long nResizeX; // mouse position at start of resizing long nMinResizeX; // never drag more left @@ -429,9 +426,6 @@ public: void SetTitleFont( const vcl::Font& rNewFont ) { Control::SetFont( rNewFont ); } - // color for line painting - void SetGridLineColor(const Color& rColor) {aGridLineColor = rColor;} - // inserting, changing, removing and freezing of columns void InsertHandleColumn( sal_uLong nWidth ); void InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index c8ea9320c504..f94d4462e434 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -366,26 +366,14 @@ private: class SVT_DLLPUBLIC FontStyleBox : public ComboBox { - OUString aLastStyle; - Size aOptimalSize; -private: - using ComboBox::SetText; public: FontStyleBox( vcl::Window* pParent, WinBits nBits ); - virtual void Select() override; - virtual void LoseFocus() override; virtual void Modify() override; virtual Size GetOptimalSize() const override; - void SetText( const OUString& rText ) override - { - aLastStyle = rText; - ComboBox::SetText( rText ); - } - private: FontStyleBox( const FontStyleBox& ) = delete; FontStyleBox& operator =( const FontStyleBox& ) = delete; @@ -415,7 +403,6 @@ private: class SVT_DLLPUBLIC FontSizeBox : public MetricBox { - FontMetric aFontMetric; bool bStdSize:1; using Window::ImplInit; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 67e73f26a492..4351633addd5 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -66,7 +66,6 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) pDataWin = VclPtr<BrowserDataWin>::Create( this ).get(); m_pImpl.reset( new ::svt::BrowseBoxImpl() ); - aGridLineColor = COL_LIGHTGRAY; InitSettings_Impl( this ); InitSettings_Impl( pDataWin ); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 70a5b24050fa..7da7ad6a6122 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1471,8 +1471,6 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) { // initialise flags bHit = false; - a1stPoint = - a2ndPoint = PixelToLogic( rEvt.GetPosPixel() ); // selection out of range? if ( rEvt.GetRow() >= nRowCount || diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 941ae66de4c8..49c29b64cc53 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -179,7 +179,6 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent ) ,DragSourceHelper( this ) ,DropTargetHelper( this ) ,pHeaderBar( nullptr ) - ,pEventWin( pParent ) ,pCornerWin( nullptr ) ,bInDtor( false ) ,bInPaint( false ) @@ -216,7 +215,6 @@ void BrowserDataWin::dispose() aInvalidRegion.clear(); pHeaderBar.clear(); - pEventWin.clear(); pCornerWin.clear(); DragSourceHelper::dispose(); DropTargetHelper::dispose(); @@ -569,9 +567,7 @@ void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) { - pEventWin = this; GetParent()->RequestHelp( rHEvt ); - pEventWin = GetParent(); } diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 1693f1e3a75b..27edfba52de7 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -91,7 +91,6 @@ class BrowserDataWin { public: VclPtr<BrowserHeader> pHeaderBar; // only for BrowserMode::HEADERBAR_NEW - VclPtr<vcl::Window> pEventWin; // Window of forwarded events VclPtr<ScrollBarBox> pCornerWin; // Window in the corner btw the ScrollBars bool bInDtor; AutoTimer aMouseTimer; // recalls MouseMove on dragging out diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 43d1aad6516e..402f17ea385e 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -109,7 +109,6 @@ namespace svt m_aImpl.reset(new EditBrowseBoxImpl); SetCompoundControl(true); - SetGridLineColor( COL_LIGHTGRAY ); ImplInitSettings(true, true, true); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index d45547e22b8b..4fa6b5dbd891 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1046,20 +1046,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeFontStyleBox(VclPtr<vcl::Window> & rRet rRet = pListBox; } -void FontStyleBox::Select() -{ - // keep text over fill operation - aLastStyle = GetText(); - ComboBox::Select(); -} - -void FontStyleBox::LoseFocus() -{ - // keep text over fill operation - aLastStyle = GetText(); - ComboBox::LoseFocus(); -} - void FontStyleBox::Modify() { CharClass aChrCls( ::comphelper::getProcessComponentContext(), @@ -1294,7 +1280,6 @@ void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList ) if( pFontMetric ) { - aFontMetric = *pFontMetric; pAry = pList->GetSizeAry( *pFontMetric ); } else diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index f44ffec85a69..2145603892cb 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -72,7 +72,6 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper mxSourceDocument; css::uno::Reference<css::awt::XWindow> mxParent; - OUString maDialogTitle; FieldUnit meFieldUnit; bool mbExportSelection; bool mbGraphicsSource; @@ -193,9 +192,8 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope } // XExecutableDialog -void SvFilterOptionsDialog::setTitle( const OUString& aTitle ) +void SvFilterOptionsDialog::setTitle( const OUString& ) { - maDialogTitle = aTitle; } sal_Int16 SvFilterOptionsDialog::execute() diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 5c3a4480be06..a190281e0f31 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -402,7 +402,6 @@ void ExportDialog::GetGraphicStream() if ( !IsTempExportAvailable() ) { mpTempStream.reset(new SvMemoryStream()); - maBitmap = Bitmap(); return; } @@ -420,7 +419,6 @@ void ExportDialog::GetGraphicStream() if ( bRecreateOutputStream ) { mpTempStream.reset(new SvMemoryStream()); - maBitmap = Bitmap(); uno::Reference< graphic::XGraphic > xGraphic; if (!mbGraphicsSource && !mxGraphic.is()) @@ -464,13 +462,6 @@ void ExportDialog::GetGraphicStream() mpTempStream->SetResizeOffset(1024); mpTempStream->SetStreamSize(1024); rFilter.ExportGraphic( aGraphic, "", *mpTempStream, nFilter, &aNewFilterData ); - - if ( mnFormat == FORMAT_JPG ) - { - mpTempStream->Seek( STREAM_SEEK_TO_BEGIN ); - maBitmap = GetGraphicBitmap( *mpTempStream ); - mpTempStream->Seek( STREAM_SEEK_TO_END ); - } } } else @@ -501,13 +492,6 @@ void ExportDialog::GetGraphicStream() xGraphicExporter->setSourceDocument( xSourceDoc ); xGraphicExporter->filter( aDescriptor ); - - if ( mnFormat == FORMAT_JPG ) - { - mpTempStream->Seek( STREAM_SEEK_TO_BEGIN ); - maBitmap = GetGraphicBitmap( *mpTempStream ); - mpTempStream->Seek( STREAM_SEEK_TO_END ); - } } } } @@ -520,18 +504,6 @@ void ExportDialog::GetGraphicStream() } } -BitmapEx ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) -{ - BitmapEx aRet; - Graphic aGraphic; - GraphicFilter aFilter( false ); - if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast<css::uno::Sequence< css::beans::PropertyValue >*>(nullptr) ) == ERRCODE_NONE ) - { - aRet = aGraphic.GetBitmapEx(); - } - return aRet; -} - sal_uInt32 ExportDialog::GetRawFileSize() const { sal_uInt64 nRawFileSize = 0; diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index dd8c9c4add3e..ac10ffb9a91a 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -70,7 +70,6 @@ private: sal_Int32 mnMaxFilesizeForRealtimePreview; std::unique_ptr<SvMemoryStream> mpTempStream; - BitmapEx maBitmap; css::awt::Size maOriginalSize; // the original graphic size in 1/100mm css::awt::Size maSize; // for vector graphics it always contains the logical size in 1/100mm @@ -158,7 +157,6 @@ private: void GetGraphicSource(); void GetGraphicStream(); - static BitmapEx GetGraphicBitmap( SvStream& rStream ); css::uno::Sequence< css::beans::PropertyValue > GetFilterData( bool bUpdateConfig ); |