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

loplugin:mergeclasses SdrItemBrowser

Browse Source 
Change-Id: I90c6006be05f182fd442ce8d3641f4f17cdb6793
This commit is contained in:
Noel Grandin
2016-06-10 09:06:54 +02:00
parent c6d0a104aa
commit fc7e6d8445
3 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -126,7 +126,6 @@ merge SdrEditView with SdrPolyEditView
merge SdrEscherImport with SdrPowerPointImport
merge SdrExchangeView with SdrDragView
merge SdrGlueEditView with SdrObjEditView
merge SdrItemBrowserWindow with SdrItemBrowser
merge SdrMarkView with SdrEditView
merge SdrObjEditView with SdrExchangeView
merge SdrPaintView with SdrSnapView

37
svx/inc/svdibrow.hxx
View File

@@ -94,14 +94,23 @@ public:
void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aSetDirtyHdl=rLink; }
};
#define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
#define WB_STDSIZEABLEFLOATWIN (WB_STDFLOATWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
class SdrView;
class SdrItemBrowserWindow: public FloatingWindow {
class SdrItemBrowser: public FloatingWindow {
VclPtr<SdrItemBrowserControl> aBrowse;
Idle aIdle;
SdrView* pView;
bool bDirty;
static vcl::Window* ImpGetViewWin(SdrView& rView);
DECL_LINK_TYPED(IdleHdl, Idle *, void);
DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void);
DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void);
public:
SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN);
virtual ~SdrItemBrowserWindow();
SdrItemBrowser(SdrView& rView);
virtual ~SdrItemBrowser();
void ForceParent();
void SetDirty();
void Undirty();
virtual void dispose() override;
virtual void Resize() override;
virtual void GetFocus() override;
@@ -109,24 +118,6 @@ public:
SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
};
class SdrView;
class SdrItemBrowser: public SdrItemBrowserWindow {
Idle aIdle;
SdrView* pView;
bool bDirty;
private:
static vcl::Window* ImpGetViewWin(SdrView& rView);
DECL_LINK_TYPED(IdleHdl, Idle *, void);
DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void);
DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void);
public:
SdrItemBrowser(SdrView& rView);
void ForceParent();
void SetDirty();
void Undirty();
};
#endif // INCLUDED_SVX_INC_SVDIBROW_HXX

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

@@ -1037,51 +1037,43 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS
SetMode(MYBROWSEMODE);
}
// - SdrItemBrowserWindow -
SdrItemBrowserWindow::SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits):
FloatingWindow(pParent,nBits),
aBrowse(VclPtr<SdrItemBrowserControl>::Create(this))
SdrItemBrowser::SdrItemBrowser(SdrView& rView):
FloatingWindow(ImpGetViewWin(rView), WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE),
aBrowse(VclPtr<SdrItemBrowserControl>::Create(this)),
aIdle("svx svdraw SdrItemBrowser"),
pView(&rView),
bDirty(false)
{
SetOutputSizePixel(aBrowse->GetSizePixel());
SetText("Joe's ItemBrowser");
aBrowse->Show();
aIdle.SetIdleHdl(LINK(this,SdrItemBrowser,IdleHdl));
GetBrowserControl()->SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
GetBrowserControl()->SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl));
SetDirty();
}
SdrItemBrowserWindow::~SdrItemBrowserWindow()
SdrItemBrowser::~SdrItemBrowser()
{
disposeOnce();
}
void SdrItemBrowserWindow::dispose()
void SdrItemBrowser::dispose()
{
aBrowse.disposeAndClear();
FloatingWindow::dispose();
}
void SdrItemBrowserWindow::Resize()
void SdrItemBrowser::Resize()
{
aBrowse->SetSizePixel(GetOutputSizePixel());
}
void SdrItemBrowserWindow::GetFocus()
void SdrItemBrowser::GetFocus()
{
aBrowse->GrabFocus();
}
SdrItemBrowser::SdrItemBrowser(SdrView& rView):
SdrItemBrowserWindow(ImpGetViewWin(rView)),
aIdle("svx svdraw SdrItemBrowser"),
pView(&rView),
bDirty(false)
{
aIdle.SetIdleHdl(LINK(this,SdrItemBrowser,IdleHdl));
GetBrowserControl()->SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
GetBrowserControl()->SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl));
SetDirty();
}
vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView)
{
const sal_uInt32 nWinCount(rView.PaintWindowCount());