[Libreoffice-commits] core.git: chart2/source

Vasily Melenchuk Vasily.Melenchuk at cib.de
Sat Jan 13 21:40:15 UTC 2018


 chart2/source/controller/main/ChartController.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d28e10b095b4ee0986fbe86170928bf077da04b9
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date:   Fri Jan 12 13:27:08 2018 +0300

    Replacing newly written deprecated OSL_ENSURE by SAL_WARN_IF.
    
    It was mentioned at https://gerrit.libreoffice.org/44605 but that patch
    was already merged.
    
    Change-Id: I0b75bb3d23406d7e25fe4c0e0a2f26f3e69d37c5
    Reviewed-on: https://gerrit.libreoffice.org/47811
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 430c560dead2..b2b8dbdc9720 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1359,12 +1359,12 @@ void ChartController::executeDispatch_SourceData()
         // Ask parent document to create new data provider
         css::uno::Reference< com::sun::star::chart2::XDataProviderAccess > xCreatorDoc(
             rModel.getParent(), uno::UNO_QUERY );
-        OSL_ENSURE( xCreatorDoc.is(), "Invalid XDataProviderAccess" );
+        SAL_WARN_IF( !xCreatorDoc.is(), "chart2.main", "Invalid XDataProviderAccess" );
 
         if ( xCreatorDoc.is() )
         {
             uno::Reference< data::XDataProvider > xDataProvider = xCreatorDoc->createDataProvider();
-            OSL_ENSURE( xCreatorDoc.is(), "Data provider was not created" );
+            SAL_WARN_IF( !xDataProvider.is(), "chart2.main", "Data provider was not created" );
             if ( xDataProvider.is() )
             {
                 rModel.attachDataProvider(xDataProvider);


More information about the Libreoffice-commits mailing list