diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-03 15:54:21 -0500 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-04 09:58:22 +0000 |
| commit | 7c136e7ba27382d5f73454bdf5fa78d0b779e0b7 (patch) | |
| tree | 2d200cc67d4442e7f87b119905de9b5c522be619 /sfx2 | |
| parent | e2f002c044243ddd79eea7837167a72c82b98599 (diff) | |
module sot: String, bool and other clean-up
Change-Id: Ibe2bfdf20c500e9fd98c3baef66d36aa79ca4b52
Reviewed-on: https://gerrit.libreoffice.org/4710
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/oleprops.hxx | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 2c2d58aa50d4..2acf6c4e1c96 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -441,7 +441,7 @@ void SfxObjectShell::ViewAssigned() //-------------------------------------------------------------------- // closes the Object and all its views -sal_Bool SfxObjectShell::Close() +bool SfxObjectShell::Close() { {DBG_CHKTHIS(SfxObjectShell, 0);} SfxObjectShellRef aRef(this); @@ -449,7 +449,7 @@ sal_Bool SfxObjectShell::Close() { // Do not close if a progress is still running if ( !pImp->bDisposing && GetProgress() ) - return sal_False; + return false; pImp->bClosing = sal_True; Reference< util::XCloseable > xCloseable( GetBaseModel(), UNO_QUERY ); @@ -478,7 +478,7 @@ sal_Bool SfxObjectShell::Close() } } - return sal_True; + return true; } //-------------------------------------------------------------------- diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index f61ce8acf749..396572cf0eaa 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -20,6 +20,7 @@ #include <map> #include <boost/shared_ptr.hpp> #include <sot/storage.hxx> +#include <tools/string.hxx> #include <vcl/bitmapex.hxx> #include <com/sun/star/util/DateTime.hpp> |