diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-10-01 11:06:53 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-01 13:23:45 +0300 |
commit | 69222d71221d0ec81a3dbf01789456bcf2dde0da (patch) | |
tree | 3e2237756ed48159a9f5c21c2cc607a8911fda0a | |
parent | 8c089f59b83a80aa5c2c5cba8e9cf7bfbaf426a9 (diff) |
Deduplication of TemplatePopup_Impl for disable-dynlinking
Change-Id: I3e49ab8bd3411be8fcfa7ab43b50cbb2d82b6de0
-rw-r--r-- | sd/source/ui/app/tmplctrl.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/utlui/tmplctrl.cxx | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 3978631d5425..63abbc568437 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -31,12 +31,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem ); -// class TemplatePopup_Impl -------------------------------------------------- +// class SdTemplatePopup_Impl -------------------------------------------------- -class TemplatePopup_Impl : public PopupMenu +class SdTemplatePopup_Impl : public PopupMenu { public: - TemplatePopup_Impl(); + SdTemplatePopup_Impl(); sal_uInt16 GetCurId() const { return nCurId; } @@ -48,7 +48,7 @@ private: // ----------------------------------------------------------------------- -TemplatePopup_Impl::TemplatePopup_Impl() : +SdTemplatePopup_Impl::SdTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { @@ -56,7 +56,7 @@ TemplatePopup_Impl::TemplatePopup_Impl() : // ----------------------------------------------------------------------- -void TemplatePopup_Impl::Select() +void SdTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); } @@ -114,7 +114,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) return; CaptureMouse(); - TemplatePopup_Impl aPop; + SdTemplatePopup_Impl aPop; { const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index b43d9c682f80..fba6dd705351 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -36,12 +36,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem ); -// class TemplatePopup_Impl -------------------------------------------------- +// class SwTemplatePopup_Impl -------------------------------------------------- -class TemplatePopup_Impl : public PopupMenu +class SwTemplatePopup_Impl : public PopupMenu { public: - TemplatePopup_Impl(); + SwTemplatePopup_Impl(); sal_uInt16 GetCurId() const { return nCurId; } @@ -51,13 +51,13 @@ private: virtual void Select(); }; -TemplatePopup_Impl::TemplatePopup_Impl() : +SwTemplatePopup_Impl::SwTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { } -void TemplatePopup_Impl::Select() +void SwTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); } @@ -98,7 +98,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) GetStatusBar().GetItemText( GetId() ).Len() ) { CaptureMouse(); - TemplatePopup_Impl aPop; + SwTemplatePopup_Impl aPop; { SwView* pView = ::GetActiveView(); SwWrtShell* pWrtShell; |