writerperfect/source/common/DirectoryStream.cxx | 17 ++++------------- writerperfect/source/common/WPXSvStream.cxx | 7 ++----- 2 files changed, 6 insertions(+), 18 deletions(-)
New commits: commit c4d3ea46ab62a2ba5d69ae79aa6828b5b7ae6cbe Author: Takeshi Abe <[email protected]> Date: Sat Mar 1 00:28:28 2014 +0900 Call it noncopyable Change-Id: If2e14b333868bb10867e54cd28c83d0d2c6a5e43 diff --git a/writerperfect/source/common/WPXSvStream.cxx b/writerperfect/source/common/WPXSvStream.cxx index f20deb6..818830d 100644 --- a/writerperfect/source/common/WPXSvStream.cxx +++ b/writerperfect/source/common/WPXSvStream.cxx @@ -23,6 +23,7 @@ #include <limits> #include <vector> +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <boost/unordered_map.hpp> @@ -36,12 +37,8 @@ namespace packages = com::sun::star::packages; namespace { -class PositionHolder +class PositionHolder : boost::noncopyable { - // disable copying - PositionHolder(const PositionHolder &); - PositionHolder &operator=(const PositionHolder &); - public: explicit PositionHolder(const Reference<XSeekable> &rxSeekable); ~PositionHolder(); commit 83f1151c706eb78e08d781245ccabdc68aa0ee83 Author: Takeshi Abe <[email protected]> Date: Sat Mar 1 00:18:06 2014 +0900 catch exception by const ref Change-Id: Id0a9e3b52cabff7be99a5bba6ddb0a108a325d42 diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index ff93e26..90aeb59 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -76,11 +76,11 @@ uno::Reference<io::XInputStream> findStream(ucbhelper::Content &rContent, const } while (xResultSet->next()); } } - catch (uno::RuntimeException) + catch (const uno::RuntimeException &) { // ignore } - catch (uno::Exception) + catch (const uno::Exception &) { // ignore } commit 6e9b859fa1c6ba2f94b46ac272372e0a503075c4 Author: Takeshi Abe <[email protected]> Date: Sat Mar 1 00:15:25 2014 +0900 Drop useless const Change-Id: Ifcdd921b08af10ff17dc3da7b811b6aed74baf98 diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index 7251d72..ff93e26 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -129,13 +129,13 @@ WPXInputStream *DirectoryStream::getDocumentOLEStream(const char *const pName) return input; } -const unsigned char *DirectoryStream::read(const unsigned long, unsigned long &nNumBytesRead) +const unsigned char *DirectoryStream::read(unsigned long, unsigned long &nNumBytesRead) { nNumBytesRead = 0; return 0; } -int DirectoryStream::seek(const long, const WPX_SEEK_TYPE) +int DirectoryStream::seek(long, WPX_SEEK_TYPE) { return -1; } commit 29c71853c469cbe7fc5f0439f6d6b5dedfe6a0fb Author: Takeshi Abe <[email protected]> Date: Sat Mar 1 00:10:49 2014 +0900 Remove unused struct Change-Id: I217620ea99c809b7f3bf1a403170168ac01ed06a diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index 14b37f3..7251d72 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -49,15 +49,6 @@ namespace writerperfect namespace { -struct NotADirectoryException -{ -}; - -} - -namespace -{ - uno::Reference<io::XInputStream> findStream(ucbhelper::Content &rContent, const rtl::OUString &rName) { uno::Reference<io::XInputStream> xInputStream; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
