summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/view/main/OpenGLRender.hxx4
-rw-r--r--comphelper/source/property/genericpropertyset.cxx8
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx5
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx5
-rw-r--r--cui/source/inc/autocdlg.hxx6
-rw-r--r--cui/source/inc/cuigaldlg.hxx5
-rw-r--r--cui/source/inc/cuitabline.hxx12
7 files changed, 19 insertions, 26 deletions
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 910c86298962..dae190ae84d0 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -42,8 +42,6 @@ struct Bubble2DPointList
float yScale;
};
-typedef std::vector<GLfloat> Bubble2DCircle;
-
struct RectanglePointList
{
float points[12];
@@ -159,7 +157,7 @@ private:
glm::vec4 m_2DColor;
- Bubble2DCircle m_Bubble2DCircle;
+ std::vector<GLfloat> m_Bubble2DCircle;
std::list <Bubble2DPointList> m_Bubble2DShapePointList;
GLint m_CommonProID;
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 4d9f7a68cff1..754b08df0ffc 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -40,14 +40,12 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-typedef std::map<OUString, Any> GenericAnyMapImpl;
-
namespace comphelper
{
struct IMPL_GenericPropertySet_MutexContainer
{
- Mutex maMutex ;
- } ;
+ Mutex maMutex;
+ };
class GenericPropertySet : public OWeakAggObject,
public XServiceInfo,
@@ -56,7 +54,7 @@ namespace comphelper
private IMPL_GenericPropertySet_MutexContainer
{
private:
- GenericAnyMapImpl maAnyMap;
+ std::map<OUString, Any> maAnyMap;
cppu::OMultiTypeInterfaceContainerHelperVar<OUString> m_aListener;
protected:
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index fbd00ec7211f..b77b2de0e929 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -50,12 +50,13 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
+
namespace
{
/// helper class for column property change events which holds the OComponentDefinition weak
-typedef ::cppu::WeakImplHelper< XContainerListener > OTableContainerListener_BASE;
class OTableContainerListener:
- public OTableContainerListener_BASE, private boost::noncopyable
+ public ::cppu::WeakImplHelper< XContainerListener >,
+ private boost::noncopyable
{
OTableHelper* m_pComponent;
::std::map< OUString,bool> m_aRefNames;
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index 5b47a2895f6f..5d10a68b6607 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -61,9 +61,6 @@ struct ColDesc
class ResultSet;
-typedef std::vector< ColDesc > ColDescVector;
-
-
class ResultSetMetaData :
public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData >
{
@@ -73,7 +70,7 @@ class ResultSetMetaData :
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_table;
OUString m_tableName;
OUString m_schemaName;
- ColDescVector m_colDesc;
+ std::vector< ColDesc > m_colDesc;
ResultSet *m_pResultSet;
bool m_checkedForTable;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index c9b9b6ce2fe2..50bd18daae62 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -211,7 +211,6 @@ struct DoubleString
};
typedef std::vector<DoubleString> DoubleStringArray;
-typedef std::map<LanguageType, DoubleStringArray> DoubleStringTable;
struct StringChangeList
{
@@ -240,8 +239,9 @@ private:
OUString sModify;
OUString sNew;
- std::set<OUString> aFormatText;
- DoubleStringTable aDoubleStringTable;
+ std::set<OUString> aFormatText;
+ std::map<LanguageType, DoubleStringArray>
+ aDoubleStringTable;
CollatorWrapper* pCompareClass;
CharClass* pCharClass;
LanguageType eLang;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 1ca117440692..f7a2e3f80700 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -236,8 +236,6 @@ public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
};
-typedef ::std::vector< FilterEntry* > FilterEntryList_impl;
-
class TPGalleryThemeProperties : public SfxTabPage
{
friend class SearchThread;
@@ -254,7 +252,8 @@ class TPGalleryThemeProperties : public SfxTabPage
ExchangeData* pData;
StringList aFoundList;
- FilterEntryList_impl aFilterEntryList;
+ ::std::vector< FilterEntry* >
+ aFilterEntryList;
Timer aPreviewTimer;
OUString aLastFilterName;
OUString aPreviewString;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index e66b4b50e1c3..3f09f31c092b 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -82,7 +82,6 @@ public:
/*************************************************************************/
struct SvxBmpItemInfo;
-typedef ::std::vector< SvxBmpItemInfo* > SvxBmpItemInfoList;
class SvxLineTabPage : public SvxTabPage
{
@@ -136,17 +135,18 @@ private:
VclPtr<MetricField> m_pSymbolWidthMF;
VclPtr<MetricField> m_pSymbolHeightMF;
VclPtr<CheckBox> m_pSymbolRatioCB;
- std::vector<OUString> aGrfNames;
- SvxBmpItemInfoList aGrfBrushItems;
- bool bLastWidthModified;
+ std::vector<OUString> aGrfNames;
+ ::std::vector< SvxBmpItemInfo* >
+ aGrfBrushItems;
+ bool bLastWidthModified;
Size aSymbolLastSize;
Graphic aSymbolGraphic;
Size aSymbolSize;
- bool bSymbols;
+ bool bSymbols;
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- bool bObjSelected;
+ bool bObjSelected;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
generated by cgit (git 2.34.1) at 2024-07-15 08:44:20 +0000