mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx,starmath: inline some use-once typedefs

Browse Source 
Change-Id: I5a7405d326b7258cbed476c30f88e57559b4cc8e
This commit is contained in:
Noel Grandin
2015-08-03 14:03:54 +02:00
parent 9e6b501833
commit 3fc7f4c582
13 changed files with 34 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
starmath/inc/error.hxx
View File

@@ -21,8 +21,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
class SmNode; class SmNode;
enum SmParseError enum SmParseError
@@ -48,8 +46,6 @@ struct SmErrorDesc
OUString Text; OUString Text;
}; };
typedef boost::ptr_vector< SmErrorDesc > SmErrDescList;
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
starmath/inc/node.hxx
View File

@@ -63,7 +63,6 @@ class SmStructureNode;
typedef std::shared_ptr<SmNode> SmNodePointer; typedef std::shared_ptr<SmNode> SmNodePointer;
typedef boost::ptr_deque<SmNode> SmNodeStack; typedef boost::ptr_deque<SmNode> SmNodeStack;
typedef std::vector< SmNode * > SmNodeArray; typedef std::vector< SmNode * > SmNodeArray;
typedef std::vector< SmStructureNode * > SmStructureNodeArray;
template < typename T > template < typename T >
T* popOrZero( boost::ptr_deque<T> & rStack ) T* popOrZero( boost::ptr_deque<T> & rStack )

4
starmath/inc/parse.hxx
View File

@@ -20,8 +20,8 @@
#define INCLUDED_STARMATH_INC_PARSE_HXX #define INCLUDED_STARMATH_INC_PARSE_HXX
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <set> #include <set>
#include <boost/ptr_container/ptr_vector.hpp>
#include "types.hxx" #include "types.hxx"
#include "token.hxx" #include "token.hxx"
@@ -33,7 +33,7 @@ class SmParser
OUString m_aBufferString; OUString m_aBufferString;
SmToken m_aCurToken; SmToken m_aCurToken;
SmNodeStack m_aNodeStack; SmNodeStack m_aNodeStack;
SmErrDescList m_aErrDescList; boost::ptr_vector< SmErrorDesc > m_aErrDescList;
int m_nCurError; int m_nCurError;
LanguageType m_nLang; LanguageType m_nLang;
sal_Int32 m_nBufferIndex, sal_Int32 m_nBufferIndex,

4
starmath/source/parse.cxx
View File

@@ -1523,8 +1523,8 @@ void SmParser::DoTerm(bool bGroupNumberIdent)
} }
else if ( TokenInGroup(TGATTRIBUT) else if ( TokenInGroup(TGATTRIBUT)
|| TokenInGroup(TGFONTATTR)) || TokenInGroup(TGFONTATTR))
{ SmStructureNodeArray aArray; {
std::vector< SmStructureNode * > aArray;
bool bIsAttr; bool bIsAttr;
sal_uInt16 n = 0; sal_uInt16 n = 0;
while ( (bIsAttr = TokenInGroup(TGATTRIBUT)) while ( (bIsAttr = TokenInGroup(TGATTRIBUT))

8
stoc/test/testintrosp.cxx
View File

@@ -54,10 +54,6 @@ using namespace css::beans::PropertyAttribute;
typedef WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess > ImplIntroTestHelper;
typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
#define DEFAULT_INDEX_ACCESS_COUNT 10 #define DEFAULT_INDEX_ACCESS_COUNT 10
#define DEFAULT_NAME_ACCESS_COUNT 5 #define DEFAULT_NAME_ACCESS_COUNT 5
@@ -176,7 +172,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
// XPropertySetInfo for test class // XPropertySetInfo for test class
class ImplPropertySetInfo : public ImplPropertySetInfoHelper class ImplPropertySetInfo : public WeakImplHelper1< XPropertySetInfo >
{ {
friend class ImplIntroTest; friend class ImplIntroTest;
@@ -257,7 +253,7 @@ sal_Bool ImplPropertySetInfo::hasPropertyByName(const OUString& Name)
} }
class ImplIntroTest : public ImplIntroTestHelper class ImplIntroTest : public WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess >
{ {
Reference< XMultiServiceFactory > mxMgr; Reference< XMultiServiceFactory > mxMgr;

5
svl/source/inc/poolio.hxx
View File

@@ -61,7 +61,6 @@ struct SfxPoolVersion_Impl
typedef std::vector<SfxPoolItem*> SfxPoolItemArrayBase_Impl; typedef std::vector<SfxPoolItem*> SfxPoolItemArrayBase_Impl;
typedef boost::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr; typedef boost::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr;
typedef std::deque< SfxPoolVersion_ImplPtr > SfxPoolVersionArr_Impl;
/** /**
* This array contains a set of SfxPoolItems, if those items are * This array contains a set of SfxPoolItems, if those items are
@@ -90,14 +89,14 @@ struct SfxItemPool_Impl
{ {
SfxBroadcaster aBC; SfxBroadcaster aBC;
std::vector<SfxPoolItemArray_Impl*> maPoolItems; std::vector<SfxPoolItemArray_Impl*> maPoolItems;
std::vector<SfxItemPoolUser*> maSfxItemPoolUsers; /// ObjectUser section std::vector<SfxItemPoolUser*> maSfxItemPoolUsers; /// ObjectUser section
OUString aName; OUString aName;
SfxPoolItem** ppPoolDefaults; SfxPoolItem** ppPoolDefaults;
SfxPoolItem** ppStaticDefaults; SfxPoolItem** ppStaticDefaults;
SfxItemPool* mpMaster; SfxItemPool* mpMaster;
SfxItemPool* mpSecondary; SfxItemPool* mpSecondary;
sal_uInt16* mpPoolRanges; sal_uInt16* mpPoolRanges;
SfxPoolVersionArr_Impl aVersions; std::deque< SfxPoolVersion_ImplPtr > aVersions;
sal_uInt16 mnStart; sal_uInt16 mnStart;
sal_uInt16 mnEnd; sal_uInt16 mnEnd;
sal_uInt16 mnFileFormatVersion; sal_uInt16 mnFileFormatVersion;

48
svx/source/accessibility/AccessibleFrameSelector.cxx
View File

@@ -55,16 +55,6 @@ using ::com::sun::star::awt::XFocusListener;
using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::accessibility;
namespace AwtKey = ::com::sun::star::awt::Key;
namespace AwtKeyModifier = ::com::sun::star::awt::KeyModifier;
namespace AwtFocusChangeReason = ::com::sun::star::awt::FocusChangeReason;
typedef ::com::sun::star::awt::Point AwtPoint;
typedef ::com::sun::star::awt::Size AwtSize;
typedef ::com::sun::star::awt::Rectangle AwtRectangle;
typedef ::com::sun::star::awt::FocusEvent AwtFocusEvent;
AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eBorder ) : AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eBorder ) :
Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ), Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ),
@@ -270,7 +260,7 @@ Locale AccFrameSelector::getLocale( )
return Application::GetSettings().GetUILanguageTag().getLocale(); return Application::GetSettings().GetUILanguageTag().getLocale();
} }
sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) sal_Bool AccFrameSelector::containsPoint( const css::awt::Point& aPt )
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
@@ -280,7 +270,7 @@ sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt )
} }
Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
const AwtPoint& aPt ) const css::awt::Point& aPt )
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
@@ -289,7 +279,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) ); return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) );
} }
AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std::exception) css::awt::Rectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
IsValid(); IsValid();
@@ -306,7 +296,7 @@ AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std::excep
aPos = aSpot.TopLeft(); aPos = aSpot.TopLeft();
aSz = aSpot.GetSize(); aSz = aSpot.GetSize();
} }
AwtRectangle aRet; css::awt::Rectangle aRet;
aRet.X = aPos.X(); aRet.X = aPos.X();
aRet.Y = aPos.Y(); aRet.Y = aPos.Y();
aRet.Width = aSz.Width(); aRet.Width = aSz.Width();
@@ -316,7 +306,7 @@ AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std::excep
AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException, std::exception) css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
IsValid(); IsValid();
@@ -330,13 +320,13 @@ AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException, std::excepti
const Rectangle aSpot = mpFrameSel->GetClickBoundRect( meBorder ); const Rectangle aSpot = mpFrameSel->GetClickBoundRect( meBorder );
aPos = aSpot.TopLeft(); aPos = aSpot.TopLeft();
} }
AwtPoint aRet(aPos.X(), aPos.Y()); css::awt::Point aRet(aPos.X(), aPos.Y());
return aRet; return aRet;
} }
AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std::exception) css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
IsValid(); IsValid();
@@ -351,13 +341,13 @@ AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std:
aPos = aSpot.TopLeft(); aPos = aSpot.TopLeft();
} }
aPos = mpFrameSel->OutputToAbsoluteScreenPixel( aPos ); aPos = mpFrameSel->OutputToAbsoluteScreenPixel( aPos );
AwtPoint aRet(aPos.X(), aPos.Y()); css::awt::Point aRet(aPos.X(), aPos.Y());
return aRet; return aRet;
} }
AwtSize AccFrameSelector::getSize( ) throw (RuntimeException, std::exception) css::awt::Size AccFrameSelector::getSize( ) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
IsValid(); IsValid();
@@ -371,7 +361,7 @@ AwtSize AccFrameSelector::getSize( ) throw (RuntimeException, std::exception)
const Rectangle aSpot = mpFrameSel->GetClickBoundRect( meBorder ); const Rectangle aSpot = mpFrameSel->GetClickBoundRect( meBorder );
aSz = aSpot.GetSize(); aSz = aSpot.GetSize();
} }
AwtSize aRet(aSz.Width(), aSz.Height()); css::awt::Size aRet(aSz.Width(), aSz.Height());
return aRet; return aRet;
} }
@@ -457,28 +447,28 @@ void AccFrameSelector::IsValid() throw (RuntimeException)
throw RuntimeException(); throw RuntimeException();
} }
void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) void AccFrameSelector::NotifyFocusListeners(bool bGetFocus)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
AwtFocusEvent aEvent; css::awt::FocusEvent aEvent;
aEvent.FocusFlags = 0; aEvent.FocusFlags = 0;
if(bGetFocus) if(bGetFocus)
{ {
GetFocusFlags nFocusFlags = mpFrameSel->GetGetFocusFlags(); GetFocusFlags nFocusFlags = mpFrameSel->GetGetFocusFlags();
if(nFocusFlags & GetFocusFlags::Tab) if(nFocusFlags & GetFocusFlags::Tab)
aEvent.FocusFlags |= AwtFocusChangeReason::TAB; aEvent.FocusFlags |= css::awt::FocusChangeReason::TAB;
if(nFocusFlags & GetFocusFlags::CURSOR) if(nFocusFlags & GetFocusFlags::CURSOR)
aEvent.FocusFlags |= AwtFocusChangeReason::CURSOR; aEvent.FocusFlags |= css::awt::FocusChangeReason::CURSOR;
if(nFocusFlags & GetFocusFlags::Mnemonic) if(nFocusFlags & GetFocusFlags::Mnemonic)
aEvent.FocusFlags |= AwtFocusChangeReason::MNEMONIC; aEvent.FocusFlags |= css::awt::FocusChangeReason::MNEMONIC;
if(nFocusFlags & GetFocusFlags::Forward) if(nFocusFlags & GetFocusFlags::Forward)
aEvent.FocusFlags |= AwtFocusChangeReason::FORWARD; aEvent.FocusFlags |= css::awt::FocusChangeReason::FORWARD;
if(nFocusFlags & GetFocusFlags::Backward) if(nFocusFlags & GetFocusFlags::Backward)
aEvent.FocusFlags |= AwtFocusChangeReason::BACKWARD; aEvent.FocusFlags |= css::awt::FocusChangeReason::BACKWARD;
if(nFocusFlags & GetFocusFlags::Around) if(nFocusFlags & GetFocusFlags::Around)
aEvent.FocusFlags |= AwtFocusChangeReason::AROUND; aEvent.FocusFlags |= css::awt::FocusChangeReason::AROUND;
if(nFocusFlags & GetFocusFlags::UniqueMnemonic) if(nFocusFlags & GetFocusFlags::UniqueMnemonic)
aEvent.FocusFlags |= AwtFocusChangeReason::UNIQUEMNEMONIC; aEvent.FocusFlags |= css::awt::FocusChangeReason::UNIQUEMNEMONIC;
} }
aEvent.Temporary = sal_False; aEvent.Temporary = sal_False;

7
svx/source/engine3d/scene3d.cxx
View File

@@ -106,14 +106,9 @@ bool ImpRemap3DDepth::operator<(const ImpRemap3DDepth& rComp) const
} }
} }
// typedefs for a vector of ImpRemap3DDepths
typedef ::std::vector< ImpRemap3DDepth > ImpRemap3DDepthVector;
class Imp3DDepthRemapper class Imp3DDepthRemapper
{ {
ImpRemap3DDepthVector maVector; std::vector< ImpRemap3DDepth > maVector;
public: public:
explicit Imp3DDepthRemapper(E3dScene& rScene); explicit Imp3DDepthRemapper(E3dScene& rScene);

3
svx/source/form/fmundo.cxx
View File

@@ -75,8 +75,7 @@ using namespace ::dbtools;
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
typedef cppu::WeakImplHelper1< XScriptListener > ScriptEventListener_BASE; class ScriptEventListenerWrapper : public cppu::WeakImplHelper1< XScriptListener >
class ScriptEventListenerWrapper : public ScriptEventListener_BASE
{ {
public: public:
explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException )

6
svx/source/inc/fmshimp.hxx
View File

@@ -64,7 +64,6 @@
#include <vector> #include <vector>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
typedef std::vector<SdrObject*> SdrObjArray;
typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray; typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray;
// catch database exceptions if they occur // catch database exceptions if they occur
@@ -164,7 +163,7 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE
// timer for delayed mark // timer for delayed mark
Timer m_aMarkTimer; Timer m_aMarkTimer;
SdrObjArray m_arrSearchedControls; std::vector<SdrObject*> m_arrSearchedControls;
// We enable a permanent cursor for the grid we found a searched text, it's disabled in the next "found" event. // We enable a permanent cursor for the grid we found a searched text, it's disabled in the next "found" event.
FmFormArray m_aSearchForms; FmFormArray m_aSearchForms;
@@ -569,11 +568,10 @@ public:
}; };
typedef boost::ptr_vector<SfxStatusForwarder> StatusForwarderArray;
class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
{ {
protected: protected:
StatusForwarderArray m_aStatusForwarders; boost::ptr_vector<SfxStatusForwarder> m_aStatusForwarders;
Menu* m_pMainMenu; Menu* m_pMainMenu;
PopupMenu* m_pConversionMenu; PopupMenu* m_pConversionMenu;

2
svx/source/table/celltypes.hxx
View File

@@ -35,8 +35,6 @@ typedef rtl::Reference< Cell > CellRef;
typedef rtl::Reference< TableModel > TableModelRef; typedef rtl::Reference< TableModel > TableModelRef;
typedef rtl::Reference< TableRow > TableRowRef; typedef rtl::Reference< TableRow > TableRowRef;
typedef rtl::Reference< TableColumn > TableColumnRef; typedef rtl::Reference< TableColumn > TableColumnRef;
typedef rtl::Reference< TableRows > TableRowsRef;
typedef rtl::Reference< TableColumns > TableColumnsRef;
typedef std::vector< CellRef > CellVector; typedef std::vector< CellRef > CellVector;
typedef std::vector< TableRowRef > RowVector; typedef std::vector< TableRowRef > RowVector;
typedef std::vector< TableColumnRef > ColumnVector; typedef std::vector< TableColumnRef > ColumnVector;

4
svx/source/table/tablemodel.hxx
View File

@@ -169,8 +169,8 @@ private:
RowVector maRows; RowVector maRows;
ColumnVector maColumns; ColumnVector maColumns;
TableColumnsRef mxTableColumns; rtl::Reference< TableColumns > mxTableColumns;
TableRowsRef mxTableRows; rtl::Reference< TableRows > mxTableRows;
SdrTableObj* mpTableObj; SdrTableObj* mpTableObj;

5
svx/source/table/tablertfimporter.cxx
View File

@@ -75,8 +75,6 @@ typedef std::vector< RTFCellInfoPtr > RTFColumnVector;
typedef boost::shared_ptr< RTFColumnVector > RTFColumnVectorPtr; typedef boost::shared_ptr< RTFColumnVector > RTFColumnVectorPtr;
typedef std::vector< RTFColumnVectorPtr > RTFRowVector;
class SdrTableRTFParser class SdrTableRTFParser
{ {
public: public:
@@ -115,8 +113,7 @@ private:
sal_Int32 mnColMax; sal_Int32 mnColMax;
std::vector< sal_Int32 > maColumnEdges; std::vector< sal_Int32 > maColumnEdges;
std::vector< RTFColumnVectorPtr > maRows;
RTFRowVector maRows;
RTFCellDefault* mpInsDefault; RTFCellDefault* mpInsDefault;
RTFCellDefault* mpActDefault; RTFCellDefault* mpActDefault;