[Libreoffice-commits] core.git: 2 commits - basctl/inc basctl/source bridges/inc bridges/source solenv/clang-format
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 13 14:12:19 UTC 2020
basctl/inc/iderdll.hxx | 7 -
basctl/source/basicide/basicmod.hxx | 6 -
basctl/source/basicide/brkdlg.cxx | 54 ++++------
basctl/source/basicide/brkdlg.hxx | 12 --
basctl/source/basicide/linenumberwindow.cxx | 22 +---
basctl/source/basicide/linenumberwindow.hxx | 11 --
basctl/source/basicide/textwindowpeer.hxx | 13 +-
basctl/source/dlged/dlgedmod.cxx | 12 --
basctl/source/inc/dlgedfac.hxx | 10 -
basctl/source/inc/dlgedfunc.hxx | 44 +++-----
basctl/source/inc/dlgedlist.hxx | 30 ++---
basctl/source/inc/dlgedmod.hxx | 8 -
basctl/source/inc/dlgedpage.hxx | 12 --
basctl/source/inc/iderid.hxx | 3
basctl/source/inc/layout.hxx | 58 +++++------
bridges/inc/types.hxx | 11 --
bridges/inc/vtables.hxx | 18 +--
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx | 7 -
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 105 +++++++++-----------
solenv/clang-format/excludelist | 19 ---
20 files changed, 196 insertions(+), 266 deletions(-)
New commits:
commit 79368f81028a05f1d3685f0052806d3f93cd2da8
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:49:31 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Nov 13 15:11:21 2020 +0100
tdf#123936 Formatting files in module bridges with clang-format
Change-Id: Ice8b5ff4ddde1b0eca19cf29c418e3281389926d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105648
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/bridges/inc/types.hxx b/bridges/inc/types.hxx
index d35529342672..597d55909d09 100644
--- a/bridges/inc/types.hxx
+++ b/bridges/inc/types.hxx
@@ -22,8 +22,8 @@
#include <typelib/typeclass.h>
#include <typelib/typedescription.h>
-namespace bridges::cpp_uno::shared {
-
+namespace bridges::cpp_uno::shared
+{
/**
* Determines whether a type is a "simple" type (VOID, BOOLEAN, BYTE, SHORT,
* UNSIGNED SHORT, LONG, UNSIGNED LONG, HYPER, UNSIGNED HYPER, FLOAT, DOUBLE,
@@ -42,7 +42,7 @@ bool isSimpleType(typelib_TypeClass typeClass);
* @param type a non-null pointer to a type description reference
* @return true if the given type is "simple"
*/
-bool isSimpleType(typelib_TypeDescriptionReference const * type);
+bool isSimpleType(typelib_TypeDescriptionReference const* type);
/**
* Determines whether a type is a "simple" type (VOID, BOOLEAN, BYTE, SHORT,
@@ -52,7 +52,7 @@ bool isSimpleType(typelib_TypeDescriptionReference const * type);
* @param type a non-null pointer to a type description
* @return true if the given type is "simple"
*/
-bool isSimpleType(typelib_TypeDescription const * type);
+bool isSimpleType(typelib_TypeDescription const* type);
/**
* Determines whether a type relates to an interface type (is itself an
@@ -61,8 +61,7 @@ bool isSimpleType(typelib_TypeDescription const * type);
* @param type a non-null pointer to a type description
* @return true if the given type relates to an interface type
*/
-bool relatesToInterfaceType(typelib_TypeDescription const * type);
-
+bool relatesToInterfaceType(typelib_TypeDescription const* type);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/vtables.hxx b/bridges/inc/vtables.hxx
index 2dc604f0a64f..57ee58f53a85 100644
--- a/bridges/inc/vtables.hxx
+++ b/bridges/inc/vtables.hxx
@@ -22,8 +22,8 @@
#include <sal/types.h>
#include <typelib/typedescription.h>
-namespace bridges::cpp_uno::shared {
-
+namespace bridges::cpp_uno::shared
+{
/**
* Calculate the number of local functions of an interface type.
*
@@ -37,7 +37,7 @@ namespace bridges::cpp_uno::shared {
* executed
* @return the number of local functions of the given interface type
*/
-sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const * type);
+sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const* type);
/**
* Calculate the number of primary functions of an interface type.
@@ -51,12 +51,13 @@ sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const * type);
* @return the number of primary functions of the given interface type, or zero
* if the given interface type is null
*/
-sal_Int32 getPrimaryFunctions(typelib_InterfaceTypeDescription * type);
+sal_Int32 getPrimaryFunctions(typelib_InterfaceTypeDescription* type);
/**
* Represents a vtable slot of a C++ class.
*/
-struct VtableSlot {
+struct VtableSlot
+{
/**
* The offset of the vtable.
*
@@ -82,8 +83,7 @@ struct VtableSlot {
* description
* @return the vtable slot associated with the given interface member
*/
-VtableSlot getVtableSlot(
- typelib_InterfaceAttributeTypeDescription const * ifcMember);
+VtableSlot getVtableSlot(typelib_InterfaceAttributeTypeDescription const* ifcMember);
/**
* Calculates the vtable slot associated with an interface method member.
@@ -91,9 +91,7 @@ VtableSlot getVtableSlot(
* @param ifcMember a non-null pointer to an interface method member description
* @return the vtable slot associated with the given interface member
*/
-VtableSlot getVtableSlot(
- typelib_InterfaceMethodTypeDescription const * ifcMember);
-
+VtableSlot getVtableSlot(typelib_InterfaceMethodTypeDescription const* ifcMember);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
index f861e52f728c..b056f2e64006 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
@@ -25,10 +25,9 @@
#include <typelib/typedescription.h>
-namespace x86_64 {
-
-std::type_info * getRtti(typelib_TypeDescription const & type);
-
+namespace x86_64
+{
+std::type_info* getRtti(typelib_TypeDescription const& type);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 24c3716333aa..ec874621baf8 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -233,7 +233,6 @@ void
#endif // 0
-
#include <sal/config.h>
#include <memory>
@@ -256,18 +255,14 @@ void
using namespace ::com::sun::star;
-static void * __cdecl copyConstruct(
- void * pExcThis,
- void * pSource,
- typelib_TypeDescription * pTD ) throw ()
+static void* __cdecl copyConstruct(void* pExcThis, void* pSource,
+ typelib_TypeDescription* pTD) throw()
{
::uno_copyData(pExcThis, pSource, pTD, uno::cpp_acquire);
return pExcThis;
}
-static void * __cdecl destruct(
- void * pExcThis,
- typelib_TypeDescription * pTD ) throw ()
+static void* __cdecl destruct(void* pExcThis, typelib_TypeDescription* pTD) throw()
{
::uno_destructData(pExcThis, pTD, uno::cpp_release);
return pExcThis;
@@ -275,48 +270,56 @@ static void * __cdecl destruct(
const int codeSnippetSize = 40;
-static void GenerateConstructorTrampoline(
- unsigned char * code,
- typelib_TypeDescription * pTD ) throw ()
+static void GenerateConstructorTrampoline(unsigned char* code, typelib_TypeDescription* pTD) throw()
{
- unsigned char *p = code;
+ unsigned char* p = code;
// mov r8, pTD
- *p++ = 0x49; *p++ = 0xB8;
- *reinterpret_cast<void **>(p) = pTD; p += 8;
+ *p++ = 0x49;
+ *p++ = 0xB8;
+ *reinterpret_cast<void**>(p) = pTD;
+ p += 8;
// mov r11, copyConstruct
- *p++ = 0x49; *p++ = 0xBB;
- *reinterpret_cast<void **>(p) = reinterpret_cast<void *>(©Construct); p += 8;
+ *p++ = 0x49;
+ *p++ = 0xBB;
+ *reinterpret_cast<void**>(p) = reinterpret_cast<void*>(©Construct);
+ p += 8;
// jmp r11
- *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3;
+ *p++ = 0x41;
+ *p++ = 0xFF;
+ *p++ = 0xE3;
- assert( p < code + codeSnippetSize );
+ assert(p < code + codeSnippetSize);
}
-static void GenerateDestructorTrampoline(
- unsigned char * code,
- typelib_TypeDescription * pTD ) throw ()
+static void GenerateDestructorTrampoline(unsigned char* code, typelib_TypeDescription* pTD) throw()
{
- unsigned char *p = code;
+ unsigned char* p = code;
// mov rdx, pTD
- *p++ = 0x48; *p++ = 0xBA;
- *reinterpret_cast<void **>(p) = pTD; p += 8;
+ *p++ = 0x48;
+ *p++ = 0xBA;
+ *reinterpret_cast<void**>(p) = pTD;
+ p += 8;
// mov r11, destruct
- *p++ = 0x49; *p++ = 0xBB;
- *reinterpret_cast<void **>(p) = reinterpret_cast<void *>(&destruct); p += 8;
+ *p++ = 0x49;
+ *p++ = 0xBB;
+ *reinterpret_cast<void**>(p) = reinterpret_cast<void*>(&destruct);
+ p += 8;
// jmp r11
- *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3;
+ *p++ = 0x41;
+ *p++ = 0xFF;
+ *p++ = 0xE3;
- assert( p < code + codeSnippetSize );
+ assert(p < code + codeSnippetSize);
}
-ExceptionType::ExceptionType(unsigned char * pCode, sal_uInt64 pCodeBase,
- typelib_TypeDescription * pTD) throw ()
+ExceptionType::ExceptionType(unsigned char* pCode, sal_uInt64 pCodeBase,
+ typelib_TypeDescription* pTD) throw()
: _n0(0)
, _n1(0)
, _n2(-1)
@@ -352,20 +355,20 @@ ExceptionType::ExceptionType(unsigned char * pCode, sal_uInt64 pCodeBase,
* is also member of ExceptionType and can be referenced via 32 bit offset.
*/
-RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
+RaiseInfo::RaiseInfo(typelib_TypeDescription* pTD) throw()
: _n0(0)
, _n2(0)
, _pTD(pTD)
{
- typelib_CompoundTypeDescription * pCompTD;
+ typelib_CompoundTypeDescription* pCompTD;
// Count how many trampolines we need
int codeSize = codeSnippetSize;
// Info count
int nLen = 0;
- for (pCompTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD);
- pCompTD; pCompTD = pCompTD->pBaseTypeDescription)
+ for (pCompTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD); pCompTD;
+ pCompTD = pCompTD->pBaseTypeDescription)
{
++nLen;
codeSize += codeSnippetSize;
@@ -380,8 +383,8 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
auto exceptionTypeSizeArray = std::make_unique<int[]>(nLen);
nLen = 0;
- for (pCompTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD);
- pCompTD; pCompTD = pCompTD->pBaseTypeDescription)
+ for (pCompTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD); pCompTD;
+ pCompTD = pCompTD->pBaseTypeDescription)
{
int typeInfoLen;
RTTInfos::get(pCompTD->aBase.pTypeName, &typeInfoLen);
@@ -390,7 +393,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
{
int n = typeInfoLen / 4;
n++;
- typeInfoLen = n*4;
+ typeInfoLen = n * 4;
}
exceptionTypeSizeArray[nLen++] = typeInfoLen + sizeof(ExceptionType);
}
@@ -405,24 +408,22 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
// Allocate mem for code and all dynamic data in one chunk to guarantee
// 32 bit offsets
const int totalSize = codeSize + typeInfoArraySize + excTypeAddLen;
- unsigned char * pCode = _code =
- static_cast<unsigned char *>(std::malloc(totalSize));
+ unsigned char* pCode = _code = static_cast<unsigned char*>(std::malloc(totalSize));
int pCodeOffset = 0;
// New base of types array, starts after Trampoline D-Tor / C-Tors
- DWORD * types = reinterpret_cast<DWORD *>(pCode + codeSize);
+ DWORD* types = reinterpret_cast<DWORD*>(pCode + codeSize);
// New base of ExceptionType array, starts after types array
- unsigned char *etMem = pCode + codeSize + typeInfoArraySize;
+ unsigned char* etMem = pCode + codeSize + typeInfoArraySize;
int etMemOffset = 0;
_codeBase = reinterpret_cast<sal_uInt64>(pCode)
- & ~static_cast<sal_uInt64>(ExceptionInfos::allocationGranularity - 1);
+ & ~static_cast<sal_uInt64>(ExceptionInfos::allocationGranularity - 1);
DWORD old_protect;
- bool success =
- VirtualProtect(pCode, codeSize, PAGE_EXECUTE_READWRITE, &old_protect);
- (void) success;
+ bool success = VirtualProtect(pCode, codeSize, PAGE_EXECUTE_READWRITE, &old_protect);
+ (void)success;
assert(success && "VirtualProtect() failed!");
::typelib_typedescription_acquire(pTD);
@@ -434,18 +435,17 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
// Info count accompanied by type info ptrs: type, base type, base base type, ...
// Keep offset of types_array
- _types = static_cast<sal_Int32>(
- reinterpret_cast<sal_uInt64>(types)-_codeBase);
+ _types = static_cast<sal_Int32>(reinterpret_cast<sal_uInt64>(types) - _codeBase);
// Fill types: (nLen, _offset to ExceptionType1, ...ExceptionType2, ...)
types[0] = nLen;
int nPos = 1;
- for (pCompTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD);
- pCompTD; pCompTD = pCompTD->pBaseTypeDescription)
+ for (pCompTD = reinterpret_cast<typelib_CompoundTypeDescription*>(pTD); pCompTD;
+ pCompTD = pCompTD->pBaseTypeDescription)
{
// Create instance in mem block with placement new
- ExceptionType * et = new(etMem + etMemOffset)ExceptionType(
- pCode + pCodeOffset, _codeBase, reinterpret_cast<typelib_TypeDescription *>(pCompTD));
+ ExceptionType* et = new (etMem + etMemOffset) ExceptionType(
+ pCode + pCodeOffset, _codeBase, reinterpret_cast<typelib_TypeDescription*>(pCompTD));
// Next trampoline entry offset
pCodeOffset += codeSnippetSize;
@@ -453,8 +453,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
etMemOffset += exceptionTypeSizeArray[nPos - 1];
// Keep offset of addresses of ET for D-Tor call in ~RaiseInfo
- types[nPos++]
- = static_cast<DWORD>(reinterpret_cast<sal_uInt64>(et)-_codeBase);
+ types[nPos++] = static_cast<DWORD>(reinterpret_cast<sal_uInt64>(et) - _codeBase);
}
// Final check: end of address calculation must be end of mem
assert(etMem + etMemOffset == pCode + totalSize);
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index e909755c86ed..1083e1a3c813 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -464,10 +464,8 @@ binaryurp/source/writer.hxx
binaryurp/source/writerstate.hxx
bridges/inc/bridge.hxx
bridges/inc/cppinterfaceproxy.hxx
-bridges/inc/types.hxx
bridges/inc/unointerfaceproxy.hxx
bridges/inc/vtablefactory.hxx
-bridges/inc/vtables.hxx
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
@@ -553,7 +551,6 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
-bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
@@ -580,7 +577,6 @@ bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
bridges/source/cpp_uno/msvc_win32_intel/except.cxx
bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
-bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
bridges/source/cpp_uno/shared/bridge.cxx
bridges/source/cpp_uno/shared/component.cxx
commit 6da61d5fa731fc34dc27607b6dc02b91928e4a54
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:48:11 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Nov 13 15:11:13 2020 +0100
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 at googlemail.com>
diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index ef8f28763e68..6bc9bacdaf94 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -21,15 +21,14 @@
namespace basctl
{
-
class Shell;
class ExtraData;
-void EnsureIde ();
+void EnsureIde();
-void ShellCreated (Shell* pShell);
+void ShellCreated(Shell* pShell);
Shell* GetShell();
-void ShellDestroyed (Shell const * pShell);
+void ShellDestroyed(Shell const* pShell);
ExtraData* GetExtraData();
diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx
index c15d53d85738..7a0175183dcb 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -17,19 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#pragma once
#include <sfx2/module.hxx>
namespace basctl
{
-
class Module : public SfxModule
{
public:
- Module(const OString& rResName, SfxObjectFactory *pObjFact)
- : SfxModule(rResName, {pObjFact})
+ Module(const OString& rResName, SfxObjectFactory* pObjFact)
+ : SfxModule(rResName, { pObjFact })
{
}
};
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index e5fafd545331..74d5be8542ca 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -28,22 +28,19 @@
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 )
+bool lcl_ParseText(OUString const& rText, size_t& rLineNr)
{
// aText should look like "# n" where
// n > 0 && n < std::numeric_limits< sal_uInt16 >::max().
// 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];
@@ -53,16 +50,17 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
aText = aText.copy(1);
// XXX Assumes that sal_uInt16 is contained within sal_Int32:
sal_Int32 n = aText.toInt32();
- if ( n <= 0 )
+ if (n <= 0)
return false;
- rLineNr = static_cast< size_t >(n);
+ rLineNr = static_cast<size_t>(n);
return true;
}
} // 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"))
@@ -76,10 +74,10 @@ BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPn
m_xComboBox->set_height_request_by_rows(12);
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 );
- OUString aEntryStr( "# " + OUString::number(rBrk.nLine) );
+ BreakPoint& rBrk = m_aModifiedBreakPointList.at(i);
+ OUString aEntryStr("# " + OUString::number(rBrk.nLine));
m_xComboBox->append_text(aEntryStr);
}
m_xComboBox->thaw();
@@ -101,20 +99,18 @@ BreakPointDialog::BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkPn
m_xComboBox->set_active(0);
if (m_aModifiedBreakPointList.size())
- UpdateFields( m_aModifiedBreakPointList.at( 0 ) );
+ UpdateFields(m_aModifiedBreakPointList.at(0));
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);
- UpdateFields( rBrk );
+ UpdateFields(rBrk);
}
void BreakPointDialog::CheckButtons()
@@ -156,8 +152,8 @@ IMPL_LINK(BreakPointDialog, EditModifyHdl, weld::ComboBox&, rBox, void)
int nEntry = rBox.find_text(rBox.get_active_text());
if (nEntry == -1)
return;
- BreakPoint& rBrk = m_aModifiedBreakPointList.at( nEntry );
- UpdateFields( rBrk );
+ BreakPoint& rBrk = m_aModifiedBreakPointList.at(nEntry);
+ UpdateFields(rBrk);
}
IMPL_LINK(BreakPointDialog, FieldModifyHdl, weld::SpinButton&, rEdit, void)
@@ -186,17 +182,17 @@ IMPL_LINK(BreakPointDialog, ButtonHdl, weld::Button&, rButton, void)
// keep checkbox in mind!
OUString aText(m_xComboBox->get_active_text());
size_t nLine;
- bool bValid = lcl_ParseText( aText, nLine );
- if ( bValid )
+ bool bValid = lcl_ParseText(aText, nLine);
+ if (bValid)
{
- BreakPoint aBrk( nLine );
+ BreakPoint aBrk(nLine);
aBrk.bEnabled = m_xCheckBox->get_active();
aBrk.nStopAfter = static_cast<size_t>(m_xNumericField->get_value());
- m_aModifiedBreakPointList.InsertSorted( aBrk );
- OUString aEntryStr( "# " + OUString::number(aBrk.nLine) );
+ m_aModifiedBreakPointList.InsertSorted(aBrk);
+ OUString aEntryStr("# " + OUString::number(aBrk.nLine));
m_xComboBox->append_text(aEntryStr);
if (SfxDispatcher* pDispatcher = GetDispatcher())
- pDispatcher->Execute( SID_BASICIDE_BRKPNTSCHANGED );
+ pDispatcher->Execute(SID_BASICIDE_BRKPNTSCHANGED);
}
else
{
@@ -216,13 +212,13 @@ IMPL_LINK(BreakPointDialog, ButtonHdl, weld::Button&, rButton, void)
nEntry--;
m_xComboBox->set_active_text(m_xComboBox->get_text(nEntry));
if (SfxDispatcher* pDispatcher = GetDispatcher())
- pDispatcher->Execute( SID_BASICIDE_BRKPNTSCHANGED );
+ pDispatcher->Execute(SID_BASICIDE_BRKPNTSCHANGED);
CheckButtons();
}
}
}
-void BreakPointDialog::UpdateFields( BreakPoint const & rBrk )
+void BreakPointDialog::UpdateFields(BreakPoint const& rBrk)
{
m_xCheckBox->set_active(rBrk.bEnabled);
m_xNumericField->set_value(rBrk.nStopAfter);
@@ -233,7 +229,7 @@ BreakPoint* BreakPointDialog::GetSelectedBreakPoint()
int nEntry = m_xComboBox->find_text(m_xComboBox->get_active_text());
if (nEntry == -1)
return nullptr;
- return &m_aModifiedBreakPointList.at( nEntry );
+ return &m_aModifiedBreakPointList.at(nEntry);
}
} // namespace basctl
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index c0db6576ca9a..d3674c371a55 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -24,10 +24,9 @@
namespace basctl
{
-
class BreakPointDialog final : public weld::GenericDialogController
{
- BreakPointList & m_rOriginalBreakPointList;
+ BreakPointList& m_rOriginalBreakPointList;
BreakPointList m_aModifiedBreakPointList;
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::SpinButton> m_xNumericField;
- void CheckButtons();
+ void CheckButtons();
DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
DECL_LINK(EditModifyHdl, weld::ComboBox&, void);
DECL_LINK(FieldModifyHdl, weld::SpinButton&, void);
DECL_LINK(ButtonHdl, weld::Button&, void);
DECL_LINK(TreeModifyHdl, weld::TreeView&, bool);
- void UpdateFields( BreakPoint const & rBrk );
- BreakPoint* GetSelectedBreakPoint();
-
+ void UpdateFields(BreakPoint const& rBrk);
+ BreakPoint* GetSelectedBreakPoint();
public:
BreakPointDialog(weld::Window* pParent, BreakPointList& rBrkList);
virtual ~BreakPointDialog() override;
- void SetCurrentBreakPoint( BreakPoint const & rBrk );
+ void SetCurrentBreakPoint(BreakPoint const& rBrk);
};
} // namespace basctl
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 196339cb1b33..be9fe3752045 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -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()
{
@@ -38,9 +34,9 @@ void LineNumberWindow::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;
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));
}
-void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt)
+void LineNumberWindow::DataChanged(DataChangedEvent const& rDCEvt)
{
Window::DataChanged(rDCEvt);
if (rDCEvt.GetType() == DataChangedEventType::SETTINGS
@@ -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: */
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index 4125672689e1..14305116ef10 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -13,7 +13,6 @@
namespace basctl
{
-
class ModulWindow;
class LineNumberWindow : public vcl::Window
@@ -23,22 +22,22 @@ private:
int m_nWidth;
tools::Long m_nCurYOffset;
int m_nBaseWidth;
- virtual void DataChanged (DataChangedEvent const& rDCEvt) override;
+ virtual void DataChanged(DataChangedEvent const& rDCEvt) override;
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
public:
- LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin);
+ LineNumberWindow(vcl::Window* pParent, ModulWindow* pModulWin);
virtual ~LineNumberWindow() override;
virtual void dispose() override;
- void DoScroll( tools::Long nVertScroll );
+ void DoScroll(tools::Long nVertScroll);
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
diff --git a/basctl/source/basicide/textwindowpeer.hxx b/basctl/source/basicide/textwindowpeer.hxx
index c5f87048d88f..8be9186f9f43 100644
--- a/basctl/source/basicide/textwindowpeer.hxx
+++ b/basctl/source/basicide/textwindowpeer.hxx
@@ -24,16 +24,15 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com::sun::star::awt {
- class XWindowPeer;
+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
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 1e8d58192ef2..291b5b9136f5 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -22,20 +22,14 @@
namespace basctl
{
-
DlgEdModel::DlgEdModel()
-: SdrModel()
+ : 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
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;
};
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index c5e4ea07b878..e909755c86ed 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -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
More information about the Libreoffice-commits
mailing list