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

1
basctl/inc/iderdll.hxx
View File

@@ -21,7 +21,6 @@
namespace basctl
{
class Shell;
class ExtraData;

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

@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#pragma once
#include <sfx2/module.hxx>
namespace basctl
{
class Module : public SfxModule
{
public:

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

@@ -28,13 +28,11 @@
namespace basctl
{
// FIXME Why does BreakPointDialog allow only sal_uInt16 for break-point line
// numbers, whereas BreakPoint supports sal_uLong?
namespace
{
bool lcl_ParseText(OUString const& rText, size_t& rLineNr)
{
// aText should look like "# n" where
@@ -42,8 +40,7 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
// All spaces are ignored, so there can even be spaces within the
// number n. (Maybe it would be better to ignore all whitespace instead
// of just spaces.)
OUString aText(
rText.replaceAll(" ", ""));
OUString aText(rText.replaceAll(" ", ""));
if (aText.isEmpty())
return false;
sal_Unicode cFirst = aText[0];
@@ -62,7 +59,8 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
} // namespace
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_aModifiedBreakPointList(rBrkPntList)
, m_xComboBox(m_xBuilder->weld_entry_tree_view("entriesgrid", "entries", "entrieslist"))
@@ -106,9 +104,7 @@ BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPn
CheckButtons();
}
BreakPointDialog::~BreakPointDialog()
{
}
BreakPointDialog::~BreakPointDialog() {}
void BreakPointDialog::SetCurrentBreakPoint(BreakPoint const& rBrk)
{

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

@@ -24,7 +24,6 @@
namespace basctl
{
class BreakPointDialog final : public weld::GenericDialogController
{
BreakPointList& m_rOriginalBreakPointList;
@@ -46,7 +45,6 @@ class BreakPointDialog final : public weld::GenericDialogController
void UpdateFields(BreakPoint const& rBrk);
BreakPoint* GetSelectedBreakPoint();
public:
BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkList);
virtual ~BreakPointDialog() override;

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

@@ -16,21 +16,17 @@
namespace basctl
{
LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :
Window(pParent, WB_BORDER),
m_pModulWindow(pModulWindow),
m_nCurYOffset(0)
LineNumberWindow::LineNumberWindow(vcl::Window* pParent, ModulWindow* pModulWindow)
: Window(pParent, WB_BORDER)
, m_pModulWindow(pModulWindow)
, m_nCurYOffset(0)
{
SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
m_nBaseWidth = GetTextWidth("8");
m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;
}
LineNumberWindow::~LineNumberWindow()
{
disposeOnce();
}
LineNumberWindow::~LineNumberWindow() { disposeOnce(); }
void LineNumberWindow::dispose()
{
@@ -108,7 +104,6 @@ void LineNumberWindow::DoScroll(tools::Long nVertScroll)
Window::Scroll(0, nVertScroll);
}
bool LineNumberWindow::SyncYOffset()
{
TextView* pView = m_pModulWindow->GetEditView();
@@ -124,7 +119,6 @@ bool LineNumberWindow::SyncYOffset()
return true;
}
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -13,7 +13,6 @@
namespace basctl
{
class ModulWindow;
class LineNumberWindow : public vcl::Window

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

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

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

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

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

@@ -25,14 +25,12 @@
namespace basctl
{
// DlgEdFactory
class DlgEdFactory
{
const css::uno::Reference<css::frame::XModel> mxModel;
public:
DlgEdFactory(const css::uno::Reference<css::frame::XModel>& xModel);
~DlgEdFactory() COVERITY_NOEXCEPT_FALSE;

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

@@ -26,13 +26,10 @@
namespace basctl
{
class DlgEditor;
// DlgEdFunc
class DlgEdFunc /* : public LinkHdl */
{
protected:
@@ -52,10 +49,8 @@ public:
bool KeyInput(const KeyEvent& rKEvt);
};
// DlgEdFuncInsert
class DlgEdFuncInsert : public DlgEdFunc
{
public:
@@ -67,10 +62,8 @@ public:
virtual void MouseMove(const MouseEvent& rMEvt) override;
};
// DlgEdFuncSelect
class DlgEdFuncSelect : public DlgEdFunc
{
public:
@@ -82,7 +75,6 @@ public:
virtual void MouseMove(const MouseEvent& rMEvt) override;
};
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -25,13 +25,10 @@
namespace basctl
{
class DlgEdObj;
// DlgEdPropListenerImpl
typedef ::cppu::WeakImplHelper<css::beans::XPropertyChangeListener> PropertyChangeListenerHelper;
class DlgEdPropListenerImpl : public PropertyChangeListenerHelper
@@ -48,13 +45,10 @@ public:
// XPropertyChangeListener
virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
};
// DlgEdEvtContListenerImpl
typedef ::cppu::WeakImplHelper<css::container::XContainerListener> ContainerListenerHelper;
class DlgEdEvtContListenerImpl : public ContainerListenerHelper

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

@@ -23,11 +23,8 @@
namespace basctl
{
// DlgEdModel
class DlgEdModel : public SdrModel
{
friend class DlgEdPage;
@@ -37,7 +34,6 @@ private:
void operator=(const DlgEdModel& rSrcModel) = delete;
public:
DlgEdModel();
virtual ~DlgEdModel() override;

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

@@ -23,11 +23,8 @@
namespace basctl
{
// DlgEdPage
class DlgEdModel;
class DlgEdForm;
@@ -39,7 +36,6 @@ class DlgEdPage final : public SdrPage
DlgEdForm* pDlgEdForm;
public:
explicit DlgEdPage(DlgEdModel& rModel, bool bMasterPage = false);
virtual ~DlgEdPage() override;

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

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

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

@@ -31,11 +31,9 @@ class SfxItemSet;
namespace basctl
{
class DockingWindow;
class BaseWindow;
// Layout -- the common base of ModulLayout and DialogLayout.
// Handles the splitting lines and the dockable windows.
@@ -78,7 +76,11 @@ private:
class SplittedSide
{
public:
enum class Side {Left, Bottom};
enum class Side
{
Left,
Bottom
};
SplittedSide(Layout*, Side);
void Add(DockingWindow*, Size const&);
void Remove(DockingWindow*);

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