diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-01 11:06:53 +0300 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:56:50 +0200 |
| commit | 1297ded2de9c8eaf0dd460fa4353a3e06765c400 (patch) | |
| tree | ca645f236f470af44ef39d1e35a4bed2d30761d9 /sd | |
| parent | configure.in: edit message checking for new GStreamer 1.0 (diff) | |
| download | core-1297ded2de9c8eaf0dd460fa4353a3e06765c400.tar.gz core-1297ded2de9c8eaf0dd460fa4353a3e06765c400.zip | |
Deduplication of TemplatePopup_Impl for disable-dynlinking
Change-Id: I3e49ab8bd3411be8fcfa7ab43b50cbb2d82b6de0
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/tmplctrl.cxx | 12 |
1 files changed, 6 insertions, 6 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); |