summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdfmtf.cxx5
-rw-r--r--svx/source/svdraw/svdfmtf.hxx4
-rw-r--r--svx/source/svdraw/svdoedge.cxx31
-rw-r--r--svx/source/svdraw/svdotext.cxx3
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx2
-rw-r--r--svx/source/table/accessibletableshape.cxx2
-rw-r--r--svx/source/table/tabledesign.cxx2
-rw-r--r--svx/source/table/tablelayouter.cxx7
-rw-r--r--svx/source/table/tablelayouter.hxx5
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
10 files changed, 19 insertions, 46 deletions
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 972bc17fccb2..e35dc5aa3c4b 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -445,12 +445,11 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale )
}
/**************************************************************************************************/
-
-void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/)
+void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) const
{
}
-void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/)
+void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/) const
{
}
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index abe1b156b798..5bfea33ad849 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -106,8 +106,8 @@ protected:
sal_Bool bLastObjWasLine;
protected:
- void DoAction(MetaPixelAction & rAct);
- void DoAction(MetaPointAction & rAct);
+ void DoAction(MetaPixelAction & rAct) const;
+ void DoAction(MetaPointAction & rAct) const;
void DoAction(MetaLineAction & rAct);
void DoAction(MetaRectAction & rAct);
void DoAction(MetaRoundRectAction & rAct);
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index ded0163f19c5..3262edcb0296 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -859,8 +859,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
Rectangle aBewareRect1(rBewareRect1);
Rectangle aBewareRect2(rBewareRect2);
Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2);
- bool bMeetingXMid = true;
- bool bMeetingYMid = true;
if (eKind==SDREDGE_ONELINE) {
XPolygon aXP(2);
aXP[0]=rPt1;
@@ -906,7 +904,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
return aXP;
}
USHORT nIntersections=0;
- bool bForceMeeting = false; // Muss die Linie durch den MeetingPoint laufen?
{
Point aC1(aBewareRect1.Center());
Point aC2(aBewareRect2.Center());
@@ -961,23 +958,18 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
bool bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom();
if (bLks1 && (bY1Ok || aBewareRect1.Left()<aBewareRect2.Right()) && (bY2Ok || aBewareRect2.Left()<aBewareRect1.Right())) {
aMeeting.X()=nXMin;
- bMeetingXMid = false;
}
if (bRts1 && (bY1Ok || aBewareRect1.Right()>aBewareRect2.Left()) && (bY2Ok || aBewareRect2.Right()>aBewareRect1.Left())) {
aMeeting.X()=nXMax;
- bMeetingXMid = false;
}
if (bObn1 && (bX1Ok || aBewareRect1.Top()<aBewareRect2.Bottom()) && (bX2Ok || aBewareRect2.Top()<aBewareRect1.Bottom())) {
aMeeting.Y()=nYMin;
- bMeetingYMid = false;
}
if (bUnt1 && (bX1Ok || aBewareRect1.Bottom()>aBewareRect2.Top()) && (bX2Ok || aBewareRect2.Bottom()>aBewareRect1.Top())) {
aMeeting.Y()=nYMax;
- bMeetingYMid = false;
}
} else if (nMainCase==2) {
// Fall 2:
- bForceMeeting = true;
if (bHor1) { // beide waagerecht
/* 9 Moeglichkeiten: */
/* 2.1 Gegenueber, Ueberschneidung */
@@ -1032,7 +1024,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
} else {
aMeeting.Y()=nYMax;
}
- bMeetingYMid = false;
if (bCase29) {
// und nun noch dafuer sorgen, dass das
// umzingelte Obj nicht durchquert wird
@@ -1041,7 +1032,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
} else {
aMeeting.X()=aBewR1.Left();
}
- bMeetingXMid = false;
}
} else {
// Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1092,7 +1082,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
} else {
aMeeting.X()=nXMax;
}
- bMeetingXMid = false;
if (bCase29) {
// und nun noch dafuer sorgen, dass das
// umzingelte Obj nicht durchquert wird
@@ -1101,7 +1090,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
} else {
aMeeting.Y()=aBewR1.Top();
}
- bMeetingYMid = false;
}
} else {
// Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1172,9 +1160,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
(((bRts2 && aTmpR2.Right ()<=aPt1.X()) || (bLks2 && aTmpR2.Left()>=aPt1.X())) &&
((bUnt1 && aTmpR1.Bottom()<=aPt2.Y()) || (bObn1 && aTmpR1.Top ()>=aPt2.Y())))) {
// Fall 3.2 trifft zu: Verbindung mit lediglich 2 Linien
- bForceMeeting = true;
- bMeetingXMid = false;
- bMeetingYMid = false;
if (bHor1) {
aMeeting.X()=aPt2.X();
aMeeting.Y()=aPt1.Y();
@@ -1194,11 +1179,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
((bUnt1 && aBewareRect1.Bottom()>aBewareRect2.Top ()) ||
(bObn1 && aBewareRect1.Top ()<aBewareRect2.Bottom())))) {
// Fall 3.3
- bForceMeeting = true;
- if (bRts1 || bRts2) { aMeeting.X()=nXMax; bMeetingXMid = false; }
- if (bLks1 || bLks2) { aMeeting.X()=nXMin; bMeetingXMid = false; }
- if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; bMeetingYMid = false; }
- if (bObn1 || bObn2) { aMeeting.Y()=nYMin; bMeetingYMid = false; }
+ if (bRts1 || bRts2) { aMeeting.X()=nXMax; }
+ if (bLks1 || bLks2) { aMeeting.X()=nXMin; }
+ if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; }
+ if (bObn1 || bObn2) { aMeeting.Y()=nYMin; }
}
}
}
@@ -1220,8 +1204,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
// Sonderbehandlung fuer 'I'-Verbinder
nXP1Anz--; aXP1.Remove(nXP1Anz,1);
nXP2Anz--; aXP2.Remove(nXP2Anz,1);
- bMeetingXMid = false;
- bMeetingYMid = false;
}
if (bInsMeetingPoint) {
aXP1.Insert(XPOLY_APPEND,aMeeting,XPOLY_NORMAL);
@@ -2096,8 +2078,6 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
bool bFnd = false;
SdrObjConnection aTestCon;
SdrObjConnection aBestCon;
- bool bTestBoundHit = false;
- //bool bBestBoundHit=FALSE;
while (no>0 && !bFnd) {
// Problem: Gruppenobjekt mit verschiedenen Layern liefert LayerID 0 !!!!
@@ -2110,7 +2090,6 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
Rectangle aObjBound(pObj->GetCurrentBoundRect());
if (aObjBound.IsOver(aMouseRect)) {
aTestCon.ResetVars();
- bTestBoundHit = false;
bool bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge
// Die Userdefined Konnektoren haben absolute Prioritaet.
// Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert.
@@ -2197,7 +2176,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
aMouseRect.Top() -=nBoundHitTol;
aMouseRect.Right() +=nBoundHitTol;
aMouseRect.Bottom()+=nBoundHitTol;
- bTestBoundHit=aObjBound.IsOver(aMouseRect2);
+ aObjBound.IsOver(aMouseRect2);
}
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b358caf5ee67..5920bc2d308a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1061,10 +1061,9 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen
long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen
bool bChkX = true;
- bool bChkY = true;
if (bNoStretching) { // #35762# evtl. nur proportional moeglich
if (nX>nY) { nX=nY; bChkX=FALSE; }
- else { nY=nX; bChkY=FALSE; }
+ else { nY=nX; }
}
while (nLoopCount<5 && !bNoMoreLoop) {
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index cd4b9e4bef32..d02123212ea7 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -593,7 +593,7 @@ namespace
const drawinglayer::attribute::StrokeAttribute& rStrokeAttribute,
std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& rTarget)
{
- for(basegfx::B2DPolyPolygonVector::const_iterator aPolygon(rB2DPolyPolyVector.begin()); aPolygon != rB2DPolyPolyVector.end(); aPolygon++)
+ for(basegfx::B2DPolyPolygonVector::const_iterator aPolygon(rB2DPolyPolyVector.begin()); aPolygon != rB2DPolyPolyVector.end(); ++aPolygon)
{
// prepare PolyPolygons
basegfx::B2DPolyPolygon aB2DPolyPolygon = *aPolygon;
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 2af13fcd44a2..94b6030e497b 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -229,7 +229,7 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/
// all accessible cell instances still left in aTempChildMap must be disposed
// as they are no longer part of the table
- for( AccessibleCellMap::iterator iter( aTempChildMap.begin() ); iter != aTempChildMap.end(); iter++ )
+ for( AccessibleCellMap::iterator iter( aTempChildMap.begin() ); iter != aTempChildMap.end(); ++iter )
{
(*iter).second->dispose();
}
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index f52b7ae7b1a6..934f59f811ee 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -717,7 +717,7 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException)
TableDesignStyleVector aDesigns;
aDesigns.swap( maDesigns );
- for( TableDesignStyleVector::iterator iter( aDesigns.begin() ); iter != aDesigns.end(); iter++ )
+ for( TableDesignStyleVector::iterator iter( aDesigns.begin() ); iter != aDesigns.end(); ++iter )
{
Reference< XComponent > xComp( (*iter), UNO_QUERY );
if( xComp.is() )
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index b849a88cde7e..8f892e80605c 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -156,8 +156,7 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr
}
// -----------------------------------------------------------------------------
-
-sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow )
+sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const
{
if( isValidRow(nRow) )
return maRows[nRow].mnSize;
@@ -180,8 +179,7 @@ void TableLayouter::setRowHeight( sal_Int32 nRow, sal_Int32 nHeight )
}
// -----------------------------------------------------------------------------
-
-sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn )
+sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const
{
if( isValidColumn(nColumn) )
return maColumns[nColumn].mnSize;
@@ -1204,7 +1202,6 @@ void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal
}
// -----------------------------------------------------------------------------
-
void TableLayouter::SetWritingMode( com::sun::star::text::WritingMode eWritingMode )
{
meWritingMode = eWritingMode;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 5d38ad96e1d7..d191d4b2dff8 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -95,13 +95,12 @@ public:
::sal_Int32 getRowCount() const { return static_cast< ::sal_Int32 >( maRows.size() ); }
::sal_Int32 getColumnCount() const { return static_cast< ::sal_Int32 >( maColumns.size() ); }
-
- sal_Int32 getRowHeight( sal_Int32 nRow );
+ sal_Int32 getRowHeight( sal_Int32 nRow ) const;
// sets the layout height of the given row hard, LayoutTable must be called directly after calling this method! */
void setRowHeight( sal_Int32 nRow, sal_Int32 nHeight );
- sal_Int32 getColumnWidth( sal_Int32 nColumn );
+ sal_Int32 getColumnWidth( sal_Int32 nColumn ) const;
// sets the layout width of the given column hard, LayoutTable must be called directly after calling this method! */
void setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index a117a1dc80cd..58195689303a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1979,7 +1979,6 @@ void SvxStyleToolBoxControl::FillStyleBox()
{
const SfxStyleFamily eFamily = GetActFamily();
USHORT nCount = pStyleSheetPool->Count();
- USHORT i = 0;
SfxStyleSheetBase* pStyle = NULL;
BOOL bDoFill = FALSE;
@@ -1998,6 +1997,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
}
else
{
+ USHORT i= 0;
while ( pStyle && !bDoFill )
{
bDoFill = ( pBox->GetEntry(i) != pStyle->GetName() );
@@ -2014,12 +2014,12 @@ void SvxStyleToolBoxControl::FillStyleBox()
{
USHORT _i;
sal_uInt32 nCnt = pImpl->aDefaultStyles.size();
- bool bInsert;
pStyle = pStyleSheetPool->First();
if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc )
{
+ bool bInsert;
while ( pStyle )
{
// sort out default styles
generated by cgit (git 2.34.1) at 2024-07-19 11:21:05 +0000