summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-06-06 21:27:35 -0400
committerKohei Yoshida <kyoshida@novell.com>2011-06-06 21:30:30 -0400
commitb2570e4a1cfbb71655b22596bb39861dfaa9ef33 (patch)
treebec25de4897f236cae3354fa2c63197daf3784cb /sc/source/ui
parent1d2d9a2820fffe73f08f0e48da611f5a43cf7a69 (diff)
Useful error message when DDE link update fails.
When the document contains DDE links to other documents, upon opening you'll be asked whether you want to update the links. When the source documents are not open, however, the update fails, and all the formula cells being updated become #N/A. Not good. With this change, when a DDE update fails, it skips updating the formula cells that contains the DDE linkage (thus avoiding the #N/A error) and instead, shows an error message telling the user that the DDE link update has failed.
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/src/scstring.src5
2 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 3fe423dc8190..6688b027eb8a 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -493,7 +493,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
{
ReloadTabLinks();
aDocument.UpdateExternalRefLinks(GetActiveDialogParent());
- aDocument.UpdateDdeLinks();
+ aDocument.UpdateDdeLinks(GetActiveDialogParent());
aDocument.UpdateAreaLinks();
//! Test, ob Fehler
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index b8e9c00721be..b280a545f177 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -855,6 +855,11 @@ String SCSTR_WARN_ME_IN_FUTURE_CHECK
Text [ en-US ] = "Warn me about this in the future.";
};
+String SCSTR_DDEDOC_NOT_LOADED
+{
+ Text [ en-US ] = "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ;
+};
+
String SCSTR_EXTDOC_NOT_LOADED
{
Text [ en-US ] = "The following external file could not be loaded. Data linked from this file did not get updated." ;