summaryrefslogtreecommitdiff
path: root/include/tools
diff options
context:
space:
mode:
Diffstat (limited to 'include/tools')
-rw-r--r--include/tools/b3dtrans.hxx2
-rw-r--r--include/tools/stream.hxx2
-rw-r--r--include/tools/urlobj.hxx11
3 files changed, 9 insertions, 6 deletions
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 9f71d7d87750..c57d7ce24abd 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -190,7 +190,7 @@ public:
private:
void CalcNewViewportValues();
- bool CalcFocalLength();
+ void CalcFocalLength();
virtual void DeviceRectangleChange() override;
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index bcc22137174a..9b28c6a46f65 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -195,7 +195,7 @@ protected:
// encrypt and write in blocks
std::size_t CryptAndWriteBuffer( const void* pStart, std::size_t nLen );
- bool EncryptBuffer( void* pStart, std::size_t nLen ) const;
+ void EncryptBuffer( void* pStart, std::size_t nLen ) const;
public:
SvStream();
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 309690048a49..94e22af5a159 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -1102,7 +1102,7 @@ private:
// Query:
- bool clearQuery();
+ void clearQuery();
bool setQuery(
OUString const & rTheQuery,
@@ -1298,9 +1298,12 @@ inline bool INetURLObject::SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
- return rTheQuery.isEmpty() ?
- clearQuery() :
- setQuery(rTheQuery, eMechanism, eCharset);
+ if (rTheQuery.isEmpty())
+ {
+ clearQuery();
+ return false;
+ }
+ return setQuery(rTheQuery, eMechanism, eCharset);
}
inline bool INetURLObject::SetMark(OUString const & rTheFragment,