[Libreoffice-commits] core.git: .clang-format writerperfect/source

[Miklos Vajna (via logerrit)]

 .clang-format                                |    1 +
 writerperfect/source/writer/exp/txtparai.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 45324a9a405ffbd913ede64f3f5099b2c325539e
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Nov 13 21:47:43 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Nov 14 08:30:47 2019 +0100

    clang-format: don't fix up namespace comments
    
    Out clang-format-5.0.0 has this default, i.e. running
    solenv/clang-format/reformat-formatted-files after this change results
    in no changes.
    
    However, clang-format from git has that enabled by default for our
    config, so prepare for that unwanted change now. (5.0.0 gives no
    "unknown configuration key" errors for "FixNamespaceComments".)
    
    [ Still touch a formatted file to make sure CI tests the new config
    before it goes in. ]
    
    Change-Id: Ic4500e067cfb2dc10dc1f452598e8932771b31c9
    Reviewed-on: https://gerrit.libreoffice.org/82636
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/.clang-format b/.clang-format
index 797f22404a09..d16c2f72d040 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,6 +19,7 @@ IndentCaseLabels: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
+FixNamespaceComments: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 60
diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index 65f521c6a20f..a129db80763d 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -33,7 +33,7 @@ void FillStyle(const OUString& rName, std::map<OUString, librevenge::RVNGPropert
     const librevenge::RVNGPropertyList& rStyle = itStyle->second;
     if (rStyle["style:parent-style-name"])
     {
-        // Style has a parent.
+        // The style has a parent.
         OUString aParent = OStringToOUString(rStyle["style:parent-style-name"]->getStr().cstr(),
                                              RTL_TEXTENCODING_UTF8);
         if (!aParent.isEmpty())