[Libreoffice-commits] core.git: filter/inc include/comphelper include/cppcanvas include/oox sc/inc sdext/source sfx2/source slideshow/source svx/source ucb/source unotools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Feb 28 09:35:48 UTC 2019
filter/inc/gfxtypes.hxx | 6 ------
include/comphelper/propagg.hxx | 1 -
include/comphelper/propertycontainerhelper.hxx | 1 -
include/cppcanvas/canvasgraphic.hxx | 2 --
include/cppcanvas/sprite.hxx | 2 --
include/oox/drawingml/clrscheme.hxx | 2 --
sc/inc/dptabres.hxx | 2 --
sdext/source/pdfimport/inc/pdfiprocessor.hxx | 2 --
sfx2/source/control/objface.cxx | 2 --
slideshow/source/inc/animation.hxx | 2 --
slideshow/source/inc/cursormanager.hxx | 2 --
slideshow/source/inc/expressionnode.hxx | 2 --
slideshow/source/inc/unoviewcontainer.hxx | 2 --
slideshow/source/inc/vieweventhandler.hxx | 1 -
svx/source/inc/fmexpl.hxx | 2 --
ucb/source/core/FileAccess.cxx | 2 --
unotools/source/config/eventcfg.cxx | 1 -
17 files changed, 34 deletions(-)
New commits:
commit 376ee49f68384cf16aec57d54506378b67ccd402
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 28 09:15:10 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 28 10:35:22 2019 +0100
remove some unused typedefs
Change-Id: I7775a7d86e9641cd514e58f03d3727d2ad846120
Reviewed-on: https://gerrit.libreoffice.org/68485
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/filter/inc/gfxtypes.hxx b/filter/inc/gfxtypes.hxx
index 135aa5fd4988..365e381c0ab4 100644
--- a/filter/inc/gfxtypes.hxx
+++ b/filter/inc/gfxtypes.hxx
@@ -315,12 +315,6 @@ namespace std
};
}
-namespace svgi
-{
-typedef std::unordered_set<State> StatePool;
-typedef std::unordered_map<sal_Int32, State> StateMap;
-} // namespace svgi
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index cb0b1749b36e..3e153a64a39b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -61,7 +61,6 @@ namespace internal
};
typedef std::map< sal_Int32, OPropertyAccessor > PropertyAccessorMap;
- typedef PropertyAccessorMap::iterator PropertyAccessorMapIterator;
typedef PropertyAccessorMap::const_iterator ConstPropertyAccessorMapIterator;
}
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index 0b5a178f6e4a..6564cc0f85b3 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -72,7 +72,6 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
class COMPHELPER_DLLPUBLIC OPropertyContainerHelper
{
typedef ::std::vector< css::uno::Any > PropertyContainer;
- typedef PropertyContainer::const_iterator ConstPropertyContainerIterator;
PropertyContainer m_aHoldProperties;
// the properties which are hold by this class' instance, not the derived one's
diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index 8f1797ab9045..501df5b51749 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -75,8 +75,6 @@ namespace cppcanvas
virtual bool draw() const = 0;
};
-
- typedef std::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 52b967ee0231..b52bffd90e83 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -97,8 +97,6 @@ namespace cppcanvas
*/
virtual void setPriority( double fPriority ) = 0;
};
-
- typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_SPRITE_HXX
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 8b99b8523d77..80c932b44a1e 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -90,8 +90,6 @@ public:
::Color& rColor) const;
};
-typedef std::shared_ptr< ClrScheme > ClrSchemePtr;
-
} }
#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 0a20f3cffa76..13eeb5fc5135 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -483,8 +483,6 @@ public:
ScDPDataDimension* GetChildDimension() { return pChildDimension.get(); }
};
-typedef std::vector<ScDPDataMember*> ScDPDataMembers;
-
// result dimension contains only members
class ScDPResultDimension
diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
index 281c78be6c8d..196a59ba3a8b 100644
--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
@@ -169,8 +169,6 @@ namespace pdfi
typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
- typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
- typedef std::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap;
typedef boost::bimaps::bimap<
boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
boost::bimaps::unordered_set_of<sal_Int32>
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index cf93d83f064c..f87b4fbbb10e 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -68,8 +68,6 @@ struct SfxObjectUI_Impl
}
};
-typedef std::vector<SfxObjectUI_Impl*> SfxObjectUIArr_Impl;
-
struct SfxInterface_Impl
{
std::vector<std::unique_ptr<SfxObjectUI_Impl>>
diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx
index b876db457ebb..b44d02dc36fc 100644
--- a/slideshow/source/inc/animation.hxx
+++ b/slideshow/source/inc/animation.hxx
@@ -80,8 +80,6 @@ namespace slideshow
virtual void end() = 0;
};
- typedef ::std::shared_ptr< Animation > AnimationSharedPtr;
-
}
}
diff --git a/slideshow/source/inc/cursormanager.hxx b/slideshow/source/inc/cursormanager.hxx
index 2607a2633cc3..48b6ded2cd7b 100644
--- a/slideshow/source/inc/cursormanager.hxx
+++ b/slideshow/source/inc/cursormanager.hxx
@@ -56,8 +56,6 @@ namespace slideshow
virtual void resetCursor() = 0;
};
- typedef ::std::shared_ptr< CursorManager > CursorManagerSharedPtr;
-
}
}
diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx
index bb6aff2cba7d..9af9e1f9e202 100644
--- a/slideshow/source/inc/expressionnode.hxx
+++ b/slideshow/source/inc/expressionnode.hxx
@@ -53,8 +53,6 @@ namespace slideshow
};
- typedef ::std::shared_ptr< AnimationFunction > AnimationFunctionSharedPtr;
-
/** Refinement of AnimationFunction
This interface is used by the SMIL function parser, to
diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx
index 9d47c8f890db..cae48c11bd1f 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -82,8 +82,6 @@ namespace slideshow
UnoViewVector maViews;
};
- typedef ::std::shared_ptr< UnoViewContainer > UnoViewContainerSharedPtr;
-
}
}
diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx
index 800daf9c087b..aa75acaf9f21 100644
--- a/slideshow/source/inc/vieweventhandler.hxx
+++ b/slideshow/source/inc/vieweventhandler.hxx
@@ -80,7 +80,6 @@ namespace slideshow
virtual void viewsChanged() = 0;
};
- typedef ::std::shared_ptr< ViewEventHandler > ViewEventHandlerSharedPtr;
typedef ::std::weak_ptr< ViewEventHandler > ViewEventHandlerWeakPtr;
}
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 6e751c2921f8..861cab0ce3d6 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -182,8 +182,6 @@ public:
};
-typedef ::std::vector< FmEntryData* > FmEntryDataBaseList;
-
class FmEntryDataList final
{
private:
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 21d4e0b9fbf0..dcb37a713b68 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -429,8 +429,6 @@ css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
return aDateTime;
}
-typedef vector< OUString* > StringList_Impl;
-
Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders )
{
// SfxContentHelper::GetFolderContents
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 8c0b62781b6f..71ae2477f8e1 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -79,7 +79,6 @@ static o3tl::enumarray<GlobalEventId, const char*> pEventAsciiNames =
};
typedef std::unordered_map< OUString, OUString > EventBindingHash;
-typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector;
typedef o3tl::enumarray< GlobalEventId, OUString > SupportedEventsVector;
class GlobalEventConfig_Impl : public utl::ConfigItem
More information about the Libreoffice-commits
mailing list