[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/options/optaboutconfig.cxx | 364 +-
cui/source/options/optaboutconfig.hxx | 34 +--
solenv/clang-format/excludelist |2
3 files changed, 202 insertions(+), 198 deletions(-)
New commits:
commit f271ec5cd98ae32fd643df33174136d0a91a1941
Author: Samuel Mehrbrodt
AuthorDate: Mon Nov 13 14:22:09 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Nov 16 08:04:31 2023 +0100
Format optaboutconfig with clang-format
Change-Id: Ia696e096f972fe722920238c3710d20a3f03b221
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159374
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 11806faa8477..362af44cfd7d 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -7,37 +7,37 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "optaboutconfig.hxx"
#include
#include
-#include "optaboutconfig.hxx"
-#include
-#include
-#include
-#include
#include
#include
#include
#include
#include
#include
+#include
+#include
#include
#include
-#include
+#include
#include
#include
#include
-#include
-#include
#include
+#include
+#include
+#include
+#include
+#include
#include
#include
#include
+#include
#include
#include
#include
-#include
-#include
#include
#include
@@ -52,15 +52,16 @@ using namespace com::sun::star::container;
struct Prop_Impl
{
-OUStringName;
-OUStringProperty;
-Any Value;
-
-Prop_Impl( OUString sName, OUString sProperty, Any aValue )
-: Name(std::move( sName ))
-, Property(std::move( sProperty ))
-, Value(std::move( aValue ))
-{}
+OUString Name;
+OUString Property;
+Any Value;
+
+Prop_Impl(OUString sName, OUString sProperty, Any aValue)
+: Name(std::move(sName))
+, Property(std::move(sProperty))
+, Value(std::move(aValue))
+{
+}
};
struct UserData
@@ -72,20 +73,22 @@ struct UserData
int aLineage;
Reference aXNameAccess;
-explicit UserData( OUString aPropertyPath, OUString aTooltip, bool
isReadOnly )
-: bIsPropertyPath( true )
-, bIsReadOnly( isReadOnly )
+explicit UserData(OUString aPropertyPath, OUString aTooltip, bool
isReadOnly)
+: bIsPropertyPath(true)
+, bIsReadOnly(isReadOnly)
, sPropertyPath(std::move(aPropertyPath))
, sTooltip(std::move(aTooltip))
, aLineage(0)
-{}
+{
+}
-explicit UserData( Reference const & rXNameAccess, int rIndex
)
-: bIsPropertyPath( false )
-, bIsReadOnly( false )
+explicit UserData(Reference const& rXNameAccess, int rIndex)
+: bIsPropertyPath(false)
+, bIsReadOnly(false)
, aLineage(rIndex)
-, aXNameAccess( rXNameAccess )
-{}
+, aXNameAccess(rXNameAccess)
+{
+}
};
CuiAboutConfigTabPage::CuiAboutConfigTabPage(weld::Window* pParent)
@@ -103,24 +106,20 @@
CuiAboutConfigTabPage::CuiAboutConfigTabPage(weld::Window* pParent)
m_xPrefBox->get_height_rows(23));
m_xPrefBox->connect_column_clicked(LINK(this, CuiAboutConfigTabPage,
HeaderBarClick));
-m_xEditBtn->connect_clicked(LINK( this, CuiAboutConfigTabPage,
StandardHdl_Impl));
-m_xResetBtn->connect_clicked(LINK( this, CuiAboutConfigTabPage,
ResetBtnHdl_Impl));
+m_xEditBtn->connect_clicked(LINK(this, CuiAboutConfigTabPage,
StandardHdl_Impl));
+m_xResetBtn->connect_clicked(LINK(this, CuiAboutConfigTabPage,
ResetBtnHdl_Impl));
m_xPrefBox->connect_row_activated(LINK(this, CuiAboutConfigTabPage,
DoubleClickHdl_Impl));
m_xPrefBox->connect_expanding(LINK(this, CuiAboutConfigTabPage,
ExpandingHdl_Impl));
m_xSearchBtn->connect_clicked(LINK(this, CuiAboutConfigTabPage,
SearchHdl_Impl));
m_options.AlgorithmType2 = util::SearchAlgorithms2::ABSOLUTE;
m_options.transliterateFlags |= TransliterationFlags::IGNORE_CASE;
-m_options.searchFlag |= (util::SearchFlags::REG_NOT_BEGINOFLINE |
-util::SearchFlags::REG_NOT_ENDOFLINE);
+m_options.searchFlag
+|= (util::SearchFlags::REG_NOT_BEGINOFLINE |
util::SearchFlags::REG_NOT_ENDOFLINE);
float fWidth = m_xPrefBox->get_approximate_digit_width();
-std::vector aWidths
-{
-o3tl::narrowing(fWidth * 65),
-o3tl::narrowing(fWidth * 20),
-o3tl::narrowing(fWidth * 8)
-};
+std::vector aWidths{ o3tl::narrowing(fWidth * 65),
o3tl::narrowing(fWidth * 20),
+ o3tl::narrowing(fWidth * 8) };
m_xPrefBox->set_column_fixed_widths(aWidths);
m_xPrefBox->connect_query_tooltip(LINK(this, CuiAboutConfigTabPage,
QueryTooltip));
@@ -128,7 +127,7 @@
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/customize/SvxToolbarConfigPage.cxx | 474 --
cui/source/inc/SvxToolbarConfigPage.hxx | 53 +-
solenv/clang-format/excludelist |2
3 files changed, 255 insertions(+), 274 deletions(-)
New commits:
commit 35fa77d0137350e69b17418e2bc33f1fa0be2efb
Author: Muhammet Kara
AuthorDate: Sun Oct 18 19:48:16 2020 +0300
Commit: Muhammet Kara
CommitDate: Sun Oct 18 20:57:51 2020 +0200
clang-format customize/SvxToolbarConfigPage
Change-Id: If9b3fcbaa8e900d73c8dd0e727b4059c3b30ac01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104485
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 740fa426feb0..57f78dcd6161 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -42,15 +42,19 @@
#include
-SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
+SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage,
+ weld::DialogController* pController,
+ const SfxItemSet& rSet)
: SvxConfigPage(pPage, pController, rSet)
{
m_xGearBtn = m_xBuilder->weld_menu_button("toolbargearbtn");
m_xGearBtn->show();
m_xContainer->set_help_id(HID_SVX_CONFIG_TOOLBAR);
-m_xContentsListBox.reset(new
SvxToolbarEntriesListBox(m_xBuilder->weld_tree_view("toolcontents"), this));
-m_xDropTargetHelper.reset(new SvxConfigPageFunctionDropTarget(*this,
m_xContentsListBox->get_widget()));
+m_xContentsListBox.reset(
+new
SvxToolbarEntriesListBox(m_xBuilder->weld_tree_view("toolcontents"), this));
+m_xDropTargetHelper.reset(
+new SvxConfigPageFunctionDropTarget(*this,
m_xContentsListBox->get_widget()));
weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
Size aSize(m_xFunctions->get_size_request());
@@ -58,44 +62,38 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container*
pPage, weld::DialogC
rTreeView.set_hexpand(true);
rTreeView.set_vexpand(true);
-rTreeView.set_help_id( HID_SVX_CONFIG_TOOLBAR_CONTENTS );
+rTreeView.set_help_id(HID_SVX_CONFIG_TOOLBAR_CONTENTS);
rTreeView.show();
-rTreeView.connect_changed(
-LINK( this, SvxToolbarConfigPage, SelectToolbarEntry ) );
-rTreeView.connect_popup_menu( LINK( this, SvxToolbarConfigPage,
ContentContextMenuHdl ) );
+rTreeView.connect_changed(LINK(this, SvxToolbarConfigPage,
SelectToolbarEntry));
+rTreeView.connect_popup_menu(LINK(this, SvxToolbarConfigPage,
ContentContextMenuHdl));
m_xFunctions->get_widget().connect_popup_menu(
-LINK( this, SvxToolbarConfigPage, FunctionContextMenuHdl ) );
+LINK(this, SvxToolbarConfigPage, FunctionContextMenuHdl));
-m_xTopLevelListBox->set_help_id ( HID_SVX_TOPLEVELLISTBOX );
-m_xSaveInListBox->set_help_id( HID_SVX_SAVE_IN );
-m_xMoveUpButton->set_help_id( HID_SVX_UP_TOOLBAR_ITEM );
-m_xMoveDownButton->set_help_id( HID_SVX_DOWN_TOOLBAR_ITEM );
-m_xDescriptionField->set_help_id ( HID_SVX_DESCFIELD );
+m_xTopLevelListBox->set_help_id(HID_SVX_TOPLEVELLISTBOX);
+m_xSaveInListBox->set_help_id(HID_SVX_SAVE_IN);
+m_xMoveUpButton->set_help_id(HID_SVX_UP_TOOLBAR_ITEM);
+m_xMoveDownButton->set_help_id(HID_SVX_DOWN_TOOLBAR_ITEM);
+m_xDescriptionField->set_help_id(HID_SVX_DESCFIELD);
-m_xCommandCategoryListBox->connect_changed(
-LINK( this, SvxToolbarConfigPage, SelectCategory ) );
+m_xCommandCategoryListBox->connect_changed(LINK(this,
SvxToolbarConfigPage, SelectCategory));
-m_xGearBtn->connect_selected(
-LINK( this, SvxToolbarConfigPage, GearHdl ) );
+m_xGearBtn->connect_selected(LINK(this, SvxToolbarConfigPage, GearHdl));
-m_xMoveUpButton->connect_clicked( LINK( this, SvxToolbarConfigPage,
MoveHdl) );
-m_xMoveDownButton->connect_clicked( LINK( this, SvxToolbarConfigPage,
MoveHdl) );
+m_xMoveUpButton->connect_clicked(LINK(this, SvxToolbarConfigPage,
MoveHdl));
+m_xMoveDownButton->connect_clicked(LINK(this, SvxToolbarConfigPage,
MoveHdl));
// Always enable Up and Down buttons
// added for issue i53677 by shizhoubo
m_xMoveDownButton->set_sensitive(true);
m_xMoveUpButton->set_sensitive(true);
-m_xAddCommandButton->connect_clicked( LINK( this, SvxToolbarConfigPage,
AddCommandHdl ) );
-m_xRemoveCommandButton->connect_clicked( LINK( this, SvxToolbarConfigPage,
RemoveCommandHdl ) );
+m_xAddCommandButton->connect_clicked(LINK(this, SvxToolbarConfigPage,
AddCommandHdl));
+m_xRemoveCommandButton->connect_clicked(LINK(this, SvxToolbarConfigPage,
RemoveCommandHdl));
-m_xInsertBtn->connect_selected(
-LINK( this, SvxToolbarConfigPage, InsertHdl ) );
-
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/customize/SvxMenuConfigPage.cxx | 245 ++---
cui/source/inc/SvxMenuConfigPage.hxx | 47 ++---
solenv/clang-format/excludelist|2
3 files changed, 144 insertions(+), 150 deletions(-)
New commits:
commit e190529f40988bbeb23b7b3abaeca6900f96213f
Author: Muhammet Kara
AuthorDate: Sun Oct 18 18:55:37 2020 +0300
Commit: Muhammet Kara
CommitDate: Sun Oct 18 20:53:59 2020 +0200
clang-format customize/SvxMenuConfigPage
Change-Id: I9ad8012d31c8e727fa4c8c840f15a93ca47541cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104483
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx
b/cui/source/customize/SvxMenuConfigPage.cxx
index d3fed61015a2..3181a78bbb07 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -36,13 +36,15 @@
#include
-SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet, bool bIsMenuBar)
+SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage,
weld::DialogController* pController,
+ const SfxItemSet& rSet, bool bIsMenuBar)
: SvxConfigPage(pPage, pController, rSet)
, m_bIsMenuBar(bIsMenuBar)
{
m_xGearBtn = m_xBuilder->weld_menu_button("menugearbtn");
m_xGearBtn->show();
-m_xContentsListBox.reset(new
SvxMenuEntriesListBox(m_xBuilder->weld_tree_view("menucontents"), this));
+m_xContentsListBox.reset(
+new SvxMenuEntriesListBox(m_xBuilder->weld_tree_view("menucontents"),
this));
weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
m_xDropTargetHelper.reset(new SvxConfigPageFunctionDropTarget(*this,
rTreeView));
rTreeView.connect_size_allocate(LINK(this, SvxMenuConfigPage,
MenuEntriesSizeAllocHdl));
@@ -53,36 +55,32 @@ SvxMenuConfigPage::SvxMenuConfigPage(weld::Container*
pPage, weld::DialogControl
rTreeView.set_vexpand(true);
rTreeView.show();
-rTreeView.connect_changed(
-LINK( this, SvxMenuConfigPage, SelectMenuEntry ) );
-rTreeView.connect_popup_menu( LINK( this, SvxMenuConfigPage,
ContentContextMenuHdl ) );
+rTreeView.connect_changed(LINK(this, SvxMenuConfigPage, SelectMenuEntry));
+rTreeView.connect_popup_menu(LINK(this, SvxMenuConfigPage,
ContentContextMenuHdl));
m_xFunctions->get_widget().connect_popup_menu(
-LINK( this, SvxMenuConfigPage, FunctionContextMenuHdl ) );
+LINK(this, SvxMenuConfigPage, FunctionContextMenuHdl));
m_xGearBtn->connect_selected(LINK(this, SvxMenuConfigPage, GearHdl));
m_xCommandCategoryListBox->connect_changed(LINK(this, SvxMenuConfigPage,
SelectCategory));
-m_xMoveUpButton->connect_clicked( LINK( this, SvxConfigPage, MoveHdl) );
-m_xMoveDownButton->connect_clicked( LINK( this, SvxConfigPage, MoveHdl) );
+m_xMoveUpButton->connect_clicked(LINK(this, SvxConfigPage, MoveHdl));
+m_xMoveDownButton->connect_clicked(LINK(this, SvxConfigPage, MoveHdl));
-m_xAddCommandButton->connect_clicked( LINK( this, SvxMenuConfigPage,
AddCommandHdl ) );
-m_xRemoveCommandButton->connect_clicked( LINK( this, SvxMenuConfigPage,
RemoveCommandHdl ) );
+m_xAddCommandButton->connect_clicked(LINK(this, SvxMenuConfigPage,
AddCommandHdl));
+m_xRemoveCommandButton->connect_clicked(LINK(this, SvxMenuConfigPage,
RemoveCommandHdl));
-m_xInsertBtn->connect_selected(
-LINK( this, SvxMenuConfigPage, InsertHdl ) );
-m_xModifyBtn->connect_selected(
-LINK( this, SvxMenuConfigPage, ModifyItemHdl ) );
-m_xResetBtn->connect_clicked(
-LINK( this, SvxMenuConfigPage, ResetMenuHdl ) );
+m_xInsertBtn->connect_selected(LINK(this, SvxMenuConfigPage, InsertHdl));
+m_xModifyBtn->connect_selected(LINK(this, SvxMenuConfigPage,
ModifyItemHdl));
+m_xResetBtn->connect_clicked(LINK(this, SvxMenuConfigPage, ResetMenuHdl));
// These operations are not possible on menus/context menus yet
m_xModifyBtn->remove_item("changeIcon");
m_xModifyBtn->remove_item("resetIcon");
m_xModifyBtn->remove_item("restoreItem");
-if ( !bIsMenuBar )
+if (!bIsMenuBar)
{
//TODO: Remove this when the gear button is implemented for context
menus
m_xGearBtn->set_sensitive(false);
@@ -102,7 +100,8 @@ void SvxMenuConfigPage::ListModified()
pEntries->clear();
for (int i = 0; i < m_xContentsListBox->n_children(); ++i)
-
pEntries->push_back(reinterpret_cast(m_xContentsListBox->get_id(i).toInt64()));
+pEntries->push_back(
+
reinterpret_cast(m_xContentsListBox->get_id(i).toInt64()));
GetSaveInData()->SetModified();
GetTopLevelSelection()->SetModified();
@@ -140,36 +139,32 @@ void SvxMenuConfigPage::Init()
m_xTopLevelListBox->set_active(0);
SelectElement();
-m_xCommandCategoryListBox->Init(
-
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/customize/SvxConfigPageHelper.cxx | 224 ---
cui/source/inc/SvxConfigPageHelper.hxx | 77 +++--
solenv/clang-format/excludelist |2
3 files changed, 132 insertions(+), 171 deletions(-)
New commits:
commit 11485a500196af7a2533787f4faf32e14693f480
Author: Muhammet Kara
AuthorDate: Sun Oct 18 17:15:45 2020 +0300
Commit: Muhammet Kara
CommitDate: Sun Oct 18 17:43:53 2020 +0200
clang-format customize/SvxConfigPageHelper
Change-Id: Ia802bfc4a6cd8d970fbb3c37a55959729ea19257
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104481
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx
b/cui/source/customize/SvxConfigPageHelper.cxx
index 033219f4d9a0..d54bb7cdaf1a 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -27,52 +27,43 @@
#include
#include
-static sal_Int16 theImageType =
-css::ui::ImageType::COLOR_NORMAL |
-css::ui::ImageType::SIZE_DEFAULT;
+static sal_Int16 theImageType = css::ui::ImageType::COLOR_NORMAL |
css::ui::ImageType::SIZE_DEFAULT;
-void SvxConfigPageHelper::RemoveEntry( SvxEntries* pEntries, SvxConfigEntry
const * pChildEntry )
+void SvxConfigPageHelper::RemoveEntry(SvxEntries* pEntries, SvxConfigEntry
const* pChildEntry)
{
SvxEntries::iterator iter = pEntries->begin();
-while ( iter != pEntries->end() )
+while (iter != pEntries->end())
{
-if ( pChildEntry == *iter )
+if (pChildEntry == *iter)
{
-pEntries->erase( iter );
+pEntries->erase(iter);
break;
}
++iter;
}
}
-OUString SvxConfigPageHelper::replaceSaveInName( const OUString& rMessage,
const OUString& rSaveInName )
+OUString SvxConfigPageHelper::replaceSaveInName(const OUString& rMessage,
+const OUString& rSaveInName)
{
OUString name = rMessage.replaceFirst("%SAVE IN SELECTION%", rSaveInName);
return name;
}
-OUString SvxConfigPageHelper::stripHotKey( const OUString& str )
-{
-return str.replaceFirst("~", "");
-}
+OUString SvxConfigPageHelper::stripHotKey(const OUString& str) { return
str.replaceFirst("~", ""); }
-OUString SvxConfigPageHelper::replaceSixteen( const OUString& str, sal_Int32
nReplacement )
+OUString SvxConfigPageHelper::replaceSixteen(const OUString& str, sal_Int32
nReplacement)
{
-return str.replaceAll( OUString::number( 16 ), OUString::number(
nReplacement ));
+return str.replaceAll(OUString::number(16),
OUString::number(nReplacement));
}
-sal_Int16 SvxConfigPageHelper::GetImageType()
-{
-return theImageType;
-}
+sal_Int16 SvxConfigPageHelper::GetImageType() { return theImageType; }
void SvxConfigPageHelper::InitImageType()
{
-theImageType =
-css::ui::ImageType::COLOR_NORMAL |
-css::ui::ImageType::SIZE_DEFAULT;
+theImageType = css::ui::ImageType::COLOR_NORMAL |
css::ui::ImageType::SIZE_DEFAULT;
if (SvtMiscOptions().GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE)
{
@@ -84,30 +75,29 @@ void SvxConfigPageHelper::InitImageType()
}
}
-css::uno::Reference< css::graphic::XGraphic > SvxConfigPageHelper::GetGraphic(
-const css::uno::Reference< css::ui::XImageManager >& xImageManager,
-const OUString& rCommandURL )
+css::uno::Reference
+SvxConfigPageHelper::GetGraphic(const
css::uno::Reference& xImageManager,
+const OUString& rCommandURL)
{
-css::uno::Reference< css::graphic::XGraphic > result;
+css::uno::Reference result;
-if ( xImageManager.is() )
+if (xImageManager.is())
{
// TODO handle large graphics
-css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >
aGraphicSeq;
+css::uno::Sequence>
aGraphicSeq;
-css::uno::Sequence aImageCmdSeq { rCommandURL };
+css::uno::Sequence aImageCmdSeq{ rCommandURL };
try
{
-aGraphicSeq =
-xImageManager->getImages( GetImageType(), aImageCmdSeq );
+aGraphicSeq = xImageManager->getImages(GetImageType(),
aImageCmdSeq);
-if ( aGraphicSeq.hasElements() )
+if (aGraphicSeq.hasElements())
{
-result = aGraphicSeq[0];
+result = aGraphicSeq[0];
}
}
-catch ( css::uno::Exception& )
+catch (css::uno::Exception&)
{
// will return empty XGraphic
}
@@ -116,22 +106,19 @@ css::uno::Reference< css::graphic::XGraphic >
SvxConfigPageHelper::GetGraphic(
return result;
}
-OUString
-SvxConfigPageHelper::generateCustomName(
-const OUString& prefix,
-SvxEntries* entries,
-sal_Int32 suffix /*= 1*/ )
+OUString SvxConfigPageHelper::generateCustomName(const OUString& prefix,
SvxEntries* entries,
+
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/customize/CommandCategoryListBox.cxx | 309 +---
cui/source/inc/CommandCategoryListBox.hxx | 50 ++-
solenv/clang-format/excludelist |2
3 files changed, 196 insertions(+), 165 deletions(-)
New commits:
commit 2242774bc8a35cda736d65d0f4b647cf394ca6ee
Author: Muhammet Kara
AuthorDate: Sun Oct 18 16:21:59 2020 +0300
Commit: Muhammet Kara
CommitDate: Sun Oct 18 16:08:31 2020 +0200
clang-format CommandCategoryListBox
Change-Id: If7ae64a0b9be01b3fa73310a4d9834ae3c151c10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104479
Reviewed-by: Yusuf Keten
Reviewed-by: Muhammet Kara
Tested-by: Jenkins
diff --git a/cui/source/customize/CommandCategoryListBox.cxx
b/cui/source/customize/CommandCategoryListBox.cxx
index 1337c3dd48dd..5b8903f3d199 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -51,39 +51,36 @@
#include //for SaveInData
CommandCategoryListBox::CommandCategoryListBox(std::unique_ptr
xControl)
-: pStylesInfo( nullptr )
+: pStylesInfo(nullptr)
, m_xControl(std::move(xControl))
{
//Initialize search util
m_searchOptions.AlgorithmType2 = css::util::SearchAlgorithms2::ABSOLUTE;
m_searchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE;
m_searchOptions.searchFlag |= (css::util::SearchFlags::REG_NOT_BEGINOFLINE
-| css::util::SearchFlags::REG_NOT_ENDOFLINE);
+ |
css::util::SearchFlags::REG_NOT_ENDOFLINE);
}
-CommandCategoryListBox::~CommandCategoryListBox()
-{
-ClearAll();
-}
+CommandCategoryListBox::~CommandCategoryListBox() { ClearAll(); }
void CommandCategoryListBox::ClearAll()
{
// Clear objects from m_aGroupInfo vector to avoid memory leak
-for (const auto & It : m_aGroupInfo)
+for (const auto& It : m_aGroupInfo)
{
-if ( It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject )
+if (It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject)
{
SfxStyleInfo_Impl* pStyle =
static_cast(It->pObject);
delete pStyle;
}
-else if ( It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject )
+else if (It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject)
{
OUString* pScriptURI = static_cast(It->pObject);
delete pScriptURI;
}
-else if ( It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER &&
It->pObject)
+else if (It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER && It->pObject)
{
-css::uno::XInterface* xi = static_cast(It->pObject);
+css::uno::XInterface* xi =
static_cast(It->pObject);
if (xi != nullptr)
{
xi->release();
@@ -95,10 +92,9 @@ void CommandCategoryListBox::ClearAll()
m_xControl->clear();
}
-void CommandCategoryListBox::Init(
-const css::uno::Reference< css::uno::XComponentContext >& xContext,
-const css::uno::Reference< css::frame::XFrame >& xFrame,
-const OUString& sModuleLongName)
+void CommandCategoryListBox::Init(const
css::uno::Reference& xContext,
+ const
css::uno::Reference& xFrame,
+ const OUString& sModuleLongName)
{
// User will not see incomplete UI
m_xControl->freeze();
@@ -108,9 +104,10 @@ void CommandCategoryListBox::Init(
m_xFrame = xFrame;
m_sModuleLongName = sModuleLongName;
-m_xGlobalCategoryInfo = css::ui::theUICategoryDescription::get( m_xContext
);
-
m_xModuleCategoryInfo.set(m_xGlobalCategoryInfo->getByName(m_sModuleLongName),
css::uno::UNO_QUERY_THROW);
-m_xUICmdDescription = css::frame::theUICommandDescription::get(
m_xContext );
+m_xGlobalCategoryInfo = css::ui::theUICategoryDescription::get(m_xContext);
+
m_xModuleCategoryInfo.set(m_xGlobalCategoryInfo->getByName(m_sModuleLongName),
+ css::uno::UNO_QUERY_THROW);
+m_xUICmdDescription = css::frame::theUICommandDescription::get(m_xContext);
// Support style commands
css::uno::Reference xController;
@@ -125,16 +122,20 @@ void CommandCategoryListBox::Init(
try
{
-css::uno::Reference< css::frame::XDispatchInformationProvider >
xProvider(m_xFrame, css::uno::UNO_QUERY_THROW);
-css::uno::Sequence< sal_Int16 > lGroups =
xProvider->getSupportedCommandGroups();
+css::uno::Reference
xProvider(
+m_xFrame, css::uno::UNO_QUERY_THROW);
+css::uno::Sequence lGroups =
xProvider->getSupportedCommandGroups();
sal_Int32 nGroupsLength = lGroups.getLength();
-if ( nGroupsLength > 0 )
+if (nGroupsLength > 0)
{
// Add the category of "All commands"
-m_aGroupInfo.push_back( std::make_unique(
SfxCfgKind::GROUP_ALLFUNCTIONS, 0 )
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/customize/acccfg.cxx | 1645
cui/source/inc/acccfg.hxx | 149 +--
solenv/clang-format/blacklist |2
3 files changed, 900 insertions(+), 896 deletions(-)
New commits:
commit 472d5cfb11bc68779f9e1754a22e4d93725ea255
Author: Muhammet Kara
AuthorDate: Sat Mar 7 19:16:24 2020 +0300
Commit: Muhammet Kara
CommitDate: Sat Mar 7 21:57:08 2020 +0100
remove acccfg.{cxx,hxx} from clang-format blacklist
Change-Id: Iaa85fe6332f057642dfd01eee7a1d2b1e27c49b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90168
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 98f67d601025..7e0a4820fc2e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
// include own files
#include
@@ -35,7 +34,6 @@
#include
#include
-
// include interface declarations
#include
#include
@@ -67,713 +65,712 @@
using namespace css;
-static const char FOLDERNAME_UICONFIG [] = "Configurations2";
-
-static const char MEDIATYPE_PROPNAME[] = "MediaType";
-
-static const sal_uInt16 KEYCODE_ARRAY[] =
-{
-KEY_F1,
-KEY_F2,
-KEY_F3,
-KEY_F4,
-KEY_F5,
-KEY_F6,
-KEY_F7,
-KEY_F8,
-KEY_F9,
-KEY_F10,
-KEY_F11,
-KEY_F12,
-KEY_F13,
-KEY_F14,
-KEY_F15,
-KEY_F16,
-
-KEY_DOWN,
-KEY_UP,
-KEY_LEFT,
-KEY_RIGHT,
-KEY_HOME,
-KEY_END,
-KEY_PAGEUP,
-KEY_PAGEDOWN,
-KEY_RETURN,
-KEY_ESCAPE,
-KEY_BACKSPACE,
-KEY_INSERT,
-KEY_DELETE,
-
-KEY_OPEN,
-KEY_CUT,
-KEY_COPY,
-KEY_PASTE,
-KEY_UNDO,
-KEY_REPEAT,
-KEY_FIND,
-KEY_PROPERTIES,
-KEY_FRONT,
-KEY_CONTEXTMENU,
-KEY_MENU,
-KEY_HELP,
-
-KEY_SHIFT | KEY_F1,
-KEY_SHIFT | KEY_F2,
-KEY_SHIFT | KEY_F3,
-KEY_SHIFT | KEY_F4,
-KEY_SHIFT | KEY_F5,
-KEY_SHIFT | KEY_F6,
-KEY_SHIFT | KEY_F7,
-KEY_SHIFT | KEY_F8,
-KEY_SHIFT | KEY_F9,
-KEY_SHIFT | KEY_F10,
-KEY_SHIFT | KEY_F11,
-KEY_SHIFT | KEY_F12,
-KEY_SHIFT | KEY_F13,
-KEY_SHIFT | KEY_F14,
-KEY_SHIFT | KEY_F15,
-KEY_SHIFT | KEY_F16,
-
-KEY_SHIFT | KEY_DOWN,
-KEY_SHIFT | KEY_UP,
-KEY_SHIFT | KEY_LEFT,
-KEY_SHIFT | KEY_RIGHT,
-KEY_SHIFT | KEY_HOME,
-KEY_SHIFT | KEY_END,
-KEY_SHIFT | KEY_PAGEUP,
-KEY_SHIFT | KEY_PAGEDOWN,
-KEY_SHIFT | KEY_RETURN,
-KEY_SHIFT | KEY_SPACE,
-KEY_SHIFT | KEY_ESCAPE,
-KEY_SHIFT | KEY_BACKSPACE,
-KEY_SHIFT | KEY_INSERT,
-KEY_SHIFT | KEY_DELETE,
-KEY_SHIFT | KEY_EQUAL,
-
-KEY_MOD1 | KEY_0,
-KEY_MOD1 | KEY_1,
-KEY_MOD1 | KEY_2,
-KEY_MOD1 | KEY_3,
-KEY_MOD1 | KEY_4,
-KEY_MOD1 | KEY_5,
-KEY_MOD1 | KEY_6,
-KEY_MOD1 | KEY_7,
-KEY_MOD1 | KEY_8,
-KEY_MOD1 | KEY_9,
-KEY_MOD1 | KEY_A,
-KEY_MOD1 | KEY_B,
-KEY_MOD1 | KEY_C,
-KEY_MOD1 | KEY_D,
-KEY_MOD1 | KEY_E,
-KEY_MOD1 | KEY_F,
-KEY_MOD1 | KEY_G,
-KEY_MOD1 | KEY_H,
-KEY_MOD1 | KEY_I,
-KEY_MOD1 | KEY_J,
-KEY_MOD1 | KEY_K,
-KEY_MOD1 | KEY_L,
-KEY_MOD1 | KEY_M,
-KEY_MOD1 | KEY_N,
-KEY_MOD1 | KEY_O,
-KEY_MOD1 | KEY_P,
-KEY_MOD1 | KEY_Q,
-KEY_MOD1 | KEY_R,
-KEY_MOD1 | KEY_S,
-KEY_MOD1 | KEY_T,
-KEY_MOD1 | KEY_U,
-KEY_MOD1 | KEY_V,
-KEY_MOD1 | KEY_W,
-KEY_MOD1 | KEY_X,
-KEY_MOD1 | KEY_Y,
-KEY_MOD1 | KEY_Z,
-KEY_MOD1 | KEY_SEMICOLON,
-KEY_MOD1 | KEY_QUOTERIGHT,
-KEY_MOD1 | KEY_BRACKETLEFT,
-KEY_MOD1 | KEY_BRACKETRIGHT,
-KEY_MOD1 | KEY_POINT,
-KEY_MOD1 | KEY_COMMA,
-KEY_MOD1 | KEY_TILDE,
-KEY_MOD1 | KEY_TAB,
-
-KEY_MOD1 | KEY_F1,
-KEY_MOD1 | KEY_F2,
-KEY_MOD1 | KEY_F3,
-KEY_MOD1 | KEY_F4,
-KEY_MOD1 | KEY_F5,
-KEY_MOD1 | KEY_F6,
-KEY_MOD1 | KEY_F7,
-KEY_MOD1 | KEY_F8,
-KEY_MOD1 | KEY_F9,
-KEY_MOD1 | KEY_F10,
-KEY_MOD1 | KEY_F11,
-KEY_MOD1 | KEY_F12,
-KEY_MOD1 | KEY_F13,
-KEY_MOD1 | KEY_F14,
-KEY_MOD1 | KEY_F15,
-KEY_MOD1 | KEY_F16,
-
-KEY_MOD1 | KEY_DOWN,
-KEY_MOD1 | KEY_UP,
-KEY_MOD1 | KEY_LEFT,
-KEY_MOD1 | KEY_RIGHT,
-KEY_MOD1 | KEY_HOME,
-KEY_MOD1 | KEY_END,
-KEY_MOD1 | KEY_PAGEUP,
-KEY_MOD1 | KEY_PAGEDOWN,
-KEY_MOD1 | KEY_RETURN,
-KEY_MOD1 | KEY_SPACE,
-KEY_MOD1 | KEY_BACKSPACE,
-KEY_MOD1 | KEY_INSERT,
-KEY_MOD1 | KEY_DELETE,
-
-KEY_MOD1 | KEY_ADD,
-KEY_MOD1 | KEY_SUBTRACT,
-KEY_MOD1 | KEY_MULTIPLY,
-KEY_MOD1 | KEY_DIVIDE,
-KEY_MOD1 | KEY_EQUAL,
-
-KEY_SHIFT | KEY_MOD1 | KEY_0,
-KEY_SHIFT | KEY_MOD1 | KEY_1,
-KEY_SHIFT | KEY_MOD1 | KEY_2,
-KEY_SHIFT | KEY_MOD1 | KEY_3,
-KEY_SHIFT | KEY_MOD1 | KEY_4,
-KEY_SHIFT | KEY_MOD1 | KEY_5,
-KEY_SHIFT | KEY_MOD1 | KEY_6,
-KEY_SHIFT | KEY_MOD1 |
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/dialogs/dlgname.cxx |2 +-
cui/source/dialogs/zoom.cxx | 39 ---
cui/source/inc/about.hxx|4 ++--
cui/source/inc/dialmgr.hxx |2 +-
cui/source/inc/newtabledlg.hxx |1 -
cui/source/inc/showcols.hxx |4 ++--
cui/source/options/certpath.hxx |2 +-
cui/source/options/tsaurls.hxx |2 +-
solenv/clang-format/blacklist |8
9 files changed, 28 insertions(+), 36 deletions(-)
New commits:
commit e9152974af2598856ab57268cb02c363f8730579
Author: Muhammet Kara
AuthorDate: Fri Feb 7 01:46:25 2020 +0300
Commit: Muhammet Kara
CommitDate: Fri Feb 7 08:06:24 2020 +0100
clang-format cui with under 5-percent lines of change
Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i
There will be follow-up patches to fix all 'under-5-percent' files.
Change-Id: I2886b6da85043218505ff9f3e40a8e28289c6f37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88152
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 0e201d5e22dd..133f1753fecd 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -77,7 +77,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl, weld::Entry&,
void)
// Dialog for editing Object Title and Description
SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(weld::Window* pParent,
const OUString& rTitle,
-const OUString& rDescription)
+ const OUString&
rDescription)
: GenericDialogController(pParent, "cui/ui/objecttitledescdialog.ui",
"ObjectTitleDescDialog")
, m_xEdtTitle(m_xBuilder->weld_entry("object_title_entry"))
, m_xEdtDescription(m_xBuilder->weld_text_view("desc_entry"))
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 380ad1404da4..b80080dfa352 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -28,7 +28,6 @@
namespace
{
-
const sal_uInt16 SPECIAL_FACTOR = 0x;
} // anonymous namespace
@@ -50,7 +49,7 @@ void SvxZoomDialog::SetFactor(sal_uInt16 nNewFactor,
ZoomButtonId nButtonId)
if (nButtonId == ZoomButtonId::NONE)
{
-if ( nNewFactor == 100 )
+if (nNewFactor == 100)
{
m_x100Btn->set_active(true);
m_x100Btn->grab_focus();
@@ -66,7 +65,7 @@ void SvxZoomDialog::SetFactor(sal_uInt16 nNewFactor,
ZoomButtonId nButtonId)
else
{
m_xUserEdit->set_value(nNewFactor, FieldUnit::PERCENT);
-switch(nButtonId)
+switch (nButtonId)
{
case ZoomButtonId::OPTIMAL:
{
@@ -86,7 +85,8 @@ void SvxZoomDialog::SetFactor(sal_uInt16 nNewFactor,
ZoomButtonId nButtonId)
m_xWholePageBtn->grab_focus();
break;
}
-default: break;
+default:
+break;
}
}
}
@@ -108,7 +108,7 @@ void SvxZoomDialog::HideButton(ZoomButtonId nButtonId)
break;
default:
-OSL_FAIL("Wrong button number!" );
+OSL_FAIL("Wrong button number!");
}
}
@@ -118,10 +118,7 @@ void SvxZoomDialog::SetLimits(sal_uInt16 nMin, sal_uInt16
nMax)
m_xUserEdit->set_range(nMin, nMax, FieldUnit::PERCENT);
}
-const SfxItemSet* SvxZoomDialog::GetOutputItemSet() const
-{
-return m_pOutSet.get();
-}
+const SfxItemSet* SvxZoomDialog::GetOutputItemSet() const { return
m_pOutSet.get(); }
SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet)
: SfxDialogController(pParent, "cui/ui/zoomdialog.ui", "ZoomDialog")
@@ -141,22 +138,24 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const
SfxItemSet& rCoreSet)
, m_xBookModeChk(m_xBuilder->weld_check_button("bookmode"))
, m_xOKBtn(m_xBuilder->weld_button("ok"))
{
-Link aLink = LINK(this, SvxZoomDialog, UserHdl);
+Link aLink = LINK(this, SvxZoomDialog, UserHdl);
m_x100Btn->connect_toggled(aLink);
m_xOptimalBtn->connect_toggled(aLink);
m_xPageWidthBtn->connect_toggled(aLink);
m_xWholePageBtn->connect_toggled(aLink);
m_xUserBtn->connect_toggled(aLink);
-Link aViewLayoutLink = LINK(this, SvxZoomDialog,
ViewLayoutUserHdl);
+Link aViewLayoutLink = LINK(this,
SvxZoomDialog, ViewLayoutUserHdl);
m_xAutomaticBtn->connect_toggled(aViewLayoutLink);
m_xSingleBtn->connect_toggled(aViewLayoutLink);
m_xColumnsBtn->connect_toggled(aViewLayoutLink);
-Link aViewLayoutSpinLink = LINK(this,
SvxZoomDialog, ViewLayoutSpinHdl);
+Link aViewLayoutSpinLink
+= LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
[Libreoffice-commits] core.git: cui/source solenv/clang-format
cui/source/options/personalization.cxx | 111 ++---
cui/source/options/personalization.hxx | 24 +++
solenv/clang-format/blacklist |2
3 files changed, 61 insertions(+), 76 deletions(-)
New commits:
commit 4c1479d63972aaea0b1bfee1ffb56b530ca05655
Author: Muhammet Kara
AuthorDate: Thu May 23 00:41:44 2019 +0300
Commit: Muhammet Kara
CommitDate: Thu May 23 18:21:06 2019 +0200
clang-format SvxPersonalizationTabPage
Now is the time to get it out of the blacklist
since it is a tiny class again.
And also remove some leftovers.
Change-Id: Ia38dd3054ddefa43a7e0d917d358e7d9d1b750e4
Reviewed-on: https://gerrit.libreoffice.org/72837
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 0ab9a28fecc8..e9d9380065d1 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -43,100 +43,90 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::beans;
-struct PersonaInfo
-{
-OUString sSlug;
-OUString sName;
-OUString sPreviewURL;
-OUString sHeaderURL;
-OUString sFooterURL;
-OUString sTextColor;
-};
-
-SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent,
const SfxItemSet )
-: SfxTabPage( pParent, "PersonalizationTabPage",
"cui/ui/personalization_tab.ui", )
+SvxPersonalizationTabPage::SvxPersonalizationTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
+: SfxTabPage(pParent, "PersonalizationTabPage",
"cui/ui/personalization_tab.ui", )
{
// persona
-get( m_pNoPersona, "no_persona" );
-get( m_pDefaultPersona, "default_persona" );
+get(m_pNoPersona, "no_persona");
+get(m_pDefaultPersona, "default_persona");
for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
{
OUString sDefaultId("default" + OUString::number(i));
-get( m_vDefaultPersonaImages[i], OUStringToOString(sDefaultId,
RTL_TEXTENCODING_UTF8) );
-m_vDefaultPersonaImages[i]->SetClickHdl( LINK( this,
SvxPersonalizationTabPage, DefaultPersona ) );
+get(m_vDefaultPersonaImages[i], OUStringToOString(sDefaultId,
RTL_TEXTENCODING_UTF8));
+m_vDefaultPersonaImages[i]->SetClickHdl(
+LINK(this, SvxPersonalizationTabPage, DefaultPersona));
}
LoadDefaultImages();
}
-SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
-{
-disposeOnce();
-}
+SvxPersonalizationTabPage::~SvxPersonalizationTabPage() { disposeOnce(); }
void SvxPersonalizationTabPage::dispose()
{
m_pNoPersona.clear();
m_pDefaultPersona.clear();
-for (VclPtr & i : m_vDefaultPersonaImages)
+for (VclPtr& i : m_vDefaultPersonaImages)
i.clear();
SfxTabPage::dispose();
}
-
-VclPtr SvxPersonalizationTabPage::Create( TabPageParent pParent,
const SfxItemSet *rSet )
+VclPtr SvxPersonalizationTabPage::Create(TabPageParent pParent,
const SfxItemSet* rSet)
{
-return VclPtr::Create( pParent.pParent, *rSet );
+return VclPtr::Create(pParent.pParent, *rSet);
}
-bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
+bool SvxPersonalizationTabPage::FillItemSet(SfxItemSet*)
{
// persona
-OUString aPersona( "default" );
-if ( m_pNoPersona->IsChecked() )
+OUString aPersona("default");
+if (m_pNoPersona->IsChecked())
aPersona = "no";
bool bModified = false;
-uno::Reference< uno::XComponentContext > xContext(
comphelper::getProcessComponentContext() );
-if ( xContext.is() &&
-( aPersona != officecfg::Office::Common::Misc::Persona::get(
xContext ) ||
- m_aPersonaSettings !=
officecfg::Office::Common::Misc::PersonaSettings::get( xContext ) ) )
+uno::Reference
xContext(comphelper::getProcessComponentContext());
+if (xContext.is()
+&& (aPersona != officecfg::Office::Common::Misc::Persona::get(xContext)
+|| m_aPersonaSettings
+ !=
officecfg::Office::Common::Misc::PersonaSettings::get(xContext)))
{
bModified = true;
}
// write
-std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create() );
-if( aPersona == "no" )
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+if (aPersona == "no")
m_aPersonaSettings.clear();
-officecfg::Office::Common::Misc::Persona::set( aPersona, batch );
-officecfg::Office::Common::Misc::PersonaSettings::set( m_aPersonaSettings,
batch );
+officecfg::Office::Common::Misc::Persona::set(aPersona, batch);
+officecfg::Office::Common::Misc::PersonaSettings::set(m_aPersonaSettings,
batch);
batch->commit();
-if ( bModified )
+if (bModified)
{
// broadcast the change
-DataChangedEvent aDataChanged(
