diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/basic/sbxvar.hxx | 1 | ||||
-rw-r--r-- | include/comphelper/PropertyInfoHash.hxx | 1 | ||||
-rw-r--r-- | include/comphelper/componentmodule.hxx | 8 | ||||
-rw-r--r-- | include/comphelper/container.hxx | 3 | ||||
-rw-r--r-- | include/editeng/editdata.hxx | 5 | ||||
-rw-r--r-- | include/editeng/eedata.hxx | 11 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 16 | ||||
-rw-r--r-- | include/editeng/splwrap.hxx | 1 | ||||
-rw-r--r-- | include/editeng/svxrtf.hxx | 1 |
9 files changed, 5 insertions, 42 deletions
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 8a517eac90a5..46092c79ebf7 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -56,7 +56,6 @@ struct SbxValues sal_Int16* pInteger; sal_uInt32* pULong; sal_Int32* pLong; - unsigned int* pUInt; int* pInt; sal_uInt64* puInt64; sal_Int64* pnInt64; diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx index 365e2e4c838f..da1dddf7e313 100644 --- a/include/comphelper/PropertyInfoHash.hxx +++ b/include/comphelper/PropertyInfoHash.hxx @@ -32,7 +32,6 @@ namespace comphelper sal_Int32 mnHandle; css::uno::Type maType; sal_Int16 mnAttributes; - sal_uInt8 mnMemberId; }; struct PropertyData { diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index fbd5d6336497..2f6bc6812113 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -55,10 +55,6 @@ namespace comphelper OUString sImplementationName; /// the services supported by the component implementation css::uno::Sequence< OUString > aSupportedServices; - /** the name under which the component implementation should be registered as singleton, - or empty if the component does not implement a singleton. - */ - OUString sSingletonName; /// the function to create an instance of the component ::cppu::ComponentFactoryFunc pComponentCreationFunc; /// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>) @@ -67,7 +63,6 @@ namespace comphelper ComponentDescription() :sImplementationName() ,aSupportedServices() - ,sSingletonName() ,pComponentCreationFunc( nullptr ) ,pFactoryCreationFunc( nullptr ) { @@ -76,13 +71,11 @@ namespace comphelper ComponentDescription( const OUString& _rImplementationName, const css::uno::Sequence< OUString >& _rSupportedServices, - const OUString& _rSingletonName, ::cppu::ComponentFactoryFunc _pComponentCreationFunc, FactoryInstantiation _pFactoryCreationFunc ) :sImplementationName( _rImplementationName ) ,aSupportedServices( _rSupportedServices ) - ,sSingletonName( _rSingletonName ) ,pComponentCreationFunc( _pComponentCreationFunc ) ,pFactoryCreationFunc( _pFactoryCreationFunc ) { @@ -246,7 +239,6 @@ namespace comphelper _rModule.registerImplementation( ComponentDescription( TYPE::getImplementationName_static(), TYPE::getSupportedServiceNames_static(), - TYPE::getSingletonName_static(), &TYPE::Create, &::cppu::createSingleComponentFactory ) ); diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx index ceae9f3c5586..2cba09882991 100644 --- a/include/comphelper/container.hxx +++ b/include/comphelper/container.hxx @@ -47,9 +47,6 @@ protected: // so I have to remember where each child is in relation to its parent. // That is the path from the root node to m_xCurrentObject - OUString m_ustrProperty; - // The Name of the requested property - public: IndexAccessIterator(css::uno::Reference< css::uno::XInterface> xStartingPoint); diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index e92101c86101..33de259fc6c2 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -274,15 +274,12 @@ struct MoveParagraphsInfo { nStartPara = nS; nEndPara = nE; nDestPara = nD; } }; -enum class PasteOrDropInfosAction { PASTE=1, DROP=2 }; - struct PasteOrDropInfos { - PasteOrDropInfosAction nAction; sal_Int32 nStartPara; sal_Int32 nEndPara; - PasteOrDropInfos(PasteOrDropInfosAction _nAction) : nAction(_nAction), nStartPara(-1), nEndPara(-1) {} + PasteOrDropInfos() : nStartPara(-1), nEndPara(-1) {} }; enum EENotifyType diff --git a/include/editeng/eedata.hxx b/include/editeng/eedata.hxx index 321cf04e43e7..0eef2bd29bd1 100644 --- a/include/editeng/eedata.hxx +++ b/include/editeng/eedata.hxx @@ -49,17 +49,6 @@ namespace EEngineData EndOfSentence = 2 }; - class TextMarkingClass - { - public: - TextMarkingType eType; - sal_Int32 nIndex; - - TextMarkingClass(TextMarkingType eT, sal_Int32 nI) : eType(eT), nIndex(nI) {} - }; - - typedef std::vector< TextMarkingClass > TextMarkingVector; - } // end of namespace EditEngine #endif // INCLUDED_EDITENG_EEDATA_HXX diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 19ae9178d2e4..26261d2e09c3 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -394,7 +394,6 @@ public: sal_Int32 mnTextStart; sal_Int32 mnTextLen; sal_Int32 mnPara; - sal_Int32 mnIndex; const SvxFont& mrFont; const long* mpDXArray; @@ -423,7 +422,6 @@ public: sal_Int32 nTxtLen, const SvxFont& rFnt, sal_Int32 nPar, - sal_Int32 nIdx, const long* pDXArr, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, @@ -441,7 +439,6 @@ public: mnTextStart(nTxtStart), mnTextLen(nTxtLen), mnPara(nPar), - mnIndex(nIdx), mrFont(rFnt), mpDXArray(pDXArr), mpWrongSpellVector(pWrongSpellVector), @@ -478,14 +475,11 @@ public: struct EDITENG_DLLPUBLIC PaintFirstLineInfo { sal_Int32 mnPara; - short mnOrientation; const Point& mrStartPos; - long mnBaseLineY; - const Point& mrOrigin; VclPtr<OutputDevice> mpOutDev; - PaintFirstLineInfo( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) - : mnPara( nPara ), mnOrientation( nOrientation ), mrStartPos( rStartPos ), mnBaseLineY( nBaseLineY ), mrOrigin( rOrigin ), mpOutDev( pOutDev ) + PaintFirstLineInfo( sal_Int32 nPara, const Point& rStartPos, OutputDevice* pOutDev ) + : mnPara( nPara ), mrStartPos( rStartPos ), mpOutDev( pOutDev ) {} }; @@ -624,8 +618,6 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool bStrippingPortions; bool bPasting; - sal_uLong nDummy; - DECL_LINK_TYPED( ParaVisibleStateChangedHdl, Paragraph&, void ); DECL_LINK_TYPED( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); DECL_LINK_TYPED( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); @@ -841,7 +833,7 @@ public: void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont, - sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, + sal_Int32 nPara, sal_uInt8 nRightToLeft, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, bool bEndOfLine, @@ -852,7 +844,7 @@ public: const Color& rTextLineColor); void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, - const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, + const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 821425a37c96..4f3d76240c79 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -60,7 +60,6 @@ private: bool bOtherCntnt : 1; // set => Check special sections initially bool bDialog : 1; // Is pWin the Svx...Dialog? bool bHyphen : 1; // Split instead of spell checking - bool bAuto : 1; // AutoCorrect available? bool bReverse : 1; // Reverse spell check bool bStartDone : 1; // Beginning already corrected bool bEndDone : 1; // End part already corrected diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index d521f1f1499f..30b1dfc0ff0e 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -184,7 +184,6 @@ struct RTFPardAttrMapIds class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser { - SvStream & rStrm; std::deque< Color* > aColorTbl; SvxRTFFontTbl m_FontTable; SvxRTFStyleTbl m_StyleTable; |