diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-26 15:22:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:06 +0200 |
| commit | bf1db6daca85bee8333740d43e087feb2965a81b (patch) | |
| tree | 3daed89ae5a5ad7c6bd3451f7bbbc556afb1c671 /sd | |
| parent | df00d4c230d15951ad31405a3ea77e0faeebcb75 (diff) | |
convert include/sfx2/linkmgr.hxx from String to OUString
along the way, de-virtual ScDocFunc::InsertAreaLink, since
it only has one implementation.
Change-Id: I3fc836f9954628f154e01b1c7ae8f90eb7600a76
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/sdpage.hxx | 4 | ||||
| -rw-r--r-- | sd/source/core/pglink.cxx | 8 | ||||
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 0b5d631b24a5..aaf29122bb31 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -123,8 +123,8 @@ protected: bool mbLoopSound; bool mbStopSound; String maCreatedPageName; ///< generated page name by GetPageName. - String maFileName; ///< file name. - String maBookmarkName; ///< Bookmark name. + OUString maFileName; ///< file name. + OUString maBookmarkName; ///< Bookmark name. sal_Bool mbScaleObjects; ///< Objects should be scaled sal_Bool mbBackgroundFullSize; ///< Background object to represent the whole page. rtl_TextEncoding meCharSet; ///< Text encoding diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 1f3612d5cd33..0aacfc473685 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -70,9 +70,9 @@ SdPageLink::~SdPageLink() * Only standard pages are allowed to be linked * The corresponding note pages are updated automaticly **********************************************************************/ - String aFileName; - String aBookmarkName; - String aFilterName; + OUString aFileName; + OUString aBookmarkName; + OUString aFilterName; pLinkManager->GetDisplayNames( this,0, &aFileName, &aBookmarkName, &aFilterName); pPage->SetFileName(aFileName); @@ -85,7 +85,7 @@ SdPageLink::~SdPageLink() /****************************************************************** * the linked page is replaced in the model ******************************************************************/ - if (aBookmarkName.Len() == 0) + if (aBookmarkName.isEmpty()) { // no page name specified: we assume it is the first page aBookmarkName = pBookmarkDoc->GetSdPage(0, PK_STANDARD)->GetName(); diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 1b4f9ab7fec9..96ef7dfe26a3 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -321,7 +321,7 @@ void SdPage::ConnectLink() { sfx2::LinkManager* pLinkManager = pModel!=NULL ? pModel->GetLinkManager() : NULL; - if (pLinkManager && !mpPageLink && maFileName.Len() && maBookmarkName.Len() && + if (pLinkManager && !mpPageLink && !maFileName.isEmpty() && !maBookmarkName.isEmpty() && mePageKind==PK_STANDARD && !IsMasterPage() && ( (SdDrawDocument*) pModel)->IsNewOrLoadCompleted()) { @@ -335,7 +335,7 @@ void SdPage::ConnectLink() { // No links to document owned pages! mpPageLink = new SdPageLink(this, maFileName, maBookmarkName); - String aFilterName(SdResId(STR_IMPRESS)); + OUString aFilterName(SdResId(STR_IMPRESS)); pLinkManager->InsertFileLink(*mpPageLink, OBJECT_CLIENT_FILE, maFileName, &aFilterName, &maBookmarkName); mpPageLink->Connect(); |