summaryrefslogtreecommitdiff
path: root/forms/source/inc/formnavigation.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'forms/source/inc/formnavigation.hxx')
-rw-r--r--forms/source/inc/formnavigation.hxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 5a25dd89667e..03715d28aba8 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX
-#define INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX
+#pragma once
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase2.hxx>
#include "featuredispatcher.hxx"
+#include "controlfeatureinterception.hxx"
#include <vector>
#include <map>
#include <memory>
@@ -35,7 +35,6 @@ namespace frm
class UrlTransformer;
- class ControlFeatureInterception;
//= OFormNavigationHelper
@@ -63,8 +62,8 @@ namespace frm
private:
css::uno::Reference< css::uno::XComponentContext >
m_xORB;
- ::std::unique_ptr< ControlFeatureInterception >
- m_pFeatureInterception;
+ ControlFeatureInterception
+ m_aFeatureInterception;
// all supported features
FeatureMap m_aSupportedFeatures;
@@ -204,7 +203,7 @@ namespace frm
the id of the feature URL, or -1 if the URl is not known
(which is a valid usage)
*/
- static sal_Int16 getFeatureId( const OUString& _rCompleteURL );
+ static sal_Int16 getFeatureId( std::u16string_view _rCompleteURL );
private:
OFormNavigationMapper( const OFormNavigationMapper& ) = delete;
@@ -215,6 +214,4 @@ namespace frm
} // namespace frm
-#endif // INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */