Kaydet (Commit) 5ce65d04 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

chart2: cleanup local var assignments

and remove comments about a gcc 3.3 workaround.
some comments went obsolete with other commits
like 367105e0

Change-Id: I15fff464e2f71a6ade29c141bb17216770f54ced
Reviewed-on: https://gerrit.libreoffice.org/27127Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 22023b10
......@@ -169,7 +169,6 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
CheckDisposeState();
Reference< awt::XFont > xFont;
// using assignment for broken gcc 3.3
Reference< awt::XDevice > xDevice( Reference< awt::XWindow >( GetInfo().m_xWindow ), uno::UNO_QUERY );
if( xDevice.is())
......
......@@ -375,7 +375,6 @@ IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedHdl, Edit&, void)
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void)
{
OUString aRange = m_pED_Range->GetText();
// using assignment for broken gcc 3.3
OUString aTitle = m_pFTTitle->GetText();
lcl_enableRangeChoosing( true, m_pParentDialog );
......
......@@ -1382,7 +1382,7 @@ void ChartController::executeDispatch_SourceData()
if( !xChartDoc.is())
return;
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
UndoLiveUpdateGuard aUndoGuard(
SCH_RESSTR(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager );
if( xChartDoc.is())
{
......
......@@ -49,8 +49,7 @@ void ChartController::executeDispatch_EditData()
{
SolarMutexGuard aSolarGuard;
// using assignment for broken gcc 3.3
UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
UndoLiveUpdateGuardWithData aUndoGuard(
SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
m_xUndoManager );
ScopedVclPtrInstance<DataEditor> aDataEditorDialog( nullptr, xChartDoc, m_xCC );
......
......@@ -531,7 +531,6 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 )
uno::Reference< beans::XPropertySet > xEqProp( xRegCurve->getEquationProperties());
if( xEqProp.is())
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
......
......@@ -817,8 +817,7 @@ void ChartController::executeDispatch_View3D()
{
try
{
// using assignment for broken gcc 3.3
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
UndoLiveUpdateGuard aUndoGuard(
SCH_RESSTR( STR_ACTION_EDIT_3D_VIEW ),
m_xUndoManager );
......
......@@ -178,7 +178,6 @@ void ChartController::executeDispatch_NewArrangement()
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ));
if( xDiagram.is())
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
SCH_RESSTR( STR_ACTION_REARRANGE_CHART ),
m_xUndoManager );
......@@ -234,7 +233,6 @@ void ChartController::executeDispatch_NewArrangement()
void ChartController::executeDispatch_ScaleText()
{
SolarMutexGuard aSolarGuard;
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
SCH_RESSTR( STR_ACTION_SCALE_TEXT ),
m_xUndoManager );
......@@ -615,7 +613,6 @@ bool ChartController::executeDispatch_Delete()
{
case OBJECTTYPE_TITLE:
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )),
......@@ -634,7 +631,6 @@ bool ChartController::executeDispatch_Delete()
uno::Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY );
if( xLegendProp.is())
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )),
......@@ -681,7 +677,6 @@ bool ChartController::executeDispatch_Delete()
ObjectIdentifier::getFullParentParticle( aCID ), getModel()), uno::UNO_QUERY );
if( xRegCurveCnt.is())
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
......@@ -707,7 +702,6 @@ bool ChartController::executeDispatch_Delete()
if( xEqProp.is())
{
uno::Reference< frame::XModel > xModel( getModel() );
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
......@@ -741,7 +735,6 @@ bool ChartController::executeDispatch_Delete()
nId = STR_OBJECT_ERROR_BARS_Z;
uno::Reference< frame::XModel > xModel( getModel() );
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )),
......
......@@ -68,17 +68,9 @@ void UndoCommandDispatch::fireStatusEvent(
const bool bFireAll = rURL.isEmpty();
uno::Any aUndoState, aRedoState;
if( m_xUndoManager->isUndoPossible())
{
// using assignment for broken gcc 3.3
OUString aUndo = SvtResId( STR_UNDO ).toString();
aUndoState <<= ( aUndo + m_xUndoManager->getCurrentUndoActionTitle());
}
aUndoState <<= ( SVT_RESSTR( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
if( m_xUndoManager->isRedoPossible())
{
// using assignment for broken gcc 3.3
OUString aRedo = SvtResId( STR_REDO ).toString();
aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle());
}
aRedoState <<= ( SVT_RESSTR( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
if( bFireAll || rURL == ".uno:Undo" )
fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
......
......@@ -223,9 +223,7 @@ struct StaticChartTypeInfoHelper_Initializer
{
::cppu::OPropertyArrayHelper* operator()()
{
// using assignment for broken gcc 3.3
static ::cppu::OPropertyArrayHelper aPropHelper = ::cppu::OPropertyArrayHelper(
Sequence< beans::Property >() );
static ::cppu::OPropertyArrayHelper aPropHelper( Sequence< beans::Property >{} );
return &aPropHelper;
}
};
......
......@@ -102,9 +102,7 @@ struct StaticNetChartTypeInfoHelper_Initializer
{
::cppu::OPropertyArrayHelper* operator()()
{
// using assignment for broken gcc 3.3
static ::cppu::OPropertyArrayHelper aPropHelper = ::cppu::OPropertyArrayHelper(
Sequence< beans::Property >() );
static ::cppu::OPropertyArrayHelper aPropHelper(Sequence< beans::Property >{});
return &aPropHelper;
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment