[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sw/Module_sw.mk sw/source unusedcode.easy

[Miklos Vajna]

 include/oox/drawingml/customshapeproperties.hxx |   14 --------------
 oox/source/drawingml/customshapeproperties.cxx  |   11 -----------
 sw/Module_sw.mk                                 |    5 +----
 sw/source/core/crsr/viscrs.cxx                  |    3 ++-
 unusedcode.easy                                 |    1 -
 5 files changed, 3 insertions(+), 31 deletions(-)

New commits:
commit f84fe39ca48955e01e37df2c8687c3b6387da2ea
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue May 6 21:51:34 2014 +0200

    sw: make CppunitTest_sw_uwriter a slowcheck
    
    It's annoying that after touching a cxx file from Library_sw, it's not
    enough to wait till it relinks, it also relinks CppunitTest_sw_uwriter
    as well. So turn that one into a slowcheck, this way 'make sw' doesn't
    relink it.
    
    Change-Id: I0a8d956f57e92a9c6f1f91b727f492ca4c92c599

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index fa10662..53a19bb 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -46,11 +46,8 @@ $(eval $(call gb_Module_add_targets,sw,\
 
 endif
 
-$(eval $(call gb_Module_add_check_targets,sw,\
-    CppunitTest_sw_uwriter \
-))
-
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
+    CppunitTest_sw_uwriter \
     CppunitTest_sw_htmlexport \
     CppunitTest_sw_macros_test \
     CppunitTest_sw_ooxmlexport \
commit 3507190c9b90afcc16846f284f52b429e4da2922
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue May 6 21:49:13 2014 +0200

    coverity#704855 Unchecked dynamic_cast
    
    Change-Id: I25f3d1f53451cd16f6fd05b1084af79fea56b803

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 64ad0fc..6a05a8c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -541,7 +541,8 @@ void SwShellCrsr::Show()
 {
     SwShellCrsr * pTmp = this;
     do {
-        pTmp->SwSelPaintRects::Show();
+        if (pTmp)
+            pTmp->SwSelPaintRects::Show();
     } while( this != ( pTmp = dynamic_cast<SwShellCrsr*>(pTmp->GetNext()) ) );
 }
 
commit c39f66023a4d208e98b287db3c3028442d7e76e1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue May 6 21:39:01 2014 +0200

    oox: unused CustomShapeProvider
    
    Change-Id: Ia8b23df9a78385f9129d5cea1195a8ba210113d2

diff --git a/include/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx
index c0753e0..d27fc66 100644
--- a/include/oox/drawingml/customshapeproperties.hxx
+++ b/include/oox/drawingml/customshapeproperties.hxx
@@ -104,20 +104,6 @@ struct Path2D
 };
 
 
-class CustomShapeProvider {
-protected:
-    struct ParameterPairData {
-        sal_uInt16 nFirstType;
-        sal_uInt16 nSecondType;
-        sal_uInt32 nFirstValue;
-        sal_uInt32 nSecondValue;
-    };
-    static com::sun::star::drawing::EnhancedCustomShapeParameterPair createParameterPair( const ParameterPairData *pData );
-public:
-    virtual ~CustomShapeProvider() {}
-    virtual PropertyMap getProperties() = 0;
-};
-
 class CustomShapeProperties
 {
 public:
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 1feec30..81171a3 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -369,17 +369,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
     }
 }
 
-com::sun::star::drawing::EnhancedCustomShapeParameterPair
-CustomShapeProvider::createParameterPair( const ParameterPairData *pData )
-{
-    EnhancedCustomShapeParameterPair aParameterPair;
-    aParameterPair.First.Type = pData->nFirstType;
-    aParameterPair.First.Value = makeAny(pData->nFirstValue);
-    aParameterPair.Second.Type = pData->nSecondType;
-    aParameterPair.Second.Value = makeAny(pData->nSecondValue);
-    return aParameterPair;
-}
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 9cf9e88..3dd021b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -244,7 +244,6 @@ connectivity::sdbcx::OGroup::OGroup(bool)
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
 oglcanvas::CanvasHelper::flush() const
 oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
-oox::drawingml::CustomShapeProvider::createParameterPair(oox::drawingml::CustomShapeProvider::ParameterPairData const*)
 oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
 sc::CLBuildKernelThread::CLBuildKernelThread()
 sc::CLBuildKernelThread::consume()