summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-21 14:33:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-21 14:49:42 +0000
commitb97d9a1238a82461e64717757a4527565f879ee2 (patch)
tree6d4de98530bd6170633a131ea6b239f36f9c52eb
parent1dbc6d05ded0dc1df75f7b9ff779571c98800035 (diff)
slot:5500 -> .uno:NewDoc(FromTemplate)
try and strip out the slot:5500 magic/lunacy Change-Id: I7236c83fba6cb8264f76aca90242775a3de58645
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx7
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--vcl/source/window/window.cxx2
4 files changed, 5 insertions, 8 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 889560205c3e..ffca153e7b62 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -342,7 +342,7 @@
</node>
<node oor:name="m14" oor:op="replace">
<prop oor:name="URL" oor:type="xs:string">
- <value>slot:5500</value>
+ <value>.uno:NewDoc</value>
</prop>
<prop oor:name="Title">
<value xml:lang="en-US">Templates</value>
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";
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d63aaa0181e5..cc49cab05715 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2413,7 +2413,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
else if ( !ImplIsWindowOrChild( pSVData->mpIntroWindow ) )
{
// ... but the VCL splash is broken, and it needs this
- // (for ./soffice slot:5500)
+ // (for ./soffice .uno:NewDoc)
pSVData->mpIntroWindow->Hide();
}