dbaccess/inc/strings.hxx | 37 +++---- dbaccess/qa/extras/macros-test.cxx | 6 - dbaccess/qa/unit/hsqldb.cxx | 9 - dbaccess/source/core/dataaccess/SharedConnection.cxx | 69 ++++++-------- dbaccess/source/core/dataaccess/databaseregistrations.hxx | 5 - dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 23 ++-- dbaccess/source/ui/app/AppIconControl.cxx | 22 +--- dbaccess/source/ui/app/AppSwapWindow.cxx | 24 ++-- dbaccess/source/ui/app/AppTitleWindow.cxx | 15 --- dbaccess/source/ui/app/templwin.hxx | 3 dbaccess/source/ui/browser/AsynchronousLink.cxx | 32 +++--- dbaccess/source/ui/dlg/dsselect.hxx | 13 -- dbaccess/source/ui/inc/dbu_dlg.hxx | 4 dbaccess/source/ui/inc/stringlistitem.hxx | 11 +- dbaccess/source/ui/misc/stringlistitem.cxx | 17 +-- dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx | 3 dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 26 ++--- dbaccess/source/ui/querydesign/QueryTextView.cxx | 34 +----- dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 9 - dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 68 +++++++------ dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 22 +--- dbaccess/source/ui/uno/admindlg.cxx | 33 +++--- shell/inc/filepath.hxx | 2 shell/inc/global.hxx | 2 shell/inc/iso8601_converter.hxx | 2 shell/inc/metainforeader.hxx | 30 ++---- shell/inc/shlxthdl.hxx | 16 +-- shell/inc/stream_helper.hxx | 22 ++-- shell/inc/types.hxx | 26 ++--- shell/inc/utilities.hxx | 30 ++---- shell/inc/xml_parser.hxx | 15 +-- shell/inc/zipfile.hxx | 28 ++--- shell/qa/zip/testzipimpl.cxx | 16 +-- shell/qa/zip/testzipimpl.hxx | 7 - shell/qa/zip/ziptest.cxx | 16 ++- shell/source/tools/lngconvex/cmdline.cxx | 19 +-- shell/source/tools/lngconvex/cmdline.hxx | 13 -- shell/source/win32/ooofilereader/keywordstag.cxx | 20 +--- shell/source/win32/zipfile/zipexcptn.hxx | 6 - solenv/clang-format/excludelist | 39 ------- 40 files changed, 325 insertions(+), 469 deletions(-)
New commits: commit 7c9a2c4b97c145a358084bed4b875396d3dc3e5c Author: Philipp Hofer <philipp.ho...@protonmail.com> AuthorDate: Thu Nov 12 13:16:05 2020 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Nov 19 10:44:14 2020 +0100 tdf#123936 Formatting files in module shell with clang-format Change-Id: Iba0c34cff0e04b18a3b4c5b7bb2aa42e14aedb81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105707 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/shell/inc/filepath.hxx b/shell/inc/filepath.hxx index cc1d42a1ccef..7472ccf8252f 100644 --- a/shell/inc/filepath.hxx +++ b/shell/inc/filepath.hxx @@ -10,10 +10,8 @@ #ifndef INCLUDED_SHELL_INC_INTERNAL_FILEPATH_HXX #define INCLUDED_SHELL_INC_INTERNAL_FILEPATH_HXX - // typedefs to allow using Unicode paths on Windows - #include <string> #if defined _WIN32 diff --git a/shell/inc/global.hxx b/shell/inc/global.hxx index 07b7d5f79e7d..fb812bcf8140 100644 --- a/shell/inc/global.hxx +++ b/shell/inc/global.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX #if !defined WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #endif #include <windows.h> diff --git a/shell/inc/iso8601_converter.hxx b/shell/inc/iso8601_converter.hxx index a8a0b4ed2ae2..daf2afd0b51a 100644 --- a/shell/inc/iso8601_converter.hxx +++ b/shell/inc/iso8601_converter.hxx @@ -22,7 +22,6 @@ #include <string> - /* Converts ISO 8601 compliant date/time representation to the representation conforming to the current locale, @@ -30,7 +29,6 @@ */ std::wstring iso8601_date_to_local_date(const std::wstring& iso8601date); - /* Converts ISO 8601 compliant duration representation to the representation conforming to the current locale diff --git a/shell/inc/metainforeader.hxx b/shell/inc/metainforeader.hxx index 7ff0a734fc3f..6a4e82527e0f 100644 --- a/shell/inc/metainforeader.hxx +++ b/shell/inc/metainforeader.hxx @@ -35,9 +35,9 @@ class CMetaInfoReader : public CBaseReader public: virtual ~CMetaInfoReader() override; - CMetaInfoReader( const Filepath_t& DocumentName ); + CMetaInfoReader(const Filepath_t& DocumentName); - CMetaInfoReader( StreamInterface* stream ); + CMetaInfoReader(StreamInterface* stream); /** check if the Tag is in the target meta.xml file. @@ -46,7 +46,6 @@ public: */ bool hasTag(const std::wstring& TagName) const; - /** Get a specific tag content, compound tags will be returned as comma separated list. @param TagName @@ -61,7 +60,7 @@ public: @param AttributeName the name of the attribute. */ - bool hasTagAttribute(const std::wstring& TagName, const std::wstring& AttributeName); + bool hasTagAttribute(const std::wstring& TagName, const std::wstring& AttributeName); /** Get a specific attribute content. @@ -70,14 +69,13 @@ public: @param AttributeName the name of the attribute. */ - std::wstring getTagAttribute(const std::wstring& TagName, const std::wstring& AttributeName); + std::wstring getTagAttribute(const std::wstring& TagName, const std::wstring& AttributeName); /** Get the default language of the whole document. */ - LocaleSet_t getDefaultLocale( ); + LocaleSet_t getDefaultLocale(); protected: // protected because its only an implementation relevant class - /** start_element occurs when a tag is start. @param raw_name @@ -87,10 +85,8 @@ protected: // protected because its only an implementation relevant class @param attributes attribute structure. */ - virtual void start_element( - const string_t& raw_name, - const string_t& local_name, - const xml_tag_attribute_container_t& attributes) override; + virtual void start_element(const string_t& raw_name, const string_t& local_name, + const xml_tag_attribute_container_t& attributes) override; /** end_element occurs when a tag is closed @@ -99,8 +95,7 @@ protected: // protected because its only an implementation relevant class @param local_name local name of the tag. */ - virtual void end_element( - const string_t& raw_name, const string_t& local_name) override; + virtual void end_element(const string_t& raw_name, const string_t& local_name) override; /** characters occurs when receiving characters @@ -117,25 +112,24 @@ protected: @param XmlAttributes attribute structure of the tag to save in. */ - ITag* chooseTagReader( - const std::wstring& tag_name, const XmlTagAttributes_t& XmlAttributes ); + ITag* chooseTagReader(const std::wstring& tag_name, const XmlTagAttributes_t& XmlAttributes); /** save the received content into structure. @param tag_name the name of the tag. */ - void saveTagContent( const std::wstring& tag_name ); + void saveTagContent(const std::wstring& tag_name); private: - XmlTags_t m_AllMetaInfo; + XmlTags_t m_AllMetaInfo; private: std::stack<ITag*> m_TagBuilderStack; private: CKeywordsTag* m_pKeywords_Builder; - CDummyTag* m_pDummy_Builder; + CDummyTag* m_pDummy_Builder; CSimpleTag* m_pSimple_Builder; }; diff --git a/shell/inc/shlxthdl.hxx b/shell/inc/shlxthdl.hxx index 2f1c1b1e8146..00b8bf876777 100644 --- a/shell/inc/shlxthdl.hxx +++ b/shell/inc/shlxthdl.hxx @@ -23,20 +23,20 @@ #include <objbase.h> // {087B3AE3-E237-4467-B8DB-5A38AB959AC9} -const CLSID CLSID_INFOTIP_HANDLER = -{0x87b3ae3, 0xe237, 0x4467, {0xb8, 0xdb, 0x5a, 0x38, 0xab, 0x95, 0x9a, 0xc9}}; +const CLSID CLSID_INFOTIP_HANDLER + = { 0x87b3ae3, 0xe237, 0x4467, { 0xb8, 0xdb, 0x5a, 0x38, 0xab, 0x95, 0x9a, 0xc9 } }; // {C52AF81D-F7A0-4aab-8E87-F80A60CCD396} -const CLSID CLSID_COLUMN_HANDLER = -{ 0xc52af81d, 0xf7a0, 0x4aab, { 0x8e, 0x87, 0xf8, 0xa, 0x60, 0xcc, 0xd3, 0x96 } }; +const CLSID CLSID_COLUMN_HANDLER + = { 0xc52af81d, 0xf7a0, 0x4aab, { 0x8e, 0x87, 0xf8, 0xa, 0x60, 0xcc, 0xd3, 0x96 } }; // {63542C48-9552-494a-84F7-73AA6A7C99C1} -const CLSID CLSID_PROPERTYSHEET_HANDLER = -{ 0x63542c48, 0x9552, 0x494a, { 0x84, 0xf7, 0x73, 0xaa, 0x6a, 0x7c, 0x99, 0xc1 } }; +const CLSID CLSID_PROPERTYSHEET_HANDLER + = { 0x63542c48, 0x9552, 0x494a, { 0x84, 0xf7, 0x73, 0xaa, 0x6a, 0x7c, 0x99, 0xc1 } }; // {3B092F0C-7696-40e3-A80F-68D74DA84210} -const CLSID CLSID_THUMBVIEWER_HANDLER = -{ 0x3b092f0c, 0x7696, 0x40e3, { 0xa8, 0xf, 0x68, 0xd7, 0x4d, 0xa8, 0x42, 0x10 } }; +const CLSID CLSID_THUMBVIEWER_HANDLER + = { 0x3b092f0c, 0x7696, 0x40e3, { 0xa8, 0xf, 0x68, 0xd7, 0x4d, 0xa8, 0x42, 0x10 } }; extern HINSTANCE g_hModule; diff --git a/shell/inc/stream_helper.hxx b/shell/inc/stream_helper.hxx index bcd2f28f04ff..99976cc562d8 100644 --- a/shell/inc/stream_helper.hxx +++ b/shell/inc/stream_helper.hxx @@ -28,25 +28,27 @@ struct IStream; class BufferStream : public StreamInterface { public: - BufferStream(IStream *str); + BufferStream(IStream* str); ~BufferStream() override; - unsigned long sread (unsigned char *vuf, unsigned long size) override; - long stell () override; - long sseek (long offset, int origin) override; + unsigned long sread(unsigned char* vuf, unsigned long size) override; + long stell() override; + long sseek(long offset, int origin) override; + private: - IStream *stream; + IStream* stream; }; class FileStream : public StreamInterface { public: - FileStream(const Filepath_char_t *filename); + FileStream(const Filepath_char_t* filename); ~FileStream() override; - unsigned long sread (unsigned char *buf, unsigned long size) override; - long stell () override; - long sseek (long offset, int origin) override; + unsigned long sread(unsigned char* buf, unsigned long size) override; + long stell() override; + long sseek(long offset, int origin) override; + private: - FILE *file; + FILE* file; }; #endif diff --git a/shell/inc/types.hxx b/shell/inc/types.hxx index 6834bc60963d..140d03245199 100644 --- a/shell/inc/types.hxx +++ b/shell/inc/types.hxx @@ -31,9 +31,9 @@ // XmlTags_t, tags defined with tag name and xml tag. // Contents: Definitions of xml tag used in parser. -typedef std::map<std::wstring, std::wstring> XmlTagAttributes_t; -typedef std::pair<std::wstring, XmlTagAttributes_t> XmlTag_t; -typedef std::map<std::wstring, XmlTag_t> XmlTags_t; +typedef std::map<std::wstring, std::wstring> XmlTagAttributes_t; +typedef std::pair<std::wstring, XmlTagAttributes_t> XmlTag_t; +typedef std::map<std::wstring, XmlTag_t> XmlTags_t; const XmlTag_t EMPTY_XML_TAG = std::make_pair(std::wstring(), XmlTagAttributes_t()); @@ -45,14 +45,14 @@ const XmlTag_t EMPTY_XML_TAG = std::make_pair(std::wstring(), XmlTagAttributes_t typedef ::std::wstring Language_t; typedef ::std::wstring Country_t; -typedef ::std::pair<Language_t, Country_t > LocaleSet_t; +typedef ::std::pair<Language_t, Country_t> LocaleSet_t; typedef ::std::wstring Content_t; -typedef ::std::pair<LocaleSet_t, Content_t > Chunk_t; -typedef ::std::vector< Chunk_t > ChunkBuffer_t; +typedef ::std::pair<LocaleSet_t, Content_t> Chunk_t; +typedef ::std::vector<Chunk_t> ChunkBuffer_t; const LocaleSet_t EMPTY_LOCALE = ::std::make_pair(::std::wstring(), ::std::wstring()); -const Chunk_t EMPTY_CHUNK = ::std::make_pair( EMPTY_LOCALE, ::std::wstring()); +const Chunk_t EMPTY_CHUNK = ::std::make_pair(EMPTY_LOCALE, ::std::wstring()); //+------------------------------------------------------------------------- // Declare: StyleName_t, style name of a style-locale pair. @@ -60,18 +60,18 @@ const Chunk_t EMPTY_CHUNK = ::std::make_pair( EMPTY_LOCALE, ::std::wstring()); // Contents: Definitions of Style Names. typedef ::std::wstring StyleName_t; -typedef ::std::pair <StyleName_t, LocaleSet_t> StyleLocalePair_t; -typedef ::std::map<StyleName_t, LocaleSet_t> StyleLocaleMap_t; +typedef ::std::pair<StyleName_t, LocaleSet_t> StyleLocalePair_t; +typedef ::std::map<StyleName_t, LocaleSet_t> StyleLocaleMap_t; -const StyleLocalePair_t EMPTY_STYLELOCALE_PAIR = ::std::make_pair(::std::wstring(), EMPTY_LOCALE ); +const StyleLocalePair_t EMPTY_STYLELOCALE_PAIR = ::std::make_pair(::std::wstring(), EMPTY_LOCALE); class StreamInterface { public: virtual ~StreamInterface() {} - virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0; - virtual long stell () = 0; - virtual long sseek (long offset, int origin) = 0; + virtual unsigned long sread(unsigned char* vuf, unsigned long size) = 0; + virtual long stell() = 0; + virtual long sseek(long offset, int origin) = 0; }; #endif diff --git a/shell/inc/utilities.hxx b/shell/inc/utilities.hxx index a199c83db5e9..1941d85e658a 100644 --- a/shell/inc/utilities.hxx +++ b/shell/inc/utilities.hxx @@ -23,7 +23,7 @@ #include <malloc.h> #if !defined WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #endif #include <windows.h> @@ -41,25 +41,21 @@ */ std::wstring StringToWString(const std::string& String); - /** Convert a wstring to a string using CP_ACP */ std::string WStringToString(const std::wstring& String); - /** Convert a string to a wstring using CP_UTF8 */ std::wstring UTF8ToWString(const std::string& String); - /** Retrieve a string from the resources of this module */ std::wstring GetResString(int ResId); - /** helper function to judge if the string is only has spaces. @returns <TRUE>if the provided string contains only but at least one space @@ -72,33 +68,27 @@ bool HasOnlySpaces(const std::wstring& String); Windows Locale Identifier corresponding to input LocaleSet. */ - /** Convert a long path name using Windows api call GetShortPathName */ -std::wstring getShortPathName( const std::wstring& aLongName ); - - -LCID LocaleSetToLCID( const LocaleSet_t & Locale ); +std::wstring getShortPathName(const std::wstring& aLongName); +LCID LocaleSetToLCID(const LocaleSet_t& Locale); #ifdef DEBUG -inline void OutputDebugStringFormatW( LPCWSTR pFormat, ... ) +inline void OutputDebugStringFormatW(LPCWSTR pFormat, ...) { - WCHAR buffer[1024]; + WCHAR buffer[1024]; va_list args; - va_start( args, pFormat ); - StringCchVPrintfW( buffer, sizeof(buffer)/sizeof(*buffer), pFormat, args ); - va_end( args ); - OutputDebugStringW( buffer ); + va_start(args, pFormat); + StringCchVPrintfW(buffer, sizeof(buffer) / sizeof(*buffer), pFormat, args); + va_end(args); + OutputDebugStringW(buffer); } #else -static inline void OutputDebugStringFormatW( LPCWSTR, ... ) -{ -} +static inline void OutputDebugStringFormatW(LPCWSTR, ...) {} #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/xml_parser.hxx b/shell/inc/xml_parser.hxx index 37c44781cc5a..e07c860dd699 100644 --- a/shell/inc/xml_parser.hxx +++ b/shell/inc/xml_parser.hxx @@ -26,15 +26,12 @@ class xml_parser_exception final : public std::runtime_error { public: - - xml_parser_exception( - const std::string& error_msg) : - std::runtime_error(error_msg) - {} - + xml_parser_exception(const std::string& error_msg) + : std::runtime_error(error_msg) + { + } }; - // Simple wrapper around expat, the xml parser library // created by James Clark @@ -88,9 +85,9 @@ public: /** Returns the currently used document handler or null if no document handler was set before. */ - i_xml_parser_event_handler* get_document_handler() const { return document_handler_;} -private: + i_xml_parser_event_handler* get_document_handler() const { return document_handler_; } +private: void init(); private: diff --git a/shell/inc/zipfile.hxx b/shell/inc/zipfile.hxx index 1d774f77362a..f845368bf78a 100644 --- a/shell/inc/zipfile.hxx +++ b/shell/inc/zipfile.hxx @@ -33,12 +33,11 @@ class StreamInterface; class ZipFile { public: - typedef std::vector<std::string> Directory_t; + typedef std::vector<std::string> Directory_t; typedef std::unique_ptr<Directory_t> DirectoryPtr_t; - typedef std::vector<char> ZipContentBuffer_t; + typedef std::vector<char> ZipContentBuffer_t; public: - /** Checks whether a file is a zip file or not @precond The given parameter must be a string with length > 0 @@ -52,10 +51,9 @@ public: IOException if the specified file doesn't exist AccessViolationException if read access to the file is denied */ - static bool IsZipFile(const Filepath_t &FileName); - - static bool IsZipFile(void *stream); + static bool IsZipFile(const Filepath_t& FileName); + static bool IsZipFile(void* stream); /** Returns whether the version of the specified zip file may be uncompressed with the currently used zlib version or not @@ -72,12 +70,11 @@ public: IOException if the specified file doesn't exist or is no zip file AccessViolationException if read access to the file is denied */ - static bool IsValidZipFileVersionNumber(const Filepath_t &FileName); + static bool IsValidZipFileVersionNumber(const Filepath_t& FileName); - static bool IsValidZipFileVersionNumber(void *stream); + static bool IsValidZipFileVersionNumber(void* stream); public: - /** Constructs a zip file from a zip file @precond The given parameter must be a string with length > 0 @@ -90,10 +87,9 @@ public: WrongZipVersionException if the zip file cannot be uncompressed with the used zlib version */ - ZipFile(const Filepath_t &FileName); - - ZipFile(StreamInterface *stream); + ZipFile(const Filepath_t& FileName); + ZipFile(StreamInterface* stream); /** Destroys a zip file */ @@ -117,7 +113,8 @@ public: ZipContentMissException if the specified zip content does not exist in this zip file */ - void GetUncompressedContent(const std::string &ContentName, /*inout*/ ZipContentBuffer_t &ContentBuffer); + void GetUncompressedContent(const std::string& ContentName, + /*inout*/ ZipContentBuffer_t& ContentBuffer); /** Returns a list with the content names contained within this file @@ -129,10 +126,9 @@ public: iterating over a ZipFileDirectory returned by GetDirectory */ - bool HasContent(const std::string &ContentName) const; + bool HasContent(const std::string& ContentName) const; private: - /** Returns the length of the longest file name in the current zip file @@ -141,7 +137,7 @@ private: long GetFileLongestFileNameLength() const; private: - StreamInterface *m_pStream; + StreamInterface* m_pStream; bool m_bShouldFree; }; diff --git a/shell/qa/zip/testzipimpl.cxx b/shell/qa/zip/testzipimpl.cxx index 8fe27d9caffb..e669b6a8b40d 100644 --- a/shell/qa/zip/testzipimpl.cxx +++ b/shell/qa/zip/testzipimpl.cxx @@ -19,8 +19,9 @@ #include "testzipimpl.hxx" -TestZipImpl::TestZipImpl(StreamInterface *stream) : - zipFile(ZipFile(stream)), expectedContents() +TestZipImpl::TestZipImpl(StreamInterface* stream) + : zipFile(ZipFile(stream)) + , expectedContents() { expectedContents.push_back("mimetype"); expectedContents.push_back("Configurations2/statusbar/"); @@ -42,22 +43,17 @@ TestZipImpl::TestZipImpl(StreamInterface *stream) : sort(expectedContents.begin(), expectedContents.end()); } -TestZipImpl::~TestZipImpl() -{ -} +TestZipImpl::~TestZipImpl() {} bool TestZipImpl::test_directory() { ZipFile::DirectoryPtr_t contents = zipFile.GetDirectory(); - vector<string> &stringVector = *contents; + vector<string>& stringVector = *contents; sort(stringVector.begin(), stringVector.end()); return expectedContents == stringVector; } -bool TestZipImpl::test_hasContentCaseInSensitive() -{ - return zipFile.HasContent("mimetype"); -} +bool TestZipImpl::test_hasContentCaseInSensitive() { return zipFile.HasContent("mimetype"); } bool TestZipImpl::test_getContent() { diff --git a/shell/qa/zip/testzipimpl.hxx b/shell/qa/zip/testzipimpl.hxx index b0f4b91b172d..ae1ff8cedd72 100644 --- a/shell/qa/zip/testzipimpl.hxx +++ b/shell/qa/zip/testzipimpl.hxx @@ -30,11 +30,12 @@ using namespace std; class TestZipImpl { - private: +private: ZipFile zipFile; vector<string> expectedContents; - public: - explicit TestZipImpl(StreamInterface *stream); + +public: + explicit TestZipImpl(StreamInterface* stream); ~TestZipImpl(); bool test_directory(); bool test_hasContentCaseInSensitive(); diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx index 7af18912abd2..2ebe056d5b8b 100644 --- a/shell/qa/zip/ziptest.cxx +++ b/shell/qa/zip/ziptest.cxx @@ -18,7 +18,7 @@ */ #if !defined WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #endif #include <windows.h> #include <ole2.h> @@ -38,6 +38,7 @@ class Test : public CppUnit::TestFixture private: wstring documentName; LPSTREAM pStream; + public: Test(); void test_file_directory(); @@ -58,7 +59,9 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(Test); -Test::Test() : documentName(), pStream(nullptr) +Test::Test() + : documentName() + , pStream(nullptr) { const wchar_t* pSrcRoot = _wgetenv(L"SRC_ROOT"); if (pSrcRoot) @@ -69,7 +72,8 @@ Test::Test() : documentName(), pStream(nullptr) documentName.append(L"shell/qa/zip/simpledocument.odt"); // Create an IStream pointer from the file - HANDLE hFile = CreateFileW(documentName.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, 0, nullptr); + HANDLE hFile + = CreateFileW(documentName.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, 0, nullptr); DWORD dwFileSize = GetFileSize(hFile, nullptr); HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, dwFileSize); @@ -90,7 +94,8 @@ void Test::test_file_directory() FileStream stream(documentName.c_str()); TestZipImpl testImpl(&stream); bool isPassed = testImpl.test_directory(); - CPPUNIT_ASSERT_MESSAGE("FileStream: Content does not match with expected directory names.", isPassed); + CPPUNIT_ASSERT_MESSAGE("FileStream: Content does not match with expected directory names.", + isPassed); } void Test::test_file_hasContentCaseInSensitive() @@ -114,7 +119,8 @@ void Test::test_stream_directory() BufferStream stream(pStream); TestZipImpl testImpl(&stream); bool isPassed = testImpl.test_directory(); - CPPUNIT_ASSERT_MESSAGE("BufferStream: Content does not match with expected directory names.", isPassed); + CPPUNIT_ASSERT_MESSAGE("BufferStream: Content does not match with expected directory names.", + isPassed); } void Test::test_stream_hasContentCaseInSensitive() diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx index ffbd228e582a..e3f24e1d8b5c 100644 --- a/shell/source/tools/lngconvex/cmdline.cxx +++ b/shell/source/tools/lngconvex/cmdline.cxx @@ -17,27 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdexcept> #include "cmdline.hxx" - /** Simple command line abstraction */ // Creation - -CommandLine::CommandLine(size_t argc, char* argv[]) : - m_argc(argc), - m_argv(argv) +CommandLine::CommandLine(size_t argc, char* argv[]) + : m_argc(argc) + , m_argv(argv) { } - // Query - /** Returns an argument by name. If there are duplicate argument names in the command line, the first one wins. @@ -58,13 +53,13 @@ std::string CommandLine::get_arg(const std::string& ArgumentName) const { std::string arg_value; size_t i; - for ( i = 0; i < m_argc; i++) + for (i = 0; i < m_argc; i++) { std::string arg = m_argv[i]; - if (ArgumentName == arg && ((i+1) < m_argc) && !is_arg_name(m_argv[i+1])) + if (ArgumentName == arg && ((i + 1) < m_argc) && !is_arg_name(m_argv[i + 1])) { - arg_value = m_argv[i+1]; + arg_value = m_argv[i + 1]; break; } } @@ -75,10 +70,8 @@ std::string CommandLine::get_arg(const std::string& ArgumentName) const return arg_value; } - // Command - /** Returns whether a given argument is an argument name */ bool CommandLine::is_arg_name(const std::string& Argument) diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index bbf5afa5b0e5..507ace6174de 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -24,23 +24,18 @@ #include <sal/config.h> - /** Simple command line abstraction */ class CommandLine { public: - // Creation - CommandLine(size_t argc, char* argv[]); - // Query - /** Returns an argument by name. If there are duplicate argument names in the command line, the first one wins. @@ -59,18 +54,16 @@ public: */ std::string get_arg(const std::string& ArgumentName) const; - private: - /** Returns whether a given argument is an argument name */ static bool is_arg_name(const std::string& Argument); private: - size_t m_argc; - char** m_argv; + size_t m_argc; + char** m_argv; -// prevent copy and assignment + // prevent copy and assignment private: CommandLine(const CommandLine&) = delete; CommandLine& operator=(const CommandLine&) = delete; diff --git a/shell/source/win32/ooofilereader/keywordstag.cxx b/shell/source/win32/ooofilereader/keywordstag.cxx index 8a8600e2823f..4bc63e0423b0 100644 --- a/shell/source/win32/ooofilereader/keywordstag.cxx +++ b/shell/source/win32/ooofilereader/keywordstag.cxx @@ -21,15 +21,9 @@ /*********************** CKeywordsTag ***********************/ -void CKeywordsTag::startTag() -{ - m_sCurrentKeyword.clear(); -} +void CKeywordsTag::startTag() { m_sCurrentKeyword.clear(); } -void CKeywordsTag::endTag() -{ - m_slKeywords.push_back(m_sCurrentKeyword); -} +void CKeywordsTag::endTag() { m_slKeywords.push_back(m_sCurrentKeyword); } void CKeywordsTag::addCharacters(const std::wstring& characters) { @@ -41,13 +35,13 @@ void CKeywordsTag::addAttributes(const XmlTagAttributes_t& /*attributes*/) // there are no attributes for keywords } -std::wstring CKeywordsTag::getTagContent( ) +std::wstring CKeywordsTag::getTagContent() { - auto keywords_Iter= m_slKeywords.cbegin( ); - auto keywords_Iter_end = m_slKeywords.cend( ); + auto keywords_Iter = m_slKeywords.cbegin(); + auto keywords_Iter_end = m_slKeywords.cend(); - std::wstring ret_KeyWord_String = ( keywords_Iter != keywords_Iter_end) ? *keywords_Iter++ : L""; - for ( ; keywords_Iter != keywords_Iter_end; ++keywords_Iter) + std::wstring ret_KeyWord_String = (keywords_Iter != keywords_Iter_end) ? *keywords_Iter++ : L""; + for (; keywords_Iter != keywords_Iter_end; ++keywords_Iter) ret_KeyWord_String += L"," + *keywords_Iter; return ret_KeyWord_String; } diff --git a/shell/source/win32/zipfile/zipexcptn.hxx b/shell/source/win32/zipfile/zipexcptn.hxx index 6fb7c0d971b7..f6c6205058da 100644 --- a/shell/source/win32/zipfile/zipexcptn.hxx +++ b/shell/source/win32/zipfile/zipexcptn.hxx @@ -24,7 +24,6 @@ #include <stdexcept> - class RuntimeException : public std::exception { public: @@ -37,7 +36,6 @@ private: int m_Error; }; - class ZipException : public RuntimeException { public: @@ -46,7 +44,6 @@ public: virtual const char* what() const throw() override; }; - class Win32Exception : public RuntimeException { public: @@ -59,21 +56,18 @@ private: mutable char* m_MsgBuff; }; - class ZipContentMissException : public ZipException { public: explicit ZipContentMissException(int Error); }; - class AccessViolationException : public Win32Exception { public: explicit AccessViolationException(int Error); }; - class IOException : public Win32Exception { public: diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index a287e64c01e3..611a6d7aedc7 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11483,26 +11483,13 @@ shell/inc/columninfo.hxx shell/inc/config.hxx shell/inc/contentreader.hxx shell/inc/fileextensions.hxx -shell/inc/filepath.hxx -shell/inc/global.hxx shell/inc/i_xml_parser_event_handler.hxx shell/inc/infotips.hxx -shell/inc/iso8601_converter.hxx -shell/inc/metainforeader.hxx shell/inc/propertyhdl.hxx shell/inc/propsheets.hxx shell/inc/registry.hxx shell/inc/resource.h -shell/inc/shlxthdl.hxx -shell/inc/stream_helper.hxx shell/inc/thumbviewer.hxx -shell/inc/types.hxx -shell/inc/utilities.hxx -shell/inc/xml_parser.hxx -shell/inc/zipfile.hxx -shell/qa/zip/testzipimpl.cxx -shell/qa/zip/testzipimpl.hxx -shell/qa/zip/ziptest.cxx shell/source/all/xml_parser.cxx shell/source/backends/desktopbe/desktopbackend.cxx shell/source/backends/localebe/localebackend.cxx @@ -11516,8 +11503,6 @@ shell/source/cmdmail/cmdmailsuppl.cxx shell/source/cmdmail/cmdmailsuppl.hxx shell/source/sessioninstall/SyncDbusSessionHelper.cxx shell/source/sessioninstall/SyncDbusSessionHelper.hxx -shell/source/tools/lngconvex/cmdline.cxx -shell/source/tools/lngconvex/cmdline.hxx shell/source/tools/lngconvex/lngconvex.cxx shell/source/tools/regsvrex/regsvrex.cxx shell/source/unix/exec/shellexec.cxx @@ -11531,7 +11516,6 @@ shell/source/win32/ooofilereader/basereader.cxx shell/source/win32/ooofilereader/contentreader.cxx shell/source/win32/ooofilereader/dummytag.hxx shell/source/win32/ooofilereader/itag.hxx -shell/source/win32/ooofilereader/keywordstag.cxx shell/source/win32/ooofilereader/keywordstag.hxx shell/source/win32/ooofilereader/metainforeader.cxx shell/source/win32/ooofilereader/simpletag.cxx @@ -11571,7 +11555,6 @@ shell/source/win32/spsupp/spsuppServ.cxx shell/source/win32/workbench/TestSmplMail.cxx shell/source/win32/workbench/TestSysShExec.cxx shell/source/win32/zipfile/zipexcptn.cxx -shell/source/win32/zipfile/zipexcptn.hxx shell/source/win32/zipfile/zipfile.cxx slideshow/source/engine/activities/accumulation.hxx slideshow/source/engine/activities/activitiesfactory.cxx commit 02d65d7a19981d342d9ef3996b296b4efda905a4 Author: Philipp Hofer <philipp.ho...@protonmail.com> AuthorDate: Thu Nov 12 12:54:01 2020 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Nov 19 10:43:56 2020 +0100 tdf#123936 Formatting files in module dbaccess with clang-format Change-Id: I7056dc36b68021bdf16cc6c496645a2797958ab8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105660 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx index 793807f0c58c..b70186d28863 100644 --- a/dbaccess/inc/strings.hxx +++ b/dbaccess/inc/strings.hxx @@ -167,7 +167,6 @@ #define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer" #define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled" - // service names #define SERVICE_SDBC_RESULTSET "com.sun.star.sdbc.ResultSet" @@ -241,31 +240,31 @@ // URLs -#define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign" -#define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign" -#define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign" -#define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView" -#define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser" -#define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign" -#define URL_COMPONENT_APPLICATION ".component:DB/Application" -#define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign" +#define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign" +#define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign" +#define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign" +#define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView" +#define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser" +#define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign" +#define URL_COMPONENT_APPLICATION ".component:DB/Application" +#define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign" // service names -#define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" +#define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" // other DBU relevant strings -#define FRAME_NAME_QUERY_PREVIEW "QueryPreview" -#define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl" -#define PROPERTY_QUERYDESIGNVIEW "QueryDesignView" -#define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign" -#define PROPERTY_HELP_URL "HelpURL" +#define FRAME_NAME_QUERY_PREVIEW "QueryPreview" +#define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl" +#define PROPERTY_QUERYDESIGNVIEW "QueryDesignView" +#define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign" +#define PROPERTY_HELP_URL "HelpURL" // other DBU properties -#define PROPERTY_TRISTATE "TriState" -#define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape" +#define PROPERTY_TRISTATE "TriState" +#define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape" #define PROPERTY_TABSTOP "TabStop" #define PROPERTY_DEFAULTCONTROL "DefaultControl" #define PROPERTY_ENABLED "Enabled" @@ -274,8 +273,8 @@ #define SQLSTATE_GENERAL "01000" #define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode" -#define PROPERTY_IS_FORM "IsForm" -#define PROPERTY_PERSISTENT_PATH "PersistentPath" +#define PROPERTY_IS_FORM "IsForm" +#define PROPERTY_PERSISTENT_PATH "PersistentPath" #define STR_AUTOTEXTSEPARATORLIST "\"\t34\t'\t39" diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index dbc6488db051..5d65133664b3 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -25,12 +25,10 @@ public: CPPUNIT_TEST_SUITE(DBAccessTest); CPPUNIT_TEST(test); CPPUNIT_TEST_SUITE_END(); - }; - DBAccessTest::DBAccessTest() - : UnoApiTest("/dbaccess/qa/extras/testdocuments") + : UnoApiTest("/dbaccess/qa/extras/testdocuments") { } @@ -38,7 +36,7 @@ void DBAccessTest::test() { OUString aFileName; createFileURL("testdb.odb", aFileName); - uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); + uno::Reference<lang::XComponent> xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT(xComponent.is()); xComponent->dispose(); } diff --git a/dbaccess/qa/unit/hsqldb.cxx b/dbaccess/qa/unit/hsqldb.cxx index e9b0b6bbf9f3..0e3c2494bc5b 100644 --- a/dbaccess/qa/unit/hsqldb.cxx +++ b/dbaccess/qa/unit/hsqldb.cxx @@ -16,8 +16,7 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; -class HSQLDBTest - : public DBTestBase +class HSQLDBTest : public DBTestBase { public: void testEmptyDBConnection(); @@ -34,13 +33,11 @@ public: void HSQLDBTest::testEmptyDBConnection() { auto const file = createTempCopy("hsqldb_empty.odb"); - uno::Reference< XOfficeDatabaseDocument > xDocument = - getDocumentForUrl(file.GetURL()); + uno::Reference<XOfficeDatabaseDocument> xDocument = getDocumentForUrl(file.GetURL()); getConnectionForDocument(xDocument); - css::uno::Reference<css::lang::XComponent>( - xDocument, css::uno::UNO_QUERY_THROW)->dispose(); + css::uno::Reference<css::lang::XComponent>(xDocument, css::uno::UNO_QUERY_THROW)->dispose(); } CPPUNIT_TEST_SUITE_REGISTRATION(HSQLDBTest); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 93bd17ff71af..31a8e68ba7b1 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -28,15 +28,13 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace connectivity; -OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnection) - : OSharedConnection_BASE(m_aMutex) +OSharedConnection::OSharedConnection(Reference<XAggregation>& _rxProxyConnection) + : OSharedConnection_BASE(m_aMutex) { - setDelegation(_rxProxyConnection,m_refCount); + setDelegation(_rxProxyConnection, m_refCount); } -OSharedConnection::~OSharedConnection() -{ -} +OSharedConnection::~OSharedConnection() {} void SAL_CALL OSharedConnection::disposing() { @@ -44,114 +42,113 @@ void SAL_CALL OSharedConnection::disposing() OConnectionWrapper::disposing(); } -Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) +Reference<XStatement> SAL_CALL OSharedConnection::createStatement() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->createStatement(); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) +Reference<XPreparedStatement> SAL_CALL OSharedConnection::prepareStatement(const OUString& sql) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->prepareStatement(sql); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) +Reference<XPreparedStatement> SAL_CALL OSharedConnection::prepareCall(const OUString& sql) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->prepareCall(sql); } -OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) +OUString SAL_CALL OSharedConnection::nativeSQL(const OUString& sql) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->nativeSQL(sql); } -sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) +sal_Bool SAL_CALL OSharedConnection::getAutoCommit() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->getAutoCommit(); } -void SAL_CALL OSharedConnection::commit( ) +void SAL_CALL OSharedConnection::commit() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); m_xConnection->commit(); } -void SAL_CALL OSharedConnection::rollback( ) +void SAL_CALL OSharedConnection::rollback() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); m_xConnection->rollback(); } -sal_Bool SAL_CALL OSharedConnection::isClosed( ) +sal_Bool SAL_CALL OSharedConnection::isClosed() { - ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_xConnection.is() ) + ::osl::MutexGuard aGuard(m_aMutex); + if (!m_xConnection.is()) return true; return m_xConnection->isClosed(); } -Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) +Reference<XDatabaseMetaData> SAL_CALL OSharedConnection::getMetaData() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - return m_xConnection->getMetaData(); } -sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) +sal_Bool SAL_CALL OSharedConnection::isReadOnly() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->isReadOnly(); } -OUString SAL_CALL OSharedConnection::getCatalog( ) +OUString SAL_CALL OSharedConnection::getCatalog() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->getCatalog(); } -sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) +sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->getTransactionIsolation(); } -Reference< css::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap( ) +Reference<css::container::XNameAccess> SAL_CALL OSharedConnection::getTypeMap() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); return m_xConnection->getTypeMap(); } -IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection ) +IMPLEMENT_GET_IMPLEMENTATION_ID(OSharedConnection) -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx index 9f8190ba1190..709bc9f98490 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx @@ -24,9 +24,8 @@ namespace dbaccess { - - css::uno::Reference< css::uno::XAggregation > - createDataSourceRegistrations( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); +css::uno::Reference<css::uno::XAggregation> +createDataSourceRegistrations(const css::uno::Reference<css::uno::XComponentContext>& _rxContext); } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 8d1c53f112d2..8083f5ef59fa 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -24,8 +24,8 @@ #include "documentcontainer.hxx" #include <memory> -namespace dbaccess { - +namespace dbaccess +{ struct DataSupplier_Impl; class DataSupplier : public ucbhelper::ResultSetDataSupplier @@ -33,30 +33,27 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier std::unique_ptr<DataSupplier_Impl> m_pImpl; public: - explicit DataSupplier( const rtl::Reference< ODocumentContainer >& rxContent ); + explicit DataSupplier(const rtl::Reference<ODocumentContainer>& rxContent); virtual ~DataSupplier() override; - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual css::uno::Reference< css::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual css::uno::Reference< css::ucb::XContent > - queryContent( sal_uInt32 nIndex ) override; + virtual OUString queryContentIdentifierString(sal_uInt32 nIndex) override; + virtual css::uno::Reference<css::ucb::XContentIdentifier> + queryContentIdentifier(sal_uInt32 nIndex) override; + virtual css::uno::Reference<css::ucb::XContent> queryContent(sal_uInt32 nIndex) override; - virtual bool getResult( sal_uInt32 nIndex ) override; + virtual bool getResult(sal_uInt32 nIndex) override; virtual sal_uInt32 totalCount() override; virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual css::uno::Reference< css::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) override; - virtual void releasePropertyValues( sal_uInt32 nIndex ) override; + virtual css::uno::Reference<css::sdbc::XRow> queryPropertyValues(sal_uInt32 nIndex) override; + virtual void releasePropertyValues(sal_uInt32 nIndex) override; virtual void close() override; virtual void validate() override; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index d481077bdd49..0ae6f1eff01b 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -33,7 +33,6 @@ namespace dbaui { - class OApplicationIconControlDropTarget final : public DropTargetHelper { private: @@ -75,17 +74,16 @@ void OApplicationIconControl::Fill() const char* pLabelResId; ElementType eType; const char* aImageResId; - } aCategories[] = { - { RID_STR_TABLES_CONTAINER, E_TABLE, BMP_TABLEFOLDER_TREE_L }, - { RID_STR_QUERIES_CONTAINER, E_QUERY, BMP_QUERYFOLDER_TREE_L }, - { RID_STR_FORMS_CONTAINER, E_FORM, BMP_FORMFOLDER_TREE_L }, - { RID_STR_REPORTS_CONTAINER, E_REPORT, BMP_REPORTFOLDER_TREE_L } - }; + } aCategories[] = { { RID_STR_TABLES_CONTAINER, E_TABLE, BMP_TABLEFOLDER_TREE_L }, + { RID_STR_QUERIES_CONTAINER, E_QUERY, BMP_QUERYFOLDER_TREE_L }, + { RID_STR_FORMS_CONTAINER, E_FORM, BMP_FORMFOLDER_TREE_L }, + { RID_STR_REPORTS_CONTAINER, E_REPORT, BMP_REPORTFOLDER_TREE_L } }; for (const CategoryDescriptor& aCategorie : aCategories) { // E_TABLE is 0, but 0 means void so use id of enum + 1 - std::unique_ptr<ThumbnailViewItem> xItem(new ThumbnailViewItem(*this, aCategorie.eType + 1)); + std::unique_ptr<ThumbnailViewItem> xItem( + new ThumbnailViewItem(*this, aCategorie.eType + 1)); xItem->mbBorder = false; xItem->maPreview1 = BitmapEx(OUString::createFromAscii(aCategorie.aImageResId)); const Size& rSize = xItem->maPreview1.GetSizePixel(); @@ -186,7 +184,8 @@ sal_Int8 OApplicationIconControl::AcceptDrop(const AcceptDropEvent& rEvt) { deselectItems(); SelectItem(nEntry); - nDropOption = m_pActionListener->queryDrop(rEvt, m_xDropTarget->GetDataFlavorExVector()); + nDropOption + = m_pActionListener->queryDrop(rEvt, m_xDropTarget->GetDataFlavorExVector()); } } return nDropOption; @@ -199,9 +198,7 @@ sal_Int8 OApplicationIconControl::ExecuteDrop(const ExecuteDropEvent& rEvt) return DND_ACTION_NONE; } -OApplicationIconControl::~OApplicationIconControl() -{ -} +OApplicationIconControl::~OApplicationIconControl() {} void OApplicationIconControl::GetFocus() { @@ -236,7 +233,6 @@ tools::Rectangle OApplicationIconControl::GetFocusRect() } return tools::Rectangle(); } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 01952da0eb03..ea2066c729c1 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -32,7 +32,8 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent, OAppBorderWindow& rBorderWindow) +OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent, + OAppBorderWindow& rBorderWindow) : OChildWindow(pParent, "dbaccess/ui/appswapwindow.ui", "AppSwapWindow") , m_xIconControl(new OApplicationIconControl(m_xBuilder->weld_scrolled_window("scroll", true))) , m_xIconControlWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xIconControl)) @@ -45,7 +46,7 @@ OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent, OAppBor m_xIconControl->SetHelpId(HID_APP_SWAP_ICONCONTROL); m_xIconControl->Fill(); m_xIconControl->setItemStateHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl)); - m_xIconControl->setControlActionListener( &m_rBorderWin.getView()->getAppController() ); + m_xIconControl->setControlActionListener(&m_rBorderWin.getView()->getAppController()); } void OApplicationSwapWindow::GrabFocus() @@ -76,11 +77,11 @@ void OApplicationSwapWindow::createIconAutoMnemonics(MnemonicGenerator& rMnemoni m_xIconControl->createIconAutoMnemonics(rMnemonics); } -bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent ) +bool OApplicationSwapWindow::interceptKeyInput(const KeyEvent& _rEvent) { const vcl::KeyCode& rKeyCode = _rEvent.GetKeyCode(); - if ( rKeyCode.GetModifier() == KEY_MOD2 ) - return m_xIconControl->DoKeyShortCut( _rEvent ); + if (rKeyCode.GetModifier() == KEY_MOD2) + return m_xIconControl->DoKeyShortCut(_rEvent); // not handled return false; } @@ -90,20 +91,21 @@ ElementType OApplicationSwapWindow::getElementType() const return m_xIconControl->GetSelectedItem(); } -bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) +bool OApplicationSwapWindow::onContainerSelected(ElementType _eType) { - if ( m_eLastType == _eType ) + if (m_eLastType == _eType) return true; - if ( m_rBorderWin.getView()->getAppController().onContainerSelect( _eType ) ) + if (m_rBorderWin.getView()->getAppController().onContainerSelect(_eType)) { - if ( _eType != E_NONE ) + if (_eType != E_NONE) m_eLastType = _eType; return true; } if (!m_nChangeEvent) - m_nChangeEvent = Application::PostUserEvent(LINK(this, OApplicationSwapWindow, ChangeToLastSelected)); + m_nChangeEvent + = Application::PostUserEvent(LINK(this, OApplicationSwapWindow, ChangeToLastSelected)); return false; } @@ -112,7 +114,7 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, const ThumbnailViewItem* if (pEntry->mbSelected) { ElementType eType = static_cast<ElementType>(pEntry->mnId - 1); - onContainerSelected( eType ); // i87582 + onContainerSelected(eType); // i87582 } } diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index d69aabf6f032..9927b49b2956 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -23,7 +23,6 @@ namespace dbaui { - OTitleWindow::OTitleWindow(weld::Container* pParent, const char* pTitleId) : m_xBuilder(Application::CreateBuilder(pParent, "dbaccess/ui/titlewindow.ui")) , m_xContainer(m_xBuilder->weld_container("TitleWindow")) @@ -38,14 +37,9 @@ OTitleWindow::OTitleWindow(weld::Container* pParent, const char* pTitleId) m_xTitle->set_label_type(weld::LabelType::Title); } -OTitleWindow::~OTitleWindow() -{ -} +OTitleWindow::~OTitleWindow() {} -weld::Container* OTitleWindow::getChildContainer() -{ - return m_xChildContainer.get(); -} +weld::Container* OTitleWindow::getChildContainer() { return m_xChildContainer.get(); } void OTitleWindow::setChildWindow(const std::shared_ptr<OChildWindow>& rChild) { @@ -65,10 +59,7 @@ void OTitleWindow::GrabFocus() m_xChild->GrabFocus(); } -bool OTitleWindow::HasChildPathFocus() const -{ - return m_xChild && m_xChild->HasChildPathFocus(); -} +bool OTitleWindow::HasChildPathFocus() const { return m_xChild && m_xChild->HasChildPathFocus(); } } // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/templwin.hxx b/dbaccess/source/ui/app/templwin.hxx index 1a3f435af272..8978a6ea3e17 100644 --- a/dbaccess/source/ui/app/templwin.hxx +++ b/dbaccess/source/ui/app/templwin.hxx @@ -22,8 +22,7 @@ namespace SvtDocInfoTable_Impl { - OUString GetString(int nId); +OUString GetString(int nId); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index c8a7e500fb95..f42c00d9a944 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -22,25 +22,25 @@ // OAsynchronousLink using namespace dbaui; -OAsynchronousLink::OAsynchronousLink( const Link<void*,void>& _rHandler ) - :m_aHandler(_rHandler) - ,m_aEventSafety() - ,m_aDestructionSafety() - ,m_nEventId(nullptr) +OAsynchronousLink::OAsynchronousLink(const Link<void*, void>& _rHandler) + : m_aHandler(_rHandler) + , m_aEventSafety() + , m_aDestructionSafety() + , m_nEventId(nullptr) { } OAsynchronousLink::~OAsynchronousLink() { { - ::osl::MutexGuard aEventGuard( m_aEventSafety ); - if ( m_nEventId ) + ::osl::MutexGuard aEventGuard(m_aEventSafety); + if (m_nEventId) Application::RemoveUserEvent(m_nEventId); m_nEventId = nullptr; } { - ::osl::MutexGuard aDestructionGuard( m_aDestructionSafety ); + ::osl::MutexGuard aDestructionGuard(m_aDestructionSafety); // this is just for the case we're deleted while another thread just handled the event : // if this other thread called our link while we were deleting the event here, the // link handler blocked. With leaving the above block it continued, but now we are prevented @@ -48,28 +48,28 @@ OAsynchronousLink::~OAsynchronousLink() } } -void OAsynchronousLink::Call( void* _pArgument ) +void OAsynchronousLink::Call(void* _pArgument) { - ::osl::MutexGuard aEventGuard( m_aEventSafety ); + ::osl::MutexGuard aEventGuard(m_aEventSafety); if (m_nEventId) Application::RemoveUserEvent(m_nEventId); - m_nEventId = Application::PostUserEvent( LINK( this, OAsynchronousLink, OnAsyncCall ), _pArgument ); + m_nEventId = Application::PostUserEvent(LINK(this, OAsynchronousLink, OnAsyncCall), _pArgument); } void OAsynchronousLink::CancelCall() { - ::osl::MutexGuard aEventGuard( m_aEventSafety ); - if ( m_nEventId ) - Application::RemoveUserEvent( m_nEventId ); + ::osl::MutexGuard aEventGuard(m_aEventSafety); + if (m_nEventId) + Application::RemoveUserEvent(m_nEventId); m_nEventId = nullptr; } IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) { { - ::osl::MutexGuard aDestructionGuard( m_aDestructionSafety ); + ::osl::MutexGuard aDestructionGuard(m_aDestructionSafety); { - ::osl::MutexGuard aEventGuard( m_aEventSafety ); + ::osl::MutexGuard aEventGuard(m_aEventSafety); if (!m_nEventId) // our destructor deleted the event just while we are waiting for m_aEventSafety // -> get outta here diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 70aedf2e4d31..87cdef17c7aa 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -28,7 +28,6 @@ class SfxItemSet; namespace dbaui { - // ODatasourceSelector class ODatasourceSelectDialog final : public weld::GenericDialogController { @@ -43,17 +42,13 @@ class ODatasourceSelectDialog final : public weld::GenericDialogController public: ODatasourceSelectDialog(weld::Window* pParent, const std::set<OUString>& rDatasources); virtual ~ODatasourceSelectDialog() override; - OUString GetSelected() const { - return m_xDatasource->get_selected_text(); - } - void Select( const OUString& _rEntry ) { - m_xDatasource->select_text(_rEntry); - } + OUString GetSelected() const { return m_xDatasource->get_selected_text(); } + void Select(const OUString& _rEntry) { m_xDatasource->select_text(_rEntry); } virtual short run() override; private: - DECL_LINK( ListDblClickHdl, weld::TreeView&, bool ); + DECL_LINK(ListDblClickHdl, weld::TreeView&, bool); #ifdef HAVE_ODBC_ADMINISTRATION DECL_LINK(ManageClickHdl, weld::Button&, void); DECL_LINK(ManageProcessFinished, void*, void); @@ -61,6 +56,6 @@ private: void fillListBox(const std::set<OUString>& _rDatasources); }; -} // namespace dbaui +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_dlg.hxx b/dbaccess/source/ui/inc/dbu_dlg.hxx index f40e6f0b8375..ed97c4c937b5 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hxx +++ b/dbaccess/source/ui/inc/dbu_dlg.hxx @@ -18,7 +18,7 @@ */ #pragma once -#define WIZARD_PAGE_X 56 -#define WIZARD_PAGE_Y 30 +#define WIZARD_PAGE_X 56 +#define WIZARD_PAGE_Y 30 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index fc2cc757ea03..3d16f6770c30 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -26,24 +26,23 @@ namespace dbaui { - // OStringListItem /** <type>SfxPoolItem</type> which transports a sequence of <type scope="rtl">OUString</type>'s */ class OStringListItem : public SfxPoolItem { - css::uno::Sequence< OUString > m_aList; + css::uno::Sequence<OUString> m_aList; public: - OStringListItem(sal_Int16 nWhich, const css::uno::Sequence< OUString >& _rList); + OStringListItem(sal_Int16 nWhich, const css::uno::Sequence<OUString>& _rList); OStringListItem(const OStringListItem& _rSource); - virtual bool operator==(const SfxPoolItem& _rItem) const override; + virtual bool operator==(const SfxPoolItem& _rItem) const override; virtual OStringListItem* Clone(SfxItemPool* _pPool = nullptr) const override; - const css::uno::Sequence< OUString >& getList() const { return m_aList; } + const css::uno::Sequence<OUString>& getList() const { return m_aList; } }; -} // namespace dbaui +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index c5da8c21968e..97e75fe6d4b6 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -21,19 +21,18 @@ namespace dbaui { - using namespace ::com::sun::star::uno; // OStringListItem -OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< OUString >& _rList) - :SfxPoolItem(_nWhich) - ,m_aList(_rList) +OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence<OUString>& _rList) + : SfxPoolItem(_nWhich) + , m_aList(_rList) { } OStringListItem::OStringListItem(const OStringListItem& _rSource) - :SfxPoolItem(_rSource) - ,m_aList(_rSource.m_aList) + : SfxPoolItem(_rSource) + , m_aList(_rSource.m_aList) { } @@ -41,12 +40,12 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const { if (!SfxPoolItem::operator==(_rItem)) return false; - const OStringListItem* pCompare = static_cast<const OStringListItem*>( &_rItem ); + const OStringListItem* pCompare = static_cast<const OStringListItem*>(&_rItem); if (pCompare->m_aList.getLength() != m_aList.getLength()) return false; // compare all strings individually - for (sal_Int32 i=0; i<m_aList.getLength(); ++i) + for (sal_Int32 i = 0; i < m_aList.getLength(); ++i) if (m_aList[i] != pCompare->m_aList[i]) return false; @@ -58,6 +57,6 @@ OStringListItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const return new OStringListItem(*this); } -} // namespace dbaui +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx index 1e7ca6bb9525..39873281586a 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx @@ -23,7 +23,8 @@ using namespace dbaui; void OJoinMoveTabWinUndoAct::TogglePosition() { - Point ptFrameScrollPos(m_pOwner->GetHScrollBar().GetThumbPos(), m_pOwner->GetVScrollBar().GetThumbPos()); + Point ptFrameScrollPos(m_pOwner->GetHScrollBar().GetThumbPos(), + m_pOwner->GetVScrollBar().GetThumbPos()); Point ptNext = m_pTabWin->GetPosPixel() + ptFrameScrollPos; m_pTabWin->SetPosPixel(m_ptNextPosition - ptFrameScrollPos); diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index b209a62ce5e8..33cafc1509d7 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -29,16 +29,16 @@ using namespace dbaui; OQueryTabConnUndoAction::~OQueryTabConnUndoAction() { if (m_bOwnerOfConn) - { // I have the connection -> delete + { // I have the connection -> delete m_pOwner->DeselectConn(m_pConnection); m_pConnection.disposeAndClear(); } } OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID) - :OQueryDesignUndoAction(pOwner, pCommentID) - ,m_pConnection(nullptr) - ,m_bOwnerOfConn(false) + : OQueryDesignUndoAction(pOwner, pCommentID) + , m_pConnection(nullptr) + , m_bOwnerOfConn(false) { } @@ -77,13 +77,11 @@ void OQueryDelTabConnUndoAction::Redo() } OQueryTabWinShowUndoAct::OQueryTabWinShowUndoAct(OQueryTableView* pOwner) - : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINSHOW) + : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINSHOW) { } -OQueryTabWinShowUndoAct::~OQueryTabWinShowUndoAct() -{ -} +OQueryTabWinShowUndoAct::~OQueryTabWinShowUndoAct() {} void OQueryTabWinShowUndoAct::Undo() { @@ -93,28 +91,26 @@ void OQueryTabWinShowUndoAct::Undo() void OQueryTabWinShowUndoAct::Redo() { - static_cast<OQueryTableView*>(m_pOwner.get())->ShowTabWin(m_pTabWin, this,true); + static_cast<OQueryTableView*>(m_pOwner.get())->ShowTabWin(m_pTabWin, this, true); SetOwnership(false); } OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) - : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) + : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) { } -OQueryTabWinDelUndoAct::~OQueryTabWinDelUndoAct() -{ -} +OQueryTabWinDelUndoAct::~OQueryTabWinDelUndoAct() {} void OQueryTabWinDelUndoAct::Undo() { - static_cast<OQueryTableView*>(m_pOwner.get())->ShowTabWin( m_pTabWin, this,true ); + static_cast<OQueryTableView*>(m_pOwner.get())->ShowTabWin(m_pTabWin, this, true); SetOwnership(false); } void OQueryTabWinDelUndoAct::Redo() { - static_cast<OQueryTableView*>(m_pOwner.get())->HideTabWin( m_pTabWin, this ); + static_cast<OQueryTableView*>(m_pOwner.get())->HideTabWin(m_pTabWin, this); SetOwnership(true); } diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 202cc96a6e00..4af5a1c591a8 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -56,7 +56,7 @@ IMPL_LINK_NOARG(OQueryTextView, ModifyHdl, LinkParamNone*, void) m_timerUndoActionCreation.Start(); if (!m_rController.isModified()) - m_rController.setModified( true ); + m_rController.setModified(true); m_rController.InvalidateFeature(SID_SBA_QRY_EXECUTE); m_rController.InvalidateFeature(SID_CUT); @@ -103,10 +103,7 @@ void OQueryTextView::stopTimer() m_timerInvalidate.Stop(); } -OQueryTextView::~OQueryTextView() -{ - disposeOnce(); -} +OQueryTextView::~OQueryTextView() { disposeOnce(); } void OQueryTextView::dispose() { @@ -128,30 +125,21 @@ void OQueryTextView::GetFocus() InterimItemWindow::GetFocus(); } -OUString OQueryTextView::getStatement() const -{ - return m_xSQL->GetText(); -} +OUString OQueryTextView::getStatement() const { return m_xSQL->GetText(); } void OQueryTextView::clear() { std::unique_ptr<OSqlEditUndoAct> xUndoAct(new OSqlEditUndoAct(*this)); xUndoAct->SetOriginalText(m_xSQL->GetText()); - m_rController.addUndoActionAndInvalidate( std::move(xUndoAct) ); + m_rController.addUndoActionAndInvalidate(std::move(xUndoAct)); SetSQLText(OUString()); } -void OQueryTextView::setStatement(const OUString& rsStatement) -{ - SetSQLText(rsStatement); -} +void OQueryTextView::setStatement(const OUString& rsStatement) { SetSQLText(rsStatement); } -OUString OQueryTextView::GetSQLText() const -{ - return m_xSQL->GetText(); -} +OUString OQueryTextView::GetSQLText() const { return m_xSQL->GetText(); } void OQueryTextView::SetSQLText(const OUString& rNewText) { @@ -167,15 +155,9 @@ void OQueryTextView::SetSQLText(const OUString& rNewText) m_strOrigText = rNewText; } -void OQueryTextView::copy() -{ - m_xSQL->Copy(); -} +void OQueryTextView::copy() { m_xSQL->Copy(); } -bool OQueryTextView::isCutAllowed() const -{ - return m_xSQL->HasSelection(); -} +bool OQueryTextView::isCutAllowed() const { return m_xSQL->HasSelection(); } void OQueryTextView::cut() { diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx index 15c60b83352d..a0c8ff747e34 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx @@ -21,13 +21,12 @@ using namespace dbaui; -OTableFieldInfo::OTableFieldInfo() : - m_eFieldType(TAB_NORMAL_FIELD), m_eDataType(1000) +OTableFieldInfo::OTableFieldInfo() + : m_eFieldType(TAB_NORMAL_FIELD) + , m_eDataType(1000) { } -OTableFieldInfo::~OTableFieldInfo() -{ -} +OTableFieldInfo::~OTableFieldInfo() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index a90c70b21148..53f1d45a72cd 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -40,11 +40,11 @@ OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox) { } -OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent ) +OTableWindowListBox::OTableWindowListBox(OTableWindow* pParent) : InterimItemWindow(pParent, "dbaccess/ui/tablelistbox.ui", "TableListBox") , m_xTreeView(m_xBuilder->weld_tree_view("treeview")) , m_xDragDropTargetHelper(new TableWindowListBoxHelper(*this, m_xTreeView->get_drop_target())) - , m_pTabWin( pParent ) + , m_pTabWin(pParent) , m_nDropEvent(nullptr) , m_nUiEvent(nullptr) { @@ -57,20 +57,19 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent ) m_xTreeView->connect_drag_begin(LINK(this, OTableWindowListBox, DragBeginHdl)); } -void OTableWindowListBox::dragFinished( ) +void OTableWindowListBox::dragFinished() { // first show the error msg when existing - m_pTabWin->getDesignView()->getController().showError(m_pTabWin->getDesignView()->getController().clearOccurredError()); + m_pTabWin->getDesignView()->getController().showError( + m_pTabWin->getDesignView()->getController().clearOccurredError()); // second look for ui activities which should happen after d&d if (m_nUiEvent) Application::RemoveUserEvent(m_nUiEvent); - m_nUiEvent = Application::PostUserEvent(LINK(this, OTableWindowListBox, LookForUiHdl), nullptr, true); + m_nUiEvent + = Application::PostUserEvent(LINK(this, OTableWindowListBox, LookForUiHdl), nullptr, true); } -OTableWindowListBox::~OTableWindowListBox() -{ - disposeOnce(); -} +OTableWindowListBox::~OTableWindowListBox() { disposeOnce(); } void OTableWindowListBox::dispose() { @@ -84,7 +83,7 @@ void OTableWindowListBox::dispose() InterimItemWindow::dispose(); } -int OTableWindowListBox::GetEntryFromText( const OUString& rEntryText ) +int OTableWindowListBox::GetEntryFromText(const OUString& rEntryText) { // iterate through the list OJoinDesignView* pView = m_pTabWin->getDesignView(); @@ -94,19 +93,20 @@ int OTableWindowListBox::GetEntryFromText( const OUString& rEntryText ) { bool bCase = false; const Reference<XConnection>& xConnection = rController.getConnection(); - if(xConnection.is()) + if (xConnection.is()) { Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); - if(xMeta.is()) + if (xMeta.is()) bCase = xMeta->supportsMixedCaseQuotedIdentifiers(); } for (int nEntry = 0, nCount = m_xTreeView->n_children(); nEntry < nCount; ++nEntry) { - if (bCase ? rEntryText == m_xTreeView->get_text(nEntry) : rEntryText.equalsIgnoreAsciiCase(m_xTreeView->get_text(nEntry))) + if (bCase ? rEntryText == m_xTreeView->get_text(nEntry) + : rEntryText.equalsIgnoreAsciiCase(m_xTreeView->get_text(nEntry))) return nEntry; } } - catch(SQLException&) + catch (SQLException&) { } @@ -129,7 +129,8 @@ IMPL_LINK(OTableWindowListBox, DragBeginHdl, bool&, rUnsetDragIcon, bool) } OJoinTableView* pCont = m_pTabWin->getTableView(); - if (!pCont->getDesignView()->getController().isReadOnly() && pCont->getDesignView()->getController().isConnected()) + if (!pCont->getDesignView()->getController().isReadOnly() + && pCont->getDesignView()->getController().isConnected()) { // asterisk was not allowed to be copied to selection browsebox bool bFirstNotAllowed = m_xTreeView->is_selected(0) && m_pTabWin->GetData()->IsShowAll(); @@ -144,7 +145,7 @@ IMPL_LINK(OTableWindowListBox, DragBeginHdl, bool&, rUnsetDragIcon, bool) return true; } -sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) +sal_Int8 OTableWindowListBox::AcceptDrop(const AcceptDropEvent& _rEvt) { // to enable the autoscroll when we're close to the edges std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator()); @@ -152,9 +153,11 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDND_Action = DND_ACTION_NONE; // check the format - if ( !OJoinExchObj::isFormatAvailable(m_xDragDropTargetHelper->GetDataFlavorExVector(),SotClipboardFormatId::SBA_TABID) // this means that the first entry is to be dragged - && OJoinExchObj::isFormatAvailable(m_xDragDropTargetHelper->GetDataFlavorExVector()) ) - { // don't drop into the window if it's the drag source itself + if (!OJoinExchObj::isFormatAvailable( + m_xDragDropTargetHelper->GetDataFlavorExVector(), + SotClipboardFormatId::SBA_TABID) // this means that the first entry is to be dragged + && OJoinExchObj::isFormatAvailable(m_xDragDropTargetHelper->GetDataFlavorExVector())) + { // don't drop into the window if it's the drag source itself // remove the selection if the dragging operation is leaving the window if (_rEvt.mbLeaving) @@ -169,48 +172,51 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) m_xTreeView->select(*xEntry); // one cannot drop on the first (*) entry - if(!( m_pTabWin->GetData()->IsShowAll() && (m_xTreeView->get_iter_index_in_parent(*xEntry) == 0) )) + if (!(m_pTabWin->GetData()->IsShowAll() + && (m_xTreeView->get_iter_index_in_parent(*xEntry) == 0))) nDND_Action = DND_ACTION_LINK; } } return nDND_Action; } -IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl, void*, void ) +IMPL_LINK_NOARG(OTableWindowListBox, LookForUiHdl, void*, void) { m_nUiEvent = nullptr; m_pTabWin->getTableView()->lookForUiActivities(); } -IMPL_LINK_NOARG( OTableWindowListBox, DropHdl, void*, void ) +IMPL_LINK_NOARG(OTableWindowListBox, DropHdl, void*, void) { // create the connection m_nDropEvent = nullptr; - OSL_ENSURE(m_pTabWin,"No TableWindow!"); + OSL_ENSURE(m_pTabWin, "No TableWindow!"); try { OJoinTableView* pCont = m_pTabWin->getTableView(); - OSL_ENSURE(pCont,"No QueryTableView!"); + OSL_ENSURE(pCont, "No QueryTableView!"); pCont->AddConnection(m_aDropInfo.aSource, m_aDropInfo.aDest); } - catch(const SQLException& e) + catch (const SQLException& e) { // remember the exception so that we can show them later when d&d is finished - m_pTabWin->getDesignView()->getController().setErrorOccurred(::dbtools::SQLExceptionInfo(e)); + m_pTabWin->getDesignView()->getController().setErrorOccurred( + ::dbtools::SQLExceptionInfo(e)); } } -sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) +sal_Int8 OTableWindowListBox::ExecuteDrop(const ExecuteDropEvent& _rEvt) { TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable); - if ( OJoinExchObj::isFormatAvailable(aDropped.GetDataFlavorExVector())) - { // don't drop into the window if it's the drag source itself + if (OJoinExchObj::isFormatAvailable(aDropped.GetDataFlavorExVector())) + { // don't drop into the window if it's the drag source itself m_aDropInfo.aSource = OJoinExchangeData(this); - m_aDropInfo.aDest = OJoinExchObj::GetSourceDescription(_rEvt.maDropEvent.Transferable); + m_aDropInfo.aDest = OJoinExchObj::GetSourceDescription(_rEvt.maDropEvent.Transferable); if (m_nDropEvent) Application::RemoveUserEvent(m_nDropEvent); - m_nDropEvent = Application::PostUserEvent(LINK(this, OTableWindowListBox, DropHdl), nullptr, true); + m_nDropEvent + = Application::PostUserEvent(LINK(this, OTableWindowListBox, DropHdl), nullptr, true); dragFinished(); diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index fe3912fa1eb5..f81123e55d03 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -22,7 +22,7 @@ using namespace dbaui; -#define DETAILS_MIN_HELP_WIDTH 200 +#define DETAILS_MIN_HELP_WIDTH 200 OTableDesignHelpBar::OTableDesignHelpBar(std::unique_ptr<weld::TextView> xTextWin) : m_xTextWin(std::move(xTextWin)) @@ -31,7 +31,7 @@ OTableDesignHelpBar::OTableDesignHelpBar(std::unique_ptr<weld::TextView> xTextWi m_xTextWin->set_help_id(HID_TAB_DESIGN_HELP_TEXT_FRAME); } -void OTableDesignHelpBar::SetHelpText( const OUString& rText ) +void OTableDesignHelpBar::SetHelpText(const OUString& rText) { if (!m_xTextWin) return; @@ -44,19 +44,11 @@ bool OTableDesignHelpBar::isCopyAllowed() return m_xTextWin && m_xTextWin->get_selection_bounds(mStartPos, nEndPos); } -bool OTableDesignHelpBar::isCutAllowed() -{ - return false; -} +bool OTableDesignHelpBar::isCutAllowed() { return false; } -bool OTableDesignHelpBar::isPasteAllowed() -{ - return false; -} +bool OTableDesignHelpBar::isPasteAllowed() { return false; } -void OTableDesignHelpBar::cut() -{ -} +void OTableDesignHelpBar::cut() {} void OTableDesignHelpBar::copy() { @@ -65,8 +57,6 @@ void OTableDesignHelpBar::copy() m_xTextWin->copy_clipboard(); } -void OTableDesignHelpBar::paste() -{ -} +void OTableDesignHelpBar::paste() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index f609863e1881..3e524372eea5 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -25,24 +25,23 @@ using namespace dbaui; extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* org_openoffice_comp_dbu_ODatasourceAdministrationDialog_get_implementation( - css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& ) + css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ODataSourcePropertyDialog(context)); } namespace dbaui { +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::beans; - -ODataSourcePropertyDialog::ODataSourcePropertyDialog(const Reference< XComponentContext >& _rxORB) - :ODatabaseAdministrationDialog(_rxORB) +ODataSourcePropertyDialog::ODataSourcePropertyDialog(const Reference<XComponentContext>& _rxORB) + : ODatabaseAdministrationDialog(_rxORB) { } -Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId( ) +Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -57,9 +56,9 @@ css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedSer return { "com.sun.star.sdb.DatasourceAdministrationDialog" }; } -Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo() +Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo() { - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); + Reference<XPropertySetInfo> xInfo(createPropertySetInfo(getInfoHelper())); return xInfo; } @@ -68,24 +67,26 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI return *getArrayHelper(); } -::cppu::IPropertyArrayHelper* ODataSourcePropertyDialog::createArrayHelper( ) const +::cppu::IPropertyArrayHelper* ODataSourcePropertyDialog::createArrayHelper() const { - Sequence< Property > aProps; + Sequence<Property> aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -std::unique_ptr<weld::DialogController> ODataSourcePropertyDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) +std::unique_ptr<weld::DialogController> +ODataSourcePropertyDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { - std::unique_ptr<ODbAdminDialog> xDialog(new ODbAdminDialog(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(), m_aContext)); + std::unique_ptr<ODbAdminDialog> xDialog(new ODbAdminDialog( + Application::GetFrameWeld(rParent), m_pDatasourceItems.get(), m_aContext)); // the initial selection - if ( m_aInitialSelection.hasValue() ) + if (m_aInitialSelection.hasValue()) xDialog->selectDataSource(m_aInitialSelection); return xDialog; } -} // namespace dbaui +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index c5a0601d11ba..a287e64c01e3 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -2696,17 +2696,14 @@ cui/source/tabpages/tptrans.cxx cui/source/tabpages/transfrm.cxx dbaccess/inc/core_resource.hxx dbaccess/inc/helpids.h -dbaccess/inc/strings.hxx dbaccess/qa/extras/dialog-save.cxx dbaccess/qa/extras/empty-stdlib-save.cxx -dbaccess/qa/extras/macros-test.cxx dbaccess/qa/extras/nolib-save.cxx dbaccess/qa/extras/rowsetclones.cxx dbaccess/qa/unit/dbtest_base.cxx dbaccess/qa/unit/embeddeddb_performancetest.cxx dbaccess/qa/unit/firebird-regression.cxx dbaccess/qa/unit/firebird.cxx -dbaccess/qa/unit/hsqldb.cxx dbaccess/source/core/api/BookmarkSet.cxx dbaccess/source/core/api/BookmarkSet.hxx dbaccess/source/core/api/CIndexes.cxx @@ -2768,7 +2765,6 @@ dbaccess/source/core/dataaccess/ComponentDefinition.cxx dbaccess/source/core/dataaccess/ComponentDefinition.hxx dbaccess/source/core/dataaccess/ContentHelper.cxx dbaccess/source/core/dataaccess/ModelImpl.cxx -dbaccess/source/core/dataaccess/SharedConnection.cxx dbaccess/source/core/dataaccess/SharedConnection.hxx dbaccess/source/core/dataaccess/bookmarkcontainer.cxx dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -2782,7 +2778,6 @@ dbaccess/source/core/dataaccess/databasecontext.cxx dbaccess/source/core/dataaccess/databasedocument.cxx dbaccess/source/core/dataaccess/databasedocument.hxx dbaccess/source/core/dataaccess/databaseregistrations.cxx -dbaccess/source/core/dataaccess/databaseregistrations.hxx dbaccess/source/core/dataaccess/datasource.cxx dbaccess/source/core/dataaccess/datasource.hxx dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -2798,7 +2793,6 @@ dbaccess/source/core/dataaccess/documentevents.cxx dbaccess/source/core/dataaccess/intercept.cxx dbaccess/source/core/dataaccess/intercept.hxx dbaccess/source/core/dataaccess/myucp_datasupplier.cxx -dbaccess/source/core/dataaccess/myucp_datasupplier.hxx dbaccess/source/core/dataaccess/myucp_resultset.cxx dbaccess/source/core/dataaccess/myucp_resultset.hxx dbaccess/source/core/inc/ContainerMediator.hxx @@ -2928,11 +2922,8 @@ dbaccess/source/ui/app/AppDetailPageHelper.cxx dbaccess/source/ui/app/AppDetailPageHelper.hxx dbaccess/source/ui/app/AppDetailView.cxx dbaccess/source/ui/app/AppDetailView.hxx -dbaccess/source/ui/app/AppIconControl.cxx dbaccess/source/ui/app/AppIconControl.hxx -dbaccess/source/ui/app/AppSwapWindow.cxx dbaccess/source/ui/app/AppSwapWindow.hxx -dbaccess/source/ui/app/AppTitleWindow.cxx dbaccess/source/ui/app/AppTitleWindow.hxx dbaccess/source/ui/app/AppView.cxx dbaccess/source/ui/app/AppView.hxx @@ -2941,8 +2932,6 @@ dbaccess/source/ui/app/DocumentInfoPreview.hxx dbaccess/source/ui/app/subcomponentmanager.cxx dbaccess/source/ui/app/subcomponentmanager.hxx dbaccess/source/ui/app/templwin.cxx -dbaccess/source/ui/app/templwin.hxx -dbaccess/source/ui/browser/AsynchronousLink.cxx dbaccess/source/ui/browser/brwctrlr.cxx dbaccess/source/ui/browser/brwview.cxx dbaccess/source/ui/browser/dataview.cxx @@ -3011,7 +3000,6 @@ dbaccess/source/ui/dlg/dlgsave.cxx dbaccess/source/ui/dlg/dlgsize.cxx dbaccess/source/ui/dlg/dsnItem.hxx dbaccess/source/ui/dlg/dsselect.cxx -dbaccess/source/ui/dlg/dsselect.hxx dbaccess/source/ui/dlg/finteraction.cxx dbaccess/source/ui/dlg/finteraction.hxx dbaccess/source/ui/dlg/generalpage.cxx @@ -3108,7 +3096,6 @@ dbaccess/source/ui/inc/datasourceconnector.hxx dbaccess/source/ui/inc/dbadmin.hxx dbaccess/source/ui/inc/dbexchange.hxx dbaccess/source/ui/inc/dbtreelistbox.hxx -dbaccess/source/ui/inc/dbu_dlg.hxx dbaccess/source/ui/inc/dbwiz.hxx dbaccess/source/ui/inc/dbwizsetup.hxx dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -3139,7 +3126,6 @@ dbaccess/source/ui/inc/sbamultiplex.hxx dbaccess/source/ui/inc/singledoccontroller.hxx dbaccess/source/ui/inc/sqledit.hxx dbaccess/source/ui/inc/sqlmessage.hxx -dbaccess/source/ui/inc/stringlistitem.hxx dbaccess/source/ui/inc/tabletree.hxx dbaccess/source/ui/inc/textconnectionsettings.hxx dbaccess/source/ui/inc/undosqledit.hxx @@ -3174,7 +3160,6 @@ dbaccess/source/ui/misc/indexcollection.cxx dbaccess/source/ui/misc/linkeddocuments.cxx dbaccess/source/ui/misc/propertystorage.cxx dbaccess/source/ui/misc/singledoccontroller.cxx -dbaccess/source/ui/misc/stringlistitem.cxx dbaccess/source/ui/querydesign/ConnectionLine.cxx dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -3195,28 +3180,23 @@ dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx dbaccess/source/ui/querydesign/QueryDesignView.cxx -dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx -dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx dbaccess/source/ui/querydesign/QueryTableView.cxx -dbaccess/source/ui/querydesign/QueryTextView.cxx dbaccess/source/ui/querydesign/QueryViewSwitch.cxx dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx dbaccess/source/ui/querydesign/TableConnection.cxx dbaccess/source/ui/querydesign/TableConnectionData.cxx dbaccess/source/ui/querydesign/TableFieldDescription.cxx -dbaccess/source/ui/querydesign/TableFieldInfo.cxx dbaccess/source/ui/querydesign/TableFieldInfo.hxx dbaccess/source/ui/querydesign/TableWindow.cxx dbaccess/source/ui/querydesign/TableWindowAccess.cxx dbaccess/source/ui/querydesign/TableWindowData.cxx -dbaccess/source/ui/querydesign/TableWindowListBox.cxx dbaccess/source/ui/querydesign/TableWindowTitle.cxx dbaccess/source/ui/querydesign/limitboxcontroller.cxx dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -3236,7 +3216,6 @@ dbaccess/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.hxx dbaccess/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableDesignControl.cxx -dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx dbaccess/source/ui/tabledesign/TableDesignView.cxx dbaccess/source/ui/tabledesign/TableFieldControl.cxx dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -3261,7 +3240,6 @@ dbaccess/source/ui/uno/TableFilterDlg.cxx dbaccess/source/ui/uno/TableFilterDlg.hxx dbaccess/source/ui/uno/UserSettingsDlg.cxx dbaccess/source/ui/uno/UserSettingsDlg.hxx -dbaccess/source/ui/uno/admindlg.cxx dbaccess/source/ui/uno/admindlg.hxx dbaccess/source/ui/uno/composerdialogs.cxx dbaccess/source/ui/uno/composerdialogs.hxx _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits