8295a33447
We don't need E3D_INVENTOR_FLAG, we can just check if the SdrObjKind is
in the right range.
Which exposes some dodgy code in DrawViewShell::GetMenuStateSel
SfxItemState::DEFAULT == rSet.GetItemState( OBJ_TITLETEXT ) ||
SfxItemState::DEFAULT == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
which has been there ever since
commit f47a9d9db3
Date: Mon Sep 18 16:07:07 2000 +0000
initial import
just remove that.
In SwFEShell::ImpEndCreate() move some logic around to avoid
using an out-of-range SdrObjKind value
Change-Id: I4620bfe61aca8f7415503debe3c84bfe5f4368a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127763
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
231 lines
11 KiB
C++
231 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <dlgedfac.hxx>
|
|
#include <dlgedobj.hxx>
|
|
#include <dlgeddef.hxx>
|
|
#include <com/sun/star/container/XNameContainer.hpp>
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
|
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
|
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
#include <comphelper/processfactory.hxx>
|
|
|
|
namespace basctl
|
|
{
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
|
|
DlgEdFactory::DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ) : mxModel( xModel )
|
|
{
|
|
SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
|
|
}
|
|
|
|
|
|
DlgEdFactory::~DlgEdFactory() COVERITY_NOEXCEPT_FALSE
|
|
{
|
|
SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
|
|
}
|
|
|
|
|
|
IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
|
|
{
|
|
static const uno::Reference<lang::XMultiServiceFactory> xDialogSFact = [] {
|
|
uno::Reference<lang::XMultiServiceFactory> xFact;
|
|
uno::Reference< uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
|
|
uno::Reference< container::XNameContainer > xC( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.UnoControlDialogModel", xContext ), uno::UNO_QUERY );
|
|
if( xC.is() )
|
|
{
|
|
uno::Reference< lang::XMultiServiceFactory > xModFact( xC, uno::UNO_QUERY );
|
|
xFact = xModFact;
|
|
}
|
|
return xFact;
|
|
}();
|
|
|
|
SdrObject* pNewObj = nullptr;
|
|
if( (aParams.nInventor == SdrInventor::BasicDialog) &&
|
|
(aParams.nObjIdentifier >= SdrObjKind::BasicDialogPushButton) &&
|
|
(aParams.nObjIdentifier <= SdrObjKind::BasicDialogFormHorizontalScroll) )
|
|
{
|
|
switch( aParams.nObjIdentifier )
|
|
{
|
|
case SdrObjKind::BasicDialogPushButton:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlButtonModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogRadioButton:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlRadioButtonModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormRadio:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.RadioButton", xDialogSFact );
|
|
static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
|
|
break;
|
|
case SdrObjKind::BasicDialogCheckbox:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlCheckBoxModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormCheck:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.CheckBox", xDialogSFact );
|
|
static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
|
|
break;
|
|
case SdrObjKind::BasicDialogListbox:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlListBoxModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormList:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ListBox", xDialogSFact );
|
|
static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormCombo:
|
|
case SdrObjKind::BasicDialogCombobox:
|
|
{
|
|
DlgEdObj* pNew = nullptr;
|
|
if ( aParams.nObjIdentifier == SdrObjKind::BasicDialogCombobox )
|
|
pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlComboBoxModel", xDialogSFact );
|
|
else
|
|
{
|
|
pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ComboBox", xDialogSFact );
|
|
pNew->MakeDataAware( mxModel );
|
|
}
|
|
pNewObj = pNew;
|
|
try
|
|
{
|
|
uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
|
|
if (xPSet.is())
|
|
{
|
|
xPSet->setPropertyValue( DLGED_PROP_DROPDOWN, uno::Any(true));
|
|
}
|
|
}
|
|
catch(...)
|
|
{
|
|
}
|
|
}
|
|
break;
|
|
case SdrObjKind::BasicDialogGroupBox:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlGroupBoxModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogEdit:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlEditModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFixedText:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedTextModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogImageControl:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlImageControlModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogProgressbar:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlProgressBarModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogHorizontalScrollbar:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlScrollBarModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormHorizontalScroll:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ScrollBar", xDialogSFact );
|
|
static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormVerticalScroll:
|
|
case SdrObjKind::BasicDialogVerticalScrollbar:
|
|
{
|
|
DlgEdObj* pNew = nullptr;
|
|
if ( aParams.nObjIdentifier == SdrObjKind::BasicDialogVerticalScrollbar )
|
|
pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlScrollBarModel", xDialogSFact );
|
|
else
|
|
{
|
|
pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ScrollBar", xDialogSFact );
|
|
pNew->MakeDataAware( mxModel );
|
|
}
|
|
pNewObj = pNew;
|
|
// set vertical orientation
|
|
try
|
|
{
|
|
uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
|
|
if (xPSet.is())
|
|
{
|
|
xPSet->setPropertyValue( DLGED_PROP_ORIENTATION, uno::Any(sal_Int32(css::awt::ScrollBarOrientation::VERTICAL)) );
|
|
}
|
|
}
|
|
catch(...)
|
|
{
|
|
}
|
|
} break;
|
|
case SdrObjKind::BasicDialogHorizontalFixedLine:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedLineModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogVerticalFixedLine:
|
|
{
|
|
DlgEdObj* pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedLineModel", xDialogSFact );
|
|
pNewObj = pNew;
|
|
// set vertical orientation
|
|
try
|
|
{
|
|
uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
|
|
if (xPSet.is())
|
|
{
|
|
xPSet->setPropertyValue( DLGED_PROP_ORIENTATION, uno::Any(sal_Int32(1)) );
|
|
}
|
|
}
|
|
catch(...)
|
|
{
|
|
}
|
|
} break;
|
|
case SdrObjKind::BasicDialogDateField:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlDateFieldModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogTimeField:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlTimeFieldModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogNumericField:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlNumericFieldModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogCurencyField:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlCurrencyFieldModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormattedField:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFormattedFieldModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogPatternField:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlPatternFieldModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFileControl:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFileControlModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogSpinButton:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlSpinButtonModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogFormSpin:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.SpinButton", xDialogSFact );
|
|
static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
|
|
break;
|
|
case SdrObjKind::BasicDialogTreeControl:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.tree.TreeControlModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogGridControl:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.grid.UnoControlGridModel", xDialogSFact );
|
|
break;
|
|
case SdrObjKind::BasicDialogHyperlinkControl:
|
|
pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel", xDialogSFact );
|
|
break;
|
|
default:
|
|
break;
|
|
|
|
}
|
|
}
|
|
return pNewObj;
|
|
}
|
|
|
|
} // namespace basctl
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|