sw/source/filter/basflt/fltini.cxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 2 +- sw/source/filter/ww8/ww8scan.hxx | 2 +- unotools/source/ucbhelper/ucblockbytes.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 55dc40bc85fa5f5b1491d4788eaee0fba415d017 Author: Stephan Bergmann <[email protected]> Date: Wed Dec 10 18:45:23 2014 +0100 Cargo cult? Change-Id: Ib04880eee7ffed621a97ca0f6c6f9896eb54df0d diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 196a3a4..136d085 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -426,7 +426,7 @@ const CharSetNameMap *GetCharSetNameMap() { static const CharSetNameMap aMapArr[] = { -# define IMPLENTRY(X) { RTL_TEXTENCODING_##X, "" #X "" } +# define IMPLENTRY(X) { RTL_TEXTENCODING_##X, #X } IMPLENTRY(DONTKNOW), IMPLENTRY(MS_1252), IMPLENTRY(APPLE_ROMAN), diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 145886d..f5b71fb 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star::lang; //-begin namespace SL { -# define IMPLCONSTSTRINGARRAY(X) const char a##X[] = "" #X "" +# define IMPLCONSTSTRINGARRAY(X) const char a##X[] = #X IMPLCONSTSTRINGARRAY(ObjectPool); IMPLCONSTSTRINGARRAY(1Table); IMPLCONSTSTRINGARRAY(0Table); diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index afcb415..2dec722 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -46,7 +46,7 @@ //Commonly used string literals for stream and storage names in word docs namespace SL { -# define DEFCONSTSTRINGARRAY(X) extern const char a##X[sizeof("" #X "")] +# define DEFCONSTSTRINGARRAY(X) extern const char a##X[sizeof(#X)] DEFCONSTSTRINGARRAY(ObjectPool); DEFCONSTSTRINGARRAY(1Table); DEFCONSTSTRINGARRAY(0Table); commit 4bb684274b5d80d04260b7ed6f6adf361ef9a26f Author: Stephan Bergmann <[email protected]> Date: Wed Dec 10 18:43:03 2014 +0100 This shall apparently check that aScheme is neither http nor https ...introduced when https was added in c21b8a1620808865d03239256221a6a86e6316f0 "INTEGRATION: CWS tkr05_SRC680: #31053# HTTPS WebDAV support" Change-Id: Id7c361a078008d66391771f26b9c35999404091f diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 1d38f4a..0ec9f47 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -875,7 +875,7 @@ static bool UCBOpenContentSync( return _UCBOpenContentSync( xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); - if ( !aScheme.equalsAscii( "http" ) || + if ( !aScheme.equalsAscii( "http" ) && !aScheme.equalsAscii( "https" ) ) xLockBytes->SetStreamValid_Impl(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
