cui/uiconfig/ui/similaritysearchdialog.ui | 125 ++---
include/svx/srchdlg.hxx | 65 +-
svx/source/dialog/srchdlg.cxx | 700 ++++++++++++++----------------
3 files changed, 436 insertions(+), 454 deletions(-)
New commits:
commit d677acf41dfd219dc796b70e04440c91031eaac6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 29 11:15:47 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 30 07:45:42 2025 +0200
svx: Prefix SvxSearchDialog members with "m_"
Also, use "s" instead of "a" prefix for OUString
members.
Change-Id: I5daa6ee4ad451ed9ba4bb33605a8683458651b85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185993
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 9f5336c2247f..7b874bd9027a 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -131,10 +131,8 @@ public:
// Window
virtual void Activate() override;
- const SearchAttrItemList* GetSearchItemList() const
- { return pSearchList.get(); }
- const SearchAttrItemList* GetReplaceItemList() const
- { return pReplaceList.get(); }
+ const SearchAttrItemList* GetSearchItemList() const { return
m_pSearchList.get(); }
+ const SearchAttrItemList* GetReplaceItemList() const { return
m_pReplaceList.get(); }
TransliterationFlags GetTransliterationFlags() const;
@@ -146,37 +144,36 @@ public:
void Present();
private:
- SfxBindings& rBindings;
+ SfxBindings& m_rBindings;
Timer m_aPresentIdle;
- bool bWriter;
- bool bSearch;
- bool bFormat;
- bool bReplaceBackwards;
- SearchOptionFlags nOptions;
- bool bSet;
- bool bConstruct;
- ModifyFlags nModifyFlag;
- OUString aStylesStr;
- OUString aLayoutStr;
- OUString aLayoutWriterStr;
- OUString aLayoutCalcStr;
- OUString aCalcStr;
- sal_uInt16 nRememberSize;
-
- std::vector<OUString> aSearchStrings;
- std::vector<OUString> aReplaceStrings;
-
- std::unique_ptr<SearchDlg_Impl> pImpl;
- std::unique_ptr<SearchAttrItemList> pSearchList;
- std::unique_ptr<SearchAttrItemList> pReplaceList;
- std::unique_ptr<SvxSearchItem> pSearchItem;
-
- std::unique_ptr<SvxSearchController> pSearchController;
- std::unique_ptr<SvxSearchController> pOptionsController;
- std::unique_ptr<SvxSearchController> pFamilyController;
-
- mutable TransliterationFlags
- nTransliterationFlags;
+ bool m_bWriter;
+ bool m_bSearch;
+ bool m_bFormat;
+ bool m_bReplaceBackwards;
+ SearchOptionFlags m_nOptions;
+ bool m_bSet;
+ bool m_bConstruct;
+ ModifyFlags m_nModifyFlag;
+ OUString m_sStylesStr;
+ OUString m_sLayoutStr;
+ OUString m_sLayoutWriterStr;
+ OUString m_sLayoutCalcStr;
+ OUString m_sCalcStr;
+ sal_uInt16 m_nRememberSize;
+
+ std::vector<OUString> m_aSearchStrings;
+ std::vector<OUString> m_aReplaceStrings;
+
+ std::unique_ptr<SearchDlg_Impl> m_pImpl;
+ std::unique_ptr<SearchAttrItemList> m_pSearchList;
+ std::unique_ptr<SearchAttrItemList> m_pReplaceList;
+ std::unique_ptr<SvxSearchItem> m_pSearchItem;
+
+ std::unique_ptr<SvxSearchController> m_pSearchController;
+ std::unique_ptr<SvxSearchController> m_pOptionsController;
+ std::unique_ptr<SvxSearchController> m_pFamilyController;
+
+ mutable TransliterationFlags m_nTransliterationFlags;
bool m_executingSubDialog = false;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6c85c5f2734f..45f908ce5e5c 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -243,18 +243,18 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
: SfxModelessDialogController(&rBind, pChildWin, pParent,
IsMobile() ?
u"svx/ui/findreplacedialog-mobile.ui"_ustr :
u"svx/ui/findreplacedialog.ui"_ustr,
u"FindReplaceDialog"_ustr)
- , rBindings(rBind)
+ , m_rBindings(rBind)
, m_aPresentIdle("Bring SvxSearchDialog to Foreground")
- , bWriter(false)
- , bSearch(true)
- , bFormat(false)
- , bReplaceBackwards(false)
- , nOptions(SearchOptionFlags::ALL)
- , bSet(false)
- , bConstruct(true)
- , nModifyFlag(ModifyFlags::NONE)
- , pReplaceList(new SearchAttrItemList)
- , nTransliterationFlags(TransliterationFlags::NONE)
+ , m_bWriter(false)
+ , m_bSearch(true)
+ , m_bFormat(false)
+ , m_bReplaceBackwards(false)
+ , m_nOptions(SearchOptionFlags::ALL)
+ , m_bSet(false)
+ , m_bConstruct(true)
+ , m_nModifyFlag(ModifyFlags::NONE)
+ , m_pReplaceList(new SearchAttrItemList)
+ , m_nTransliterationFlags(TransliterationFlags::NONE)
, m_xSearchFrame(m_xBuilder->weld_frame(u"searchframe"_ustr))
, m_xSearchLB(m_xBuilder->weld_combo_box(u"searchterm"_ustr))
, m_xSearchTmplLB(m_xBuilder->weld_combo_box(u"searchlist"_ustr))
@@ -326,15 +326,15 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
m_xReplaceTmplLB->make_sorted();
m_xReplaceAttrText->hide();
- aCalcStr = m_xCalcStrFT->get_label();
+ m_sCalcStr = m_xCalcStrFT->get_label();
//
m_xSimilarityBtn->set_height_request(m_xSimilarityBox->get_preferred_size().Height());
//
m_xJapOptionsBtn->set_height_request(m_xJapOptionsCB->get_preferred_size().Height());
//tdf#122322
- nRememberSize =
officecfg::Office::Common::Misc::FindReplaceRememberedSearches::get();
- if (nRememberSize<1)
- nRememberSize = 1; //0 crashes with no results found
+ m_nRememberSize =
officecfg::Office::Common::Misc::FindReplaceRememberedSearches::get();
+ if (m_nRememberSize < 1)
+ m_nRememberSize = 1; //0 crashes with no results found
auto nTermWidth = m_xSearchLB->get_approximate_digit_width() * 28;
m_xSearchLB->set_size_request(nTermWidth, -1);
@@ -359,70 +359,67 @@ void SvxSearchDialog::Present()
void SvxSearchDialog::ChildWinDispose()
{
- rBindings.EnterRegistrations();
- pSearchController.reset();
- pOptionsController.reset();
- pFamilyController.reset();
- rBindings.LeaveRegistrations();
+ m_rBindings.EnterRegistrations();
+ m_pSearchController.reset();
+ m_pOptionsController.reset();
+ m_pFamilyController.reset();
+ m_rBindings.LeaveRegistrations();
SfxModelessDialogController::ChildWinDispose();
}
SvxSearchDialog::~SvxSearchDialog()
{
m_aPresentIdle.Stop();
- pSearchItem.reset();
- pImpl.reset();
+ m_pSearchItem.reset();
+ m_pImpl.reset();
}
void SvxSearchDialog::Construct_Impl()
{
- pImpl.reset( new SearchDlg_Impl() );
- pImpl->aSelectionTimer.SetTimeout( 500 );
- pImpl->aSelectionTimer.SetInvokeHandler(
- LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) );
+ m_pImpl.reset(new SearchDlg_Impl());
+ m_pImpl->aSelectionTimer.SetTimeout(500);
+ m_pImpl->aSelectionTimer.SetInvokeHandler(LINK(this, SvxSearchDialog,
TimeoutHdl_Impl));
EnableControls_Impl( SearchOptionFlags::NONE );
// Store old Text from m_xWordBtn
- aCalcStr += "#";
- aCalcStr += m_xWordBtn->get_label();
+ m_sCalcStr += "#";
+ m_sCalcStr += m_xWordBtn->get_label();
- aLayoutStr = SvxResId( RID_SVXSTR_SEARCH_STYLES );
- aLayoutWriterStr = SvxResId( RID_SVXSTR_WRITER_STYLES );
- aLayoutCalcStr = SvxResId( RID_SVXSTR_CALC_STYLES );
- aStylesStr = m_xLayoutBtn->get_label();
+ m_sLayoutStr = SvxResId(RID_SVXSTR_SEARCH_STYLES);
+ m_sLayoutWriterStr = SvxResId(RID_SVXSTR_WRITER_STYLES);
+ m_sLayoutCalcStr = SvxResId(RID_SVXSTR_CALC_STYLES);
+ m_sStylesStr = m_xLayoutBtn->get_label();
// Get stored search-strings from the application
- ListToStrArr_Impl(SID_SEARCHDLG_SEARCHSTRINGS,
- aSearchStrings, *m_xSearchLB, nRememberSize);
- ListToStrArr_Impl(SID_SEARCHDLG_REPLACESTRINGS,
- aReplaceStrings, *m_xReplaceLB, nRememberSize);
+ ListToStrArr_Impl(SID_SEARCHDLG_SEARCHSTRINGS, m_aSearchStrings,
*m_xSearchLB, m_nRememberSize);
+ ListToStrArr_Impl(SID_SEARCHDLG_REPLACESTRINGS, m_aReplaceStrings,
*m_xReplaceLB,
+ m_nRememberSize);
InitControls_Impl();
// Get attribute sets only once in constructor()
- const SfxPoolItem* ppArgs[] = { pSearchItem.get(), nullptr };
- SfxPoolItemHolder
aResult(rBindings.GetDispatcher()->Execute(FID_SEARCH_SEARCHSET,
SfxCallMode::SLOT, ppArgs));
+ const SfxPoolItem* ppArgs[] = { m_pSearchItem.get(), nullptr };
+ SfxPoolItemHolder aResult(
+ m_rBindings.GetDispatcher()->Execute(FID_SEARCH_SEARCHSET,
SfxCallMode::SLOT, ppArgs));
const SvxSetItem* pSrchSetItem(static_cast<const
SvxSetItem*>(aResult.getItem()));
if ( pSrchSetItem )
InitAttrList_Impl( &pSrchSetItem->GetItemSet(), nullptr );
- aResult = rBindings.GetDispatcher()->Execute(FID_SEARCH_REPLACESET,
SfxCallMode::SLOT, ppArgs);
+ aResult
+ = m_rBindings.GetDispatcher()->Execute(FID_SEARCH_REPLACESET,
SfxCallMode::SLOT, ppArgs);
const SvxSetItem* pReplSetItem(static_cast<const
SvxSetItem*>(aResult.getItem()));
if ( pReplSetItem )
InitAttrList_Impl( nullptr, &pReplSetItem->GetItemSet() );
// Create controller and update at once
- rBindings.EnterRegistrations();
- pSearchController.reset(
- new SvxSearchController( SID_SEARCH_ITEM, rBindings, *this ) );
- pOptionsController.reset(
- new SvxSearchController( SID_SEARCH_OPTIONS, rBindings, *this ) );
- rBindings.LeaveRegistrations();
- rBindings.GetDispatcher()->Execute( FID_SEARCH_ON, SfxCallMode::SLOT,
ppArgs );
- pImpl->aSelectionTimer.Start();
-
+ m_rBindings.EnterRegistrations();
+ m_pSearchController.reset(new SvxSearchController(SID_SEARCH_ITEM,
m_rBindings, *this));
+ m_pOptionsController.reset(new SvxSearchController(SID_SEARCH_OPTIONS,
m_rBindings, *this));
+ m_rBindings.LeaveRegistrations();
+ m_rBindings.GetDispatcher()->Execute(FID_SEARCH_ON, SfxCallMode::SLOT,
ppArgs);
+ m_pImpl->aSelectionTimer.Start();
if(!SvtCJKOptions::IsJapaneseFindEnabled())
{
@@ -447,7 +444,7 @@ void SvxSearchDialog::Construct_Impl()
}
//component extension - show component search buttons if the commands
// vnd.sun.star::SearchViaComponent1 and 2 are supported
- const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame();
+ const uno::Reference<frame::XFrame> xFrame = m_rBindings.GetActiveFrame();
const uno::Reference< frame::XDispatchProvider > xDispatchProv(xFrame,
uno::UNO_QUERY);
bool bSearchComponent1 = false;
@@ -455,11 +452,13 @@ void SvxSearchDialog::Construct_Impl()
if(xDispatchProv.is())
{
OUString sTarget(u"_self"_ustr);
- pImpl->xCommand1Dispatch =
xDispatchProv->queryDispatch(pImpl->aCommand1URL, sTarget, 0);
- if (pImpl->xCommand1Dispatch.is())
+ m_pImpl->xCommand1Dispatch
+ = xDispatchProv->queryDispatch(m_pImpl->aCommand1URL, sTarget, 0);
+ if (m_pImpl->xCommand1Dispatch.is())
bSearchComponent1 = true;
- pImpl->xCommand2Dispatch =
xDispatchProv->queryDispatch(pImpl->aCommand2URL, sTarget, 0);
- if (pImpl->xCommand2Dispatch.is())
+ m_pImpl->xCommand2Dispatch
+ = xDispatchProv->queryDispatch(m_pImpl->aCommand2URL, sTarget, 0);
+ if (m_pImpl->xCommand2Dispatch.is())
bSearchComponent2 = true;
}
@@ -508,11 +507,11 @@ void SvxSearchDialog::Construct_Impl()
void SvxSearchDialog::Close()
{
// remember strings
- if (!aSearchStrings.empty())
- StrArrToList_Impl( SID_SEARCHDLG_SEARCHSTRINGS, aSearchStrings );
+ if (!m_aSearchStrings.empty())
+ StrArrToList_Impl(SID_SEARCHDLG_SEARCHSTRINGS, m_aSearchStrings);
- if (!aReplaceStrings.empty())
- StrArrToList_Impl( SID_SEARCHDLG_REPLACESTRINGS, aReplaceStrings );
+ if (!m_aReplaceStrings.empty())
+ StrArrToList_Impl(SID_SEARCHDLG_REPLACESTRINGS, m_aReplaceStrings);
// save settings to configuration
SvtSearchOptions aOpt;
@@ -532,9 +531,9 @@ void SvxSearchDialog::Close()
if (IsClosing())
return;
- const SfxPoolItem* ppArgs[] = { pSearchItem.get(), nullptr };
- rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SfxCallMode::SLOT,
ppArgs );
- rBindings.Invalidate(SID_SEARCH_DLG);
+ const SfxPoolItem* ppArgs[] = { m_pSearchItem.get(), nullptr };
+ m_rBindings.GetDispatcher()->Execute(FID_SEARCH_OFF, SfxCallMode::SLOT,
ppArgs);
+ m_rBindings.Invalidate(SID_SEARCH_DLG);
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if (pViewFrame)
@@ -544,20 +543,17 @@ void SvxSearchDialog::Close()
TransliterationFlags SvxSearchDialog::GetTransliterationFlags() const
{
if (!m_xMatchCaseCB->get_active())
- nTransliterationFlags |= TransliterationFlags::IGNORE_CASE;
+ m_nTransliterationFlags |= TransliterationFlags::IGNORE_CASE;
else
- nTransliterationFlags &= ~TransliterationFlags::IGNORE_CASE;
+ m_nTransliterationFlags &= ~TransliterationFlags::IGNORE_CASE;
if ( !m_xJapMatchFullHalfWidthCB->get_active())
- nTransliterationFlags |= TransliterationFlags::IGNORE_WIDTH;
+ m_nTransliterationFlags |= TransliterationFlags::IGNORE_WIDTH;
else
- nTransliterationFlags &= ~TransliterationFlags::IGNORE_WIDTH;
- return nTransliterationFlags;
+ m_nTransliterationFlags &= ~TransliterationFlags::IGNORE_WIDTH;
+ return m_nTransliterationFlags;
}
-void SvxSearchDialog::SetSaveToModule(bool b)
-{
- pImpl->bSaveToModule = b;
-}
+void SvxSearchDialog::SetSaveToModule(bool b) { m_pImpl->bSaveToModule = b; }
void SvxSearchDialog::SetSearchLabel(const OUString& rStr)
{
@@ -593,7 +589,7 @@ void SvxSearchDialog::SetSearchLabel(const OUString& rStr)
void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags
nSettings )
{
- nTransliterationFlags = nSettings;
+ m_nTransliterationFlags = nSettings;
bool bVal(nSettings & TransliterationFlags::IGNORE_CASE);
m_xMatchCaseCB->set_active( !bVal );
bVal = bool(nSettings & TransliterationFlags::IGNORE_WIDTH);
@@ -619,10 +615,10 @@ bool SvxSearchDialog::IsOtherOptionsExpanded() const
void SvxSearchDialog::Activate()
{
// apply possible transliteration changes of the SvxSearchItem member
- if (pSearchItem)
+ if (m_pSearchItem)
{
- m_xMatchCaseCB->set_active( pSearchItem->GetExact() );
- m_xJapMatchFullHalfWidthCB->set_active(
!pSearchItem->IsMatchFullHalfWidthForms() );
+ m_xMatchCaseCB->set_active(m_pSearchItem->GetExact());
+
m_xJapMatchFullHalfWidthCB->set_active(!m_pSearchItem->IsMatchFullHalfWidthForms());
}
SfxModelessDialogController::Activate();
@@ -710,9 +706,9 @@ namespace
void SvxSearchDialog::ShowOptionalControls_Impl()
{
- DBG_ASSERT( pSearchItem, "no search item" );
+ DBG_ASSERT(m_pSearchItem, "no search item");
- SvtModuleOptions::EFactory eFactory = getModule(rBindings);
+ SvtModuleOptions::EFactory eFactory = getModule(m_rBindings);
bool bDrawApp = eFactory == SvtModuleOptions::EFactory::DRAW;
bool bWriterApp =
eFactory == SvtModuleOptions::EFactory::WRITER ||
@@ -734,7 +730,7 @@ void SvxSearchDialog::ShowOptionalControls_Impl()
m_xJapOptionsCB->set_visible(SvtCJKOptions::IsJapaneseFindEnabled());
m_xJapOptionsBtn->set_visible(SvtCJKOptions::IsJapaneseFindEnabled());
- if (bWriter)
+ if (m_bWriter)
{
m_xAttributeBtn->show();
m_xFormatBtn->show();
@@ -778,44 +774,44 @@ private:
void SvxSearchDialog::Init_Impl( bool bSearchPattern )
{
- DBG_ASSERT( pSearchItem, "SearchItem == 0" );
+ DBG_ASSERT(m_pSearchItem, "SearchItem == 0");
// We don't want to save any intermediate state to the module while the
// dialog is being initialized.
ToggleSaveToModule aNoModuleSave(*this, false);
SvtSearchOptions aOpt;
- bWriter = ( pSearchItem->GetAppFlag() == SvxSearchApp::WRITER );
-
- if ( !( nModifyFlag & ModifyFlags::Word ) )
- m_xWordBtn->set_active( pSearchItem->GetWordOnly() );
- if ( !( nModifyFlag & ModifyFlags::Exact ) )
- m_xMatchCaseCB->set_active( pSearchItem->GetExact() );
- if ( !( nModifyFlag & ModifyFlags::Backwards ) )
- m_xReplaceBackwardsCB->set_active( bReplaceBackwards ); //adjustment
to replace backwards
- if ( !( nModifyFlag & ModifyFlags::Notes ) )
- m_xNotesBtn->set_active( pSearchItem->GetNotes() );
- if ( !( nModifyFlag & ModifyFlags::Selection ) )
- m_xSelectionBtn->set_active( pSearchItem->GetSelection() );
- if ( !( nModifyFlag & ModifyFlags::Regexp ) )
- m_xRegExpBtn->set_active( pSearchItem->GetRegExp() );
- if ( !( nModifyFlag & ModifyFlags::Wildcard ) )
- m_xWildcardBtn->set_active( pSearchItem->GetWildcard() );
- if ( !( nModifyFlag & ModifyFlags::Layout ) )
- m_xLayoutBtn->set_active( pSearchItem->GetPattern() );
+ m_bWriter = (m_pSearchItem->GetAppFlag() == SvxSearchApp::WRITER);
+
+ if (!(m_nModifyFlag & ModifyFlags::Word))
+ m_xWordBtn->set_active(m_pSearchItem->GetWordOnly());
+ if (!(m_nModifyFlag & ModifyFlags::Exact))
+ m_xMatchCaseCB->set_active(m_pSearchItem->GetExact());
+ if (!(m_nModifyFlag & ModifyFlags::Backwards))
+ m_xReplaceBackwardsCB->set_active(m_bReplaceBackwards); //adjustment
to replace backwards
+ if (!(m_nModifyFlag & ModifyFlags::Notes))
+ m_xNotesBtn->set_active(m_pSearchItem->GetNotes());
+ if (!(m_nModifyFlag & ModifyFlags::Selection))
+ m_xSelectionBtn->set_active(m_pSearchItem->GetSelection());
+ if (!(m_nModifyFlag & ModifyFlags::Regexp))
+ m_xRegExpBtn->set_active(m_pSearchItem->GetRegExp());
+ if (!(m_nModifyFlag & ModifyFlags::Wildcard))
+ m_xWildcardBtn->set_active(m_pSearchItem->GetWildcard());
+ if (!(m_nModifyFlag & ModifyFlags::Layout))
+ m_xLayoutBtn->set_active(m_pSearchItem->GetPattern());
if (m_xNotesBtn->get_active())
m_xLayoutBtn->set_sensitive(false);
- m_xSimilarityBox->set_active( pSearchItem->IsLevenshtein() );
+ m_xSimilarityBox->set_active(m_pSearchItem->IsLevenshtein());
if ( m_xJapOptionsCB->get_visible() )
- m_xJapOptionsCB->set_active( pSearchItem->IsUseAsianOptions() );
+ m_xJapOptionsCB->set_active(m_pSearchItem->IsUseAsianOptions());
m_xIncludeDiacritics->set_active( !aOpt.IsIgnoreDiacritics_CTL() );
if ( m_xIncludeKashida->get_visible() )
m_xIncludeKashida->set_active( !aOpt.IsIgnoreKashida_CTL() );
- ApplyTransliterationFlags_Impl( pSearchItem->GetTransliterationFlags() );
+ ApplyTransliterationFlags_Impl(m_pSearchItem->GetTransliterationFlags());
ShowOptionalControls_Impl();
- if ( pSearchItem->GetAppFlag() == SvxSearchApp::CALC )
+ if (m_pSearchItem->GetAppFlag() == SvxSearchApp::CALC)
{
m_xCalcGrid->show();
m_xSearchFormattedCB->set_active( aOpt.IsSearchFormatted() );
@@ -827,7 +823,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
m_xSearchFormattedCB->connect_toggled( aLink );
ModifyFlags nModifyFlagCheck;
- switch ( pSearchItem->GetCellType() )
+ switch (m_pSearchItem->GetCellType())
{
case SvxSearchCellType::FORMULA:
nModifyFlagCheck = ModifyFlags::Formulas;
@@ -844,20 +840,18 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
default:
std::abort(); // cannot happen
}
- if ( !(nModifyFlag & nModifyFlagCheck) )
- m_xCalcSearchInLB->set_active(
static_cast<sal_Int32>(pSearchItem->GetCellType()) );
+ if (!(m_nModifyFlag & nModifyFlagCheck))
+
m_xCalcSearchInLB->set_active(static_cast<sal_Int32>(m_pSearchItem->GetCellType()));
- m_xWordBtn->set_label( aCalcStr.getToken( 0, '#' ) );
+ m_xWordBtn->set_label(m_sCalcStr.getToken(0, '#'));
- if ( pSearchItem->GetRowDirection() &&
- !( nModifyFlag & ModifyFlags::Rows ) )
+ if (m_pSearchItem->GetRowDirection() && !(m_nModifyFlag &
ModifyFlags::Rows))
m_xRowsBtn->set_active(true);
- else if ( !pSearchItem->GetRowDirection() &&
- !( nModifyFlag & ModifyFlags::Columns ) )
+ else if (!m_pSearchItem->GetRowDirection() && !(m_nModifyFlag &
ModifyFlags::Columns))
m_xColumnsBtn->set_active(true);
- if ( !( nModifyFlag & ModifyFlags::AllTables ) )
- m_xAllSheetsCB->set_active( pSearchItem->IsAllTables() );
+ if (!(m_nModifyFlag & ModifyFlags::AllTables))
+ m_xAllSheetsCB->set_active(m_pSearchItem->IsAllTables());
// only look for formatting in Writer
m_xFormatBtn->hide();
@@ -867,9 +861,9 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
else
{
m_xSearchFormattedCB->hide();
- m_xWordBtn->set_label( aCalcStr.getToken( 1, '#' ) );
+ m_xWordBtn->set_label(m_sCalcStr.getToken(1, '#'));
- if ( pSearchItem->GetAppFlag() == SvxSearchApp::DRAW )
+ if (m_pSearchItem->GetAppFlag() == SvxSearchApp::DRAW)
{
m_xSearchAllBtn->hide();
@@ -886,17 +880,19 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
{
m_xWildcardBtn->hide(); /* TODO:WILDCARD do not hide for other
apps if they handle it */
- if ( !pSearchList )
+ if (!m_pSearchList)
{
// Get attribute sets, if it not has been done already
- const SfxPoolItem* ppArgs[] = { pSearchItem.get(), nullptr };
- SfxPoolItemHolder
aResult(rBindings.GetDispatcher()->Execute(FID_SEARCH_SEARCHSET,
SfxCallMode::SLOT, ppArgs));
+ const SfxPoolItem* ppArgs[] = { m_pSearchItem.get(), nullptr };
+ SfxPoolItemHolder aResult(m_rBindings.GetDispatcher()->Execute(
+ FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs));
const SvxSetItem* pSrchSetItem(static_cast<const
SvxSetItem*>(aResult.getItem()));
if ( pSrchSetItem )
InitAttrList_Impl( &pSrchSetItem->GetItemSet(), nullptr );
- aResult =
rBindings.GetDispatcher()->Execute(FID_SEARCH_REPLACESET, SfxCallMode::SLOT,
ppArgs);
+ aResult =
m_rBindings.GetDispatcher()->Execute(FID_SEARCH_REPLACESET,
+
SfxCallMode::SLOT, ppArgs);
const SvxSetItem* pReplSetItem(static_cast<const
SvxSetItem*>(aResult.getItem()));
if ( pReplSetItem )
@@ -906,9 +902,9 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
}
// similarity search?
- if ( !( nModifyFlag & ModifyFlags::Similarity ) )
- m_xSimilarityBox->set_active( pSearchItem->IsLevenshtein() );
- bSet = true;
+ if (!(m_nModifyFlag & ModifyFlags::Similarity))
+ m_xSimilarityBox->set_active(m_pSearchItem->IsLevenshtein());
+ m_bSet = true;
FlagHdl_Impl(*m_xSimilarityBox);
FlagHdl_Impl(*m_xJapOptionsCB);
@@ -940,7 +936,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
m_xSearchTmplLB->clear();
m_xReplaceTmplLB->clear();
SfxStyleSheetBasePool* pStylePool = pShell->GetStyleSheetPool();
- SfxStyleSheetBase* pBase =
pStylePool->First(pSearchItem->GetFamily());
+ SfxStyleSheetBase* pBase =
pStylePool->First(m_pSearchItem->GetFamily());
while ( pBase )
{
@@ -949,13 +945,12 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
m_xReplaceTmplLB->append_text( pBase->GetName() );
pBase = pStylePool->Next();
}
- m_xSearchTmplLB->set_active_text( pSearchItem->GetSearchString() );
- m_xReplaceTmplLB->set_active_text( pSearchItem->GetReplaceString()
);
-
+ m_xSearchTmplLB->set_active_text(m_pSearchItem->GetSearchString());
+
m_xReplaceTmplLB->set_active_text(m_pSearchItem->GetReplaceString());
}
m_xSearchTmplLB->show();
- if ( bConstruct )
+ if (m_bConstruct)
// Grab focus only after creating
m_xSearchTmplLB->grab_focus();
m_xReplaceTmplLB->show();
@@ -971,31 +966,30 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
}
else
{
- bool bSetSearch = !( nModifyFlag & ModifyFlags::Search );
- bool bSetReplace = !( nModifyFlag & ModifyFlags::Replace );
+ bool bSetSearch = !(m_nModifyFlag & ModifyFlags::Search);
+ bool bSetReplace = !(m_nModifyFlag & ModifyFlags::Replace);
- if ( !(pSearchItem->GetSearchString().isEmpty()) && bSetSearch )
- m_xSearchLB->set_entry_text( pSearchItem->GetSearchString() );
- else if (!aSearchStrings.empty())
+ if (!(m_pSearchItem->GetSearchString().isEmpty()) && bSetSearch)
+ m_xSearchLB->set_entry_text(m_pSearchItem->GetSearchString());
+ else if (!m_aSearchStrings.empty())
{
- bool bAttributes =
- ( ( pSearchList && pSearchList->Count() ) ||
- ( pReplaceList && pReplaceList->Count() ) );
+ bool bAttributes = ((m_pSearchList && m_pSearchList->Count())
+ || (m_pReplaceList &&
m_pReplaceList->Count()));
if ( bSetSearch && !bAttributes )
- m_xSearchLB->set_entry_text(aSearchStrings[0]);
+ m_xSearchLB->set_entry_text(m_aSearchStrings[0]);
- OUString aReplaceTxt = pSearchItem->GetReplaceString();
+ OUString aReplaceTxt = m_pSearchItem->GetReplaceString();
- if (!aReplaceStrings.empty())
- aReplaceTxt = aReplaceStrings[0];
+ if (!m_aReplaceStrings.empty())
+ aReplaceTxt = m_aReplaceStrings[0];
if ( bSetReplace && !bAttributes )
m_xReplaceLB->set_entry_text( aReplaceTxt );
}
m_xSearchLB->show();
- if ( bConstruct )
+ if (m_bConstruct)
// Grab focus only after creating
m_xSearchLB->grab_focus();
m_xReplaceLB->show();
@@ -1030,12 +1024,12 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
EnableControl_Impl(*m_xSearchBtn);
EnableControl_Impl(*m_xBackSearchBtn);
EnableControl_Impl(*m_xReplaceBtn);
- if (!bWriter || !m_xNotesBtn->get_active())
+ if (!m_bWriter || !m_xNotesBtn->get_active())
{
EnableControl_Impl(*m_xSearchAllBtn);
EnableControl_Impl(*m_xReplaceAllBtn);
}
- if (bWriter && pSearchItem->GetNotes())
+ if (m_bWriter && m_pSearchItem->GetNotes())
{
m_xSearchAllBtn->set_sensitive(false);
m_xReplaceAllBtn->set_sensitive(false);
@@ -1047,7 +1041,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
else
m_xNoFormatBtn->set_sensitive(false);
- if ( !pSearchList )
+ if (!m_pSearchList)
{
m_xAttributeBtn->set_sensitive(false);
m_xFormatBtn->set_sensitive(false);
@@ -1055,9 +1049,9 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
if ( m_xLayoutBtn->get_active() )
{
- pImpl->bSaveToModule = false;
+ m_pImpl->bSaveToModule = false;
TemplateHdl_Impl(*m_xLayoutBtn);
- pImpl->bSaveToModule = true;
+ m_pImpl->bSaveToModule = true;
}
}
@@ -1068,8 +1062,8 @@ void SvxSearchDialog::InitAttrList_Impl( const
SfxItemSet* pSSet,
if ( !pSSet && !pRSet )
return;
- if ( pImpl->pRanges.empty() && pSSet )
- pImpl->pRanges = pSSet->GetRanges();
+ if (m_pImpl->pRanges.empty() && pSSet)
+ m_pImpl->pRanges = pSSet->GetRanges();
bool bSetOptimalLayoutSize = false;
@@ -1078,11 +1072,11 @@ void SvxSearchDialog::InitAttrList_Impl( const
SfxItemSet* pSSet,
if ( pSSet )
{
- pSearchList.reset(new SearchAttrItemList);
+ m_pSearchList.reset(new SearchAttrItemList);
if ( pSSet->Count() )
{
- pSearchList->Put( *pSSet );
+ m_pSearchList->Put(*pSSet);
m_xSearchAttrText->set_label( BuildAttrText_Impl( aDesc, true ) );
@@ -1093,18 +1087,18 @@ void SvxSearchDialog::InitAttrList_Impl( const
SfxItemSet* pSSet,
m_xSearchAttrText->show();
bSetOptimalLayoutSize = true;
}
- bFormat |= true;
+ m_bFormat |= true;
}
}
}
if ( pRSet )
{
- pReplaceList.reset(new SearchAttrItemList);
+ m_pReplaceList.reset(new SearchAttrItemList);
if ( pRSet->Count() )
{
- pReplaceList->Put( *pRSet );
+ m_pReplaceList->Put(*pRSet);
m_xReplaceAttrText->set_label( BuildAttrText_Impl( aDesc, false )
);
@@ -1115,7 +1109,7 @@ void SvxSearchDialog::InitAttrList_Impl( const
SfxItemSet* pSSet,
m_xReplaceAttrText->show();
bSetOptimalLayoutSize = true;
}
- bFormat |= true;
+ m_bFormat |= true;
}
}
}
@@ -1136,10 +1130,10 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl,
weld::Toggleable&, rCtrl, void )
void SvxSearchDialog::ClickHdl_Impl(const weld::Widget* pCtrl)
{
- if ( pCtrl && !bSet )
+ if (pCtrl && !m_bSet)
SetModifyFlag_Impl(pCtrl);
else
- bSet = false;
+ m_bSet = false;
if (pCtrl == m_xSimilarityBox.get())
{
@@ -1176,7 +1170,7 @@ void SvxSearchDialog::ClickHdl_Impl(const weld::Widget*
pCtrl)
EnableControl_Impl(*m_xAttributeBtn);
m_xSimilarityBtn->set_sensitive(false);
}
- pSearchItem->SetLevenshtein( bIsChecked );
+ m_pSearchItem->SetLevenshtein(bIsChecked);
}
else if (pCtrl == m_xNotesBtn.get())
{
@@ -1194,7 +1188,7 @@ void SvxSearchDialog::ClickHdl_Impl(const weld::Widget*
pCtrl)
}
else
{
- if ( m_xLayoutBtn->get_active() && !bFormat )
+ if (m_xLayoutBtn->get_active() && !m_bFormat)
{
m_xWordBtn->set_active( false );
m_xWordBtn->set_sensitive(false);
@@ -1247,14 +1241,14 @@ void SvxSearchDialog::ClickHdl_Impl(const weld::Widget*
pCtrl)
}
// Search-string in place? then enable Buttons
- bSet = true;
+ m_bSet = true;
ModifyHdl_Impl(*m_xSearchLB);
}
}
if (pCtrl == m_xAllSheetsCB.get())
{
- bSet = true;
+ m_bSet = true;
ModifyHdl_Impl(*m_xSearchLB);
}
@@ -1266,13 +1260,13 @@ void SvxSearchDialog::ClickHdl_Impl(const weld::Widget*
pCtrl)
m_xJapOptionsBtn->set_sensitive( bEnableJapOpt );
}
- if ( pImpl->bSaveToModule )
+ if (m_pImpl->bSaveToModule)
SaveToModule_Impl();
}
IMPL_LINK(SvxSearchDialog, CommandHdl_Impl, weld::Button&, rBtn, void)
{
- bool bInclusive = ( m_xLayoutBtn->get_label() == aLayoutStr );
+ bool bInclusive = (m_xLayoutBtn->get_label() == m_sLayoutStr);
if ( ( &rBtn == m_xSearchBtn.get() ) ||
(&rBtn == m_xBackSearchBtn.get()) ||
@@ -1282,13 +1276,13 @@ IMPL_LINK(SvxSearchDialog, CommandHdl_Impl,
weld::Button&, rBtn, void)
{
if ( m_xLayoutBtn->get_active() && !bInclusive )
{
- pSearchItem->SetSearchString ( m_xSearchTmplLB->get_active_text()
);
- pSearchItem->SetReplaceString( m_xReplaceTmplLB->get_active_text()
);
+ m_pSearchItem->SetSearchString(m_xSearchTmplLB->get_active_text());
+
m_pSearchItem->SetReplaceString(m_xReplaceTmplLB->get_active_text());
}
else
{
- pSearchItem->SetSearchString ( m_xSearchLB->get_active_text() );
- pSearchItem->SetReplaceString( m_xReplaceLB->get_active_text() );
+ m_pSearchItem->SetSearchString(m_xSearchLB->get_active_text());
+ m_pSearchItem->SetReplaceString(m_xReplaceLB->get_active_text());
if ( &rBtn == m_xReplaceBtn.get() )
Remember_Impl(false);
@@ -1301,17 +1295,17 @@ IMPL_LINK(SvxSearchDialog, CommandHdl_Impl,
weld::Button&, rBtn, void)
}
}
- pSearchItem->SetRegExp( false );
- pSearchItem->SetWildcard( false );
- pSearchItem->SetLevenshtein( false );
+ m_pSearchItem->SetRegExp(false);
+ m_pSearchItem->SetWildcard(false);
+ m_pSearchItem->SetLevenshtein(false);
if (GetCheckBoxValue(*m_xRegExpBtn))
- pSearchItem->SetRegExp( true );
+ m_pSearchItem->SetRegExp(true);
else if (GetCheckBoxValue(*m_xWildcardBtn))
- pSearchItem->SetWildcard( true );
+ m_pSearchItem->SetWildcard(true);
else if (GetCheckBoxValue(*m_xSimilarityBox))
- pSearchItem->SetLevenshtein( true );
+ m_pSearchItem->SetLevenshtein(true);
- pSearchItem->SetWordOnly(GetCheckBoxValue(*m_xWordBtn));
+ m_pSearchItem->SetWordOnly(GetCheckBoxValue(*m_xWordBtn));
bool bSetBackwards = false;
if( &rBtn == m_xBackSearchBtn.get())
@@ -1321,56 +1315,57 @@ IMPL_LINK(SvxSearchDialog, CommandHdl_Impl,
weld::Button&, rBtn, void)
else if( &rBtn == m_xReplaceBtn.get())
{
bSetBackwards = GetCheckBoxValue(*m_xReplaceBackwardsCB);
- bReplaceBackwards = GetCheckBoxValue(*m_xReplaceBackwardsCB);
+ m_bReplaceBackwards = GetCheckBoxValue(*m_xReplaceBackwardsCB);
}
- pSearchItem->SetBackward(bSetBackwards);
+ m_pSearchItem->SetBackward(bSetBackwards);
- pSearchItem->SetNotes(GetCheckBoxValue(*m_xNotesBtn));
- pSearchItem->SetPattern(GetCheckBoxValue(*m_xLayoutBtn));
- pSearchItem->SetSelection(GetCheckBoxValue(*m_xSelectionBtn));
- pSearchItem->SetUseAsianOptions(GetCheckBoxValue(*m_xJapOptionsCB));
+ m_pSearchItem->SetNotes(GetCheckBoxValue(*m_xNotesBtn));
+ m_pSearchItem->SetPattern(GetCheckBoxValue(*m_xLayoutBtn));
+ m_pSearchItem->SetSelection(GetCheckBoxValue(*m_xSelectionBtn));
+ m_pSearchItem->SetUseAsianOptions(GetCheckBoxValue(*m_xJapOptionsCB));
TransliterationFlags nFlags = GetTransliterationFlags();
- if( !pSearchItem->IsUseAsianOptions())
+ if (!m_pSearchItem->IsUseAsianOptions())
nFlags &= TransliterationFlags::IGNORE_CASE |
TransliterationFlags::IGNORE_WIDTH;
if (GetNegatedCheckBoxValue(*m_xIncludeDiacritics))
nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
if (GetNegatedCheckBoxValue(*m_xIncludeKashida))
nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
- pSearchItem->SetTransliterationFlags( nFlags );
+ m_pSearchItem->SetTransliterationFlags(nFlags);
- if ( !bWriter )
+ if (!m_bWriter)
{
if ( m_xCalcSearchInLB->get_active() != -1)
- pSearchItem->SetCellType(
static_cast<SvxSearchCellType>(m_xCalcSearchInLB->get_active()) );
+ m_pSearchItem->SetCellType(
+
static_cast<SvxSearchCellType>(m_xCalcSearchInLB->get_active()));
- pSearchItem->SetRowDirection( m_xRowsBtn->get_active() );
- pSearchItem->SetAllTables( m_xAllSheetsCB->get_active() );
- pSearchItem->SetSearchFormatted(
m_xSearchFormattedCB->get_active() );
+ m_pSearchItem->SetRowDirection(m_xRowsBtn->get_active());
+ m_pSearchItem->SetAllTables(m_xAllSheetsCB->get_active());
+
m_pSearchItem->SetSearchFormatted(m_xSearchFormattedCB->get_active());
}
if ((&rBtn == m_xSearchBtn.get()) || (&rBtn ==
m_xBackSearchBtn.get()))
- pSearchItem->SetCommand( SvxSearchCmd::FIND );
+ m_pSearchItem->SetCommand(SvxSearchCmd::FIND);
else if ( &rBtn == m_xSearchAllBtn.get() )
- pSearchItem->SetCommand( SvxSearchCmd::FIND_ALL );
+ m_pSearchItem->SetCommand(SvxSearchCmd::FIND_ALL);
else if ( &rBtn == m_xReplaceBtn.get() )
- pSearchItem->SetCommand( SvxSearchCmd::REPLACE );
+ m_pSearchItem->SetCommand(SvxSearchCmd::REPLACE);
else if ( &rBtn == m_xReplaceAllBtn.get() )
- pSearchItem->SetCommand( SvxSearchCmd::REPLACE_ALL );
+ m_pSearchItem->SetCommand(SvxSearchCmd::REPLACE_ALL);
// when looking for templates, delete format lists
- if ( !bFormat && pSearchItem->GetPattern() )
+ if (!m_bFormat && m_pSearchItem->GetPattern())
{
- if ( pSearchList )
- pSearchList->Clear();
+ if (m_pSearchList)
+ m_pSearchList->Clear();
- if ( pReplaceList )
- pReplaceList->Clear();
+ if (m_pReplaceList)
+ m_pReplaceList->Clear();
}
- nModifyFlag = ModifyFlags::NONE;
- const SfxPoolItem* ppArgs[] = { pSearchItem.get(), nullptr };
- rBindings.ExecuteSynchron( FID_SEARCH_NOW, ppArgs );
+ m_nModifyFlag = ModifyFlags::NONE;
+ const SfxPoolItem* ppArgs[] = { m_pSearchItem.get(), nullptr };
+ m_rBindings.ExecuteSynchron(FID_SEARCH_NOW, ppArgs);
}
else if ( &rBtn == m_xCloseBtn.get() )
{
@@ -1385,32 +1380,30 @@ IMPL_LINK(SvxSearchDialog, CommandHdl_Impl,
weld::Button&, rBtn, void)
else if (&rBtn == m_xSimilarityBtn.get())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractSvxSearchSimilarityDialog>
pDlg(pFact->CreateSvxSearchSimilarityDialog(m_xDialog.get(),
-
pSearchItem->IsLEVRelaxed(),
-
pSearchItem->GetLEVOther(),
-
pSearchItem->GetLEVShorter(),
-
pSearchItem->GetLEVLonger() ));
+ ScopedVclPtr<AbstractSvxSearchSimilarityDialog>
pDlg(pFact->CreateSvxSearchSimilarityDialog(
+ m_xDialog.get(), m_pSearchItem->IsLEVRelaxed(),
m_pSearchItem->GetLEVOther(),
+ m_pSearchItem->GetLEVShorter(), m_pSearchItem->GetLEVLonger()));
if ( executeSubDialog(pDlg.get()) == RET_OK )
{
- pSearchItem->SetLEVRelaxed( pDlg->IsRelaxed() );
- pSearchItem->SetLEVOther( pDlg->GetOther() );
- pSearchItem->SetLEVShorter( pDlg->GetShorter() );
- pSearchItem->SetLEVLonger( pDlg->GetLonger() );
+ m_pSearchItem->SetLEVRelaxed(pDlg->IsRelaxed());
+ m_pSearchItem->SetLEVOther(pDlg->GetOther());
+ m_pSearchItem->SetLEVShorter(pDlg->GetShorter());
+ m_pSearchItem->SetLEVLonger(pDlg->GetLonger());
SaveToModule_Impl();
}
}
else if (&rBtn == m_xJapOptionsBtn.get())
{
SfxItemSet aSet( SfxGetpApp()->GetPool() );
- pSearchItem->SetTransliterationFlags( GetTransliterationFlags() );
+ m_pSearchItem->SetTransliterationFlags(GetTransliterationFlags());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractSvxJSearchOptionsDialog>
aDlg(pFact->CreateSvxJSearchOptionsDialog(m_xDialog.get(), aSet,
- pSearchItem->GetTransliterationFlags() ));
+ ScopedVclPtr<AbstractSvxJSearchOptionsDialog>
aDlg(pFact->CreateSvxJSearchOptionsDialog(
+ m_xDialog.get(), aSet, m_pSearchItem->GetTransliterationFlags()));
int nRet = executeSubDialog(aDlg.get());
if (RET_OK == nRet) //! true only if FillItemSet of
SvxJSearchOptionsPage returns true
{
TransliterationFlags nFlags = aDlg->GetTransliterationFlags();
- pSearchItem->SetTransliterationFlags( nFlags );
+ m_pSearchItem->SetTransliterationFlags(nFlags);
ApplyTransliterationFlags_Impl( nFlags );
}
}
@@ -1424,13 +1417,13 @@ IMPL_LINK(SvxSearchDialog, CommandHdl_Impl,
weld::Button&, rBtn, void)
pArgs[1].Value <<= m_xDialog->GetXWindow();
if (&rBtn == m_xSearchComponent1PB.get())
{
- if ( pImpl->xCommand1Dispatch.is() )
- pImpl->xCommand1Dispatch->dispatch(pImpl->aCommand1URL, aArgs);
+ if (m_pImpl->xCommand1Dispatch.is())
+ m_pImpl->xCommand1Dispatch->dispatch(m_pImpl->aCommand1URL,
aArgs);
}
else
{
- if ( pImpl->xCommand2Dispatch.is() )
- pImpl->xCommand2Dispatch->dispatch(pImpl->aCommand2URL, aArgs);
+ if (m_pImpl->xCommand2Dispatch.is())
+ m_pImpl->xCommand2Dispatch->dispatch(m_pImpl->aCommand2URL,
aArgs);
}
}
}
@@ -1438,13 +1431,13 @@ IMPL_LINK(SvxSearchDialog, CommandHdl_Impl,
weld::Button&, rBtn, void)
IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, weld::ComboBox&, rEd, void )
{
- if ( !bSet )
+ if (!m_bSet)
SetModifyFlag_Impl( &rEd );
else
- bSet = false;
+ m_bSet = false;
// Calc allows searching for empty cells.
- bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SvxSearchApp::CALC);
+ bool bAllowEmptySearch = (m_pSearchItem->GetAppFlag() ==
SvxSearchApp::CALC);
if (&rEd != m_xSearchLB.get() && &rEd != m_xReplaceLB.get())
return;
@@ -1460,7 +1453,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl,
weld::ComboBox&, rEd, void )
EnableControl_Impl(*m_xSearchBtn);
EnableControl_Impl(*m_xBackSearchBtn);
EnableControl_Impl(*m_xReplaceBtn);
- if (!bWriter || !m_xNotesBtn->get_active())
+ if (!m_bWriter || !m_xNotesBtn->get_active())
{
EnableControl_Impl(*m_xSearchAllBtn);
EnableControl_Impl(*m_xReplaceAllBtn);
@@ -1479,21 +1472,21 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl,
weld::ComboBox&, rEd, void )
IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl, weld::Toggleable&, void)
{
- if ( pImpl->bSaveToModule )
+ if (m_pImpl->bSaveToModule)
SaveToModule_Impl();
- if ( bFormat )
+ if (m_bFormat)
return;
OUString sDesc;
if ( m_xLayoutBtn->get_active() )
{
- if ( !pFamilyController )
+ if (!m_pFamilyController)
{
sal_uInt16 nId = 0;
// Enable templates controller
- switch ( pSearchItem->GetFamily() )
+ switch (m_pSearchItem->GetFamily())
{
case SfxStyleFamily::Char:
nId = SID_STYLE_FAMILY1; break;
@@ -1514,10 +1507,9 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl,
weld::Toggleable&, void)
OSL_FAIL( "StyleSheetFamily was changed?" );
}
- rBindings.EnterRegistrations();
- pFamilyController.reset(
- new SvxSearchController( nId, rBindings, *this ) );
- rBindings.LeaveRegistrations();
+ m_rBindings.EnterRegistrations();
+ m_pFamilyController.reset(new SvxSearchController(nId,
m_rBindings, *this));
+ m_rBindings.LeaveRegistrations();
m_xSearchTmplLB->clear();
m_xReplaceTmplLB->clear();
@@ -1548,9 +1540,9 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl,
weld::Toggleable&, void)
else
{
// Disable templates controller
- rBindings.EnterRegistrations();
- pFamilyController.reset();
- rBindings.LeaveRegistrations();
+ m_rBindings.EnterRegistrations();
+ m_pFamilyController.reset();
+ m_rBindings.LeaveRegistrations();
m_xSearchLB->show();
m_xReplaceLB->show();
@@ -1574,17 +1566,17 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl,
weld::Toggleable&, void)
EnableControl_Impl(*m_xAttributeBtn);
EnableControl_Impl(*m_xSimilarityBox);
- FocusHdl_Impl( bSearch ? *m_xSearchLB : *m_xReplaceLB );
+ FocusHdl_Impl(m_bSearch ? *m_xSearchLB : *m_xReplaceLB);
}
- bSet = true;
- pImpl->bSaveToModule = false;
+ m_bSet = true;
+ m_pImpl->bSaveToModule = false;
FlagHdl_Impl(*m_xLayoutBtn);
- pImpl->bSaveToModule = true;
+ m_pImpl->bSaveToModule = true;
}
void SvxSearchDialog::Remember_Impl(bool _bSearch)
{
- std::vector<OUString>& rArr = _bSearch ? aSearchStrings : aReplaceStrings;
+ std::vector<OUString>& rArr = _bSearch ? m_aSearchStrings :
m_aReplaceStrings;
weld::ComboBox& rListBox = _bSearch ? *m_xSearchLB : *m_xReplaceLB;
const OUString sText = rListBox.get_active_text();
@@ -1602,11 +1594,11 @@ void SvxSearchDialog::Remember_Impl(bool _bSearch)
rListBox.remove(nPos);
rArr.erase(rArr.begin() + nPos);
}
- else if (rListBox.get_count() >= nRememberSize)
+ else if (rListBox.get_count() >= m_nRememberSize)
{
// delete oldest entry at maximum occupancy (ListBox and Array)
- rListBox.remove(nRememberSize - 1);
- rArr.erase(rArr.begin() + nRememberSize - 1);
+ rListBox.remove(m_nRememberSize - 1);
+ rArr.erase(rArr.begin() + m_nRememberSize - 1);
}
rArr.insert(rArr.begin(), sText);
@@ -1621,7 +1613,7 @@ void SvxSearchDialog::TemplatesChanged_Impl(
SfxStyleSheetBasePool& rPool )
m_xReplaceTmplLB->clear();
m_xSearchTmplLB->freeze();
m_xReplaceTmplLB->freeze();
- SfxStyleSheetBase* pBase = rPool.First(pSearchItem->GetFamily());
+ SfxStyleSheetBase* pBase = rPool.First(m_pSearchItem->GetFamily());
while ( pBase )
{
@@ -1654,29 +1646,28 @@ void SvxSearchDialog::TemplatesChanged_Impl(
SfxStyleSheetBasePool& rPool )
void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags )
{
- if ( nFlags == nOptions )
+ if (nFlags == m_nOptions)
return;
else
- nOptions = nFlags;
+ m_nOptions = nFlags;
bool bNoSearch = true;
- bool bEnableSearch = bool( SearchOptionFlags::SEARCH & nOptions );
+ bool bEnableSearch = bool(SearchOptionFlags::SEARCH & m_nOptions);
m_xSearchBtn->set_sensitive(bEnableSearch);
m_xBackSearchBtn->set_sensitive(bEnableSearch);
if( bEnableSearch )
bNoSearch = false;
-
- if ( SearchOptionFlags::SEARCHALL & nOptions )
+ if (SearchOptionFlags::SEARCHALL & m_nOptions)
{
m_xSearchAllBtn->set_sensitive(true);
bNoSearch = false;
}
else
m_xSearchAllBtn->set_sensitive(false);
- if ( SearchOptionFlags::REPLACE & nOptions )
+ if (SearchOptionFlags::REPLACE & m_nOptions)
{
m_xReplaceBtn->set_sensitive(true);
m_xReplaceFrame->set_sensitive(true);
@@ -1691,7 +1682,7 @@ void SvxSearchDialog::EnableControls_Impl( const
SearchOptionFlags nFlags )
m_xReplaceLB->set_sensitive(false);
m_xReplaceTmplLB->set_sensitive(false);
}
- if ( SearchOptionFlags::REPLACE_ALL & nOptions )
+ if (SearchOptionFlags::REPLACE_ALL & m_nOptions)
{
m_xReplaceAllBtn->set_sensitive(true);
bNoSearch = false;
@@ -1705,11 +1696,11 @@ void SvxSearchDialog::EnableControls_Impl( const
SearchOptionFlags nFlags )
m_xSearchLB->set_sensitive( !bNoSearch );
m_xNotesBtn->set_sensitive(true);
- if ( SearchOptionFlags::WHOLE_WORDS & nOptions )
+ if (SearchOptionFlags::WHOLE_WORDS & m_nOptions)
m_xWordBtn->set_sensitive(true);
else
m_xWordBtn->set_sensitive(false);
- if ( SearchOptionFlags::BACKWARDS & nOptions )
+ if (SearchOptionFlags::BACKWARDS & m_nOptions)
{
m_xBackSearchBtn->set_sensitive(true);
m_xReplaceBackwardsCB->set_sensitive(true);
@@ -1719,27 +1710,27 @@ void SvxSearchDialog::EnableControls_Impl( const
SearchOptionFlags nFlags )
m_xBackSearchBtn->set_sensitive(false);
m_xReplaceBackwardsCB->set_sensitive(false);
}
- if ( SearchOptionFlags::REG_EXP & nOptions )
+ if (SearchOptionFlags::REG_EXP & m_nOptions)
m_xRegExpBtn->set_sensitive(true);
else
m_xRegExpBtn->set_sensitive(false);
- if ( SearchOptionFlags::WILDCARD & nOptions )
+ if (SearchOptionFlags::WILDCARD & m_nOptions)
m_xWildcardBtn->set_sensitive(true);
else
m_xWildcardBtn->set_sensitive(false);
- if ( SearchOptionFlags::EXACT & nOptions )
+ if (SearchOptionFlags::EXACT & m_nOptions)
m_xMatchCaseCB->set_sensitive(true);
else
m_xMatchCaseCB->set_sensitive(false);
- if ( SearchOptionFlags::SELECTION & nOptions )
+ if (SearchOptionFlags::SELECTION & m_nOptions)
m_xSelectionBtn->set_sensitive(true);
else
m_xSelectionBtn->set_sensitive(false);
- if ( SearchOptionFlags::FAMILIES & nOptions )
+ if (SearchOptionFlags::FAMILIES & m_nOptions)
m_xLayoutBtn->set_sensitive(true);
else
m_xLayoutBtn->set_sensitive(false);
- if ( SearchOptionFlags::FORMAT & nOptions )
+ if (SearchOptionFlags::FORMAT & m_nOptions)
{
m_xAttributeBtn->set_sensitive(true);
m_xFormatBtn->set_sensitive(true);
@@ -1752,7 +1743,7 @@ void SvxSearchDialog::EnableControls_Impl( const
SearchOptionFlags nFlags )
m_xNoFormatBtn->set_sensitive(false);
}
- if ( SearchOptionFlags::SIMILARITY & nOptions )
+ if (SearchOptionFlags::SIMILARITY & m_nOptions)
{
m_xSimilarityBox->set_sensitive(true);
m_xSimilarityBtn->set_sensitive(true);
@@ -1763,10 +1754,9 @@ void SvxSearchDialog::EnableControls_Impl( const
SearchOptionFlags nFlags )
m_xSimilarityBtn->set_sensitive(false);
}
- if ( pSearchItem )
+ if (m_pSearchItem)
{
- Init_Impl( pSearchItem->GetPattern() &&
- ( !pSearchList || !pSearchList->Count() ) );
+ Init_Impl(m_pSearchItem->GetPattern() && (!m_pSearchList ||
!m_pSearchList->Count()));
if (SvxSearchDialog::IsOtherOptionsExpanded())
m_xOtherOptionsExpander->set_expanded(true);
}
@@ -1774,35 +1764,33 @@ void SvxSearchDialog::EnableControls_Impl( const
SearchOptionFlags nFlags )
void SvxSearchDialog::EnableControl_Impl(const weld::Widget& rCtrl)
{
- if (m_xSearchBtn.get() == &rCtrl && ( SearchOptionFlags::SEARCH & nOptions
) )
+ if (m_xSearchBtn.get() == &rCtrl && (SearchOptionFlags::SEARCH &
m_nOptions))
{
m_xComponentFrame->set_sensitive(true);
m_xSearchBtn->set_sensitive(true);
return;
}
- if ( m_xSearchAllBtn.get() == &rCtrl &&
- ( SearchOptionFlags::SEARCHALL & nOptions ) )
+ if (m_xSearchAllBtn.get() == &rCtrl && (SearchOptionFlags::SEARCHALL &
m_nOptions))
{
m_xSearchAllBtn->set_sensitive(true);
return;
}
- if ( m_xReplaceBtn.get() == &rCtrl && ( SearchOptionFlags::REPLACE &
nOptions ) )
+ if (m_xReplaceBtn.get() == &rCtrl && (SearchOptionFlags::REPLACE &
m_nOptions))
{
m_xReplaceBtn->set_sensitive(true);
return;
}
- if ( m_xReplaceAllBtn.get() == &rCtrl &&
- ( SearchOptionFlags::REPLACE_ALL & nOptions ) )
+ if (m_xReplaceAllBtn.get() == &rCtrl && (SearchOptionFlags::REPLACE_ALL &
m_nOptions))
{
m_xReplaceAllBtn->set_sensitive(true);
return;
}
- if ( m_xWordBtn.get() == &rCtrl && ( SearchOptionFlags::WHOLE_WORDS &
nOptions ) )
+ if (m_xWordBtn.get() == &rCtrl && (SearchOptionFlags::WHOLE_WORDS &
m_nOptions))
{
m_xWordBtn->set_sensitive(true);
return;
}
- if ( SearchOptionFlags::BACKWARDS & nOptions )
+ if (SearchOptionFlags::BACKWARDS & m_nOptions)
{
if( m_xBackSearchBtn.get() == &rCtrl )
{
@@ -1820,51 +1808,50 @@ void SvxSearchDialog::EnableControl_Impl(const
weld::Widget& rCtrl)
m_xNotesBtn->set_sensitive(true);
return;
}
- if ( m_xRegExpBtn.get() == &rCtrl && ( SearchOptionFlags::REG_EXP &
nOptions )
+ if (m_xRegExpBtn.get() == &rCtrl && (SearchOptionFlags::REG_EXP &
m_nOptions)
&& !m_xSimilarityBox->get_active() && !m_xWildcardBtn->get_active())
{
m_xRegExpBtn->set_sensitive(true);
return;
}
- if ( m_xWildcardBtn.get() == &rCtrl && ( SearchOptionFlags::WILDCARD &
nOptions )
+ if (m_xWildcardBtn.get() == &rCtrl && (SearchOptionFlags::WILDCARD &
m_nOptions)
&& !m_xSimilarityBox->get_active() && !m_xRegExpBtn->get_active())
{
m_xWildcardBtn->set_sensitive(true);
return;
}
- if ( m_xMatchCaseCB.get() == &rCtrl && ( SearchOptionFlags::EXACT &
nOptions ) )
+ if (m_xMatchCaseCB.get() == &rCtrl && (SearchOptionFlags::EXACT &
m_nOptions))
{
if (!m_xJapOptionsCB->get_active())
m_xMatchCaseCB->set_sensitive(true);
return;
}
- if ( m_xSelectionBtn.get() == &rCtrl && ( SearchOptionFlags::SELECTION &
nOptions ) )
+ if (m_xSelectionBtn.get() == &rCtrl && (SearchOptionFlags::SELECTION &
m_nOptions))
{
m_xSelectionBtn->set_sensitive(true);
return;
}
- if ( m_xLayoutBtn.get() == &rCtrl && ( SearchOptionFlags::FAMILIES &
nOptions ) )
+ if (m_xLayoutBtn.get() == &rCtrl && (SearchOptionFlags::FAMILIES &
m_nOptions))
{
m_xLayoutBtn->set_sensitive(true);
return;
}
- if ( m_xAttributeBtn.get() == &rCtrl
- && ( SearchOptionFlags::FORMAT & nOptions )
- && pSearchList )
+ if (m_xAttributeBtn.get() == &rCtrl && (SearchOptionFlags::FORMAT &
m_nOptions)
+ && m_pSearchList)
{
- m_xAttributeBtn->set_sensitive( pImpl->bFocusOnSearch );
+ m_xAttributeBtn->set_sensitive(m_pImpl->bFocusOnSearch);
}
- if ( m_xFormatBtn.get() == &rCtrl && ( SearchOptionFlags::FORMAT &
nOptions ) )
+ if (m_xFormatBtn.get() == &rCtrl && (SearchOptionFlags::FORMAT &
m_nOptions))
{
m_xFormatBtn->set_sensitive(true);
return;
}
- if ( m_xNoFormatBtn.get() == &rCtrl && ( SearchOptionFlags::FORMAT &
nOptions ) )
+ if (m_xNoFormatBtn.get() == &rCtrl && (SearchOptionFlags::FORMAT &
m_nOptions))
{
m_xNoFormatBtn->set_sensitive(true);
return;
}
- if ( m_xSimilarityBox.get() == &rCtrl && ( SearchOptionFlags::SIMILARITY &
nOptions )
+ if (m_xSimilarityBox.get() == &rCtrl && (SearchOptionFlags::SIMILARITY &
m_nOptions)
&& !m_xRegExpBtn->get_active() && !m_xWildcardBtn->get_active())
{
m_xSimilarityBox->set_sensitive(true);
@@ -1879,9 +1866,8 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem*
pItem )
//TODO: save pItem and process later if m_executingSubDialog?
if ( pItem && !m_executingSubDialog )
{
- pSearchItem.reset(pItem->Clone());
- Init_Impl( pSearchItem->GetPattern() &&
- ( !pSearchList || !pSearchList->Count() ) );
+ m_pSearchItem.reset(pItem->Clone());
+ Init_Impl(m_pSearchItem->GetPattern() && (!m_pSearchList ||
!m_pSearchList->Count()));
}
}
@@ -1892,9 +1878,9 @@ IMPL_LINK(SvxSearchDialog, FocusHdl_Impl, weld::Widget&,
rControl, void)
if (pCtrl == m_xSearchLB.get())
{
if (pCtrl->has_focus())
- pImpl->bFocusOnSearch = true;
+ m_pImpl->bFocusOnSearch = true;
pCtrl = m_xSearchLB.get();
- bSearch = true;
+ m_bSearch = true;
if( nTxtLen )
EnableControl_Impl(*m_xNoFormatBtn);
@@ -1904,9 +1890,9 @@ IMPL_LINK(SvxSearchDialog, FocusHdl_Impl, weld::Widget&,
rControl, void)
}
else
{
- pImpl->bFocusOnSearch = false;
+ m_pImpl->bFocusOnSearch = false;
pCtrl = m_xReplaceLB.get();
- bSearch = false;
+ m_bSearch = false;
if (!m_xReplaceAttrText->get_label().isEmpty())
EnableControl_Impl(*m_xNoFormatBtn);
@@ -1914,17 +1900,17 @@ IMPL_LINK(SvxSearchDialog, FocusHdl_Impl,
weld::Widget&, rControl, void)
m_xNoFormatBtn->set_sensitive(false);
m_xAttributeBtn->set_sensitive(false);
}
- bSet = true;
+ m_bSet = true;
weld::ComboBox &rComboBox = dynamic_cast<weld::ComboBox&>(*pCtrl);
rComboBox.select_entry_region(0, -1);
ModifyHdl_Impl(rComboBox);
- if (bFormat && nTxtLen)
- m_xLayoutBtn->set_label(aLayoutStr);
+ if (m_bFormat && nTxtLen)
+ m_xLayoutBtn->set_label(m_sLayoutStr);
else
{
- SvtModuleOptions::EFactory eFactory = getModule(rBindings);
+ SvtModuleOptions::EFactory eFactory = getModule(m_rBindings);
bool bWriterApp =
eFactory == SvtModuleOptions::EFactory::WRITER ||
eFactory == SvtModuleOptions::EFactory::WRITERWEB ||
@@ -1932,13 +1918,13 @@ IMPL_LINK(SvxSearchDialog, FocusHdl_Impl,
weld::Widget&, rControl, void)
bool bCalcApp = eFactory == SvtModuleOptions::EFactory::CALC;
if (bWriterApp)
- m_xLayoutBtn->set_label(aLayoutWriterStr);
+ m_xLayoutBtn->set_label(m_sLayoutWriterStr);
else
{
if (bCalcApp)
- m_xLayoutBtn->set_label(aLayoutCalcStr);
+ m_xLayoutBtn->set_label(m_sLayoutCalcStr);
else
- m_xLayoutBtn->set_label(aStylesStr);
+ m_xLayoutBtn->set_label(m_sStylesStr);
}
}
}
@@ -1954,11 +1940,11 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl,
weld::Button&, void)
DBG_ASSERT( pSh, "no DocShell" );
- if ( !pSh || pImpl->pRanges.empty() )
+ if (!pSh || m_pImpl->pRanges.empty())
return;
SfxItemPool& rPool = pSh->GetPool();
- SfxItemSet aSet(rPool, pImpl->pRanges);
+ SfxItemSet aSet(rPool, m_pImpl->pRanges);
aSet.MergeRange(SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL);
@@ -1978,15 +1964,15 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl,
weld::Button&, void)
aSet.InvalidateItem(nWh);
aSet.Put(SvxBrushItem(nBrushWhich));
- if ( bSearch )
+ if (m_bSearch)
{
aTxt = SvxResId( RID_SVXSTR_SEARCH );
- pSearchList->Get( aSet );
+ m_pSearchList->Get(aSet);
}
else
{
aTxt = SvxResId( RID_SVXSTR_REPLACE );
- pReplaceList->Get( aSet );
+ m_pReplaceList->Get(aSet);
}
aSet.DisableItem(SID_ATTR_PARA_MODEL);
aSet.DisableItem(rPool.GetWhichIDFromSlotID(SID_ATTR_PARA_PAGEBREAK));
@@ -2003,7 +1989,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl,
weld::Button&, void)
DBG_ASSERT( pDlg->GetOutputItemSet(), "invalid Output-Set" );
SfxItemSet aOutSet( *pDlg->GetOutputItemSet() );
- SearchAttrItemList* pList = bSearch ? pSearchList.get() :
pReplaceList.get();
+ SearchAttrItemList* pList = m_bSearch ? m_pSearchList.get() :
m_pReplaceList.get();
const SfxPoolItem* pItem;
for( sal_uInt16 n = 0; n < pList->Count(); ++n )
@@ -2026,7 +2012,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl,
weld::Button&, void)
IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl, weld::Button&, void)
{
- SvtModuleOptions::EFactory eFactory = getModule(rBindings);
+ SvtModuleOptions::EFactory eFactory = getModule(m_rBindings);
bool bWriterApp =
eFactory == SvtModuleOptions::EFactory::WRITER ||
eFactory == SvtModuleOptions::EFactory::WRITERWEB ||
@@ -2034,23 +2020,23 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl,
weld::Button&, void)
bool bCalcApp = eFactory == SvtModuleOptions::EFactory::CALC;
if (bCalcApp)
- m_xLayoutBtn->set_label( aLayoutCalcStr );
+ m_xLayoutBtn->set_label(m_sLayoutCalcStr);
else
{
if (bWriterApp)
- m_xLayoutBtn->set_label( aLayoutWriterStr);
+ m_xLayoutBtn->set_label(m_sLayoutWriterStr);
else
- m_xLayoutBtn->set_label( aStylesStr );
+ m_xLayoutBtn->set_label(m_sStylesStr);
}
- bFormat = false;
+ m_bFormat = false;
m_xLayoutBtn->set_active( false );
bool bSetOptimalLayoutSize = false;
- if ( bSearch )
+ if (m_bSearch)
{
- pSearchList->Clear();
+ m_pSearchList->Clear();
m_xSearchAttrText->set_label( u""_ustr );
if (m_xSearchAttrText->get_visible())
{
@@ -2060,7 +2046,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl,
weld::Button&, void)
}
else
{
- pReplaceList->Clear();
+ m_pReplaceList->Clear();
m_xReplaceAttrText->set_label( u""_ustr );
if (m_xReplaceAttrText->get_visible())
{
@@ -2072,19 +2058,20 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl,
weld::Button&, void)
if (bSetOptimalLayoutSize)
m_xDialog->resize_to_request();
- pImpl->bSaveToModule = false;
+ m_pImpl->bSaveToModule = false;
TemplateHdl_Impl(*m_xLayoutBtn);
- pImpl->bSaveToModule = true;
+ m_pImpl->bSaveToModule = true;
m_xNoFormatBtn->set_sensitive(false);
}
IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl, weld::Button&, void)
{
- if ( !pSearchList || pImpl->pRanges.empty() )
+ if (!m_pSearchList || m_pImpl->pRanges.empty())
return;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ScopedVclPtr<VclAbstractDialog>
pDlg(pFact->CreateSvxSearchAttributeDialog(m_xDialog.get(), *pSearchList,
pImpl->pRanges));
+ ScopedVclPtr<VclAbstractDialog> pDlg(
+ pFact->CreateSvxSearchAttributeDialog(m_xDialog.get(), *m_pSearchList,
m_pImpl->pRanges));
executeSubDialog(pDlg.get());
PaintAttrText_Impl();
}
@@ -2119,7 +2106,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString&
rStr,
return rStr;
SfxItemPool& rPool = pSh->GetPool();
- SearchAttrItemList* pList = bSrchFlag ? pSearchList.get() :
pReplaceList.get();
+ SearchAttrItemList* pList = bSrchFlag ? m_pSearchList.get() :
m_pReplaceList.get();
if ( !pList )
return rStr;
@@ -2182,14 +2169,14 @@ OUString& SvxSearchDialog::BuildAttrText_Impl(
OUString& rStr,
void SvxSearchDialog::PaintAttrText_Impl()
{
OUString aDesc;
- BuildAttrText_Impl( aDesc, bSearch );
+ BuildAttrText_Impl(aDesc, m_bSearch);
- if ( !bFormat && !aDesc.isEmpty() )
- bFormat = true;
+ if (!m_bFormat && !aDesc.isEmpty())
+ m_bFormat = true;
bool bSetOptimalLayoutSize = false;
- if ( bSearch )
+ if (m_bSearch)
{
m_xSearchAttrText->set_label( aDesc );
if (!aDesc.isEmpty() && !m_xSearchAttrText->get_visible())
@@ -2220,78 +2207,78 @@ void SvxSearchDialog::SetModifyFlag_Impl( const
weld::Widget* pCtrl )
{
if (m_xSearchLB.get() == pCtrl)
{
- nModifyFlag |= ModifyFlags::Search;
+ m_nModifyFlag |= ModifyFlags::Search;
m_xSearchLB->set_entry_message_type(weld::EntryMessageType::Normal);
if (!SvxSearchDialogWrapper::GetSearchLabel().isEmpty())
SvxSearchDialogWrapper::SetSearchLabel(u""_ustr);
}
else if ( m_xReplaceLB.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Replace;
+ m_nModifyFlag |= ModifyFlags::Replace;
else if ( m_xWordBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Word;
+ m_nModifyFlag |= ModifyFlags::Word;
else if ( m_xMatchCaseCB.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Exact;
+ m_nModifyFlag |= ModifyFlags::Exact;
else if ( m_xReplaceBackwardsCB.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Backwards;
+ m_nModifyFlag |= ModifyFlags::Backwards;
else if ( m_xNotesBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Notes;
+ m_nModifyFlag |= ModifyFlags::Notes;
else if ( m_xSelectionBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Selection;
+ m_nModifyFlag |= ModifyFlags::Selection;
else if ( m_xRegExpBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Regexp;
+ m_nModifyFlag |= ModifyFlags::Regexp;
else if ( m_xWildcardBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Wildcard;
+ m_nModifyFlag |= ModifyFlags::Wildcard;
else if ( m_xLayoutBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Layout;
+ m_nModifyFlag |= ModifyFlags::Layout;
else if ( m_xSimilarityBox.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Similarity;
+ m_nModifyFlag |= ModifyFlags::Similarity;
else if ( m_xCalcSearchInLB.get() == pCtrl )
{
- nModifyFlag |= ModifyFlags::Formulas;
- nModifyFlag |= ModifyFlags::Values;
- nModifyFlag |= ModifyFlags::CalcNotes;
+ m_nModifyFlag |= ModifyFlags::Formulas;
+ m_nModifyFlag |= ModifyFlags::Values;
+ m_nModifyFlag |= ModifyFlags::CalcNotes;
}
else if ( m_xRowsBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Rows;
+ m_nModifyFlag |= ModifyFlags::Rows;
else if ( m_xColumnsBtn.get() == pCtrl )
- nModifyFlag |= ModifyFlags::Columns;
+ m_nModifyFlag |= ModifyFlags::Columns;
else if ( m_xAllSheetsCB.get() == pCtrl )
- nModifyFlag |= ModifyFlags::AllTables;
+ m_nModifyFlag |= ModifyFlags::AllTables;
}
void SvxSearchDialog::SaveToModule_Impl()
{
- if ( !pSearchItem )
+ if (!m_pSearchItem)
return;
if ( m_xLayoutBtn->get_active() )
{
- pSearchItem->SetSearchString ( m_xSearchTmplLB->get_active_text() );
- pSearchItem->SetReplaceString( m_xReplaceTmplLB->get_active_text() );
+ m_pSearchItem->SetSearchString(m_xSearchTmplLB->get_active_text());
+ m_pSearchItem->SetReplaceString(m_xReplaceTmplLB->get_active_text());
}
else
{
- pSearchItem->SetSearchString ( m_xSearchLB->get_active_text() );
- pSearchItem->SetReplaceString( m_xReplaceLB->get_active_text() );
+ m_pSearchItem->SetSearchString(m_xSearchLB->get_active_text());
+ m_pSearchItem->SetReplaceString(m_xReplaceLB->get_active_text());
Remember_Impl(true);
}
- pSearchItem->SetRegExp( false );
- pSearchItem->SetWildcard( false );
- pSearchItem->SetLevenshtein( false );
+ m_pSearchItem->SetRegExp(false);
+ m_pSearchItem->SetWildcard(false);
+ m_pSearchItem->SetLevenshtein(false);
if (GetCheckBoxValue(*m_xRegExpBtn))
- pSearchItem->SetRegExp( true );
+ m_pSearchItem->SetRegExp(true);
else if (GetCheckBoxValue(*m_xWildcardBtn))
- pSearchItem->SetWildcard( true );
+ m_pSearchItem->SetWildcard(true);
else if (GetCheckBoxValue(*m_xSimilarityBox))
- pSearchItem->SetLevenshtein( true );
+ m_pSearchItem->SetLevenshtein(true);
- pSearchItem->SetWordOnly(GetCheckBoxValue(*m_xWordBtn));
- pSearchItem->SetBackward(GetCheckBoxValue(*m_xReplaceBackwardsCB));
- pSearchItem->SetNotes(GetCheckBoxValue(*m_xNotesBtn));
- pSearchItem->SetPattern(GetCheckBoxValue(*m_xLayoutBtn));
- pSearchItem->SetSelection(GetCheckBoxValue(*m_xSelectionBtn));
- pSearchItem->SetUseAsianOptions(GetCheckBoxValue(*m_xJapOptionsCB));
+ m_pSearchItem->SetWordOnly(GetCheckBoxValue(*m_xWordBtn));
+ m_pSearchItem->SetBackward(GetCheckBoxValue(*m_xReplaceBackwardsCB));
+ m_pSearchItem->SetNotes(GetCheckBoxValue(*m_xNotesBtn));
+ m_pSearchItem->SetPattern(GetCheckBoxValue(*m_xLayoutBtn));
+ m_pSearchItem->SetSelection(GetCheckBoxValue(*m_xSelectionBtn));
+ m_pSearchItem->SetUseAsianOptions(GetCheckBoxValue(*m_xJapOptionsCB));
SvtSearchOptions aOpt;
aOpt.SetIgnoreDiacritics_CTL(GetNegatedCheckBoxValue(*m_xIncludeDiacritics));
@@ -2299,29 +2286,30 @@ void SvxSearchDialog::SaveToModule_Impl()
aOpt.Commit();
TransliterationFlags nFlags = GetTransliterationFlags();
- if( !pSearchItem->IsUseAsianOptions())
+ if (!m_pSearchItem->IsUseAsianOptions())
nFlags &= TransliterationFlags::IGNORE_CASE |
TransliterationFlags::IGNORE_WIDTH;
if (GetNegatedCheckBoxValue(*m_xIncludeDiacritics))
nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
if (GetNegatedCheckBoxValue(*m_xIncludeKashida))
nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
- pSearchItem->SetTransliterationFlags( nFlags );
+ m_pSearchItem->SetTransliterationFlags(nFlags);
- if ( !bWriter )
+ if (!m_bWriter)
{
if (m_xCalcSearchInLB->get_active() != -1)
- pSearchItem->SetCellType(
static_cast<SvxSearchCellType>(m_xCalcSearchInLB->get_active()) );
+ m_pSearchItem->SetCellType(
+
static_cast<SvxSearchCellType>(m_xCalcSearchInLB->get_active()));
- pSearchItem->SetRowDirection( m_xRowsBtn->get_active() );
- pSearchItem->SetAllTables( m_xAllSheetsCB->get_active() );
- pSearchItem->SetSearchFormatted( m_xSearchFormattedCB->get_active() );
+ m_pSearchItem->SetRowDirection(m_xRowsBtn->get_active());
+ m_pSearchItem->SetAllTables(m_xAllSheetsCB->get_active());
+ m_pSearchItem->SetSearchFormatted(m_xSearchFormattedCB->get_active());
}
- pSearchItem->SetCommand( SvxSearchCmd::FIND );
- nModifyFlag = ModifyFlags::NONE;
- const SfxPoolItem* ppArgs[] = { pSearchItem.get(), nullptr };
- rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SfxCallMode::SLOT,
ppArgs );
+ m_pSearchItem->SetCommand(SvxSearchCmd::FIND);
+ m_nModifyFlag = ModifyFlags::NONE;
+ const SfxPoolItem* ppArgs[] = { m_pSearchItem.get(), nullptr };
+ m_rBindings.GetDispatcher()->Execute(SID_SEARCH_ITEM, SfxCallMode::SLOT,
ppArgs);
}
short SvxSearchDialog::executeSubDialog(VclAbstractDialog * dialog) {
@@ -2347,7 +2335,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper(
vcl::Window* _pParent, sal_uInt1
pBindings->Update( SID_SEARCH_OPTIONS );
pBindings->Update( SID_SEARCH_SEARCHSET );
pBindings->Update( SID_SEARCH_REPLACESET );
- dialog->bConstruct = false;
+ dialog->m_bConstruct = false;
}
SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
commit 7665fd196926e376f104d285aab5883bc5333a27
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 29 10:39:59 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 30 07:45:34 2025 +0200
cui: Resave similaritysearchdialog.ui with glade 3.40
This dialog can be triggered as follows:
* In Writer, select "Tools" -> "Find and Replace"
* check the "Similarity search" checkbox in the dialog
* click on the "Similarities..." button
Change-Id: I98c0d04c94ebcc0324c5c829f01d80dff975ba45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185990
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui
b/cui/uiconfig/ui/similaritysearchdialog.ui
index cf9e51c4ac26..6ff9ecd8f40c 100644
--- a/cui/uiconfig/ui/similaritysearchdialog.ui
+++ b/cui/uiconfig/ui/similaritysearchdialog.ui
@@ -1,51 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">30</property>
<property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">30</property>
<property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">30</property>
<property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkDialog" id="SimilaritySearchDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="title" translatable="yes"
context="similaritysearchdialog|SimilaritySearchDialog">Similarity
Search</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default_width">0</property>
- <property name="default_height">0</property>
- <property name="type_hint">dialog</property>
+ <property name="default-width">0</property>
+ <property name="default-height">0</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area3">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -58,8 +58,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -72,8 +72,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="margin-end">6</property>
<property name="use-underline">True</property>
</object>
@@ -88,70 +88,70 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=4 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="similaritysearchdialog|label2">_Exchange characters:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">otherfld</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">otherfld</property>
<property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="similaritysearchdialog|label3">_Add characters:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">longerfld</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">longerfld</property>
<property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="similaritysearchdialog|label4">_Remove characters:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">shorterfld</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">shorterfld</property>
<property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="relaxbox">
<property name="label" translatable="yes"
context="similaritysearchdialog|relaxbox">_Combine</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="relaxbox-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|relaxbox">Searches for a term that
matches any combination of the similarity search settings.</property>
@@ -159,17 +159,17 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="otherfld">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment1</property>
<child internal-child="accessible">
<object class="AtkObject" id="otherfld-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="similaritysearchdialog|extended_tip|otherfld">Enter
the number of characters in the search term that can be exchanged.</property>
@@ -177,16 +177,16 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="longerfld">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment2</property>
<child internal-child="accessible">
<object class="AtkObject" id="longerfld-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|longerfld">Enter the maximum
number of characters by which a word can exceed the number of characters in the
search term.</property>
@@ -194,16 +194,16 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="shorterfld">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment3</property>
+ <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment3</property>
<child internal-child="accessible">
<object class="AtkObject" id="shorterfld-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|shorterfld">Enter the number of
characters by which a word can be shorter than the search term.</property>
@@ -211,8 +211,8 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
</object>
@@ -229,9 +229,6 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="accessible">
<object class="AtkObject" id="SimilaritySearchDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="similaritysearchdialog|extended_tip|SimilaritySearchDialog">Find terms
that are similar to the Find text. Select this checkbox, and then click the
Similarities button to define the similarity options.</property>
