diff options
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 5 | ||||
| -rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 1 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/app/i18n_xkb.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 8d00603cae75..15152721c35d 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -88,25 +88,20 @@ public: m_xStream(rxStream) {}; virtual sal_Int32 SAL_CALL readBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { sal_Int32 n = m_xStream->readBytes(aData, nBytesToRead); return n; }; virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { sal_Int32 n = m_xStream->readSomeBytes(aData, nMaxBytesToRead); return n; }; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { m_xStream->skipBytes(nBytesToSkip); }; virtual sal_Int32 SAL_CALL available() - throw (io::NotConnectedException, io::IOException, uno::RuntimeException) { return m_xStream->available(); }; virtual void SAL_CALL closeInput( ) - throw (io::NotConnectedException, io::IOException, uno::RuntimeException) {}; }; diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index ed20faf74b3b..1f16b3724fc4 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -18,6 +18,7 @@ */ #include <sal/config.h> +#include <sal/log.hxx> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/util/XCloneable.hpp> diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 9789e20a343c..9d76dbe6ffe3 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2047,7 +2047,7 @@ void dump_pset(Reference< XPropertySet > const& rXPropSet) else if (value >>= boolValue) SAL_INFO("sd.eppt", name << " = " << boolValue << " (bool)"); else if (value >>= pointValue) - SAL_INFO("sd.eppt", name << " = " << pointValue << " (RectanglePoint)"); + SAL_INFO("sd.eppt", name << " = " << static_cast<int>(pointValue) << " (RectanglePoint)"); else SAL_INFO("sd.eppt", "??? <unhandled type>"); } diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index bf387210f0c8..ddf609af0c62 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -19,6 +19,8 @@ #include "SlsRequestQueue.hxx" +#include <sal/log.hxx> + #include <svx/svdpage.hxx> #include <set> diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index 8fe7808e3a96..06fc520fe229 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -18,6 +18,7 @@ */ #include <stdlib.h> +#include <stdio.h> #include <X11/Xlib.h> #include <X11/XKBlib.h> diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index fde5c08c8274..0dd380d7c8f7 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -760,7 +760,7 @@ PPDParser::PPDParser( const OUString& rFile ) : << " Keys from PPD " << m_aFile << ":"); for (auto const& key : m_aKeys) { - const PPDKey* pKey = key.second; + const PPDKey* pKey = key.second.get(); char const* pSetupType = "<unknown>"; switch( pKey->m_eSetupType ) { |