summaryrefslogtreecommitdiff
path: root/basctl/source/dlged
diff options
context:
space:
mode:
Diffstat (limited to 'basctl/source/dlged')
-rw-r--r--basctl/source/dlged/dlged.cxx197
-rw-r--r--basctl/source/dlged/dlgedclip.cxx2
-rw-r--r--basctl/source/dlged/dlgedfac.cxx177
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx34
-rw-r--r--basctl/source/dlged/dlgedmod.cxx10
-rw-r--r--basctl/source/dlged/dlgedobj.cxx325
-rw-r--r--basctl/source/dlged/dlgedpage.cxx6
-rw-r--r--basctl/source/dlged/dlgedview.cxx8
-rw-r--r--basctl/source/dlged/managelang.cxx71
-rw-r--r--basctl/source/dlged/propbrw.cxx87
10 files changed, 431 insertions, 486 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f99dab40d4c3..abdc662802d8 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/awt/UnoControlDialog.hpp>
+#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/resource/StringResource.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/util/NumberFormatsSupplier.hpp>
@@ -43,10 +44,10 @@
#include <svx/svdpagv.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/print.hxx>
-#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <xmlscript/xml_helper.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
+#include <osl/diagnose.h>
namespace basctl
{
@@ -57,8 +58,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::io;
-constexpr OUStringLiteral aResourceResolverPropName = u"ResourceResolver";
-constexpr OUStringLiteral aDecorationPropName = u"Decoration";
+constexpr OUString aResourceResolverPropName = u"ResourceResolver"_ustr;
+constexpr OUString aDecorationPropName = u"Decoration"_ustr;
// DlgEdHint
@@ -123,7 +124,7 @@ void DlgEditor::ShowDialog()
if( !bDecoration )
{
xNewDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) );
- xNewDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
+ xNewDlgModPropSet->setPropertyValue( u"Title"_ustr, Any( OUString() ) );
}
}
catch(const UnknownPropertyException& )
@@ -181,14 +182,20 @@ DlgEditor::DlgEditor (
,pVScroll(nullptr)
,pDlgEdModel(new DlgEdModel())
,pDlgEdPage(new DlgEdPage(*pDlgEdModel))
- ,m_ClipboardDataFlavors(1)
- ,m_ClipboardDataFlavorsResource(2)
+ // set clipboard data flavors
+ ,m_ClipboardDataFlavors{ { /* MimeType */ u"application/vnd.sun.xml.dialog"_ustr,
+ /* HumanPresentableName */ u"Dialog 6.0"_ustr,
+ /* DataType */ cppu::UnoType<Sequence< sal_Int8 >>::get() } }
+ ,m_ClipboardDataFlavorsResource{ m_ClipboardDataFlavors[0],
+ { /* MimeType */ u"application/vnd.sun.xml.dialogwithresource"_ustr,
+ /* HumanPresentableName */ u"Dialog 8.0"_ustr,
+ /* DataType */ cppu::UnoType<Sequence< sal_Int8 >>::get() } }
,pObjFac(new DlgEdFactory(xModel))
,rWindow(rWindow_)
,pFunc(new DlgEdFuncSelect(*this))
,rLayout(rLayout_)
,eMode( DlgEditor::SELECT )
- ,eActObj( OBJ_DLG_PUSHBUTTON )
+ ,eActObj( SdrObjKind::BasicDialogPushButton )
,bFirstDraw(false)
,bCreateOK(true)
,bDialogModelChanged(false)
@@ -196,33 +203,22 @@ DlgEditor::DlgEditor (
,mnPaintGuard(0)
,m_xDocument( xModel )
{
- pDlgEdModel->GetItemPool().FreezeIdRanges();
- pDlgEdView.reset(new DlgEdView(*pDlgEdModel, rWindow_, *this));
+ pDlgEdView.reset(new DlgEdView(*pDlgEdModel, *rWindow_.GetOutDev(), *this));
pDlgEdModel->SetScaleUnit( MapUnit::Map100thMM );
SdrLayerAdmin& rAdmin = pDlgEdModel->GetLayerAdmin();
rAdmin.NewLayer( rAdmin.GetControlLayerName() );
- rAdmin.NewLayer( "HiddenLayer" );
+ rAdmin.NewLayer( u"HiddenLayer"_ustr );
pDlgEdModel->InsertPage(pDlgEdPage);
- // set clipboard data flavors
- m_ClipboardDataFlavors[0].MimeType = "application/vnd.sun.xml.dialog" ;
- m_ClipboardDataFlavors[0].HumanPresentableName = "Dialog 6.0" ;
- m_ClipboardDataFlavors[0].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
-
- m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0];
- m_ClipboardDataFlavorsResource[1].MimeType = "application/vnd.sun.xml.dialogwithresource" ;
- m_ClipboardDataFlavorsResource[1].HumanPresentableName = "Dialog 8.0" ;
- m_ClipboardDataFlavorsResource[1].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
-
aMarkIdle.SetInvokeHandler( LINK( this, DlgEditor, MarkTimeout ) );
rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) );
pDlgEdPage->SetSize( rWindow.PixelToLogic( Size(DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN) ) );
- pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0));
- pDlgEdView->SetLayerVisible( "HiddenLayer", false );
+ pDlgEdView->ShowSdrPage(pDlgEdView->GetModel().GetPage(0));
+ pDlgEdView->SetLayerVisible( u"HiddenLayer"_ustr, false );
pDlgEdView->SetMoveSnapOnlyTopLeft(true);
pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
@@ -240,7 +236,6 @@ DlgEditor::DlgEditor (
SetDialog(xDialogModel);
}
-
DlgEditor::~DlgEditor()
{
aMarkIdle.Stop();
@@ -248,7 +243,6 @@ DlgEditor::~DlgEditor()
::comphelper::disposeComponent( m_xControlContainer );
}
-
Reference< awt::XControlContainer > const & DlgEditor::GetWindowControlContainer()
{
if (!m_xControlContainer.is())
@@ -256,8 +250,7 @@ Reference< awt::XControlContainer > const & DlgEditor::GetWindowControlContainer
return m_xControlContainer;
}
-
-void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS )
+void DlgEditor::SetScrollBars(ScrollAdaptor* pHS, ScrollAdaptor* pVS)
{
pHScroll = pHS;
pVScroll = pVS;
@@ -265,7 +258,6 @@ void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS )
InitScrollBars();
}
-
void DlgEditor::InitScrollBars()
{
DBG_ASSERT( pHScroll, "DlgEditor::InitScrollBars: no horizontal scroll bar!" );
@@ -273,13 +265,13 @@ void DlgEditor::InitScrollBars()
if ( !pHScroll || !pVScroll )
return;
- Size aOutSize = rWindow.GetOutputSize();
+ Size aOutSize = rWindow.GetOutDev()->GetOutputSize();
Size aPgSize = pDlgEdPage->GetSize();
pHScroll->SetRange( Range( 0, aPgSize.Width() ));
pVScroll->SetRange( Range( 0, aPgSize.Height() ));
- pHScroll->SetVisibleSize( static_cast<sal_uLong>(aOutSize.Width()) );
- pVScroll->SetVisibleSize( static_cast<sal_uLong>(aOutSize.Height()) );
+ pHScroll->SetVisibleSize( aOutSize.Width() );
+ pVScroll->SetVisibleSize( aOutSize.Height() );
pHScroll->SetLineSize( aOutSize.Width() / 10 );
pVScroll->SetLineSize( aOutSize.Height() / 10 );
@@ -350,8 +342,8 @@ void DlgEditor::SetDialog( const uno::Reference< container::XNameContainer >& xU
pDlgEdForm = new DlgEdForm(*pDlgEdModel, *this);
uno::Reference< awt::XControlModel > xDlgMod( m_xUnoControlDialogModel , uno::UNO_QUERY );
pDlgEdForm->SetUnoControlModel(xDlgMod);
- static_cast<DlgEdPage*>(pDlgEdModel->GetPage(0))->SetDlgEdForm( pDlgEdForm );
- pDlgEdModel->GetPage(0)->InsertObject( pDlgEdForm );
+ static_cast<DlgEdPage*>(pDlgEdModel->GetPage(0))->SetDlgEdForm( pDlgEdForm.get() );
+ pDlgEdModel->GetPage(0)->InsertObject( pDlgEdForm.get() );
AdjustPageSize();
pDlgEdForm->SetRectFromProps();
pDlgEdForm->UpdateTabIndices(); // for backward compatibility
@@ -361,17 +353,10 @@ void DlgEditor::SetDialog( const uno::Reference< container::XNameContainer >& xU
if ( m_xUnoControlDialogModel.is() )
{
// get sequence of control names
- Sequence< OUString > aNames = m_xUnoControlDialogModel->getElementNames();
- const OUString* pNames = aNames.getConstArray();
- sal_Int32 nCtrls = aNames.getLength();
-
// create a map of tab indices and control names, sorted by tab index
IndexToNameMap aIndexToNameMap;
- for ( sal_Int32 i = 0; i < nCtrls; ++i )
+ for (auto& aName : m_xUnoControlDialogModel->getElementNames())
{
- // get name
- OUString aName( pNames[i] );
-
// get tab index
sal_Int16 nTabIndex = -1;
Any aCtrl = m_xUnoControlDialogModel->getByName( aName );
@@ -390,11 +375,11 @@ void DlgEditor::SetDialog( const uno::Reference< container::XNameContainer >& xU
Any aCtrl = m_xUnoControlDialogModel->getByName( indexToName.second );
Reference< css::awt::XControlModel > xCtrlModel;
aCtrl >>= xCtrlModel;
- DlgEdObj* pCtrlObj = new DlgEdObj(*pDlgEdModel);
+ rtl::Reference<DlgEdObj> pCtrlObj = new DlgEdObj(*pDlgEdModel);
pCtrlObj->SetUnoControlModel( xCtrlModel );
- pCtrlObj->SetDlgEdForm( pDlgEdForm );
- pDlgEdForm->AddChild( pCtrlObj );
- pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj );
+ pCtrlObj->SetDlgEdForm( pDlgEdForm.get() );
+ pDlgEdForm->AddChild( pCtrlObj.get() );
+ pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj.get() );
pCtrlObj->SetRectFromProps();
pCtrlObj->UpdateStep();
pCtrlObj->StartListening();
@@ -408,7 +393,7 @@ void DlgEditor::SetDialog( const uno::Reference< container::XNameContainer >& xU
void DlgEditor::ResetDialog ()
{
- DlgEdForm* pOldDlgEdForm = pDlgEdForm;
+ DlgEdForm* pOldDlgEdForm = pDlgEdForm.get();
DlgEdPage* pPage = static_cast<DlgEdPage*>(pDlgEdModel->GetPage(0));
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
bool bWasMarked = pDlgEdView->IsObjMarked( pOldDlgEdForm );
@@ -420,7 +405,7 @@ void DlgEditor::ResetDialog ()
pPage->SetDlgEdForm( nullptr );
SetDialog( m_xUnoControlDialogModel );
if( bWasMarked )
- pDlgEdView->MarkObj( pDlgEdForm, pPgView );
+ pDlgEdView->MarkObj( pDlgEdForm.get(), pPgView );
}
@@ -434,7 +419,7 @@ Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSup
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !m_xSupplier.is() )
{
- m_xSupplier = xSupplier;
+ m_xSupplier = std::move(xSupplier);
}
}
return m_xSupplier;
@@ -523,16 +508,13 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
pDlgEdForm->StartListening();
// set position and size of controls
- if (const size_t nObjCount = pDlgEdPage->GetObjCount())
+ for (const rtl::Reference<SdrObject>& pObj : *pDlgEdPage)
{
- for (size_t i = 0 ; i < nObjCount ; ++i)
+ if (DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pObj.get()))
{
- if (DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pDlgEdPage->GetObj(i)))
+ if (!dynamic_cast<DlgEdForm*>(pDlgEdObj))
{
- if (!dynamic_cast<DlgEdForm*>(pDlgEdObj))
- {
- pDlgEdObj->SetRectFromProps();
- }
+ pDlgEdObj->SetRectFromProps();
}
}
}
@@ -544,27 +526,20 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
const vcl::Region aPaintRectRegion(aPaintRect);
- // #i74769#
- SdrPaintWindow* pTargetPaintWindow = nullptr;
-
// mark repaint start
if (pPgView)
{
- pTargetPaintWindow = pPgView->GetView().BeginDrawLayers(&rRenderContext, aPaintRectRegion);
- OSL_ENSURE(pTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)");
- }
+ // #i74769#
+ SdrPaintWindow* pTargetPaintWindow(pPgView->GetView().BeginDrawLayers(&rRenderContext, aPaintRectRegion));
+ assert(pTargetPaintWindow && "BeginDrawLayers: Got no SdrPaintWindow (!)");
- // draw background self using wallpaper
- // #i79128# ...and use correct OutDev for that
- if (pTargetPaintWindow)
- {
+ // draw background self using wallpaper
+ // #i79128# ...and use correct OutDev for that
+ Color maBackColor = rRenderContext.GetSettings().GetStyleSettings().GetLightColor();
OutputDevice& rTargetOutDev = pTargetPaintWindow->GetTargetOutputDevice();
- rTargetOutDev.DrawWallpaper(aPaintRect, Wallpaper(COL_WHITE));
- }
+ rTargetOutDev.DrawWallpaper(aPaintRect, Wallpaper(maBackColor));
- // do paint (unbuffered) and mark repaint end
- if (pPgView)
- {
+ // do paint (unbuffered) and mark repaint end
// paint of control layer is done in EndDrawLayers anyway...
pPgView->GetView().EndDrawLayers(*pTargetPaintWindow, true);
}
@@ -611,12 +586,12 @@ void DlgEditor::SetInsertObj(SdrObjKind eObj)
void DlgEditor::CreateDefaultObject()
{
// create object by factory
- SdrObject* pObj = SdrObjFactory::MakeNewObject(
+ rtl::Reference<SdrObject> pObj = SdrObjFactory::MakeNewObject(
*pDlgEdModel,
pDlgEdView->GetCurrentObjInventor(),
pDlgEdView->GetCurrentObjIdentifier());
- DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pObj);
+ DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pObj.get());
if (!pDlgEdObj)
return;
@@ -629,6 +604,8 @@ void DlgEditor::CreateDefaultObject()
// set default property values
pDlgEdObj->SetDefaults();
+ // set the form to which the new object belongs
+ pDlgEdObj->SetDlgEdForm(pDlgEdForm.get());
// insert object into drawing page
SdrPageView* pPageView = pDlgEdView->GetSdrPageView();
@@ -677,13 +654,9 @@ void DlgEditor::Copy()
if ( xClipDialogModel.is() )
{
- Sequence< OUString > aNames = xClipDialogModel->getElementNames();
- const OUString* pNames = aNames.getConstArray();
- sal_uInt32 nCtrls = aNames.getLength();
-
- for ( sal_uInt32 n = 0; n < nCtrls; n++ )
+ for (auto& rName : xClipDialogModel->getElementNames())
{
- xClipDialogModel->removeByName( pNames[n] );
+ xClipDialogModel->removeByName(rName);
}
}
@@ -748,7 +721,7 @@ void DlgEditor::Copy()
{}
}
- DlgEdTransferableImpl* pTrans = nullptr;
+ rtl::Reference<DlgEdTransferableImpl> pTrans;
if( xStringResourcePersistence.is() )
{
// With resource, support old and new format
@@ -762,10 +735,8 @@ void DlgEditor::Copy()
xStream2->closeInput();
// Old format contains dialog with replaced ids
- Sequence< Any > aSeqData(2);
Any aNoResourceDialogModelBytesAny;
aNoResourceDialogModelBytesAny <<= NoResourceDialogModelBytes;
- aSeqData[0] = aNoResourceDialogModelBytesAny;
// New format contains dialog and resource
Sequence< sal_Int8 > aResData = xStringResourcePersistence->exportBinary();
@@ -791,18 +762,18 @@ void DlgEditor::Copy()
memcpy( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen );
memcpy( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen );
- aSeqData[1] <<= aCombinedData;
+ Sequence< Any > aSeqData
+ {
+ aNoResourceDialogModelBytesAny,
+ Any(aCombinedData)
+ };
pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavorsResource, aSeqData );
}
else
{
// No resource, support only old format
- Sequence< Any > aSeqData(1);
- Any aDialogModelBytesAny;
- aDialogModelBytesAny <<= DialogModelBytes;
- aSeqData[0] = aDialogModelBytesAny;
- pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavors , aSeqData );
+ pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavors , { Any(DialogModelBytes) } );
}
SolarMutexReleaser aReleaser;
xClipboard->setContents( pTrans , pTrans );
@@ -854,7 +825,7 @@ void DlgEditor::Paste()
// create clipboard dialog model from xml
Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
Reference< container::XNameContainer > xClipDialogModel( xContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.awt.UnoControlDialogModel", xContext ), uno::UNO_QUERY );
+ u"com.sun.star.awt.UnoControlDialogModel"_ustr, xContext ), uno::UNO_QUERY );
bool bSourceIsLocalized = false;
Sequence< sal_Int8 > DialogModelBytes;
@@ -866,27 +837,31 @@ void DlgEditor::Paste()
Any aCombinedDataAny = xTransf->getTransferData( m_ClipboardDataFlavorsResource[1] );
Sequence< sal_Int8 > aCombinedData;
aCombinedDataAny >>= aCombinedData;
- const sal_Int8* pCombinedData = aCombinedData.getConstArray();
sal_Int32 nTotalLen = aCombinedData.getLength();
-
- // Reading offset
- sal_Int32 nResOffset = 0;
- sal_Int32 nFactor = 1;
- for( sal_Int16 i = 0; i < 4; i++ )
+ if (nTotalLen > 4)
{
- nResOffset += nFactor * sal_uInt8( pCombinedData[i] );
- nFactor *= 256;
- }
+ // Reading offset
+ sal_Int32 nResOffset = 0;
+ sal_Int32 nFactor = 1;
+ for (sal_Int16 i = 0; i < 4; i++)
+ {
+ nResOffset += nFactor * sal_uInt8(aCombinedData[i]);
+ nFactor *= 256;
+ }
+
+ if (nResOffset > nTotalLen || nResOffset < 0)
+ nResOffset = nTotalLen;
- sal_Int32 nResDataLen = nTotalLen - nResOffset;
- sal_Int32 nDialogDataLen = nTotalLen - nResDataLen - 4;
+ sal_Int32 nResDataLen = nTotalLen - nResOffset;
+ sal_Int32 nDialogDataLen = nTotalLen - nResDataLen - 4;
- DialogModelBytes.realloc( nDialogDataLen );
- memcpy( DialogModelBytes.getArray(), pCombinedData + 4, nDialogDataLen );
+ DialogModelBytes.realloc(nDialogDataLen);
+ memcpy(DialogModelBytes.getArray(), aCombinedData.getConstArray() + 4, nDialogDataLen);
- aResData.realloc( nResDataLen );
- memcpy( aResData.getArray(), pCombinedData + nResOffset, nResDataLen );
+ aResData.realloc(nResDataLen);
+ memcpy(aResData.getArray(), aCombinedData.getConstArray() + nResOffset, nResDataLen);
+ }
}
else
{
@@ -905,18 +880,16 @@ void DlgEditor::Paste()
return;
Sequence< OUString > aNames = xClipDialogModel->getElementNames();
- const OUString* pNames = aNames.getConstArray();
- sal_uInt32 nCtrls = aNames.getLength();
Reference< resource::XStringResourcePersistence > xStringResourcePersistence;
- if( nCtrls > 0 && bSourceIsLocalized )
+ if (aNames.hasElements() && bSourceIsLocalized)
{
xStringResourcePersistence = css::resource::StringResource::create( getProcessComponentContext() );
xStringResourcePersistence->importBinary( aResData );
}
- for( sal_uInt32 n = 0; n < nCtrls; n++ )
+ for (auto& rName : aNames)
{
- Any aA = xClipDialogModel->getByName( pNames[n] );
+ Any aA = xClipDialogModel->getByName(rName);
Reference< css::awt::XControlModel > xCM;
aA >>= xCM;
@@ -924,9 +897,9 @@ void DlgEditor::Paste()
Reference< util::XCloneable > xClone( xCM, uno::UNO_QUERY );
Reference< awt::XControlModel > xCtrlModel( xClone->createClone(), uno::UNO_QUERY );
- DlgEdObj* pCtrlObj = new DlgEdObj(*pDlgEdModel);
- pCtrlObj->SetDlgEdForm(pDlgEdForm); // set parent form
- pDlgEdForm->AddChild(pCtrlObj); // add child to parent form
+ rtl::Reference<DlgEdObj> pCtrlObj = new DlgEdObj(*pDlgEdModel);
+ pCtrlObj->SetDlgEdForm(pDlgEdForm.get()); // set parent form
+ pDlgEdForm->AddChild(pCtrlObj.get()); // add child to parent form
pCtrlObj->SetUnoControlModel( xCtrlModel ); // set control model
// set new name
@@ -960,7 +933,7 @@ void DlgEditor::Paste()
m_xUnoControlDialogModel->insertByName( aOUniqueName , aCtrlModel );
// insert object into drawing page
- pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj );
+ pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj.get() );
pCtrlObj->SetRectFromProps();
pCtrlObj->UpdateStep();
pDlgEdForm->UpdateTabOrderAndGroups();
@@ -968,7 +941,7 @@ void DlgEditor::Paste()
// mark object
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
- pDlgEdView->MarkObj( pCtrlObj, pPgView, false, true);
+ pDlgEdView->MarkObj( pCtrlObj.get(), pPgView, false, true);
}
// center marked objects in dialog editor form
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 931f10afe507..264e42c835b4 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -90,7 +90,7 @@ sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor
{
const SolarMutexGuard aGuard;
- for ( auto const & i : std::as_const(m_SeqFlavors) )
+ for (auto const& i : m_SeqFlavors)
if ( compareDataFlavors( i, rFlavor ) )
return true;
return false;
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 38c8dc0d1a9c..3fc4ef3a2966 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/processfactory.hxx>
+#include <utility>
namespace basctl
{
@@ -32,7 +33,7 @@ namespace basctl
using namespace ::com::sun::star;
-DlgEdFactory::DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ) : mxModel( xModel )
+DlgEdFactory::DlgEdFactory( css::uno::Reference< css::frame::XModel > xModel ) : mxModel(std::move( xModel ))
{
SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
}
@@ -44,63 +45,57 @@ DlgEdFactory::~DlgEdFactory() COVERITY_NOEXCEPT_FALSE
}
-IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
+IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, rtl::Reference<SdrObject> )
{
- static bool bNeedsInit = true;
- static uno::Reference< lang::XMultiServiceFactory > xDialogSFact;
-
- if( bNeedsInit )
- {
+ 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 );
- xDialogSFact = xModFact;
- }
- bNeedsInit = false;
- }
+ uno::Reference< container::XNameContainer > xC( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.awt.UnoControlDialogModel"_ustr, xContext ), uno::UNO_QUERY );
+ if (xC.is())
+ xFact.set(xC, uno::UNO_QUERY);
+ return xFact;
+ }();
- SdrObject* pNewObj = nullptr;
+ rtl::Reference<SdrObject> pNewObj;
if( (aParams.nInventor == SdrInventor::BasicDialog) &&
- (aParams.nObjIdentifier >= OBJ_DLG_PUSHBUTTON) &&
- (aParams.nObjIdentifier <= OBJ_DLG_FORMHSCROLL) )
+ (aParams.nObjIdentifier >= SdrObjKind::BasicDialogPushButton) &&
+ (aParams.nObjIdentifier <= SdrObjKind::BasicDialogFormHorizontalScroll) )
{
switch( aParams.nObjIdentifier )
{
- case OBJ_DLG_PUSHBUTTON:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlButtonModel", xDialogSFact );
+ case SdrObjKind::BasicDialogPushButton:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlButtonModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_RADIOBUTTON:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlRadioButtonModel", xDialogSFact );
+ case SdrObjKind::BasicDialogRadioButton:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FORMRADIO:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.RadioButton", xDialogSFact );
- static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
+ case SdrObjKind::BasicDialogFormRadio:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.RadioButton"_ustr, xDialogSFact );
+ static_cast< DlgEdObj* >( pNewObj.get() )->MakeDataAware( mxModel );
break;
- case OBJ_DLG_CHECKBOX:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlCheckBoxModel", xDialogSFact );
+ case SdrObjKind::BasicDialogCheckbox:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FORMCHECK:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.CheckBox", xDialogSFact );
- static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
+ case SdrObjKind::BasicDialogFormCheck:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.CheckBox"_ustr, xDialogSFact );
+ static_cast< DlgEdObj* >( pNewObj.get() )->MakeDataAware( mxModel );
break;
- case OBJ_DLG_LISTBOX:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlListBoxModel", xDialogSFact );
+ case SdrObjKind::BasicDialogListbox:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlListBoxModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FORMLIST:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ListBox", xDialogSFact );
- static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
+ case SdrObjKind::BasicDialogFormList:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.ListBox"_ustr, xDialogSFact );
+ static_cast< DlgEdObj* >( pNewObj.get() )->MakeDataAware( mxModel );
break;
- case OBJ_DLG_FORMCOMBO:
- case OBJ_DLG_COMBOBOX:
+ case SdrObjKind::BasicDialogFormCombo:
+ case SdrObjKind::BasicDialogCombobox:
{
- DlgEdObj* pNew = nullptr;
- if ( aParams.nObjIdentifier == OBJ_DLG_COMBOBOX )
- pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlComboBoxModel", xDialogSFact );
+ rtl::Reference<DlgEdObj> pNew;
+ if ( aParams.nObjIdentifier == SdrObjKind::BasicDialogCombobox )
+ pNew = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlComboBoxModel"_ustr, xDialogSFact );
else
{
- pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ComboBox", xDialogSFact );
+ pNew = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.ComboBox"_ustr, xDialogSFact );
pNew->MakeDataAware( mxModel );
}
pNewObj = pNew;
@@ -117,37 +112,37 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
}
}
break;
- case OBJ_DLG_GROUPBOX:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlGroupBoxModel", xDialogSFact );
+ case SdrObjKind::BasicDialogGroupBox:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_EDIT:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlEditModel", xDialogSFact );
+ case SdrObjKind::BasicDialogEdit:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlEditModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FIXEDTEXT:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedTextModel", xDialogSFact );
+ case SdrObjKind::BasicDialogFixedText:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlFixedTextModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_IMAGECONTROL:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlImageControlModel", xDialogSFact );
+ case SdrObjKind::BasicDialogImageControl:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlImageControlModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_PROGRESSBAR:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlProgressBarModel", xDialogSFact );
+ case SdrObjKind::BasicDialogProgressbar:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlProgressBarModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_HSCROLLBAR:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlScrollBarModel", xDialogSFact );
+ case SdrObjKind::BasicDialogHorizontalScrollbar:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlScrollBarModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FORMHSCROLL:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ScrollBar", xDialogSFact );
- static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
+ case SdrObjKind::BasicDialogFormHorizontalScroll:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.ScrollBar"_ustr, xDialogSFact );
+ static_cast< DlgEdObj* >( pNewObj.get() )->MakeDataAware( mxModel );
break;
- case OBJ_DLG_FORMVSCROLL:
- case OBJ_DLG_VSCROLLBAR:
+ case SdrObjKind::BasicDialogFormVerticalScroll:
+ case SdrObjKind::BasicDialogVerticalScrollbar:
{
- DlgEdObj* pNew = nullptr;
- if ( aParams.nObjIdentifier == OBJ_DLG_VSCROLLBAR )
- pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlScrollBarModel", xDialogSFact );
+ rtl::Reference<DlgEdObj> pNew;
+ if ( aParams.nObjIdentifier == SdrObjKind::BasicDialogVerticalScrollbar )
+ pNew = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlScrollBarModel"_ustr, xDialogSFact );
else
{
- pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ScrollBar", xDialogSFact );
+ pNew = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.ScrollBar"_ustr, xDialogSFact );
pNew->MakeDataAware( mxModel );
}
pNewObj = pNew;
@@ -164,12 +159,12 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
{
}
} break;
- case OBJ_DLG_HFIXEDLINE:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedLineModel", xDialogSFact );
+ case SdrObjKind::BasicDialogHorizontalFixedLine:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlFixedLineModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_VFIXEDLINE:
+ case SdrObjKind::BasicDialogVerticalFixedLine:
{
- DlgEdObj* pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedLineModel", xDialogSFact );
+ rtl::Reference<DlgEdObj> pNew = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlFixedLineModel"_ustr, xDialogSFact );
pNewObj = pNew;
// set vertical orientation
try
@@ -184,42 +179,42 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
{
}
} break;
- case OBJ_DLG_DATEFIELD:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlDateFieldModel", xDialogSFact );
+ case SdrObjKind::BasicDialogDateField:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlDateFieldModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_TIMEFIELD:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlTimeFieldModel", xDialogSFact );
+ case SdrObjKind::BasicDialogTimeField:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlTimeFieldModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_NUMERICFIELD:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlNumericFieldModel", xDialogSFact );
+ case SdrObjKind::BasicDialogNumericField:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlNumericFieldModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_CURRENCYFIELD:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlCurrencyFieldModel", xDialogSFact );
+ case SdrObjKind::BasicDialogCurencyField:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlCurrencyFieldModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FORMATTEDFIELD:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFormattedFieldModel", xDialogSFact );
+ case SdrObjKind::BasicDialogFormattedField:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_PATTERNFIELD:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlPatternFieldModel", xDialogSFact );
+ case SdrObjKind::BasicDialogPatternField:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlPatternFieldModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FILECONTROL:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFileControlModel", xDialogSFact );
+ case SdrObjKind::BasicDialogFileControl:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlFileControlModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_SPINBUTTON:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlSpinButtonModel", xDialogSFact );
+ case SdrObjKind::BasicDialogSpinButton:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlSpinButtonModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_FORMSPIN:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.SpinButton", xDialogSFact );
- static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
+ case SdrObjKind::BasicDialogFormSpin:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.form.component.SpinButton"_ustr, xDialogSFact );
+ static_cast< DlgEdObj* >( pNewObj.get() )->MakeDataAware( mxModel );
break;
- case OBJ_DLG_TREECONTROL:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.tree.TreeControlModel", xDialogSFact );
+ case SdrObjKind::BasicDialogTreeControl:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.tree.TreeControlModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_GRIDCONTROL:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.grid.UnoControlGridModel", xDialogSFact );
+ case SdrObjKind::BasicDialogGridControl:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.grid.UnoControlGridModel"_ustr, xDialogSFact );
break;
- case OBJ_DLG_HYPERLINKCONTROL:
- pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel", xDialogSFact );
+ case SdrObjKind::BasicDialogHyperlinkControl:
+ pNewObj = new DlgEdObj(aParams.rSdrModel, u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr, xDialogSFact );
break;
default:
break;
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index b16cf695a26a..7f1a0388eeaa 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/scrbar.hxx>
+#include <svtools/scrolladaptor.hxx>
#include <svx/svdview.hxx>
#include <dlgedfunc.hxx>
#include <dlged.hxx>
@@ -41,16 +41,16 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
vcl::Window& rWindow = rParent.GetWindow();
- static Point aDefPoint;
+ static const Point aDefPoint;
tools::Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() );
aOutRect = rWindow.PixelToLogic( aOutRect );
- ScrollBar* pHScroll = rParent.GetHScroll();
- ScrollBar* pVScroll = rParent.GetVScroll();
+ ScrollAdaptor* pHScroll = rParent.GetHScroll();
+ ScrollAdaptor* pVScroll = rParent.GetVScroll();
tools::Long nDeltaX = pHScroll->GetLineSize();
tools::Long nDeltaY = pVScroll->GetLineSize();
- if( !aOutRect.IsInside( rPos ) )
+ if( !aOutRect.Contains( rPos ) )
{
if( rPos.X() < aOutRect.Left() )
nDeltaX = -nDeltaX;
@@ -77,7 +77,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
}
DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
- rParent(rParent_)
+ rParent(rParent_), aScrollTimer("basctl DlgEdFunc aScrollTimer")
{
aScrollTimer.SetInvokeHandler( LINK( this, DlgEdFunc, ScrollTimeout ) );
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
@@ -233,7 +233,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
tools::Rectangle aMarkRect( rView.GetMarkedObjRect() );
aMarkRect.Move( nX, nY );
- if ( !rWorkArea.IsInside( aMarkRect ) )
+ if ( !rWorkArea.Contains( aMarkRect ) )
{
if ( aMarkRect.Left() < rWorkArea.Left() )
nX += rWorkArea.Left() - aMarkRect.Left();
@@ -294,7 +294,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
else
{
// scroll page
- ScrollBar* pScrollBar = ( nX != 0 ) ? rParent.GetHScroll() : rParent.GetVScroll();
+ ScrollAdaptor* pScrollBar = ( nX != 0 ) ? rParent.GetHScroll() : rParent.GetVScroll();
if ( pScrollBar )
{
tools::Long nRangeMin = pScrollBar->GetRangeMin();
@@ -342,7 +342,7 @@ void DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
SdrView& rView = rParent.GetView();
vcl::Window& rWindow = rParent.GetWindow();
- rView.SetActualWin(&rWindow);
+ rView.SetActualWin(rWindow.GetOutDev());
Point aPos = rWindow.PixelToLogic( rMEvt.GetPosPixel() );
sal_uInt16 nHitLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
@@ -378,7 +378,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
SdrView& rView = rParent.GetView();
vcl::Window& rWindow = rParent.GetWindow();
- rView.SetActualWin(&rWindow);
+ rView.SetActualWin(rWindow.GetOutDev());
rWindow.ReleaseMouse();
@@ -408,7 +408,7 @@ void DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
{
SdrView& rView = rParent.GetView();
vcl::Window& rWindow = rParent.GetWindow();
- rView.SetActualWin(&rWindow);
+ rView.SetActualWin(rWindow.GetOutDev());
Point aPos = rWindow.PixelToLogic(rMEvt.GetPosPixel());
sal_uInt16 nHitLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
@@ -419,7 +419,7 @@ void DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
rView.MovAction(aPos);
}
- rWindow.SetPointer( rView.GetPreferredPointer( aPos, &rWindow, nHitLog ) );
+ rWindow.SetPointer( rView.GetPreferredPointer( aPos, rWindow.GetOutDev(), nHitLog ) );
}
DlgEdFuncSelect::DlgEdFuncSelect (DlgEditor& rParent_) :
@@ -436,7 +436,7 @@ void DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
// get view from parent
SdrView& rView = rParent.GetView();
vcl::Window& rWindow = rParent.GetWindow();
- rView.SetActualWin(&rWindow);
+ rView.SetActualWin(rWindow.GetOutDev());
sal_uInt16 nDrgLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
sal_uInt16 nHitLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
@@ -497,7 +497,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
// get view from parent
SdrView& rView = rParent.GetView();
vcl::Window& rWindow = rParent.GetWindow();
- rView.SetActualWin(&rWindow);
+ rView.SetActualWin(rWindow.GetOutDev());
Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel());
sal_uInt16 nHitLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
@@ -516,7 +516,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
}
}
- rWindow.SetPointer( rView.GetPreferredPointer( aPnt, &rWindow, nHitLog ) );
+ rWindow.SetPointer( rView.GetPreferredPointer( aPnt, rWindow.GetOutDev(), nHitLog ) );
rWindow.ReleaseMouse();
return true;
@@ -526,7 +526,7 @@ void DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
{
SdrView& rView = rParent.GetView();
vcl::Window& rWindow = rParent.GetWindow();
- rView.SetActualWin(&rWindow);
+ rView.SetActualWin(rWindow.GetOutDev());
Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel());
sal_uInt16 nHitLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
@@ -540,7 +540,7 @@ void DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
rView.MovAction(aPnt_);
}
- rWindow.SetPointer( rView.GetPreferredPointer( aPnt, &rWindow, nHitLog ) );
+ rWindow.SetPointer( rView.GetPreferredPointer( aPnt, rWindow.GetOutDev(), nHitLog ) );
}
} // namespace basctl
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 291b5b9136f5..017e4b16c78f 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -22,14 +22,14 @@
namespace basctl
{
-DlgEdModel::DlgEdModel()
- : SdrModel()
-{
-}
+DlgEdModel::DlgEdModel() {}
DlgEdModel::~DlgEdModel() {}
-SdrPage* DlgEdModel::AllocPage(bool bMasterPage) { return new DlgEdPage(*this, bMasterPage); }
+rtl::Reference<SdrPage> DlgEdModel::AllocPage(bool bMasterPage)
+{
+ return new DlgEdPage(*this, bMasterPage);
+}
} // namespace basctl
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 056006c4305e..bc714d51c768 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
#include <cppuhelper/exc_hlp.hxx>
#include <o3tl/functional.hxx>
#include <svx/svdpagv.hxx>
@@ -70,17 +71,53 @@ DlgEditor& DlgEdObj::GetDialogEditor ()
DlgEdObj::DlgEdObj(SdrModel& rSdrModel)
: SdrUnoObj(rSdrModel, OUString())
,bIsListening(false)
- ,pDlgEdForm( nullptr )
{
}
+DlgEdObj::DlgEdObj(SdrModel& rSdrModel, DlgEdObj const & rSource)
+: SdrUnoObj(rSdrModel, rSource)
+ ,bIsListening(false)
+{
+ // set parent form
+ pDlgEdForm = rSource.pDlgEdForm;
+
+ // add child to parent form
+ pDlgEdForm->AddChild( this );
+
+ Reference< beans::XPropertySet > xPSet( GetUnoControlModel(), UNO_QUERY );
+ if ( xPSet.is() )
+ {
+ // set new name
+ OUString aOUniqueName( GetUniqueName() );
+ Any aUniqueName;
+ aUniqueName <<= aOUniqueName;
+ xPSet->setPropertyValue( DLGED_PROP_NAME, aUniqueName );
+
+ Reference< container::XNameContainer > xCont( GetDlgEdForm()->GetUnoControlModel() , UNO_QUERY );
+ if ( xCont.is() )
+ {
+ // set tabindex
+ Sequence< OUString > aNames = xCont->getElementNames();
+ xPSet->setPropertyValue( DLGED_PROP_TABINDEX, Any(static_cast<sal_Int16>(aNames.getLength())) );
+
+ // insert control model in dialog model
+ Reference< awt::XControlModel > xCtrl( xPSet , UNO_QUERY );
+ xCont->insertByName( aOUniqueName, Any(xCtrl) );
+
+ pDlgEdForm->UpdateTabOrderAndGroups();
+ }
+ }
+
+ // start listening
+ StartListening();
+}
+
DlgEdObj::DlgEdObj(
SdrModel& rSdrModel,
const OUString& rModelName,
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac)
: SdrUnoObj(rSdrModel, rModelName, rxSFac)
,bIsListening(false)
- ,pDlgEdForm( nullptr )
{
}
@@ -114,7 +151,7 @@ uno::Reference< awt::XControl > DlgEdObj::GetControl() const
if (DlgEdForm const* pForm = GetDlgEdForm())
{
DlgEditor const& rEditor = pForm->GetDlgEditor();
- xControl = GetUnoControl(rEditor.GetView(), rEditor.GetWindow());
+ xControl = GetUnoControl(rEditor.GetView(), *rEditor.GetWindow().GetOutDev());
}
return xControl;
}
@@ -505,7 +542,7 @@ void DlgEdObj::UpdateStep()
sal_Int32 nStep = GetStep();
SdrLayerAdmin& rLayerAdmin(getSdrModelFromSdrObject().GetLayerAdmin());
- SdrLayerID nHiddenLayerId = rLayerAdmin.GetLayerID( "HiddenLayer" );
+ SdrLayerID nHiddenLayerId = rLayerAdmin.GetLayerID( u"HiddenLayer"_ustr );
SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName() );
if( nCurStep )
@@ -543,16 +580,12 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt )
{
// get sequence of control names
Sequence< OUString > aNames = xNameAcc->getElementNames();
- const OUString* pNames = aNames.getConstArray();
sal_Int32 nCtrls = aNames.getLength();
// create a map of tab indices and control names, sorted by tab index
IndexToNameMap aIndexToNameMap;
- for ( sal_Int32 i = 0; i < nCtrls; ++i )
+ for (auto& aName : aNames)
{
- // get control name
- OUString aName( pNames[i] );
-
// get tab index
sal_Int16 nTabIndex = -1;
Any aCtrl = xNameAcc->getByName( aName );
@@ -637,99 +670,99 @@ OUString DlgEdObj::GetDefaultName() const
{
OUString sResId;
OUString aDefaultName;
- if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ) )
+ if ( supportsService( u"com.sun.star.awt.UnoControlDialogModel"_ustr ) )
{
sResId = RID_STR_CLASS_DIALOG;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlButtonModel"_ustr ) )
{
sResId = RID_STR_CLASS_BUTTON;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ) )
{
sResId = RID_STR_CLASS_RADIOBUTTON;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_CHECKBOX;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlListBoxModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlListBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_LISTBOX;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlComboBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_COMBOBOX;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_GROUPBOX;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlEditModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlEditModel"_ustr ) )
{
sResId = RID_STR_CLASS_EDIT;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ) )
{
sResId = RID_STR_CLASS_FIXEDTEXT;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlImageControlModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlImageControlModel"_ustr ) )
{
sResId = RID_STR_CLASS_IMAGECONTROL;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlProgressBarModel"_ustr ) )
{
sResId = RID_STR_CLASS_PROGRESSBAR;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlScrollBarModel"_ustr ) )
{
sResId = RID_STR_CLASS_SCROLLBAR;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFixedLineModel"_ustr ) )
{
sResId = RID_STR_CLASS_FIXEDLINE;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlDateFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_DATEFIELD;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlTimeFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_TIMEFIELD;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlNumericFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_NUMERICFIELD;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlCurrencyFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_CURRENCYFIELD;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_FORMATTEDFIELD;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlPatternFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_PATTERNFIELD;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFileControlModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFileControlModel"_ustr ) )
{
sResId = RID_STR_CLASS_FILECONTROL;
}
- else if ( supportsService( "com.sun.star.awt.tree.TreeControlModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.tree.TreeControlModel"_ustr ) )
{
sResId = RID_STR_CLASS_TREECONTROL;
}
- else if ( supportsService( "com.sun.star.awt.grid.UnoControlGridModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.grid.UnoControlGridModel"_ustr ) )
{
sResId = RID_STR_CLASS_GRIDCONTROL;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr ) )
{
sResId = RID_STR_CLASS_HYPERLINKCONTROL;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlSpinButtonModel" ) )
+ else if ( supportsService( u"com.sun.star.awt.UnoControlSpinButtonModel"_ustr ) )
{
sResId = RID_STR_CLASS_SPINCONTROL;
}
@@ -770,160 +803,114 @@ SdrInventor DlgEdObj::GetObjInventor() const
SdrObjKind DlgEdObj::GetObjIdentifier() const
{
- if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ))
+ if ( supportsService( u"com.sun.star.awt.UnoControlDialogModel"_ustr ))
{
- return OBJ_DLG_DIALOG;
+ return SdrObjKind::BasicDialogDialog;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlButtonModel"_ustr ))
{
- return OBJ_DLG_PUSHBUTTON;
+ return SdrObjKind::BasicDialogPushButton;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ))
{
- return OBJ_DLG_RADIOBUTTON;
+ return SdrObjKind::BasicDialogRadioButton;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ))
{
- return OBJ_DLG_CHECKBOX;
+ return SdrObjKind::BasicDialogCheckbox;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlListBoxModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlListBoxModel"_ustr ))
{
- return OBJ_DLG_LISTBOX;
+ return SdrObjKind::BasicDialogListbox;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlComboBoxModel"_ustr ))
{
- return OBJ_DLG_COMBOBOX;
+ return SdrObjKind::BasicDialogCombobox;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ))
{
- return OBJ_DLG_GROUPBOX;
+ return SdrObjKind::BasicDialogGroupBox;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlEditModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlEditModel"_ustr ))
{
- return OBJ_DLG_EDIT;
+ return SdrObjKind::BasicDialogEdit;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ))
{
- return OBJ_DLG_FIXEDTEXT;
+ return SdrObjKind::BasicDialogFixedText;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlImageControlModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlImageControlModel"_ustr ))
{
- return OBJ_DLG_IMAGECONTROL;
+ return SdrObjKind::BasicDialogImageControl;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlProgressBarModel"_ustr ))
{
- return OBJ_DLG_PROGRESSBAR;
+ return SdrObjKind::BasicDialogProgressbar;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlScrollBarModel"_ustr ))
{
- return OBJ_DLG_HSCROLLBAR;
+ return SdrObjKind::BasicDialogHorizontalScrollbar;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFixedLineModel"_ustr ))
{
- return OBJ_DLG_HFIXEDLINE;
+ return SdrObjKind::BasicDialogHorizontalFixedLine;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlDateFieldModel"_ustr ))
{
- return OBJ_DLG_DATEFIELD;
+ return SdrObjKind::BasicDialogDateField;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlTimeFieldModel"_ustr ))
{
- return OBJ_DLG_TIMEFIELD;
+ return SdrObjKind::BasicDialogTimeField;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlNumericFieldModel"_ustr ))
{
- return OBJ_DLG_NUMERICFIELD;
+ return SdrObjKind::BasicDialogNumericField;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlCurrencyFieldModel"_ustr ))
{
- return OBJ_DLG_CURRENCYFIELD;
+ return SdrObjKind::BasicDialogCurencyField;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr ))
{
- return OBJ_DLG_FORMATTEDFIELD;
+ return SdrObjKind::BasicDialogFormattedField;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlPatternFieldModel"_ustr ))
{
- return OBJ_DLG_PATTERNFIELD;
+ return SdrObjKind::BasicDialogPatternField;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFileControlModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFileControlModel"_ustr ))
{
- return OBJ_DLG_FILECONTROL;
+ return SdrObjKind::BasicDialogFileControl;
}
- else if ( supportsService( "com.sun.star.awt.tree.TreeControlModel" ))
+ else if ( supportsService( u"com.sun.star.awt.tree.TreeControlModel"_ustr ))
{
- return OBJ_DLG_TREECONTROL;
+ return SdrObjKind::BasicDialogTreeControl;
}
- else if ( supportsService( "com.sun.star.awt.grid.UnoControlGridModel" ))
+ else if ( supportsService( u"com.sun.star.awt.grid.UnoControlGridModel"_ustr ))
{
- return OBJ_DLG_GRIDCONTROL;
+ return SdrObjKind::BasicDialogGridControl;
}
- else if ( supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ))
+ else if ( supportsService( u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr ))
{
- return OBJ_DLG_HYPERLINKCONTROL;
+ return SdrObjKind::BasicDialogHyperlinkControl;
}
else
{
- return OBJ_DLG_CONTROL;
- }
-}
-
-void DlgEdObj::clonedFrom(const DlgEdObj* _pSource)
-{
- // set parent form
- pDlgEdForm = _pSource->pDlgEdForm;
-
- // add child to parent form
- pDlgEdForm->AddChild( this );
-
- Reference< beans::XPropertySet > xPSet( GetUnoControlModel(), UNO_QUERY );
- if ( xPSet.is() )
- {
- // set new name
- OUString aOUniqueName( GetUniqueName() );
- Any aUniqueName;
- aUniqueName <<= aOUniqueName;
- xPSet->setPropertyValue( DLGED_PROP_NAME, aUniqueName );
-
- Reference< container::XNameContainer > xCont( GetDlgEdForm()->GetUnoControlModel() , UNO_QUERY );
- if ( xCont.is() )
- {
- // set tabindex
- Sequence< OUString > aNames = xCont->getElementNames();
- xPSet->setPropertyValue( DLGED_PROP_TABINDEX, Any(static_cast<sal_Int16>(aNames.getLength())) );
-
- // insert control model in dialog model
- Reference< awt::XControlModel > xCtrl( xPSet , UNO_QUERY );
- xCont->insertByName( aOUniqueName, Any(xCtrl) );
-
- pDlgEdForm->UpdateTabOrderAndGroups();
- }
+ return SdrObjKind::BasicDialogControl;
}
-
- // start listening
- StartListening();
}
-DlgEdObj* DlgEdObj::CloneSdrObject(SdrModel& rTargetModel) const
+rtl::Reference<SdrObject> DlgEdObj::CloneSdrObject(SdrModel& rTargetModel) const
{
- DlgEdObj* pDlgEdObj = CloneHelper< DlgEdObj >(rTargetModel);
- DBG_ASSERT( pDlgEdObj != nullptr, "DlgEdObj::Clone: invalid clone!" );
- if ( pDlgEdObj )
- pDlgEdObj->clonedFrom( this );
-
- return pDlgEdObj;
+ return new DlgEdObj(rTargetModel, *this);
}
-SdrObjectUniquePtr DlgEdObj::getFullDragClone() const
+rtl::Reference<SdrObject> DlgEdObj::getFullDragClone() const
{
// no need to really add the clone for dragging, it's a temporary
// object
- SdrObjectUniquePtr pObj( new SdrUnoObj(
- getSdrModelFromSdrObject(),
- OUString()) );
- *pObj = *static_cast<const SdrUnoObj*>(this);
-
- return pObj;
+ return rtl::Reference<SdrObject>(new SdrUnoObj(getSdrModelFromSdrObject(), *this));
}
void DlgEdObj::NbcMove( const Size& rSize )
@@ -969,7 +956,7 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
// implementation. For historical reasons, the SdrPage (which is the DlgEdPage) was
// already set. For now, get it from the SdrDragStat and use it to access and set
// the local pDlgEdForm
- if(nullptr == pDlgEdForm && nullptr != rStat.GetPageView())
+ if(!pDlgEdForm && nullptr != rStat.GetPageView())
{
const DlgEdPage* pDlgEdPage(dynamic_cast<const DlgEdPage*>(rStat.GetPageView()->GetPage()));
@@ -1004,17 +991,17 @@ void DlgEdObj::SetDefaults()
xPSet->setPropertyValue( DLGED_PROP_NAME, Any(aOUniqueName) );
// set labels
- if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ) ||
- supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) ||
- supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) ||
- supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) ||
- supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
+ if ( supportsService( u"com.sun.star.awt.UnoControlButtonModel"_ustr ) ||
+ supportsService( u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ) ||
+ supportsService( u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ) ||
+ supportsService( u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ) ||
+ supportsService( u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ) )
{
xPSet->setPropertyValue( DLGED_PROP_LABEL, Any(aOUniqueName) );
}
// set number formats supplier for formatted field
- if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
+ if ( supportsService( u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr ) )
{
Reference< util::XNumberFormatsSupplier > xSupplier = GetDlgEdForm()->GetDlgEditor().GetNumberFormatsSupplier();
if ( xSupplier.is() )
@@ -1171,7 +1158,7 @@ void DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt )
catch (container::NoSuchElementException const&)
{
css::uno::Any anyEx = cppu::getCaughtException();
- throw lang::WrappedTargetRuntimeException("", nullptr,
+ throw lang::WrappedTargetRuntimeException(u""_ustr, nullptr,
anyEx);
}
}
@@ -1297,7 +1284,7 @@ void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj )
void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj )
{
- pChildren.erase( std::remove( pChildren.begin() , pChildren.end() , pDlgEdObj ) );
+ std::erase(pChildren, pDlgEdObj);
}
void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
@@ -1415,10 +1402,9 @@ void DlgEdForm::UpdateStep()
if ( pSdrPage )
{
- const size_t nObjCount = pSdrPage->GetObjCount();
- for ( size_t i = 0 ; i < nObjCount ; i++ )
+ for (const rtl::Reference<SdrObject>& pObj : *pSdrPage)
{
- DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pSdrPage->GetObj(i));
+ DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pObj.get());
if (pDlgEdObj && !dynamic_cast<DlgEdForm*>(pDlgEdObj))
pDlgEdObj->UpdateStep();
}
@@ -1437,17 +1423,10 @@ void DlgEdForm::UpdateTabIndices()
if ( xNameAcc.is() )
{
// get sequence of control names
- Sequence< OUString > aNames = xNameAcc->getElementNames();
- const OUString* pNames = aNames.getConstArray();
- sal_Int32 nCtrls = aNames.getLength();
-
// create a map of tab indices and control names, sorted by tab index
IndexToNameMap aIndexToNameMap;
- for ( sal_Int32 i = 0; i < nCtrls; ++i )
+ for (auto& aName : xNameAcc->getElementNames())
{
- // get name
- OUString aName( pNames[i] );
-
// get tab index
sal_Int16 nTabIndex = -1;
Any aCtrl = xNameAcc->getByName( aName );
@@ -1495,11 +1474,8 @@ void DlgEdForm::UpdateTabOrder()
Reference< awt::XUnoControlContainer > xCont( GetControl(), UNO_QUERY );
if ( xCont.is() )
{
- Sequence< Reference< awt::XTabController > > aSeqTabCtrls = xCont->getTabControllers();
- const Reference< awt::XTabController >* pTabCtrls = aSeqTabCtrls.getConstArray();
- sal_Int32 nCount = aSeqTabCtrls.getLength();
- for ( sal_Int32 i = 0; i < nCount; ++i )
- pTabCtrls[i]->activateTabOrder();
+ for (auto& xTabController : xCont->getTabControllers())
+ xTabController->activateTabOrder();
}
}
@@ -1521,8 +1497,9 @@ void DlgEdForm::UpdateGroups()
std::vector<DlgEdObj*> aChildList = GetChildren();
sal_uInt32 nSize = aChildList.size();
Sequence< Reference< awt::XControl > > aSeqControls( nSize );
+ auto* pSeqControlsData = aSeqControls.getArray();
for ( sal_uInt32 i = 0; i < nSize; ++i )
- aSeqControls.getArray()[i] = aChildList[i]->GetControl();
+ pSeqControlsData[i] = aChildList[i]->GetControl();
sal_Int32 nGroupCount = xTabModel->getGroupCount();
for ( sal_Int32 nGroup = 0; nGroup < nGroupCount; ++nGroup )
@@ -1531,26 +1508,23 @@ void DlgEdForm::UpdateGroups()
OUString aName;
Sequence< Reference< awt::XControlModel > > aSeqModels;
xTabModel->getGroup( nGroup, aSeqModels, aName );
- const Reference< awt::XControlModel >* pModels = aSeqModels.getConstArray();
sal_Int32 nModelCount = aSeqModels.getLength();
// create a list of peers that belong to this group
Sequence< Reference< awt::XWindow > > aSeqPeers( nModelCount );
+ auto* pSeqPeersData = aSeqPeers.getArray();
for ( sal_Int32 nModel = 0; nModel < nModelCount; ++nModel )
{
// for each control model find the corresponding control in the global list
- const Reference< awt::XControl >* pControls = aSeqControls.getConstArray();
- sal_Int32 nControlCount = aSeqControls.getLength();
- for ( sal_Int32 nControl = 0; nControl < nControlCount; ++nControl )
+ for (auto& xCtrl : aSeqControls)
{
- const Reference< awt::XControl > xCtrl( pControls[nControl] );
if ( xCtrl.is() )
{
Reference< awt::XControlModel > xCtrlModel( xCtrl->getModel() );
- if ( xCtrlModel.get() == pModels[nModel].get() )
+ if (xCtrlModel.get() == aSeqModels[nModel].get())
{
// get the control peer and insert into the list of peers
- aSeqPeers.getArray()[ nModel ].set( xCtrl->getPeer(), UNO_QUERY );
+ pSeqPeersData[nModel].set(xCtrl->getPeer(), UNO_QUERY);
break;
}
}
@@ -1683,27 +1657,30 @@ void DlgEdObj::MakeDataAware( const Reference< frame::XModel >& xModel )
if ( !xFac.is() )
return;
- css::table::CellAddress aApiAddress;
-
- //tdf#90361 CellValueBinding and CellRangeListSource are unusable
+ //tdf#90361 and tdf#104011 CellValueBinding and CellRangeListSource are unusable
//without being initialized, so use createInstanceWithArguments with a
- //dummy BoundCell instead of createInstance. This at least results in
+ //dummy BoundCell and CellRange instead of createInstance. This at least results in
//the dialog editor not falling.
- css::beans::NamedValue aValue;
- aValue.Name = "BoundCell";
- aValue.Value <<= aApiAddress;
+ css::beans::NamedValue aCellValue;
+ aCellValue.Name = "BoundCell";
+ css::table::CellAddress aCellAddress;
+ aCellValue.Value <<= aCellAddress;
+
+ css::beans::NamedValue aCellRange;
+ aCellRange.Name = "CellRange";
+ css::table::CellRangeAddress aRangeAddress;
+ aCellRange.Value <<= aRangeAddress;
- Sequence< Any > aArgs( 1 );
- aArgs[ 0 ] <<= aValue;
+ Sequence< Any > aArgs{ Any(aCellValue), Any(aCellRange) };
if ( xBindable.is() )
{
- Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( "com.sun.star.table.CellValueBinding", aArgs ), UNO_QUERY );
+ Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( u"com.sun.star.table.CellValueBinding"_ustr, aArgs ), UNO_QUERY );
xBindable->setValueBinding( xBinding );
}
if ( xListEntrySink.is() )
{
- Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", aArgs ), UNO_QUERY );
+ Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( u"com.sun.star.table.CellRangeListSource"_ustr, aArgs ), UNO_QUERY );
xListEntrySink->setListEntrySource( xSource );
}
}
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index d422f757868c..760f88527609 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -38,13 +38,13 @@ DlgEdPage::~DlgEdPage()
ClearSdrObjList();
}
-SdrPage* DlgEdPage::CloneSdrPage(SdrModel& rTargetModel) const
+rtl::Reference<SdrPage> DlgEdPage::CloneSdrPage(SdrModel& rTargetModel) const
{
DlgEdModel& rDlgEdModel(static_cast< DlgEdModel& >(rTargetModel));
- DlgEdPage* pClonedDlgEdPage(
+ rtl::Reference<DlgEdPage> pClonedDlgEdPage =
new DlgEdPage(
rDlgEdModel,
- IsMasterPage()));
+ IsMasterPage());
pClonedDlgEdPage->SdrPage::lateInit(*this);
return pClonedDlgEdPage;
}
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index f9371b10bac3..5ffe5185a2fb 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -21,8 +21,8 @@
#include <dlged.hxx>
#include <dlgedpage.hxx>
+#include <svtools/scrolladaptor.hxx>
#include <vcl/canvastools.hxx>
-#include <vcl/scrbar.hxx>
#include <dlgedobj.hxx>
@@ -58,12 +58,12 @@ void DlgEdView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin )
// visible area
MapMode aMap( rWin.GetMapMode() );
Point aOrg( aMap.GetOrigin() );
- Size aVisSize( rWin.GetOutputSize() );
+ Size aVisSize( rWin.GetOutDev()->GetOutputSize() );
tools::Rectangle RectTmp( Point(-aOrg.X(),-aOrg.Y()), aVisSize );
tools::Rectangle aVisRect( RectTmp );
// check, if rectangle is inside visible area
- if ( aVisRect.IsInside( rRect ) )
+ if ( aVisRect.Contains( rRect ) )
return;
// calculate scroll distance; the rectangle must be inside the visible area
@@ -133,7 +133,7 @@ static SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, s
// from DlgEdForm::CheckHit; exclude inner for DlgEdForm
bExcludeInner = true;
}
- else if(pDlgEdObj->supportsService("com.sun.star.awt.UnoControlGroupBoxModel"))
+ else if(pDlgEdObj->supportsService(u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr))
{
// from DlgEdObj::CheckHit; exclude inner for group shapes
bExcludeInner = true;
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index d36c23803e7a..c014ca05f1de 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -31,6 +31,7 @@
#include <sfx2/sfxsids.hrc>
#include <svtools/langtab.hxx>
#include <svx/langbox.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
@@ -39,7 +40,6 @@
namespace basctl
{
-using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::resource;
using namespace ::com::sun::star::uno;
@@ -52,15 +52,15 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight )
return bRet;
}
-ManageLanguageDialog::ManageLanguageDialog(weld::Window* pParent, std::shared_ptr<LocalizationMgr> const & xLMgr)
- : GenericDialogController(pParent, "modules/BasicIDE/ui/managelanguages.ui", "ManageLanguagesDialog")
- , m_xLocalizationMgr(xLMgr)
+ManageLanguageDialog::ManageLanguageDialog(weld::Window* pParent, std::shared_ptr<LocalizationMgr> xLMgr)
+ : GenericDialogController(pParent, u"modules/BasicIDE/ui/managelanguages.ui"_ustr, u"ManageLanguagesDialog"_ustr)
+ , m_xLocalizationMgr(std::move(xLMgr))
, m_sDefLangStr(IDEResId(RID_STR_DEF_LANG))
, m_sCreateLangStr(IDEResId(RID_STR_CREATE_LANG))
- , m_xLanguageLB(m_xBuilder->weld_tree_view("treeview"))
- , m_xAddPB(m_xBuilder->weld_button("add"))
- , m_xDeletePB(m_xBuilder->weld_button("delete"))
- , m_xMakeDefPB(m_xBuilder->weld_button("default"))
+ , m_xLanguageLB(m_xBuilder->weld_tree_view(u"treeview"_ustr))
+ , m_xAddPB(m_xBuilder->weld_button(u"add"_ustr))
+ , m_xDeletePB(m_xBuilder->weld_button(u"delete"_ustr))
+ , m_xMakeDefPB(m_xBuilder->weld_button(u"default"_ustr))
{
m_xLanguageLB->set_size_request(m_xLanguageLB->get_approximate_digit_width() * 42,
m_xLanguageLB->get_height_rows(10));
@@ -100,20 +100,17 @@ void ManageLanguageDialog::FillLanguageBox()
if ( m_xLocalizationMgr->isLibraryLocalized() )
{
Locale aDefaultLocale = m_xLocalizationMgr->getStringResourceManager()->getDefaultLocale();
- Sequence< Locale > aLocaleSeq = m_xLocalizationMgr->getStringResourceManager()->getLocales();
- const Locale* pLocale = aLocaleSeq.getConstArray();
- sal_Int32 i, nCount = aLocaleSeq.getLength();
- for ( i = 0; i < nCount; ++i )
+ for (auto& rLocale : m_xLocalizationMgr->getStringResourceManager()->getLocales())
{
- bool bIsDefault = localesAreEqual( aDefaultLocale, pLocale[i] );
- LanguageType eLangType = LanguageTag::convertToLanguageType( pLocale[i] );
+ bool bIsDefault = localesAreEqual(aDefaultLocale, rLocale);
+ LanguageType eLangType = LanguageTag::convertToLanguageType(rLocale);
OUString sLanguage = SvtLanguageTable::GetLanguageString( eLangType );
if ( bIsDefault )
{
sLanguage += " " + m_sDefLangStr;
}
- LanguageEntry* pEntry = new LanguageEntry(pLocale[i], bIsDefault);
- m_xLanguageLB->append(OUString::number(reinterpret_cast<sal_Int64>(pEntry)), sLanguage);
+ LanguageEntry* pEntry = new LanguageEntry(rLocale, bIsDefault);
+ m_xLanguageLB->append(weld::toId(pEntry), sLanguage);
}
}
else
@@ -125,7 +122,7 @@ void ManageLanguageDialog::ClearLanguageBox()
const sal_Int32 nCount = m_xLanguageLB->n_children();
for (sal_Int32 i = 0; i < nCount; ++i)
{
- LanguageEntry* pEntry = reinterpret_cast<LanguageEntry*>(m_xLanguageLB->get_id(i).toInt64());
+ LanguageEntry* pEntry = weld::fromId<LanguageEntry*>(m_xLanguageLB->get_id(i));
delete pEntry;
}
m_xLanguageLB->clear();
@@ -152,8 +149,8 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, weld::Button&, void)
IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, weld::Button&, void)
{
- std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xDialog.get(), "modules/BasicIDE/ui/deletelangdialog.ui"));
- std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("DeleteLangDialog"));
+ std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xDialog.get(), u"modules/BasicIDE/ui/deletelangdialog.ui"_ustr));
+ std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog(u"DeleteLangDialog"_ustr));
if (xQBox->run() != RET_OK)
return;
@@ -162,12 +159,13 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, weld::Button&, void)
int nPos = m_xLanguageLB->get_selected_index();
// remove locales
Sequence< Locale > aLocaleSeq( nCount );
+ auto aLocaleSeqRange = asNonConstRange(aLocaleSeq);
for (int i = 0; i < nCount; ++i)
{
const sal_Int32 nSelPos = aSelection[i];
- LanguageEntry* pEntry = reinterpret_cast<LanguageEntry*>(m_xLanguageLB->get_id(nSelPos).toInt64());
+ LanguageEntry* pEntry = weld::fromId<LanguageEntry*>(m_xLanguageLB->get_id(nSelPos));
if ( pEntry )
- aLocaleSeq[i] = pEntry->m_aLocale;
+ aLocaleSeqRange[i] = pEntry->m_aLocale;
}
m_xLocalizationMgr->handleRemoveLocales( aLocaleSeq );
// update listbox
@@ -184,7 +182,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, weld::Button&, void)
IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, weld::Button&, void)
{
const sal_Int32 nPos = m_xLanguageLB->get_selected_index();
- LanguageEntry* pSelectEntry = reinterpret_cast<LanguageEntry*>(m_xLanguageLB->get_id(nPos).toInt64());
+ LanguageEntry* pSelectEntry = weld::fromId<LanguageEntry*>(m_xLanguageLB->get_id(nPos));
if (pSelectEntry && !pSelectEntry->m_bIsDefault)
{
// set new default entry
@@ -212,17 +210,17 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, weld::TreeView&, void)
// class SetDefaultLanguageDialog -----------------------------------------------
-SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent, std::shared_ptr<LocalizationMgr> const & xLMgr)
- : GenericDialogController(pParent, "modules/BasicIDE/ui/defaultlanguage.ui", "DefaultLanguageDialog")
- , m_xLocalizationMgr(xLMgr)
- , m_xLanguageFT(m_xBuilder->weld_label("defaultlabel"))
- , m_xLanguageLB(m_xBuilder->weld_tree_view("entries"))
- , m_xCheckLangFT(m_xBuilder->weld_label("checkedlabel"))
- , m_xCheckLangLB(m_xBuilder->weld_tree_view("checkedentries"))
- , m_xDefinedFT(m_xBuilder->weld_label("defined"))
- , m_xAddedFT(m_xBuilder->weld_label("added"))
- , m_xAltTitle(m_xBuilder->weld_label("alttitle"))
- , m_xLanguageCB(new SvxLanguageBox(m_xBuilder->weld_combo_box("hidden")))
+SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent, std::shared_ptr<LocalizationMgr> xLMgr)
+ : GenericDialogController(pParent, u"modules/BasicIDE/ui/defaultlanguage.ui"_ustr, u"DefaultLanguageDialog"_ustr)
+ , m_xLocalizationMgr(std::move(xLMgr))
+ , m_xLanguageFT(m_xBuilder->weld_label(u"defaultlabel"_ustr))
+ , m_xLanguageLB(m_xBuilder->weld_tree_view(u"entries"_ustr))
+ , m_xCheckLangFT(m_xBuilder->weld_label(u"checkedlabel"_ustr))
+ , m_xCheckLangLB(m_xBuilder->weld_tree_view(u"checkedentries"_ustr))
+ , m_xDefinedFT(m_xBuilder->weld_label(u"defined"_ustr))
+ , m_xAddedFT(m_xBuilder->weld_label(u"added"_ustr))
+ , m_xAltTitle(m_xBuilder->weld_label(u"alttitle"_ustr))
+ , m_xLanguageCB(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"hidden"_ustr)))
{
m_xLanguageLB->set_size_request(-1, m_xLanguageLB->get_height_rows(10));
m_xCheckLangLB->set_size_request(-1, m_xCheckLangLB->get_height_rows(10));
@@ -255,11 +253,8 @@ void SetDefaultLanguageDialog::FillLanguageBox()
if (m_xLocalizationMgr->isLibraryLocalized())
{
// remove the already localized languages
- Sequence< Locale > aLocaleSeq = m_xLocalizationMgr->getStringResourceManager()->getLocales();
- const Locale* pLocale = aLocaleSeq.getConstArray();
- const sal_Int32 nCountLoc = aLocaleSeq.getLength();
- for ( sal_Int32 i = 0; i < nCountLoc; ++i )
- m_xLanguageCB->remove_id(LanguageTag::convertToLanguageType(pLocale[i]));
+ for (auto& rLocale : m_xLocalizationMgr->getStringResourceManager()->getLocales())
+ m_xLanguageCB->remove_id(LanguageTag::convertToLanguageType(rLocale));
// fill checklistbox if not in default mode
const sal_Int32 nCountLang = m_xLanguageCB->get_count();
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 084395ad2536..12a0e671863a 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -37,7 +37,7 @@
#include <svx/svditer.hxx>
#include <svx/svdview.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
#include <vcl/layout.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
@@ -82,11 +82,18 @@ const tools::Long WIN_BORDER = 2;
} // namespace
+static Reference<XModel> lclGetModel()
+{
+ if (SfxViewShell* pCurrent = SfxViewShell::Current())
+ return pCurrent->GetCurrentDocument();
+ return Reference<XModel>();
+}
+
PropBrw::PropBrw (DialogWindowLayout& rLayout_):
DockingWindow(&rLayout_),
m_xContentArea(VclPtr<VclVBox>::Create(this)),
m_bInitialStateChange(true),
- m_xContextDocument(SfxViewShell::Current() ? SfxViewShell::Current()->GetCurrentDocument() : Reference<XModel>()),
+ m_xContextDocument(lclGetModel()),
pView(nullptr)
{
Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y);
@@ -105,7 +112,7 @@ PropBrw::PropBrw (DialogWindowLayout& rLayout_):
// create a frame wrapper for myself
m_xMeAsFrame = frame::Frame::create( comphelper::getProcessComponentContext() );
m_xMeAsFrame->initialize(VCLUnoHelper::GetInterface(m_xContentArea));
- m_xMeAsFrame->setName( "form property browser" ); // change name!
+ m_xMeAsFrame->setName( u"form property browser"_ustr ); // change name!
}
catch (const Exception&)
{
@@ -133,15 +140,15 @@ void PropBrw::ImplReCreateController()
// a ComponentContext for the
::cppu::ContextEntry_Init aHandlerContextInfo[] =
{
- ::cppu::ContextEntry_Init( "DialogParentWindow", Any(VCLUnoHelper::GetInterface(this))),
- ::cppu::ContextEntry_Init( "ContextDocument", Any( m_xContextDocument ) )
+ ::cppu::ContextEntry_Init( u"DialogParentWindow"_ustr, Any(VCLUnoHelper::GetInterface(this))),
+ ::cppu::ContextEntry_Init( u"ContextDocument"_ustr, Any( m_xContextDocument ) )
};
Reference< XComponentContext > xInspectorContext(
- ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) );
+ ::cppu::createComponentContext( aHandlerContextInfo, std::size( aHandlerContextInfo ), xOwnContext ) );
// create a property browser controller
Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_SET_THROW );
- static constexpr OUStringLiteral s_sControllerServiceName = u"com.sun.star.awt.PropertyBrowserController";
+ static constexpr OUString s_sControllerServiceName = u"com.sun.star.awt.PropertyBrowserController"_ustr;
m_xBrowserController.set( xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY );
if ( !m_xBrowserController.is() )
{
@@ -228,9 +235,6 @@ bool PropBrw::Close()
{
ImplDestroyController();
- if( IsRollUp() )
- RollDown();
-
return DockingWindow::Close();
}
@@ -244,12 +248,13 @@ Sequence< Reference< XInterface > >
for( size_t i = 0 ; i < nMarkCount ; ++i )
{
SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj();
+ assert(pCurrent && "GetMarkedSdrObj will succeed");
- std::unique_ptr<SdrObjListIter> pGroupIterator;
+ std::optional<SdrObjListIter> oGroupIterator;
if (pCurrent->IsGroupObject())
{
- pGroupIterator.reset(new SdrObjListIter(pCurrent->GetSubList()));
- pCurrent = pGroupIterator->IsMore() ? pGroupIterator->Next() : nullptr;
+ oGroupIterator.emplace(pCurrent->GetSubList());
+ pCurrent = oGroupIterator->IsMore() ? oGroupIterator->Next() : nullptr;
}
while (pCurrent)
@@ -262,7 +267,7 @@ Sequence< Reference< XInterface > >
}
// next element
- pCurrent = pGroupIterator && pGroupIterator->IsMore() ? pGroupIterator->Next() : nullptr;
+ pCurrent = oGroupIterator && oGroupIterator->IsMore() ? oGroupIterator->Next() : nullptr;
}
}
@@ -295,7 +300,7 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
{
if ( m_xBrowserController.is() )
{
- m_xBrowserController->setPropertyValue( "IntrospectedObject",
+ m_xBrowserController->setPropertyValue( u"IntrospectedObject"_ustr,
Any( _rxObject )
);
@@ -315,95 +320,95 @@ OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject )
OUString sResId;
aName = IDEResId(RID_STR_BRWTITLE_PROPERTIES);
- if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlDialogModel" ) )
+ if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlDialogModel"_ustr ) )
{
sResId = RID_STR_CLASS_DIALOG;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlButtonModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlButtonModel"_ustr ) )
{
sResId = RID_STR_CLASS_BUTTON;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ) )
{
sResId = RID_STR_CLASS_RADIOBUTTON;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_CHECKBOX;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlListBoxModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlListBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_LISTBOX;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlComboBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_COMBOBOX;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ) )
{
sResId = RID_STR_CLASS_GROUPBOX;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlEditModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlEditModel"_ustr ) )
{
sResId = RID_STR_CLASS_EDIT;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ) )
{
sResId = RID_STR_CLASS_FIXEDTEXT;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlImageControlModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlImageControlModel"_ustr ) )
{
sResId = RID_STR_CLASS_IMAGECONTROL;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlProgressBarModel"_ustr ) )
{
sResId = RID_STR_CLASS_PROGRESSBAR;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlScrollBarModel"_ustr ) )
{
sResId = RID_STR_CLASS_SCROLLBAR;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFixedLineModel"_ustr ) )
{
sResId = RID_STR_CLASS_FIXEDLINE;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlDateFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_DATEFIELD;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlTimeFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_TIMEFIELD;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlNumericFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_NUMERICFIELD;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlCurrencyFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_CURRENCYFIELD;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_FORMATTEDFIELD;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlPatternFieldModel"_ustr ) )
{
sResId = RID_STR_CLASS_PATTERNFIELD;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFileControlModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFileControlModel"_ustr ) )
{
sResId = RID_STR_CLASS_FILECONTROL;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.tree.TreeControlModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.tree.TreeControlModel"_ustr ) )
{
sResId = RID_STR_CLASS_TREECONTROL;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.grid.UnoControlGridModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.grid.UnoControlGridModel"_ustr ) )
{
sResId = RID_STR_CLASS_GRIDCONTROL;
}
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ) )
+ else if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr ) )
{
sResId = RID_STR_CLASS_HYPERLINKCONTROL;
}
@@ -446,7 +451,7 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
{
if ( pView )
{
- EndListening( *(pView->GetModel()) );
+ EndListening(pView->GetModel());
pView = nullptr;
}
@@ -467,7 +472,7 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
if ( nMarkCount == 0 )
{
- EndListening( *(pView->GetModel()) );
+ EndListening(pView->GetModel());
pView = nullptr;
implSetNewObject( nullptr );
return;
@@ -495,7 +500,7 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
else
implSetNewObject( xNewObject );
- StartListening( *(pView->GetModel()) );
+ StartListening(pView->GetModel());
}
catch ( const PropertyVetoException& ) { /* silence */ }
catch ( const Exception& )
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 09:13:10 +0000