summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--forms/source/component/GroupManager.hxx9
-rw-r--r--forms/source/xforms/submission/serialization.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.cxx7
-rw-r--r--framework/inc/classes/filtercachedata.hxx23
-rw-r--r--framework/inc/recording/dispatchrecorder.hxx4
-rw-r--r--i18nlangtag/source/languagetag/simple-langtag.cxx3
-rw-r--r--idl/inc/basobj.hxx4
-rw-r--r--idl/inc/module.hxx1
-rw-r--r--idl/inc/object.hxx2
-rw-r--r--idl/inc/types.hxx2
-rw-r--r--idl/source/objects/module.cxx2
-rw-r--r--idl/source/objects/object.cxx2
-rw-r--r--idl/source/objects/types.cxx2
-rw-r--r--idl/source/prj/database.cxx2
14 files changed, 19 insertions, 48 deletions
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 4a07fae95245..c2c17c292fbb 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -131,15 +131,12 @@ public:
const OGroupComp& GetGroupComponent() const { return m_aGroupComp; }
};
-typedef std::vector<OGroupCompAcc> OGroupCompAccArr;
-
-
class OGroup
{
- OGroupCompArr m_aCompArray;
- OGroupCompAccArr m_aCompAccArray;
+ OGroupCompArr m_aCompArray;
+ std::vector<OGroupCompAcc> m_aCompAccArray;
- OUString m_aGroupName;
+ OUString m_aGroupName;
sal_uInt16 m_nInsertPos; // The insertion position of the GroupComps is determind by the Group
friend class OGroupLess;
diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx
index da61af1e08df..9339d475021a 100644
--- a/forms/source/xforms/submission/serialization.hxx
+++ b/forms/source/xforms/submission/serialization.hxx
@@ -35,13 +35,11 @@
Serialize an XObject
*/
-typedef std::map<OUString, OUString> PropMap;
-
class CSerialization
{
protected:
css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
- PropMap m_properties;
+ std::map<OUString, OUString> m_properties;
public:
virtual ~CSerialization() {}
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index d832ddf0aa3e..4be8a3ee1dd0 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -39,9 +39,6 @@ const sal_Bool MANUAL_RESET = sal_True;
const sal_Bool AUTO_RESET = sal_False;
const sal_Bool INIT_NONSIGNALED = sal_False;
-typedef sal::systools::COMReference<IMalloc> IMallocPtr;
-typedef sal::systools::COMReference<IShellFolder> IShellFolderPtr;
-
namespace
{
const char* FOLDERPICKER_SRV_DLL_NAME = "fps.dll";
@@ -416,7 +413,7 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
{
- IMallocPtr pIMalloc;
+ sal::systools::COMReference<IMalloc> pIMalloc;
SHGetMalloc(&pIMalloc);
if (pIMalloc.is())
{
@@ -437,7 +434,7 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a
LPITEMIDLIST lpItemIdList(NULL);
- IShellFolderPtr pIShellFolder;
+ sal::systools::COMReference<IShellFolder> pIShellFolder;
SHGetDesktopFolder(&pIShellFolder);
if (pIShellFolder.is())
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index b01fbbc51667..813940752247 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -355,17 +355,6 @@ class PerformanceHash : public std::unordered_map< OUString,
{
};
-// Define easy usable types
-
-typedef SetNodeHash< FileType > FileTypeHash;
-typedef SetNodeHash< Filter > FilterHash;
-typedef SetNodeHash< Detector > DetectorHash;
-typedef SetNodeHash< Loader > LoaderHash;
-typedef SetNodeHash< ContentHandler > ContentHandlerHash;
-typedef OUStringHashMap PreferredHash;
-typedef OUStringList OrderList;
-
-
// Use private static data container to hold all values of configuration!
@@ -398,16 +387,16 @@ class DataContainer
DataContainer();
- FileTypeHash m_aTypeCache; /// hold all information about registered file types
- FilterHash m_aFilterCache; /// hold all information about registered filters
- DetectorHash m_aDetectorCache; /// hold all information about registered detect services
- LoaderHash m_aLoaderCache; /// hold all information about registered loader services
- ContentHandlerHash m_aContentHandlerCache; /// hold all information about registered content handler services
+ SetNodeHash< FileType > m_aTypeCache; /// hold all information about registered file types
+ SetNodeHash< Filter > m_aFilterCache; /// hold all information about registered filters
+ SetNodeHash< Detector > m_aDetectorCache; /// hold all information about registered detect services
+ SetNodeHash< Loader > m_aLoaderCache; /// hold all information about registered loader services
+ SetNodeHash< ContentHandler > m_aContentHandlerCache; /// hold all information about registered content handler services
PerformanceHash m_aFastFilterCache; /// hold all registered filter for a special file type
PerformanceHash m_aFastDetectorCache; /// hold all registered detect services for a special file type
PerformanceHash m_aFastLoaderCache; /// hold all registered loader services for a special file type
PerformanceHash m_aFastContentHandlerCache; /// hold all registered content handler services for a special file type
- PreferredHash m_aPreferredTypesCache; /// assignment of extensions to preferred types for it
+ OUStringHashMap m_aPreferredTypesCache; /// assignment of extensions to preferred types for it
Loader m_aGenericLoader; /// information about our default frame loader
OUString m_sLocale; /// current set locale of configuration to handle right UIName from set of all UINames!
bool m_bTypesModified;
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 80128e748d9d..abe2c91ab627 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -45,8 +45,6 @@
namespace framework{
-typedef ::std::vector < com::sun::star::frame::DispatchStatement > DispatchStatementList;
-
class DispatchRecorder
: public ::cppu::WeakImplHelper3<
css::lang::XServiceInfo
@@ -55,7 +53,7 @@ class DispatchRecorder
{
// private member
private:
- DispatchStatementList m_aStatements;
+ ::std::vector < css::frame::DispatchStatement > m_aStatements;
sal_Int32 m_nRecordingID;
css::uno::Reference< css::script::XTypeConverter > m_xConverter;
diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx b/i18nlangtag/source/languagetag/simple-langtag.cxx
index a7aa1aeb2e68..0cad44eeb2ff 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -22,7 +22,6 @@
namespace {
-typedef int lt_bool_t;
typedef void* lt_pointer_t;
struct lt_error_t {
@@ -326,7 +325,7 @@ static void lt_tag_unref(lt_tag_t *tag)
any i-* irregular and x-* privateuse. Subtags are not checked for validity
(alpha, digit, registered, ...).
*/
-static lt_bool_t lt_tag_parse(lt_tag_t *tag,
+static int lt_tag_parse(lt_tag_t *tag,
const char *tag_string,
lt_error_t **error)
{
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 81194182db3c..89ca0a61b56b 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -100,12 +100,10 @@ public:
class SvMetaNameMemberList : public SvRefMemberList<SvMetaName *> {};
-class SvMetaReference;
-typedef tools::SvRef<SvMetaReference> SvMetaReferenceRef;
class SvMetaReference : public SvMetaName
{
protected:
- SvMetaReferenceRef aRef;
+ tools::SvRef<SvMetaReference> aRef;
public:
TYPEINFO_OVERRIDE();
SvMetaReference();
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 4cb379882196..46cacb854a20 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -65,7 +65,6 @@ public:
void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
};
-typedef tools::SvRef<SvMetaModule> SvMetaModuleRef;
class SvMetaModuleMemberList : public SvRefMemberList<SvMetaModule *> {};
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 37788d372ad1..7d3e07b39fc6 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -62,8 +62,6 @@ public:
{ return xClass; }
};
-typedef tools::SvRef<SvClassElement> SvClassElementRef;
-
class SvClassElementMemberList : public SvRefMemberList<SvClassElement *> {};
class SvMetaClassMemberList : public SvRefMemberList<SvMetaClass *> {};
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 79b976d5d4b1..a9d5c75030c9 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -190,7 +190,6 @@ public:
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
};
-typedef tools::SvRef<SvMetaEnumValue> SvMetaEnumValueRef;
class SvMetaEnumValueMemberList : public SvRefMemberList<SvMetaEnumValue *> {};
@@ -211,7 +210,6 @@ public:
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
};
-typedef tools::SvRef<SvMetaTypeEnum> SvMetaTypeEnumRef;
class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 573fc6ddac27..c6e29449d8a1 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -97,7 +97,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else if( rInStm.GetToken().Is( SvHash_enum() ) )
{
- SvMetaTypeEnumRef aEnum = new SvMetaTypeEnum();
+ tools::SvRef<SvMetaTypeEnum> aEnum = new SvMetaTypeEnum();
if( aEnum->ReadSvIdl( rBase, rInStm ) )
{
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index fe9117da1979..1ce4378edab6 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -58,7 +58,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
SvMetaClass * pClass = rBase.ReadKnownClass( rInStm );
if( pClass )
{
- SvClassElementRef xEle = new SvClassElement();
+ tools::SvRef<SvClassElement> xEle = new SvClassElement();
xEle->SetClass( pClass );
aClassList.push_back( xEle );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 95a04f0e50e9..e87ea42e6fce 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -704,7 +704,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
{
sal_uInt32 nTokPos = rInStm.Tell();
- SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
+ tools::SvRef<SvMetaEnumValue> aEnumVal = new SvMetaEnumValue();
bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
if( bOk )
{
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 6030afd9e5ce..51f906c3a23e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -587,7 +587,7 @@ bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, bool bImported, const
// only one import at the very beginning
if( pTok->Is( SvHash_module() ) )
{
- SvMetaModuleRef aModule = new SvMetaModule( bImported );
+ tools::SvRef<SvMetaModule> aModule = new SvMetaModule( bImported );
if( aModule->ReadSvIdl( *this, rInStm ) )
GetModuleList().push_back( aModule );
else
generated by cgit (git 2.34.1) at 2024-06-27 00:03:41 +0000