chart2/source/controller/inc/ChartController.hxx | 7 +--
chart2/source/controller/main/ChartController.cxx | 12 ++++++
chart2/source/controller/main/ShapeController.cxx | 42 +++++++++++-----------
3 files changed, 36 insertions(+), 25 deletions(-)
New commits:
commit eb0218315aa4f564233e105a2cd1e0496a3f409e
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Mar 21 02:49:55 2017 +0100
Lets not call 1/2 of everyone we know friend...
...esp. when they tend try to own our private parts.
Lets be honest here. Also remove pointless dynamic_casts.
Change-Id: Ie6ef8a0c07a72aaa15e374e5ec6841520c0fafb1
Reviewed-on: https://gerrit.libreoffice.org/35599
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 40b31bc6ec00..7dfcfa688f56 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -102,7 +102,6 @@ class ChartController : public ::cppu::WeakImplHelper <
>
{
friend class DrawCommandDispatch;
- friend class ShapeController;
public:
ChartController() = delete;
@@ -322,15 +321,15 @@ public:
ViewElementListProvider getViewElementListProvider();
DrawModelWrapper* GetDrawModelWrapper();
+ DrawViewWrapper* GetDrawViewWrapper();
+ VclPtr<ChartWindow> GetChartWindow();
+ bool isAdditionalShapeSelected();
DECL_LINK( NotifyUndoActionHdl, SdrUndoAction*, void );
css::uno::Reference<css::uno::XInterface> const & getChartView();
private:
- DrawViewWrapper* GetDrawViewWrapper();
-
-private:
class TheModelRef;
friend class ChartController::TheModelRef;
class TheModel : public salhelper::SimpleReferenceObject
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 0322808af53a..f4e9f4c11fab 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1445,6 +1445,18 @@ DrawViewWrapper* ChartController::GetDrawViewWrapper()
return m_pDrawViewWrapper;
}
+
+VclPtr<ChartWindow> ChartController::GetChartWindow()
+{
+ return m_pChartWindow;
+}
+
+bool ChartController::isAdditionalShapeSelected()
+{
+ return m_aSelection.isAdditionalShapeSelected();
+}
+
+
uno::Reference< XAccessible > ChartController::CreateAccessible()
{
uno::Reference< XAccessible > xResult = new AccessibleChartView(
GetDrawViewWrapper() );
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index 478b0a18aa05..49d7de285103 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -244,10 +244,10 @@ void ShapeController::executeDispatch_FormatLine()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- vcl::Window* pParent = dynamic_cast< vcl::Window* >(
m_pChartController->m_pChartWindow.get() );
+ VclPtr<ChartWindow> pChartWindow( m_pChartController->GetChartWindow()
);
DrawModelWrapper* pDrawModelWrapper =
m_pChartController->GetDrawModelWrapper();
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
- if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
+ if ( pChartWindow && pDrawModelWrapper && pDrawViewWrapper )
{
SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
@@ -260,7 +260,7 @@ void ShapeController::executeDispatch_FormatLine()
if ( pFact )
{
ScopedVclPtr< SfxAbstractTabDialog > pDlg(
- pFact->CreateSvxLineTabDialog( pParent, &aAttr,
&pDrawModelWrapper->getSdrModel(),
+ pFact->CreateSvxLineTabDialog( pChartWindow, &aAttr,
&pDrawModelWrapper->getSdrModel(),
pSelectedObj, bHasMarked ) );
if ( pDlg->Execute() == RET_OK )
{
@@ -284,10 +284,10 @@ void ShapeController::executeDispatch_FormatArea()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- vcl::Window* pParent = dynamic_cast< vcl::Window* >(
m_pChartController->m_pChartWindow.get() );
+ VclPtr<ChartWindow> pChartWindow( m_pChartController->GetChartWindow()
);
DrawModelWrapper* pDrawModelWrapper =
m_pChartController->GetDrawModelWrapper();
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
- if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
+ if ( pChartWindow && pDrawModelWrapper && pDrawViewWrapper )
{
SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
@@ -299,7 +299,7 @@ void ShapeController::executeDispatch_FormatArea()
if ( pFact )
{
ScopedVclPtr< AbstractSvxAreaTabDialog > pDlg(
- pFact->CreateSvxAreaTabDialog( pParent, &aAttr,
&pDrawModelWrapper->getSdrModel(), true ) );
+ pFact->CreateSvxAreaTabDialog( pChartWindow, &aAttr,
&pDrawModelWrapper->getSdrModel(), true ) );
if ( pDlg.get() )
{
if ( pDlg->Execute() == RET_OK )
@@ -325,9 +325,9 @@ void ShapeController::executeDispatch_TextAttributes()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- vcl::Window* pParent = dynamic_cast< vcl::Window* >(
m_pChartController->m_pChartWindow.get() );
+ VclPtr<ChartWindow> pChartWindow( m_pChartController->GetChartWindow()
);
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
- if ( pParent && pDrawViewWrapper )
+ if ( pChartWindow && pDrawViewWrapper )
{
SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
@@ -339,7 +339,7 @@ void ShapeController::executeDispatch_TextAttributes()
if ( pFact )
{
ScopedVclPtr< SfxAbstractTabDialog > pDlg(
- pFact->CreateTextTabDialog( pParent, &aAttr,
pDrawViewWrapper ) );
+ pFact->CreateTextTabDialog( pChartWindow, &aAttr,
pDrawViewWrapper ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
@@ -362,9 +362,9 @@ void ShapeController::executeDispatch_TransformDialog()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- vcl::Window* pParent = dynamic_cast< vcl::Window* >(
m_pChartController->m_pChartWindow.get() );
+ VclPtr<ChartWindow> pChartWindow( m_pChartController->GetChartWindow()
);
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
- if ( pParent && pDrawViewWrapper )
+ if ( pChartWindow && pDrawViewWrapper )
{
SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
if ( pSelectedObj && pSelectedObj->GetObjIdentifier() ==
OBJ_CAPTION )
@@ -378,7 +378,7 @@ void ShapeController::executeDispatch_TransformDialog()
if ( pFact )
{
ScopedVclPtr< SfxAbstractTabDialog > pDlg(
- pFact->CreateCaptionDialog( pParent, pDrawViewWrapper
) );
+ pFact->CreateCaptionDialog( pChartWindow,
pDrawViewWrapper ) );
if ( pDlg.get() )
{
const sal_uInt16* pRange = pDlg->GetInputRanges(
*aAttr.GetPool() );
@@ -402,7 +402,7 @@ void ShapeController::executeDispatch_TransformDialog()
if ( pFact )
{
ScopedVclPtr< SfxAbstractTabDialog > pDlg(
- pFact->CreateSvxTransformTabDialog( pParent,
&aGeoAttr, pDrawViewWrapper ) );
+ pFact->CreateSvxTransformTabDialog( pChartWindow,
&aGeoAttr, pDrawViewWrapper ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
@@ -531,15 +531,15 @@ void ShapeController::executeDispatch_FontDialog()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- vcl::Window* pParent = dynamic_cast< vcl::Window* >(
m_pChartController->m_pChartWindow.get() );
+ VclPtr<ChartWindow> pChartWindow( m_pChartController->GetChartWindow()
);
DrawModelWrapper* pDrawModelWrapper =
m_pChartController->GetDrawModelWrapper();
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
- if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
+ if ( pChartWindow && pDrawModelWrapper && pDrawViewWrapper )
{
SfxItemSet aAttr( pDrawViewWrapper->GetModel()->GetItemPool() );
pDrawViewWrapper->GetAttributes( aAttr );
ViewElementListProvider aViewElementListProvider(
pDrawModelWrapper );
- ScopedVclPtrInstance< ShapeFontDialog > pDlg( pParent, &aAttr,
&aViewElementListProvider );
+ ScopedVclPtrInstance< ShapeFontDialog > pDlg( pChartWindow,
&aAttr, &aViewElementListProvider );
if ( pDlg->Execute() == RET_OK )
{
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
@@ -554,9 +554,9 @@ void ShapeController::executeDispatch_ParagraphDialog()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- vcl::Window* pParent = dynamic_cast< vcl::Window* >(
m_pChartController->m_pChartWindow.get() );
+ VclPtr<ChartWindow> pChartWindow( m_pChartController->GetChartWindow()
);
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
- if ( pParent && pDrawViewWrapper )
+ if ( pChartWindow && pDrawViewWrapper )
{
SfxItemPool& rPool = pDrawViewWrapper->GetModel()->GetItemPool();
SfxItemSet aAttr( rPool );
@@ -577,7 +577,7 @@ void ShapeController::executeDispatch_ParagraphDialog()
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
- ScopedVclPtrInstance< ShapeParagraphDialog > pDlg( pParent,
&aNewAttr );
+ ScopedVclPtrInstance< ShapeParagraphDialog > pDlg( pChartWindow,
&aNewAttr );
if ( pDlg->Execute() == RET_OK )
{
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
@@ -669,7 +669,7 @@ SdrObject* ShapeController::getLastAdditionalShape()
bool ShapeController::isBackwardPossible()
{
- if ( m_pChartController &&
m_pChartController->m_aSelection.isAdditionalShapeSelected() )
+ if ( m_pChartController && m_pChartController->isAdditionalShapeSelected()
)
{
SolarMutexGuard aGuard;
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
@@ -688,7 +688,7 @@ bool ShapeController::isBackwardPossible()
bool ShapeController::isForwardPossible()
{
- if ( m_pChartController &&
m_pChartController->m_aSelection.isAdditionalShapeSelected() )
+ if ( m_pChartController && m_pChartController->isAdditionalShapeSelected()
)
{
SolarMutexGuard aGuard;
DrawViewWrapper* pDrawViewWrapper =
m_pChartController->GetDrawViewWrapper();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
