strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove acccfg.{cxx,hxx} from clang-format blacklist

Browse source 
Change-Id: Iaa85fe6332f057642dfd01eee7a1d2b1e27c49b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90168
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
This commit is contained in:
Muhammet Kara 2020-03-07 19:16:24 +03:00
parent 40efd21770
commit 472d5cfb11
3 changed files with 864 additions and 860 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1579
cui/source/customize/acccfg.cxx
View file

File diff suppressed because it is too large Load diff

143
cui/source/inc/acccfg.hxx
View file

@ -38,56 +38,59 @@ class SfxStringItem;
struct TAccInfo
{
public:
TAccInfo( sal_Int32 nKeyPos ,
sal_Int32 nListPos,
const vcl::KeyCode& aKey )
: m_nKeyPos (nKeyPos )
, m_nListPos (nListPos )
, m_bIsConfigurable(true ) /**< it's important to set true as default -
public:
TAccInfo(sal_Int32 nKeyPos, sal_Int32 nListPos, const vcl::KeyCode& aKey)
: m_nKeyPos(nKeyPos)
, m_nListPos(nListPos)
, m_bIsConfigurable(true) /**< it's important to set true as default -
because only fix entries will be disabled later... */
, m_sCommand ( )
, m_aKey (aKey )
{}
, m_sCommand()
, m_aKey(aKey)
{
}
bool isConfigured() const
{
return (m_nKeyPos>-1 && m_nListPos>-1 && !m_sCommand.isEmpty());
}
bool isConfigured() const
{
return (m_nKeyPos > -1 && m_nListPos > -1 && !m_sCommand.isEmpty());
}
sal_Int32 m_nKeyPos;
sal_Int32 m_nListPos;
bool m_bIsConfigurable;
OUString m_sCommand;
vcl::KeyCode m_aKey;
sal_Int32 m_nKeyPos;
sal_Int32 m_nListPos;
bool m_bIsConfigurable;
OUString m_sCommand;
vcl::KeyCode m_aKey;
};
namespace sfx2
{
class FileDialogHelper;
class FileDialogHelper;
}
enum class StartFileDialogType { Open, SaveAs };
enum class StartFileDialogType
{
Open,
SaveAs
};
class SfxAcceleratorConfigPage : public SfxTabPage
{
private:
const SfxMacroInfoItem* m_pMacroInfoItem;
const SfxMacroInfoItem* m_pMacroInfoItem;
std::unique_ptr<sfx2::FileDialogHelper> m_pFileDlg;
OUString aLoadAccelConfigStr;
OUString aSaveAccelConfigStr;
OUString aFilterAllStr;
OUString aFilterCfgStr;
SfxStylesInfo_Impl m_aStylesInfo;
bool m_bStylesInfoInitialized;
OUString aLoadAccelConfigStr;
OUString aSaveAccelConfigStr;
OUString aFilterAllStr;
OUString aFilterCfgStr;
SfxStylesInfo_Impl m_aStylesInfo;
bool m_bStylesInfoInitialized;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal;
css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModule;
css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xAct;
css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
css::uno::Reference< css::frame::XFrame > m_xFrame;
css::uno::Reference<css::uno::XComponentContext> m_xContext;
css::uno::Reference<css::ui::XAcceleratorConfiguration> m_xGlobal;
css::uno::Reference<css::ui::XAcceleratorConfiguration> m_xModule;
css::uno::Reference<css::ui::XAcceleratorConfiguration> m_xAct;
css::uno::Reference<css::container::XNameAccess> m_xUICmdDescription;
css::uno::Reference<css::frame::XFrame> m_xFrame;
OUString m_sModuleLongName;
OUString m_sModuleUIName;
@ -98,54 +101,54 @@ private:
Idle m_aFillGroupIdle;
std::unique_ptr<weld::TreeView> m_xEntriesBox;
std::unique_ptr<weld::RadioButton> m_xOfficeButton;
std::unique_ptr<weld::RadioButton> m_xModuleButton;
std::unique_ptr<weld::Button> m_xChangeButton;
std::unique_ptr<weld::Button> m_xRemoveButton;
std::unique_ptr<weld::TreeView> m_xEntriesBox;
std::unique_ptr<weld::RadioButton> m_xOfficeButton;
std::unique_ptr<weld::RadioButton> m_xModuleButton;
std::unique_ptr<weld::Button> m_xChangeButton;
std::unique_ptr<weld::Button> m_xRemoveButton;
std::unique_ptr<CuiConfigGroupListBox> m_xGroupLBox;
std::unique_ptr<CuiConfigFunctionListBox> m_xFunctionBox;
std::unique_ptr<weld::TreeView> m_xKeyBox;
std::unique_ptr<weld::Entry> m_xSearchEdit;
std::unique_ptr<weld::Button> m_xLoadButton;
std::unique_ptr<weld::Button> m_xSaveButton;
std::unique_ptr<weld::Button> m_xResetButton;
std::unique_ptr<weld::TreeView> m_xKeyBox;
std::unique_ptr<weld::Entry> m_xSearchEdit;
std::unique_ptr<weld::Button> m_xLoadButton;
std::unique_ptr<weld::Button> m_xSaveButton;
std::unique_ptr<weld::Button> m_xResetButton;
DECL_LINK(ChangeHdl, weld::Button&, void);
DECL_LINK(RemoveHdl, weld::Button&, void);
DECL_LINK(SelectHdl, weld::TreeView&, void);
DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
DECL_LINK(Save, weld::Button&, void);
DECL_LINK(Load, weld::Button&, void);
DECL_LINK(Default, weld::Button&, void);
DECL_LINK(RadioHdl, weld::Button&, void);
DECL_LINK(ImplUpdateDataHdl, Timer*, void);
DECL_LINK(FocusOut_Impl, weld::Widget&, void);
DECL_LINK(TimeOut_Impl, Timer*, void);
DECL_LINK(ChangeHdl, weld::Button&, void);
DECL_LINK(RemoveHdl, weld::Button&, void);
DECL_LINK(SelectHdl, weld::TreeView&, void);
DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
DECL_LINK(Save, weld::Button&, void);
DECL_LINK(Load, weld::Button&, void);
DECL_LINK(Default, weld::Button&, void);
DECL_LINK(RadioHdl, weld::Button&, void);
DECL_LINK(ImplUpdateDataHdl, Timer*, void);
DECL_LINK(FocusOut_Impl, weld::Widget&, void);
DECL_LINK(TimeOut_Impl, Timer*, void);
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
DECL_LINK(LoadHdl, sfx2::FileDialogHelper*, void);
DECL_LINK(SaveHdl, sfx2::FileDialogHelper*, void);
DECL_LINK(LoadHdl, sfx2::FileDialogHelper *, void);
DECL_LINK(SaveHdl, sfx2::FileDialogHelper *, void);
OUString GetLabel4Command(const OUString& rCommand);
int applySearchFilter(OUString const& rSearchTerm);
void InitAccCfg();
sal_Int32 MapKeyCodeToPos(const vcl::KeyCode& rCode) const;
void StartFileDialog(StartFileDialogType nType, const OUString& rTitle);
OUString GetLabel4Command(const OUString& rCommand);
int applySearchFilter(OUString const & rSearchTerm);
void InitAccCfg();
sal_Int32 MapKeyCodeToPos(const vcl::KeyCode &rCode) const;
void StartFileDialog( StartFileDialogType nType, const OUString& rTitle );
void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
void ResetConfig();
void Init(const css::uno::Reference<css::ui::XAcceleratorConfiguration>& pAccMgr);
void ResetConfig();
public:
SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
virtual ~SfxAcceleratorConfigPage() override;
SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rItemSet);
virtual ~SfxAcceleratorConfigPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
virtual bool FillItemSet(SfxItemSet*) override;
virtual void Reset(const SfxItemSet*) override;
void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
void Apply(const css::uno::Reference<css::ui::XAcceleratorConfiguration>& pAccMgr);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
solenv/clang-format/blacklist
View file

@ -2641,7 +2641,6 @@ cui/source/customize/CommandCategoryListBox.cxx
cui/source/customize/SvxConfigPageHelper.cxx
cui/source/customize/SvxMenuConfigPage.cxx
cui/source/customize/SvxToolbarConfigPage.cxx
cui/source/customize/acccfg.cxx
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/eventdlg.cxx
@ -2694,7 +2693,6 @@ cui/source/inc/SpellDialog.hxx
cui/source/inc/SvxConfigPageHelper.hxx
cui/source/inc/SvxMenuConfigPage.hxx
cui/source/inc/SvxToolbarConfigPage.hxx
cui/source/inc/acccfg.hxx
cui/source/inc/align.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx