loplugin:unuseddefaultparam in svx (part2)

Change-Id: I99e3d6137ec17e3fc782253c85e5fa4f1da4cec4

21 files changed, 85 insertions, 119 deletions

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 61519208f610..6855141fcdb0 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -653,7 +653,7 @@ void SvxShowCharSet::OutputIndex( int nNewIndex )
 }
 
 
-void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus )
+void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew )
 {
     if (mxFontCharMap == nullptr)
         RecalculateFont(*this);
@@ -662,13 +662,10 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus )
     sal_UCS4 cNext = mxFontCharMap->GetNextChar( (cNew > 0) ? cNew - 1 : cNew );
 
     int nMapIndex = mxFontCharMap->GetIndexFromChar( cNext );
-    SelectIndex( nMapIndex, bFocus );
-    if( !bFocus )
-    {
-        // move selected item to top row if not in focus
-        aVscrollSB->SetThumbPos( nMapIndex / COLUMN_COUNT );
-        Invalidate();
-    }
+    SelectIndex( nMapIndex );
+    // move selected item to top row if not in focus
+    aVscrollSB->SetThumbPos( nMapIndex / COLUMN_COUNT );
+    Invalidate();
 }
 
 
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index ae321b006820..653d8f207fbb 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -78,10 +78,10 @@ void SvxCheckListBox::RemoveEntry( sal_uLong nPos )
 }
 
 
-void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect )
+void SvxCheckListBox::SelectEntryPos( sal_uLong nPos )
 {
     if ( nPos < GetEntryCount() )
-        Select( GetEntry( nPos ), bSelect );
+        Select( GetEntry( nPos ) );
 }
 
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index c94d9450df35..ba71974d236a 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -161,17 +161,10 @@ sal_Int32 SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRi
 
     return nCompare;
 }
-void SvxRedlinTable::SetCalcView(bool bFlag)
+void SvxRedlinTable::SetCalcView()
 {
-    bIsCalc=bFlag;
-    if(bFlag)
-    {
-        nDatePos=CALC_DATE;
-    }
-    else
-    {
-        nDatePos=WRITER_DATE;
-    }
+    bIsCalc=true;
+    nDatePos=CALC_DATE;
 }
 
 void SvxRedlinTable::UpdateFilterTest()
@@ -497,9 +490,9 @@ void SvxTPView::EnableRejectAll(bool bFlag)
     m_pRejectAll->Enable(bFlag);
 }
 
-void SvxTPView::ShowUndo(bool bFlag)
+void SvxTPView::ShowUndo()
 {
-    m_pUndo->Show(bFlag);
+    m_pUndo->Show();
 }
 
 void SvxTPView::EnableUndo(bool bFlag)
@@ -768,9 +761,9 @@ void SvxTPFilter::ClearAuthors()
     m_pLbAuthor->Clear();
 }
 
-void SvxTPFilter::InsertAuthor( const OUString& rString, sal_Int32 nPos)
+void SvxTPFilter::InsertAuthor( const OUString& rString)
 {
-    m_pLbAuthor->InsertEntry(rString,nPos);
+    m_pLbAuthor->InsertEntry(rString);
 }
 
 OUString SvxTPFilter::GetSelectedAuthor() const
@@ -1016,9 +1009,9 @@ void SvxTPFilter::Enable( bool bEnable, bool bChild)
         RowEnableHdl(m_pCbComment);
     }
 }
-void SvxTPFilter::Disable( bool bChild)
+void SvxTPFilter::Disable()
 {
-    Enable( false, bChild );
+    Enable( false );
 }
 
 IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void)
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 2916f4c1382e..90f2ef54f356 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -533,14 +533,11 @@ Point SvxRectCtl::GetPointFromRP( RECT_POINT _eRP) const
 }
 
 
-void SvxRectCtl::SetFocusRect( const Rectangle* pRect )
+void SvxRectCtl::SetFocusRect()
 {
     HideFocus();
 
-    if( pRect )
-        ShowFocus( *pRect );
-    else
-        ShowFocus( CalculateFocusRectangle() );
+    ShowFocus( CalculateFocusRectangle() );
 }
 
 Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT eNewRP )
@@ -1347,7 +1344,7 @@ void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bit
 }
 
 void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUString& rStr,
-                                    const XGradient& rGradient, sal_uInt16 nDist )
+                                    const XGradient& rGradient )
 {
     long nCount = pList.get() ? pList->Count() : 0;
     XGradientEntry* pEntry;
@@ -1365,7 +1362,7 @@ void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUStrin
             bFound = true;
     }
     if( bFound )
-        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 // Fills the listbox (provisional) with strings
@@ -1712,7 +1709,7 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart )
     SetUpdateMode( true );
 }
 
-void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart )
+void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap )
 {
     if(!rBitmap.IsEmpty())
     {
@@ -1724,7 +1721,7 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool
         InsertEntry(
             rEntry.GetName(),
             Image(pVD->GetBitmap(
-                (bStart) ? Point() : Point(aBmpSize.Width() / 2, 0),
+                Point(),
                 Size(aBmpSize.Width() / 2, aBmpSize.Height()))));
     }
     else
@@ -1735,7 +1732,7 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool
     AdaptDropDownLineCountToMaximum();
 }
 
-void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap, bool bStart )
+void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap )
 {
     RemoveEntry( nPos );
 
@@ -1749,7 +1746,7 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitma
         InsertEntry(
             rEntry.GetName(),
             Image(pVD->GetBitmap(
-                    (bStart) ? Point() : Point(aBmpSize.Width() / 2, 0),
+                    Point(),
                     Size(aBmpSize.Width() / 2, aBmpSize.Height()))),
             nPos);
     }
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 141bbf9d809a..3a451f40169b 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -623,9 +623,9 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor)
     Invalidate();
 }
 
-void SvxFontPrevWindow::UseResourceText(bool bUse)
+void SvxFontPrevWindow::UseResourceText()
 {
-    pImpl->mbUseResText = bUse;
+    pImpl->mbUseResText = true;
 }
 
 void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 30a521a5afeb..87a482de4568 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -105,12 +105,12 @@ void SvxFontListBox::InsertFontEntry( const OUString& rString, const vcl::Font&
     mbUseFont = false;
 }
 
-void SvxFontListBox::SelectEntryPos( sal_uLong nPos, bool bSelect )
+void SvxFontListBox::SelectEntryPos( sal_uLong nPos )
 {
     SvTreeListEntry* pEntry = GetEntry( nPos );
     if( pEntry )
     {
-        Select( pEntry, bSelect );
+        Select( pEntry );
         ShowEntry( pEntry );
     }
 }
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 548ba97c5df9..e2d91902ff14 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -496,11 +496,8 @@ void Array::SetRowStyleBottom( size_t nRow, const Style& rStyle )
         SetCellStyleBottom( nCol, nRow, rStyle );
 }
 
-const Style& Array::GetCellStyleLeft( size_t nCol, size_t nRow, bool bSimple ) const
+const Style& Array::GetCellStyleLeft( size_t nCol, size_t nRow ) const
 {
-    // simple: always return own left style
-    if( bSimple )
-        return CELL( nCol, nRow ).maLeft;
     // outside clipping rows or overlapped in merged cells: invisible
     if( !mxImpl->IsRowInClipRange( nRow ) || mxImpl->IsMergedOverlappedLeft( nCol, nRow ) )
         return OBJ_STYLE_NONE;
@@ -517,11 +514,8 @@ const Style& Array::GetCellStyleLeft( size_t nCol, size_t nRow, bool bSimple ) c
     return std::max( ORIGCELL( nCol, nRow ).maLeft, ORIGCELL( nCol - 1, nRow ).maRight );
 }
 
-const Style& Array::GetCellStyleRight( size_t nCol, size_t nRow, bool bSimple ) const
+const Style& Array::GetCellStyleRight( size_t nCol, size_t nRow ) const
 {
-    // simple: always return own right style
-    if( bSimple )
-        return CELL( nCol, nRow ).maRight;
     // outside clipping rows or overlapped in merged cells: invisible
     if( !mxImpl->IsRowInClipRange( nRow ) || mxImpl->IsMergedOverlappedRight( nCol, nRow ) )
         return OBJ_STYLE_NONE;
@@ -538,11 +532,8 @@ const Style& Array::GetCellStyleRight( size_t nCol, size_t nRow, bool bSimple )
     return std::max( ORIGCELL( nCol, nRow ).maRight, ORIGCELL( nCol + 1, nRow ).maLeft );
 }
 
-const Style& Array::GetCellStyleTop( size_t nCol, size_t nRow, bool bSimple ) const
+const Style& Array::GetCellStyleTop( size_t nCol, size_t nRow ) const
 {
-    // simple: always return own top style
-    if( bSimple )
-        return CELL( nCol, nRow ).maTop;
     // outside clipping columns or overlapped in merged cells: invisible
     if( !mxImpl->IsColInClipRange( nCol ) || mxImpl->IsMergedOverlappedTop( nCol, nRow ) )
         return OBJ_STYLE_NONE;
@@ -559,11 +550,8 @@ const Style& Array::GetCellStyleTop( size_t nCol, size_t nRow, bool bSimple ) co
     return std::max( ORIGCELL( nCol, nRow ).maTop, ORIGCELL( nCol, nRow - 1 ).maBottom );
 }
 
-const Style& Array::GetCellStyleBottom( size_t nCol, size_t nRow, bool bSimple ) const
+const Style& Array::GetCellStyleBottom( size_t nCol, size_t nRow ) const
 {
-    // simple: always return own bottom style
-    if( bSimple )
-        return CELL( nCol, nRow ).maBottom;
     // outside clipping columns or overlapped in merged cells: invisible
     if( !mxImpl->IsColInClipRange( nCol ) || mxImpl->IsMergedOverlappedBottom( nCol, nRow ) )
         return OBJ_STYLE_NONE;
@@ -834,13 +822,13 @@ Size Array::GetCellSize( size_t nCol, size_t nRow, bool bSimple ) const
     return Size( GetColWidth( nFirstCol, nLastCol ) + 1, GetRowHeight( nFirstRow, nLastRow ) + 1 );
 }
 
-Rectangle Array::GetCellRect( size_t nCol, size_t nRow, bool bSimple ) const
+Rectangle Array::GetCellRect( size_t nCol, size_t nRow ) const
 {
-    Rectangle aRect( GetCellPosition( nCol, nRow, bSimple ), GetCellSize( nCol, nRow, bSimple ) );
+    Rectangle aRect( GetCellPosition( nCol, nRow ), GetCellSize( nCol, nRow ) );
 
     // adjust rectangle for partly visible merged cells
     const Cell& rCell = CELL( nCol, nRow );
-    if( !bSimple && rCell.IsMerged() )
+    if( rCell.IsMerged() )
     {
         aRect.Left() -= rCell.mnAddLeft;
         aRect.Right() += rCell.mnAddRight;
@@ -851,16 +839,16 @@ Rectangle Array::GetCellRect( size_t nCol, size_t nRow, bool bSimple ) const
 }
 
 // diagonal frame borders
-double Array::GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const
+double Array::GetHorDiagAngle( size_t nCol, size_t nRow ) const
 {
     DBG_FRAME_CHECK_COLROW( nCol, nRow, "GetHorDiagAngle" );
-    return mxImpl->GetHorDiagAngle( nCol, nRow, bSimple );
+    return mxImpl->GetHorDiagAngle( nCol, nRow );
 }
 
-double Array::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const
+double Array::GetVerDiagAngle( size_t nCol, size_t nRow ) const
 {
     DBG_FRAME_CHECK_COLROW( nCol, nRow, "GetVerDiagAngle" );
-    return mxImpl->GetVerDiagAngle( nCol, nRow, bSimple );
+    return mxImpl->GetVerDiagAngle( nCol, nRow );
 }
 
 void Array::SetUseDiagDoubleClipping( bool bSet )
@@ -1312,10 +1300,10 @@ void Array::DrawRange( OutputDevice& rDev,
     }
 }
 
-void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const
+void Array::DrawArray( OutputDevice& rDev ) const
 {
     if( mxImpl->mnWidth && mxImpl->mnHeight )
-        DrawRange( rDev, 0, 0, mxImpl->mnWidth - 1, mxImpl->mnHeight - 1, pForceColor );
+        DrawRange( rDev, 0, 0, mxImpl->mnWidth - 1, mxImpl->mnHeight - 1 );
 }
 
 
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 49093a93d391..5d259f42d70c 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -50,9 +50,9 @@ VCL_BUILDER_DECL_FACTORY(FrameDirectionListBox)
     rRet = pListBox;
 }
 
-void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_Int32 nPos )
+void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection )
 {
-    sal_Int32 nRealPos = InsertEntry( rString, nPos );
+    sal_Int32 nRealPos = InsertEntry( rString );
     SetEntryData( nRealPos, lclEnumToVoid( eDirection ) );
 }
 
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 3268bb502523..ecd0ebf47626 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -936,9 +936,9 @@ bool FrameSelector::IsBorderSelected( FrameBorderType eBorder ) const
     return mxImpl->GetBorder( eBorder ).IsSelected();
 }
 
-void FrameSelector::SelectBorder( FrameBorderType eBorder, bool bSelect /*, bool bFocus */ )
+void FrameSelector::SelectBorder( FrameBorderType eBorder )
 {
-    mxImpl->SelectBorder( mxImpl->GetBorderAccess( eBorder ), bSelect );
+    mxImpl->SelectBorder( mxImpl->GetBorderAccess( eBorder ), true/*bSelect*/ );
     // MT: bFireFox as API parameter is ugly...
     // if (bFocus)
     {
@@ -965,10 +965,10 @@ void FrameSelector::SelectAllBorders( bool bSelect )
         mxImpl->SelectBorder( **aIt, bSelect );
 }
 
-void FrameSelector::SelectAllVisibleBorders( bool bSelect )
+void FrameSelector::SelectAllVisibleBorders()
 {
     for( VisFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
-        mxImpl->SelectBorder( **aIt, bSelect );
+        mxImpl->SelectBorder( **aIt, true/*bSelect*/ );
 }
 
 void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle )
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index caeead2d34af..6f2a77c662c0 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -297,9 +297,9 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList,
 }
 
 
-sal_Int32 SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType, sal_Int32 nPos )
+sal_Int32 SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType )
 {
-    return ImplInsertLanguage( nLangType, nPos, css::i18n::ScriptType::WEAK );
+    return ImplInsertLanguage( nLangType, LISTBOX_APPEND, css::i18n::ScriptType::WEAK );
 }
 
 
@@ -358,20 +358,20 @@ sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType,
 }
 
 
-void SvxLanguageBoxBase::InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos )
+void SvxLanguageBoxBase::InsertDefaultLanguage( sal_Int16 nType )
 {
-    ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
+    ImplInsertLanguage( LANGUAGE_SYSTEM, LISTBOX_APPEND, nType );
 }
 
 
-void SvxLanguageBoxBase::InsertSystemLanguage( sal_Int32 nPos )
+void SvxLanguageBoxBase::InsertSystemLanguage()
 {
-    ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, css::i18n::ScriptType::WEAK );
+    ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, LISTBOX_APPEND, css::i18n::ScriptType::WEAK );
 }
 
 
 void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType,
-        bool bCheckEntry, sal_Int32 nPos )
+        bool bCheckEntry )
 {
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the
@@ -388,7 +388,7 @@ void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType,
     if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
         aStrEntry = m_aAllString;
 
-    sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
+    sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, LISTBOX_APPEND, bCheckEntry );
     ImplSetEntryData( nAt, reinterpret_cast<void*>(nLang) );
 }
 
@@ -413,7 +413,7 @@ LanguageType SvxLanguageBoxBase::GetSelectLanguage() const
 }
 
 
-void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType, bool bSelect )
+void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType )
 {
     // If the core uses a LangID of an imported MS document and wants to select
     // a language that is replaced, we need to select the replacement instead.
@@ -425,7 +425,7 @@ void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType, bool bSel
         nAt = InsertLanguage( nLang );      // on-the-fly-ID
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
-        ImplSelectEntryPos( nAt, bSelect );
+        ImplSelectEntryPos( nAt, true/*bSelect*/ );
 }
 
 
@@ -469,9 +469,9 @@ void SvxLanguageBoxBase::SaveValueLBB()
     ImplSaveValue();
 }
 
-sal_Int32 SvxLanguageBoxBase::GetSelectEntryPosLBB( sal_Int32 nSelIndex ) const
+sal_Int32 SvxLanguageBoxBase::GetSelectEntryPosLBB() const
 {
-    return ImplGetSelectEntryPos( nSelIndex);
+    return ImplGetSelectEntryPos();
 }
 
 void* SvxLanguageBoxBase::GetEntryDataLBB( sal_Int32  nPos ) const
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d54cce84ef47..a53e915361b6 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -230,8 +230,9 @@ void SearchAttrItemList::Clear()
 
 
 // Deletes the pointer to the items
-void SearchAttrItemList::Remove(size_t nPos, size_t nLen)
+void SearchAttrItemList::Remove(size_t nPos)
 {
+    size_t nLen = 1;
     if ( nPos + nLen > size() )
         nLen = size() - nPos;
 
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 3f67bc63f832..2a2c11554946 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -362,10 +362,9 @@ namespace svx
     }
 
 
-    void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, bool _bClear)
+    void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues)
     {
-        if (_bClear)
-            clear();
+        clear();
         m_pImpl->buildFrom(_rValues);
     }
 
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 40c90dcf5882..f32bfb5e8ff8 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -154,9 +154,9 @@ void displayException(const css::sdb::SQLContext& _rExcept, vcl::Window* _pParen
 }
 
 
-void displayException(const css::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent)
+void displayException(const css::sdb::SQLErrorEvent& _rEvent)
 {
-    displayException(_rEvent.Reason, _pParent);
+    displayException(_rEvent.Reason);
 }
 
 
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 5c84e2ac1303..ae7047872aa1 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -307,10 +307,10 @@ void FmFormView::ChangeDesignMode(bool bDesign)
 }
 
 
-void FmFormView::GrabFirstControlFocus( bool _bForceSync )
+void FmFormView::GrabFirstControlFocus()
 {
     if ( !IsDesignMode() )
-        pImpl->AutoFocus( _bForceSync );
+        pImpl->AutoFocus();
 }
 
 
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 025b1019f5c5..85bad9efefa1 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -587,7 +587,7 @@ void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow )
 }
 
 void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions,
-                                     sal_Int32 nDragPointer, sal_Int32 nDragImage )
+                                     sal_Int32 nDragPointer )
 {
     INetURLObject aURL;
 
@@ -595,7 +595,7 @@ void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceA
     {
         mpTheme->SetDragging( true );
         mpTheme->SetDragPos( mnObjectPos );
-        TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer, nDragImage );
+        TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer );
     }
 }
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 6aebc63df639..0b90af5b9e88 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -355,12 +355,12 @@ bool GalleryTheme::UnlockTheme()
     return bRet;
 }
 
-void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos )
+void GalleryTheme::UnlockBroadcaster()
 {
     DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" );
 
     if( mnBroadcasterLockCount && !--mnBroadcasterLockCount )
-        ImplBroadcast( nUpdatePos );
+        ImplBroadcast( 0 );
 }
 
 bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
@@ -998,7 +998,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo
     return bRet;
 }
 
-bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rxModelStream, bool )
+bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rxModelStream )
 {
     const GalleryObject*    pObject = ImplGetGalleryObject( nPos );
     bool                    bRet = false;
@@ -1083,7 +1083,7 @@ bool GalleryTheme::InsertModelStream( const tools::SvRef<SotStorageStream>& rxMo
     return bRet;
 }
 
-bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool )
+bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL )
 {
     const GalleryObject*    pObject = ImplGetGalleryObject( nPos );
     bool                    bRet = false;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 63a2a1b94090..9b1c2c061f2f 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -119,13 +119,12 @@ SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const
     return new SvxClipboardFormatItem( *this );
 }
 
-void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId )
 {
-    if( nPos > pImpl->aFmtNms.size() )
-        nPos = pImpl->aFmtNms.size();
+    sal_uInt16 nPos = pImpl->aFmtNms.size();
 
-    pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, OUString());
-    pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
+    pImpl->aFmtNms.insert( pImpl->aFmtNms.begin() + nPos, OUString());
+    pImpl->aFmtIds.insert( pImpl->aFmtIds.begin() + nPos, nId );
 }
 
 void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 2e9132012607..c744f2923793 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -119,8 +119,9 @@ namespace sdr
             return false;
         }
 
-        bool OverlayObjectList::isHitPixel(const Point& rDiscretePosition, sal_uInt32 nDiscreteTolerance) const
+        bool OverlayObjectList::isHitPixel(const Point& rDiscretePosition) const
         {
+            sal_uInt32 nDiscreteTolerance = DEFAULT_VALUE_FOR_HITTEST_PIXEL;
             if(!maVector.empty())
             {
                 OverlayObjectVector::const_iterator aStart(maVector.begin());
@@ -132,15 +133,8 @@ namespace sdr
                     const Point aPosLogic(pManager->getOutputDevice().PixelToLogic(rDiscretePosition));
                     const basegfx::B2DPoint aPosition(aPosLogic.X(), aPosLogic.Y());
 
-                    if(nDiscreteTolerance)
-                    {
-                        const Size aSizeLogic(pManager->getOutputDevice().PixelToLogic(Size(nDiscreteTolerance, nDiscreteTolerance)));
-                        return isHitLogic(aPosition, (double)aSizeLogic.Width());
-                    }
-                    else
-                    {
-                        return isHitLogic(aPosition);
-                    }
+                    const Size aSizeLogic(pManager->getOutputDevice().PixelToLogic(Size(nDiscreteTolerance, nDiscreteTolerance)));
+                    return isHitLogic(aPosition, (double)aSizeLogic.Width());
                 }
             }
 
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index bba7151c2ffe..0fc62bb4b7e4 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -151,8 +151,7 @@ drawinglayer::primitive2d::Primitive2DContainer ChartHelper::tryToGetChartConten
 
 void ChartHelper::AdaptDefaultsForChart(
     const uno::Reference < embed::XEmbeddedObject > & xEmbObj,
-    bool /* bNoFillStyle */,
-    bool /* bNoLineStyle */)
+    bool /* bNoFillStyle */)
 {
     if( xEmbObj.is())
     {
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 411cc9127cf6..8eb54cbef3d8 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -71,10 +71,9 @@ void SdrDragStat::NextMove(const Point& rPnt)
     Now()=aBla;
 }
 
-void SdrDragStat::NextPoint(bool bSaveReal)
+void SdrDragStat::NextPoint()
 {
     Point aPnt(GetNow());
-    if (bSaveReal) aPnt=aRealNow;
     aPnts.push_back(new Point(KorregPos(GetRealNow(),aPnt)));
     Prev()=aPnt;
 }
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index db4f68822412..c5e2bfd3657a 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -553,7 +553,7 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag()
     }
 }
 
-void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const
+void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const
 {
     ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE;
     if (IsDraggingPoints()) {
@@ -561,7 +561,7 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr
     } else if (IsDraggingGluePoints()) {
         nOpt=ImpTakeDescriptionOptions::GLUEPOINTS;
     }
-    getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nVal,nOpt);
+    getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,0,nOpt);
 }
 
 SdrObject* SdrDragMethod::GetDragObj() const