diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 21:16:42 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 23:30:23 +0200 |
| commit | c931bed5f1ab16e758f8da8e4304c9c126a1ca49 (patch) | |
| tree | e2759f689bb99c4cae3c35d5583beaf59f2d01cc /sfx2 | |
| parent | a470c10d88b7824a9d3a986b302beef115fbc303 (diff) | |
ErrorBox MSG_ERR_NO_ABS_URI_REF to String
Change-Id: Ifc6c6358e327c6ba1e5e552a698568736090e70b
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/app.hrc | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/app.src | 6 | ||||
| -rw-r--r-- | sfx2/source/appl/openuriexternally.cxx | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index bb7552ded846..74e6226d6d1d 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -24,7 +24,7 @@ // #defines ***************************************************************** #define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) -#define MSG_ERR_NO_ABS_URI_REF (RID_SFX_APP_START+8) +#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8) #define MSG_CANT_QUIT (RID_SFX_APP_START+10) #define STR_ISMODIFIED (RID_SFX_APP_START+11) diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index b6c6b96e637e..d1ddf93221ed 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -65,11 +65,9 @@ String STR_NO_WEBBROWSER_FOUND Text [ en-US ] = "%PRODUCTNAME could not find a web browser on your system. Please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation." ; }; -ErrorBox MSG_ERR_NO_ABS_URI_REF +String STR_NO_ABS_URI_REF { - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message[ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ; + Text [ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ; }; Resource SID_UNKNOWN diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index 32dfb79fc97b..e892c2c6f6b8 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -45,11 +45,9 @@ bool sfx2::openUriExternally( + e.Message); } SolarMutexGuard g; - ErrorBox eb( - SfxGetpApp()->GetTopWindow(), SfxResId(MSG_ERR_NO_ABS_URI_REF)); - OUString msg(eb.GetMessText()); - msg = msg.replaceFirst("$(ARG1)", uri); - eb.SetMessText(msg); + MessageDialog eb( + SfxGetpApp()->GetTopWindow(), SfxResId(STR_NO_ABS_URI_REF)); + eb.set_primary_text(eb.get_primary_text().replaceFirst("$(ARG1)", uri)); eb.Execute(); } catch (css::system::SystemShellExecuteException &) { if (!handleSystemShellExecuteException) { |