[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Thu Sep 15 02:07:03 PDT 2011
binfilter/bf_svx/source/editeng/editsel.hxx | 2 +-
binfilter/bf_svx/source/editeng/svx_editview.cxx | 17 +++--------------
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 11 -----------
binfilter/bf_svx/source/outliner/svx_outlin2.cxx | 2 +-
binfilter/bf_svx/source/unoedit/svx_unofored.cxx | 6 +++---
binfilter/inc/bf_svx/editobj.hxx | 12 ++++++------
6 files changed, 14 insertions(+), 36 deletions(-)
New commits:
commit 7a4980ae580ba7abc4f0443058ef6a831b7faa29
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Sep 15 11:06:53 2011 +0200
Some more warning cleanup.
diff --git a/binfilter/bf_svx/source/editeng/editsel.hxx b/binfilter/bf_svx/source/editeng/editsel.hxx
index 2645879..f8360e1 100644
--- a/binfilter/bf_svx/source/editeng/editsel.hxx
+++ b/binfilter/bf_svx/source/editeng/editsel.hxx
@@ -51,7 +51,7 @@ public:
virtual BOOL SetCursorAtPoint(
const Point& /* rPointPixel */,
- BOOL bDontSelectAtCursor = FALSE
+ BOOL = FALSE
)
{ return FALSE; }
diff --git a/binfilter/bf_svx/source/editeng/svx_editview.cxx b/binfilter/bf_svx/source/editeng/svx_editview.cxx
index 258597a..dc4ff32 100644
--- a/binfilter/bf_svx/source/editeng/svx_editview.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editview.cxx
@@ -78,8 +78,8 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ EditSelection aNewSelection( PIMPEE->ConvertSelection( rESel.nStartPara, rESel.nStartPos, rESel.nEndPara, rESel.nEndPos ) );
/*N*/
/*N*/ // Selektion darf nicht bei einem unsichtbaren Absatz Starten/Enden:
-/*N*/ ParaPortion* pPortion = PIMPEE->FindParaPortion( aNewSelection.Min().GetNode() );
-/*N*/ pPortion = PIMPEE->FindParaPortion( aNewSelection.Max().GetNode() );
+/*N*/ PIMPEE->FindParaPortion( aNewSelection.Min().GetNode() ); // WaE cleanup: left in for potential side effects
+/*N*/ PIMPEE->FindParaPortion( aNewSelection.Max().GetNode() ); // WaE cleanup: left in for potential side effects
/*N*/
/*N*/ pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen'
/*N*/ pImpEditView->SetEditSelection( aNewSelection );
@@ -133,19 +133,8 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
-/*N*/ void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor )
+/*N*/ void EditView::ShowCursor( sal_Bool, sal_Bool )
/*N*/ {
-/*N*/ DBG_CHKTHIS( EditView, 0 );
-/*N*/ DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-/*N*/
-/*N*/ // Draw vertraegt die Assertion nicht, spaeter mal aktivieren
-/*N*/
-/*N*/ if ( pImpEditView->pEditEngine->HasView( this ) )
-/*N*/ {
-/*N*/ // Das ControlWord hat mehr Gewicht:
-/*N*/ if ( !pImpEditView->DoAutoScroll() )
-/*N*/ bGotoCursor = sal_False;
-/*N*/ }
/*N*/ }
/*N*/ void EditView::HideCursor()
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
index 3bbdd54..ccba68e 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
@@ -528,7 +528,6 @@ struct TabInfo
/*N*/ TabInfo aCurrentTab;
/*N*/
/*N*/ BOOL bForceOneRun = bEmptyNodeWithPolygon;
-/*N*/ BOOL bCompressedChars = FALSE;
/*N*/
/*N*/ while ( ( nIndex < pNode->Len() ) || bForceOneRun )
/*N*/ {
@@ -688,7 +687,6 @@ struct TabInfo
/*?*/ bBrokenLine = sal_True;
/*N*/ }
/*N*/ pLine->GetCharPosArray().Insert( pPortion->GetSize().Width(), nTmpPos-pLine->GetStart() );
-/*N*/ bCompressedChars = FALSE;
/*N*/ }
/*N*/ break;
/*N*/ case EE_FEATURE_LINEBR:
@@ -698,7 +696,6 @@ struct TabInfo
/*N*/ bEOL = sal_True;
/*N*/ bLineBreak = sal_True;
/*N*/ pPortion->GetKind() = PORTIONKIND_LINEBREAK;
-/*N*/ bCompressedChars = FALSE;
/*N*/ pLine->GetCharPosArray().Insert( pPortion->GetSize().Width(), nTmpPos-pLine->GetStart() );
/*N*/ }
/*N*/ break;
@@ -729,7 +726,6 @@ struct TabInfo
/*N*/ }
/*N*/ // Compression in Fields????
/*N*/ // I think this could be a little bit difficult and is not very usefull
-/*N*/ bCompressedChars = FALSE;
/*N*/ }
/*N*/ break;
/*N*/ default: OSL_FAIL( "Was fuer ein Feature ?" );
@@ -1649,7 +1645,6 @@ struct TabInfo
/*N*/ xub_StrLen nIdx = 0;
/*N*/ xub_StrLen nKashidaPos = STRING_LEN;
/*N*/ xub_Unicode cCh;
-/*N*/ xub_Unicode cPrevCh = 0;
/*N*/
/*N*/ while ( nIdx < aWord.Len() )
/*N*/ {
@@ -1681,12 +1676,6 @@ struct TabInfo
/*N*/ // 6. Priority:
/*N*/ // other connecting possibilities
/*N*/
-/*N*/ // Do not consider Fathatan, Dammatan, Kasratan, Fatha,
-/*N*/ // Damma, Kasra, Shadda and Sukun when checking if
-/*N*/ // a character can be connected to previous character.
-/*N*/ if ( cCh < 0x64B || cCh > 0x652 )
-/*N*/ cPrevCh = cCh;
-/*N*/
/*N*/ ++nIdx;
/*N*/ } // end of current word
/*N*/
diff --git a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
index 5acf7fe..0fcc6c2 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
@@ -319,7 +319,7 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
-/*N*/ ULONG Outliner::GetTextHeight( ULONG nParagraph ) const
+/*N*/ ULONG Outliner::GetTextHeight( ULONG ) const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
DBG_BF_ASSERT(0, "STRIP");
diff --git a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
index 8e6c47e..8f03e38 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
@@ -166,8 +166,8 @@ XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, US
}
USHORT GetSvxEditEngineItemState(
- EditEngine& rEditEngine,
- const ESelection& rSel,
+ EditEngine&,
+ const ESelection&,
USHORT /* nWhich */
)
{
@@ -335,7 +335,7 @@ USHORT SvxEditEngineForwarder::GetLineCount( USHORT nPara ) const
return rEditEngine.GetLineCount(nPara);
}
-USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
+USHORT SvxEditEngineForwarder::GetLineLen( USHORT, USHORT ) const
{
DBG_BF_ASSERT(0, "STRIP");
return 0;
diff --git a/binfilter/inc/bf_svx/editobj.hxx b/binfilter/inc/bf_svx/editobj.hxx
index c0b5577..9f9c1d1 100644
--- a/binfilter/inc/bf_svx/editobj.hxx
+++ b/binfilter/inc/bf_svx/editobj.hxx
@@ -78,7 +78,7 @@ public:
virtual BOOL IsVertical() const
{ return FALSE; }
- virtual void SetVertical( BOOL bVertical )
+ virtual void SetVertical( BOOL )
{}
virtual USHORT GetVersion() const
@@ -99,7 +99,7 @@ public:
virtual USHORT GetParagraphCount() const
{ return 0; }
- virtual XubString GetText( USHORT nParagraph ) const
+ virtual XubString GetText( USHORT ) const
{ return XubString(); }
virtual void Insert( const EditTextObject& /* rObj */, USHORT /* nPara */ )
@@ -109,12 +109,12 @@ public:
{}
virtual void MergeParaAttribs(
- const SfxItemSet& rAttribs,
- USHORT nStart = EE_CHAR_START,
- USHORT nEnd = EE_CHAR_END
+ const SfxItemSet&,
+ USHORT = EE_CHAR_START,
+ USHORT = EE_CHAR_END
) {}
- virtual BOOL HasField( TypeId aType = NULL ) const
+ virtual BOOL HasField( TypeId = NULL ) const
{ return FALSE; }
virtual SfxItemSet GetParaAttribs( USHORT nPara ) const;
More information about the Libreoffice-commits
mailing list