[Libreoffice-commits] core.git: i18nutil/source

Caolán McNamara caolanm at redhat.com
Tue May 30 08:16:48 UTC 2017


 i18nutil/source/utility/paper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3f9fbca3011fe4f8fd6d34fa6fe4644dbaf3d3a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 30 09:14:45 2017 +0100

    coverity#1411565 'Constant' variable guards dead code
    
    on incomplete fix of
    
    commit 922e935c8812b1c1f94347bdbd7cdf277a75644e
    Date:   Mon May 29 17:08:06 2017 +0200
    
        i18nutil: fix invalid string copy that prevents startup
    
    for
    
    commit ef513fd4b049b214a03fbe6e62a5ea43680a7a9b
    Date:   Fri May 26 10:58:42 2017 +0200
    
        remove unnecessary use of OString::getStr
    
    Change-Id: I6cc56bae5e4a5c2fb235663bc6676cdea02b9701

diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 7e250024ebe4..d7c55a76eb1a 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -271,7 +271,8 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
 
                 if (ePaper == PAPER_USER)
                 {
-                    if (aPaper.startsWith("half"))
+                    bHalve = aPaper.startsWith("half");
+                    if (bHalve)
                     {
                         aPaper = aPaper.copy(4);
                     }


More information about the Libreoffice-commits mailing list