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

[Kohei Yoshida]

 chart2/source/controller/main/ChartController.hxx            |    2 -
 chart2/source/controller/main/ChartController_Properties.cxx |   17 +++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 06830a9abc549a8a881abfa168357a41dcc450c8
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Jul 21 23:19:15 2014 -0400

    LongAndWordyVariableNameReallyGetsToMyNerveReallyAndEvenMisspelled.
    
    Change-Id: Ifc6f876ca9e2ca77b2ab336ea0668697f32d4066

diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index a75f863..469dee2 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -544,7 +544,7 @@ private:
     void executeDispatch_ObjectProperties();
     void executeDispatch_FormatObject( const OUString& rDispatchCommand );
     void executeDlg_ObjectProperties( const OUString& rObjectCID );
-    bool                executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso );
+    bool executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bSuccessOnUnchanged );
 
     void executeDispatch_ChartType();
 
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 8daacd3..f6367fe 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -685,7 +685,8 @@ void ChartController::executeDlg_ObjectProperties( const OUString& rSelectedObje
         aUndoGuard.commit();
 }
 
-bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso )
+bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard(
+    const OUString& rObjectCID, bool bSuccessOnUnchanged )
 {
     //return true if the properties were changed successfully
     bool bRet = false;
@@ -763,7 +764,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri
         }
 
         //open the dialog
-        if( aDlg.Execute() == RET_OK || (bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso && aDlg.DialogWasClosedWithOK()) )
+        if (aDlg.Execute() == RET_OK || (bSuccessOnUnchanged && aDlg.DialogWasClosedWithOK()))
         {
             const SfxItemSet* pOutItemSet = aDlg.GetOutputItemSet();
             if(pOutItemSet)
commit a1d6f1dfd5855a82970119a1812caade20e22f7e
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Jul 21 23:16:06 2014 -0400

    scoped_ptr will do just fine here.
    
    Change-Id: I35701126963047f3e405a6560a90930de99ed3fa

diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 86e51c0..8daacd3 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -711,21 +711,21 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri
 
         boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
 
-        ::std::auto_ptr< ::comphelper::ItemConverter > apItemConverter(
+        boost::scoped_ptr<comphelper::ItemConverter> pItemConverter(
             createItemConverter( rObjectCID, getModel(), m_xCC,
                                  m_pDrawModelWrapper->getSdrModel(),
                                  ExplicitValueProvider::getExplicitValueProvider(m_xChartView),
                                  pRefSizeProv.get()));
-        SAL_WNODEPRECATED_DECLARATIONS_POP
-        if(!apItemConverter.get())
+
+        if (!pItemConverter)
             return bRet;
 
-        SfxItemSet aItemSet = apItemConverter->CreateEmptyItemSet();
+        SfxItemSet aItemSet = pItemConverter->CreateEmptyItemSet();
 
         if ( eObjectType == OBJECTTYPE_DATA_ERRORS_X || eObjectType == OBJECTTYPE_DATA_ERRORS_Y )
             aItemSet.Put(SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, eObjectType == OBJECTTYPE_DATA_ERRORS_Y ));
 
-        apItemConverter->FillItemSet( aItemSet );
+        pItemConverter->FillItemSet(aItemSet);
 
         //prepare dialog
         ObjectPropertiesDialogParameter aDialogParameter = ObjectPropertiesDialogParameter( rObjectCID );
@@ -769,7 +769,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri
             if(pOutItemSet)
             {
                 ControllerLockGuardUNO aCLGuard( getModel());
-                apItemConverter->ApplyItemSet( *pOutItemSet );//model should be changed now
+                pItemConverter->ApplyItemSet(*pOutItemSet); //model should be changed now
                 bRet = true;
             }
         }