summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/macrodlg.hxx2
-rw-r--r--cui/source/inc/SpellDialog.hxx2
-rw-r--r--cui/source/inc/hyphen.hxx2
-rw-r--r--cui/source/inc/scriptdlg.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx4
-rw-r--r--sw/source/ui/inc/wordcountdialog.hxx2
-rw-r--r--vcl/inc/vcl/button.hxx7
-rw-r--r--vcl/source/control/button.cxx7
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx2
13 files changed, 27 insertions, 11 deletions
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 339de6c54a61..1d1854d4bda4 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -58,7 +58,7 @@ private:
SvTreeListBox* m_pMacroBox;
PushButton* m_pRunButton;
- PushButton* m_pCloseButton;
+ CloseButton* m_pCloseButton;
PushButton* m_pAssignButton;
PushButton* m_pEditButton;
PushButton* m_pDelButton;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 5cfeeaa1ccc1..b7b4ef066724 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -151,7 +151,7 @@ private:
PushButton* m_pOptionsPB;
PushButton* m_pUndoPB;
- PushButton* m_pClosePB;
+ CloseButton* m_pClosePB;
OUString m_sResumeST;
OUString m_sIgnoreOnceST;
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 73c95b3f5ae1..816a00464696 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -51,7 +51,7 @@ class SvxHyphenWordDialog : public SfxModalDialog
PushButton* m_pContBtn;
PushButton* m_pDelBtn;
PushButton* m_pHyphAll;
- PushButton* m_pCloseBtn;
+ CloseButton* m_pCloseBtn;
String aLabel;
SvxSpellWrapper* pHyphWrapper;
uno::Reference< linguistic2::XHyphenator > xHyphenator;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index bfbe49f59cc2..6364dbb06428 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -142,7 +142,7 @@ protected:
SFTreeListBox* m_pScriptsBox;
PushButton* m_pRunButton;
- PushButton* m_pCloseButton;
+ CloseButton* m_pCloseButton;
PushButton* m_pCreateButton;
PushButton* m_pEditButton;
PushButton* m_pRenameButton;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 90b790a7d0eb..023d16d8dc7c 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -101,7 +101,7 @@ class ExtMgrDialog : public ModelessDialog,
ExtBoxWithBtns_Impl *m_pExtensionBox;
PushButton *m_pAddBtn;
PushButton *m_pUpdateBtn;
- PushButton *m_pCloseBtn;
+ CloseButton *m_pCloseBtn;
CheckBox *m_pBundledCbx;
CheckBox *m_pSharedCbx;
CheckBox *m_pUserCbx;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 2b2c5becceea..7ebc3fca0513 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -135,7 +135,7 @@ private:
PushButton* m_pPBDelete;
PushButton* m_pPBSave;
PushButton* m_pPBOpen;
- PushButton* m_pPBClose;
+ CloseButton* m_pPBClose;
bool m_bIsClosable;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 589971aaee7e..7fccd4ed406d 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -79,7 +79,7 @@ private:
PushButton* m_pPBImportBrowse;
PushButton* m_pPBRecentFile;
FixedText* m_pFTNameOfRecentFile;
- PushButton* m_pPBClose;
+ CloseButton* m_pPBClose;
filter_info_impl* m_pFilterInfo;
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index f21ef2a24a91..f09254e2db94 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.hxx
@@ -80,7 +80,7 @@ class SwIndexMarkPane
PushButton* m_pOKBT;
- PushButton* m_pCloseBT;
+ CloseButton* m_pCloseBT;
PushButton* m_pDelBT;
PushButton* m_pPrevSameBT;
@@ -193,7 +193,7 @@ class SwAuthorMarkPane
ListBox* m_pEntryLB;
PushButton* m_pActionBT;
- PushButton* m_pCloseBT;
+ CloseButton* m_pCloseBT;
PushButton* m_pCreateEntryPB;
PushButton* m_pEditEntryPB;
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index c132de712551..56c2b09da253 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -44,7 +44,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog
FixedText* m_pCjkcharsLabelFT;
- PushButton* m_pClosePB;
+ CloseButton* m_pClosePB;
SW_DLLPRIVATE DECL_LINK( CloseHdl, void* );
public:
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 478ec9a3243a..46be2854e301 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -247,6 +247,13 @@ public:
virtual void Click();
};
+class VCL_DLLPUBLIC CloseButton : public CancelButton
+{
+public:
+ CloseButton(Window* pParent, WinBits nStyle = 0);
+};
+
+
// --------------
// - HelpButton -
// --------------
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 82d037892201..8ad4c6cb6324 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1866,6 +1866,13 @@ void CancelButton::Click()
}
}
+CloseButton::CloseButton( Window* pParent, WinBits nStyle )
+ : CancelButton(pParent, nStyle)
+{
+ SetText( Button::GetStandardText( BUTTON_CLOSE ) );
+ SetHelpText( Button::GetStandardHelpText( BUTTON_CLOSE ) );
+}
+
// =======================================================================
void HelpButton::ImplInit( Window* pParent, WinBits nStyle )
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d9defdfc932f..5e6fc5ce9672 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -506,6 +506,8 @@ namespace
pWindow = new OKButton(pParent, nBits);
else if (sType == "gtk-cancel")
pWindow = new CancelButton(pParent, nBits);
+ else if (sType == "gtk-close")
+ pWindow = new CloseButton(pParent, nBits);
else if (sType == "gtk-help")
pWindow = new HelpButton(pParent, nBits);
else
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 390573d7c6e3..03d660140c86 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -84,7 +84,7 @@ private:
PushButton* m_pAddBtn;
PushButton* m_pRemoveBtn;
- PushButton* m_pCloseBtn;
+ CloseButton* m_pCloseBtn;
OUString m_sODFVersion;
//Signals if the document contains already a document signature. This is only
generated by cgit (git 2.34.1) at 2024-10-28 15:06:38 +0000