diff options
Diffstat (limited to 'extensions/source/propctrlr/propertyeditor.hxx')
| -rw-r--r-- | extensions/source/propctrlr/propertyeditor.hxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 6b20d6ce232e..96199b31af4c 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX -#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX +#pragma once #include "browserpage.hxx" #include "pcrcommon.hxx" @@ -47,7 +46,7 @@ namespace pcr OUString sLabel; std::unique_ptr<OBrowserPage> xPage; PropertyPage(); - PropertyPage(sal_uInt16 nPagePos, const OUString& rLabel, std::unique_ptr<OBrowserPage> pPage); + PropertyPage(sal_uInt16 nPagePos, OUString aLabel, std::unique_ptr<OBrowserPage> pPage); }; std::unique_ptr<weld::Container> m_xContainer; @@ -58,7 +57,7 @@ namespace pcr IPropertyLineListener* m_pListener; IPropertyControlObserver* m_pObserver; sal_uInt16 m_nNextId; - Link<LinkParamNone*,void> m_aPageActivationHandler; + Link<const OUString&,void> m_aPageActivationHandler; bool m_bHasHelpSection; MapStringToPageId m_aPropertyPageIds; @@ -76,8 +75,8 @@ namespace pcr bool HasHelpSection() const { return m_bHasHelpSection; } void SetHelpText( const OUString& _rHelpText ); - void SetHelpId( const OString& sHelpId ); - sal_uInt16 AppendPage( const OUString& r, const OString& _rHelpId ); + void SetHelpId( const OUString& sHelpId ); + sal_uInt16 AppendPage( const OUString& r, const OUString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage() const; @@ -96,11 +95,11 @@ namespace pcr void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); - void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } + void setPageActivationHandler(const Link<const OUString&,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } Size get_preferred_size() const; - weld::Container* getWidget() const { return m_xTabControl.get(); } + weld::Widget* getWidget() const { return m_xTabControl.get(); } void Show() { m_xTabControl->show(); } void Hide() { m_xTabControl->hide(); } @@ -123,15 +122,13 @@ namespace pcr void enableHelpSection( OBrowserPage& _rPage, const void* ); static void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString ); - DECL_LINK(OnPageDeactivate, const OString&, bool); - DECL_LINK(OnPageActivate, const OString&, void); + DECL_LINK(OnPageDeactivate, const OUString&, bool); + DECL_LINK(OnPageActivate, const OUString&, void); }; } // namespace pcr -#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |