diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-10-10 23:57:22 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-11 09:21:42 +0100 |
commit | d7cdef2c49b9c13f8c726d1067ed5cf3cfd38746 (patch) | |
tree | 428ed5cfae50c9673cc6d20cb697a1f3c47dab46 /vcl/inc | |
parent | 258483a58e49733b80745ffd97ba5b27a125da19 (diff) |
VCLMultiLineEdit->VclMultiLineEdit to align with other new widget names
Change-Id: I97b7459b9c5c680d624234e8c51a5997a02fd5f7
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/vcl/builder.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/msgbox.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/vclmedit.hxx | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index ef3e85c07472..8ef33278acc2 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -14,6 +14,7 @@ #include <vcl/window.hxx> #include <xmlreader/xmlreader.hxx> #include <map> +#include <set> #include <stack> #include <vector> @@ -112,6 +113,7 @@ private: std::vector<ButtonImageWidgetMap> m_aButtonImageWidgetMaps; StockMap m_aStockMap; Translations m_aTranslations; + std::set<Window*> m_aRedundantParentWidgets; }; OString getTranslation(const OString &rId, const OString &rProperty) const; diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx index 2bb73abed728..8a3fd1d690a3 100644 --- a/vcl/inc/vcl/msgbox.hxx +++ b/vcl/inc/vcl/msgbox.hxx @@ -34,7 +34,7 @@ #include <vcl/btndlg.hxx> #include <vcl/image.hxx> #include <vcl/bitmap.hxx> -class VCLMultiLineEdit; +class VclMultiLineEdit; class FixedImage; class CheckBox; @@ -67,7 +67,7 @@ class CheckBox; class VCL_DLLPUBLIC MessBox : public ButtonDialog { protected: - VCLMultiLineEdit* mpVCLMultiLineEdit; + VclMultiLineEdit* mpVCLMultiLineEdit; FixedImage* mpFixedImage; XubString maMessText; Image maImage; diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx index 519cb0e0948c..6287419778a5 100644 --- a/vcl/inc/vcl/vclmedit.hxx +++ b/vcl/inc/vcl/vclmedit.hxx @@ -39,7 +39,7 @@ class Timer; class ExtTextEngine; class ExtTextView; -class VCL_DLLPUBLIC VCLMultiLineEdit : public Edit +class VCL_DLLPUBLIC VclMultiLineEdit : public Edit { private: ImpSvMEdit* pImpSvMEdit; @@ -66,9 +66,9 @@ protected: ScrollBar* GetVScrollBar() const; public: - VCLMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); - VCLMultiLineEdit( Window* pParent, const ResId& rResId ); - virtual ~VCLMultiLineEdit(); + VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + VclMultiLineEdit( Window* pParent, const ResId& rResId ); + virtual ~VclMultiLineEdit(); virtual void Modify(); @@ -139,7 +139,7 @@ public: void SetTextSelectable( sal_Bool bTextSelectable ); }; -inline sal_uLong VCLMultiLineEdit::IsUpdateDataEnabled() const +inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const { return pUpdateDataTimer ? pUpdateDataTimer->GetTimeout() : 0; } |