diff options
Diffstat (limited to 'svx')
49 files changed, 22 insertions, 358 deletions
diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx index 859f88e2dc9a..d930e176b24b 100644 --- a/svx/inc/sdr/properties/itemsettools.hxx +++ b/svx/inc/sdr/properties/itemsettools.hxx @@ -45,7 +45,7 @@ namespace sdr explicit ItemChangeBroadcaster(const SdrObject& rObj); ~ItemChangeBroadcaster(); - sal_uInt32 GetRectangleCount() const; + sal_uInt32 GetRectangleCount() const { return mnCount; } const Rectangle& GetRectangle(sal_uInt32 nIndex) const; }; } // end of namespace properties diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx index 258fcdd72246..e30baeacfd0a 100644 --- a/svx/inc/svdoopengl.hxx +++ b/svx/inc/svdoopengl.hxx @@ -30,7 +30,7 @@ public: virtual ~SdrOpenGLObj(); virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; - OpenGLContext* getOpenGLContext(); + OpenGLContext* getOpenGLContext() { return mpContext;} virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 1e98cd553b76..4a89f38da17a 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -139,10 +139,6 @@ void AccessibleShapeTreeInfo::SetSdrView (SdrView* pView) -SdrView* AccessibleShapeTreeInfo::GetSdrView (void) const -{ - return mpView; -} @@ -173,10 +169,6 @@ void AccessibleShapeTreeInfo::SetWindow (Window* pWindow) -Window* AccessibleShapeTreeInfo::GetWindow (void) const -{ - return mpWindow; -} @@ -189,10 +181,6 @@ void AccessibleShapeTreeInfo::SetViewForwarder (const IAccessibleViewForwarder* -const IAccessibleViewForwarder* AccessibleShapeTreeInfo::GetViewForwarder (void) const -{ - return mpViewForwarder; -} } // end of namespace accessibility diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index e205ba74aada..9d8488ef579d 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -156,7 +156,12 @@ namespace accessibility void FireEvent( const AccessibleEventObject& rEvent ) const; void SetFocus( bool bHaveFocus ); - bool HaveFocus(); + bool HaveFocus() + { + // No locking of solar mutex here, since we rely on the fact + // that sal_Bool access is atomic + return mbThisHasFocus; + } void SetChildFocus( sal_Int32 nChild, bool bHaveFocus ); void SetShapeFocus( bool bHaveFocus ); void ChangeChildFocus( sal_Int32 nNewChild ); @@ -524,13 +529,6 @@ namespace accessibility OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %p, state: %s", this, bHaveFocus ? "focused" : "not focused"); } - bool AccessibleTextHelper_Impl::HaveFocus() - { - - // No locking of solar mutex here, since we rely on the fact - // that sal_Bool access is atomic - return mbThisHasFocus; - } bool AccessibleTextHelper_Impl::IsActive() const { diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index a18ddbf94718..53f1685f1c7a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -509,10 +509,6 @@ void SvxTPView::EnableUndo(bool nFlag) m_pUndo->Enable(nFlag); } -SvxRedlinTable* SvxTPView::GetTableControl() -{ - return m_pViewData; -} IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) { @@ -888,10 +884,6 @@ void SvxTPFilter::ShowAction(bool bShow) } } -ListBox* SvxTPFilter::GetLbAction() -{ - return m_pLbAction; -} IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb ) { @@ -1123,15 +1115,7 @@ void SvxAcceptChgCtr::ShowViewPage() SetCurPageId(m_nViewPageId); } -SvxTPFilter* SvxAcceptChgCtr::GetFilterPage() -{ - return pTPFilter; -} -SvxTPView* SvxAcceptChgCtr::GetViewPage() -{ - return pTPView; -} SvxRedlinTable* SvxAcceptChgCtr::GetViewTable() { diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index f629d9cc9548..d8b6153e1165 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1161,10 +1161,6 @@ Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 n Set( pBorder, fScale, nMaxWidth ); } -double Style::PatternScale() const -{ - return mfPatternScale; -} void Style::SetPatternScale( double fScale ) { diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index de8c2514f26c..44aeecbc083c 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -767,10 +767,6 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl, SvxLanguageComboBox*, /*pEd*/ ) } -SvxLanguageComboBox::EditedAndValid SvxLanguageComboBox::GetEditedAndValid() const -{ - return meEditedAndValid; -} sal_Int32 SvxLanguageComboBox::SaveEditedAsEntry() diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 6c914271d75d..4983389f86dd 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -152,15 +152,7 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) : mlRight (rCpy.mlRight) {} -long SvxLongLRSpaceItem::GetLeft() const -{ - return mlLeft; -} -long SvxLongLRSpaceItem::GetRight() const -{ - return mlRight; -} void SvxLongLRSpaceItem::SetLeft(long lArgLeft) { @@ -293,15 +285,7 @@ SvxLongULSpaceItem::SvxLongULSpaceItem() : mlRight (0) {} -long SvxLongULSpaceItem::GetUpper() const -{ - return mlLeft; -} -long SvxLongULSpaceItem::GetLower() const -{ - return mlRight; -} void SvxLongULSpaceItem::SetUpper(long lArgLeft) { @@ -646,10 +630,6 @@ void SvxColumnItem::SetRight(long right) nRight = right; } -sal_uInt16 SvxColumnItem::GetActColumn() const -{ - return nActColumn; -} bool SvxColumnItem::IsFirstAct() const { @@ -661,20 +641,8 @@ bool SvxColumnItem::IsLastAct() const return nActColumn == Count() - 1; } -long SvxColumnItem::GetLeft() -{ - return nLeft; -} -long SvxColumnItem::GetRight() -{ - return nRight; -} -bool SvxColumnItem::IsTable() const -{ - return bTable; -} /* SvxColumnDescription */ @@ -844,30 +812,10 @@ bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM return bRet; } -bool SvxObjectItem::HasLimits() const -{ - return bLimits; -} -long SvxObjectItem::GetStartX() const -{ - return nStartX; -} -long SvxObjectItem::GetEndX() const -{ - return nEndX; -} -long SvxObjectItem::GetStartY() const -{ - return nStartY; -} -long SvxObjectItem::GetEndY() const -{ - return nEndY; -} void SvxObjectItem::SetStartX(long lValue) { diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index ac1a4afd2824..37f7de03079d 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2244,10 +2244,6 @@ SvxSearchDialogWrapper::~SvxSearchDialogWrapper () { } -SvxSearchDialog *SvxSearchDialogWrapper::getDialog () -{ - return dialog; -} diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 49570960ccb4..7455e6d31d34 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -2005,10 +2005,6 @@ void FmGridControl::Select() } } -sal_Int32 FmGridControl::GetSelectedColumn() const -{ - return m_nCurrentSelectedColumn; -} void FmGridControl::KeyInput( const KeyEvent& rKEvt ) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 9e464d0db02c..3d30b76b65c5 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1605,10 +1605,6 @@ void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos) } } -sal_uInt32 SvxNumberFormatShell::GetCurrencySymbol() -{ - return nCurCurrencyEntryPos; -} void SvxNumberFormatShell::SetCurCurrencyEntry(NfCurrencyEntry* pCEntry) { diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index d7d44184c78a..099af576c38b 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -38,10 +38,6 @@ namespace sdr { } - Event* Event::GetNext() const - { - return mpNext; - } void Event::SetNext(Event* pNew) { @@ -51,10 +47,6 @@ namespace sdr } } - sal_uInt32 Event::GetTime() const - { - return mnTime; - } void Event::SetTime(sal_uInt32 nNew) { @@ -145,10 +137,6 @@ namespace sdr } } - Event* EventList::GetFirst() - { - return mpHead; - } } // end of namespace animation } // end of namespace sdr @@ -230,10 +218,6 @@ namespace sdr } } - sal_uInt32 Scheduler::GetTime() - { - return mnTime; - } // #i38135# void Scheduler::SetTime(sal_uInt32 nTime) diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 259aea7afbd7..e74326c5d487 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -195,18 +195,12 @@ namespace sdr return true; } - // check if asynchronious graphis loading is allowed. Default is false. + // check if asynchronous graphics loading is allowed. Default is false. bool ObjectContact::IsAsynchronGraphicsLoadingAllowed() const { return false; } - // access to ViewObjectContactRedirector - ViewObjectContactRedirector* ObjectContact::GetViewObjectContactRedirector() const - { - return mpViewObjectContactRedirector; - } - void ObjectContact::SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew) { if(mpViewObjectContactRedirector != pNew) diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 2879b487313a..0d4a5e16b904 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -72,10 +72,6 @@ namespace sdr } } - sal_uInt32 ItemChangeBroadcaster::GetRectangleCount() const - { - return mnCount; - } const Rectangle& ItemChangeBroadcaster::GetRectangle(sal_uInt32 nIndex) const { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index f37bb1acfc43..109cb5bdce99 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1069,10 +1069,6 @@ void AreaPropertyPanel::NotifyItemUpdate( -SfxBindings* AreaPropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index eea746439b2d..bd6677d732fc 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -70,7 +70,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} const static sal_Int32 DEFAULT_CENTERX; const static sal_Int32 DEFAULT_CENTERY; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 656aeaea3f82..58e8cd2c5699 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -461,10 +461,6 @@ void GraphicPropertyPanel::NotifyItemUpdate( -SfxBindings* GraphicPropertyPanel::GetBindings() -{ - return mpBindings; -} // namespace close diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 9bedc8869e3d..a7ac8eb869d1 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -53,7 +53,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index eaa79bbe118e..241d16ec8395 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -673,10 +673,6 @@ void LinePropertyPanel::NotifyItemUpdate( -SfxBindings* LinePropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 9eb1508d7f13..c22268f014f2 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -74,7 +74,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} void SetWidth(long nWidth); void SetWidthIcon(int n); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 77fcea5fcfe3..a16e59e2a77f 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -346,18 +346,10 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl) -bool LineWidthControl::IsCloseByEdit() -{ - return mbCloseByEdit; -} -long LineWidthControl::GetTmpCustomWidth() -{ - return mnTmpCusomWidth; -} diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 99a1d98312e6..6053edb54c6b 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -43,8 +43,8 @@ public: virtual void Paint(const Rectangle& rect) SAL_OVERRIDE; void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit); - bool IsCloseByEdit(); - long GetTmpCustomWidth(); + bool IsCloseByEdit() { return mbCloseByEdit;} + long GetTmpCustomWidth() { return mnTmpCusomWidth;} private: LinePropertyPanel& mrLinePropertyPanel; diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index 68f11f56e24c..66f83a2f151a 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -76,10 +76,6 @@ void LineWidthValueSet::SetSelItem(sal_uInt16 nSel) -sal_uInt16 LineWidthValueSet::GetSelItem() -{ - return nSelItem; -} diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index 90b64565f3b7..a3bb77382c8f 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -33,7 +33,7 @@ public: void SetUnit(OUString* str); void SetSelItem(sal_uInt16 nSel); - sal_uInt16 GetSelItem(); + sal_uInt16 GetSelItem() { return nSelItem;} void SetImage(Image img); void SetCusEnable(bool bEnable); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index f1ac7a0cebbb..b819b00833f0 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -255,10 +255,6 @@ void NBOTypeMgrBase::StoreMapUnit_impl() { } } } -SfxMapUnit NBOTypeMgrBase::GetMapUnit() -{ - return eCoreUnit; -} /*************************************************************************************************** **********************Character Bullet Type lib********************************************************** ****************************************************************************************************/ diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index d8843464b64c..2a5e55cf11bf 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -209,10 +209,6 @@ void ParaPropertyPanel::HandleContextChange ( } } -SfxBindings* ParaPropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 220945ba70e3..df9a425a5e08 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -69,7 +69,7 @@ public: const cssu::Reference<css::ui::XSidebar>& rxSidebar); virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} virtual void HandleContextChange ( const ::sfx2::sidebar::EnumContext aContext) SAL_OVERRIDE; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index b2c3754c48af..c0b40e48bf5b 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -894,10 +894,6 @@ void PosSizePropertyPanel::NotifyItemUpdate( -SfxBindings* PosSizePropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index b25b6af63e9d..a64a579d5194 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -66,7 +66,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //Position diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 88a482c8f699..d81a63ef36f2 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -441,14 +441,6 @@ IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*, EMPTYARG) mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L); return 0; } -short TextCharacterSpacingControl::GetLastCustomState() -{ - return mnLastCus; -} -long TextCharacterSpacingControl::GetLastCustomValue() -{ - return mnCustomKern; -} }} // end of namespace sidebar diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index f0ae669ee617..957a58a79668 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -49,8 +49,8 @@ public: //virtual void Paint(const Rectangle& rect); //add - short GetLastCustomState(); - long GetLastCustomValue(); + short GetLastCustomState() { return mnLastCus;} + long GetLastCustomValue() { return mnCustomKern;} //add end private: diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index db6345eb7334..3b334d117720 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1754,10 +1754,6 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) } } -SdrMarkView* SdrHdlList::GetView() const -{ - return pView; -} // Helper struct for re-sorting handles struct ImplHdlAndIndex diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 698ee8d60759..f6945e977ac9 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -117,10 +117,6 @@ void SdrMark::SetMarkedSdrObj(SdrObject* pNewObj) } } -SdrObject* SdrMark::GetMarkedSdrObj() const -{ - return mpSelectedSdrObject; -} SdrMark& SdrMark::operator=(const SdrMark& rMark) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index f3fc337673ea..f713087c6073 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -304,10 +304,6 @@ SdrModel::~SdrModel() delete mpImpl; } -bool SdrModel::IsInDestruction() const -{ - return mbInDestruction; -} // not yet implemented void SdrModel::operator=(const SdrModel&) @@ -2060,19 +2056,7 @@ void SdrHint::SetKind(SdrHintKind eNewKind) meHint = eNewKind; } -const SdrPage* SdrHint::GetPage() const -{ - return mpPage; -} -const SdrObject* SdrHint::GetObject() const -{ - return mpObj; -} -SdrHintKind SdrHint::GetKind() const -{ - return meHint; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 8f7b0e2e5166..a640b229d315 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -535,10 +535,6 @@ void SdrObjCustomShape::SetMirroredY( const bool bMirrorY ) SetMergedItem( aGeometryItem ); } -double SdrObjCustomShape::GetObjectRotation() const -{ - return fObjectRotation; -} bool SdrObjCustomShape::IsPostRotate() const { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ca94637feb5a..c18f84c716ac 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -167,15 +167,7 @@ SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) : SdrObjUserData::~SdrObjUserData() {} -sal_uInt32 SdrObjUserData::GetInventor() const -{ - return nInventor; -} -sal_uInt16 SdrObjUserData::GetId() const -{ - return nIdentifier; -} bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const { @@ -570,20 +562,12 @@ void SdrObject::SetModel(SdrModel* pNewModel) pModel = pNewModel; } -SdrModel* SdrObject::GetModel() const -{ - return pModel; -} void SdrObject::SetObjList(SdrObjList* pNewObjList) { pObjList=pNewObjList; } -SdrObjList* SdrObject::GetObjList() const -{ - return pObjList; -} void SdrObject::SetPage(SdrPage* pNewPage) { @@ -611,10 +595,6 @@ void SdrObject::SetPage(SdrPage* pNewPage) } } -SdrPage* SdrObject::GetPage() const -{ - return pPage; -} // init global static itempool SdrItemPool* SdrObject::mpGlobalItemPool = NULL; @@ -900,10 +880,6 @@ sal_uInt32 SdrObject::GetOrdNum() const return nOrdNum; } -sal_uInt32 SdrObject::GetOrdNumDirect() const -{ - return nOrdNum; -} void SdrObject::SetOrdNum(sal_uInt32 nNum) { @@ -2690,95 +2666,39 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas return pRet; } -bool SdrObject::IsVirtualObj() const -{ - return bVirtObj; -} -bool SdrObject::IsClosedObj() const -{ - return bClosedObj; -} -bool SdrObject::IsEdgeObj() const -{ - return bIsEdge; -} -bool SdrObject::Is3DObj() const -{ - return bIs3DObj; -} -bool SdrObject::IsUnoObj() const -{ - return bIsUnoObj; -} void SdrObject::SetMarkProtect(bool bProt) { bMarkProt = bProt; } -bool SdrObject::IsMarkProtect() const -{ - return bMarkProt; -} -bool SdrObject::IsInserted() const -{ - return bInserted; -} -bool SdrObject::IsMoveProtect() const -{ - return bMovProt; -} -bool SdrObject::IsResizeProtect() const -{ - return bSizProt; -} bool SdrObject::IsPrintable() const { return !bNoPrint; } -bool SdrObject::IsVisible() const -{ - return mbVisible; -} void SdrObject::SetEmptyPresObj(bool bEpt) { bEmptyPresObj = bEpt; } -bool SdrObject::IsEmptyPresObj() const -{ - return bEmptyPresObj; -} void SdrObject::SetNotVisibleAsMaster(bool bFlg) { bNotVisibleAsMaster=bFlg; } -bool SdrObject::IsNotVisibleAsMaster() const -{ - return bNotVisibleAsMaster; -} -bool SdrObject::LineIsOutsideGeometry() const -{ - return mbLineIsOutsideGeometry; -} -bool SdrObject::DoesSupportTextIndentingOnLineWidthChange() const -{ - return mbSupportTextIndentingOnLineWidthChange; -} // convert this path object to contour object, even when it is a group SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const @@ -2966,10 +2886,6 @@ void SdrObject::SetUserCall(SdrObjUserCall* pUser) pUserCall = pUser; } -SdrObjUserCall* SdrObject::GetUserCall() const -{ - return pUserCall; -} void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const { @@ -3335,10 +3251,6 @@ void SdrObject::SetDoNotInsertIntoPageAutomatically(const bool bSet) mbDoNotInsertIntoPageAutomatically = bSet; } -bool SdrObject::IsDoNotInsertIntoPageAutomatically() const -{ - return mbDoNotInsertIntoPageAutomatically; -} // #i121917# bool SdrObject::HasText() const diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5a9496f8e541..4b1c22b490c5 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1210,10 +1210,6 @@ void SdrGrafObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ImpSetAttrToGrafInfo(); } -bool SdrGrafObj::IsMirrored() const -{ - return bMirrored; -} void SdrGrafObj::SetMirrored( bool _bMirrored ) { diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx index f1e8398cf057..1b3398359c83 100644 --- a/svx/source/svdraw/svdoopengl.cxx +++ b/svx/source/svdraw/svdoopengl.cxx @@ -34,10 +34,6 @@ sdr::contact::ViewContact* SdrOpenGLObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfOpenGLObj(*this); } -OpenGLContext* SdrOpenGLObj::getOpenGLContext() -{ - return mpContext; -} void SdrOpenGLObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 409c2b16f535..568aa4ea7a10 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -96,10 +96,6 @@ SdrPageObj::~SdrPageObj() } } -SdrPage* SdrPageObj::GetReferencedPage() const -{ - return mpShownPage; -} void SdrPageObj::SetReferencedPage(SdrPage* pNewPage) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index b0a9c4477c6e..dbe91a6c2843 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1236,10 +1236,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) ImpPageChange(*mpSdrPage); } -SfxStyleSheet* SdrPageProperties::GetStyleSheet() const -{ - return mpStyleSheet; -} diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 180396120b1e..3e09f9d64fb4 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -127,10 +127,6 @@ SvxViewHint::SvxViewHint (HintType eHintType) { } -SvxViewHint::HintType SvxViewHint::GetHintType (void) const -{ - return meHintType; -} @@ -1318,10 +1314,6 @@ void SdrPaintView::SetBufferedOverlayAllowed(bool bNew) } } -bool SdrPaintView::IsPagePaintingAllowed() const -{ - return mbPagePaintingAllowed; -} void SdrPaintView::SetPagePaintingAllowed(bool bNew) { diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b51142e6a50e..9aa4e00a3fc3 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -778,10 +778,6 @@ void SdrUndoObjList::SetOwner(bool bNew) bOwner = bNew; } -sal_uInt32 SdrUndoObjList::GetOrdNum() const -{ - return nOrdNum; -} void SdrUndoObjList::SetOrdNum(sal_uInt32 nOrdNum_) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index ddcc2f7c37d3..87aa9c4b0689 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -276,10 +276,6 @@ void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) GetModel()->SetSortMode(SortNone); } -sal_uInt16 DictionaryList::getSortColumn() const -{ - return m_nSortColumnIndex; -} IMPL_LINK( DictionaryList, CompareHdl, SvSortData*, pData ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 182c4984ad92..b088bb07196d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -81,7 +81,7 @@ public: DictionaryEntry* getFirstSelectedEntry() const; void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ); - sal_uInt16 getSortColumn() const; + sal_uInt16 getSortColumn() const { return m_nSortColumnIndex;} private: OUString getPropertyTypeName( sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/ ) const; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index bdc4478bea60..acbb614fc74d 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1262,10 +1262,6 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } -drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw() -{ - return mePolygonKind; -} void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) @@ -1397,10 +1393,6 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } -drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw() -{ - return mePolygonKind; -} void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 1a70be1f03d0..cbffcd4688fb 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -405,10 +405,6 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt -const ::GalleryObject* GalleryItem::implGetObject() const -{ - return mpGalleryObject; -} diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index ab526c9e086a..6449cc4fd608 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -92,7 +92,7 @@ private: ::unogallery::GalleryTheme* mpTheme; const ::GalleryObject* mpGalleryObject; - const ::GalleryObject* implGetObject() const; + const ::GalleryObject* implGetObject() const { return mpGalleryObject;} void implSetInvalid(); // not available diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index aa28d12f7b41..8381641fae35 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -401,10 +401,6 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) -::GalleryTheme* GalleryTheme::implGetTheme() const -{ - return mpTheme; -} diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index bf3b698e49bb..88d8afd86582 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -91,7 +91,7 @@ private: ::Gallery* mpGallery; ::GalleryTheme* mpTheme; - ::GalleryTheme* implGetTheme() const; + ::GalleryTheme* implGetTheme() const { return mpTheme;} void implReleaseItems( GalleryObject* pObj ); |