[Libreoffice-commits] core.git: sfx2/source

[Tor Lillqvist]

 sfx2/source/dialog/backingwindow.cxx |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

New commits:
commit 88ee54654e95f1f62266ee2737d2b82c8d5080a6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 13 10:58:24 2016 +0200

    Just use the strings as such
    
    Change-Id: Iab4d669ef5dc397786de2aadc2222d4efb7a244a

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 69b11e7..6646b6c 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -61,15 +61,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::document;
 
-const char WRITER_URL[] =         "private:factory/swriter";
-const char CALC_URL[] =           "private:factory/scalc";
-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[] =       ".uno:NewDoc";
-const char OPEN_URL[] =           ".uno:Open";
-const char REMOTE_URL[] =         ".uno:OpenRemote";
 const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess";
 
 // increase size of the text in the buttons on the left fMultiplier-times
@@ -549,17 +540,17 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void )
 {
     // dispatch the appropriate URL and end the dialog
     if( pButton == mpWriterAllButton )
-        dispatchURL( WRITER_URL );
+        dispatchURL( "private:factory/swriter" );
     else if( pButton == mpCalcAllButton )
-        dispatchURL( CALC_URL );
+        dispatchURL( "private:factory/scalc" );
     else if( pButton == mpImpressAllButton )
-        dispatchURL( IMPRESS_WIZARD_URL );
+        dispatchURL( "private:factory/simpress?slot=6686" );
     else if( pButton == mpDrawAllButton )
-        dispatchURL( DRAW_URL );
+        dispatchURL( "private:factory/sdraw" );
     else if( pButton == mpDBAllButton )
-        dispatchURL( BASE_URL );
+        dispatchURL( "private:factory/sdatabase?Interactive" );
     else if( pButton == mpMathAllButton )
-        dispatchURL( MATH_URL );
+        dispatchURL( "private:factory/smath" );
     else if( pButton == mpOpenButton )
     {
         Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
@@ -569,7 +560,7 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void )
         pArg[0].Name = "Referer";
         pArg[0].Value <<= OUString("private:user");
 
-        dispatchURL( OPEN_URL, OUString(), xFrame, aArgs );
+        dispatchURL( ".uno:Open", OUString(), xFrame, aArgs );
     }
     else if( pButton == mpRemoteButton )
     {
@@ -577,7 +568,7 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void )
 
         Sequence< css::beans::PropertyValue > aArgs(0);
 
-        dispatchURL( REMOTE_URL, OUString(), xFrame, aArgs );
+        dispatchURL( ".uno:OpenRemote", OUString(), xFrame, aArgs );
     }
     else if( pButton == mpRecentButton )
     {
@@ -627,7 +618,7 @@ IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void )
         pArg[0].Name = "Referer";
         pArg[0].Value <<= OUString("private:user");
 
-        dispatchURL( TEMPLATE_URL, OUString(), xFrame, aArgs );
+        dispatchURL( ".uno:NewDoc", OUString(), xFrame, aArgs );
 
     }