summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx6
-rw-r--r--svx/source/dialog/framelinkarray.cxx35
-rw-r--r--svx/source/dialog/langbox.cxx8
-rw-r--r--svx/source/dialog/txencbox.cxx4
-rw-r--r--svx/source/engine3d/view3d1.cxx64
-rw-r--r--svx/source/form/fmvwimp.cxx7
-rw-r--r--svx/source/gallery2/galmisc.cxx5
-rw-r--r--svx/source/inc/fmexch.hxx4
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx15
-rw-r--r--svx/source/svdraw/svdmrkv.cxx6
-rw-r--r--svx/source/svdraw/svdoashp.cxx4
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdotxat.cxx4
-rw-r--r--svx/source/table/svdotable.cxx4
16 files changed, 72 insertions, 100 deletions
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 358265234673..611aa1b50986 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -599,7 +599,7 @@ void SvxRectCtlAccessibleContext::FireChildFocus( RECT_POINT eButton )
else
mnSelectedChild = NOCHILDSELECTED;
}
-void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus )
+void SvxRectCtlAccessibleContext::selectChild( long nNew )
{
::osl::MutexGuard aGuard( m_aMutex );
if( nNew != mnSelectedChild )
@@ -612,7 +612,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus )
{ // deselect old selected child if one is selected
pChild = mpChildren[ mnSelectedChild ];
if( pChild )
- pChild->setStateChecked( false, bFireFocus );
+ pChild->setStateChecked( false );
}
// select new child
@@ -622,7 +622,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus )
{
pChild = mpChildren[ nNew ];
if( pChild )
- pChild->setStateChecked( true, bFireFocus );
+ pChild->setStateChecked( true );
}
}
else
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index e2d91902ff14..b194717cd7ee 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -167,7 +167,7 @@ struct ArrayImpl
long GetRowHeight( size_t nFirstRow, size_t nLastRow ) const;
double GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const;
- double GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const;
+ double GetVerDiagAngle( size_t nCol, size_t nRow ) const;
};
ArrayImpl::ArrayImpl( size_t nWidth, size_t nHeight, bool bDiagDblClip ) :
@@ -323,9 +323,9 @@ double ArrayImpl::GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple ) cons
return fAngle;
}
-double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const
+double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow ) const
{
- double fAngle = GetHorDiagAngle( nCol, nRow, bSimple );
+ double fAngle = GetHorDiagAngle( nCol, nRow );
return (fAngle > 0.0) ? (F_PI2 - fAngle) : 0.0;
}
@@ -806,19 +806,19 @@ long Array::GetHeight() const
return GetRowPosition( mxImpl->mnHeight ) - GetRowPosition( 0 );
}
-Point Array::GetCellPosition( size_t nCol, size_t nRow, bool bSimple ) const
+Point Array::GetCellPosition( size_t nCol, size_t nRow ) const
{
- size_t nFirstCol = bSimple ? nCol : mxImpl->GetMergedFirstCol( nCol, nRow );
- size_t nFirstRow = bSimple ? nRow : mxImpl->GetMergedFirstRow( nCol, nRow );
+ size_t nFirstCol = mxImpl->GetMergedFirstCol( nCol, nRow );
+ size_t nFirstRow = mxImpl->GetMergedFirstRow( nCol, nRow );
return Point( GetColPosition( nFirstCol ), GetRowPosition( nFirstRow ) );
}
-Size Array::GetCellSize( size_t nCol, size_t nRow, bool bSimple ) const
+Size Array::GetCellSize( size_t nCol, size_t nRow ) const
{
- size_t nFirstCol = bSimple ? nCol : mxImpl->GetMergedFirstCol( nCol, nRow );
- size_t nFirstRow = bSimple ? nRow : mxImpl->GetMergedFirstRow( nCol, nRow );
- size_t nLastCol = bSimple ? nCol : mxImpl->GetMergedLastCol( nCol, nRow );
- size_t nLastRow = bSimple ? nRow : mxImpl->GetMergedLastRow( nCol, nRow );
+ size_t nFirstCol = mxImpl->GetMergedFirstCol( nCol, nRow );
+ size_t nFirstRow = mxImpl->GetMergedFirstRow( nCol, nRow );
+ size_t nLastCol = mxImpl->GetMergedLastCol( nCol, nRow );
+ size_t nLastRow = mxImpl->GetMergedLastRow( nCol, nRow );
return Size( GetColWidth( nFirstCol, nLastCol ) + 1, GetRowHeight( nFirstRow, nLastRow ) + 1 );
}
@@ -1095,8 +1095,7 @@ void Array::DrawRange( drawinglayer::processor2d::BaseProcessor2D* pProcessor,
}
void Array::DrawRange( OutputDevice& rDev,
- size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow,
- const Color* pForceColor ) const
+ size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ) const
{
DBG_FRAME_CHECK_COLROW( nFirstCol, nFirstRow, "DrawRange" );
DBG_FRAME_CHECK_COLROW( nLastCol, nLastRow, "DrawRange" );
@@ -1134,7 +1133,7 @@ void Array::DrawRange( OutputDevice& rDev,
GetCellStyleRight( _nLastCol, _nLastRow ), GetCellStyleBottom( _nLastCol, _nLastRow ),
GetCellStyleLeft( _nFirstCol, _nLastRow ), GetCellStyleBottom( _nFirstCol, _nLastRow ),
GetCellStyleRight( _nLastCol, _nFirstRow ), GetCellStyleTop( _nLastCol, _nFirstRow ),
- pForceColor, mxImpl->mbDiagDblClip );
+ nullptr, mxImpl->mbDiagDblClip );
}
}
}
@@ -1192,7 +1191,7 @@ void Array::DrawRange( OutputDevice& rDev,
if( pStart->Prim() && (aStartPos.X() <= aEndPos.X()) )
DrawHorFrameBorder( rDev, aStartPos, aEndPos, *pStart,
aStartLFromTR, *pStartLFromT, *pStartLFromL, *pStartLFromB, aStartLFromBR,
- aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL, pForceColor );
+ aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL );
// re-init "*Start***" variables
aStartPos = aEndPos;
@@ -1217,7 +1216,7 @@ void Array::DrawRange( OutputDevice& rDev,
if( pStart->Prim() && (aStartPos.X() <= aEndPos.X()) )
DrawHorFrameBorder( rDev, aStartPos, aEndPos, *pStart,
aStartLFromTR, *pStartLFromT, *pStartLFromL, *pStartLFromB, aStartLFromBR,
- aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL, pForceColor );
+ aEndRFromTL, *pEndRFromT, *pEndRFromR, *pEndRFromB, aEndRFromBL );
}
// *** vertical frame borders ***
@@ -1271,7 +1270,7 @@ void Array::DrawRange( OutputDevice& rDev,
if( pStart->Prim() && (aStartPos.Y() <= aEndPos.Y()) )
DrawVerFrameBorder( rDev, aStartPos, aEndPos, *pStart,
aStartTFromBL, *pStartTFromL, *pStartTFromT, *pStartTFromR, aStartTFromBR,
- aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR, pForceColor );
+ aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR );
// re-init "*Start***" variables
aStartPos = aEndPos;
@@ -1296,7 +1295,7 @@ void Array::DrawRange( OutputDevice& rDev,
if( pStart->Prim() && (aStartPos.Y() <= aEndPos.Y()) )
DrawVerFrameBorder( rDev, aStartPos, aEndPos, *pStart,
aStartTFromBL, *pStartTFromL, *pStartTFromT, *pStartTFromR, aStartTFromBR,
- aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR, pForceColor );
+ aEndBFromTL, *pEndBFromL, *pEndBFromB, *pEndBFromR, aEndBFromTR );
}
}
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 6f2a77c662c0..cf4dca6a5301 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -566,14 +566,14 @@ void SvxLanguageComboBox::ImplSetEntryData( sal_Int32 nPos, void* pData )
}
-sal_Int32 SvxLanguageBox::ImplGetSelectEntryPos( sal_Int32 nSelIndex ) const
+sal_Int32 SvxLanguageBox::ImplGetSelectEntryPos() const
{
- return GetSelectEntryPos( nSelIndex);
+ return GetSelectEntryPos();
}
-sal_Int32 SvxLanguageComboBox::ImplGetSelectEntryPos( sal_Int32 nSelIndex ) const
+sal_Int32 SvxLanguageComboBox::ImplGetSelectEntryPos() const
{
- return GetSelectEntryPos( nSelIndex);
+ return GetSelectEntryPos();
}
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index f167a134e2ed..71868ecfe3a8 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -194,9 +194,9 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
- const OUString& rEntry, sal_Int32 nPos )
+ const OUString& rEntry )
{
- sal_Int32 nAt = InsertEntry( rEntry, nPos );
+ sal_Int32 nAt = InsertEntry( rEntry );
SetEntryData( nAt, reinterpret_cast<void*>(nEnc) );
}
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 9da8e3ff6a61..b99ff181680f 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -96,7 +96,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
}
}
-SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene) const
+SfxItemSet E3dView::Get3DAttributes() const
{
// Creating itemset with corresponding field
SfxItemSet aSet(
@@ -107,32 +107,24 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene) const
sal_uInt32 nSelectedItems(0L);
- if(pInScene)
- {
- // special scene
- aSet.Put(pInScene->GetMergedItemSet());
- }
- else
- {
- // get attributes from all selected objects
- MergeAttrFromMarked(aSet, false);
+ // get attributes from all selected objects
+ MergeAttrFromMarked(aSet, false);
- // calc flags for SID_ATTR_3D_INTERN
- const SdrMarkList& rMarkList = GetMarkedObjectList();
- const size_t nMarkCnt(rMarkList.GetMarkCount());
+ // calc flags for SID_ATTR_3D_INTERN
+ const SdrMarkList& rMarkList = GetMarkedObjectList();
+ const size_t nMarkCnt(rMarkList.GetMarkCount());
- for(size_t a = 0; a < nMarkCnt; ++a)
- {
- SdrObject* pObj = GetMarkedObjectByIndex(a);
- Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems);
- }
+ for(size_t a = 0; a < nMarkCnt; ++a)
+ {
+ SdrObject* pObj = GetMarkedObjectByIndex(a);
+ Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems);
}
// Set SID_ATTR_3D_INTERN on the status of the selected objects
aSet.Put(SfxUInt32Item(SID_ATTR_3D_INTERN, nSelectedItems));
// maintain default values
- if(!nSelectedItems && !pInScene)
+ if(!nSelectedItems)
{
// Get defaults and apply
SfxItemSet aDefaultSet(mpModel->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST);
@@ -151,41 +143,33 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene) const
return aSet;
}
-void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene)
+void E3dView::Set3DAttributes( const SfxItemSet& rAttr)
{
sal_uInt32 nSelectedItems(0L);
- if(pInScene)
- {
- pInScene->SetMergedItemSetAndBroadcast(rAttr);
- }
- else
- {
- // #i94832# removed usage of E3DModifySceneSnapRectUpdater here.
- // They are not needed here, they are already handled in SetAttrToMarked
+ // #i94832# removed usage of E3DModifySceneSnapRectUpdater here.
+ // They are not needed here, they are already handled in SetAttrToMarked
- // set at selected objects
- SetAttrToMarked(rAttr, false/*bReplaceAll*/);
+ // set at selected objects
+ SetAttrToMarked(rAttr, false/*bReplaceAll*/);
- // old run
- const SdrMarkList& rMarkList = GetMarkedObjectList();
- const size_t nMarkCnt(rMarkList.GetMarkCount());
+ // old run
+ const SdrMarkList& rMarkList = GetMarkedObjectList();
+ const size_t nMarkCnt(rMarkList.GetMarkCount());
- for(size_t a = 0; a < nMarkCnt; ++a)
- {
- SdrObject* pObj = GetMarkedObjectByIndex(a);
- Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems);
- }
+ for(size_t a = 0; a < nMarkCnt; ++a)
+ {
+ SdrObject* pObj = GetMarkedObjectByIndex(a);
+ Imp_E3dView_InorderRun3DObjects(pObj, nSelectedItems);
}
// Maintain default values
- if(!nSelectedItems && !pInScene)
+ if(!nSelectedItems)
{
// Set defaults
SfxItemSet aDefaultSet(mpModel->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST);
aDefaultSet.Put(rAttr);
SetAttributes(aDefaultSet);
-
}
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 00f9e1687f25..6fb1a9b21257 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -813,15 +813,12 @@ FmFormShell* FmXFormView::GetFormShell() const
return m_pView ? m_pView->GetFormShell() : nullptr;
}
-void FmXFormView::AutoFocus( bool _bSync )
+void FmXFormView::AutoFocus()
{
if (m_nAutoFocusEvent)
Application::RemoveUserEvent(m_nAutoFocusEvent);
- if ( _bSync )
- OnAutoFocus( nullptr );
- else
- m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus));
+ m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus));
}
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 85bad9efefa1..c7b16d64eb67 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -586,8 +586,7 @@ void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow )
TransferableHelper::CopyToClipboard( pWindow );
}
-void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions,
- sal_Int32 nDragPointer )
+void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions )
{
INetURLObject aURL;
@@ -595,7 +594,7 @@ void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceA
{
mpTheme->SetDragging( true );
mpTheme->SetDragPos( mnObjectPos );
- TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer );
+ TransferableHelper::StartDrag( pWindow, nDragSourceActions );
}
}
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 6bdad805813d..182d5a7a85c2 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -81,9 +81,9 @@ namespace svxform
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
private:
- void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE )
+ void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE )
{ // don't allow this base class method to be called from outside
- TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer, nDragImage);
+ TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer);
}
};
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index cb6c7e21e424..475a47651d4a 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -292,7 +292,7 @@ private:
void cancelEvents();
/// the auto focus to the first (in terms of the tab order) control
- void AutoFocus( bool _bSync = false );
+ void AutoFocus();
DECL_LINK_TYPED( OnActivate, void*, void );
DECL_LINK_TYPED( OnAutoFocus, void*, void );
DECL_LINK_TYPED( OnDelayedErrorMessage, void*, void );
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index acac415799ef..f27191e6026c 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -214,7 +214,7 @@ protected:
@param nIndexOfChild
Index of the new child which should be selected.
*/
- void selectChild( long nIndexOfChild, bool bFireFocus = true);
+ void selectChild( long nIndexOfChild );
public:
/** Selects a new child by point.
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index ec09febd39e4..47544bb0d3fd 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -66,7 +66,7 @@
// EditView
-void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy)
+void SdrEditView::SetMarkedObjRect(const Rectangle& rRect)
{
DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense.");
if (rRect.IsEmpty()) return;
@@ -85,16 +85,11 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy)
long h1=rRect.Bottom()-y1;
OUString aStr;
ImpTakeDescriptionStr(STR_EditPosSize,aStr);
- if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
const bool bUndo = IsUndoEnabled();
if( bUndo )
BegUndo(aStr);
- if (bCopy)
- CopyMarkedObj();
-
for (size_t nm=0; nm<nCount; ++nm)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -433,20 +428,20 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
EndUndo();
}
-void SdrEditView::MirrorMarkedObjHorizontal(bool bCopy)
+void SdrEditView::MirrorMarkedObjHorizontal()
{
Point aCenter(GetMarkedObjRect().Center());
Point aPt2(aCenter);
aPt2.Y()++;
- MirrorMarkedObj(aCenter,aPt2,bCopy);
+ MirrorMarkedObj(aCenter,aPt2);
}
-void SdrEditView::MirrorMarkedObjVertical(bool bCopy)
+void SdrEditView::MirrorMarkedObjVertical()
{
Point aCenter(GetMarkedObjRect().Center());
Point aPt2(aCenter);
aPt2.X()++;
- MirrorMarkedObj(aCenter,aPt2,bCopy);
+ MirrorMarkedObj(aCenter,aPt2);
}
long SdrEditView::GetMarkedObjShear() const
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b01c62131c4c..1fcd76375f4f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1338,15 +1338,13 @@ bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
return bRet;
}
-SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, SdrSearchOptions nOptions) const
+SdrHdl* SdrMarkView::PickHandle(const Point& rPnt) const
{
if (mbSomeObjChgdFlag) { // recalculate handles, if necessary
FlushComeBackTimer();
}
- bool bBack(nOptions & SdrSearchOptions::BACKWARD);
- bool bNext(nOptions & SdrSearchOptions::NEXT);
Point aPt(rPnt);
- return maHdlList.IsHdlListHit(aPt,bBack,bNext);
+ return maHdlList.IsHdlListHit(aPt);
}
bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, bool bToggle, bool bDeep)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index cac8a5291e4e..8b6bd6492246 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2513,9 +2513,9 @@ bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
}
return bRet;
}
-bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt)
+bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight()
{
- Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, true/*bWdt*/ );
+ Rectangle aNewTextRect = ImpCalculateTextFrame( true/*bHgt*/, true/*bWdt*/ );
bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != maRect );
if ( bRet )
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 43ceb636d9cd..e8ee5c3c1d16 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1050,7 +1050,7 @@ OUString SdrObject::GetAngleStr(long nAngle) const
return aStr;
}
-OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/) const
+OUString SdrObject::GetMetrStr(long nVal) const
{
OUString aStr;
if (pModel!=nullptr) {
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index c587c4411017..f78499f84818 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -274,10 +274,10 @@ bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
return bRet;
}
-bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt)
+bool SdrTextObj::AdjustTextFrameWidthAndHeight()
{
Rectangle aNeuRect(maRect);
- bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt);
+ bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect);
if (bRet) {
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
maRect = aNeuRect;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index bd961faacdea..08d4e7237ea3 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1894,10 +1894,10 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
}
-bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt)
+bool SdrTableObj::AdjustTextFrameWidthAndHeight()
{
Rectangle aNeuRect(maLogicRect);
- bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt);
+ bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect);
if (bRet)
{
Rectangle aBoundRect0;
generated by cgit (git 2.34.1) at 2025-01-17 20:37:21 +0000