Kaydet (Commit) c931bed5 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

ErrorBox MSG_ERR_NO_ABS_URI_REF to String

Change-Id: Ifc6c6358e327c6ba1e5e552a698568736090e70b
üst a470c10d
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// #defines ***************************************************************** // #defines *****************************************************************
#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) #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 MSG_CANT_QUIT (RID_SFX_APP_START+10)
#define STR_ISMODIFIED (RID_SFX_APP_START+11) #define STR_ISMODIFIED (RID_SFX_APP_START+11)
......
...@@ -65,11 +65,9 @@ String STR_NO_WEBBROWSER_FOUND ...@@ -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." ; 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 ; Text [ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ;
DEFBUTTON = WB_DEF_OK ;
Message[ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ;
}; };
Resource SID_UNKNOWN Resource SID_UNKNOWN
......
...@@ -45,11 +45,9 @@ bool sfx2::openUriExternally( ...@@ -45,11 +45,9 @@ bool sfx2::openUriExternally(
+ e.Message); + e.Message);
} }
SolarMutexGuard g; SolarMutexGuard g;
ErrorBox eb( MessageDialog eb(
SfxGetpApp()->GetTopWindow(), SfxResId(MSG_ERR_NO_ABS_URI_REF)); SfxGetpApp()->GetTopWindow(), SfxResId(STR_NO_ABS_URI_REF));
OUString msg(eb.GetMessText()); eb.set_primary_text(eb.get_primary_text().replaceFirst("$(ARG1)", uri));
msg = msg.replaceFirst("$(ARG1)", uri);
eb.SetMessText(msg);
eb.Execute(); eb.Execute();
} catch (css::system::SystemShellExecuteException &) { } catch (css::system::SystemShellExecuteException &) {
if (!handleSystemShellExecuteException) { if (!handleSystemShellExecuteException) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment