[Libreoffice-commits] core.git: Branch 'feature/polynomialregression' - 2 commits - chart2/source
Tomaž Vajngerl
quikee at gmail.com
Sun Jun 30 13:45:33 PDT 2013
chart2/source/controller/main/ChartController.cxx | 209 ++++++------
chart2/source/controller/main/ChartController_Window.cxx | 170 ++++-----
chart2/source/controller/main/ControllerCommandDispatch.cxx | 17
3 files changed, 202 insertions(+), 194 deletions(-)
New commits:
commit 8e302c5048cc44066c8ab7a7429afecb0932f41c
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Jun 30 22:27:07 2013 +0200
Change series and trendline pop-up to support more trendlines.
Change-Id: I70eb06d74670f54fa3792723711e9f73700f12ba
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 6150401..8e84ce5 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1301,7 +1301,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
void SAL_CALL ChartController::executeDispatch_SourceData()
{
-git gr //convert properties to ItemSet
+ //convert properties to ItemSet
uno::Reference< XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY );
OSL_ENSURE( xChartDoc.is(), "Invalid XChartDocument" );
if( !xChartDoc.is())
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 0c748f1..6c75158 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -229,10 +229,13 @@ const short HITPIX=2; //hit-tolerance in pixel
//-----------------------------------------------------------------
// awt::XWindow
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::setPosSize( sal_Int32 X, sal_Int32 Y
- , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::setPosSize(
+ sal_Int32 X,
+ sal_Int32 Y,
+ sal_Int32 Width,
+ sal_Int32 Height,
+ sal_Int16 Flags )
+ throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -251,9 +254,11 @@ const short HITPIX=2; //hit-tolerance in pixel
sal_Int32 nScaleXDenominator = aModelPageSize.Width;
sal_Int32 nScaleYNumerator = aLogicSize.Height();
sal_Int32 nScaleYDenominator = aModelPageSize.Height;
- MapMode aNewMapMode( MAP_100TH_MM, Point(0,0)
- , Fraction(nScaleXNumerator,nScaleXDenominator)
- , Fraction(nScaleYNumerator,nScaleYDenominator) );
+ MapMode aNewMapMode(
+ MAP_100TH_MM,
+ Point(0,0),
+ Fraction(nScaleXNumerator, nScaleXDenominator),
+ Fraction(nScaleYNumerator, nScaleYDenominator) );
m_pChartWindow->SetMapMode(aNewMapMode);
m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );
@@ -290,12 +295,11 @@ const short HITPIX=2; //hit-tolerance in pixel
}
}
- awt::Rectangle SAL_CALL ChartController
-::getPosSize()
- throw (uno::RuntimeException)
+awt::Rectangle SAL_CALL ChartController::getPosSize()
+ throw (uno::RuntimeException)
{
//@todo
- awt::Rectangle aRet(0,0,0,0);
+ awt::Rectangle aRet(0, 0, 0, 0);
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
if(xWindow.is())
@@ -304,9 +308,8 @@ const short HITPIX=2; //hit-tolerance in pixel
return aRet;
}
- void SAL_CALL ChartController
-::setVisible( sal_Bool Visible )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::setVisible( sal_Bool Visible )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -315,9 +318,8 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->setVisible( Visible );
}
- void SAL_CALL ChartController
-::setEnable( sal_Bool Enable )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::setEnable( sal_Bool Enable )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -326,8 +328,8 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->setEnable( Enable );
}
- void SAL_CALL ChartController
-::setFocus() throw (uno::RuntimeException)
+void SAL_CALL ChartController::setFocus()
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -336,10 +338,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->setFocus();
}
- void SAL_CALL ChartController
-::addWindowListener( const uno::Reference<
- awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addWindowListener(
+ const uno::Reference< awt::XWindowListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -348,10 +349,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->addWindowListener( xListener );
}
- void SAL_CALL ChartController
-::removeWindowListener( const uno::Reference<
- awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removeWindowListener(
+ const uno::Reference< awt::XWindowListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -360,10 +360,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->removeWindowListener( xListener );
}
- void SAL_CALL ChartController
-::addFocusListener( const uno::Reference<
- awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addFocusListener(
+ const uno::Reference< awt::XFocusListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -372,10 +371,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->addFocusListener( xListener );
}
- void SAL_CALL ChartController
-::removeFocusListener( const uno::Reference<
- awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removeFocusListener(
+ const uno::Reference< awt::XFocusListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -384,10 +382,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->removeFocusListener( xListener );
}
- void SAL_CALL ChartController
-::addKeyListener( const uno::Reference<
- awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addKeyListener(
+ const uno::Reference< awt::XKeyListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -396,10 +393,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->addKeyListener( xListener );
}
- void SAL_CALL ChartController
-::removeKeyListener( const uno::Reference<
- awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removeKeyListener(
+ const uno::Reference< awt::XKeyListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -408,10 +404,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->removeKeyListener( xListener );
}
- void SAL_CALL ChartController
-::addMouseListener( const uno::Reference<
- awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addMouseListener(
+ const uno::Reference< awt::XMouseListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -420,10 +415,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->addMouseListener( xListener );
}
- void SAL_CALL ChartController
-::removeMouseListener( const uno::Reference<
- awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removeMouseListener(
+ const uno::Reference< awt::XMouseListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -432,10 +426,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->removeMouseListener( xListener );
}
- void SAL_CALL ChartController
-::addMouseMotionListener( const uno::Reference<
- awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addMouseMotionListener(
+ const uno::Reference< awt::XMouseMotionListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -444,10 +437,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->addMouseMotionListener( xListener );
}
- void SAL_CALL ChartController
-::removeMouseMotionListener( const uno::Reference<
- awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removeMouseMotionListener(
+ const uno::Reference< awt::XMouseMotionListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -456,10 +448,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->removeMouseMotionListener( xListener );
}
- void SAL_CALL ChartController
-::addPaintListener( const uno::Reference<
- awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addPaintListener(
+ const uno::Reference< awt::XPaintListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -468,10 +459,9 @@ const short HITPIX=2; //hit-tolerance in pixel
xWindow->addPaintListener( xListener );
}
- void SAL_CALL ChartController
-::removePaintListener( const uno::Reference<
- awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removePaintListener(
+ const uno::Reference< awt::XPaintListener >& xListener )
+ throw (uno::RuntimeException)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -507,7 +497,7 @@ void ChartController::execute_Paint( const Rectangle& rRect )
uno::Reference< beans::XPropertySet > xProp( m_xChartView, uno::UNO_QUERY );
if( xProp.is() )
{
- awt::Size aResolution(1000,1000);
+ awt::Size aResolution(1000, 1000);
{
SolarMutexGuard aGuard;
if( m_pChartWindow )
@@ -583,9 +573,12 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl)
if( m_pChartWindow )
{
Window::PointerState aPointerState( m_pChartWindow->GetPointerState() );
- MouseEvent aMouseEvent( aPointerState.maPos,1/*nClicks*/,
- 0/*nMode*/, static_cast< sal_uInt16 >( aPointerState.mnState )/*nButtons*/,
- 0/*nModifier*/ );
+ MouseEvent aMouseEvent(
+ aPointerState.maPos,
+ 1/*nClicks*/,
+ 0/*nMode*/,
+ static_cast< sal_uInt16 >( aPointerState.mnState )/*nButtons*/,
+ 0/*nModifier*/ );
impl_SetMousePointer( aMouseEvent );
}
}
@@ -687,8 +680,11 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
return;
}
- m_aSelection.adaptSelectionToNewPos( aMPos, pDrawViewWrapper
- , rMEvt.IsRight(), m_bWaitingForDoubleClick );
+ m_aSelection.adaptSelectionToNewPos(
+ aMPos,
+ pDrawViewWrapper,
+ rMEvt.IsRight(),
+ m_bWaitingForDoubleClick );
if( !m_aSelection.isRotateableObjectSelected( getModel() ) )
{
@@ -699,7 +695,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
m_aSelection.applySelection(pDrawViewWrapper);
}
if( m_aSelection.isDragableObjectSelected()
- && !rMEvt.IsRight() )
+ && !rMEvt.IsRight() )
{
//start drag
sal_uInt16 nDrgLog = (sal_uInt16)m_pChartWindow->PixelToLogic(Size(DRGPIX,0)).Width();
@@ -759,12 +755,11 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
impl_SetMousePointer( rMEvt );
}
+
void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ )
{
}
-//-----------------
-
void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
{
ControllerLockGuard aCLGuard( getModel() );
@@ -971,10 +966,12 @@ void ChartController::execute_Resize()
if(m_pChartWindow)
m_pChartWindow->Invalidate();
}
+
void ChartController::execute_Activate()
{
///// pDrawViewWrapper->SetEditMode(sal_True);
}
+
void ChartController::execute_Deactivate()
{
/*
@@ -982,9 +979,11 @@ void ChartController::execute_Deactivate()
this->ReleaseMouse();
*/
}
+
void ChartController::execute_GetFocus()
{
}
+
void ChartController::execute_LoseFocus()
{
//this->ReleaseMouse();
@@ -1133,8 +1132,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataLabels" );
- if( xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendline" );
+ //if( xTrendline.is() )
+ // lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendline" );
if( bHasEquation )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" );
if( xMeanValue.is() )
@@ -1148,10 +1147,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( !bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertDataLabels" );
- if( !xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendline" );
- else if( !bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" );
+
+ //if( !xTrendline.is() )
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendline" );
+ //else if( !bHasEquation )
+ //lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" );
+
if( !xMeanValue.is() )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMeanValue" );
if( !bHasXErrorBars )
@@ -1162,8 +1163,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteDataLabels" );
- if( xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" );
+ //if( xTrendline.is() )
+ // lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" );
if( bHasEquation )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendlineEquation" );
if( xMeanValue.is() )
@@ -1195,6 +1196,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
else if( OBJECTTYPE_DATA_CURVE == eObjectType )
{
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquationAndR2" );
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index f4c1669..6731998 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -242,12 +242,12 @@ void ControllerState::update(
if( xRegCurveCnt.is())
{
uno::Reference< chart2::XRegressionCurve > xRegCurve( RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) );
- bMayFormatTrendline = bMayDeleteTrendline = xRegCurve.is();
+ // Trendline
+ bMayAddTrendline = true;
+
+ // Mean Value
bMayFormatMeanValue = bMayDeleteMeanValue = RegressionCurveHelper::hasMeanValueLine( xRegCurveCnt );
- bMayAddTrendline = ! bMayDeleteTrendline;
bMayAddMeanValue = ! bMayDeleteMeanValue;
- bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = RegressionCurveHelper::hasEquation( xRegCurve );
- bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
}
}
@@ -275,8 +275,11 @@ void ControllerState::update(
if( aObjectType == OBJECTTYPE_DATA_CURVE )
{
bMayFormatTrendline = true;
+ bMayDeleteTrendline = true;
uno::Reference< chart2::XRegressionCurve > xRegCurve(
ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY );
+
+ // Trendline Equation
bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = RegressionCurveHelper::hasEquation( xRegCurve );
bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
}
@@ -286,10 +289,10 @@ void ControllerState::update(
bool bHasR2Value = false;
try
{
- uno::Reference< beans::XPropertySet > xEqProp(
+ uno::Reference< beans::XPropertySet > xEquationProperties(
ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY );
- if( xEqProp.is())
- xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value;
+ if( xEquationProperties.is() )
+ xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value;
}
catch(const uno::RuntimeException& e)
{
commit b0e2aea989673a3daffb3d16c54fb9e950529b6a
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Jun 30 21:14:30 2013 +0200
Cleanup ChartController
Change-Id: Ife0289003afe8f10db7ce3f6d9207087a5ac8e76
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index a98803a..6150401 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -98,26 +98,26 @@ DBG_NAME(ChartController)
// ChartController Constructor and Destructor
//-----------------------------------------------------------------
-ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext)
- : m_aLifeTimeManager( NULL )
- , m_bSuspended( sal_False )
- , m_bCanClose( sal_True )
- , m_xCC(xContext) //@todo is it allowed to hold this context??
- , m_xFrame( NULL )
- , m_aModelMutex()
- , m_aModel( NULL, m_aModelMutex )
- , m_pChartWindow( NULL )
- , m_xViewWindow()
- , m_xChartView()
- , m_pDrawModelWrapper()
- , m_pDrawViewWrapper(NULL)
- , m_eDragMode(SDRDRAG_MOVE)
- , m_bWaitingForDoubleClick(false)
- , m_bWaitingForMouseUp(false)
- , m_bConnectingToView(false)
- , m_xUndoManager( 0 )
- , m_aDispatchContainer( m_xCC, this )
- , m_eDrawMode( CHARTDRAW_SELECT )
+ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext) :
+ m_aLifeTimeManager( NULL ),
+ m_bSuspended( sal_False ),
+ m_bCanClose( sal_True ),
+ m_xCC(xContext), //@todo is it allowed to hold this context??
+ m_xFrame( NULL ),
+ m_aModelMutex(),
+ m_aModel( NULL, m_aModelMutex ),
+ m_pChartWindow( NULL ),
+ m_xViewWindow(),
+ m_xChartView(),
+ m_pDrawModelWrapper(),
+ m_pDrawViewWrapper(NULL),
+ m_eDragMode(SDRDRAG_MOVE),
+ m_bWaitingForDoubleClick(false),
+ m_bWaitingForMouseUp(false),
+ m_bConnectingToView(false),
+ m_xUndoManager( 0 ),
+ m_aDispatchContainer( m_xCC, this ),
+ m_eDrawMode( CHARTDRAW_SELECT )
{
DBG_CTOR(ChartController,NULL);
m_aDoubleClickTimer.SetTimeoutHdl( LINK( this, ChartController, DoubleClickWaitingHdl ) );
@@ -151,11 +151,11 @@ void ChartController::RefCountable::release()
//-----------------------------------------------------------------
-ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel )
- : m_xModel( xModel )
- , m_xCloseable( NULL )
- , m_bOwnership( sal_True )
- , m_bOwnershipIsWellKnown( sal_False )
+ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) :
+ m_xModel( xModel ),
+ m_xCloseable( NULL ),
+ m_bOwnership( sal_True ),
+ m_bOwnershipIsWellKnown( sal_False )
{
m_xCloseable =
uno::Reference< util::XCloseable >( xModel, uno::UNO_QUERY );
@@ -256,24 +256,25 @@ void ChartController::TheModel::tryTermination()
//-----------------------------------------------------------------
-ChartController::TheModelRef::TheModelRef( TheModel* pTheModel, ::osl::Mutex& rMutex )
- : m_pTheModel(pTheModel), m_rModelMutex(rMutex)
+ChartController::TheModelRef::TheModelRef( TheModel* pTheModel, osl::Mutex& rMutex ) :
+ m_pTheModel(pTheModel),
+ m_rModelMutex(rMutex)
{
- ::osl::Guard< ::osl::Mutex > aGuard( m_rModelMutex );
+ osl::Guard< osl::Mutex > aGuard( m_rModelMutex );
if(m_pTheModel)
m_pTheModel->acquire();
}
-ChartController::TheModelRef::TheModelRef( const TheModelRef& rTheModel, ::osl::Mutex& rMutex )
- : m_rModelMutex(rMutex)
+ChartController::TheModelRef::TheModelRef( const TheModelRef& rTheModel, ::osl::Mutex& rMutex ) :
+ m_rModelMutex(rMutex)
{
- ::osl::Guard< ::osl::Mutex > aGuard( m_rModelMutex );
+ osl::Guard< osl::Mutex > aGuard( m_rModelMutex );
m_pTheModel=rTheModel.operator->();
if(m_pTheModel)
m_pTheModel->acquire();
}
ChartController::TheModelRef& ChartController::TheModelRef::operator=(TheModel* pTheModel)
{
- ::osl::Guard< ::osl::Mutex > aGuard( m_rModelMutex );
+ osl::Guard< osl::Mutex > aGuard( m_rModelMutex );
if(m_pTheModel==pTheModel)
return *this;
if(m_pTheModel)
@@ -285,7 +286,7 @@ ChartController::TheModelRef& ChartController::TheModelRef::operator=(TheModel*
}
ChartController::TheModelRef& ChartController::TheModelRef::operator=(const TheModelRef& rTheModel)
{
- ::osl::Guard< ::osl::Mutex > aGuard( m_rModelMutex );
+ osl::Guard< osl::Mutex > aGuard( m_rModelMutex );
TheModel* pNew=rTheModel.operator->();
if(m_pTheModel==pNew)
return *this;
@@ -298,7 +299,7 @@ ChartController::TheModelRef& ChartController::TheModelRef::operator=(const TheM
}
ChartController::TheModelRef::~TheModelRef()
{
- ::osl::Guard< ::osl::Mutex > aGuard( m_rModelMutex );
+ osl::Guard< osl::Mutex > aGuard( m_rModelMutex );
if(m_pTheModel)
m_pTheModel->release();
}
@@ -312,8 +313,7 @@ sal_Bool ChartController::TheModelRef::is() const
// private methods
//-----------------------------------------------------------------
- sal_Bool ChartController
-::impl_isDisposedOrSuspended() const
+sal_Bool ChartController::impl_isDisposedOrSuspended() const
{
if( m_aLifeTimeManager.impl_isDisposed() )
return sal_True;
@@ -332,8 +332,7 @@ sal_Bool ChartController::TheModelRef::is() const
APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME)
- uno::Sequence< OUString > ChartController
-::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
@@ -346,8 +345,8 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
// XController
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::attachFrame( const uno::Reference<frame::XFrame>& xFrame )
+void SAL_CALL ChartController::attachFrame(
+ const uno::Reference<frame::XFrame>& xFrame )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -608,8 +607,8 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
return sal_True;
}
- uno::Reference< frame::XFrame > SAL_CALL ChartController
-::getFrame() throw(uno::RuntimeException)
+uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame()
+ throw(uno::RuntimeException)
{
//provides access to owner frame of this controller
//return the frame containing this controller
@@ -617,8 +616,8 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
return m_xFrame;
}
- uno::Reference< frame::XModel > SAL_CALL ChartController
-::getModel() throw(uno::RuntimeException)
+uno::Reference< frame::XModel > SAL_CALL ChartController::getModel()
+ throw(uno::RuntimeException)
{
//provides access to currently attached model
//returns the currently attached model
@@ -631,8 +630,8 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
return uno::Reference< frame::XModel > ();
}
- uno::Any SAL_CALL ChartController
-::getViewData() throw(uno::RuntimeException)
+uno::Any SAL_CALL ChartController::getViewData()
+ throw(uno::RuntimeException)
{
//provides access to current view status
//set of data that can be used to restore the current view status at later time
@@ -649,8 +648,8 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
return aRet;
}
- void SAL_CALL ChartController
-::restoreViewData( const uno::Any& /* Value */ )
+void SAL_CALL ChartController::restoreViewData(
+ const uno::Any& /* Value */ )
throw(uno::RuntimeException)
{
//restores the view status using the data gotten from a previous call to XController::getViewData()
@@ -662,9 +661,8 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
//// @todo integrate specialized implementation
}
- sal_Bool SAL_CALL ChartController
-::suspend( sal_Bool bSuspend )
- throw(uno::RuntimeException)
+sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend )
+ throw(uno::RuntimeException)
{
//is called to prepare the controller for closing the view
//bSuspend==true: force the controller to suspend his work
@@ -709,6 +707,7 @@ void ChartController::impl_createDrawViewController()
}
}
}
+
void ChartController::impl_deleteDrawViewController()
{
if( m_pDrawViewWrapper )
@@ -724,8 +723,8 @@ void ChartController::impl_deleteDrawViewController()
// XComponent (base of XController)
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::dispose() throw(uno::RuntimeException)
+void SAL_CALL ChartController::dispose()
+ throw(uno::RuntimeException)
{
try
{
@@ -824,8 +823,8 @@ void ChartController::impl_deleteDrawViewController()
}
}
- void SAL_CALL ChartController
-::addEventListener( const uno::Reference<lang::XEventListener>& xListener )
+void SAL_CALL ChartController::addEventListener(
+ const uno::Reference<lang::XEventListener>& xListener )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -836,9 +835,8 @@ void ChartController::impl_deleteDrawViewController()
m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener );
}
- void SAL_CALL ChartController
-::removeEventListener( const uno::Reference<
- lang::XEventListener>& xListener )
+void SAL_CALL ChartController::removeEventListener(
+ const uno::Reference<lang::XEventListener>& xListener )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -853,8 +851,9 @@ void ChartController::impl_deleteDrawViewController()
//-----------------------------------------------------------------
// util::XCloseListener
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership )
+void SAL_CALL ChartController::queryClosing(
+ const lang::EventObject& rSource,
+ sal_Bool bGetsOwnership )
throw(util::CloseVetoException, uno::RuntimeException)
{
//do not use the m_aControllerMutex here because this call is not allowed to block
@@ -885,8 +884,8 @@ void ChartController::impl_deleteDrawViewController()
}
}
- void SAL_CALL ChartController
-::notifyClosing( const lang::EventObject& rSource )
+void SAL_CALL ChartController::notifyClosing(
+ const lang::EventObject& rSource )
throw(uno::RuntimeException)
{
//Listener should deregister himself and relaese all references to the closing object.
@@ -915,7 +914,8 @@ void ChartController::impl_deleteDrawViewController()
}
}
-bool ChartController::impl_releaseThisModel( const uno::Reference< uno::XInterface > & xModel )
+bool ChartController::impl_releaseThisModel(
+ const uno::Reference< uno::XInterface > & xModel )
{
bool bReleaseModel = sal_False;
{
@@ -935,8 +935,8 @@ bool ChartController::impl_releaseThisModel( const uno::Reference< uno::XInterfa
//-----------------------------------------------------------------
// util::XEventListener (base of XCloseListener)
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::disposing( const lang::EventObject& rSource )
+void SAL_CALL ChartController::disposing(
+ const lang::EventObject& rSource )
throw(uno::RuntimeException)
{
if( !impl_releaseThisModel( rSource.Source ))
@@ -946,8 +946,11 @@ bool ChartController::impl_releaseThisModel( const uno::Reference< uno::XInterfa
}
}
-void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const uno::Any& /* aInfo */ )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::layoutEvent(
+ const lang::EventObject& aSource,
+ sal_Int16 eLayoutEvent,
+ const uno::Any& /* aInfo */ )
+ throw (uno::RuntimeException)
{
if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR )
{
@@ -967,6 +970,7 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, ::
namespace
{
+
bool lcl_isFormatObjectCommand( const OString& aCommand )
{
if( aCommand == "MainTitle"
@@ -1022,13 +1026,15 @@ bool lcl_isFormatObjectCommand( const OString& aCommand )
// else
return false;
}
+
} // anonymous namespace
- uno::Reference<frame::XDispatch> SAL_CALL ChartController
-::queryDispatch( const util::URL& rURL
- , const OUString& rTargetFrameName
- , sal_Int32 /* nSearchFlags */)
- throw(uno::RuntimeException)
+uno::Reference<frame::XDispatch> SAL_CALL
+ ChartController::queryDispatch(
+ const util::URL& rURL,
+ const OUString& rTargetFrameName,
+ sal_Int32 /* nSearchFlags */)
+ throw(uno::RuntimeException)
{
if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() )
{
@@ -1038,10 +1044,10 @@ bool lcl_isFormatObjectCommand( const OString& aCommand )
return uno::Reference< frame::XDispatch > ();
}
- uno::Sequence<uno::Reference<frame::XDispatch > > ChartController
-::queryDispatches( const uno::Sequence<
- frame::DispatchDescriptor>& xDescripts)
- throw(uno::RuntimeException)
+uno::Sequence<uno::Reference<frame::XDispatch > >
+ ChartController::queryDispatches(
+ const uno::Sequence<frame::DispatchDescriptor>& xDescripts )
+ throw(uno::RuntimeException)
{
if ( !m_aLifeTimeManager.impl_isDisposed() )
{
@@ -1054,10 +1060,10 @@ bool lcl_isFormatObjectCommand( const OString& aCommand )
// frame::XDispatch
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::dispatch( const util::URL& rURL
- , const uno::Sequence< beans::PropertyValue >& rArgs )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::dispatch(
+ const util::URL& rURL,
+ const uno::Sequence< beans::PropertyValue >& rArgs )
+ throw (uno::RuntimeException)
{
//@todo avoid OString
OString aCommand( OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
@@ -1237,18 +1243,18 @@ bool lcl_isFormatObjectCommand( const OString& aCommand )
}
}
- void SAL_CALL ChartController
-::addStatusListener( const uno::Reference<frame::XStatusListener >& /* xControl */
- , const util::URL& /* aURL */ )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::addStatusListener(
+ const uno::Reference<frame::XStatusListener >& /* xControl */,
+ const util::URL& /* aURL */ )
+ throw (uno::RuntimeException)
{
//@todo
}
- void SAL_CALL ChartController
-::removeStatusListener( const uno::Reference<frame::XStatusListener >& /* xControl */
- , const util::URL& /* aURL */ )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::removeStatusListener(
+ const uno::Reference<frame::XStatusListener >& /* xControl */,
+ const util::URL& /* aURL */ )
+ throw (uno::RuntimeException)
{
//@todo
}
@@ -1256,17 +1262,15 @@ bool lcl_isFormatObjectCommand( const OString& aCommand )
//-----------------------------------------------------------------
// XContextMenuInterception (optional interface)
//-----------------------------------------------------------------
- void SAL_CALL ChartController
-::registerContextMenuInterceptor( const uno::Reference<
- ui::XContextMenuInterceptor > & /* xInterceptor */)
+void SAL_CALL ChartController::registerContextMenuInterceptor(
+ const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */)
throw(uno::RuntimeException)
{
//@todo
}
- void SAL_CALL ChartController
-::releaseContextMenuInterceptor( const uno::Reference<
- ui::XContextMenuInterceptor > & /* xInterceptor */)
+void SAL_CALL ChartController::releaseContextMenuInterceptor(
+ const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */)
throw(uno::RuntimeException)
{
//@todo
@@ -1297,14 +1301,12 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
void SAL_CALL ChartController::executeDispatch_SourceData()
{
- //-------------------------------------------------------------
- //convert properties to ItemSet
+git gr //convert properties to ItemSet
uno::Reference< XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY );
OSL_ENSURE( xChartDoc.is(), "Invalid XChartDocument" );
if( !xChartDoc.is())
return;
- // using assignment for broken gcc 3.3
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
String( SchResId( STR_ACTION_EDIT_DATA_RANGES )), m_xUndoManager );
if( xChartDoc.is())
@@ -1356,10 +1358,10 @@ uno::Reference< uno::XInterface > SAL_CALL
}
uno::Reference< uno::XInterface > SAL_CALL
- ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier,
- const uno::Sequence< uno::Any >& /* Arguments */ )
- throw (uno::Exception,
- uno::RuntimeException)
+ ChartController::createInstanceWithArguments(
+ const OUString& ServiceSpecifier,
+ const uno::Sequence< uno::Any >& /* Arguments */ )
+ throw (uno::Exception, uno::RuntimeException)
{
// ignore Arguments
return createInstance( ServiceSpecifier );
@@ -1367,7 +1369,7 @@ uno::Reference< uno::XInterface > SAL_CALL
uno::Sequence< OUString > SAL_CALL
ChartController::getAvailableServiceNames()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException)
{
uno::Sequence< OUString > aServiceNames(1);
aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
@@ -1375,8 +1377,9 @@ uno::Sequence< OUString > SAL_CALL
}
// ____ XModifyListener ____
-void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ )
- throw (uno::RuntimeException)
+void SAL_CALL ChartController::modified(
+ const lang::EventObject& /* aEvent */ )
+ throw (uno::RuntimeException)
{
// the source can also be a subobject of the ChartModel
// @todo: change the source in ChartModel to always be the model itself ?
More information about the Libreoffice-commits
mailing list