summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/dialogs/colorpicker.cxx10
-rw-r--r--cui/source/factory/dlgfact.cxx8
-rw-r--r--cui/source/factory/dlgfact.hxx4
-rw-r--r--cui/source/inc/border.hxx2
-rw-r--r--cui/source/inc/cfg.hxx5
-rw-r--r--cui/source/inc/insdlg.hxx3
-rw-r--r--cui/source/inc/optdict.hxx13
-rw-r--r--cui/source/options/optdict.cxx13
-rw-r--r--cui/source/options/optlingu.cxx5
-rw-r--r--cui/source/options/personalization.hxx1
-rw-r--r--include/svx/svxdlg.hxx4
11 files changed, 16 insertions, 52 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 4d351204170a..059dcb855de9 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1522,7 +1522,7 @@ class ColorPicker : protected ::comphelper::OBaseMutex, // Struct for right i
public ColorPickerBase
{
public:
- explicit ColorPicker( Reference< XComponentContext > const & xContext );
+ explicit ColorPicker();
// XInitialization
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
@@ -1541,7 +1541,6 @@ public:
virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override;
private:
- Reference< XComponentContext > mxContext;
OUString msTitle;
const OUString msColorKey;
const OUString msModeKey;
@@ -1555,9 +1554,9 @@ OUString SAL_CALL ColorPicker_getImplementationName()
return OUString( "com.sun.star.cui.ColorPicker" );
}
-Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & xContext )
+Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & )
{
- return static_cast<XWeak*>( new ColorPicker( xContext ) );
+ return static_cast<XWeak*>( new ColorPicker );
}
Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException )
@@ -1566,9 +1565,8 @@ Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( Runt
return seq;
}
-ColorPicker::ColorPicker( Reference< XComponentContext > const & xContext )
+ColorPicker::ColorPicker()
: ColorPickerBase( m_aMutex )
- , mxContext( xContext )
, msColorKey( "Color" )
, msModeKey( "Mode" )
, mnColor( 0 )
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index b3a19ef054b2..e142956e959f 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1174,23 +1174,21 @@ AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordN
return new AbstractFmInputRecordNoDialog_Impl( pDlg );
}
-AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent,
- ::Reference< css::linguistic2::XSpellChecker1 > &xSpl )
+AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent )
{
- VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent, xSpl );
+ VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent );
return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
- ::Reference< css::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId )
{
Dialog* pDlg=nullptr;
switch ( nResId )
{
case RID_SFXDLG_EDITDICT :
- pDlg = VclPtr<SvxEditDictionaryDialog>::Create( pParent, rName, xSpl );
+ pDlg = VclPtr<SvxEditDictionaryDialog>::Create( pParent, rName );
break;
default:
break;
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 482dfc82c17c..c71f014fec7a 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -586,11 +586,9 @@ public:
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags) override;
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) override;
- virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent,
- css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) override;
+ virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
- css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId) override;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) override;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index ba780e1aa41a..e96ab2caad4d 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -100,9 +100,7 @@ private:
VclPtr<CheckBox> m_pMergeAdjacentBordersCB;
VclPtr<CheckBox> m_pRemoveAdjcentCellBordersCB;
- ImageList aShadowImgLstH;
ImageList aShadowImgLst;
- ImageList aBorderImgLstH;
ImageList aBorderImgLst;
long nMinValue; ///< minimum distance
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index f719758e6630..a77cbeb11259 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -668,11 +668,6 @@ public:
}
};
-struct SvxIconSelectorToolBoxItem
-{
- Image aImg;
-};
-
class SvxIconSelectorDialog : public ModalDialog
{
private:
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 1b684439fc7e..436669dfa80a 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -98,10 +98,7 @@ class SvInsertPlugInDialog : public InsertObjectDialog_Impl
{
private:
VclPtr<Edit> m_pEdFileurl;
- VclPtr<PushButton> m_pBtnFileurl;
VclPtr<VclMultiLineEdit> m_pEdPluginsOptions;
- INetURLObject* m_pURL;
- OUString m_aCommands;
DECL_LINK_TYPED(BrowseHdl, Button*, void);
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 7f4d665e0d83..5f97eb9e8fe9 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -55,17 +55,13 @@ private:
VclPtr<CheckBox> pExceptBtn;
VclPtr<OKButton> pOKBtn;
css::uno::Reference<
- css::linguistic2::XSpellChecker1 > xSpell;
- css::uno::Reference<
css::linguistic2::XDictionary > xNewDic;
DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void);
public:
- SvxNewDictionaryDialog( vcl::Window* pParent,
- css::uno::Reference<
- css::linguistic2::XSpellChecker1 > &xSpl );
+ SvxNewDictionaryDialog( vcl::Window* pParent );
virtual ~SvxNewDictionaryDialog();
virtual void dispose() override;
@@ -115,13 +111,10 @@ private:
OUString sModify;
OUString sNew;
- DecorationView aDecoView;
css::uno::Sequence<
css::uno::Reference<
css::linguistic2::XDictionary > > aDics; //! snapshot copy to work on
- css::uno::Reference<
- css::linguistic2::XSpellChecker1 > xSpell;
short nOld;
long nWidth;
@@ -149,9 +142,7 @@ private:
public:
SvxEditDictionaryDialog( vcl::Window* pParent,
- const OUString& rName,
- css::uno::Reference<
- css::linguistic2::XSpellChecker1> &xSpl );
+ const OUString& rName );
virtual ~SvxEditDictionaryDialog();
virtual void dispose() override;
};
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 929179ee96cf..5fe38e7988fa 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -97,12 +97,8 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex
// class SvxNewDictionaryDialog -------------------------------------------
-SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,
- Reference< XSpellChecker1 > &xSpl ) :
-
- ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ),
-
- xSpell( xSpl )
+SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent ) :
+ ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" )
{
get(pNameEdit,"nameedit");
get(pLanguageLB,"language");
@@ -219,14 +215,11 @@ VCL_BUILDER_FACTORY_ARGS(SvxDictEdit, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
SvxEditDictionaryDialog::SvxEditDictionaryDialog(
vcl::Window* pParent,
- const OUString& rName,
- Reference< XSpellChecker1 > &xSpl ) :
+ const OUString& rName ) :
ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ),
sModify (CUI_RESSTR(STR_MODIFY)),
- aDecoView ( this),
- xSpell ( xSpl ),
nOld ( NOACTDICT ),
bFirstSelect (true),
bDoNothing (false),
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 55f0d2e3abd3..98dbbded979f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1613,11 +1613,10 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
}
else if (m_pLinguDicsNewPB == pBtn)
{
- uno::Reference< XSpellChecker1 > xSpellChecker1;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 ));
+ std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
uno::Reference< XDictionary > xNewDic;
if ( aDlg->Execute() == RET_OK )
@@ -1652,7 +1651,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT ));
+ std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), RID_SFXDLG_EDITDICT ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
}
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index fc9c626c5258..ea92dc22900d 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -39,7 +39,6 @@ private:
std::vector<OUString> m_vExtensionPersonaSettings;
public:
- ::rtl::Reference< SearchAndParseThread > m_rApplyThread;
SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet );
virtual ~SvxPersonalizationTabPage();
virtual void dispose() override;
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index dc5240ddaa10..cf39d68d7cb8 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -343,11 +343,9 @@ public:
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags )=0;
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0;
- virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent,
- css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) = 0;
+ virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) = 0;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
- css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId) = 0;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) = 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 05:05:30 +0000