[Libreoffice-commits] .: 4 commits - sc/inc sc/source sfx2/source

[Markus Mohrhard]

 sc/inc/scerrors.hxx              |    2 ++
 sc/source/core/data/fillinfo.cxx |    2 +-
 sc/source/filter/xml/xmlwrap.cxx |    6 +++---
 sfx2/source/doc/objembed.cxx     |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit c4c54573c6ae5e57fa7eb7d41e155997b829c2be
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 27 14:03:09 2012 +0200

    unify return type in this method
    
    Change-Id: I8db70cff48ce900db0710b30f94090ebd7d77c0a

diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index 83636dc..3115cc2 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -22,6 +22,8 @@
 
 #include <tools/errcode.hxx>
 
+#define SCERR_NONE 0
+
 // ERRCODE_CLASS_READ - file related, displays "Read-Error" in MsgBox
 #define SCERR_IMPORT_CONNECT        (   1 | ERRCODE_CLASS_READ | ERRCODE_AREA_SC )
 #define SCERR_IMPORT_OPEN           (   2 | ERRCODE_CLASS_READ | ERRCODE_AREA_SC )
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 22c4b64..acbc1fa 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -135,7 +135,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
                 sStream = sOldDocName;
             }
             else
-                return false;
+                return SCERR_NONE;
 
             aParserInput.aInputStream = xDocStream->getInputStream();
             uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY );
@@ -170,7 +170,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
         xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) );
     }
 
-    sal_uInt32 nReturn(0);
+    sal_uInt32 nReturn = SCERR_NONE;
     rDoc.SetRangeOverflowType(0);   // is modified by the importer if limits are exceeded
 
     uno::Reference<xml::sax::XDocumentHandler> xDocHandler(
commit 49bf4745fdde38278e0cd8b8bc6288bfd3c80594
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 27 13:58:56 2012 +0200

    this explicit conversion is unnecessary, use the implicit one
    
    Change-Id: I798a1cd56baa86c7ee08b5f47ec5149d8a4815de

diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 4aeb8b1..22c4b64 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -331,7 +331,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
 
     xml::sax::InputSource aParserInput;
     if (pMedium)
-        aParserInput.sSystemId = OUString(pMedium->GetName());
+        aParserInput.sSystemId = pMedium->GetName();
 
     if ( !xStorage.is() && pMedium )
         xStorage = pMedium->GetStorage();
commit 6baca4fcec1e2da240ac2e06bcb1fa1030c13d22
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 27 00:45:56 2012 +0200

    don't need to get this one for each cell
    
    Change-Id: I9aab49c7604add1d574949909f0ab8b867341b27

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index f3a01e9..743aa26 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -362,6 +362,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
         }
     }
 
+    ScConditionalFormatList* pCondFormList = GetCondFormList(nTab);
     for (nArrX=0; nArrX<=nX2+2; nArrX++)                    // links & rechts + 1
     {
         nX = (nArrX>0) ? nArrX-1 : MAXCOL+1;                    // negativ -> ungueltig
@@ -476,7 +477,6 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                         sal_uLong nConditional = ((const SfxUInt32Item&)pPattern->
                                                 GetItem(ATTR_CONDITIONAL)).GetValue();
 
-                        ScConditionalFormatList* pCondFormList = GetCondFormList(nTab);
                         const ScConditionalFormat* pCondForm = NULL;
                         if ( nConditional && pCondFormList )
                             pCondForm = pCondFormList->GetFormat( nConditional );
commit e794e50723778d0c6725a9a03c37699db0606ad6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 27 00:36:34 2012 +0200

    fix indentation
    
    Change-Id: Ia01aacf400826be63ce2ada8d57fc99ebb4ad552

diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 5a57186..ede1a20 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -236,7 +236,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
     if( pMtf )
         pMtf->Record( pDev );
 
-        Draw( pDev, rSetup, nAspect );
+    Draw( pDev, rSetup, nAspect );
 
     // Restore Device settings
     pDev->Pop();