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

[Libreoffice Gerrit user]

 sc/source/ui/condformat/condformatdlgentry.cxx |    1 +
 xmloff/source/draw/shapeexport.cxx             |   15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit d5b628720d78ccf842152db955a145473edbe14c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 9 04:45:22 2013 +0100

    move some OSL_* macros to SAL_WARN
    
    Change-Id: I8a5e158eabdbb92eec27a5753004e4f5e826c412

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 8a39d02..6d24694 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -513,9 +513,10 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
                                  com::sun::star::awt::Point* pRefPoint /* = NULL */,
                                  SvXMLAttributeList* pAttrList /* = NULL */ )
 {
+    SAL_WARN("xmloff", xShape->getShapeType());
     if( maCurrentShapesIter == maShapesInfos.end() )
     {
-        OSL_FAIL( "XMLShapeExport::exportShape(): no auto styles where collected before export" );
+        SAL_WARN( "xmloff", "XMLShapeExport::exportShape(): no auto styles where collected before export" );
         return;
     }
     sal_Int32 nZIndex = 0;
@@ -548,7 +549,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     }
     catch(const uno::Exception&)
     {
-        OSL_FAIL("XMLShapeExport::exportShape(): exception during hyperlink export");
+        SAL_WARN("xmloff", "XMLShapeExport::exportShape(): exception during hyperlink export");
     }
 
 
@@ -559,7 +560,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
 
     if( (sal_Int32)aShapeInfoVector.size() <= nZIndex )
     {
-        OSL_FAIL( "XMLShapeExport::exportShape(): no shape info collected for a given shape" );
+        SAL_WARN( "xmloff", "XMLShapeExport::exportShape(): no shape info collected for a given shape" );
         return;
     }
 
@@ -586,7 +587,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         XmlShapeType eShapeType(XmlShapeTypeNotYetSet);
         ImpCalcShapeType(xShape, eShapeType);
 
-        DBG_ASSERT( eShapeType == aShapeInfo.meShapeType, "exportShape callings do not correspond to collectShapeAutoStyles calls!" );
+        SAL_WARN_IF( eShapeType != aShapeInfo.meShapeType, "xmloff", "exportShape callings do not correspond to collectShapeAutoStyles calls!: " << xShape->getShapeType() );
     }
 #endif
 
@@ -915,7 +916,7 @@ void XMLShapeExport::collectShapesAutoStyles( const uno::Reference < drawing::XS
     for(sal_Int32 nShapeId = 0; nShapeId < nShapeCount; nShapeId++)
     {
         xShapes->getByIndex(nShapeId) >>= xShape;
-        DBG_ASSERT( xShape.is(), "Shape without a XShape?" );
+        SAL_WARN_IF( !xShape.is(), "xmloff", "Shape without a XShape?" );
         if(!xShape.is())
             continue;
 
@@ -938,7 +939,7 @@ void XMLShapeExport::exportShapes( const uno::Reference < drawing::XShapes >& xS
     for(sal_Int32 nShapeId = 0; nShapeId < nShapeCount; nShapeId++)
     {
         xShapes->getByIndex(nShapeId) >>= xShape;
-        DBG_ASSERT( xShape.is(), "Shape without a XShape?" );
+        SAL_WARN_IF( !xShape.is(), "xmloff", "Shape without a XShape?" );
         if(!xShape.is())
             continue;
 
@@ -1142,7 +1143,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
                     }
                     catch(const uno::Exception&)
                     {
-                        OSL_FAIL( "XMLShapeExport::ImpCalcShapeType(), expected ole shape to have the CLSID property?" );
+                        SAL_WARN( "xmloff", "XMLShapeExport::ImpCalcShapeType(), expected ole shape to have the CLSID property?" );
                     }
                 }
                 else if(aType.match("Chart", 26)) { eShapeType = XmlShapeTypePresChartShape;  }
commit 46c8aadec35b7057e00053d7b808d60e5bdabc72
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jan 8 23:53:19 2013 +0100

    set the list box entry for 3 entry color scales
    
    Change-Id: I5718d22e0c31bd645998bcbb508b31370cf36250

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 15f6f42..3406982 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -506,6 +506,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const
 
     FreeResource();
     maLbType.SelectEntryPos(2);
+    maLbColorFormat.SelectEntryPos(1);
 
     if(pFormat)
     {