diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/basegfx/polygon/b2dpolygontools.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/scrolladaptor.hxx | 2 | ||||
| -rw-r--r-- | include/systools/curlinit.hxx | 9 | ||||
| -rw-r--r-- | include/systools/opensslinit.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/toolkit/scrbar.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 1 |
6 files changed, 15 insertions, 6 deletions
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx index d21d0bb63b..a29d1fd06a 100644 --- a/include/basegfx/polygon/b2dpolygontools.hxx +++ b/include/basegfx/polygon/b2dpolygontools.hxx @@ -113,7 +113,7 @@ namespace basegfx::utils BASEGFX_DLLPUBLIC double getEdgeLength(const B2DPolygon& rCandidate, sal_uInt32 nIndex); /** get length of polygon */ - BASEGFX_DLLPUBLIC double getLength(const B2DPolygon& rCandidate, bool bApproximateBezierLength = false); + BASEGFX_DLLPUBLIC double getLength(const B2DPolygon& rCandidate); // get position on polygon for absolute given distance. If // length is given, it is assumed the correct polygon length, if 0.0 it is calculated diff --git a/include/svtools/scrolladaptor.hxx b/include/svtools/scrolladaptor.hxx index cdc507078c..1eba1dfdf8 100644 --- a/include/svtools/scrolladaptor.hxx +++ b/include/svtools/scrolladaptor.hxx @@ -71,6 +71,8 @@ public: void SetThickness(int nThickness); + void SetSwapArrows(bool bSwap = true); + ScrollAdaptor(vcl::Window* pParent, bool bHori); virtual void dispose() override; }; diff --git a/include/systools/curlinit.hxx b/include/systools/curlinit.hxx index d03c620a3c..4b226c7a42 100644 --- a/include/systools/curlinit.hxx +++ b/include/systools/curlinit.hxx @@ -13,12 +13,13 @@ #include <officecfg/Office/Security.hxx> -#if defined(LINUX) && !defined(SYSTEM_CURL) +// curl is built with --with-secure-transport on macOS and iOS so doesn't need these +// certs. Windows doesn't need them either, but lets assume everything else does +#if !defined(SYSTEM_OPENSSL) && !defined(_WIN32) && !defined(MACOSX) && !defined(IOS) #include <com/sun/star/uno/RuntimeException.hpp> #define LO_CURL_NEEDS_CA_BUNDLE #include "opensslinit.hxx" -#undef LO_CURL_NEEDS_CA_BUNDLE #endif #include <rtl/string.hxx> @@ -31,7 +32,7 @@ static void InitCurl_easy(CURL* const pCURL) CURLcode rc; (void)rc; -#if defined(LINUX) && !defined(SYSTEM_CURL) +#if defined(LO_CURL_NEEDS_CA_BUNDLE) char const* const path = GetCABundleFile(); rc = curl_easy_setopt(pCURL, CURLOPT_CAINFO, path); if (rc != CURLE_OK) // only if OOM? @@ -79,4 +80,6 @@ static void InitCurl_easy(CURL* const pCURL) assert(rc == CURLE_OK); } +#undef LO_CURL_NEEDS_CA_BUNDLE + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/systools/opensslinit.hxx b/include/systools/opensslinit.hxx index 04f38faa08..48b38cf675 100644 --- a/include/systools/opensslinit.hxx +++ b/include/systools/opensslinit.hxx @@ -13,8 +13,7 @@ // Also include/systools/curlinit.hxx needs GetCABundleFile() if // !defined(SYSTEM_CURL) it defines LO_CURL_NEEDS_CA_BUNDLE. -#if defined(LINUX) && (!defined(SYSTEM_OPENSSL) || defined(LO_CURL_NEEDS_CA_BUNDLE)) -#include <com/sun/star/uno/RuntimeException.hpp> +#if !defined(_WIN32) && (!defined(SYSTEM_OPENSSL) || defined(LO_CURL_NEEDS_CA_BUNDLE)) #include <unistd.h> @@ -27,6 +26,7 @@ static char const* GetCABundleFile() "/etc/pki/tls/certs/ca-bundle.trust.crt", "/etc/ssl/certs/ca-certificates.crt", "/var/lib/ca-certificates/ca-bundle.pem", + "/etc/ssl/cert.pem", // macOS has one at this location }; for (char const* const candidate : candidates) { diff --git a/include/vcl/toolkit/scrbar.hxx b/include/vcl/toolkit/scrbar.hxx index 6981b64fa6..363755fc41 100644 --- a/include/vcl/toolkit/scrbar.hxx +++ b/include/vcl/toolkit/scrbar.hxx @@ -57,6 +57,7 @@ private: ScrollType meScrollType; bool mbCalcSize; bool mbFullDrag; + bool mbSwapArrows; Link<ScrollBar*,void> maScrollHdl; Link<ScrollBar*,void> maEndScrollHdl; @@ -132,6 +133,8 @@ public: void SetEndScrollHdl( const Link<ScrollBar*,void>& rLink ) { maEndScrollHdl = rLink; } virtual Size GetOptimalSize() const override; + + void SetSwapArrows( bool bSwap ) { mbSwapArrows = bSwap; } }; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 2d8c4db085..fc585bdb10 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -2576,6 +2576,7 @@ public: virtual int get_scroll_thickness() const = 0; virtual void set_scroll_thickness(int nThickness) = 0; + virtual void set_scroll_swap_arrows(bool bSwap) = 0; virtual ScrollType get_scroll_type() const = 0; |