diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-19 17:27:28 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-19 17:27:28 +0100 |
| commit | 3e01ab9b13aa6bf670d461aaa50d03da8f9414dc (patch) | |
| tree | 4c1cdc48c10ed5dc1697be565fe3a9ec6fe54fdf /editeng | |
| parent | 3d7a9891b2309c30da4a12b4cf5f5fd222195f2b (diff) | |
#i107450#: some problems with the dialog factory
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/edtdlg.hxx | 3 | ||||
| -rw-r--r-- | editeng/source/editeng/eerdll.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/misc/edtdlg.cxx | 6 | ||||
| -rw-r--r-- | editeng/util/makefile.mk | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx index 9cef6a377e40..82f1f07269c4 100644 --- a/editeng/inc/editeng/edtdlg.hxx +++ b/editeng/inc/editeng/edtdlg.hxx @@ -94,9 +94,10 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog virtual String GetCurrentSuggestion( ) const =0; }; -class EDITENG_DLLPUBLIC EditAbstractDialogFactory +class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDialogFactory { public: + virtual ~EditAbstractDialogFactory(); // needed for export of vtable static EditAbstractDialogFactory* Create(); virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ) = 0; diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index ab5732a0a115..be0df2cc969d 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -228,7 +228,7 @@ EditResId::EditResId( USHORT nId ): EditDLL::EditDLL() { pGlobalData = new GlobalEditData; - ByteString aResMgrName( "svx" ); + ByteString aResMgrName( "editeng" ); pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); } diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx index 193ccfcaff8d..80c9f4afe26e 100644 --- a/editeng/source/misc/edtdlg.cxx +++ b/editeng/source/misc/edtdlg.cxx @@ -35,5 +35,9 @@ EditAbstractDialogFactory* EditAbstractDialogFactory::Create() { - return (EditAbstractDialogFactory*) VclAbstractDialogFactory::Create(); + return dynamic_cast <EditAbstractDialogFactory*>( VclAbstractDialogFactory::Create() ); } + +EditAbstractDialogFactory::~EditAbstractDialogFactory() +{ +}
\ No newline at end of file diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk index 5eef76146a41..a11bde28aed3 100644 --- a/editeng/util/makefile.mk +++ b/editeng/util/makefile.mk @@ -87,6 +87,8 @@ DEFLIB1NAME=$(TARGET) # Resource files SRSFILELIST=\ + $(SRS)$/editeng.srs \ + $(SRS)$/outliner.srs \ $(SRS)$/misc.srs \ $(SRS)$/items.srs |