diff options
57 files changed, 0 insertions, 638 deletions
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx index b8ff60f5fe7a..fc03a21a4d80 100644 --- a/editeng/inc/editeng/frmdiritem.hxx +++ b/editeng/inc/editeng/frmdiritem.hxx @@ -48,7 +48,6 @@ class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item public: TYPEINFO(); - SvxFrameDirectionItem( sal_uInt16 nWhich ); SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/, sal_uInt16 nWhich ); virtual ~SvxFrameDirectionItem(); diff --git a/editeng/inc/editeng/justifyitem.hxx b/editeng/inc/editeng/justifyitem.hxx index 67f8dc2e0e0d..c577845cc243 100644 --- a/editeng/inc/editeng/justifyitem.hxx +++ b/editeng/inc/editeng/justifyitem.hxx @@ -103,8 +103,6 @@ public: class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem { public: - SvxJustifyMethodItem( const sal_uInt16 nId ); - SvxJustifyMethodItem( const SvxCellJustifyMethod eMethod, const sal_uInt16 nId ); diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx index cb3729295e4a..df625f547431 100644 --- a/editeng/inc/editeng/unoedhlp.hxx +++ b/editeng/inc/editeng/unoedhlp.hxx @@ -163,26 +163,6 @@ public: */ static Rectangle EEToUserSpace( const Rectangle& rRect, const Size& rEESize, bool bIsVertical ); - /** Convert rect from user to edit engine coordinate space - - As the edit engine internally keeps vertical text unrotated, - all internal edit engine methods return their stuff unrotated, - too. This method rotates and shifts given rect appropriately, - if vertical writing is on. - - @param rRect - Rectangle to transform - - @param rEESize - Paper size of the edit engine - - @param bIsVertical - Whether output text is vertical or not - - @return the possibly transformed rect - */ - static Rectangle UserSpaceToEE( const Rectangle& rRect, const Size& rEESize, bool bIsVertical ); - }; #endif diff --git a/editeng/inc/editeng/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx index 99b82cb89523..3d07c4841bdd 100644 --- a/editeng/inc/editeng/unopracc.hxx +++ b/editeng/inc/editeng/unopracc.hxx @@ -53,9 +53,6 @@ public: virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); - - // XServiceName - ::rtl::OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 0cde9c437c46..26c273648c74 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -4126,11 +4126,6 @@ void SvxBrushItem::ApplyGraphicTransparency_Impl() } // class SvxFrameDirectionItem ---------------------------------------------- -SvxFrameDirectionItem::SvxFrameDirectionItem( sal_uInt16 _nWhich ) - : SfxUInt16Item( _nWhich, (sal_uInt16)FRMDIR_HORI_LEFT_TOP ) -{ -} - SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue , sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, (sal_uInt16)nValue ) diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index f9123fb53992..0d3024df4d24 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -353,12 +353,6 @@ sal_uInt16 SvxVerJustifyItem::GetValueCount() const } - -SvxJustifyMethodItem::SvxJustifyMethodItem( const sal_uInt16 nId ) : - SfxEnumItem( nId, (sal_uInt16)SVX_JUSTIFY_METHOD_AUTO ) -{ -} - SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify, const sal_uInt16 nId ) : SfxEnumItem( nId, (sal_uInt16)eJustify ) diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index fb1b03322350..a06baa39eb46 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -166,10 +166,4 @@ Rectangle SvxEditSourceHelper::EEToUserSpace( const Rectangle& rRect, const Size EEToUserSpace(rRect.TopRight(), rEESize, bIsVertical) ) : rRect; } -Rectangle SvxEditSourceHelper::UserSpaceToEE( const Rectangle& rRect, const Size& rEESize, bool bIsVertical ) -{ - return bIsVertical ? Rectangle( UserSpaceToEE(rRect.TopRight(), rEESize, bIsVertical), - UserSpaceToEE(rRect.BottomLeft(), rEESize, bIsVertical) ) : rRect; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 0b96a9523ae0..dcce120e4fbc 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -120,9 +120,6 @@ public: void AreInBullet( sal_Bool bInBullet = sal_True ) { mbInBullet = bInBullet; } sal_Bool InBullet() const { return mbInBullet; } - /// returns false if the current index contains non-editable text (e.g. bullets) - sal_Bool IsEditable() const; - /// returns false if the given range is non-editable (e.g. contains bullets or _parts_ of fields) sal_Bool IsEditableRange( const SvxAccessibleTextIndex& rEnd ) const; @@ -295,14 +292,6 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& } } -sal_Bool SvxAccessibleTextIndex::IsEditable() const -{ - if( InBullet() || InField() ) - return sal_False; - - return sal_True; -} - sal_Bool SvxAccessibleTextIndex::IsEditableRange( const SvxAccessibleTextIndex& rEnd ) const { if( GetIndex() > rEnd.GetIndex() ) diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index ee19d30064e8..ba8077a737c0 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -97,11 +97,4 @@ uno::Sequence< ::rtl::OUString> SAL_CALL SvxAccessibleTextPropertySet::getSuppor return SvxUnoTextRangeBase::getSupportedServiceNames(); } -// XServiceName -::rtl::OUString SAL_CALL SvxAccessibleTextPropertySet::getServiceName() throw (uno::RuntimeException) -{ - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.PropertyValue")); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index be40fda1fe8d..34183c59e45c 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -641,9 +641,7 @@ public: void Scale(sal_Int32& rVal) const; void Scale(Point& rPos) const; void Scale(Size& rSiz) const; - void Scale(Rectangle& rRect) const; void Scale(Polygon& rPoly) const; - void Scale(PolyPolygon& rPoly) const; void ScaleEmu(sal_Int32& rVal) const; sal_uInt32 ScalePt( sal_uInt32 nPt ) const; sal_Int32 ScalePoint( sal_Int32 nVal ) const; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d70420f88c8c..713a99d86c9e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3265,18 +3265,6 @@ void SvxMSDffManager::Scale( Size& rSiz ) const } } -void SvxMSDffManager::Scale( Rectangle& rRect ) const -{ - rRect.Move( nMapXOfs, nMapYOfs ); - if ( bNeedMap ) - { - rRect.Left() =BigMulDiv( rRect.Left() , nMapMul, nMapDiv ); - rRect.Top() =BigMulDiv( rRect.Top() , nMapMul, nMapDiv ); - rRect.Right() =BigMulDiv( rRect.Right() , nMapMul, nMapDiv ); - rRect.Bottom()=BigMulDiv( rRect.Bottom(), nMapMul, nMapDiv ); - } -} - void SvxMSDffManager::Scale( Polygon& rPoly ) const { if ( !bNeedMap ) @@ -3286,15 +3274,6 @@ void SvxMSDffManager::Scale( Polygon& rPoly ) const Scale( rPoly[ nPointNum ] ); } -void SvxMSDffManager::Scale( PolyPolygon& rPoly ) const -{ - if ( !bNeedMap ) - return; - sal_uInt16 nPolyAnz = rPoly.Count(); - for ( sal_uInt16 nPolyNum = 0; nPolyNum < nPolyAnz; nPolyNum++ ) - Scale( rPoly[ nPolyNum ] ); -} - void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const { rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv ); diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index 3c9f20a18632..e2ff526f8bf3 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -54,8 +54,6 @@ public: String GetCurrentFilter() const; void SetCurrentFilter(const String&); - - void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); private: // disable copy and assignment SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 826732afe759..a0dc6e435932 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -284,11 +284,4 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String& rStr) mpImpl->aFileDlg.SetCurrentFilter(rStr); } -void SvxOpenGraphicDialog::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ) -{ - mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); -} - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/broadcast.hxx b/svl/inc/svl/broadcast.hxx index 1e4be881d271..789d66dfdbe6 100644 --- a/svl/inc/svl/broadcast.hxx +++ b/svl/inc/svl/broadcast.hxx @@ -47,8 +47,6 @@ friend class SvtListenerIter; const SvtBroadcaster& operator=(const SvtBroadcaster &); // verboten protected: - void Forward( SvtBroadcaster& rBC, - const SfxHint& rHint ); virtual void ListenersGone(); public: diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index ac58097c76a3..350cfcd268c5 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -113,32 +113,4 @@ void SvtBroadcaster::ListenersGone() { } -//-------------------------------------------------------------------- - -// forward a notification to all registered listeners - -void SvtBroadcaster::Forward( SvtBroadcaster& rBC, const SfxHint& rHint ) -{ - // is anybody to notify? - if( rBC.HasListeners() /* && !IsModifyLocked()*/ ) - { -// LockModify(); -// bInModify = sal_True; - - SvtListenerIter aIter( rBC ); - SvtListener* pLast = aIter.GoStart(); - if( pLast ) - do { - pLast->Notify( rBC, rHint ); - if( !rBC.HasListeners() ) // all gone ?? - break; - } while( 0 != ( pLast = aIter.GoNext() )); - -// bInModify = sal_False; -// UnlockModify(); - } -} - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx index c423f24c6c79..ee6717b5a0ac 100644 --- a/svtools/inc/svtools/apearcfg.hxx +++ b/svtools/inc/svtools/apearcfg.hxx @@ -74,7 +74,6 @@ public: virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); sal_uInt16 GetDragMode () const { return nDragMode; } - void SetDragMode ( sal_uInt16 nSet ); sal_uInt16 GetScaleFactor () const { return nScaleFactor; } void SetScaleFactor ( sal_uInt16 nSet ); diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index 96475e71eb33..9dae703e3bff 100644 --- a/svtools/inc/svtools/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -273,7 +273,6 @@ protected: public: SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); - SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ); virtual ~SvtIconChoiceCtrl(); void SetStyle( WinBits nWinStyle ); diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx index d7114042562b..52c2428a0720 100644 --- a/svtools/inc/svtools/scriptedtext.hxx +++ b/svtools/inc/svtools/scriptedtext.hxx @@ -87,18 +87,6 @@ public: const ::rtl::OUString& _rText, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); - /** Returns the previously set text. - @return The current text. */ - const ::rtl::OUString& GetText() const; - - /** Returns the calculated width the text will take in the current output device. - @return The calculated text width. */ - sal_Int32 GetTextWidth() const; - - /** Returns the maximum height the text will take in the current output device. - @return The maximum text height. */ - sal_Int32 GetTextHeight() const; - /** Returns a size struct containing the width and height of the text in the current output device. @return A size struct with the text dimensions. */ const Size& GetTextSize() const; diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index 21b40351d164..9fde1c6d395f 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -152,7 +152,6 @@ public: virtual ~SvLBoxItem(); virtual sal_uInt16 IsA() = 0; const Size& GetSize( SvLBox* pView, SvLBoxEntry* pEntry ); - const Size& GetSize( SvLBoxEntry*, SvViewDataEntry* ); const Size& GetSize( SvViewDataEntry* pData, sal_uInt16 nItemPos ) { SvViewDataItem* pIData=pData->pItemData+nItemPos; diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 3cbe0ab52a47..0847ad020cd8 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -152,12 +152,6 @@ void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUSt { } -void SvtTabAppearanceCfg::SetDragMode ( sal_uInt16 nSet ) -{ - nDragMode = nSet; - SetModified(); -} - void SvtTabAppearanceCfg::SetScaleFactor ( sal_uInt16 nSet ) { nScaleFactor = nSet; diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index e5f6919b21f8..9d7a6d564fa7 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -89,21 +89,6 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) : _pImp->SetPositionMode( IcnViewPositionModeAutoArrange ); } -SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ) : - - Control( pParent, rResId ), - - _pCurKeyEvent ( NULL ), - _pImp ( new SvxIconChoiceCtrl_Impl( this, WB_BORDER ) ), - _bAutoFontColor ( sal_False ) - -{ - SetLineColor(); - _pImp->SetGrid( Size( 100, 70 ) ); - _pImp->InitSettings(); - _pImp->SetPositionMode( IcnViewPositionModeAutoArrange ); -} - SvtIconChoiceCtrl::~SvtIconChoiceCtrl() { _pImp->CallEventListeners( VCLEVENT_OBJECT_DYING ); diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 19068e6c04bb..0809368e0aab 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -536,14 +536,6 @@ const Size& SvLBoxItem::GetSize( SvLBox* pView,SvLBoxEntry* pEntry ) return pViewData->aSize; } -const Size& SvLBoxItem::GetSize( SvLBoxEntry* pEntry, SvViewDataEntry* pViewData) -{ - DBG_CHKTHIS(SvLBoxItem,0); - sal_uInt16 nItemPos = pEntry->GetPos( this ); - SvViewDataItem* pItemData = pViewData->pItemData+nItemPos; - return pItemData->aSize; -} - DBG_NAME(SvViewDataItem); SvViewDataItem::SvViewDataItem() diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 5cc09c95000e..de5529d00e03 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -459,12 +459,6 @@ String SvtIconWindow_Impl::GetSelectedIconURL() const return aURL; } -String SvtIconWindow_Impl::GetSelectedIconText() const -{ - sal_uLong nPos; - return MnemonicGenerator::EraseAllMnemonicChars( aIconCtrl.GetSelectedEntry( nPos )->GetText() ); -} - String SvtIconWindow_Impl::GetIconText( const String& rURL ) const { String aText; diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index 070d0167e4c7..6963f333540d 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -91,7 +91,6 @@ public: inline void SetClickHdl( const Link& rLink ) { aIconCtrl.SetClickHdl( rLink ); } String GetSelectedIconURL() const; - String GetSelectedIconText() const; String GetCursorPosIconURL() const; String GetIconText( const String& rURL ) const; void InvalidateIconControl(); diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 1628d0201d01..9338c116eaf5 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -354,21 +354,6 @@ void SvtScriptedTextHelper::SetText( const OUString& _rText, const uno::Referenc mpImpl->SetText( _rText, _xBreakIter ); } -const OUString& SvtScriptedTextHelper::GetText() const -{ - return mpImpl->GetText(); -} - -sal_Int32 SvtScriptedTextHelper::GetTextWidth() const -{ - return mpImpl->GetTextSize().Width(); -} - -sal_Int32 SvtScriptedTextHelper::GetTextHeight() const -{ - return mpImpl->GetTextSize().Height(); -} - const Size& SvtScriptedTextHelper::GetTextSize() const { return mpImpl->GetTextSize(); diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 194d43133931..11bc06dbaa6c 100644 --- a/svx/inc/svx/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx @@ -214,8 +214,6 @@ class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem { public: TYPEINFO(); - SvxChartDataDescrItem(SvxChartDataDescr eDataDescr /*= CHDESCR_NONE*/, - sal_uInt16 nId ); SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId ); @@ -255,8 +253,6 @@ class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem { public: TYPEINFO(); - SvxChartTextOrientItem(SvxChartTextOrient /*eOrient = CHTXTORIENT_STANDARD*/, - sal_uInt16 nId ); SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId ); diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 39ebc0520023..7aac1961f89c 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -68,7 +68,6 @@ protected: DECL_STATIC_LINK(SvxColorValueSet, ExecDragHdl, void*); public: - SvxColorValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); SvxColorValueSet( Window* pParent, const ResId& rResId ); sal_Bool IsLeftButton() const { return bLeft; } diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index 63161b1b72c8..6d2f1990f20b 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -120,7 +120,6 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl void TrySelection(Point aPosPixel); public: - Svx3DLightControl(Window* pParent, const ResId& rResId); Svx3DLightControl(Window* pParent, WinBits nStyle = 0); ~Svx3DLightControl(); diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index 0c3ea0489153..3a6703aa6cdd 100644 --- a/svx/inc/svx/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx @@ -173,7 +173,6 @@ public: const ImageMap& GetImageMap() const; void SetTargetList( const TargetList& rTargetList ); - const TargetList& GetTargetList() const; void Update( const Graphic& rGraphic, const ImageMap* pImageMap = NULL, const TargetList* pTargetList = NULL, void* pEditingObj = NULL ); diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index 1a8f6ef0776c..7baf253e01f6 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -80,7 +80,6 @@ private: SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 ); public: - SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck = sal_False); SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False); ~SvxLanguageBox(); diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index 6c62149ea4eb..459187696b66 100644 --- a/svx/inc/svx/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx @@ -53,8 +53,6 @@ public: ErrCode Execute(); String GetPath() const; - static bool IsAvailable (sal_uInt16 nKind); - void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx index 2dd554cbbbab..8966b9a88db3 100644 --- a/svx/inc/svx/relfld.hxx +++ b/svx/inc/svx/relfld.hxx @@ -50,7 +50,6 @@ protected: void Modify(); public: - SvxRelativeField( Window* pParent, WinBits nWinStyle = 0 ); SvxRelativeField( Window* pParent, const ResId& rResId ); void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index d35ccfc04028..5b82b4901cc9 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -91,7 +91,6 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: public: SvxDrawPage( SdrPage* pPage ) throw(); - SvxDrawPage() throw(); virtual ~SvxDrawPage() throw(); // Internals diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index f22468f0f8c9..b64ad7c66ca4 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -338,7 +338,6 @@ protected: virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); public: - SvxShapeText() throw (); SvxShapeText( SdrObject* pObj ) throw (); SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); virtual ~SvxShapeText() throw (); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 703cc770364b..ab5c4bb8d9c2 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -672,12 +672,6 @@ void SvxRectCtlAccessibleContext::selectChild( RECT_POINT eButton ) selectChild( PointToIndex( eButton, mbAngleMode ) ); } -void SvxRectCtlAccessibleContext::CommitChange( const AccessibleEventObject& rEvent ) -{ - if (mnClientId) - comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent ); -} - void SAL_CALL SvxRectCtlAccessibleContext::disposing() { if( !rBHelper.bDisposed ) diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 6be2e96ce214..c5462aa7a2a3 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -257,31 +257,6 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) #define NO_LIGHT_SELECTED (0xffffffff) #define MAX_NUMBER_LIGHTS (8) -Svx3DLightControl::Svx3DLightControl(Window* pParent, const ResId& rResId) -: Svx3DPreviewControl(pParent, rResId), - maUserInteractiveChangeCallback(), - maUserSelectionChangeCallback(), - maChangeCallback(), - maSelectionChangeCallback(), - maSelectedLight(NO_LIGHT_SELECTED), - mpExpansionObject(0), - mpLampBottomObject(0), - mpLampShaftObject(0), - maLightObjects(MAX_NUMBER_LIGHTS, (E3dObject*)0), - mfRotateX(-20.0), - mfRotateY(45.0), - mfRotateZ(0.0), - maActionStartPoint(), - mnInteractionStartDistance(5 * 5 * 2), - mfSaveActionStartHor(0.0), - mfSaveActionStartVer(0.0), - mfSaveActionStartRotZ(0.0), - mbMouseMoved(false), - mbGeometrySelected(false) -{ - Construct2(); -} - Svx3DLightControl::Svx3DLightControl(Window* pParent, WinBits nStyle) : Svx3DPreviewControl(pParent, nStyle), maUserInteractiveChangeCallback(), diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 0aff9136cd91..ac21958fe048 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -306,11 +306,6 @@ void SvxIMapDlg::SetTargetList( const TargetList& rTargetList ) maCbbTarget.InsertEntry( *aNewList[ i ] ); } -const TargetList& SvxIMapDlg::GetTargetList() const -{ - return pIMapWnd->GetTargetList(); -} - void SvxIMapDlg::Update( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList, void* pEditingObj ) { diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 98b205e30d00..9c14c0066735 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -132,14 +132,6 @@ sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) return nPos; } -//----------------------------------------------------------------------- -SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck ) : - ListBox( pParent, nWinStyle ), - m_pSpellUsedLang( NULL ), - m_bWithCheckmark( bCheck ) -{ - Init(); -} //------------------------------------------------------------------------ SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) : ListBox( pParent, rResId ), diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index c57c016a572a..5ce7b8f54bc7 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -208,62 +208,6 @@ SvxPluginFileDlg::~SvxPluginFileDlg() #define PFDLG_FOUND_SOUND 0x0004 #define PFDLG_FOUND_VIDEO 0x0008 -bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) -{ - static sal_uInt16 nCheck = 0; - - if ( nKind == SID_INSERT_SOUND && ( nCheck & PFDLG_CHECKED_SOUND ) ) - return (nCheck & PFDLG_FOUND_SOUND) != 0; - if ( nKind == SID_INSERT_VIDEO && ( nCheck & PFDLG_CHECKED_VIDEO ) ) - return (nCheck & PFDLG_FOUND_VIDEO) != 0; - - bool bFound = false; - uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); - - if( xMgr.is() ) - { - uno::Reference< plugin::XPluginManager > rPluginManager = uno::Reference< plugin::XPluginManager > ( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY ); - if( rPluginManager.is() ) - { - const uno::Sequence<plugin::PluginDescription > aSeq( rPluginManager->getPluginDescriptions() ); - const plugin::PluginDescription* pDescription = aSeq.getConstArray(); - sal_Int32 nAnzahlPlugins = rPluginManager->getPluginDescriptions().getLength(); - - for ( sal_uInt16 i = 0; i < nAnzahlPlugins && !bFound; ++i ) - { - String aStrPlugMIMEType( pDescription[i].Mimetype ); - switch (nKind) - { - case SID_INSERT_SOUND : - { - nCheck |= PFDLG_CHECKED_SOUND; - - if( aStrPlugMIMEType.SearchAscii( sAudio ) == 0 ) - { - bFound = true; - nCheck |= PFDLG_FOUND_SOUND; - } - } - break; - case SID_INSERT_VIDEO : - { - nCheck |= PFDLG_CHECKED_VIDEO; - - if (aStrPlugMIMEType.SearchAscii( sVideo ) == 0) - { - bFound = true; - nCheck |= PFDLG_FOUND_VIDEO; - } - } - break; - } - } - } - } - - return bFound; -} - void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext ) { maFileDlg.SetContext( _eNewContext ); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 0c327c981370..cfe0a2f195d1 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -33,20 +33,6 @@ // ----------------------------------------------------------------------- -SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) : - MetricField( pParent, nWinSize ) -{ - bNegativeEnabled = sal_False; - bRelativeMode = sal_False; - bRelative = sal_False; - - SetDecimalDigits( 2 ); - SetMin( 0 ); - SetMax( 9999 ); -} - -// ----------------------------------------------------------------------- - SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) : MetricField( pParent, rResId ) { diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index cee795b49d0d..ff55a84206df 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -275,9 +275,6 @@ protected: /// @Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); - /// Calls all Listener to tell they the change. - void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); - virtual void SAL_CALL disposing(); /// @returns true if it's disposed or in disposing diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 1f1a2de13357..74929869a980 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -94,14 +94,6 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const |* *************************************************************************/ -SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr eDataDescr, - sal_uInt16 nId) : - SfxEnumItem(nId, (sal_uInt16)eDataDescr) -{ -} - -// ----------------------------------------------------------------------- - SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { @@ -221,14 +213,6 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa |* *************************************************************************/ -SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient eOrient, - sal_uInt16 nId) : - SfxEnumItem(nId, (sal_uInt16)eOrient) -{ -} - -// ----------------------------------------------------------------------- - SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 369ccc9e2fd3..ddf01f7bbe29 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -105,20 +105,6 @@ sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, |* \************************************************************************/ -SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) : - ValueSet( _pParent, nWinStyle ), - DragSourceHelper( this ), - bLeft (sal_True) -{ - SetAccessibleName(String( SVX_RES( STR_COLORTABLE ) ) ); -} - -/************************************************************************* -|* -|* SvxColorValueSet: Ctor -|* -\************************************************************************/ - SvxColorValueSet::SvxColorValueSet( Window* _pParent, const ResId& rResId ) : ValueSet( _pParent, rResId ), DragSourceHelper( this ), diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index d281d5cf1338..2d95a08ae2ca 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -89,7 +89,6 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - void StartSelection(); inline ListBox & GetListBox() { return *pListBox; } sal_Bool IsUserSelected() const { return bUserSel; } @@ -149,12 +148,6 @@ void SvxPopupWindowListBox::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } - -void SvxPopupWindowListBox::StartSelection() -{ - rToolBox.StartSelection(); -} - Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() { // allows forwarding key events in the correct window diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 0f8197cabe9d..07b29c37e2c5 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -95,18 +95,6 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw() } //---------------------------------------------------------------------- -// Ctor fuer SvxDrawPage_NewInstance() -//---------------------------------------------------------------------- -SvxDrawPage::SvxDrawPage() throw() -: mrBHelper( getMutex() ) -, mpPage( NULL ) -, mpModel( NULL ) -, mpView( NULL ) -{ - DBG_CTOR(SvxDrawPage,NULL); -} - -//---------------------------------------------------------------------- SvxDrawPage::~SvxDrawPage() throw() { DBG_ASSERT( mrBHelper.bDisposed, "SvxDrawPage must be disposed!" ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f1a3c37b4c4a..988b076344f5 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3994,12 +3994,6 @@ void SvxShape::updateShapeKind() /*********************************************************************** * class SvxShapeText * ***********************************************************************/ -SvxShapeText::SvxShapeText() throw () -: SvxShape(NULL, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) -{ -} - -//---------------------------------------------------------------------- SvxShapeText::SvxShapeText( SdrObject* pObject ) throw () : SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx index e557b6338719..125875cac8c4 100644 --- a/tools/inc/tools/pstm.hxx +++ b/tools/inc/tools/pstm.hxx @@ -216,8 +216,6 @@ public: SvPersistStream( SvClassManager &, SvStream * pStream, sal_uInt32 nStartIdx = 1 ); - SvPersistStream( SvClassManager &, SvStream * pStream, - const SvPersistStream & rPersStm ); ~SvPersistStream(); void SetStream( SvStream * pStream ); @@ -246,8 +244,6 @@ public: // gespeichert werden. friend SvStream& operator >> ( SvStream &, SvPersistStream & ); friend SvStream& operator << ( SvStream &, SvPersistStream & ); - sal_uIntPtr InsertObj( SvPersistBase * ); - sal_uIntPtr RemoveObj( SvPersistBase * ); }; #endif // _PSTM_HXX diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 6a0b17c79c42..4956a6aa46f5 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -197,44 +197,6 @@ SvPersistStream::SvPersistStream } //========================================================================= -SvPersistStream::SvPersistStream -( - SvClassManager & rMgr, /* Alle Factorys, deren Objekt geladen und - gespeichert werdn k"onnen */ - SvStream * pStream, /* Dieser Stream wird als Medium genommen, auf - dem der PersistStream arbeitet */ - const SvPersistStream & rPersStm - /* Wenn PersistStream's verschachtelt werden, - dann ist dies der Parent-Stream. */ -) - : rClassMgr( rMgr ) - , pStm( pStream ) - // Bereiche nicht ueberschneiden, deshalb nur groessere Indexe - , aPUIdx( rPersStm.GetCurMaxIndex() +1 ) - , nStartIdx( rPersStm.GetCurMaxIndex() +1 ) - , pRefStm( &rPersStm ) - , nFlags( 0 ) -/* [Beschreibung] - - Der Konstruktor der Klasse SvPersistStream. Die Objekte rMgr und - pStream d"urfen nicht ver"andert werden, solange sie in einem - SvPersistStream eingesetzt sind. Eine Aussnahme gibt es f"ur - pStream (siehe <SvPersistStream::SetStream>). - Durch diesen Konstruktor wird eine Hierarchiebildung unterst"utzt. - Alle Objekte aus einer Hierarchie m"ussen erst geladen werden, - wenn das erste aus dieser Hierarchie benutzt werden soll. -*/ -{ - bIsWritable = sal_True; - if( pStm ) - { - SetVersion( pStm->GetVersion() ); - SetError( pStm->GetError() ); - SyncSvStream( pStm->Tell() ); - } -} - -//========================================================================= SvPersistStream::~SvPersistStream() /* [Beschreibung] @@ -900,21 +862,4 @@ SvStream& operator >> return rStm; } -//========================================================================= -sal_uIntPtr SvPersistStream::InsertObj( SvPersistBase * pObj ) -{ - sal_uIntPtr nId = aPUIdx.Insert( pObj ); - aPTable.Insert( (sal_uIntPtr)pObj, (void *)nId ); - return nId; -} - -//========================================================================= -sal_uIntPtr SvPersistStream::RemoveObj( SvPersistBase * pObj ) -{ - sal_uIntPtr nIdx = GetIndex( pObj ); - aPUIdx.Remove( nIdx ); - aPTable.Remove( (sal_uIntPtr)pObj ); - return nIdx; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index e183b7042925..b5090c1efc17 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -188,28 +188,17 @@ SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image) SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char) SvLBoxButtonData::SvLBoxButtonData() SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short) -SvLBoxItem::GetSize(SvLBoxEntry*, SvViewDataEntry*) -SvPersistStream::InsertObj(SvPersistBase*) -SvPersistStream::RemoveObj(SvPersistBase*) -SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) SvStringsISortDtor::Insert(String* const*, unsigned short) -SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*) SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*) -SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, char const*, unsigned char, unsigned char) -SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, rtl::OUString const&, unsigned char, unsigned char) SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const&, unsigned short&) SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const*, unsigned short) SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElementArr const*, unsigned short, unsigned short) SvXMLEmbeddedElementArr::Remove(SvXMLEmbeddedElement* const&, unsigned short) SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short) -SvXMLExport::SvXMLExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver> const&, short) -SvXMLExportPropertyMapper::exportXML(SvXMLAttributeList&, XMLPropertyState const&, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned short) const -SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) -SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short) SvXMLImportPropertyMapper::importXML(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const @@ -219,18 +208,8 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short) SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short) SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short) SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short) -SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&) -SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&) -SvtIconWindow_Impl::GetSelectedIconText() const -SvtScriptedTextHelper::GetText() const -SvtScriptedTextHelper::GetTextHeight() const -SvtScriptedTextHelper::GetTextWidth() const -SvtTabAppearanceCfg::SetDragMode(unsigned short) -Svx3DLightControl::Svx3DLightControl(Window*, ResId const&) Svx3DWin::LinkStubClickLightHdl(void*, void*) Svx3DWin::LinkStubDoubleClickHdl(void*, void*) -SvxAccessibleTextIndex::IsEditable() const -SvxAccessibleTextPropertySet::getServiceName() SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*) SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*) SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*) @@ -241,18 +220,7 @@ SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short) SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short) SvxAutocorrWordList::Remove(SvxAutocorrWord* const&, unsigned short) SvxAutocorrWordList::Remove(unsigned short, unsigned short) -SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr, unsigned short) -SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient, unsigned short) -SvxColorValueSet::SvxColorValueSet(Window*, long) SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char) -SvxDrawPage::SvxDrawPage() -SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool) -SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short) -SvxIMapDlg::GetTargetList() const -SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short) -SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char) -SvxMSDffManager::Scale(PolyPolygon&) const -SvxMSDffManager::Scale(Rectangle&) const SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&) SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short) SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned short) @@ -263,13 +231,7 @@ SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*, unsigned short) SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short) SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const&, unsigned short) SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short) -SvxOpenGraphicDialog::SetControlHelpIds(short const*, char const**) -SvxPluginFileDlg::IsAvailable(unsigned short) -SvxPopupWindowListBox::StartSelection() -SvxRectCtlAccessibleContext::CommitChange(com::sun::star::accessibility::AccessibleEventObject const&) -SvxRelativeField::SvxRelativeField(Window*, long) SvxRubyChildWindow::GetChildWindowId() -SvxShapeText::SvxShapeText() SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&) SvxTabStopArr::Insert(SvxTabStop const*, unsigned short) SvxTabStopArr::Remove(SvxTabStop const&, unsigned short) diff --git a/xmloff/inc/xmloff/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx index a393b033ee10..242e5bd22455 100644 --- a/xmloff/inc/xmloff/unoatrcn.hxx +++ b/xmloff/inc/xmloff/unoatrcn.hxx @@ -59,7 +59,6 @@ public: SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; } static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static SvUnoAttributeContainer* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInt ) throw(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 1fcdf5587e14..458ab571e0e1 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -308,23 +308,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, sal_Int16 const eDefaultFieldUnit ); - // #110680# - //SvXMLExport( const ::rtl::OUString& rFileName, - // const ::com::sun::star::uno::Reference< - // ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, - // const ::com::sun::star::uno::Reference< - // ::com::sun::star::frame::XModel > &, - // const ::com::sun::star::uno::Reference< - // ::com::sun::star::document::XGraphicObjectResolver > &, - // sal_Int16 eDfltUnit ); - SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::rtl::OUString& rFileName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > &, - sal_Int16 const eDefaultFieldUnit ); - virtual ~SvXMLExport(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); @@ -696,12 +679,6 @@ public: // Thes constructors do nothing if bDoSomething is not set SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, - sal_uInt16 nPrefix, const sal_Char *pName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); - SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, - sal_uInt16 nPrefix, const ::rtl::OUString& rName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); - SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx index fb5851e36e76..efd9101f3aaf 100644 --- a/xmloff/inc/xmloff/xmlexppr.hxx +++ b/xmloff/inc/xmloff/xmlexppr.hxx @@ -155,14 +155,6 @@ public: sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx, sal_uInt16 nFlags = 0 ) const; - /** fills the given attribute list with the representation of one item */ - void exportXML( - SvXMLAttributeList& rAttrList, - const XMLPropertyState& rProperty, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags = 0 ) const; - void exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx index 2f00ffa08142..31058c9cf846 100644 --- a/xmloff/inc/xmloff/xmlimp.hxx +++ b/xmloff/inc/xmloff/xmlimp.hxx @@ -371,13 +371,6 @@ public: void SetError( sal_Int32 nId, const rtl::OUString& rMsg1 ); void SetError( sal_Int32 nId, const rtl::OUString& rMsg1, const rtl::OUString& rMsg2 ); - void SetError( sal_Int32 nId, const rtl::OUString& rMsg1, - const rtl::OUString& rMsg2, - const rtl::OUString& rMsg3 ); - void SetError( sal_Int32 nId, const rtl::OUString& rMsg1, - const rtl::OUString& rMsg2, - const rtl::OUString& rMsg3, - const rtl::OUString& rMsg4 ); /** return current error flags */ sal_uInt16 GetErrorFlags() { return mnErrorFlags; } diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 8fe03e48e517..56cb96080257 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -117,20 +117,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::get return theSvUnoAttributeContainerUnoTunnelId::get().getSeq(); } -SvUnoAttributeContainer* SvUnoAttributeContainer::getImplementation( uno::Reference< uno::XInterface > xInt ) throw() -{ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY ); - if( xUT.is() ) - { - return - reinterpret_cast<SvUnoAttributeContainer*>( - sal::static_int_cast<sal_IntPtr>( - xUT->getSomething( SvUnoAttributeContainer::getUnoTunnelId()))); - } - else - return NULL; -} - sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) { if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index e92545c8dd91..8416a5ffc26d 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -550,46 +550,6 @@ SvXMLExport::SvXMLExport( mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier); } -SvXMLExport::SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const OUString &rFileName, - const uno::Reference< xml::sax::XDocumentHandler > & rHandler, - const Reference< XModel >& rModel, - const Reference< document::XGraphicObjectResolver >& rEmbeddedGraphicObjects, - sal_Int16 const eDefaultFieldUnit) -: mpImpl( new SvXMLExport_Impl ), - mxServiceFactory(xServiceFactory), - mxModel( rModel ), - mxHandler( rHandler ), - mxExtHandler( rHandler, uno::UNO_QUERY ), - mxNumberFormatsSupplier (rModel, uno::UNO_QUERY), - mxGraphicResolver( rEmbeddedGraphicObjects ), - mpAttrList( new SvXMLAttributeList ), - msOrigFileName( rFileName ), - mpNamespaceMap( new SvXMLNamespaceMap ), - mpUnitConv( new SvXMLUnitConverter(getServiceFactory(), - util::MeasureUnit::MM_100TH, - SvXMLUnitConverter::GetMeasureUnit(eDefaultFieldUnit)) ), - mpNumExport(0L), - mpProgressBarHelper( NULL ), - mpEventExport( NULL ), - mpImageMapExport( NULL ), - mpXMLErrors( NULL ), - mbExtended( sal_False ), - meClass( XML_TOKEN_INVALID ), - mnExportFlags( 0 ), - mnErrorFlags( ERROR_NO ), - msWS( GetXMLToken(XML_WS) ), - mbSaveLinkedSections(sal_True) -{ - mpImpl->SetSchemeOf( msOrigFileName ); - DBG_ASSERT( mxServiceFactory.is(), "got no service manager" ); - _InitCtor(); - - if (mxNumberFormatsSupplier.is()) - mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier); -} - SvXMLExport::~SvXMLExport() { delete mpXMLErrors; @@ -2627,37 +2587,6 @@ SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSth, sal_uInt16 nPrefixKey, - const sal_Char *pLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) : - rExport( rExp ), - bIgnWS( bIWSInside ), - bDoSomething( bDoSth ) -{ - if( bDoSomething ) - { - OUString sLName( OUString::createFromAscii(pLName) ); - StartElement( rExp, nPrefixKey, sLName, bIWSOutside ); - } -} - -SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, - sal_Bool bDoSth, - sal_uInt16 nPrefixKey, - const OUString& rLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) : - rExport( rExp ), - bIgnWS( bIWSInside ), - bDoSomething( bDoSth ) -{ - if( bDoSomething ) - StartElement( rExp, nPrefixKey, rLName, bIWSOutside ); -} - -SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, - sal_Bool bDoSth, - sal_uInt16 nPrefixKey, enum XMLTokenEnum eLName, sal_Bool bIWSOutside, sal_Bool bIWSInside ) : diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index e8f59b50637d..e89a8cd9ceb0 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1716,36 +1716,6 @@ void SvXMLImport::SetError( SetError( nId, aSeq ); } -void SvXMLImport::SetError( - sal_Int32 nId, - const OUString& rMsg1, - const OUString& rMsg2, - const OUString& rMsg3) -{ - Sequence<OUString> aSeq(3); - OUString* pSeq = aSeq.getArray(); - pSeq[0] = rMsg1; - pSeq[1] = rMsg2; - pSeq[2] = rMsg3; - SetError( nId, aSeq ); -} - -void SvXMLImport::SetError( - sal_Int32 nId, - const OUString& rMsg1, - const OUString& rMsg2, - const OUString& rMsg3, - const OUString& rMsg4) -{ - Sequence<OUString> aSeq(4); - OUString* pSeq = aSeq.getArray(); - pSeq[0] = rMsg1; - pSeq[1] = rMsg2; - pSeq[2] = rMsg3; - pSeq[3] = rMsg4; - SetError( nId, aSeq ); -} - void SvXMLImport::DisposingModel() { if( mxFontDecls.Is() ) diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index d610e4e0454a..10a054405a70 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -790,19 +790,6 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, } */ - -void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, - const XMLPropertyState& rProperty, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags ) const -{ - if( ( maPropMapper->GetEntryFlags( rProperty.mnIndex ) & - MID_FLAG_ELEMENT_ITEM_EXPORT ) == 0 ) - _exportXML( rAttrList, rProperty, rUnitConverter, rNamespaceMap, - nFlags ); -} - void SvXMLExportPropertyMapper::exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, |