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

Stephan Bergmann sbergman at redhat.com
Tue Jun 14 16:32:35 UTC 2016


 sw/source/uibase/config/modcfg.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25a60d19d56a4bdb4f1b6ef27d842f90617fcff8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 14 18:31:18 2016 +0200

    /org.openoffice.Office.Writer/FormLetter/MailingOutput/Format is xs:int
    
    ...i.e., sal_Int32
    
    Change-Id: Ib6adcfc40ee509f383fbd62093affe73ab92d61d

diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index b31dd36..4f4d37a 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1250,7 +1250,7 @@ void SwMiscConfig::ImplCommit()
             case 3 : pValues[nProp] <<= bGrfToGalleryAsLnk; break;
             case 4 : pValues[nProp] <<= bNumAlignSize; break;
             case 5 : pValues[nProp] <<= bSinglePrintJob; break;
-            case 6 : pValues[nProp] <<= static_cast<sal_uInt8>(nMailingFormats); break;
+            case 6 : pValues[nProp] <<= static_cast<sal_Int32>(nMailingFormats); break;
             case 7 : pValues[nProp] <<= sNameFromColumn;  break;
             case 8 : pValues[nProp] <<= sMailingPath;     break;
             case 9 : pValues[nProp] <<= sMailName;        break;
@@ -1282,7 +1282,7 @@ void SwMiscConfig::Load()
                 case 3 : bGrfToGalleryAsLnk = *o3tl::doAccess<bool>(pValues[nProp]); break;
                 case 4 : bNumAlignSize = *o3tl::doAccess<bool>(pValues[nProp]); break;
                 case 5 : bSinglePrintJob = *o3tl::doAccess<bool>(pValues[nProp]); break;
-                case 6 : nMailingFormats = static_cast<MailTextFormats>(*o3tl::doAccess<sal_Int8>(pValues[nProp])); break;
+                case 6 : nMailingFormats = static_cast<MailTextFormats>(*o3tl::doAccess<sal_Int32>(pValues[nProp])); break;
                 case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break;
                 case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp;  break;
                 case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp;     break;


More information about the Libreoffice-commits mailing list