summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-21 13:18:20 +0200
committerNoel Grandin <noel@peralex.com>2015-12-21 13:51:29 +0200
commit3785f82e26c33c385494229be3bcfbe2daffe872 (patch)
treef4b2fca382809b33d6175c2c924f9c3a62d362c1
parent45f39af2b72fa7455bb94a92ec51c4aa9e26ae2c (diff)
loplugin:unusedfields in store,svtools,svx
Change-Id: I9577c64e33950899c2e3467c7b481504e021d470
-rw-r--r--store/source/storbios.hxx19
-rw-r--r--svtools/source/brwbox/brwbox1.cxx6
-rw-r--r--svtools/source/brwbox/datwin.cxx3
-rw-r--r--svtools/source/brwbox/datwin.hxx3
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx13
-rw-r--r--svx/inc/sdr/contact/viewcontactofunocontrol.hxx4
-rw-r--r--svx/source/dialog/imapimp.hxx1
-rw-r--r--svx/source/gallery2/galbrws1.hxx1
-rw-r--r--svx/source/inc/fmpgeimp.hxx1
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx18
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx1
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/insert/InsertPropertyPanel.cxx3
-rw-r--r--svx/source/sidebar/insert/InsertPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx1
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.cxx1
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.hxx2
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx14
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx5
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx11
-rw-r--r--svx/source/unodraw/recoveryui.cxx4
25 files changed, 18 insertions, 101 deletions
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 1278a38664c1..36b2b655b234 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -124,20 +124,6 @@ public:
*/
storeError flush();
- /** ScanContext.
- */
- struct ScanContext
- {
- /** Representation.
- */
- OStorePageDescriptor m_aDescr;
-
- /** Construction.
- */
- inline ScanContext();
-
- };
-
protected:
/** Destruction (OReference).
*/
@@ -213,11 +199,6 @@ inline bool OStorePageBIOS::isValid() const
return m_xLockBytes.is();
}
-inline OStorePageBIOS::ScanContext::ScanContext()
- : m_aDescr (0, 0, 0)
-{
-}
-
/*========================================================================
*
* The End.
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index a69c17d65b6f..77b44538b3e7 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -249,7 +249,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
}
#endif
- pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), OUString(), nWidth, GetZoom() ) );
+ pCols->insert( pCols->begin(), new BrowserColumn( 0, OUString(), nWidth, GetZoom() ) );
FreezeColumn( 0 );
// adjust headerbar
@@ -285,11 +285,11 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
{
BrowserColumns::iterator it = pCols->begin();
::std::advance( it, nPos );
- pCols->insert( it, new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom() ) );
+ pCols->insert( it, new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) );
}
else
{
- pCols->push_back( new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom() ) );
+ pCols->push_back( new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) );
}
if ( nCurColId == 0 )
nCurColId = nItemId;
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index aec67c3b2ef4..9a7e3cf24203 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -101,11 +101,10 @@ void ButtonFrame::Draw( OutputDevice& rDev )
rDev.SetFillColor( aOldFillColor );
}
-BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage,
+BrowserColumn::BrowserColumn( sal_uInt16 nItemId,
const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom )
: _nId( nItemId ),
_nWidth( nWidthPixel ),
- _aImage( rImage ),
_aTitle( rTitle ),
_bFrozen( false )
{
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index c3aa74b532d0..ed882535c749 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -70,12 +70,11 @@ class BrowserColumn
sal_uInt16 _nId;
sal_uLong _nOriginalWidth;
sal_uLong _nWidth;
- Image _aImage;
OUString _aTitle;
bool _bFrozen;
public:
- BrowserColumn( sal_uInt16 nItemId, const Image &rImage,
+ BrowserColumn( sal_uInt16 nItemId,
const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom );
virtual ~BrowserColumn();
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index bf66e5e31e7e..8c5386a893fa 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -125,14 +125,12 @@ namespace svt
class AssigmentTransientData : public IAssigmentData
{
protected:
- Reference< XDataSource > m_xDataSource;
OUString m_sDSName;
OUString m_sTableName;
- MapString2String m_aAliases;
+ MapString2String m_aAliases;
-public:
+ public:
AssigmentTransientData(
- const Reference< XDataSource >& _rxDataSource,
const OUString& _rDataSourceName,
const OUString& _rTableName,
const Sequence< AliasProgrammaticPair >& _rFields
@@ -151,11 +149,10 @@ public:
};
- AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource,
+ AssigmentTransientData::AssigmentTransientData(
const OUString& _rDataSourceName, const OUString& _rTableName,
const Sequence< AliasProgrammaticPair >& _rFields )
- :m_xDataSource( _rxDataSource )
- ,m_sDSName( _rDataSourceName )
+ :m_sDSName( _rDataSourceName )
,m_sTableName( _rTableName )
{
// fill our aliases structure
@@ -485,7 +482,7 @@ void AssignmentPersistentData::ImplCommit()
,nLastVisibleListIndex(0)
,bOddFieldNumber(false)
,bWorkingPersistent( false )
- ,pConfigData( new AssigmentTransientData( m_xTransientDataSource, _rDataSourceName, _rTableName, _rFields ) )
+ ,pConfigData( new AssigmentTransientData( _rDataSourceName, _rTableName, _rFields ) )
{
memset(pFieldLabels, 0, sizeof(pFieldLabels));
memset(pFields, 0, sizeof(pFields));
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index b43fa029f6aa..316234c01f58 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -43,12 +43,8 @@ namespace sdr { namespace contact {
//= ViewContactOfUnoControl
- class ViewContactOfUnoControl_Impl;
class SVX_DLLPRIVATE ViewContactOfUnoControl : public ViewContactOfSdrObj
{
- private:
- ::std::unique_ptr< ViewContactOfUnoControl_Impl > m_pImpl;
-
public:
// access to SdrObject
const SdrUnoObj& GetSdrUnoObj() const
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 4d5a1d744e7a..9bae1589a63e 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -30,7 +30,6 @@ class IMapOwnData
public:
Idle aIdle;
- Timer aTbxTimer;
Graphic aUpdateGraphic;
ImageMap aUpdateImageMap;
TargetList aUpdateTargetList;
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 595b2e7e6f9b..f5f77f3a5356 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -89,7 +89,6 @@ private:
Image aImgNormal;
Image aImgDefault;
Image aImgReadOnly;
- Image aImgImported;
::std::function<sal_Bool (const KeyEvent&,Window*)> maKeyInputHandler;
::std::function<void ()> maThemeSlectionHandler;
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 3b9263db24e8..ae743c05729c 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -48,7 +48,6 @@ class SdrObject;
class SVX_DLLPRIVATE FmFormPageImpl
{
- ::std::map< css::uno::Reference< css::form::XFormComponent >,SdrObject* > m_aComponentMap;
css::uno::Reference< css::form::XForm > xCurrentForm;
css::uno::Reference< css::form::XForms > m_xForms;
css::uno::WeakReference< css::container::XMap > m_aControlShapeMap;
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index c0caf0e5a34d..e90c58cb8796 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -53,26 +53,8 @@ namespace sdr { namespace contact {
//= ViewContactOfUnoControl
- class ViewContactOfUnoControl_Impl: private boost::noncopyable
- {
- public:
- ViewContactOfUnoControl_Impl();
- ~ViewContactOfUnoControl_Impl();
- };
-
-
- ViewContactOfUnoControl_Impl::ViewContactOfUnoControl_Impl()
- {
- }
-
-
- ViewContactOfUnoControl_Impl::~ViewContactOfUnoControl_Impl()
- {
- }
-
ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject )
:ViewContactOfSdrObj( _rUnoObject )
- ,m_pImpl( new ViewContactOfUnoControl_Impl )
{
}
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index b43fd3f04d5f..09ab4ef3e49c 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -52,7 +52,6 @@ GraphicPropertyPanel::GraphicPropertyPanel(
maBlueControl(SID_ATTR_GRAF_BLUE, *pBindings, *this),
maGammaControl(SID_ATTR_GRAF_GAMMA, *pBindings, *this),
maModeControl(SID_ATTR_GRAF_MODE, *pBindings, *this),
- mxFrame(rxFrame),
mpBindings(pBindings)
{
get(mpMtrBrightness, "setbrightness");
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 8a86d4f36ba3..4555b7d9177e 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -83,7 +83,6 @@ private:
::sfx2::sidebar::ControllerItem maGammaControl;
::sfx2::sidebar::ControllerItem maModeControl;
- css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings;
DECL_LINK_TYPED( ModifyBrightnessHdl, Edit&, void );
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index cdd4f6a7c177..f2486c3cfade 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -45,8 +45,7 @@ namespace svx { namespace sidebar {
InsertPropertyPanel::InsertPropertyPanel (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame)
- : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame),
- mxFrame(rxFrame)
+ : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame)
{
get(mpStandardShapesToolBox, "standardshapes");
get(mpCustomShapesToolBox, "customshapes");
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
index eec58acc1f17..ee5c6fffb406 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
@@ -47,7 +47,6 @@ public:
private:
VclPtr<ToolBox> mpStandardShapesToolBox;
VclPtr<ToolBox> mpCustomShapesToolBox;
- const css::uno::Reference<css::frame::XFrame> mxFrame;
DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void);
};
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index e99f75f841b8..7c0c3a1442b4 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -108,7 +108,6 @@ private:
sfx2::sidebar::ControllerItem maEdgeStyle;
sfx2::sidebar::ControllerItem maCapStyle;
- css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings;
void Initialize();
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index aca25bfe144f..6dad280d5ec1 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -573,7 +573,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame),
- maSpace3 (SVX_RES(IMG_SPACE3)),
maIndHang (SVX_RES(IMG_INDENT_HANG)),
maTxtLeft (0),
maUpper (0),
@@ -587,7 +586,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, OUString("DecrementIndent"), rxFrame),
maIncIndentControl(SID_INC_INDENT, *pBindings,*this, OUString("IncrementIndent"), rxFrame),
m_aMetricCtl (SID_ATTR_METRIC, *pBindings,*this),
- mxFrame(rxFrame),
maContext(),
mpBindings(pBindings),
mxSidebar(rxSidebar)
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 70a2c20fa0f6..50fde91799cf 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -89,7 +89,6 @@ private:
VclPtr<SvxRelativeField> mpFLineIndent;
// Resources
- Image maSpace3;
Image maIndHang;
// Data Member
@@ -108,7 +107,6 @@ private:
::sfx2::sidebar::ControllerItem maIncIndentControl;
::sfx2::sidebar::ControllerItem m_aMetricCtl;
- css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
css::uno::Reference<css::ui::XSidebar> mxSidebar;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 89effbb61dae..53d72b66c4b9 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -81,7 +81,6 @@ PosSizePropertyPanel::PosSizePropertyPanel(
maAutoWidthControl(SID_ATTR_TRANSFORM_AUTOWIDTH, *pBindings, *this),
maAutoHeightControl(SID_ATTR_TRANSFORM_AUTOHEIGHT, *pBindings, *this),
m_aMetricCtl(SID_ATTR_METRIC, *pBindings, *this),
- mxFrame(rxFrame),
maContext(),
mpBindings(pBindings),
mbMtrPosXMirror(false),
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 34a646d10ffc..81e01f9b871e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -136,7 +136,6 @@ private:
::sfx2::sidebar::ControllerItem maAutoHeightControl;
::sfx2::sidebar::ControllerItem m_aMetricCtl;
- css::uno::Reference< css::frame::XFrame > mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index abaac42e8878..37be37999443 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -78,7 +78,6 @@ ShadowPropertyPanel::ShadowPropertyPanel(
maShadowColorController(SID_ATTR_SHADOW_COLOR, *pBindings, *this),
maShadowXDistanceController(SID_ATTR_SHADOW_XDISTANCE, *pBindings, *this),
maShadowYDistanceController(SID_ATTR_SHADOW_YDISTANCE, *pBindings, *this),
- mxFrame(rxFrame),
mpBindings(pBindings),
nX(0),
nY(0),
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index 6b28a252bbe2..139c267a64ba 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -78,8 +78,6 @@ private:
::sfx2::sidebar::ControllerItem maShadowXDistanceController;
::sfx2::sidebar::ControllerItem maShadowYDistanceController;
- css::uno::Reference<css::frame::XFrame> mxFrame;
-
SfxBindings* mpBindings;
long nX,nY,nXY;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 0ccfbd692ebf..306b89f97674 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -86,7 +86,6 @@ class SvxFontSizeBox_Impl : public FontSizeBox
{
public:
SvxFontSizeBox_Impl( vcl::Window* pParent,
- const uno::Reference< frame::XDispatchProvider >& rDispatchProvider,
const uno::Reference< frame::XFrame >& _xFrame,
FontHeightToolBoxControl& rCtrl );
@@ -105,16 +104,13 @@ private:
OUString m_aCurText;
Size m_aLogicalSize;
bool m_bRelease;
- uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
uno::Reference< frame::XFrame > m_xFrame;
- uno::Reference< awt::XWindow > m_xOldFocusWindow;
void ReleaseFocus_Impl();
};
SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
- vcl::Window* _pParent,
- const uno::Reference< frame::XDispatchProvider >& _rDispatchProvider,
+ vcl::Window* _pParent,
const uno::Reference< frame::XFrame >& _xFrame,
FontHeightToolBoxControl& _rCtrl ) :
@@ -123,7 +119,6 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
m_pCtrl ( &_rCtrl ),
m_aLogicalSize ( 0,100 ),
m_bRelease ( true ),
- m_xDispatchProvider ( _rDispatchProvider ),
m_xFrame ( _xFrame )
{
SetValue( 0 );
@@ -399,12 +394,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind
if ( pParent )
{
SolarMutexGuard aSolarMutexGuard;
- m_pBox = VclPtr<SvxFontSizeBox_Impl>::Create(
-
- pParent,
- uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ),
- m_xFrame,
- *this );
+ m_pBox = VclPtr<SvxFontSizeBox_Impl>::Create( pParent, m_xFrame, *this );
//Get the box to fill itself with all its sizes
m_pBox->UpdateFont(m_aCurrentFont);
//Make it size itself to its optimal size re above sizes
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 050a38572122..1ec7821a5c92 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -35,9 +35,8 @@ namespace textconversiondlgs
{
using namespace ::com::sun::star;
-ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext )
- : m_xCC( xContext )
- , m_xParentWindow( nullptr )
+ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog()
+ : m_xParentWindow( nullptr )
, m_pDialog( nullptr )
, m_bDisposed(false)
, m_bInDispose(false)
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index a639496ec4c1..9f64e1a655fd 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -68,8 +68,7 @@ class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper <
>
{
public:
- explicit ChineseTranslation_UnoDialog( const css::uno::Reference<
- css::uno::XComponentContext >& xContext );
+ ChineseTranslation_UnoDialog();
virtual ~ChineseTranslation_UnoDialog();
// lang::XServiceInfo
@@ -81,9 +80,9 @@ public:
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception)
+ create( css::uno::Reference< css::uno::XComponentContext > const & ) throw(css::uno::Exception)
{
- return static_cast<cppu::OWeakObject *>(new ChineseTranslation_UnoDialog( xContext ));
+ return static_cast<cppu::OWeakObject *>( new ChineseTranslation_UnoDialog );
}
// lang::XInitialization
@@ -108,15 +107,11 @@ public:
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override;
private:
- //no default constructor
- ChineseTranslation_UnoDialog();
void impl_DeleteDialog();
private:
css::uno::Reference<
- css::uno::XComponentContext> m_xCC;
- css::uno::Reference<
css::awt::XWindow > m_xParentWindow;
VclPtr<ChineseTranslationDialog> m_pDialog;
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 1609a3d7872e..b28773d83738 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -71,10 +71,6 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo
/** @short TODO */
RecoveryUI::EJob m_eJob;
- /** @short TODO */
- css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory;
-
-
// interface
public: