[Libreoffice-commits] core.git: 5 commits - basctl/source bridges/source svl/source vcl/source writerfilter/source

[Julien Nabet]

 basctl/source/dlged/dlgedclip.cxx                     |    4 +---
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx |    1 -
 svl/source/config/ctloptions.cxx                      |    4 +---
 vcl/source/gdi/outdev.cxx                             |    4 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx     |    2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit aabee4ca0bc5dd9107a8f1a53349bd652c790627
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:57:54 2013 +0100

    cppcheck: fix consecutive break
    
    Change-Id: I028543f751ed8759f694cc4901d8c89d76867596

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index 8c57046..c923804 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -168,7 +168,6 @@ namespace
                         pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
                         pStackedArgs += 2;
                         break;
-                        break;
                     case typelib_TypeClass_BOOLEAN:
                     case typelib_TypeClass_BYTE:
                         pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
commit 0a17a19949abcb6077a1b4eecb88808c85ae6c11
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:56:58 2013 +0100

    cppcheck: fix var reassigned
    
    Change-Id: I10bb64672d02626814c162b09b8bdd615f7fcad8

diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 84ffcf6..7ff4c49 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -286,11 +286,9 @@ void SvtCTLOptions_Impl::Load()
 
     if (!m_bCTLFontEnabled)
     {
-        bool bAutoEnableCTL = false;
-
         sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM);
         //system locale is CTL
-        bAutoEnableCTL = (nScriptType & SCRIPTTYPE_COMPLEX);
+        bool bAutoEnableCTL = (nScriptType & SCRIPTTYPE_COMPLEX);
 
         LanguageType eSystemLanguage = LANGUAGE_SYSTEM;
 
commit 203fbb160534496a8385a5d4b254050514eaf5f6
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:44:59 2013 +0100

    cppcheck: fix var reassigned
    
    Change-Id: I9db36a231ea846929f8860d089d77d0126242c26

diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 68fbf4f..99b8684 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -53,8 +53,6 @@ DlgEdTransferableImpl::~DlgEdTransferableImpl()
 
 sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, const DataFlavor& rFlavor )
 {
-    bool bRet = false;
-
     // compare mime content types
     Reference< uno::XComponentContext >  xContext = getProcessComponentContext();
     Reference< datatransfer::XMimeContentTypeFactory >
@@ -67,7 +65,7 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, c
     OUString aLFullMediaType = xLType->getFullMediaType();
     OUString aRFullMediaType = xRType->getFullMediaType();
 
-    bRet = aLFullMediaType.equalsIgnoreAsciiCase( aRFullMediaType );
+    bool bRet = aLFullMediaType.equalsIgnoreAsciiCase( aRFullMediaType );
 
     return bRet;
 }
commit 8b29f1eb3b5614b9fde97f12b38faa16141bfdef
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:39:16 2013 +0100

    cppcheck: reduce scope
    
    Change-Id: I9a2e2387eb1d436cd64c1ca00276fe9256ef0c04

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 74d77e0..e10ba5b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2891,7 +2891,6 @@ void DomainMapper_Impl::CloseFieldCommand()
     {
         m_bSetUserFieldContent = false;
         FieldConversionMap_t aFieldConversionMap = lcl_GetFieldConversion();
-        bool bCreateEnhancedField = false;
 
         try
         {
@@ -2905,6 +2904,7 @@ void DomainMapper_Impl::CloseFieldCommand()
             FieldConversionMap_t::iterator aIt = aFieldConversionMap.find(sCommand);
             if(aIt != aFieldConversionMap.end())
             {
+                bool bCreateEnhancedField = false;
                 uno::Reference< beans::XPropertySet > xFieldProperties;
                 bool bCreateField = true;
                 switch (aIt->second.eFieldId)
commit 943e2930e7453857f229efe04ade85cb1dc87faf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:36:44 2013 +0100

    cppcheck: reduce scope
    
    Change-Id: Id3715b84a2328ca37fbc05d552fe58617ecfa78a

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 8009275..640c505 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -233,8 +233,6 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPo
         return;
 
     sal_uInt32          aStackAry1[OUTDEV_POLYPOLY_STACKBUF];
-    PCONSTSALPOINT      aStackAry2[OUTDEV_POLYPOLY_STACKBUF];
-    sal_uInt8*              aStackAry3[OUTDEV_POLYPOLY_STACKBUF];
     sal_uInt32*         pPointAry;
     PCONSTSALPOINT*     pPointAryAry;
     const sal_uInt8**       pFlagAryAry;
@@ -248,6 +246,8 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPo
     }
     else
     {
+        PCONSTSALPOINT  aStackAry2[OUTDEV_POLYPOLY_STACKBUF];
+        sal_uInt8*      aStackAry3[OUTDEV_POLYPOLY_STACKBUF];
         pPointAry       = aStackAry1;
         pPointAryAry    = aStackAry2;
         pFlagAryAry     = (const sal_uInt8**)aStackAry3;