[Libreoffice-commits] .: 2 commits - basic/source sc/source

[Libreoffice Gerrit user]

 basic/source/basmgr/basmgr.cxx         |    2 +-
 sc/source/filter/xml/xmlcondformat.cxx |    4 ++--
 sc/source/ui/docshell/macromgr.cxx     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7093444335d70db33bd798d72c6d64bb708713cd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 8 18:57:30 2012 +0100

    xmlcondformat: warning C4701 pot. uninitialized variable pEntry used
    
    Change-Id: Ic7edfe9c919cc2c0e3cd8b68d130919c4054686c

diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index 788d5b3..5c9bbe4 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -273,7 +273,7 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP
         case XML_TOK_FORMATTING_ENTRY:
         case XML_TOK_DATABAR_DATABARENTRY:
         {
-            ScColorScaleEntry* pEntry;
+            ScColorScaleEntry* pEntry(0);
             pContext = new ScXMLFormattingEntryContext( GetScImport(), nPrefix, rLocalName, xAttrList, pEntry );
             if(mpFormatData->mpLowerLimit)
             {
@@ -353,7 +353,7 @@ SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nP
     {
         case XML_TOK_FORMATTING_ENTRY:
             {
-                ScColorScaleEntry* pEntry;
+                ScColorScaleEntry* pEntry(0);
                 pContext = new ScXMLFormattingEntryContext( GetScImport(), nPrefix, rLocalName, xAttrList, pEntry );
                 mpFormatData->maEntries.push_back(pEntry);
             }
commit af452fda333da53132a4301c372c321798be9cae
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 8 18:54:01 2012 +0100

    fix more warning C4804 unsafe use of type bool
    
    ... from commit bbf1bcd9ad9cc0368aef4a4de41e9538f6ad91b0
    
    Change-Id: Ic8e52f6848e09a274133f2d8fd1c4044cae4b039

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index d177d73..14ffe09 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1243,7 +1243,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const OUString& rLibName,
     DBG_ASSERT( !aStorName.isEmpty(), "No Storage Name!" );
 
     OUString aStorageName = INetURLObject(aStorName, INET_PROT_FILE).GetMainURL( INetURLObject::NO_DECODE );
-    DBG_ASSERT(!aStorageName.isEmpty() != 0, "Bad storage name");
+    DBG_ASSERT(!aStorageName.isEmpty(), "Bad storage name");
 
     OUString aNewLibName( rLibName );
     while ( HasLib( aNewLibName ) )
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 66890f2..40bdb2e 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -147,7 +147,7 @@ void ScMacroManager::InitUserFuncData()
 
     Reference< container::XContainer > xModuleContainer;
     SfxObjectShell* pShell = mpDoc->GetDocumentShell();
-    if ( pShell && ! pShell->GetBasicManager()->GetName().isEmpty() > 0 )
+    if (pShell && !pShell->GetBasicManager()->GetName().isEmpty())
     {
         sProjectName = pShell->GetBasicManager()->GetName();
     }