diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 11:53:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 13:44:17 +0200 |
| commit | ff37332a81bf42d0905e957183f2ce76710c3294 (patch) | |
| tree | 1120968b064b56ca2302a6440275444b8123d6fc | |
| parent | 738844c52eddb4884ac96476d4e7b74e5e58f2c9 (diff) | |
SwEditShell::Copy return type wants to be bool
Change-Id: Id39077324630cead2584bae48dd8470335f4d1fb
| -rw-r--r-- | sw/inc/editsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/eddel.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 5bfea500de7c..6f16adf37099 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -198,7 +198,7 @@ public: void SetLinkUpdMode( sal_uInt16 nMode ); /// Copy content of all ranges at current position of cursor to given Shell. - long Copy( SwEditShell* pDestShell = 0 ); + bool Copy( SwEditShell* pDestShell = 0 ); /** For copying via ClipBoard: If table is copied into table, move all cursors away from it. diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 8c0e77710bac..37d9b55910be 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -144,7 +144,7 @@ long SwEditShell::Delete() return nRet; } -long SwEditShell::Copy( SwEditShell* pDestShell ) +bool SwEditShell::Copy( SwEditShell* pDestShell ) { if( !pDestShell ) pDestShell = this; @@ -193,7 +193,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell ) // Check if a selection would be copied into itself if( pDestShell->GetDoc() == GetDoc() && *rPaM.Start() <= *pTmp && *pTmp < *rPaM.End() ) - return sal_False; + return false; } } @@ -290,7 +290,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell ) pDestShell->SaveTblBoxCntnt( pDestShell->GetCrsr()->GetPoint() ); - return (long)bRet; + return bRet; } /** Replace a selected area in a text node with a given string. diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 0e36a90abc63..d8256316c00d 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -636,7 +636,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, bRet = false; if( bRet ) - bRet = 0 != SwEditShell::Copy( pDestShell ); + bRet = SwEditShell::Copy( pDestShell ); } pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( eOldRedlMode ); |