diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 23:20:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-05 08:24:46 +0000 |
| commit | 31fedbe9f782976b6aa4615b6fd171ed52137c94 (patch) | |
| tree | aeb72168616981ca20b67aec1c9a75ca64161c2e /sfx2/source | |
| parent | cc8ca7fad08e7268e7409ce5d0103d6a3c3aef4d (diff) | |
Remove SvtInternalOptions
* only Get/SetCurrentTempURL were used, but only for compatibility reasons,
to remove old temporary directories (before 2001). Those should be gone
today.
* MailUIEnabled was false in the xcu file.
* SID_MAIL_SENDDOC* are handled some lines further.
Change-Id: I482719b0de9df0a77c2fef0bf25ae1fb68926375
Reviewed-on: https://gerrit.libreoffice.org/3180
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Notes
Notes:
API CHANGE.
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 19 |
3 files changed, 1 insertions, 20 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 49ee2b1699c6..479f9d4479a3 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -113,7 +113,6 @@ #include <unotools/securityoptions.hxx> #include <unotools/localisationoptions.hxx> #include <unotools/fontoptions.hxx> -#include <unotools/internaloptions.hxx> #include <unotools/workingsetoptions.hxx> #include <unotools/syslocaleoptions.hxx> #include <unotools/syslocale.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 2cd13360c83f..8008e9071605 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -25,7 +25,6 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <vcl/graphicfilter.hxx> -#include <unotools/internaloptions.hxx> #include <unotools/pathoptions.hxx> #include <com/sun/star/registry/InvalidRegistryException.hpp> #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 4760de15ad6a..d5c778e56aa6 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -43,7 +43,6 @@ #include <unotools/pathoptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/soerr.hxx> -#include <unotools/internaloptions.hxx> #include <basic/basmgr.hxx> #include <basic/sbuno.hxx> @@ -296,7 +295,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags) //========================================================================= SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) { - SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN ); } TYPEINIT2(SfxViewShell,SfxShell,SfxListener); @@ -518,11 +516,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) break; - if ( SvtInternalOptions().MailUIEnabled() ) - { - GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, sal_True ); - } - else + { SfxMailModel aModel; rtl::OUString aDocType; @@ -837,17 +831,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) break; } - // Mail functions - case SID_MAIL_SENDDOCASPDF: - case SID_MAIL_SENDDOC: - case SID_MAIL_SENDDOCASFORMAT: - { - sal_Bool bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN ); - if ( !bEnable ) - rSet.DisableItem( nSID ); - break; - } - // PlugIns running case SID_PLUGINS_ACTIVE: { |