diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-30 00:05:53 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-30 00:19:35 -0400 |
| commit | 3c2a26c84e70fd996855181d319970e2230b2459 (patch) | |
| tree | c7797f0cfd3183454e0ade5717b3989f7ac6e1c7 /sc/source/ui/docshell/docfunc.cxx | |
| parent | 382ac86a3ab9ba105aa3e469566b7cd86c6ca39f (diff) | |
More string conversion around ScDocumentLoader.
Diffstat (limited to 'sc/source/ui/docshell/docfunc.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index cb79c5026c75..7d2774b47942 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -4902,10 +4902,10 @@ sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, ++nLinkPos; } - String aFilterName = rFilter; - String aNewOptions = rOptions; - if (!aFilterName.Len()) - ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, sal_True, !bApi ); + rtl::OUString aFilterName = rFilter; + rtl::OUString aNewOptions = rOptions; + if (aFilterName.isEmpty()) + ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, true, !bApi ); // remove application prefix from filter name here, so the filter options // aren't reset when the filter name is changed in ScAreaLink::DataChanged @@ -4913,7 +4913,8 @@ sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, ScAreaLink* pLink = new ScAreaLink( &rDocShell, rFile, aFilterName, aNewOptions, rSource, rDestRange, nRefresh ); - pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aFilterName, &rSource ); + String aTmp = aFilterName; + pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aTmp, &rSource ); // Undo fuer den leeren Link |