summaryrefslogtreecommitdiff
path: root/include/sfx2/evntconf.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/sfx2/evntconf.hxx')
-rw-r--r--include/sfx2/evntconf.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 5db89bc023b6..86769b324f95 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -35,9 +35,9 @@ class SvxMacroTableDtor;
struct SFX2_DLLPUBLIC SfxEventName
{
- SvMacroItemId const mnId;
- OUString const maEventName;
- OUString const maUIName;
+ SvMacroItemId mnId;
+ OUString maEventName;
+ OUString maUIName;
SfxEventName( SvMacroItemId nId,
const OUString& rEventName,
@@ -50,7 +50,7 @@ struct SFX2_DLLPUBLIC SfxEventName
class SFX2_DLLPUBLIC SfxEventNamesList
{
private:
- ::std::vector< std::unique_ptr<SfxEventName> > aEventNamesList;
+ ::std::vector< SfxEventName > aEventNamesList;
public:
SfxEventNamesList() {}
@@ -60,10 +60,10 @@ public:
size_t size() const { return aEventNamesList.size(); };
- SfxEventName* at( size_t Index ) const
- { return Index < aEventNamesList.size() ? aEventNamesList[ Index ].get() : nullptr; }
+ SfxEventName& at( size_t Index ) { return aEventNamesList[ Index ]; }
+ SfxEventName const & at( size_t Index ) const { return aEventNamesList[ Index ]; }
- void push_back( std::unique_ptr<SfxEventName> Item ) { aEventNamesList.push_back( std::move(Item) ); }
+ void push_back( SfxEventName Item ) { aEventNamesList.push_back( std::move(Item) ); }
};
class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem