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

tdf#123936 Formatting files in module basctl with clang-format

Browse Source 
Change-Id: I428d5642a19588456ff4af09e2f9f39ae17b2e4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105644
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer
2020-11-12 12:48:11 +01:00
committed by Christian Lohmaier
parent 65d6173152
commit 6da61d5fa7
16 changed files with 128 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
basctl/inc/iderdll.hxx
View File

@@ -21,15 +21,14 @@
namespace basctl namespace basctl
{ {
class Shell; class Shell;
class ExtraData; class ExtraData;
void EnsureIde (); void EnsureIde();
void ShellCreated (Shell* pShell); void ShellCreated(Shell* pShell);
Shell* GetShell(); Shell* GetShell();
void ShellDestroyed (Shell const * pShell); void ShellDestroyed(Shell const* pShell);
ExtraData* GetExtraData(); ExtraData* GetExtraData();

6
basctl/source/basicide/basicmod.hxx
View File

@@ -17,19 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#pragma once #pragma once
#include <sfx2/module.hxx> #include <sfx2/module.hxx>
namespace basctl namespace basctl
{ {
class Module : public SfxModule class Module : public SfxModule
{ {
public: public:
Module(const OString& rResName, SfxObjectFactory *pObjFact) Module(const OString& rResName, SfxObjectFactory* pObjFact)
: SfxModule(rResName, {pObjFact}) : SfxModule(rResName, { pObjFact })
{ {
} }
}; };

54
basctl/source/basicide/brkdlg.cxx
View File

@@ -28,22 +28,19 @@
namespace basctl namespace basctl
{ {
// FIXME Why does BreakPointDialog allow only sal_uInt16 for break-point line // FIXME Why does BreakPointDialog allow only sal_uInt16 for break-point line
// numbers, whereas BreakPoint supports sal_uLong? // numbers, whereas BreakPoint supports sal_uLong?
namespace namespace
{ {
bool lcl_ParseText(OUString const& rText, size_t& rLineNr)
bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
{ {
// aText should look like "# n" where // aText should look like "# n" where
// n > 0 && n < std::numeric_limits< sal_uInt16 >::max(). // n > 0 && n < std::numeric_limits< sal_uInt16 >::max().
// All spaces are ignored, so there can even be spaces within the // All spaces are ignored, so there can even be spaces within the
// number n. (Maybe it would be better to ignore all whitespace instead // number n. (Maybe it would be better to ignore all whitespace instead
// of just spaces.) // of just spaces.)
OUString aText( OUString aText(rText.replaceAll(" ", ""));
rText.replaceAll(" ", ""));
if (aText.isEmpty()) if (aText.isEmpty())
return false; return false;
sal_Unicode cFirst = aText[0]; sal_Unicode cFirst = aText[0];
@@ -53,16 +50,17 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
aText = aText.copy(1); aText = aText.copy(1);
// XXX Assumes that sal_uInt16 is contained within sal_Int32: // XXX Assumes that sal_uInt16 is contained within sal_Int32:
sal_Int32 n = aText.toInt32(); sal_Int32 n = aText.toInt32();
if ( n <= 0 ) if (n <= 0)
return false; return false;
rLineNr = static_cast< size_t >(n); rLineNr = static_cast<size_t>(n);
return true; return true;
} }
} // namespace } // namespace
BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPntList) BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPntList)
: GenericDialogController(pParent, "modules/BasicIDE/ui/managebreakpoints.ui", "ManageBreakpointsDialog") : GenericDialogController(pParent, "modules/BasicIDE/ui/managebreakpoints.ui",
"ManageBreakpointsDialog")
, m_rOriginalBreakPointList(rBrkPntList) , m_rOriginalBreakPointList(rBrkPntList)
, m_aModifiedBreakPointList(rBrkPntList) , m_aModifiedBreakPointList(rBrkPntList)
, m_xComboBox(m_xBuilder->weld_entry_tree_view("entriesgrid", "entries", "entrieslist")) , m_xComboBox(m_xBuilder->weld_entry_tree_view("entriesgrid", "entries", "entrieslist"))
@@ -76,10 +74,10 @@ BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPn
m_xComboBox->set_height_request_by_rows(12); m_xComboBox->set_height_request_by_rows(12);
m_xComboBox->freeze(); m_xComboBox->freeze();
for ( size_t i = 0, n = m_aModifiedBreakPointList.size(); i < n; ++i ) for (size_t i = 0, n = m_aModifiedBreakPointList.size(); i < n; ++i)
{ {
BreakPoint& rBrk = m_aModifiedBreakPointList.at( i ); BreakPoint& rBrk = m_aModifiedBreakPointList.at(i);
OUString aEntryStr( "# " + OUString::number(rBrk.nLine) ); OUString aEntryStr("# " + OUString::number(rBrk.nLine));
m_xComboBox->append_text(aEntryStr); m_xComboBox->append_text(aEntryStr);
} }
m_xComboBox->thaw(); m_xComboBox->thaw();
@@ -101,20 +99,18 @@ BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPn
m_xComboBox->set_active(0); m_xComboBox->set_active(0);
if (m_aModifiedBreakPointList.size()) if (m_aModifiedBreakPointList.size())
UpdateFields( m_aModifiedBreakPointList.at( 0 ) ); UpdateFields(m_aModifiedBreakPointList.at(0));
CheckButtons(); CheckButtons();
} }
BreakPointDialog::~BreakPointDialog() BreakPointDialog::~BreakPointDialog() {}
{
}
void BreakPointDialog::SetCurrentBreakPoint( BreakPoint const & rBrk ) void BreakPointDialog::SetCurrentBreakPoint(BreakPoint const& rBrk)
{ {
OUString aStr( "# " + OUString::number(rBrk.nLine) ); OUString aStr("# " + OUString::number(rBrk.nLine));
m_xComboBox->set_entry_text(aStr); m_xComboBox->set_entry_text(aStr);
UpdateFields( rBrk ); UpdateFields(rBrk);
} }
void BreakPointDialog::CheckButtons() void BreakPointDialog::CheckButtons()
@@ -156,8 +152,8 @@ IMPL_LINK(BreakPointDialog, EditModifyHdl, weld::ComboBox&, rBox, void)
int nEntry = rBox.find_text(rBox.get_active_text()); int nEntry = rBox.find_text(rBox.get_active_text());
if (nEntry == -1) if (nEntry == -1)
return; return;
BreakPoint& rBrk = m_aModifiedBreakPointList.at( nEntry ); BreakPoint& rBrk = m_aModifiedBreakPointList.at(nEntry);
UpdateFields( rBrk ); UpdateFields(rBrk);
} }
IMPL_LINK(BreakPointDialog, FieldModifyHdl, weld::SpinButton&, rEdit, void) IMPL_LINK(BreakPointDialog, FieldModifyHdl, weld::SpinButton&, rEdit, void)
@@ -186,17 +182,17 @@ IMPL_LINK(BreakPointDialog, ButtonHdl, weld::Button&, rButton, void)
// keep checkbox in mind! // keep checkbox in mind!
OUString aText(m_xComboBox->get_active_text()); OUString aText(m_xComboBox->get_active_text());
size_t nLine; size_t nLine;
bool bValid = lcl_ParseText( aText, nLine ); bool bValid = lcl_ParseText(aText, nLine);
if ( bValid ) if (bValid)
{ {
BreakPoint aBrk( nLine ); BreakPoint aBrk(nLine);
aBrk.bEnabled = m_xCheckBox->get_active(); aBrk.bEnabled = m_xCheckBox->get_active();
aBrk.nStopAfter = static_cast<size_t>(m_xNumericField->get_value()); aBrk.nStopAfter = static_cast<size_t>(m_xNumericField->get_value());
m_aModifiedBreakPointList.InsertSorted( aBrk ); m_aModifiedBreakPointList.InsertSorted(aBrk);
OUString aEntryStr( "# " + OUString::number(aBrk.nLine) ); OUString aEntryStr("# " + OUString::number(aBrk.nLine));
m_xComboBox->append_text(aEntryStr); m_xComboBox->append_text(aEntryStr);
if (SfxDispatcher* pDispatcher = GetDispatcher()) if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute( SID_BASICIDE_BRKPNTSCHANGED ); pDispatcher->Execute(SID_BASICIDE_BRKPNTSCHANGED);
} }
else else
{ {
@@ -216,13 +212,13 @@ IMPL_LINK(BreakPointDialog, ButtonHdl, weld::Button&, rButton, void)
nEntry--; nEntry--;
m_xComboBox->set_active_text(m_xComboBox->get_text(nEntry)); m_xComboBox->set_active_text(m_xComboBox->get_text(nEntry));
if (SfxDispatcher* pDispatcher = GetDispatcher()) if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute( SID_BASICIDE_BRKPNTSCHANGED ); pDispatcher->Execute(SID_BASICIDE_BRKPNTSCHANGED);
CheckButtons(); CheckButtons();
} }
} }
} }
void BreakPointDialog::UpdateFields( BreakPoint const & rBrk ) void BreakPointDialog::UpdateFields(BreakPoint const& rBrk)
{ {
m_xCheckBox->set_active(rBrk.bEnabled); m_xCheckBox->set_active(rBrk.bEnabled);
m_xNumericField->set_value(rBrk.nStopAfter); m_xNumericField->set_value(rBrk.nStopAfter);
@@ -233,7 +229,7 @@ BreakPoint* BreakPointDialog::GetSelectedBreakPoint()
int nEntry = m_xComboBox->find_text(m_xComboBox->get_active_text()); int nEntry = m_xComboBox->find_text(m_xComboBox->get_active_text());
if (nEntry == -1) if (nEntry == -1)
return nullptr; return nullptr;
return &m_aModifiedBreakPointList.at( nEntry ); return &m_aModifiedBreakPointList.at(nEntry);
} }
} // namespace basctl } // namespace basctl

12
basctl/source/basicide/brkdlg.hxx
View File

@@ -24,10 +24,9 @@
namespace basctl namespace basctl
{ {
class BreakPointDialog final : public weld::GenericDialogController class BreakPointDialog final : public weld::GenericDialogController
{ {
BreakPointList & m_rOriginalBreakPointList; BreakPointList& m_rOriginalBreakPointList;
BreakPointList m_aModifiedBreakPointList; BreakPointList m_aModifiedBreakPointList;
std::unique_ptr<weld::EntryTreeView> m_xComboBox; std::unique_ptr<weld::EntryTreeView> m_xComboBox;
@@ -37,21 +36,20 @@ class BreakPointDialog final : public weld::GenericDialogController
std::unique_ptr<weld::CheckButton> m_xCheckBox; std::unique_ptr<weld::CheckButton> m_xCheckBox;
std::unique_ptr<weld::SpinButton> m_xNumericField; std::unique_ptr<weld::SpinButton> m_xNumericField;
void CheckButtons(); void CheckButtons();
DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
DECL_LINK(EditModifyHdl, weld::ComboBox&, void); DECL_LINK(EditModifyHdl, weld::ComboBox&, void);
DECL_LINK(FieldModifyHdl, weld::SpinButton&, void); DECL_LINK(FieldModifyHdl, weld::SpinButton&, void);
DECL_LINK(ButtonHdl, weld::Button&, void); DECL_LINK(ButtonHdl, weld::Button&, void);
DECL_LINK(TreeModifyHdl, weld::TreeView&, bool); DECL_LINK(TreeModifyHdl, weld::TreeView&, bool);
void UpdateFields( BreakPoint const & rBrk ); void UpdateFields(BreakPoint const& rBrk);
BreakPoint* GetSelectedBreakPoint(); BreakPoint* GetSelectedBreakPoint();
public: public:
BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkList); BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkList);
virtual ~BreakPointDialog() override; virtual ~BreakPointDialog() override;
void SetCurrentBreakPoint( BreakPoint const & rBrk ); void SetCurrentBreakPoint(BreakPoint const& rBrk);
}; };
} // namespace basctl } // namespace basctl

22
basctl/source/basicide/linenumberwindow.cxx
View File

@@ -16,21 +16,17 @@
namespace basctl namespace basctl
{ {
LineNumberWindow::LineNumberWindow(vcl::Window* pParent, ModulWindow* pModulWindow)
LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : : Window(pParent, WB_BORDER)
Window(pParent, WB_BORDER), , m_pModulWindow(pModulWindow)
m_pModulWindow(pModulWindow), , m_nCurYOffset(0)
m_nCurYOffset(0)
{ {
SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
m_nBaseWidth = GetTextWidth("8"); m_nBaseWidth = GetTextWidth("8");
m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;
} }
LineNumberWindow::~LineNumberWindow() LineNumberWindow::~LineNumberWindow() { disposeOnce(); }
{
disposeOnce();
}
void LineNumberWindow::dispose() void LineNumberWindow::dispose()
{ {
@@ -38,9 +34,9 @@ void LineNumberWindow::dispose()
Window::dispose(); Window::dispose();
} }
void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle&) void LineNumberWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{ {
if(SyncYOffset()) if (SyncYOffset())
return; return;
ExtTextEngine* txtEngine = m_pModulWindow->GetEditEngine(); ExtTextEngine* txtEngine = m_pModulWindow->GetEditEngine();
@@ -86,7 +82,7 @@ void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const tools::R
rRenderContext.DrawText(Point(0, y - m_nCurYOffset), OUString::number(n)); rRenderContext.DrawText(Point(0, y - m_nCurYOffset), OUString::number(n));
} }
void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt) void LineNumberWindow::DataChanged(DataChangedEvent const& rDCEvt)
{ {
Window::DataChanged(rDCEvt); Window::DataChanged(rDCEvt);
if (rDCEvt.GetType() == DataChangedEventType::SETTINGS if (rDCEvt.GetType() == DataChangedEventType::SETTINGS
@@ -108,7 +104,6 @@ void LineNumberWindow::DoScroll(tools::Long nVertScroll)
Window::Scroll(0, nVertScroll); Window::Scroll(0, nVertScroll);
} }
bool LineNumberWindow::SyncYOffset() bool LineNumberWindow::SyncYOffset()
{ {
TextView* pView = m_pModulWindow->GetEditView(); TextView* pView = m_pModulWindow->GetEditView();
@@ -124,7 +119,6 @@ bool LineNumberWindow::SyncYOffset()
return true; return true;
} }
} // namespace basctl } // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

11
basctl/source/basicide/linenumberwindow.hxx
View File

@@ -13,7 +13,6 @@
namespace basctl namespace basctl
{ {
class ModulWindow; class ModulWindow;
class LineNumberWindow : public vcl::Window class LineNumberWindow : public vcl::Window
@@ -23,22 +22,22 @@ private:
int m_nWidth; int m_nWidth;
tools::Long m_nCurYOffset; tools::Long m_nCurYOffset;
int m_nBaseWidth; int m_nBaseWidth;
virtual void DataChanged (DataChangedEvent const& rDCEvt) override; virtual void DataChanged(DataChangedEvent const& rDCEvt) override;
protected: protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
public: public:
LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin); LineNumberWindow(vcl::Window* pParent, ModulWindow* pModulWin);
virtual ~LineNumberWindow() override; virtual ~LineNumberWindow() override;
virtual void dispose() override; virtual void dispose() override;
void DoScroll( tools::Long nVertScroll ); void DoScroll(tools::Long nVertScroll);
bool SyncYOffset(); bool SyncYOffset();
tools::Long& GetCurYOffset() { return m_nCurYOffset;} tools::Long& GetCurYOffset() { return m_nCurYOffset; }
int GetWidth() const { return m_nWidth;} int GetWidth() const { return m_nWidth; }
}; };
} // namespace basctl } // namespace basctl

13
basctl/source/basicide/textwindowpeer.hxx
View File

@@ -24,16 +24,15 @@
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
namespace com::sun::star::awt { namespace com::sun::star::awt
class XWindowPeer; {
class XWindowPeer;
} }
class TextView; class TextView;
namespace basctl { namespace basctl
{
css::uno::Reference<css::awt::XWindowPeer> createTextWindowPeer( css::uno::Reference<css::awt::XWindowPeer> createTextWindowPeer(TextView& view);
TextView & view);
} }
#endif #endif

12
basctl/source/dlged/dlgedmod.cxx
View File

@@ -22,20 +22,14 @@
namespace basctl namespace basctl
{ {
DlgEdModel::DlgEdModel() DlgEdModel::DlgEdModel()
: SdrModel() : SdrModel()
{ {
} }
DlgEdModel::~DlgEdModel() DlgEdModel::~DlgEdModel() {}
{
}
SdrPage* DlgEdModel::AllocPage(bool bMasterPage) SdrPage* DlgEdModel::AllocPage(bool bMasterPage) { return new DlgEdPage(*this, bMasterPage); }
{
return new DlgEdPage(*this, bMasterPage);
}
} // namespace basctl } // namespace basctl

10
basctl/source/inc/dlgedfac.hxx
View File

@@ -25,19 +25,17 @@
namespace basctl namespace basctl
{ {
// DlgEdFactory // DlgEdFactory
class DlgEdFactory class DlgEdFactory
{ {
const css::uno::Reference< css::frame::XModel > mxModel; const css::uno::Reference<css::frame::XModel> mxModel;
public: public:
DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ); DlgEdFactory(const css::uno::Reference<css::frame::XModel>& xModel);
~DlgEdFactory() COVERITY_NOEXCEPT_FALSE; ~DlgEdFactory() COVERITY_NOEXCEPT_FALSE;
DECL_LINK( MakeObject, SdrObjCreatorParams, SdrObject* ); DECL_LINK(MakeObject, SdrObjCreatorParams, SdrObject*);
}; };
} // namespace basctl } // namespace basctl

44
basctl/source/inc/dlgedfunc.hxx
View File

@@ -26,63 +26,55 @@
namespace basctl namespace basctl
{ {
class DlgEditor; class DlgEditor;
// DlgEdFunc // DlgEdFunc
class DlgEdFunc /* : public LinkHdl */ class DlgEdFunc /* : public LinkHdl */
{ {
protected: protected:
DlgEditor& rParent; DlgEditor& rParent;
Timer aScrollTimer; Timer aScrollTimer;
DECL_LINK( ScrollTimeout, Timer *, void ); DECL_LINK(ScrollTimeout, Timer*, void);
void ForceScroll( const Point& rPos ); void ForceScroll(const Point& rPos);
public: public:
explicit DlgEdFunc (DlgEditor& rParent); explicit DlgEdFunc(DlgEditor& rParent);
virtual ~DlgEdFunc(); virtual ~DlgEdFunc();
virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonDown(const MouseEvent& rMEvt);
virtual bool MouseButtonUp( const MouseEvent& rMEvt ); virtual bool MouseButtonUp(const MouseEvent& rMEvt);
virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseMove(const MouseEvent& rMEvt);
bool KeyInput( const KeyEvent& rKEvt ); bool KeyInput(const KeyEvent& rKEvt);
}; };
// DlgEdFuncInsert // DlgEdFuncInsert
class DlgEdFuncInsert : public DlgEdFunc class DlgEdFuncInsert : public DlgEdFunc
{ {
public: public:
explicit DlgEdFuncInsert (DlgEditor& rParent); explicit DlgEdFuncInsert(DlgEditor& rParent);
virtual ~DlgEdFuncInsert () override; virtual ~DlgEdFuncInsert() override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseMove(const MouseEvent& rMEvt) override;
}; };
// DlgEdFuncSelect // DlgEdFuncSelect
class DlgEdFuncSelect : public DlgEdFunc class DlgEdFuncSelect : public DlgEdFunc
{ {
public: public:
explicit DlgEdFuncSelect (DlgEditor& rParent); explicit DlgEdFuncSelect(DlgEditor& rParent);
virtual ~DlgEdFuncSelect () override; virtual ~DlgEdFuncSelect() override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseMove(const MouseEvent& rMEvt) override;
}; };
} // namespace basctl } // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

30
basctl/source/inc/dlgedlist.hxx
View File

@@ -25,54 +25,48 @@
namespace basctl namespace basctl
{ {
class DlgEdObj; class DlgEdObj;
// DlgEdPropListenerImpl // DlgEdPropListenerImpl
typedef ::cppu::WeakImplHelper<css::beans::XPropertyChangeListener> PropertyChangeListenerHelper;
typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > PropertyChangeListenerHelper; class DlgEdPropListenerImpl : public PropertyChangeListenerHelper
class DlgEdPropListenerImpl: public PropertyChangeListenerHelper
{ {
private: private:
DlgEdObj& rDlgEdObj; DlgEdObj& rDlgEdObj;
public: public:
explicit DlgEdPropListenerImpl (DlgEdObj&); explicit DlgEdPropListenerImpl(DlgEdObj&);
virtual ~DlgEdPropListenerImpl() override; virtual ~DlgEdPropListenerImpl() override;
// XEventListener // XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
// XPropertyChangeListener // XPropertyChangeListener
virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
}; };
// DlgEdEvtContListenerImpl // DlgEdEvtContListenerImpl
typedef ::cppu::WeakImplHelper<css::container::XContainerListener> ContainerListenerHelper;
typedef ::cppu::WeakImplHelper< css::container::XContainerListener > ContainerListenerHelper; class DlgEdEvtContListenerImpl : public ContainerListenerHelper
class DlgEdEvtContListenerImpl: public ContainerListenerHelper
{ {
private: private:
DlgEdObj& rDlgEdObj; DlgEdObj& rDlgEdObj;
public: public:
explicit DlgEdEvtContListenerImpl (DlgEdObj&); explicit DlgEdEvtContListenerImpl(DlgEdObj&);
virtual ~DlgEdEvtContListenerImpl() override; virtual ~DlgEdEvtContListenerImpl() override;
// XEventListener // XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
// XContainerListener // XContainerListener
virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) override;
virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override; virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) override;
}; };
} // namespace basctl } // namespace basctl

8
basctl/source/inc/dlgedmod.hxx
View File

@@ -23,25 +23,21 @@
namespace basctl namespace basctl
{ {
// DlgEdModel // DlgEdModel
class DlgEdModel : public SdrModel class DlgEdModel : public SdrModel
{ {
friend class DlgEdPage; friend class DlgEdPage;
private: private:
DlgEdModel( const DlgEdModel& ) = delete; DlgEdModel(const DlgEdModel&) = delete;
void operator=(const DlgEdModel& rSrcModel) = delete; void operator=(const DlgEdModel& rSrcModel) = delete;
public: public:
DlgEdModel(); DlgEdModel();
virtual ~DlgEdModel() override; virtual ~DlgEdModel() override;
virtual SdrPage* AllocPage(bool bMasterPage) override; virtual SdrPage* AllocPage(bool bMasterPage) override;
}; };
} // namespace basctl } // namespace basctl

12
basctl/source/inc/dlgedpage.hxx
View File

@@ -23,11 +23,8 @@
namespace basctl namespace basctl
{ {
// DlgEdPage // DlgEdPage
class DlgEdModel; class DlgEdModel;
class DlgEdForm; class DlgEdForm;
@@ -36,17 +33,16 @@ class DlgEdPage final : public SdrPage
DlgEdPage& operator=(const DlgEdPage&) = delete; DlgEdPage& operator=(const DlgEdPage&) = delete;
DlgEdPage(const DlgEdPage&) = delete; DlgEdPage(const DlgEdPage&) = delete;
DlgEdForm* pDlgEdForm; DlgEdForm* pDlgEdForm;
public: public:
explicit DlgEdPage(DlgEdModel& rModel, bool bMasterPage = false);
explicit DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false );
virtual ~DlgEdPage() override; virtual ~DlgEdPage() override;
virtual SdrPage* CloneSdrPage(SdrModel& rTargetModel) const override; virtual SdrPage* CloneSdrPage(SdrModel& rTargetModel) const override;
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } void SetDlgEdForm(DlgEdForm* pForm) { pDlgEdForm = pForm; }
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) override; virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) override;
}; };

3
basctl/source/inc/iderid.hxx
View File

@@ -23,8 +23,7 @@
namespace basctl namespace basctl
{ {
OUString IDEResId(const char* pId);
OUString IDEResId(const char *pId);
} // namespace basctl } // namespace basctl

58
basctl/source/inc/layout.hxx
View File

@@ -31,24 +31,22 @@ class SfxItemSet;
namespace basctl namespace basctl
{ {
class DockingWindow; class DockingWindow;
class BaseWindow; class BaseWindow;
// Layout -- the common base of ModulLayout and DialogLayout. // Layout -- the common base of ModulLayout and DialogLayout.
// Handles the splitting lines and the dockable windows. // Handles the splitting lines and the dockable windows.
class Layout: public vcl::Window class Layout : public vcl::Window
{ {
public: public:
void ArrangeWindows (); void ArrangeWindows();
virtual void Activating (BaseWindow&); virtual void Activating(BaseWindow&);
virtual void Deactivating (); virtual void Deactivating();
virtual void ExecuteGlobal (SfxRequest&) { } virtual void ExecuteGlobal(SfxRequest&) {}
virtual void GetState (SfxItemSet&, unsigned nWhich) = 0; virtual void GetState(SfxItemSet&, unsigned nWhich) = 0;
virtual void UpdateDebug (bool bBasicStopped ) = 0; virtual void UpdateDebug(bool bBasicStopped) = 0;
virtual ~Layout() override; virtual ~Layout() override;
virtual void dispose() override; virtual void dispose() override;
@@ -56,16 +54,16 @@ public:
protected: protected:
explicit Layout(vcl::Window* pParent); explicit Layout(vcl::Window* pParent);
void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); } void AddToLeft(DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); }
void AddToBottom (DockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); } void AddToBottom(DockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); }
void Remove (DockingWindow*); void Remove(DockingWindow*);
bool HasSize () const { return !bFirstSize; } bool HasSize() const { return !bFirstSize; }
// Window: // Window:
virtual void Resize () override; virtual void Resize() override;
virtual void DataChanged (DataChangedEvent const& rDCEvt) override; virtual void DataChanged(DataChangedEvent const& rDCEvt) override;
// new: // new:
virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) = 0; virtual void OnFirstSize(tools::Long nWidth, tools::Long nHeight) = 0;
private: private:
// the main child window (either ModulWindow or DialogWindow) // the main child window (either ModulWindow or DialogWindow)
@@ -78,13 +76,17 @@ private:
class SplittedSide class SplittedSide
{ {
public: public:
enum class Side {Left, Bottom}; enum class Side
SplittedSide (Layout*, Side); {
void Add (DockingWindow*, Size const&); Left,
void Remove (DockingWindow*); Bottom
bool IsEmpty () const; };
tools::Long GetSize () const; SplittedSide(Layout*, Side);
void ArrangeIn (tools::Rectangle const&); void Add(DockingWindow*, Size const&);
void Remove(DockingWindow*);
bool IsEmpty() const;
tools::Long GetSize() const;
void ArrangeIn(tools::Rectangle const&);
void dispose(); void dispose();
private: private:
@@ -117,12 +119,12 @@ private:
}; };
std::vector<Item> vItems; std::vector<Item> vItems;
Point MakePoint (tools::Long, tools::Long) const; Point MakePoint(tools::Long, tools::Long) const;
Size MakeSize (tools::Long, tools::Long) const; Size MakeSize(tools::Long, tools::Long) const;
static bool IsDocking (DockingWindow const&); static bool IsDocking(DockingWindow const&);
DECL_LINK(SplitHdl, Splitter*, void); DECL_LINK(SplitHdl, Splitter*, void);
void CheckMarginsFor (Splitter*); void CheckMarginsFor(Splitter*);
void InitSplitter (Splitter&); void InitSplitter(Splitter&);
} aLeftSide, aBottomSide; } aLeftSide, aBottomSide;
}; };

15
solenv/clang-format/excludelist
View File

@@ -199,13 +199,11 @@ avmedia/source/win/player.hxx
avmedia/source/win/window.cxx avmedia/source/win/window.cxx
avmedia/source/win/window.hxx avmedia/source/win/window.hxx
basctl/inc/helpids.h basctl/inc/helpids.h
basctl/inc/iderdll.hxx
basctl/inc/strings.hxx basctl/inc/strings.hxx
basctl/source/accessibility/accessibledialogcontrolshape.cxx basctl/source/accessibility/accessibledialogcontrolshape.cxx
basctl/source/accessibility/accessibledialogwindow.cxx basctl/source/accessibility/accessibledialogwindow.cxx
basctl/source/basicide/basdoc.cxx basctl/source/basicide/basdoc.cxx
basctl/source/basicide/basdoc.hxx basctl/source/basicide/basdoc.hxx
basctl/source/basicide/basicmod.hxx
basctl/source/basicide/basicrenderable.cxx basctl/source/basicide/basicrenderable.cxx
basctl/source/basicide/basicrenderable.hxx basctl/source/basicide/basicrenderable.hxx
basctl/source/basicide/baside2.cxx basctl/source/basicide/baside2.cxx
@@ -223,8 +221,6 @@ basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx basctl/source/basicide/bastypes.cxx
basctl/source/basicide/breakpoint.cxx basctl/source/basicide/breakpoint.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/brkdlg.hxx
basctl/source/basicide/doceventnotifier.cxx basctl/source/basicide/doceventnotifier.cxx
basctl/source/basicide/docsignature.cxx basctl/source/basicide/docsignature.cxx
basctl/source/basicide/documentenumeration.cxx basctl/source/basicide/documentenumeration.cxx
@@ -232,8 +228,6 @@ basctl/source/basicide/documentenumeration.hxx
basctl/source/basicide/iderdll.cxx basctl/source/basicide/iderdll.cxx
basctl/source/basicide/iderdll2.hxx basctl/source/basicide/iderdll2.hxx
basctl/source/basicide/layout.cxx basctl/source/basicide/layout.cxx
basctl/source/basicide/linenumberwindow.cxx
basctl/source/basicide/linenumberwindow.hxx
basctl/source/basicide/localizationmgr.cxx basctl/source/basicide/localizationmgr.cxx
basctl/source/basicide/macrodlg.cxx basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/macrodlg.hxx basctl/source/basicide/macrodlg.hxx
@@ -242,7 +236,6 @@ basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/moduldlg.hxx basctl/source/basicide/moduldlg.hxx
basctl/source/basicide/sbxitem.cxx basctl/source/basicide/sbxitem.cxx
basctl/source/basicide/scriptdocument.cxx basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/textwindowpeer.hxx
basctl/source/basicide/textwindowpeer.cxx basctl/source/basicide/textwindowpeer.cxx
basctl/source/basicide/unomodel.cxx basctl/source/basicide/unomodel.cxx
basctl/source/basicide/unomodel.hxx basctl/source/basicide/unomodel.hxx
@@ -251,7 +244,6 @@ basctl/source/dlged/dlgedclip.cxx
basctl/source/dlged/dlgedfac.cxx basctl/source/dlged/dlgedfac.cxx
basctl/source/dlged/dlgedfunc.cxx basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedlist.cxx basctl/source/dlged/dlgedlist.cxx
basctl/source/dlged/dlgedmod.cxx
basctl/source/dlged/dlgedobj.cxx basctl/source/dlged/dlgedobj.cxx
basctl/source/dlged/dlgedpage.cxx basctl/source/dlged/dlgedpage.cxx
basctl/source/dlged/dlgedview.cxx basctl/source/dlged/dlgedview.cxx
@@ -268,17 +260,10 @@ basctl/source/inc/bastypes.hxx
basctl/source/inc/dlged.hxx basctl/source/inc/dlged.hxx
basctl/source/inc/dlgedclip.hxx basctl/source/inc/dlgedclip.hxx
basctl/source/inc/dlgeddef.hxx basctl/source/inc/dlgeddef.hxx
basctl/source/inc/dlgedfac.hxx
basctl/source/inc/dlgedfunc.hxx
basctl/source/inc/dlgedlist.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedobj.hxx basctl/source/inc/dlgedobj.hxx
basctl/source/inc/dlgedpage.hxx
basctl/source/inc/dlgedview.hxx basctl/source/inc/dlgedview.hxx
basctl/source/inc/doceventnotifier.hxx basctl/source/inc/doceventnotifier.hxx
basctl/source/inc/docsignature.hxx basctl/source/inc/docsignature.hxx
basctl/source/inc/iderid.hxx
basctl/source/inc/layout.hxx
basctl/source/inc/localizationmgr.hxx basctl/source/inc/localizationmgr.hxx
basctl/source/inc/managelang.hxx basctl/source/inc/managelang.hxx
basctl/source/inc/propbrw.hxx basctl/source/inc/propbrw.hxx