diff options
23 files changed, 92 insertions, 89 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index db6136ba742b..5f1cfed5cf78 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -258,10 +258,7 @@ void Shell::onDocumentCreated( const ScriptDocument& /*_rDocument*/ ) // for VBA documents, show a warning that we can save them only in ODF if (pCurWin->GetDocument().isInVBAMode()) - { - std::vector< VclPtr<PushButton> > aButtons; - GetViewFrame()->AppendInfoBar("vba_save", IDE_RESSTR(RID_STR_CANNOTSAVEVBA), aButtons); - } + GetViewFrame()->AppendInfoBar("vba_save", IDE_RESSTR(RID_STR_CANNOTSAVEVBA)); } UpdateWindows(); diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 61e5e419a8c4..95010111963b 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -242,7 +242,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, OUString aScriptURL; SbMethod* pMethod = NULL; - ScopedVclPtr< MacroChooser > pChooser( NULL, true ); + ScopedVclPtrInstance< MacroChooser > pChooser( NULL, true ); if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() ) pChooser->SetMode(MacroChooser::ChooseOnly); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 97f2065fb3b6..e0176be4eff4 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -267,7 +267,7 @@ void ShapeController::executeDispatch_FormatLine() SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - ScopedVclPtr< SfxAbstractTabDialog > pDlg( + boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxLineTabDialog( pParent, &aAttr, &pDrawModelWrapper->getSdrModel(), pSelectedObj, bHasMarked ) ); if ( pDlg->Execute() == RET_OK ) diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 9dc2a8b606d0..21a70bc38a5f 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -295,8 +295,8 @@ SvxZoomDialog::~SvxZoomDialog() void SvxZoomDialog::dispose() { - delete pOutSet; - pOutSet = 0; + delete mpOutSet; + mpOutSet = 0; m_pOptimalBtn.clear(); m_pWholePageBtn.clear(); m_pPageWidthBtn.clear(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index ef4779dddd72..c634dc715a6b 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -42,7 +42,7 @@ class SvPasteObjectDialog : public ModalDialog VclPtr<FixedText> m_pFtObjectSource; VclPtr<ListBox> m_pLbInsertList; VclPtr<OKButton> m_pOKButton; - ::std::map< SotFormatStringId, OUString > aSupplementMap; + ::std::map< SotClipboardFormatId, OUString > aSupplementMap; SvGlobalName aObjClassName; OUString aObjName; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 29b1eacfe9d3..13d81a999d76 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -187,6 +187,9 @@ void OfaMSFilterTabPage2::dispose() pCheckButtonData = NULL; m_pCheckLB.clear(); m_pCheckLBContainer.clear(); + aHighlightingRB.clear(); + aShadingRB.clear(); + SfxTabPage::dispose(); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 20b01c1916f8..8a38d43de0ce 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -84,8 +84,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage sChgToFromSmartArt; SvLBoxButtonData* pCheckButtonData; - RadioButton* aHighlightingRB; - RadioButton* aShadingRB; + VclPtr<RadioButton> aHighlightingRB; + VclPtr<RadioButton> aShadingRB; OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage2(); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index ee3e99a04b43..16edfe7179b0 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -222,7 +222,6 @@ SvxProxyTabPage::~SvxProxyTabPage() void SvxProxyTabPage::dispose() { - mpCertPathDlg.disposeAndClear(); m_pProxyModeLB.clear(); m_pHttpProxyFT.clear(); m_pHttpProxyED.clear(); @@ -656,7 +655,7 @@ void SvxSecurityTabPage::dispose() { delete mpSecOptions; mpSecOptions = NULL; - mpCertPathDlg.clear(); + mpCertPathDlg.disposeAndClear(); mpSecOptDlg.clear(); m_pSecurityOptionsPB.clear(); m_pSavePasswordsCB.clear(); @@ -668,6 +667,9 @@ void SvxSecurityTabPage::dispose() m_pMacroSecPB.clear(); m_pCertFrame.clear(); m_pCertPathPB.clear(); + m_pTSAURLsFrame.clear(); + m_pTSAURLsPB.clear(); + SfxTabPage::dispose(); } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index e1cccd41a09f..6aa6d4c8afc4 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -146,8 +146,8 @@ private: VclPtr<VclContainer> m_pCertFrame; VclPtr<PushButton> m_pCertPathPB; - VclContainer* m_pTSAURLsFrame; - PushButton* m_pTSAURLsPB; + VclPtr<VclContainer> m_pTSAURLsFrame; + VclPtr<PushButton> m_pTSAURLsPB; SvtSecurityOptions* mpSecOptions; VclPtr<svx::SecurityOptionsDialog> mpSecOptDlg; diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 9304c364e38f..c98ce9a4a76b 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -113,20 +113,11 @@ void SvxOpenCLTabPage::dispose() delete static_cast<OpenCLConfig::ImplMatcher*>(mpBlackList->GetEntry(i)->GetUserData()); for ( sal_uInt16 i = 0; i < mpWhiteList->GetEntryCount(); ++i ) delete static_cast<OpenCLConfig::ImplMatcher*>(mpWhiteList->GetEntry(i)->GetUserData()); - mpBlackList.disposeAndClear() - mpWhiteList.disposeAndClear() -} + mpBlackList.disposeAndClear(); + mpWhiteList.disposeAndClear(); -SvxOpenCLTabPage::~SvxOpenCLTabPage() -{ - disposeOnce(); -} - -void SvxOpenCLTabPage::dispose() -{ mpUseOpenCL.clear(); mpBlackListFrame.clear(); - mpBlackList.clear(); mpBlackListTable.clear(); mpBlackListEdit.clear(); mpBlackListAdd.clear(); @@ -137,11 +128,11 @@ void SvxOpenCLTabPage::dispose() mpVendor.clear(); mpDrvVersion.clear(); mpWhiteListFrame.clear(); - mpWhiteList.clear(); mpWhiteListTable.clear(); mpWhiteListEdit.clear(); mpWhiteListAdd.clear(); mpWhiteListDelete.clear(); + SfxTabPage::dispose(); } diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 9db380135ed7..142ea656f045 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -67,6 +67,17 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl) TSAURLsDialog::~TSAURLsDialog() { + disposeOnce(); +} + +void TSAURLsDialog::dispose() +{ + m_pAddBtn.clear(); + m_pDeleteBtn.clear(); + m_pOKBtn.clear(); + m_pURLListBox.clear(); + + ModalDialog::dispose(); } void TSAURLsDialog::AddTSAURL(const OUString& rURL) diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index aba749181ac5..0b25238f1397 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -16,10 +16,10 @@ class TSAURLsDialog : public ModalDialog { private: - ListBox* m_pURLListBox; - PushButton* m_pAddBtn; - PushButton* m_pDeleteBtn; - OKButton* m_pOKBtn; + VclPtr<ListBox> m_pURLListBox; + VclPtr<PushButton> m_pAddBtn; + VclPtr<PushButton> m_pDeleteBtn; + VclPtr<OKButton> m_pOKBtn; DECL_LINK(AddHdl_Impl, void *); DECL_LINK(DeleteHdl_Impl, void *); @@ -32,7 +32,7 @@ private: public: TSAURLsDialog(vcl::Window* pParent); virtual ~TSAURLsDialog(); - + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 2a4d7049c0f0..031028942fa5 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -185,7 +185,6 @@ namespace dbaui { m_pEscapeDateTime, "useodbcliterals", DSID_ESCAPE_DATETIME, false }, { m_pPrimaryKeySupport, "primarykeys", DSID_PRIMARY_KEY_SUPPORT, false }, { m_pRespectDriverResultSetType, "resulttype", DSID_RESPECTRESULTSETTYPE, false }, - { NULL, "", 0, false } }; for ( const BooleanSettingDesc& pCopy : aSettings ) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b44242d3a4cb..9c5943667f29 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -629,12 +629,12 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, { // Draw a small red rectangle in the top left corner so that it's easy to see where a new tile begins. Rectangle aRect(0, 0, 5, 5); - aRect = aDevice.PixelToLogic(aRect); - aDevice.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); - aDevice.SetFillColor(COL_LIGHTRED); - aDevice.SetLineColor(); - aDevice.DrawRect(aRect); - aDevice.Pop(); + aRect = pDevice->PixelToLogic(aRect); + pDevice->Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); + pDevice->SetFillColor(COL_LIGHTRED); + pDevice->SetLineColor(); + pDevice->DrawRect(aRect); + pDevice->Pop(); } #else diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 787a0ca2cc5f..658c6be0632b 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -124,9 +124,9 @@ public: protected: struct DialControl_Impl { - ScopedVclPtr<DialControlBmp> mpBmpEnabled; - ScopedVclPtr<DialControlBmp> mpBmpDisabled; - ScopedVclPtr<DialControlBmp> mpBmpBuffered; + ScopedVclPtr<DialControlBmp> mxBmpEnabled; + ScopedVclPtr<DialControlBmp> mxBmpDisabled; + ScopedVclPtr<DialControlBmp> mxBmpBuffered; Link maModifyHdl; VclPtr<NumericField> mpLinkField; sal_Int32 mnLinkedFieldValueMultiplyer; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 4f12058b1fa9..5531b8ad2bac 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -127,7 +127,7 @@ private: VclPtr<PushButton> m_pBtnAmbientColor; // color button // Textures - VclContainer* m_pFLTexture; + VclPtr<VclContainer> m_pFLTexture; VclPtr<PushButton> m_pBtnTexLuminance; VclPtr<PushButton> m_pBtnTexColor; VclPtr<PushButton> m_pBtnTexReplace; diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index c350bd724857..113c0e77e4a2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1178,12 +1178,12 @@ IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn ) { if (pBtn == maBtnOk.get()) close(true); - else if (pBtn == maBtnSelectSingle->get()) + else if (pBtn == maBtnSelectSingle.get()) { selectCurrentMemberOnly(true); CheckHdl(maChecks.get()); } - else if (pBtn == maBtnUnselectSingle->get()) + else if (pBtn == maBtnUnselectSingle.get()) { selectCurrentMemberOnly(false); CheckHdl(maChecks.get()); @@ -1232,7 +1232,7 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl) if ( bSearchTextEmpty ) { - maChecks.ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, true, maMembers[i].mbVisible ); + maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, true, maMembers[i].mbVisible ); if ( maMembers[i].mbVisible ) ++nSelCount; continue; @@ -1240,19 +1240,19 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl) if ( aLabelDisp.toAsciiLowerCase().indexOf( aSearchText ) != -1 ) { - maChecks.ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, true, true ); + maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, true, true ); ++nSelCount; } else - maChecks.ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, false, false ); + maChecks->ShowCheckEntry( aLabelDisp, maMembers[i].mpParent, false, false ); } if ( nSelCount == n ) - maChkToggleAll.SetState( TRISTATE_TRUE ); + maChkToggleAll->SetState( TRISTATE_TRUE ); else if ( nSelCount == 0 ) - maChkToggleAll.SetState( TRISTATE_FALSE ); + maChkToggleAll->SetState( TRISTATE_FALSE ); else - maChkToggleAll.SetState( TRISTATE_INDET ); + maChkToggleAll->SetState( TRISTATE_INDET ); return 0; } diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index f4f760cfa94f..810769255df1 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -224,15 +224,15 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pD maEdVal1->Show(); maEdVal1->SetText(pFormatEntry->GetExpression(maPos, 0)); maEdVal2->Hide(); - OnEdChanged(&maEdVal1); + OnEdChanged(maEdVal1); break; case 2: maEdVal1->Show(); maEdVal1->SetText(pFormatEntry->GetExpression(maPos, 0)); - OnEdChanged(&maEdVal1); + OnEdChanged(maEdVal1); maEdVal2->Show(); maEdVal2->SetText(pFormatEntry->GetExpression(maPos, 1)); - OnEdChanged(&maEdVal2); + OnEdChanged(maEdVal2); break; } } @@ -324,7 +324,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit) if( aFormula.isEmpty() ) { - maFtVal.SetText(ScGlobal::GetRscString(STR_ENTER_VALUE)); + maFtVal->SetText(ScGlobal::GetRscString(STR_ENTER_VALUE)); return 0; } @@ -336,7 +336,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit) if( ta->GetCodeError() ) { pEdit->SetControlBackground(COL_LIGHTRED); - maFtVal.SetText(ScGlobal::GetRscString(STR_VALID_DEFERROR)); + maFtVal->SetText(ScGlobal::GetRscString(STR_VALID_DEFERROR)); return 0; } @@ -348,38 +348,38 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit) aComp2.SetGrammar( mpDoc->GetGrammar() ); if (&maEdVal1 == pEdit) { - OUString aFormula2 = maEdVal2.GetText(); + OUString aFormula2 = maEdVal2->GetText(); boost::scoped_ptr<ScTokenArray> pArr2(aComp2.CompileString(aFormula2)); - bContainsColumnLabel = containsOnlyColumnLabel(&maEdVal2, pArr2.get()); + bContainsColumnLabel = containsOnlyColumnLabel(maEdVal2, pArr2.get()); } else { - OUString aFormula1 = maEdVal1.GetText(); + OUString aFormula1 = maEdVal1->GetText(); boost::scoped_ptr<ScTokenArray> pArr1(aComp2.CompileString(aFormula1)); - bContainsColumnLabel = containsOnlyColumnLabel(&maEdVal1, pArr1.get()); + bContainsColumnLabel = containsOnlyColumnLabel(maEdVal1, pArr1.get()); } } if (bContainsColumnLabel) { - maFtVal.SetText(ScGlobal::GetRscString(STR_UNQUOTED_STRING)); + maFtVal->SetText(ScGlobal::GetRscString(STR_UNQUOTED_STRING)); return 0; } pEdit->SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); - maFtVal.SetText(""); + maFtVal->SetText(""); return 0; } void ScConditionFrmtEntry::Select() { - maFtVal.Show(); + maFtVal->Show(); ScCondFrmtEntry::Select(); } void ScConditionFrmtEntry::Deselect() { - maFtVal.Hide(); + maFtVal->Hide(); ScCondFrmtEntry::Deselect(); } diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index f1b8aabb9b34..7ce191073b55 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -109,8 +109,7 @@ public: virtual void GetFocus() SAL_OVERRIDE; void Clear() { aBrowse->Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse->SetAttributes(pAttr,p2ndSet); } - const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse.get(); } - _SdrItemBrowserControl& GetBrowserControl() { return aBrowse.get(); } + _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); } }; class SdrView; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 2f392b1bd335..7e3f5d4bb831 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -163,7 +163,8 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow SfxChildWindow( _pParent, nId ) { - pWindow = VclPtrInstance<SvxFontWorkDialog>(pBindings, this, _pParent); + VclPtrInstance<SvxFontWorkDialog> pDlg(pBindings, this, _pParent); + pWindow = pDlg.get(); eChildAlignment = SfxChildAlignment::NOALIGNMENT; @@ -294,18 +295,18 @@ void SvxFontWorkDialog::dispose() { for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++) DELETEZ(pCtrlItems[i]); - aTbxStyle.disposeAndClear(); - aTbxAdjust.disposeAndClear(); - aFbDistance.disposeAndClear(); - aMtrFldDistance.disposeAndClear(); - aFbTextStart.disposeAndClear(); - aMtrFldTextStart.disposeAndClear(); - aTbxShadow.disposeAndClear(); - aFbShadowX.disposeAndClear(); - aMtrFldShadowX.disposeAndClear(); - aFbShadowY.disposeAndClear(); - aMtrFldShadowY.disposeAndClear(); - aShadowColorLB.disposeAndClear(); + m_pTbxStyle.clear(); + m_pTbxAdjust.clear(); + m_pFbDistance.clear(); + m_pMtrFldDistance.clear(); + m_pFbTextStart.clear(); + m_pMtrFldTextStart.clear(); + m_pTbxShadow.clear(); + m_pFbShadowX.clear(); + m_pMtrFldShadowX.clear(); + m_pFbShadowY.clear(); + m_pMtrFldShadowY.clear(); + m_pShadowColorLB.clear(); SfxDockingWindow::dispose(); } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 4ee0b01505a3..106568454f18 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -342,13 +342,13 @@ void Svx3DWin::dispose() delete mpImpl; - aBtnGeo.disposeAndClear(); - aBtnRepresentation.disposeAndClear(); - aBtnLight.disposeAndClear(); - aBtnTexture.disposeAndClear(); - aBtnMaterial.disposeAndClear(); - aBtnUpdate.disposeAndClear(); - aBtnAssign.disposeAndClear(); + m_pBtnGeo.clear(); + m_pBtnRepresentation.clear(); + m_pBtnLight.clear(); + m_pBtnTexture.clear(); + m_pBtnMaterial.clear(); + m_pBtnUpdate.clear(); + m_pBtnAssign.clear(); SfxDockingWindow::dispose(); } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index ad948fa7f079..51130f01be70 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1082,8 +1082,8 @@ SdrItemBrowser::SdrItemBrowser(SdrView& rView): bDirty(false) { aIdle.SetIdleHdl(LINK(this,SdrItemBrowser,IdleHdl)); - GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl)); - GetBrowserControl().SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl)); + GetBrowserControl()->SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl)); + GetBrowserControl()->SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl)); SetDirty(); } diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 81668a5d3926..1dd73677e74c 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -475,7 +475,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 if (!IsGluePointEditMode()) return false; bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; - OutputDevice* pOut=const_cast<OutputDevice*>(pActualOutDev); + OutputDevice* pOut=const_cast<OutputDevice*>(pActualOutDev.get()); if (pOut==NULL) pOut=GetFirstOutputDevice(); if (pOut==NULL) return false; SortMarkedObjects(); |