[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang desktop/source

[Miklos Vajna]

 compilerplugins/clang/oncevar.cxx       |  146 --------------------------------
 compilerplugins/clang/store/oncevar.cxx |  146 ++++++++++++++++++++++++++++++++
 desktop/source/lib/init.cxx             |    2 
 3 files changed, 147 insertions(+), 147 deletions(-)

New commits:
commit 7ab4f31b6e23bc33ca9bb3bd6ca44da029148a8d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jun 23 09:43:21 2016 +0200

    compilerplugins: move oncevar into store
    
    As suggested by Stephan and agreed by Noel -- as its warnings are not
    useful in all cases.
    
    Change-Id: I3c6034ae9d3c74aeb089a67dc48c1f91a3ea3a21

diff --git a/compilerplugins/clang/oncevar.cxx b/compilerplugins/clang/store/oncevar.cxx
similarity index 100%
rename from compilerplugins/clang/oncevar.cxx
rename to compilerplugins/clang/store/oncevar.cxx
commit bb19a820e8ceec28bcb346b32f4288babc442720
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jun 23 09:42:42 2016 +0200

    Revert "desktop: fix loplugin:oncevar"
    
    This reverts commit 8dc2873081bff3fe7107d472a91a24af8b67a87d. Instead of
    working around the warning, the plugin will be disabled, as its warnings
    are not useful in all cases.

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0d0cdf2..ab765dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2007,7 +2007,7 @@ static void lo_setDocumentPassword(LibreOfficeKit* pThis,
 
 static char* lo_getVersionInfo(LibreOfficeKit* /*pThis*/)
 {
-    static const OUString sVersionStrTemplate(
+    const OUString sVersionStrTemplate(
         "{ "
         "\"ProductName\": \"%PRODUCTNAME\", "
         "\"ProductVersion\": \"%PRODUCTVERSION\", "