summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx3
-rw-r--r--sfx2/source/doc/oleprops.hxx3
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx3
-rw-r--r--sfx2/source/inc/docundomanager.hxx3
4 files changed, 4 insertions, 8 deletions
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 42605dc29efe..11ee26436345 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -256,8 +256,7 @@ public:
namespace
{
- typedef std::vector<std::unique_ptr<SfxFilterMatcher_Impl> > SfxFilterMatcherArr_Impl;
- static SfxFilterMatcherArr_Impl aImplArr;
+ static std::vector<std::unique_ptr<SfxFilterMatcher_Impl> > aImplArr;
static int nSfxFilterMatcherCount;
SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const OUString &rName)
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 78c1ac9c29e2..3ca0ddddeb42 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -121,8 +121,7 @@ public:
void SetCodePage( sal_uInt16 nCodePage );
private:
- typedef std::shared_ptr< rtl_TextEncoding > TextEncRef;
- TextEncRef mxTextEnc;
+ std::shared_ptr< rtl_TextEncoding > mxTextEnc;
};
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1cb5ff308c37..2b25ad1f993c 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1072,8 +1072,7 @@ void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XContr
namespace
{
- typedef ::cppu::WeakImplHelper< XUndoAction > ControllerLockUndoAction_Base;
- class ControllerLockUndoAction : public ControllerLockUndoAction_Base
+ class ControllerLockUndoAction : public ::cppu::WeakImplHelper< XUndoAction >
{
public:
ControllerLockUndoAction( const Reference< XModel >& i_model, const bool i_undoIsUnlock )
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 108de6fbaf1c..51b564e6e683 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -96,9 +96,8 @@ namespace sfx2
{
//= DocumentUndoManager
- typedef ::cppu::WeakImplHelper <css::document::XUndoManager> DocumentUndoManager_Base;
struct DocumentUndoManager_Impl;
- class DocumentUndoManager :public DocumentUndoManager_Base
+ class DocumentUndoManager :public ::cppu::WeakImplHelper<css::document::XUndoManager>
,public SfxModelSubComponent
{
friend struct DocumentUndoManager_Impl;