summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx4
-rw-r--r--sw/source/ui/fldui/flddb.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx6
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx6
-rw-r--r--sw/source/ui/fldui/fldvar.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.hxx2
-rw-r--r--sw/source/ui/misc/bookmark.cxx2
-rw-r--r--sw/source/uibase/inc/bookmark.hxx2
-rw-r--r--sw/source/uibase/inc/condedit.hxx14
-rw-r--r--sw/source/uibase/inc/regionsw.hxx4
-rw-r--r--sw/source/uibase/utlui/condedit.cxx8
12 files changed, 27 insertions, 27 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 80960fe412ef..546d135f3432 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -334,7 +334,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
, m_xPasswdPB(m_xBuilder->weld_button("password"))
, m_xHideCB(m_xBuilder->weld_check_button("hide"))
, m_xConditionFT(m_xBuilder->weld_label("conditionft"))
- , m_xConditionED(new SwConditionEdit(m_xBuilder->weld_entry("condition")))
+ , m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry("condition")))
, m_xEditInReadonlyCB(m_xBuilder->weld_check_button("editinro"))
, m_xOK(m_xBuilder->weld_button("ok"))
, m_xOptionsPB(m_xBuilder->weld_button("options"))
@@ -1488,7 +1488,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(TabPageParent pParent, const SfxI
, m_xPasswdPB(m_xBuilder->weld_button("selectpassword"))
, m_xHideCB(m_xBuilder->weld_check_button("hide"))
, m_xConditionFT(m_xBuilder->weld_label("condlabel"))
- , m_xConditionED(new SwConditionEdit(m_xBuilder->weld_entry("withcond")))
+ , m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry("withcond")))
// edit in readonly sections
, m_xEditInReadonlyCB(m_xBuilder->weld_check_button("editable"))
{
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index d322e4658e20..cca2f31abaeb 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -41,7 +41,7 @@ SwFieldDBPage::SwFieldDBPage(TabPageParent pParent, const SfxItemSet *const pCor
, m_xDatabaseTLB(new SwDBTreeList(m_xBuilder->weld_tree_view("select")))
, m_xAddDBPB(m_xBuilder->weld_button("browse"))
, m_xCondition(m_xBuilder->weld_widget("condgroup"))
- , m_xConditionED(new SwConditionEdit(m_xBuilder->weld_entry("condition")))
+ , m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry("condition")))
, m_xValue(m_xBuilder->weld_widget("recgroup"))
, m_xValueED(m_xBuilder->weld_entry("recnumber"))
, m_xDBFormatRB(m_xBuilder->weld_radio_button("fromdatabasecb"))
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index f82d8dfc2b7c..c1ae1b8e5768 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -41,7 +41,7 @@ class SwFieldDBPage : public SwFieldPage
std::unique_ptr<SwDBTreeList> m_xDatabaseTLB;
std::unique_ptr<weld::Button> m_xAddDBPB;
std::unique_ptr<weld::Widget> m_xCondition;
- std::unique_ptr<SwConditionEdit> m_xConditionED;
+ std::unique_ptr<ConditionEdit> m_xConditionED;
std::unique_ptr<weld::Widget> m_xValue;
std::unique_ptr<weld::Entry> m_xValueED;
std::unique_ptr<weld::RadioButton> m_xDBFormatRB;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 9c18d44126b2..2ccb8864d1e3 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -47,14 +47,14 @@ SwFieldFuncPage::SwFieldFuncPage(TabPageParent pParent, const SfxItemSet *const
, m_xFormat(m_xBuilder->weld_widget("formatframe"))
, m_xFormatLB(m_xBuilder->weld_tree_view("format"))
, m_xNameFT(m_xBuilder->weld_label("nameft"))
- , m_xNameED(new SwConditionEdit(m_xBuilder->weld_entry("condFunction")))
+ , m_xNameED(new ConditionEdit(m_xBuilder->weld_entry("condFunction")))
, m_xValueGroup(m_xBuilder->weld_widget("valuegroup"))
, m_xValueFT(m_xBuilder->weld_label("valueft"))
, m_xValueED(m_xBuilder->weld_entry("value"))
, m_xCond1FT(m_xBuilder->weld_label("cond1ft"))
- , m_xCond1ED(new SwConditionEdit(m_xBuilder->weld_entry("cond1")))
+ , m_xCond1ED(new ConditionEdit(m_xBuilder->weld_entry("cond1")))
, m_xCond2FT(m_xBuilder->weld_label("cond2ft"))
- , m_xCond2ED(new SwConditionEdit(m_xBuilder->weld_entry("cond2")))
+ , m_xCond2ED(new ConditionEdit(m_xBuilder->weld_entry("cond2")))
, m_xMacroBT(m_xBuilder->weld_button("macro"))
, m_xListGroup(m_xBuilder->weld_widget("listgroup"))
, m_xListItemFT(m_xBuilder->weld_label("itemft"))
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 4013a94e9ddc..d10fb72382a7 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -42,14 +42,14 @@ class SwFieldFuncPage : public SwFieldPage
std::unique_ptr<weld::Widget> m_xFormat;
std::unique_ptr<weld::TreeView> m_xFormatLB;
std::unique_ptr<weld::Label> m_xNameFT;
- std::unique_ptr<SwConditionEdit> m_xNameED;
+ std::unique_ptr<ConditionEdit> m_xNameED;
std::unique_ptr<weld::Widget> m_xValueGroup;
std::unique_ptr<weld::Label> m_xValueFT;
std::unique_ptr<weld::Entry> m_xValueED;
std::unique_ptr<weld::Label> m_xCond1FT;
- std::unique_ptr<SwConditionEdit> m_xCond1ED;
+ std::unique_ptr<ConditionEdit> m_xCond1ED;
std::unique_ptr<weld::Label> m_xCond2FT;
- std::unique_ptr<SwConditionEdit> m_xCond2ED;
+ std::unique_ptr<ConditionEdit> m_xCond2ED;
std::unique_ptr<weld::Button> m_xMacroBT;
//controls of "Input list"
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 49c7f5f6584f..5d2c264033b7 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -48,7 +48,7 @@ SwFieldVarPage::SwFieldVarPage(TabPageParent pParent, const SfxItemSet *const pC
, m_xNameFT(m_xBuilder->weld_label("nameft"))
, m_xNameED(m_xBuilder->weld_entry("name"))
, m_xValueFT(m_xBuilder->weld_label("valueft"))
- , m_xValueED(new SwConditionEdit(m_xBuilder->weld_entry("value")))
+ , m_xValueED(new ConditionEdit(m_xBuilder->weld_entry("value")))
, m_xFormat(m_xBuilder->weld_widget("formatframe"))
, m_xNumFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("numformat")))
, m_xFormatLB(m_xBuilder->weld_tree_view("format"))
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 31b63495bf02..5838e2f96b00 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -40,7 +40,7 @@ class SwFieldVarPage : public SwFieldPage
std::unique_ptr<weld::Label> m_xNameFT;
std::unique_ptr<weld::Entry> m_xNameED;
std::unique_ptr<weld::Label> m_xValueFT;
- std::unique_ptr<SwConditionEdit> m_xValueED;
+ std::unique_ptr<ConditionEdit> m_xValueED;
std::unique_ptr<weld::Widget> m_xFormat;
std::unique_ptr<SwNumFormatTreeView> m_xNumFormatLB;
std::unique_ptr<weld::TreeView> m_xFormatLB;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 32631b20d2f5..4dc14e5deaf0 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -306,7 +306,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS,
, m_xRenameBtn(m_xBuilder->weld_button("rename"))
, m_xHideCB(m_xBuilder->weld_check_button("hide"))
, m_xConditionFT(m_xBuilder->weld_label("condlabel"))
- , m_xConditionED(new SwConditionEdit(m_xBuilder->weld_entry("withcond")))
+ , m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry("withcond")))
, m_xBookmarksBox(new BookmarkTable(m_xBuilder->weld_tree_view("bookmarks")))
{
m_xBookmarksBox->connect_changed(LINK(this, SwInsertBookmarkDlg, SelectionChangedHdl));
diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index 755783abd789..3b32dc6d27de 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -76,7 +76,7 @@ class SwInsertBookmarkDlg : public SfxDialogController
std::unique_ptr<weld::Button> m_xRenameBtn;
std::unique_ptr<weld::CheckButton> m_xHideCB;
std::unique_ptr<weld::Label> m_xConditionFT;
- std::unique_ptr<SwConditionEdit> m_xConditionED;
+ std::unique_ptr<ConditionEdit> m_xConditionED;
std::unique_ptr<BookmarkTable> m_xBookmarksBox;
DECL_LINK(ModifyHdl, weld::Entry&, void);
diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx
index 35e2ca4b63b6..6e2b8854cdb3 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.hxx
@@ -24,28 +24,28 @@
#include <vcl/weld.hxx>
#include <swdllapi.h>
-class SwConditionEdit;
+class ConditionEdit;
-class SW_DLLPUBLIC SwConditionEditDropTarget : public DropTargetHelper
+class SW_DLLPUBLIC ConditionEditDropTarget : public DropTargetHelper
{
private:
- SwConditionEdit& m_rEdit;
+ ConditionEdit& m_rEdit;
SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
public:
- SwConditionEditDropTarget(SwConditionEdit& rEdit);
+ ConditionEditDropTarget(ConditionEdit& rEdit);
};
-class SW_DLLPUBLIC SwConditionEdit
+class SW_DLLPUBLIC ConditionEdit
{
std::unique_ptr<weld::Entry> m_xControl;
- SwConditionEditDropTarget m_aDropTargetHelper;
+ ConditionEditDropTarget m_aDropTargetHelper;
bool bBrackets, bEnableDrop;
public:
- SwConditionEdit(std::unique_ptr<weld::Entry> xControl);
+ ConditionEdit(std::unique_ptr<weld::Entry> xControl);
OUString get_text() const { return m_xControl->get_text(); }
void set_text(const OUString& rText) { m_xControl->set_text(rText); }
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 60e5bb2802cd..aa10c154d2fa 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -84,7 +84,7 @@ class SwEditRegionDlg : public SfxDialogController
std::unique_ptr<weld::Button> m_xPasswdPB;
std::unique_ptr<weld::CheckButton> m_xHideCB;
std::unique_ptr<weld::Label> m_xConditionFT;
- std::unique_ptr<SwConditionEdit> m_xConditionED;
+ std::unique_ptr<ConditionEdit> m_xConditionED;
// #114856# edit in readonly sections
std::unique_ptr<weld::CheckButton> m_xEditInReadonlyCB;
std::unique_ptr<weld::Button> m_xOK;
@@ -154,7 +154,7 @@ class SwInsertSectionTabPage : public SfxTabPage
std::unique_ptr<weld::Button> m_xPasswdPB;
std::unique_ptr<weld::CheckButton> m_xHideCB;
std::unique_ptr<weld::Label> m_xConditionFT;
- std::unique_ptr<SwConditionEdit> m_xConditionED;
+ std::unique_ptr<ConditionEdit> m_xConditionED;
// #114856# edit in readonly sections
std::unique_ptr<weld::CheckButton> m_xEditInReadonlyCB;
diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index 573d26d9a0e3..b8147bd7c4bc 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -26,7 +26,7 @@
using namespace ::svx;
using namespace ::com::sun::star::uno;
-SwConditionEdit::SwConditionEdit(std::unique_ptr<weld::Entry> xControl)
+ConditionEdit::ConditionEdit(std::unique_ptr<weld::Entry> xControl)
: m_xControl(std::move(xControl))
, m_aDropTargetHelper(*this)
, bBrackets(true)
@@ -34,7 +34,7 @@ SwConditionEdit::SwConditionEdit(std::unique_ptr<weld::Entry> xControl)
{
}
-sal_Int8 SwConditionEditDropTarget::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
+sal_Int8 ConditionEditDropTarget::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
{
return OColumnTransferable::canExtractColumnDescriptor
( GetDataFlavorExVector(),
@@ -43,13 +43,13 @@ sal_Int8 SwConditionEditDropTarget::AcceptDrop( const AcceptDropEvent& /*rEvt*/
: DND_ACTION_NONE;
}
-SwConditionEditDropTarget::SwConditionEditDropTarget(SwConditionEdit& rEdit)
+ConditionEditDropTarget::ConditionEditDropTarget(ConditionEdit& rEdit)
: DropTargetHelper(rEdit.get_widget().get_drop_target())
, m_rEdit(rEdit)
{
}
-sal_Int8 SwConditionEditDropTarget::ExecuteDrop( const ExecuteDropEvent& rEvt )
+sal_Int8 ConditionEditDropTarget::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
sal_Int8 nRet = DND_ACTION_NONE;
if (m_rEdit.GetDropEnable())
generated by cgit (git 2.34.1) at 2025-03-01 21:02:26 +0000