diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-21 14:33:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-21 14:49:42 +0000 |
| commit | b97d9a1238a82461e64717757a4527565f879ee2 (patch) | |
| tree | 6d4de98530bd6170633a131ea6b239f36f9c52eb /sfx2 | |
| parent | 1dbc6d05ded0dc1df75f7b9ff779571c98800035 (diff) | |
slot:5500 -> .uno:NewDoc(FromTemplate)
try and strip out the slot:5500 magic/lunacy
Change-Id: I7236c83fba6cb8264f76aca90242775a3de58645
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index f6bca870bc8e..d4ef0bbe05c4 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -286,7 +286,7 @@ void ShutdownIcon::FromTemplate() xFrame = ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY ); URL aTargetURL; - aTargetURL.Complete = "slot:5500"; + aTargetURL.Complete = ".uno:NewDoc"; ::com::sun::star::uno::Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); @@ -294,10 +294,7 @@ void ShutdownIcon::FromTemplate() ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDisp; if ( xProv.is() ) { - if (aTargetURL.Protocol == "slot:") - xDisp = xProv->queryDispatch( aTargetURL, OUString(), 0 ); - else - xDisp = xProv->queryDispatch( aTargetURL, OUString("_blank"), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString("_self"), 0 ); } if ( xDisp.is() ) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index ce33baec3f03..e0074b55abae 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -67,7 +67,7 @@ const char IMPRESS_WIZARD_URL[] = "private:factory/simpress?slot=6686"; const char DRAW_URL[] = "private:factory/sdraw"; const char BASE_URL[] = "private:factory/sdatabase?Interactive"; const char MATH_URL[] = "private:factory/smath"; -const char TEMPLATE_URL[] = "slot:5500"; +const char TEMPLATE_URL[] = ".uno:NewDoc"; const char OPEN_URL[] = ".uno:Open"; const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess"; |