summaryrefslogtreecommitdiff
path: root/basctl/source/inc
diff options
context:
space:
mode:
authorPhilipp Hofer <philipp.hofer@protonmail.com>2020-11-12 12:48:11 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-11-13 15:11:13 +0100
commit6da61d5fa731fc34dc27607b6dc02b91928e4a54 (patch)
tree499df23c5ab574b94ba56fef9b884adc3d88c750 /basctl/source/inc
parent65d6173152deab49f9c9ed138f6d9fa56008b800 (diff)
tdf#123936 Formatting files in module basctl with clang-format
Change-Id: I428d5642a19588456ff4af09e2f9f39ae17b2e4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105644 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'basctl/source/inc')
-rw-r--r--basctl/source/inc/dlgedfac.hxx10
-rw-r--r--basctl/source/inc/dlgedfunc.hxx44
-rw-r--r--basctl/source/inc/dlgedlist.hxx30
-rw-r--r--basctl/source/inc/dlgedmod.hxx8
-rw-r--r--basctl/source/inc/dlgedpage.hxx12
-rw-r--r--basctl/source/inc/iderid.hxx3
-rw-r--r--basctl/source/inc/layout.hxx58
7 files changed, 71 insertions, 94 deletions
diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx
index 47587ac17e17..f780bc22bb95 100644
--- a/basctl/source/inc/dlgedfac.hxx
+++ b/basctl/source/inc/dlgedfac.hxx
@@ -25,19 +25,17 @@
namespace basctl
{
-
-
// DlgEdFactory
-
class DlgEdFactory
{
- const css::uno::Reference< css::frame::XModel > mxModel;
+ const css::uno::Reference<css::frame::XModel> mxModel;
+
public:
- DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel );
+ DlgEdFactory(const css::uno::Reference<css::frame::XModel>& xModel);
~DlgEdFactory() COVERITY_NOEXCEPT_FALSE;
- DECL_LINK( MakeObject, SdrObjCreatorParams, SdrObject* );
+ DECL_LINK(MakeObject, SdrObjCreatorParams, SdrObject*);
};
} // namespace basctl
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index a3390db5b7c2..9e20f39015a8 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -26,63 +26,55 @@
namespace basctl
{
-
class DlgEditor;
-
// DlgEdFunc
-
class DlgEdFunc /* : public LinkHdl */
{
protected:
DlgEditor& rParent;
- Timer aScrollTimer;
+ Timer aScrollTimer;
- DECL_LINK( ScrollTimeout, Timer *, void );
- void ForceScroll( const Point& rPos );
+ DECL_LINK(ScrollTimeout, Timer*, void);
+ void ForceScroll(const Point& rPos);
public:
- explicit DlgEdFunc (DlgEditor& rParent);
+ explicit DlgEdFunc(DlgEditor& rParent);
virtual ~DlgEdFunc();
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual bool MouseButtonUp( const MouseEvent& rMEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- bool KeyInput( const KeyEvent& rKEvt );
+ virtual void MouseButtonDown(const MouseEvent& rMEvt);
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt);
+ virtual void MouseMove(const MouseEvent& rMEvt);
+ bool KeyInput(const KeyEvent& rKEvt);
};
-
// DlgEdFuncInsert
-
class DlgEdFuncInsert : public DlgEdFunc
{
public:
- explicit DlgEdFuncInsert (DlgEditor& rParent);
- virtual ~DlgEdFuncInsert () override;
+ explicit DlgEdFuncInsert(DlgEditor& rParent);
+ virtual ~DlgEdFuncInsert() override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override;
- virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt) override;
+ virtual void MouseMove(const MouseEvent& rMEvt) override;
};
-
// DlgEdFuncSelect
-
class DlgEdFuncSelect : public DlgEdFunc
{
public:
- explicit DlgEdFuncSelect (DlgEditor& rParent);
- virtual ~DlgEdFuncSelect () override;
+ explicit DlgEdFuncSelect(DlgEditor& rParent);
+ virtual ~DlgEdFuncSelect() override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override;
- virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
+ virtual bool MouseButtonUp(const MouseEvent& rMEvt) override;
+ virtual void MouseMove(const MouseEvent& rMEvt) override;
};
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx
index 51e888975bfc..373f38b1467a 100644
--- a/basctl/source/inc/dlgedlist.hxx
+++ b/basctl/source/inc/dlgedlist.hxx
@@ -25,54 +25,48 @@
namespace basctl
{
-
class DlgEdObj;
-
// DlgEdPropListenerImpl
+typedef ::cppu::WeakImplHelper<css::beans::XPropertyChangeListener> PropertyChangeListenerHelper;
-typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > PropertyChangeListenerHelper;
-
-class DlgEdPropListenerImpl: public PropertyChangeListenerHelper
+class DlgEdPropListenerImpl : public PropertyChangeListenerHelper
{
private:
DlgEdObj& rDlgEdObj;
public:
- explicit DlgEdPropListenerImpl (DlgEdObj&);
+ explicit DlgEdPropListenerImpl(DlgEdObj&);
virtual ~DlgEdPropListenerImpl() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
-
+ virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
};
-
// DlgEdEvtContListenerImpl
+typedef ::cppu::WeakImplHelper<css::container::XContainerListener> ContainerListenerHelper;
-typedef ::cppu::WeakImplHelper< css::container::XContainerListener > ContainerListenerHelper;
-
-class DlgEdEvtContListenerImpl: public ContainerListenerHelper
+class DlgEdEvtContListenerImpl : public ContainerListenerHelper
{
private:
DlgEdObj& rDlgEdObj;
public:
- explicit DlgEdEvtContListenerImpl (DlgEdObj&);
+ explicit DlgEdEvtContListenerImpl(DlgEdObj&);
virtual ~DlgEdEvtContListenerImpl() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
// XContainerListener
- 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 elementRemoved( 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 elementRemoved(const css::container::ContainerEvent& Event) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index 9dfe50421b2c..2960135e0d3d 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -23,25 +23,21 @@
namespace basctl
{
-
-
// DlgEdModel
-
class DlgEdModel : public SdrModel
{
friend class DlgEdPage;
private:
- DlgEdModel( const DlgEdModel& ) = delete;
+ DlgEdModel(const DlgEdModel&) = delete;
void operator=(const DlgEdModel& rSrcModel) = delete;
public:
-
DlgEdModel();
virtual ~DlgEdModel() override;
- virtual SdrPage* AllocPage(bool bMasterPage) override;
+ virtual SdrPage* AllocPage(bool bMasterPage) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index c532c2a12fff..7b8d48faa331 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -23,11 +23,8 @@
namespace basctl
{
-
-
// DlgEdPage
-
class DlgEdModel;
class DlgEdForm;
@@ -36,17 +33,16 @@ class DlgEdPage final : public SdrPage
DlgEdPage& operator=(const DlgEdPage&) = delete;
DlgEdPage(const DlgEdPage&) = delete;
- DlgEdForm* pDlgEdForm;
+ DlgEdForm* pDlgEdForm;
public:
-
- explicit DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false );
+ explicit DlgEdPage(DlgEdModel& rModel, bool bMasterPage = false);
virtual ~DlgEdPage() override;
virtual SdrPage* CloneSdrPage(SdrModel& rTargetModel) const override;
- void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
- DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
+ void SetDlgEdForm(DlgEdForm* pForm) { pDlgEdForm = pForm; }
+ DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) override;
};
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index 7c49af0b16ea..5d18586079e5 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -23,8 +23,7 @@
namespace basctl
{
-
-OUString IDEResId(const char *pId);
+OUString IDEResId(const char* pId);
} // namespace basctl
diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx
index c3aba7427ce0..29b44896b331 100644
--- a/basctl/source/inc/layout.hxx
+++ b/basctl/source/inc/layout.hxx
@@ -31,24 +31,22 @@ class SfxItemSet;
namespace basctl
{
-
class DockingWindow;
class BaseWindow;
-
// Layout -- the common base of ModulLayout and DialogLayout.
// Handles the splitting lines and the dockable windows.
-class Layout: public vcl::Window
+class Layout : public vcl::Window
{
public:
- void ArrangeWindows ();
+ void ArrangeWindows();
- virtual void Activating (BaseWindow&);
- virtual void Deactivating ();
- virtual void ExecuteGlobal (SfxRequest&) { }
- virtual void GetState (SfxItemSet&, unsigned nWhich) = 0;
- virtual void UpdateDebug (bool bBasicStopped ) = 0;
+ virtual void Activating(BaseWindow&);
+ virtual void Deactivating();
+ virtual void ExecuteGlobal(SfxRequest&) {}
+ virtual void GetState(SfxItemSet&, unsigned nWhich) = 0;
+ virtual void UpdateDebug(bool bBasicStopped) = 0;
virtual ~Layout() override;
virtual void dispose() override;
@@ -56,16 +54,16 @@ public:
protected:
explicit Layout(vcl::Window* pParent);
- void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); }
- void AddToBottom (DockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); }
- void Remove (DockingWindow*);
- bool HasSize () const { return !bFirstSize; }
+ void AddToLeft(DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); }
+ void AddToBottom(DockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); }
+ void Remove(DockingWindow*);
+ bool HasSize() const { return !bFirstSize; }
// Window:
- virtual void Resize () override;
- virtual void DataChanged (DataChangedEvent const& rDCEvt) override;
+ virtual void Resize() override;
+ virtual void DataChanged(DataChangedEvent const& rDCEvt) override;
// new:
- virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) = 0;
+ virtual void OnFirstSize(tools::Long nWidth, tools::Long nHeight) = 0;
private:
// the main child window (either ModulWindow or DialogWindow)
@@ -78,13 +76,17 @@ private:
class SplittedSide
{
public:
- enum class Side {Left, Bottom};
- SplittedSide (Layout*, Side);
- void Add (DockingWindow*, Size const&);
- void Remove (DockingWindow*);
- bool IsEmpty () const;
- tools::Long GetSize () const;
- void ArrangeIn (tools::Rectangle const&);
+ enum class Side
+ {
+ Left,
+ Bottom
+ };
+ SplittedSide(Layout*, Side);
+ void Add(DockingWindow*, Size const&);
+ void Remove(DockingWindow*);
+ bool IsEmpty() const;
+ tools::Long GetSize() const;
+ void ArrangeIn(tools::Rectangle const&);
void dispose();
private:
@@ -117,12 +119,12 @@ private:
};
std::vector<Item> vItems;
- Point MakePoint (tools::Long, tools::Long) const;
- Size MakeSize (tools::Long, tools::Long) const;
- static bool IsDocking (DockingWindow const&);
+ Point MakePoint(tools::Long, tools::Long) const;
+ Size MakeSize(tools::Long, tools::Long) const;
+ static bool IsDocking(DockingWindow const&);
DECL_LINK(SplitHdl, Splitter*, void);
- void CheckMarginsFor (Splitter*);
- void InitSplitter (Splitter&);
+ void CheckMarginsFor(Splitter*);
+ void InitSplitter(Splitter&);
} aLeftSide, aBottomSide;
};