mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop dbgutil SdrItemBrowser FloatingWindow

Browse Source 
Change-Id: I7a4ca90ea23271e7b6f60d7e47e4513978d3222d
Reviewed-on: https://gerrit.libreoffice.org/84356
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2019-12-03 09:38:46 +00:00
parent e15a843051
commit ef5133e468
21 changed files with 6 additions and 1550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chart2/uiconfig/accelerator/en-US/default.xml
View File

@ -42,6 +42,5 @@
<accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
<accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
<accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
<accel:item accel:code="KEY_9" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:ShowItemBrowser"/>
<accel:item accel:code="KEY_F4" xlink:href=".uno:TransformDialog"/>
</accel:acceleratorlist>

3
compilerplugins/clang/singlevalfields.results
View File

@ -700,9 +700,6 @@ svl/source/crypto/cryptosign.cxx:153
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx:44
sdr::overlay::OverlayManagerBuffered maBufferIdle
sdr overlay OverlayManagerBuffered Idle
svx/inc/svdibrow.hxx:96
SdrItemBrowser aIdle
svx svdraw SdrItemBrowser
svx/source/dialog/contimp.hxx:70
SvxSuperContourDlg aUpdateIdle
SvxSuperContourDlg UpdateIdle

2
compilerplugins/clang/unusedenumconstants.writeonly.results
View File

@ -9564,8 +9564,6 @@ svx/source/stbctrls/modctrl.cxx:48
enum SvxModifyControl::ImplData::ModificationState MODIFICATION_STATE_FEEDBACK
svx/source/stbctrls/modctrl.cxx:49
enum SvxModifyControl::ImplData::ModificationState MODIFICATION_STATE_SIZE
svx/source/svdraw/svdibrow.cxx:78
enum ItemType DONTKNOW
svx/source/svdraw/svdocapt.cxx:67
enum EscDir UNT
svx/source/table/tablehandles.hxx:30

2
compilerplugins/clang/unusedfields.writeonly.results
View File

@ -772,8 +772,6 @@ svx/source/sidebar/line/LinePropertyPanel.hxx:104
svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
svx/source/sidebar/line/LinePropertyPanel.hxx:105
svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
svx/source/svdraw/svdibrow.cxx:98
ImpItemListRow pType const std::type_info *
svx/source/svdraw/svdpdf.hxx:196
ImpSdrPdfImport mdPageWidthPts double
svx/source/tbxctrls/tbcontrl.cxx:199

14
include/svx/svdpntv.hxx
View File

@ -53,10 +53,6 @@ class SdrModel;
class SdrObject;
enum class GraphicManagerDrawFlags;
#ifdef DBG_UTIL
class SdrItemBrowser;
#endif
namespace sdr { namespace contact {
class ViewObjectContactRedirector;
}}
@ -134,9 +130,6 @@ private:
std::unique_ptr<SdrPageView> mpPageView;
protected:
SdrModel* mpModel;
#ifdef DBG_UTIL
VclPtr<SdrItemBrowser> mpItemBrowser;
#endif
VclPtr<OutputDevice> mpActualOutDev; // Only for comparison
VclPtr<OutputDevice> mpDragWin;
SfxStyleSheet* mpDefaultStyleSheet;
@ -496,13 +489,6 @@ public:
/// 3. SdrAnimationMode::Disable: don't start and don't show any replacement
void SetAnimationMode( const SdrAnimationMode eMode );
/// The Browser is destroyed for bShow=false
#ifdef DBG_UTIL
void ShowItemBrowser(bool bShow);
bool IsItemBrowserVisible() const { return mpItemBrowser!=nullptr && GetItemBrowser()->IsVisible(); }
vcl::Window* GetItemBrowser() const;
#endif
/// Must be called by the App when scrolling etc. in order for
/// an active FormControl to be moved too
void VisAreaChanged(const OutputDevice* pOut);

2
include/svx/svxids.hrc
View File

@ -790,7 +790,7 @@ class SvxSetItem;
#define SID_ATTR_TRANSFORM_HORI_POSITION ( SID_SVX_START + 999 )
#define SID_ATTR_TRANSFORM_VERT_POSITION ( SID_SVX_START + 1000 )
#define SID_SHOW_ITEMBROWSER ( SID_SVX_START + 1001 )
// Available for use 1001
#define SID_ALIGN_ANY_LEFT ( SID_SVX_START + 1002 )
#define SID_ALIGN_ANY_HCENTER ( SID_SVX_START + 1003 )
#define SID_ALIGN_ANY_RIGHT ( SID_SVX_START + 1004 )

18
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
View File

@ -1392,12 +1392,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
</node>
</node>
<node oor:name="com.sun.star.chart2.ChartDocument" oor:op="replace">
<node oor:name="9_SHIFT_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ShowItemBrowser</value>
</prop>
</node>
<node oor:name="C_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
@ -1540,12 +1534,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="9_SHIFT_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ShowItemBrowser</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
@ -2827,12 +2815,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="de">.uno:Grow</value>
</prop>
</node>
<node oor:name="9_SHIFT_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ShowItemBrowser</value>
</prop>
</node>
<node oor:name="ADD_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>

5
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
View File

@ -5765,11 +5765,6 @@
<value xml:lang="en-US">Current Date</value>
</prop>
</node>
<node oor:name=".uno:ShowItemBrowser" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Item Browser On/Off</value>
</prop>
</node>
<node oor:name=".uno:DateField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Date Field</value>

5
sd/sdi/_drvwsh.sdi
View File

@ -2091,11 +2091,6 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
SID_SHOW_ITEMBROWSER // ole : no, status : play rec
[
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
SID_AUTOSPELL_CHECK // ole : no, status : play rec
[
ExecMethod = FuSupport ;

9
sd/source/ui/view/drviewse.cxx
View File

@ -1339,15 +1339,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
#ifdef DBG_UTIL
case SID_SHOW_ITEMBROWSER:
{
mpDrawView->ShowItemBrowser( !mpDrawView->IsItemBrowserVisible() );
rReq.Done ();
}
break;
#endif
case SID_AUTOSPELL_CHECK:
{
bool bOnlineSpell = !GetDoc()->GetOnlineSpell();

2
solenv/clang-format/blacklist
View File

@ -13856,7 +13856,6 @@ svx/inc/sdr/properties/pageproperties.hxx
svx/inc/sdr/properties/rectangleproperties.hxx
svx/inc/sdr/properties/textproperties.hxx
svx/inc/strings.hxx
svx/inc/svdibrow.hxx
svx/inc/sxallitm.hxx
svx/inc/sxcikitm.hxx
svx/inc/sxlayitm.hxx
@ -14367,7 +14366,6 @@ svx/source/svdraw/svdglev.cxx
svx/source/svdraw/svdglue.cxx
svx/source/svdraw/svdhdl.cxx
svx/source/svdraw/svdhlpln.cxx
svx/source/svdraw/svdibrow.cxx
svx/source/svdraw/svditer.cxx
svx/source/svdraw/svdlayer.cxx
svx/source/svdraw/svdmark.cxx

1
svx/Library_svxcore.mk
View File

@ -301,7 +301,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/svdglue \
svx/source/svdraw/svdhdl \
svx/source/svdraw/svdhlpln \
svx/source/svdraw/svdibrow \
svx/source/svdraw/svditer \
svx/source/svdraw/svdlayer \
svx/source/svdraw/svdmark \

5
svx/inc/pch/precompiled_svx.hxx
View File

@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
Generated on 2019-12-03 09:22:33 using:
Generated on 2019-12-03 09:41:31 using:
./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@ -61,8 +61,11 @@
#include <rtl/instance.hxx>
#include <rtl/math.hxx>
#include <rtl/ref.hxx>
#include <rtl/strbuf.h>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/stringconcat.hxx>
#include <rtl/stringutils.hxx>
#include <rtl/tencinfo.h>
#include <rtl/textenc.h>
#include <rtl/uri.hxx>

3
svx/inc/pch/precompiled_svxcore.hxx
View File

@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
Generated on 2019-12-03 09:23:12 using:
Generated on 2019-12-03 09:41:26 using:
./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@ -62,7 +62,6 @@
#include <osl/interlck.h>
#include <osl/mutex.hxx>
#include <osl/process.h>
#include <osl/thread.h>
#include <osl/time.h>
#include <rtl/alloc.h>
#include <rtl/character.hxx>

119
svx/inc/svdibrow.hxx
View File

@ -1,119 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVX_INC_SVDIBROW_HXX
#define INCLUDED_SVX_INC_SVDIBROW_HXX
#include <svtools/brwbox.hxx>
#include <vcl/edit.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/idle.hxx>
#include <memory>
class SfxItemSet;
class ImpItemListRow;
class BrowserMouseEvent;
class SdrItemBrowserControl final : public BrowseBox
{
friend class ImpItemEdit;
std::vector<std::unique_ptr<ImpItemListRow>> aList;
long nCurrentPaintRow;
VclPtr<Edit> pEditControl;
OUString aWNameMemorized;
Link<SdrItemBrowserControl&,void> aEntryChangedHdl;
Link<SdrItemBrowserControl&,void> aSetDirtyHdl;
std::unique_ptr<ImpItemListRow> pCurrentChangeEntry;
long nLastWhichOfs;
sal_uInt16 nLastWhich;
bool bWhichesButNames;
bool bDontHideIneffectiveItems;
bool bDontSortItems;
void ImpCtor();
void ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum);
void ImpSaveWhich();
void ImpRestoreWhich();
std::size_t GetCurrentPos() const;
bool BeginChangeEntry(std::size_t nPos);
virtual long GetRowCount() const override;
virtual bool SeekRow(long nRow) override;
virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override;
virtual void DoubleClick(const BrowserMouseEvent&) override;
virtual void KeyInput(const KeyEvent& rEvt) override;
virtual void Select() override;
void SetDirty(); // is called for example in mode switches
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
public:
SdrItemBrowserControl(vcl::Window* pParent);
virtual ~SdrItemBrowserControl() override;
virtual void dispose() override;
void Clear();
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet);
sal_uInt16 GetCurrentWhich() const;
void EndChangeEntry();
void BreakChangeEntry();
/** GetCellText returns the text at the given position
@param _nRow
the number of the row
@param _nColId
the ID of the column
@return
the text out of the cell
*/
virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override;
const ImpItemListRow* GetCurrentChangeEntry() const { return pCurrentChangeEntry.get(); }
OUString GetNewEntryValue() const { return pEditControl->GetText(); }
void SetEntryChangedHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aEntryChangedHdl=rLink; }
void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aSetDirtyHdl=rLink; }
};
class SdrView;
class SdrItemBrowser: public FloatingWindow {
VclPtr<SdrItemBrowserControl> aBrowse;
Idle aIdle;
SdrView* pView;
bool bDirty;
static vcl::Window* ImpGetViewWin(SdrView const & rView);
DECL_LINK(IdleHdl, Timer *, void);
DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void);
DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void);
public:
SdrItemBrowser(SdrView& rView);
virtual ~SdrItemBrowser() override;
void ForceParent();
void SetDirty();
void Undirty();
virtual void dispose() override;
virtual void Resize() override;
virtual void GetFocus() override;
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet) { aBrowse->SetAttributes(pAttr,p2ndSet); }
SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
};
#endif // INCLUDED_SVX_INC_SVDIBROW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

19
svx/sdi/svx.sdi
View File

@ -7744,25 +7744,6 @@ SfxBoolItem ShowFmExplorer SID_FM_SHOW_FMEXPLORER
SfxBoolItem ShowItemBrowser SID_SHOW_ITEMBROWSER
[
AutoUpdate = TRUE,
FastCall = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = TRUE,
MenuConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::View;
]
SfxBoolItem ShowPropBrowser SID_SHOW_PROPERTYBROWSER
[

39
svx/source/svdraw/svdedxv.cxx
View File

@ -45,9 +45,6 @@
#include <vcl/cursor.hxx>
#include <vcl/hatch.hxx>
#include <vcl/weld.hxx>
#ifdef DBG_UTIL
#include <svdibrow.hxx>
#endif
#include <comphelper/lok.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
@ -1325,10 +1322,6 @@ bool SdrObjEditView::SdrBeginTextEdit(SdrObject* pObj_, SdrPageView* pPV, vcl::W
LINK(this, SdrObjEditView, ImpAfterCutOrPasteChainingEventHdl));
}
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
pTextEditOutliner->ClearModifyFlag();
if (pTextObj->IsFitToSize())
@ -1641,13 +1634,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
{
GetMarkedObjectListWriteAccess().SetNameDirty();
}
#ifdef DBG_UTIL
if (mpItemBrowser)
{
GetMarkedObjectListWriteAccess().SetNameDirty();
mpItemBrowser->SetDirty();
}
#endif
}
if (pTEObj && !pTEObj->getSdrModelFromSdrObject().isLocked() && pTEObj->GetBroadcaster())
@ -1826,10 +1812,6 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
if (pWin != nullptr && pWin != pTextEditWin)
SetTextEditWin(pWin);
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
}
@ -1873,10 +1855,6 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, OutputDevice* pWin
if (pWin != nullptr && pWin != pTextEditWin
&& pWin->GetOutDevType() == OUTDEV_WINDOW)
SetTextEditWin(static_cast<vcl::Window*>(pWin));
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
}
@ -1915,10 +1893,6 @@ bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, OutputDevice* pWin)
rMEvt.GetModifier());
if (pTextEditOutlinerView->MouseButtonUp(aMEvt))
{
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
}
@ -1962,10 +1936,6 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, OutputDevice* pWin)
rMEvt.GetModifier());
if (pTextEditOutlinerView->MouseMove(aMEvt) && bSelMode)
{
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
}
@ -2011,10 +1981,6 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin)
pTextEditOutlinerView->Command(aCEvt);
if (pWin != nullptr && pWin != pTextEditWin)
SetTextEditWin(pWin);
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
}
@ -2287,11 +2253,6 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
if (mpModel && pTEOutliner && pTEOutliner->IsModified())
mpModel->SetChanged();
#ifdef DBG_UTIL
if (mpItemBrowser != nullptr)
mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
}
bRet = true;

1233
svx/source/svdraw/svdibrow.cxx
View File

File diff suppressed because it is too large Load Diff

7
svx/source/svdraw/svdmrkv.cxx
View File

@ -27,10 +27,6 @@
#include <svx/svdotable.hxx>
#include "svddrgm1.hxx"
#ifdef DBG_UTIL
#include <svdibrow.hxx>
#endif
#include <osl/thread.h>
#include <svx/svdoole2.hxx>
#include <svx/xgrad.hxx>
@ -2445,9 +2441,6 @@ void SdrMarkView::MarkListHasChanged()
mbMarkedObjRectDirty=true;
mbMarkedPointsRectsDirty=true;
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
bool bOneEdgeMarked=false;
if (GetMarkedObjectCount()==1) {
const SdrObject* pObj=GetMarkedObjectByIndex(0);

57
svx/source/svdraw/svdpntv.cxx
View File

@ -36,7 +36,6 @@
#include <svx/svdglue.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdograf.hxx>
#include <svdibrow.hxx>
#include <svx/svditer.hxx>
#include <svx/svdouno.hxx>
#include <svx/sdr/overlay/overlayobjectlist.hxx>
@ -134,9 +133,6 @@ BitmapEx convertMetafileToBitmapEx(
void SdrPaintView::ImpClearVars()
{
#ifdef DBG_UTIL
mpItemBrowser=nullptr;
#endif
mbPageVisible=true;
mbPageShadowVisible=true;
mbPageBorderVisible=true;
@ -207,10 +203,6 @@ SdrPaintView::~SdrPaintView()
maColorConfig.RemoveListener(this);
ClearPageView();
#ifdef DBG_UTIL
mpItemBrowser.disposeAndClear();
#endif
// delete existing SdrPaintWindows
maPaintWindows.clear();
}
@ -289,13 +281,6 @@ void SdrPaintView::ModelHasChanged()
{
mpPageView->ModelHasChanged();
}
#ifdef DBG_UTIL
if(mpItemBrowser)
{
mpItemBrowser->SetDirty();
}
#endif
}
@ -421,11 +406,6 @@ void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWin
{
mpPageView->AddPaintWindowToPageView(*pNewPaintWindow);
}
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr)
mpItemBrowser->ForceParent();
#endif
}
void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
@ -442,11 +422,6 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
DeletePaintWindow(*pCandidate);
}
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr)
mpItemBrowser->ForceParent();
#endif
}
void SdrPaintView::SetLayerVisible(const OUString& rName, bool bShow)
@ -989,9 +964,6 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll)
if (bReplaceAll) maDefaultAttr.Set(rAttr);
else maDefaultAttr.Put(rAttr,false); // if FALSE, regard InvalidItems as "holes," not as Default
SetNotPersistDefaultAttr(rAttr);
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
}
void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
@ -1012,9 +984,6 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRe
nWhich=aIter.NextWhich();
}
}
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
}
void SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
@ -1047,25 +1016,6 @@ void SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHar
SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr);
}
#ifdef DBG_UTIL
void SdrPaintView::ShowItemBrowser(bool bShow)
{
if (bShow) {
if (mpItemBrowser==nullptr) {
mpItemBrowser=VclPtr<SdrItemBrowser>::Create(*static_cast<SdrView*>(this));
}
mpItemBrowser->Show();
mpItemBrowser->GrabFocus();
} else {
if (mpItemBrowser!=nullptr) {
mpItemBrowser->Hide();
mpItemBrowser.disposeAndClear();
}
}
}
#endif
void SdrPaintView::MakeVisible(const tools::Rectangle& rRect, vcl::Window& rWin)
{
// TODO: handle when the text cursor goes out of the chart area
@ -1131,13 +1081,6 @@ void SdrPaintView::SetAnimationEnabled( bool bEnable )
SetAnimationMode( bEnable ? SdrAnimationMode::Animate : SdrAnimationMode::Disable );
}
#if defined DBG_UTIL
vcl::Window* SdrPaintView::GetItemBrowser() const
{
return mpItemBrowser;
}
#endif
void SdrPaintView::SetAnimationPause( bool bSet )
{
if(mbAnimationPause != bSet)

10
svx/source/svdraw/svdview.cxx
View File

@ -31,10 +31,6 @@
#include <svx/svdomedia.hxx>
#include <svx/svdetc.hxx>
#ifdef DBG_UTIL
#include <svdibrow.hxx>
#endif
#include <svx/svdoutl.hxx>
#include <svx/svdview.hxx>
#include <editeng/editview.hxx>
@ -1349,9 +1345,6 @@ void SdrView::MarkAll()
{
if (IsTextEdit()) {
GetTextEditOutlinerView()->SetSelection(ESelection(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL));
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
} else if (IsGluePointEditMode()) MarkAllGluePoints();
else if (HasMarkablePoints()) MarkAllPoints();
else MarkAllObj();
@ -1364,9 +1357,6 @@ void SdrView::UnmarkAll()
eSel.nStartPara=eSel.nEndPara;
eSel.nStartPos=eSel.nEndPos;
GetTextEditOutlinerView()->SetSelection(eSel);
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
} else if (HasMarkedGluePoints()) UnmarkAllGluePoints();
else if (HasMarkedPoints()) UnmarkAllPoints(); // Marked, not Markable!
else UnmarkAllObj();