[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2012-03-22 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/bastyp/sw_index.cxx |8 ++--
 binfilter/inc/bf_sw/index.hxx   |2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 1ac6932d891754769359cd53041cf46a32723602
Author: Caolán McNamara 
Date:   Thu Mar 22 12:28:09 2012 +

WaE: need a virtual dtor

diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx 
b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
index 1356f25..26cee14 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
@@ -309,16 +309,12 @@ int SwIndex::nSerial = 0;
 /*N*/ {
 /*N*/ }
 
-#ifdef DBG_UTIL
-
-
 /*N*/ SwIndexReg::~SwIndexReg()
 /*N*/ {
+#ifdef DBG_UTIL
 /*N*/   OSL_ENSURE( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
-/*N*/ }
-
 #endif
-
+/*N*/ }
 
 /*N*/ void SwIndexReg::Update( const SwIndex& rIdx, xub_StrLen nDiff, BOOL 
bNeg )
 /*N*/ {
diff --git a/binfilter/inc/bf_sw/index.hxx b/binfilter/inc/bf_sw/index.hxx
index b985e72..4d14ea2 100644
--- a/binfilter/inc/bf_sw/index.hxx
+++ b/binfilter/inc/bf_sw/index.hxx
@@ -126,9 +126,7 @@ protected:
 
 public:
 SwIndexReg();
-#ifdef DBG_UTIL
 virtual ~SwIndexReg();
-#endif
 
 // rtti, abgeleitete moegens gleichtun oder nicht. Wenn sie es gleichtun
 // kann ueber das SwIndexReg typsicher gecastet werden.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sw

2012-03-21 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 19dcfb4a33e9b1b2c23603b9f793e547763f1dcc
Author: Caolán McNamara 
Date:   Wed Mar 21 10:59:26 2012 +

WaE: potentially uninitialized

diff --git a/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx 
b/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx
index 3749aaf..e432c52 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx
@@ -99,7 +99,7 @@ static SwFmt* _GetUserPoolFmt( USHORT nId, const SvPtrarr* 
pFmtArr );
 USHORT SwSwgReader::InAttrSet( SwAttrSet& rSet )
 {
 // Format einlesen
-USHORT nFmtId, nDerived;
+USHORT nFmtId(IDX_NO_VALUE), nDerived(IDX_NO_VALUE);
 if( aHdr.nVersion >= SWG_VER_COMPAT )
 {
 if( r.next() != SWG_DATA ) Error();
@@ -205,7 +205,7 @@ SwFmt* SwSwgReader::InFormat( SwFmt* pFmt, USHORT* 
pParentId )
 nFmtLvl++;
 
 String aName( String::CreateFromAscii("dummy") );
-USHORT nDerived, nPoolId = IDX_NO_VALUE;
+USHORT nDerived(IDX_NO_VALUE), nPoolId(IDX_NO_VALUE);
 if( aHdr.nVersion >= SWG_VER_COMPAT )
 {
 if( r.next() != SWG_DATA ) Error();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2012-03-15 Thread Caolán McNamara 
 binfilter/bf_sw/source/filter/inc/wrt_fn.hxx   |5 
 binfilter/bf_sw/source/filter/writer/sw_writer.cxx |  128 -
 binfilter/bf_sw/source/filter/writer/sw_wrt_fn.cxx |   61 --
 binfilter/inc/bf_sw/shellio.hxx|   28 
 4 files changed, 222 deletions(-)

New commits:
commit 49d3d392b740bd90bacf73036b6dae454d8fa5c8
Author: Caolán McNamara 
Date:   Thu Mar 15 16:25:46 2012 +

callcatcher: now safely remove the actually unused parts

diff --git a/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx 
b/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
index f0fd707..58aef01 100644
--- a/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
+++ b/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
@@ -46,11 +46,6 @@ class Writer;
 typedef Writer& (*FnAttrOut)( Writer&, const SfxPoolItem& );
 typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ];
 
-Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
-Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
- BOOL bDeep, BOOL bTstForDefault = TRUE );
-
-
 /* Funktionspointer auf die Node-Write-Funktionen */
 
 enum RES_NODE
diff --git a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx 
b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
index 0dcc3be..53069ed 100644
--- a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
+++ b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
@@ -53,10 +53,6 @@
 #include 
 namespace binfilter {
 
-// Stringbuffer fuer die umgewandelten Zahlen
-static sal_Char aNToABuf[] = "0";
-#define NTOABUFLEN (sizeof(aNToABuf))
-
 /*N*/ DECLARE_TABLE( SwBookmarkNodeTable, SvPtrarr* )
 
 /*N*/ struct Writer_Impl
@@ -166,28 +162,6 @@ static sal_Char aNToABuf[] = "0";
 /*?*/   return TRUE;
 /*N*/ }
 
-// suche die naechste Bookmark-Position aus der Bookmark-Tabelle
-
- SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx ) const
- {
-SwNodes* pNds = &rDoc.GetNodes();
-
-SwNodeIndex aStt( *pNds, nStartIdx );
-SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
-if( !pCNode && 0 == ( pCNode = pNds->GoNext( &aStt )) )
-OSL_ENSURE( !this, "An StartPos kein ContentNode mehr" );
-
-SwPaM* pNew = new SwPaM( aStt );
-pNew->SetMark();
-aStt = nEndIdx;
-if( 0 == (pCNode = aStt.GetNode().GetCntntNode()) &&
-0 == (pCNode = pNds->GoPrevious( &aStt )) )
-OSL_ENSURE( !this, "An StartPos kein ContentNode mehr" );
-pCNode->MakeEndIndex( &pNew->GetPoint()->nContent );
-pNew->GetPoint()->nNode = aStt;
-return pNew;
- }
-
 // Stream-spezifisches
 /*N*/ #ifdef DBG_UTIL
 /*N*/ SvStream& Writer::Strm()
@@ -198,53 +172,6 @@ static sal_Char aNToABuf[] = "0";
 /*N*/ #endif
 
 
-SvStream& Writer::OutHex( SvStream& rStrm, ULONG nHex, BYTE nLen )
-{  // in einen Stream aus
-// Pointer an das Bufferende setzen
-sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
-for( BYTE n = 0; n < nLen; ++n )
-{
-*(--pStr) = (sal_Char)(nHex & 0xf ) + 48;
-if( *pStr > '9' )
-*pStr += 39;
-nHex >>= 4;
-}
-return rStrm << pStr;
-}
-
-SvStream& Writer::OutLong( SvStream& rStrm, long nVal )
-{
-// Pointer an das Bufferende setzen
-sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
-
-int bNeg = nVal < 0;
-if( bNeg )
-nVal = -nVal;
-
-do {
-*(--pStr) = (sal_Char)(nVal % 10 ) + 48;
-nVal /= 10;
-} while( nVal );
-
-// Ist Zahl negativ, dann noch -
-if( bNeg )
-*(--pStr) = '-';
-
-return rStrm << pStr;
-}
-
-SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
-{
-// Pointer an das Bufferende setzen
-sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
-
-do {
-*(--pStr) = (sal_Char)(nVal % 10 ) + 48;
-nVal /= 10;
-} while ( nVal );
-return rStrm << pStr;
-}
-
 /*N*/ ULONG Writer::Write( SwPaM& rPaM, SvStream& rStrm )
 /*N*/ {
 /*N*/  pStrm = &rStrm;
@@ -263,61 +190,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
 /*N*/  return nRet;
 /*N*/ }
 
-/*N*/ void Writer::PutNumFmtFontsInAttrPool()
-/*N*/ {
-/*N*/   if( !pImpl )
-/*?*/   pImpl = new Writer_Impl;
-/*N*/
-/*N*/   // dann gibt es noch in den NumRules ein paar Fonts
-/*N*/   // Diese in den Pool putten. Haben sie danach einen RefCount > 1
-/*N*/   // kann es wieder entfernt werden - ist schon im Pool
-/*N*/   SfxItemPool& rPool = pDoc->GetAttrPool();
-/*N*/   const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
-/*N*/   const SwNumRule* pRule;
-/*N*/   const SwNumFmt* pFmt;
-/*N*/   const Font *pFont, *pDefFont = &SwNumRule::GetDefBulletFont();
-/*N*/   BOOL bCheck = FALSE;
-/*N*/
-/*N*/   for( USHORT nGet = rListTbl.Count(); nGet; )
-/*N*/   if( pDoc->IsUsed( *(pRule = rListTbl[ --nGet ] )))
-/*?*/   for( BYTE nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
-/*?*/

[Libreoffice-commits] .: binfilter/bf_sw

2011-12-14 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/inc/fntcache.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d46295ca600848a13e2aa1311a7ed7f9004fcb46
Author: Caolán McNamara 
Date:   Tue Dec 13 23:11:44 2011 +

ditch a ByteString

diff --git a/binfilter/bf_sw/source/core/inc/fntcache.hxx 
b/binfilter/bf_sw/source/core/inc/fntcache.hxx
index 1ea63d9..691f7c5 100644
--- a/binfilter/bf_sw/source/core/inc/fntcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/fntcache.hxx
@@ -58,7 +58,7 @@ public:
 
 inline SwFntCache() : SwCache(50,50
 #ifdef DBG_UTIL
-, ByteString( RTL_CONSTASCII_STRINGPARAM(
+, rtl::OString( RTL_CONSTASCII_STRINGPARAM(
 "Globaler Font-Cache pFntCache" ))
 #endif
 ) {}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sw binfilter/bf_xmloff

2011-12-01 Thread August Sodora 
 binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx |2 -
 binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx |   26 +--
 binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx|4 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 43e9388234d6294c67f399be86e6acd308f7b386
Author: August Sodora 
Date:   Thu Dec 1 18:53:37 2011 -0500

Remove charAt/setCharAt from binfilter

diff --git a/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
index 83fef26..4fd84db 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
@@ -72,7 +72,7 @@ void Crypter::Encrypt( rtl::OStringBuffer& r ) const
 
 while( nLen-- )
 {
-r.setCharAt(i, r[i] ^ ( *p ^ (BYTE) ( cBuf[ 0 ] * nCryptPtr ) ));
+r[i] = r[i] ^ ( *p ^ (BYTE) ( cBuf[ 0 ] * nCryptPtr ) );
 *p += ( nCryptPtr < (PASSWDLEN-1) ) ? *(p+1) : cBuf[ 0 ];
 if( !*p )
 *p += 1;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx 
b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
index 3ca6af4..7875e96 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
@@ -795,10 +795,10 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& 
rContent, sal_uInt16 nFormat
 sal_Int32 nLength = rContent.getLength();
 
 if ( ( nLength == 1 &&
-lcl_ValidChar( rContent.charAt(0), nFormatType ) ) ||
+lcl_ValidChar( rContent[0], nFormatType ) ) ||
  ( nLength == 2 &&
- lcl_ValidChar( rContent.charAt(0), nFormatType ) &&
- rContent.charAt(1) == ' ' ) )
+ lcl_ValidChar( rContent[0], nFormatType ) &&
+ rContent[1] == ' ' ) )
 {
 //  don't quote single separator characters like space or percent,
 //  or separator characters followed by space (used in date formats)
@@ -815,7 +815,7 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& 
rContent, sal_uInt16 nFormat
 {
 if ( nPos + 1 < nLength )
 {
-if ( nPos + 2 == nLength && lcl_ValidChar( 
rContent.charAt(nPos + 1), nFormatType ) )
+if ( nPos + 2 == nLength && lcl_ValidChar( rContent[nPos + 1], 
nFormatType ) )
 {
 //  single character that doesn't need quoting
 }
@@ -828,7 +828,7 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& 
rContent, sal_uInt16 nFormat
 }
 if ( nPos > 0 )
 {
-if ( nPos == 1 && lcl_ValidChar( rContent.charAt(0), 
nFormatType ) )
+if ( nPos == 1 && rContent.getLength() > 0 && lcl_ValidChar( 
rContent[0], nFormatType ) )
 {
 //  single character that doesn't need quoting
 }
@@ -858,7 +858,7 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& 
rContent, sal_uInt16 nFormat
 sal_Int32 nPos = 0;
 while ( nPos < rContent.getLength() )
 {
-if ( rContent.charAt( nPos ) == (sal_Unicode) '"' )
+if ( rContent[nPos] == (sal_Unicode) '"' )
 {
 rContent.insert( nPos, aInsert );
 nPos += aInsert.getLength();
@@ -875,8 +875,8 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& 
rContent, sal_uInt16 nFormat
 if ( bEscape )
 {
 if ( rContent.getLength() > 2 &&
- rContent.charAt(0) == (sal_Unicode) '"' &&
- rContent.charAt(1) == (sal_Unicode) '"' )
+ rContent[0] == (sal_Unicode) '"' &&
+ rContent[1] == (sal_Unicode) '"' )
 {
 String aTrimmed( rContent.makeStringAndClear().copy(2) );
 rContent = rtl::OUStringBuffer( aTrimmed );
@@ -884,8 +884,8 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& 
rContent, sal_uInt16 nFormat
 
 sal_Int32 nLen = rContent.getLength();
 if ( nLen > 2 &&
- rContent.charAt(nLen-1) == (sal_Unicode) '"' &&
- rContent.charAt(nLen-2) == (sal_Unicode) '"' )
+ rContent[nLen - 1] == (sal_Unicode) '"' &&
+ rContent[nLen - 2] == (sal_Unicode) '"' )
 {
 String aTrimmed( rContent.makeStringAndClear().copy( 0, nLen - 
2 ) );
 rContent = rtl::OUStringBuffer( aTrimmed );
@@ -1827,14 +1827,14 @@ void SvXMLNumFormatContext::AddCurrency( const 
::rtl::OUString& rContent, Langua
 //  otherwise the currency symbol isn't recognized (#94048#)
 
 sal_Int32 nLength = aFormatCode.getLength();
-if ( nLength > 1 && aFormatCode.charAt( nLength-1 ) == '"' )
+if ( nLength > 1 && aFormatCode[nLength - 1] == '"' )
 {
 //  find start of quoted string
 //  Wh

[Libreoffice-commits] .: binfilter/bf_sw binfilter/legacysmgr

2011-11-22 Thread Stephan Bergmann 
 binfilter/bf_sw/source/core/fields/sw_dbfld.cxx   |1 +
 binfilter/bf_sw/source/core/layout/sw_flylay.cxx  |1 +
 binfilter/bf_sw/source/core/layout/sw_newfrm.cxx  |1 +
 binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx  |2 ++
 binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx   |1 +
 binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx |1 +
 binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx|1 +
 binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx   |   10 +-
 binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx |6 --
 9 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit fd3abe7a85c883cc8ecbfdd2403256d4cebd7c10
Author: Stephan Bergmann 
Date:   Tue Nov 22 16:57:42 2011 +0100

Fix --disable-dbgutil --enable-werror failures.

diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx 
b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index df1af4e..7fad1b0 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -743,6 +743,7 @@ BOOLSwDBNumSetField::PutValue( const 
::com::sun::star::uno::Any& rAny, BYTE
 /*N*/ String SwDBNameFieldType::Expand(ULONG nFmt) const
 /*N*/ {
 /*N*/   OSL_ENSURE( nFmt < FF_END, "Expand: kein guelt. Fmt!" );
+(void) nFmt; // avoid warnings
 /*N*/   const SwDBData aData = pDoc->GetDBData();
 /*N*/   String sRet(aData.sDataSource);
 /*N*/   sRet += '.';
diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx 
b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
index e2f59c1..3b74552 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
@@ -700,6 +700,7 @@ void SwPageFrm::RemoveVirtDrawObj( SwDrawContact*, 
SwDrawVirtObj* _pDrawVirtObj
 /*N*/ {
 /*N*/   //Der Fly will immer an der Seite direkt haengen.
 /*N*/   OSL_ENSURE( pAnch->GetAnchorId() == FLY_PAGE, "Unerwartete AnchorId." 
);
+(void) pAnch; // avoid warnings
 /*N*/
 /*N*/   //Wenn ein Fly uebergeben wurde, so benutzen wir diesen, ansonsten wird
 /*N*/   //mit dem Format einer erzeugt.
diff --git a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx 
b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
index cf5de1a..07cf5bc 100644
--- a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
@@ -347,6 +347,7 @@ namespace binfilter {
 /*N*/ CurrShell::CurrShell( ViewShell *pNew )
 /*N*/ {
 /*N*/   OSL_ENSURE( pNew, "0-Shell einsetzen?" );
+(void) pNew; // avoid warnings
 /*?*/   pPrev = 0;
 /*N*/ }
 
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index e008a44..1eacbce 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -378,6 +378,7 @@ SfxPoolItem* SwFmtNoBalancedColumns::Create(SvStream 
&rStrm, USHORT) const
 /*M*/   SOFFICE_FILEFORMAT_40==nFFVer ||
 /*M*/   SOFFICE_FILEFORMAT_50==nFFVer,
 /*M*/ "SwHeaderAndFooterEatSpacingItem: Gibt es ein neues 
Fileformat?" );
+(void) nFFVer; // avoid warnings
 /*M*/ return USHRT_MAX;
 /*M*/ }
 
@@ -417,6 +418,7 @@ SfxPoolItem* SwFmtNoBalancedColumns::Create(SvStream 
&rStrm, USHORT) const
 /*N*/   SOFFICE_FILEFORMAT_40==nFFVer ||
 /*N*/   SOFFICE_FILEFORMAT_50==nFFVer,
 /*N*/   "SwCropGrf: Gibt es ein neues Fileformat?" );
+(void) nFFVer; // avoid warnings
 /*N*/
 /*N*/   return GRFCROP_VERSION_SWDEFAULT;
 /*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index e8da6cd..76f4a79 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -697,6 +697,7 @@ public:
 /*N*/   nLvl--;
 /*N*/   OSL_ENSURE( cType == aRecTypes[nLvl],
 /*N*/   "CloseRec: Falscher Block-Header" );
+(void) cType; // avoid warnings
 /*N*/   sal_uInt32 nPos = pStrm->Tell();
 /*N*/   if( bOut )
 /*N*/   {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index 2526b60..7fb26e3 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -674,6 +674,7 @@ SfxPoolItem* SwTextGridItem::Create(SvStream& rStrm, USHORT 
/*nIVer*/) const
 /*N*/   SOFFICE_FILEFORMAT_40==nFFVer ||
 /*N*/   SOFFICE_FILEFORMAT_50==nFFVer,
 /*N*/ "SwTextGridItem: Gibt es ein neues Fileformat?" );
+(void) nFFVer; // avoid warnings
 /*N*/
 /*N*/ return USHRT_MAX;
 /*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx 
b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx
index 8e96a41..d46b677 100644
--- a/binfilter/bf_sw/source/core/txtnode/

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-10-19 Thread Joseph Powers 
 binfilter/bf_sw/source/core/crsr/makefile.mk |2 
 binfilter/bf_sw/source/core/crsr/sw_findattr.cxx |   70 ---
 binfilter/bf_sw/source/core/crsr/sw_pam.cxx  |   43 --
 binfilter/bf_sw/source/core/crsr/sw_paminit.cxx  |   57 --
 binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx  |   69 --
 binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx  |   35 ---
 binfilter/bf_sw/source/core/doc/sw_docredln.cxx  |6 -
 binfilter/bf_sw/source/core/inc/pamtyp.hxx   |   20 --
 binfilter/inc/bf_sw/cshtyp.hxx   |   11 ---
 binfilter/inc/bf_sw/pam.hxx  |   17 -
 10 files changed, 10 insertions(+), 320 deletions(-)

New commits:
commit 51dd983e772b50c1ed2677ec81a52b7634ce0cb4
Author: Joseph Powers 
Date:   Tue Oct 18 07:22:33 2011 -0700

Cleanup PaM related code a little.

diff --git a/binfilter/bf_sw/source/core/crsr/makefile.mk 
b/binfilter/bf_sw/source/core/crsr/makefile.mk
index 120d5d0..e92a1d6 100644
--- a/binfilter/bf_sw/source/core/crsr/makefile.mk
+++ b/binfilter/bf_sw/source/core/crsr/makefile.mk
@@ -48,11 +48,9 @@ CDEFS+=-Dmydebug
 SLOFILES = \
 $(SLO)$/sw_bookmrk.obj \
 $(SLO)$/sw_crsrsh.obj \
-$(SLO)$/sw_findattr.obj \
 $(SLO)$/sw_pam.obj \
 $(SLO)$/sw_paminit.obj \
 $(SLO)$/sw_swcrsr.obj \
-$(SLO)$/sw_trvlreg.obj \
 $(SLO)$/sw_trvltbl.obj \
 $(SLO)$/sw_unocrsr.obj \
 $(SLO)$/sw_viscrs.obj
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx 
b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
deleted file mode 100644
index 3aa82e2..000
--- a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-namespace binfilter {
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-
-
-// Sonderbehandlung fuer SvxFontItem, nur den Namen vergleichen:
-
-
-/*N*/ const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& /*rHtsArr*/, USHORT& 
/*rPos*/,
-/*N*/   xub_StrLen /*nCntntPos*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return 0;   // kein gueltiges TextAttribut
-/*N*/ }
-
-
-/*N*/ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& /*rHtsArr*/, USHORT& 
/*rPos*/,
-/*N*/   xub_StrLen /*nCntntPos*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return 0;   // kein gueltiges TextAttribut
-/*N*/ }
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx 
b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
index f47906e..c0f0815 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
@@ -475,17 +475,9 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 /*N*/ }
 
 
-/*N*/ void GoStartSection( SwPosition* /*pPos*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-// gehe an das Ende der akt. Grund-Section
-
-
-/*N*/ void GoEndSection( SwPosition* /*pPos*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
+// These are used in bf_sw/source/core/crsr/sw_paminit.cxx
+bool GoInCntntCells( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ ) { return FALSE; } 
// DBG_BF_ASSERT
+bool GoPrevPara( SwPaM & /*rPam*/, SwPosPara /*aPosPara*/) { return FALSE; } 
// DBG_BF_ASSERT
 
 
 /*N*/ bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
@@ -495,12 +487,6 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 /*N*/ }
 
 
-/*N*/ bool GoInSection( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return TRUE;

[Libreoffice-commits] .: binfilter/bf_sw binfilter/binfilterdetect

2011-10-05 Thread Caolán McNamara 
 binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx |1 
 binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx |7 
 binfilter/bf_sw/source/filter/inc/w4wflt.hxx   |6 
 binfilter/bf_sw/source/ui/app/sw_swlib.cxx |2 
 binfilter/binfilterdetect/source/bindetect.cxx |  358 -
 5 files changed, 5 insertions(+), 369 deletions(-)

New commits:
commit a23429dbada39402cc45aa2a30244a50bd19f288
Author: Caolán McNamara 
Date:   Tue Oct 4 21:37:07 2011 +0100

we don't have the W4W filters

diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx 
b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index caa1c55..3ef39d5 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -50,7 +50,6 @@
 #include 
 #include// fuer den SW/G Parser
 #include 
-#include// AutoDetect
 // enable implementation and members
 #define IS_SW_DLL 1
 #include 
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx 
b/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx
index da8ae10..ad5d70d 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx
@@ -97,10 +97,6 @@ namespace binfilter {
 
 #define ERR_DLL 
 
-/*N*/ USHORT AutoDetec( const String& /*rFileName*/, USHORT & /*rVersion*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
 // Handler fuer die Prozentanzeige
 
 #if defined( WIN ) || defined( WNT ) || defined( PM2 )
@@ -119,11 +115,8 @@ int FNDisp W4WWriteDisplayHandler( int nPercent )
 return 0;   // -1 fuehrt zu Abbruch
 }
 
-
 #endif
 
-
-
 // W4W speichert beim Laden vom File rFileName die Ausgabe in aTmpFile.
 // der Filter wird ueber nFilter bestimmt.
 
diff --git a/binfilter/bf_sw/source/filter/inc/w4wflt.hxx 
b/binfilter/bf_sw/source/filter/inc/w4wflt.hxx
index 5f731f8..bca660f 100644
--- a/binfilter/bf_sw/source/filter/inc/w4wflt.hxx
+++ b/binfilter/bf_sw/source/filter/inc/w4wflt.hxx
@@ -32,12 +32,6 @@
 class String;
 namespace binfilter {
 
-
-
-// suche fuer das File den enstsprechenden Filter Typ
-// und die Version
-USHORT AutoDetec( const String& rFileName, USHORT & rVersion );
-
 // W4W speichert beim Laden vom File pFileName die Ausgabe in pTmpFile.
 // (das Tempfile wird hier anleget!)
 // der Filter wird ueber nFilter bestimmt.
diff --git a/binfilter/bf_sw/source/ui/app/sw_swlib.cxx 
b/binfilter/bf_sw/source/ui/app/sw_swlib.cxx
index 81f5fd4..349be83 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swlib.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swlib.cxx
@@ -58,8 +58,6 @@ inline BOOL IsDocShellRegistered()
 return SvtModuleOptions().IsWriter();
 }
 
-USHORT AutoDetec( const String& FileName, USHORT & rVersion );
-
 IO_DETECT_IMPL1
 IO_DETECT_IMPL2
 IO_DETECT_IMPL3
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx 
b/binfilter/binfilterdetect/source/bindetect.cxx
index ea63106..b0e083b 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -49,18 +49,6 @@
 #include 
 #include 
 
-#if defined( WNT )
-
-// Typen fuer die Funktion der W4W-DLL
-#include 
-#include 
-
-#endif
-
-#ifdef UNX
-#include 
-#endif
-
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::uno;
 
@@ -74,9 +62,7 @@ struct TypesInfo
 
 // the binfilter module is responsible for
 // - see /filter/source/config/fragments/filters/
-static const sal_uInt8 nStreamFileTypeCount = 114;
-static const sal_uInt8 nFileTypeCount = 29 + nStreamFileTypeCount;
-static const sal_uInt8 nW4WStartOffset = 5;
+static const sal_uInt8 nFileTypeCount = 34;
 static const TypesInfo aFileTypeList[ nFileTypeCount ] =
 {
 {RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_10")},
@@ -84,115 +70,6 @@ static const TypesInfo aFileTypeList[ nFileTypeCount ] =
 {RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_DOS")},
 {RTL_CONSTASCII_STRINGPARAM("writer_Lotus_1_2_3_10_DOS_StarWriter")},
 {RTL_CONSTASCII_STRINGPARAM("writer_Lotus_1_2_3_10_WIN_StarWriter")},
-{RTL_CONSTASCII_STRINGPARAM("writer_Ami_Pro_1x_31_W4W")}, 
// 5 , 33
-{RTL_CONSTASCII_STRINGPARAM("writer_CTOS_DEF_W4W")},  
// 6 , 36
-{RTL_CONSTASCII_STRINGPARAM("writer_Claris_Works_W4W")},  
// 7 , 57
-{RTL_CONSTASCII_STRINGPARAM("writer_DCA_Revisable_Form_Text_W4W")},   
// 8 , 15
-{RTL_CONSTASCII_STRINGPARAM("writer_DCA_with_Display_Write_5_W4W")},  
// 9 , 15
-{RTL_CONSTASCII_STRINGPARAM("writer_DCAFFT_Final_Form_Text_W4W")},
//10, 32
-{RTL_CONSTASCII_STRINGPARAM("writer_DEC_DX_W4W")},
//11, 30
-{RTL_CONSTASCII_STRINGPARAM("writer_DEC_WPS_PLUS_W4W")},  
//12, 45
-{RTL_CONSTASCII_STRINGPARAM("writer_DataGeneral_CEO_Write_W4W")}, 
//13, 104
-{RTL_CONSTASCII_STRINGPARAM("writer_DisplayWrite_20_4x_W4W")},
//14, 15
-

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-28 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/docnode/sw_node.cxx|   89 -
 binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx |   18 
 binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx  |   17 
 binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx |   27 --
 binfilter/inc/bf_sw/node.hxx   |1 
 binfilter/inc/bf_sw/unodraw.hxx|1 
 binfilter/inc/bf_sw/unoobj.hxx |3 
 7 files changed, 156 deletions(-)

New commits:
commit 202a9283867098048cbe5fe584438299bc47305a
Author: Caolán McNamara 
Date:   Wed Sep 28 14:46:52 2011 +0100

callcatcher: newly unused methods

diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx 
b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index f9a75be..0c26f92 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -1153,95 +1153,6 @@ using namespace ::com::sun::star::i18n;
 /*N*/   }
 /*N*/ }
 
-
-/*N*/ BOOL SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
-/*N*/ {
-/*N*/   const SwNodes& rNds = GetNodes();
-/*N*/   {
-/*N*/   int nCond = 0;
-/*N*/   const SwStartNode* pSttNd = FindStartNode();
-/*N*/   while( pSttNd )
-/*N*/   {
-/*N*/   switch( pSttNd->GetNodeType() )
-/*N*/   {
-/*?*/   case ND_TABLENODE:  nCond = PARA_IN_TABLEBODY; break;
-/*N*/   case ND_SECTIONNODE:nCond = PARA_IN_SECTION; break;
-/*N*/
-/*N*/   default:
-/*N*/   switch( pSttNd->GetStartNodeType() )
-/*N*/   {
-/*N*/   case SwTableBoxStartNode:
-/*N*/   {
-/*N*/   nCond = PARA_IN_TABLEBODY;
-/*N*/   const SwTableNode* pTblNd = 
pSttNd->FindTableNode();
-/*N*/   const SwTableBox* pBox;
-/*N*/   if( pTblNd && 0 != ( pBox = pTblNd->GetTable().
-/*N*/   GetTblBox( pSttNd->GetIndex() ) ) &&
-/*N*/   pBox->IsInHeadline( &pTblNd->GetTable() ) )
-/*N*/   nCond = PARA_IN_TABLEHEAD;
-/*N*/   }
-/*N*/   break;
-/*N*/   case SwFlyStartNode:nCond = PARA_IN_FRAME; break;
-/*N*/   case SwFootnoteStartNode:
-/*?*/   {
-/*?*/   nCond = PARA_IN_FOOTENOTE;
-/*?*/   const SwFtnIdxs& rFtnArr = 
rNds.GetDoc()->GetFtnIdxs();
-/*?*/   const SwTxtFtn* pTxtFtn;
-/*?*/   const SwNode* pSrchNd = pSttNd;
-/*?*/
-/*?*/   for( USHORT n = 0; n < rFtnArr.Count(); ++n )
-/*?*/   if( 0 != ( pTxtFtn = rFtnArr[ n 
])->GetStartNode() &&
-/*?*/   pSrchNd == 
&pTxtFtn->GetStartNode()->GetNode() )
-/*?*/   {
-/*?*/   if( pTxtFtn->GetFtn().IsEndNote() )
-/*?*/   nCond = PARA_IN_ENDNOTE;
-/*?*/   break;
-/*?*/   }
-/*?*/   }
-/*?*/   break;
-/*?*/   case SwHeaderStartNode: nCond = PARA_IN_HEADER; break;
-/*?*/   case SwFooterStartNode: nCond = PARA_IN_FOOTER; break;
-case SwNormalStartNode: break;
-/*N*/   }
-/*N*/   }
-/*N*/
-/*N*/   if( nCond )
-/*N*/   {
-/*N*/   rTmp.SetCondition( (Master_CollConditions)nCond, 0 );
-/*N*/   return TRUE;
-/*N*/   }
-/*N*/   pSttNd = pSttNd->GetIndex()
-/*N*/   ? pSttNd->FindStartNode()
-/*N*/   : 0;
-/*N*/   }
-/*N*/   }
-/*N*/
-/*N*/   {
-/*N*/   USHORT nPos;
-/*N*/   const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
-/*N*/   if( rOutlNds.Count() )
-/*N*/   {
-/*N*/   if( !rOutlNds.Seek_Entry( (SwCntntNode*)this, &nPos ) && nPos )
-/*N*/   --nPos;
-/*N*/   if( nPos < rOutlNds.Count() &&
-/*N*/   rOutlNds[ nPos ]->GetIndex() < GetIndex() )
-/*N*/   {
-/*N*/   SwTxtNode* pOutlNd = rOutlNds[ nPos ]->GetTxtNode();
-/*N*/
-/*N*/   if( pOutlNd->GetOutlineNum() && !pOutlNd->GetNumRule() )
-/*N*/   {
-/*N*/   rTmp.SetCondition( PARA_IN_OUTLINE,
-/*N*/   pOutlNd->GetOutlineNum()->GetLevel() );
-/*N*/   return TRUE;
-/*N*/   }
-/*N*/   }
-/*N*/   }
-/*N*/   }
-/*N*/
-/*N*/   return FALSE;
-/*N*/ }
-
-
 /*N*/ void SwCntntNode::ChkCondColl()
 /*N*/ {
 /*N*/   // zur Sicherheit abfragen
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
index 7750720..5cecfa1 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cx

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-28 Thread Stephan Bergmann 
 binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx |   21 
 binfilter/bf_sw/source/core/unocore/sw_unosett.cxx  |2 
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx   |4 
 binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx   |   92 ++--
 binfilter/inc/bf_sw/unotxdoc.hxx|1 
 5 files changed, 13 insertions(+), 107 deletions(-)

New commits:
commit d88e64fa42456362081a675ea2fd7144e2d85b95
Author: Stephan Bergmann 
Date:   Wed Sep 28 10:52:00 2011 +0200

Some more warning cleanup.

diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index ca53894..9b05448 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -1086,26 +1086,7 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const uno::Any& a
 else if(  rPropertyName.equalsAsciiL( 
SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))
|| rPropertyName.equalsAsciiL( 
SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME))
)
-{
-OUString uTemp;
-aValue >>= uTemp;
-String sChainName(uTemp);
-if(sChainName.Len())
-{
-sal_uInt16 nCount = pDoc->GetFlyCount(FLYCNTTYPE_FRM);
-
-SwFrmFmt* pChain = 0;
-for( sal_uInt16 i = 0; i < nCount; i++)
-{
-SwFrmFmt* pLclFmt = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
-if(sChainName == pLclFmt->GetName() )
-{
-pChain = pLclFmt;
-break;
-}
-}
-}
-}
+{}
 else if(FN_UNO_Z_ORDER == pCur->nWID)
 {
 sal_Int32 nZOrder = - 1;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
index 1de05cd..5486a15 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
@@ -1569,7 +1569,6 @@ void SwXNumberingRules::setNumberingRuleByIndex(
 SvxBrushItem* pSetBrush = 0;
 Size* pSetSize = 0;
 SwFmtVertOrient* pSetVOrient = 0;
-BOOL bCharStyleNameSet = FALSE;
 
 for(sal_uInt16 i = 0; i < nPropNameCount && !bExcept && !bWrongArg; 
i++)
 {
@@ -1616,7 +1615,6 @@ void SwXNumberingRules::setNumberingRuleByIndex(
 break;
 case 4: //"CharStyleName",
 {
-bCharStyleNameSet = TRUE;
 OUString uTmp;
 pData->aVal >>= uTmp;
 String sCharFmtName;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index f3a70e7..66ec438 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -1343,7 +1343,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, 
sal_Bool Expand) throw( un
 return bRet;
 }
 
-sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( 
uno::RuntimeException )
+sal_Bool SwXTextTableCursor::goUp(sal_Int16, sal_Bool Expand) throw( 
uno::RuntimeException )
 {
 SolarMutexGuard aGuard;
 sal_Bool bRet = sal_False;
@@ -1357,7 +1357,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, 
sal_Bool Expand) throw( uno::
 return bRet;
 }
 
-sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( 
uno::RuntimeException )
+sal_Bool SwXTextTableCursor::goDown(sal_Int16, sal_Bool Expand) throw( 
uno::RuntimeException )
 {
 SolarMutexGuard aGuard;
 sal_Bool bRet = sal_False;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx 
b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index fe61ef5..6e7f30b 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -133,18 +133,6 @@ using ::osl::FileBase;
 #define SW_CREATE_DRAW_DEFAULTS 0x07
 
 
-SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc)
-{
-SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollName );
-if( !pColl )
-{
-sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCollName, 
GET_POOLID_TXTCOLL );
-if( USHRT_MAX != nId )
-pColl = pDoc->GetTxtCollFromPool( nId );
-}
-return pColl;
-}
-
 const Sequence< sal_Int8 > & SwXTextDocument::getUnoTunnelId()
 {
 static Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
@@ -566,17 +554,11 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< 
util::XSearchDescriptor >
 const SwXTextSearch* pSearch = (const SwXTextSearch*)
 xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId());
 
-int eRanges(FND_IN_BODY|FND_IN_SELALL);
-
 SearchOptions aSearchOpt;
 pSearch->Fi

[Libreoffice-commits] .: binfilter/bf_sw

2011-09-28 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx |   50 --
 binfilter/bf_sw/source/core/inc/swcache.hxx   |2 
 2 files changed, 52 deletions(-)

New commits:
commit 90788ac6a6b491542708c074832b66a49b701ccd
Author: Caolán McNamara 
Date:   Tue Sep 27 22:22:21 2011 +0100

callcatcher: SwCache::Flush unused

diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx 
b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
index 840f59b..0166445 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
@@ -140,56 +140,6 @@ namespace binfilter {
 
 /*
 |*
-|*  SwCache::Flush()
-|*
-|*/
-
-
-/*N*/ void SwCache::Flush( const BYTE nPercent )
-/*N*/ {
-/*N*/   OSL_ENSURE( nPercent == 100, "SwCache::Flush() arbeitet nur 100%'ig" );
-/*N*/
-/*N*/   INCREMENT( nFlushCnt );
-/*N*/   SwCacheObj *pObj = pRealFirst;
-/*N*/   pRealFirst = pFirst = pLast = 0;
-/*N*/   SwCacheObj *pTmp;
-/*N*/   while ( pObj )
-/*N*/   {
-/*N*/ #ifdef DBG_UTIL
-/*N*/   if ( pObj->IsLocked() )
-/*N*/   {
-/*?*/   OSL_ENSURE( TRUE, "Flushing locked objects." );
-/*?*/   if ( !pRealFirst )
-/*?*/   {
-/*?*/   pRealFirst = pFirst = pLast = pObj;
-/*?*/   pTmp = pObj->GetNext();
-/*?*/   pObj->SetNext( 0 ); pObj->SetPrev( 0 );
-/*?*/   pObj = pTmp;
-/*?*/   }
-/*?*/   else
-/*?*/   {   pLast->SetNext( pObj );
-/*?*/   pObj->SetPrev( pLast );
-/*?*/   pLast = pObj;
-/*?*/   pTmp = pObj->GetNext();
-/*?*/   pObj->SetNext( 0 );
-/*?*/   pObj = pTmp;
-/*?*/   }
-/*N*/   }
-/*N*/   else
-/*N*/ #endif
-/*N*/   {
-/*N*/   pTmp = (SwCacheObj*)pObj;
-/*N*/   pObj = pTmp->GetNext();
-/*N*/   aFreePositions.Insert( pTmp->GetCachePos(), 
aFreePositions.Count() );
-/*N*/   *(pData + pTmp->GetCachePos()) = (void*)0;
-/*N*/   delete pTmp;
-/*N*/   INCREMENT( nFlushedObjects );
-/*N*/   }
-/*N*/   }
-/*N*/ }
-
-/*
-|*
 |*  SwCache::ToTop()
 |*
 |*/
diff --git a/binfilter/bf_sw/source/core/inc/swcache.hxx 
b/binfilter/bf_sw/source/core/inc/swcache.hxx
index 544cd61..be608e1 100644
--- a/binfilter/bf_sw/source/core/inc/swcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/swcache.hxx
@@ -123,8 +123,6 @@ public:
 SwCache( const USHORT nInitSize, const USHORT nGrowSize );
 #endif
 
-void Flush( const BYTE nPercent = 100 );
-
 //bToTop == FALSE -> Keine LRU-Umsortierung!
 SwCacheObj *Get( const void *pOwner, const BOOL bToTop = TRUE );
 SwCacheObj *Get( const void *pOwner, const USHORT nIndex,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-27 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/doc/makefile.mk |1 
 binfilter/bf_sw/source/core/doc/sw_docfmt.cxx   |   18 
 binfilter/bf_sw/source/core/doc/sw_docredln.cxx |7 -
 binfilter/bf_sw/source/core/doc/sw_extinput.cxx |   90 
 binfilter/bf_sw/source/core/inc/fntcache.hxx|1 
 binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx |   17 ---
 binfilter/inc/bf_sw/doc.hxx |8 -
 7 files changed, 142 deletions(-)

New commits:
commit 08f5cda4a6c8ef2b3084156ed60a588bf007cbce
Author: Caolán McNamara 
Date:   Tue Sep 27 12:33:50 2011 +0100

callcatcher: newly unused code

diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk 
b/binfilter/bf_sw/source/core/doc/makefile.mk
index fe8a3f0..1ce5b6b 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -67,7 +67,6 @@ SLOFILES =\
 $(SLO)$/sw_docsort.obj \
 $(SLO)$/sw_docstat.obj \
 $(SLO)$/sw_doctxm.obj \
-$(SLO)$/sw_extinput.obj \
 $(SLO)$/sw_fmtcol.obj \
 $(SLO)$/sw_ftnidx.obj \
 $(SLO)$/sw_gctable.obj \
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx 
b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 7d17d5d..d707279 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -867,24 +867,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
 /*N*/   return pFmt;
 /*N*/ }
 
-
-/*N*/ SwFrmFmt& SwDoc::GetTblFrmFmt(USHORT nFmt, BOOL bUsed ) const
-/*N*/ {
-/*?*/   USHORT nRemoved = 0;
-/*?*/   if(bUsed)
-/*?*/   {
-/*?*/   SwAutoFmtGetDocNode aGetHt( &aNodes );
-/*?*/   for ( USHORT i = 0; i <= nFmt; i++ )
-/*?*/   {
-/*?*/   while ( (*pTblFrmFmtTbl)[ i + nRemoved]->GetInfo( aGetHt ))
-/*?*/   {
-/*?*/   nRemoved++;
-/*?*/   }
-/*?*/   }
-/*?*/   }
-/*?*/   return *((*pTblFrmFmtTbl)[nRemoved + nFmt]);
-/*N*/}
-
 /*N*/ SwTableFmt* SwDoc::MakeTblFrmFmt( const String &rFmtName,
 /*N*/   SwFrmFmt *pDerivedFrom )
 /*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx 
b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index e25f472..453ee51 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -184,13 +184,6 @@ Verhalten von Delete-Redline:
 /*N*/   return DeleteRedline( aTemp, bSaveInUndo, nDelType );
 /*N*/ }
 
-
-/*N*/ USHORT SwDoc::GetRedlinePos( const SwNode& rNd, USHORT /*nType*/ ) const
-/*N*/ {
-/*N*/   rNd.GetIndex();
-/*N*/   return USHRT_MAX;
-/*N*/ }
-
 /*N*/ const SwRedline* SwDoc::GetRedline( const SwPosition& /*rPos*/,
 /*N*/   USHORT* pFndPos ) const
 /*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_extinput.cxx 
b/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
deleted file mode 100644
index e1acb86..000
--- a/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-
-#include 
-#include 
-
-#include 
-#include 
-namespace binfilter {
-
-
-
-
-
-
-
-
-// die Doc Schnittstellen:
-
-
-
-/*N*/ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
-/*N*/   xub_StrLen nCntntPos ) const
-/*N*/ {
-/*N*/   SwExtTextInput* pRet = 0;
-/*N*/   if( pExtInputRing )
-/*N*/   {
-/*?*/   ULONG nNdIdx = rNd.GetIndex();
-/*?*/   SwExtTextInput* pTmp = (SwExtTextInput*)pExtInputRing;
-/*?*/   do {
-/*?*/   ULONG nPt = pTmp->GetPoint()->nNode.GetIndex(),
-/*?*/ nMk = pTmp->GetMark()->nNode.GetIndex();
-/*?*/   xub_StrLen nPtCnt = pTmp->

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-26 Thread Stephan Bergmann 
 binfilter/bf_sw/source/core/doc/sw_docfld.cxx   |   20 ++-
 binfilter/bf_sw/source/core/doc/sw_doclay.cxx   |2 -
 binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx   |3 -
 binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx   |2 -
 binfilter/bf_sw/source/core/docnode/sw_node.cxx |4 +-
 binfilter/bf_sw/source/core/docnode/sw_section.cxx  |3 +
 binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx |   12 --
 binfilter/bf_sw/source/core/fields/sw_docufld.cxx   |2 -
 binfilter/bf_sw/source/core/fields/sw_reffld.cxx|   35 
 binfilter/bf_sw/source/core/inc/frmtool.hxx |1 
 binfilter/bf_sw/source/core/inc/tabfrm.hxx  |2 -
 binfilter/bf_sw/source/core/layout/sw_fly.cxx   |3 -
 binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx|1 
 binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx   |3 -
 binfilter/bf_sw/source/core/swg/sw_rdcont.cxx   |3 -
 binfilter/bf_sw/source/core/text/sw_redlnitr.cxx|   19 --
 binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx  |6 +--
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx   |   17 -
 binfilter/inc/bf_sw/dcontact.hxx|2 -
 binfilter/inc/bf_sw/doc.hxx |7 +---
 binfilter/inc/bf_sw/fldbas.hxx  |4 +-
 binfilter/inc/bf_sw/fmtcol.hxx  |2 -
 binfilter/inc/bf_sw/reffld.hxx  |2 -
 23 files changed, 33 insertions(+), 122 deletions(-)

New commits:
commit 4fa095b0b481ae568275d94cf2826a5fe001c658
Author: Stephan Bergmann 
Date:   Mon Sep 26 10:41:30 2011 +0200

Some more warning cleanup.

diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx 
b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index d917c86..6f4f859 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -342,13 +342,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT 
nMySttPos,
 /*N*/   pFldType = 0;
 /*N*/   }
 
-// und dann noch alle Tabellen Box Formeln abklappern
-/*N*/   const SfxPoolItem* pItem;
-/*N*/   USHORT nMaxItems = GetAttrPool().GetItemCount( RES_BOXATR_FORMULA );
-/*N*/   for( i = 0; i < nMaxItems; ++i )
-/*N*/   pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i );
-/*?*/
-/*?*/
 /*?*/   // alle Felder/Boxen sind jetzt invalide, also kann das Rechnen 
anfangen
 /*?*/   if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
 /*?*/   TBL_CALC != ((SwTableFmlUpdate*)pHt)->eFlags ))
@@ -400,7 +393,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT 
nMySttPos,
 /*N*/   {
 /*N*/   // einen Index fuers bestimmen vom TextNode anlegen
 /*N*/   SwNodeIndex aIdx( rTxtNd );
-/*N*/   FldsToCalc( *pCalc,
+/*N*/   FldsToCalc(
 /*N*/   _SetGetExpFld( aIdx, pFmtFld->GetTxtFld() ));
 /*N*/   }
 /*N*/
@@ -411,10 +404,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT 
nMySttPos,
 /*N*/   pFmtFld->Modify( 0, pHt );
 /*N*/   } while( 0 != ( pLast = aIter-- ));
 /*N*/   }
-/*N*/
-/*N*/   // dann berechene noch die Formeln an den Boxen
-/*N*/   for( i = 0; i < nMaxItems; ++i )
-/*N*/   pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i );
 /*?*/
 /*N*/   if( pCalc )
 /*N*/   delete pCalc;
@@ -646,15 +635,14 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT 
nMySttPos,
 Beschreibung:
  */
 
-/*N*/ void lcl_CalcFld( SwDoc& /*rDoc*/, SwCalc& /*rCalc*/, const 
_SetGetExpFld& rSGEFld,
-/*N*/   SwNewDBMgr* pMgr )
+/*N*/ void lcl_CalcFld( const _SetGetExpFld& rSGEFld )
 /*N*/ {
 /*N*/   const SwTxtFld* pTxtFld = rSGEFld.GetFld();
 /*N*/   if( !pTxtFld )
 /*N*/   return ;
 /*N*/ }
 
-/*N*/ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
+/*N*/ void SwDoc::FldsToCalc( const _SetGetExpFld& rToThisFld )
 /*N*/ {
 /*N*/   // erzeuge die Sortierteliste aller SetFelder
 /*N*/   pUpdtFlds->MakeFldList( *this, bNewFldLst, GETFLD_CALC );
@@ -672,7 +660,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT 
nMySttPos,
 /*N*/
 /*N*/   const _SetGetExpFldPtr* ppSortLst = 
pUpdtFlds->GetSortLst()->GetData();
 /*N*/   for( USHORT n = 0; n < nLast; ++n, ++ppSortLst )
-/*N*/   lcl_CalcFld( *this, rCalc, **ppSortLst, pMgr );
+/*N*/   lcl_CalcFld( **ppSortLst );
 /*N*/   }
 /*N*/
 /*N*/   pMgr->CloseAll(FALSE);
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx 
b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 14d5a8b..775d15b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -377,7 +377,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT 
which)
 /*N*/
 /*N*/

[Libreoffice-commits] .: binfilter/bf_sw

2011-09-23 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/inc/drawfont.hxx |6 -
 binfilter/bf_sw/source/core/text/sw_porlay.cxx   |   44 -
 binfilter/bf_sw/source/core/text/sw_pormulti.cxx |  107 ---
 3 files changed, 157 deletions(-)

New commits:
commit 1c0819b2ae55405add198e8de44a3b716d8ba127
Author: Caolán McNamara 
Date:   Fri Sep 23 16:14:47 2011 +0100

callcatcher: freshly unused code

diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx 
b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index 4274542..f7db89e 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -157,12 +157,6 @@ public:
 // obtain the end of a SwBidiPortion
 xub_StrLen NextDirChg( const xub_StrLen nPos,
const BYTE* pLevel = 0 ) const;
-BYTE DirType( const xub_StrLen nPos ) const;
-
-
-// examines the range [ nStart, nStart + nEnd ] if there are kanas
-// returns start index of kana entry in array, otherwise USHRT_MAX
-USHORT HasKana( xub_StrLen nStart, const xub_StrLen nEnd ) const;
 };
 
 inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos )
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx 
b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index a6eb583..77e49a9 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -868,53 +868,9 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
 /*N*/   return STRING_LEN;
 /*N*/ }
 
-/*N*/ BYTE SwScriptInfo::DirType( const xub_StrLen nPos ) const
-/*N*/ {
-/*N*/ USHORT nEnd = CountDirChg();
-/*N*/ for( USHORT nX = 0; nX < nEnd; ++nX )
-/*N*/ {
-/*?*/ if( nPos < GetDirChg( nX ) )
-/*?*/ return GetDirType( nX );
-/*N*/ }
-/*N*/
-/*N*/ return 0;
-/*N*/ }
-
 #endif
 
 /*
- *SwScriptInfo::CompType(..)
- * returns the type of the compressed character
- */
-
-
-/*
- *  SwScriptInfo::HasKana()
- * returns, if there are compressable kanas or specials
- * betwenn nStart and nEnd
- */
-
-/*N*/ USHORT SwScriptInfo::HasKana( xub_StrLen nStart, const xub_StrLen nLen ) 
const
-/*N*/ {
-/*N*/ USHORT nCnt = CountCompChg();
-/*N*/ xub_StrLen nEnd = nStart + nLen;
-/*N*/
-/*N*/ for( USHORT nX = 0; nX < nCnt; ++nX )
-/*N*/ {
-/*N*/ xub_StrLen nKanaStart  = GetCompStart( nX );
-/*N*/ xub_StrLen nKanaEnd = nKanaStart + GetCompLen( nX );
-/*N*/
-/*N*/ if ( nKanaStart >= nEnd )
-/*N*/ return USHRT_MAX;
-/*N*/
-/*N*/ if ( nStart < nKanaEnd )
-/*N*/ return nX;
-/*N*/ }
-/*N*/
-/*N*/ return USHRT_MAX;
-/*N*/ }
-
-/*
  *  class SwParaPortion
  */
 
diff --git a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx 
b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
index 0df5771..ee981cc 100644
--- a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
@@ -54,113 +54,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
const SwScriptInfo* pSI );
 
 /*--
- *  class SwMultiPortion
- *
- * A SwMultiPortion is not a simple portion,
- * it's a container, which contains almost a SwLineLayoutPortion.
- * This SwLineLayout could be followed by other textportions via pPortion
- * and by another SwLineLayout via pNext to realize a doubleline portion.
- * --*/
-
-/*
- *  virtual SwMultiPortion::HandlePortion()
- */
-
-/*--
- * lcl_Has2Lines(..)
- * is a little help function for GetMultiCreator(..)
- * It extracts the 2-line-format from a 2-line-attribute or a character style.
- * The rValue is set to TRUE, if the 2-line-attribute's value is set and
- * no 2-line-format reference is passed. If there is a 2-line-format reference,
- * then the rValue is set only, if the 2-line-attribute's value is set _and_
- * the 2-line-formats has the same brackets.
- * --*/
-
-/*N*/ sal_Bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* 
&rpRef,
-/*N*/   sal_Bool &rValue )
-/*N*/ {
-/*N*/   if( RES_CHRATR_TWO_LINES == rAttr.Which() )
-/*N*/   {
-/*?*/   rValue = rAttr.Get2Lines().GetValue(

[Libreoffice-commits] .: binfilter/bf_sw

2011-09-23 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/inc/drawfont.hxx |5 
 binfilter/bf_sw/source/core/layout/sw_flycnt.cxx |5 
 binfilter/bf_sw/source/core/text/inftxt.hxx  |9 
 binfilter/bf_sw/source/core/text/sw_frmform.cxx  |2 
 binfilter/bf_sw/source/core/text/sw_porlay.cxx   |  114 ---
 binfilter/bf_sw/source/core/text/sw_pormulti.cxx |  373 ---
 6 files changed, 508 deletions(-)

New commits:
commit 21eb5cb817082d46491cea84fd3b82a3931a6a52
Author: Caolán McNamara 
Date:   Fri Sep 23 13:51:08 2011 +0100

callcatcher: remove newly unused methods

diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx 
b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index bf5cbfb..4274542 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -163,11 +163,6 @@ public:
 // examines the range [ nStart, nStart + nEnd ] if there are kanas
 // returns start index of kana entry in array, otherwise USHRT_MAX
 USHORT HasKana( xub_StrLen nStart, const xub_StrLen nEnd ) const;
-
-// modifies the kerning array according to a given compress value
-long Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen,
-   const USHORT nCompress, const USHORT nFontHeight,
-   Point* pPoint = NULL ) const;
 };
 
 inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos )
diff --git a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx 
b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
index 568ee53..3cc2395 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
@@ -249,11 +249,6 @@ namespace binfilter {
 /*?*/   SwOszControl::pStk5 = 0;
 /*N*/ }
 
-/*N*/ bool IsInProgress( const SwFlyFrm* /*pFly*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
 /*N*/ bool SwOszControl::IsInProgress( const SwFlyFrm *pFly )
 /*N*/ {
 /*N*/   if ( SwOszControl::pStk1 && !pFly->IsLowerOf( SwOszControl::pStk1 ) )
diff --git a/binfilter/bf_sw/source/core/text/inftxt.hxx 
b/binfilter/bf_sw/source/core/text/inftxt.hxx
index 4d9f9be..cb38c31 100644
--- a/binfilter/bf_sw/source/core/text/inftxt.hxx
+++ b/binfilter/bf_sw/source/core/text/inftxt.hxx
@@ -232,15 +232,6 @@ public:
const xub_StrLen _nLen = STRING_LEN )
{ CtorInit( _pFrm, _pFnt, _nIdx, _nLen ); }
 
-// GetMultiAttr returns the text attribute of the multiportion,
-// if rPos is inside any multi-line part.
-// rPos will set to the end of the multi-line part.
-#ifdef BIDI
-SwMultiCreator* GetMultiCreator( xub_StrLen &rPos, SwMultiPortion* pM ) 
const;
-#else
-SwMultiCreator* GetMultiCreator( xub_StrLen &rPos ) const;
-#endif
-
 inline sal_Bool OnWin() const { return bOnWin; }
 inline void SetOnWin( const sal_Bool bNew ) { bOnWin = bNew; }
 inline sal_Bool NotEOL() const { return bNotEOL; }
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx 
b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 0ef23bd..09a5171 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -56,8 +56,6 @@
 
 namespace binfilter {
 
-extern bool IsInProgress( const SwFlyFrm *pFly );
-
 class FormatLevel
 {
 static MSHORT nLevel;
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx 
b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index cf78792..a6eb583 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -915,120 +915,6 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
 /*N*/ }
 
 /*
- *  SwScriptInfo::Compress()
- */
-
-/*N*/ long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, 
xub_StrLen nLen,
-/*N*/  const USHORT nCompress, const USHORT 
nFontHeight,
-/*N*/  Point* pPoint ) const
-/*N*/ {
-/*N*/   OSL_ENSURE( nCompress, "Compression without compression?!" );
-/*N*/   OSL_ENSURE( nLen, "Compression without text?!" );
-/*N*/ USHORT nCompCount = CountCompChg();
-/*N*/
-/*N*/ // In asian typography, there are full width and half width 
characters.
-/*N*/ // Full width punctuation characters can be compressed by 50 %
-/*N*/ // to determine this, we compare the font width with 75 % of its 
height
-/*N*/ USHORT nMinWidth = ( 3 * nFontHeight ) / 4;
-/*N*/
-/*N*/ USHORT nCompIdx = HasKana( nIdx, nLen );
-/*N*/
-/*N*/ if ( USHRT_MAX == nCompIdx )
-/*N*/ return 0;
-/*N*/
-/*N*/ xub_StrLen nChg = GetCompStart( nCompIdx );
-/*N*/ xub_StrLen nCompLen = GetCompLen( nCompIdx );
-/*N*/ USHORT nI = 0;
-/*N*/ nLen += nIdx;
-/*N*/
-/*N*/ if( nChg > nIdx )
-/*N*/ {
-/*N*/ nI = nChg - nIdx;
-/*N*/

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-22 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/doc/sw_docfmt.cxx |7 +--
 binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx |3 +--
 binfilter/inc/bf_sw/ndtxt.hxx |3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit c56b83c027e6edb681067fd2bffc75ffb4e58c28
Author: Caolán McNamara 
Date:   Thu Sep 22 16:35:16 2011 +0100

chop out unused arguments

diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx 
b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 39021c2..7445500 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -139,17 +139,12 @@ struct ParaRstFmt
 /*N*/   if( pTxtNode && pTxtNode->GetpSwpHints() )
 /*N*/   {
 /*N*/   SwIndex aSt( pTxtNode, 0 );
-/*N*/   USHORT nEnd = pTxtNode->Len();
 /*N*/
 /*N*/   if( &pPara->pSttNd->nNode.GetNode() == pTxtNode &&
 /*N*/   pPara->pSttNd->nContent.GetIndex() )
 /*?*/   aSt = pPara->pSttNd->nContent.GetIndex();
 /*N*/
-/*N*/   if( &pPara->pEndNd->nNode.GetNode() == rpNd )
-/*N*/   nEnd = pPara->pEndNd->nContent.GetIndex();
-/*N*/
-/*?*/   pTxtNode->RstAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
-/*?*/   pPara->pDelSet, pPara->bInclRefToxMark );
+/*?*/   pTxtNode->RstAttr( aSt );
 /*N*/   }
 /*N*/   return TRUE;
 /*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx 
b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
index fe23c38..3b1e204 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
@@ -158,8 +158,7 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
 
 
 
-/*M*/ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen, USHORT,
-/*M*/   const SfxItemSet*, BOOL)
+/*M*/ void SwTxtNode::RstAttr(const SwIndex &rIdx)
 /*M*/ {
 /*M*/   // Attribute?
 /*M*/   if ( !GetpSwpHints() )
diff --git a/binfilter/inc/bf_sw/ndtxt.hxx b/binfilter/inc/bf_sw/ndtxt.hxx
index 72643d7..b64d684 100644
--- a/binfilter/inc/bf_sw/ndtxt.hxx
+++ b/binfilter/inc/bf_sw/ndtxt.hxx
@@ -142,8 +142,7 @@ public:
 // loesche alle TextAttribute die als Attribut im Set vorhanden sind
 // (Set-Pointer != 0 ) oder alle deren Which-Wert mit nWhich mappen
 // oder wenn Which = 0, alle.
-voidRstAttr( const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich = 0,
-const SfxItemSet* pSet = 0, BOOL bInclRefToxMark = FALSE );
+voidRstAttr( const SwIndex &rIdx );
 
 // loesche das Text-Attribut (muss beim Pool abgemeldet werden!)
 voidDestroyAttr( SwTxtAttr* pAttr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sw

2011-09-22 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/inc/txtfrm.hxx|2 -
 binfilter/bf_sw/source/core/text/porftn.hxx   |2 -
 binfilter/bf_sw/source/core/text/porrst.hxx   |4 +--
 binfilter/bf_sw/source/core/text/sw_frmform.cxx   |   28 +++--
 binfilter/bf_sw/source/core/text/sw_itrform2.cxx  |   29 --
 binfilter/bf_sw/source/core/text/sw_pormulti.cxx  |5 ---
 binfilter/bf_sw/source/core/txtnode/sw_thints.cxx |4 ---
 binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx |4 +--
 binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx |8 +++---
 9 files changed, 14 insertions(+), 72 deletions(-)

New commits:
commit 134ed682a4538bf14e82ac7d83b949bc0da73da3
Author: Caolán McNamara 
Date:   Thu Sep 22 16:31:21 2011 +0100

WaE: fix new warnings

diff --git a/binfilter/bf_sw/source/core/inc/txtfrm.hxx 
b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
index 0e3b58a..d849c8c 100644
--- a/binfilter/bf_sw/source/core/inc/txtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
@@ -115,7 +115,7 @@ class SwTxtFrm: public SwCntntFrm
 
 // WidowsAndOrphans, AdjustFrm, AdjustFollow
 void FormatAdjust( SwTxtFormatter &rLine, WidowsAndOrphans &rFrmBreak,
-   const xub_StrLen nStrLen, const sal_Bool bDummy );
+   const xub_StrLen nStrLen );
 
 sal_Bool bLocked: 1;// im Format?
 sal_Bool bFormatted : 1;// nach Format auf sal_True
diff --git a/binfilter/bf_sw/source/core/text/porftn.hxx 
b/binfilter/bf_sw/source/core/text/porftn.hxx
index a470d52..299720c 100644
--- a/binfilter/bf_sw/source/core/text/porftn.hxx
+++ b/binfilter/bf_sw/source/core/text/porftn.hxx
@@ -48,7 +48,7 @@ public:
   KSHORT nOrig = KSHRT_MAX );
 inline KSHORT& Orig() { return nOrigHeight; }
 
-virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, 
"STRIP"); }
+virtual void Paint( const SwTxtPaintInfo & ) const { DBG_BF_ASSERT(0, 
"STRIP"); }
 virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) 
const;
 virtual SwPosSize GetTxtSize( const SwTxtSizeInfo& /*rInfo*/ ) const { 
DBG_BF_ASSERT(0, "STRIP"); return 0; }
 virtual sal_Bool Format( SwTxtFormatInfo &rInf );
diff --git a/binfilter/bf_sw/source/core/text/porrst.hxx 
b/binfilter/bf_sw/source/core/text/porrst.hxx
index 13e9744..575b591 100644
--- a/binfilter/bf_sw/source/core/text/porrst.hxx
+++ b/binfilter/bf_sw/source/core/text/porrst.hxx
@@ -102,7 +102,7 @@ public:
 #endif
 
 virtual void FormatEOL( SwTxtFormatInfo &rInf );
-virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, 
"STRIP"); }
+virtual void Paint( const SwTxtPaintInfo & ) const { DBG_BF_ASSERT(0, 
"STRIP"); }
 
 OUTPUT_OPERATOR
 };
@@ -117,7 +117,7 @@ class SwArrowPortion : public SwLinePortion
 sal_Bool bLeft;
 public:
 SwArrowPortion( const SwLinePortion &rPortion );
-virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, 
"STRIP"); }
+virtual void Paint( const SwTxtPaintInfo & ) const { DBG_BF_ASSERT(0, 
"STRIP"); }
 virtual SwLinePortion *Compress();
 inline sal_Bool IsLeft() const { return bLeft; }
 inline const Point& GetPos() const { return aPos; }
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx 
b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 757dd1b..0ef23bd 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -579,15 +579,6 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/   // umgehaengt.
 /*N*/   xub_StrLen nStart = pFoll->GetOfst();
 /*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ else if ( pFoll->GetValidPrtAreaFlag() ||
-/*N*/   pFoll->GetValidSizeFlag() )
-/*N*/ {
-/*N*/   pFoll->CalcFtnFlag();
-/*N*/   OSL_ENSURE( !pFoll->HasFtn(), "Missing FtnFlag." );
-/*N*/   }
-/*N*/ #endif
-/*N*/
 /*N*/   pFoll->MoveFlyInCnt( this, nStart, STRING_LEN );
 /*N*/ pFoll->SetFtn( FALSE );
 /*N*/   pFoll->Cut();
@@ -615,14 +606,6 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/
 /*N*/   pNew->Paste( GetUpper(), GetNext() );
 /*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/   else
-/*N*/   {
-/*N*/   CalcFtnFlag( nTxtPos-1 );
-/*N*/   OSL_ENSURE( !HasFtn(), "Missing FtnFlag." );
-/*N*/   }
-/*N*/ #endif
-/*N*/
 /*N*/   MoveFlyInCnt( pNew, nTxtPos, STRING_LEN );
 /*N*/
 /*N*/   // Kein SetOfst oder CalcFollow, weil gleich ohnehin ein AdjustFollow 
folgt.
@@ -788,14 +771,14 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/   // ist. Mal sehen, ob's klappt ...
 /*N*/   aLine.TruncLines();
 /*N*/   aFrmBreak.SetRstHeight( aLine );
-/*N*/   FormatAdjust( aLine, aFrmBreak, aInf.GetTxt().Len(), 
aInf.IsStop() );
+/*N*/   FormatAdjust( aLine, aFrmBreak, aInf.GetTxt().Len() );
 /*N*/   }
 /*N*/   else
 /*N*/   {
 /*N*/   if( !GetFollow() )
 /*N*/   {
 /*N*/

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-22 Thread Joseph Powers 
 binfilter/bf_sw/source/ui/app/sw_docstyle.cxx |   23 ---
 binfilter/inc/bf_sw/docstyle.hxx  |7 +++
 2 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit 38b105497dac1ff7c523744a02a6a9be18fa9de2
Author: Joseph Powers 
Date:   Thu Sep 22 06:58:42 2011 -0700

Move some virtual metheds to the class to make cleanup easyer latter.

diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx 
b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
index ef67450..b53a4ed 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
@@ -1143,9 +1143,6 @@ namespace binfilter {
 /*N*/   bOrganizer = bOrg;
 /*N*/ }
 
-/*N*/ SwDocStyleSheetPool::~SwDocStyleSheetPool()
-/*N*/ {
-/*N*/ }
 
 /*N*/ SfxStyleSheetBase& SwDocStyleSheetPool::Make(
 /*N*/   const String&   rName,
@@ -1166,9 +1163,6 @@ namespace binfilter {
 
 
 
-
-
-
 /*N*/ SfxStyleSheetIterator*  SwDocStyleSheetPool::CreateIterator(
 /*N*/   SfxStyleFamily eFam, USHORT nInMask )
 /*N*/ {
@@ -1176,18 +1170,6 @@ namespace binfilter {
 /*N*/ }
 
 
-
-
-BOOL  SwDocStyleSheetPool::SetParent(
-SfxStyleFamily /*eFam*/,
-const String& /*rStyle*/,
-const String& /*rParent*/
-)
-{
-DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-return FALSE;
-}
-
 /*N*/ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const String& rName,
 /*N*/   SfxStyleFamily eFam, USHORT n )
 /*N*/ {
@@ -1595,11 +1577,6 @@ BOOL  SwDocStyleSheetPool::SetParent(
 /*N*/   aLst.Append( cType, *rList[i] );
 /*N*/ }
 
-void  SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& )
-{
-DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
-}
-
 
 }
 
diff --git a/binfilter/inc/bf_sw/docstyle.hxx b/binfilter/inc/bf_sw/docstyle.hxx
index a58680e..5fb9407 100644
--- a/binfilter/inc/bf_sw/docstyle.hxx
+++ b/binfilter/inc/bf_sw/docstyle.hxx
@@ -163,7 +163,7 @@ public:
 virtual SfxStyleSheetBase* First();
 virtual SfxStyleSheetBase* Next();
 
-virtual void Notify( SfxBroadcaster&, const SfxHint& );
+virtual void Notify( SfxBroadcaster&, const SfxHint& ) { DBG_BF_ASSERT(0, 
"STRIP"); }
 };
 
 /*
@@ -179,13 +179,12 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool
 
 public:
 SwDocStyleSheetPool( SwDoc&, BOOL bOrganizer = FALSE );
-virtual ~SwDocStyleSheetPool();
+virtual ~SwDocStyleSheetPool() {}
 
 virtual SfxStyleSheetBase& Make(const String&, SfxStyleFamily, USHORT 
nMask, USHORT nPos = 0x);
 virtual SfxStyleSheetBase* Find( const String&, SfxStyleFamily eFam,
 USHORT n=0x );
-virtual BOOL SetParent( SfxStyleFamily eFam, const String &rStyle,
-const String &rParent );
+virtual BOOL SetParent( SfxStyleFamily, const String&, const String& ) { 
DBG_BF_ASSERT(0, "STRIP"); return FALSE; }
 
 voidSetItemSet(const SfxItemSet& rSet) { aStyleSheet.SetItemSet(rSet); 
}
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sw

2011-09-21 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx |   12 +++-
 binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx  |2 --
 binfilter/bf_sw/source/ui/app/sw_docstyle.cxx |2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit c07240c625b45f46eeed052f87a8c7fb99dd1897
Author: Caolán McNamara 
Date:   Wed Sep 21 15:27:23 2011 +0100

WaE: remove new unused variables

diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index ede5245..53163e5 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -464,7 +464,7 @@ void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, 
SwTableBox* pBox, sal
 
 }
 
-void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* 
pBox, sal_Bool bRow, SwDoc* pDoc)
+void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* 
pBox, sal_Bool bRow)
 {
 SwTabCols aOldCols;
 
@@ -481,7 +481,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* 
pTable, SwTableBox* pBo
 if(pSepSeq && pSepSeq->getLength() == nOldCount)
 {
 SwTabCols aCols(aOldCols);
-sal_Bool bError = sal_False;
 const TableColumnSeparator* pArray = pSepSeq->getConstArray();
 sal_Int32 nLastValue = 0;
 for(sal_uInt16 i = 0; i < nOldCount; i++)
@@ -492,7 +491,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* 
pTable, SwTableBox* pBo
 long(aCols[i] - long(nLastValue)) < 0 ||
 UNO_TABLE_COLUMN_SUM < aCols[i] )
 {
-bError = sal_True;
 break;
 }
 nLastValue = aCols[i];
@@ -1121,7 +1119,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& 
rPropertyName,
 case FN_UNO_TABLE_COLUMN_SEPARATORS:
 {
 SwTable* pLclTable = SwTable::FindTable( pFmt );
-lcl_SetTblSeparators(aValue, pLclTable, 
pLine->GetTabBoxes()[0], sal_True, pDoc);
+lcl_SetTblSeparators(aValue, pLclTable, 
pLine->GetTabBoxes()[0], sal_True);
 }
 break;
 default:
@@ -2859,7 +2857,7 @@ void SwXTextTable::setPropertyValue(const OUString& 
rPropertyName,
 {
 UnoActionContext(pFmt->GetDoc());
 SwTable* pTable = SwTable::FindTable( pFmt );
-lcl_SetTblSeparators(aValue, pTable, 
pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False, pFmt->GetDoc());
+lcl_SetTblSeparators(aValue, pTable, 
pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False);
 }
 break;
 case FN_UNO_TABLE_COLUMN_RELATIVE_SUM:/*_readonly_*/ break;
@@ -4113,10 +4111,8 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, 
sal_Int32 nCount) throw( uno:
 {
 String sTLName = lcl_GetCellName(0, (sal_Int16)nIndex);
 const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
-sal_Bool bAppend = sal_False;
 if(!pTLBox)
 {
-bAppend = sal_True;
 // am Ende anfuegen, dazu muss der Cursor in die letzte Zeile!
 SwTableLines& rLines = pTable->GetTabLines();
 SwTableLine* pLine = rLines.GetObject(rLines.Count() -1);
@@ -4307,10 +4303,8 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, 
sal_Int32 nCount) throw( u
 {
 String sTLName = lcl_GetCellName((sal_Int16)nIndex, 0);
 const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
-sal_Bool bAppend = sal_False;
 if(!pTLBox)
 {
-bAppend = sal_True;
 // am Ende anfuegen, dazu muss der Cursor in die letzte Spalte!
 SwTableLines& rLines = pTable->GetTabLines();
 SwTableLine* pLine = rLines.GetObject(0);
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx 
b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index c019bb4..fc25d4b 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -3437,7 +3437,6 @@ BOOL SwW4WParser::ContinueHdFtDefinition( BOOL bFollow,
 //JP 29.5.2001: Bug #74471#:
 // "share" the content of the header / footer of the first and the
 // following pagedesc.
-BOOL bShareHdFtCntntOfFirstPgDsc = FALSE;
 if( pOpen1stPgPageDesc && W4W_EVENODD == (nHdFtType & W4W_MASK1) )
 {
 SwFrmFmt* pTmp = &pOpen1stPgPageDesc->GetMaster();
@@ -3448,7 +3447,6 @@ BOOL SwW4WParser::ContinueHdFtDefinition( BOOL bFollow,
 pTmp->SetAttr( SwFmtHeader( TRUE ));
 else
 pTmp->SetAttr( SwFmtFooter( TRUE ));
-bShareHdFtCntntOfFirstPgDsc = TRUE;
 }
 }
 
diff --git a/binfilter/bf_sw/source/ui/app/sw_d

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-21 Thread Joseph Powers 
 binfilter/bf_sw/source/core/doc/sw_docredln.cxx |   38 
 binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx|   10 -
 binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx   |2 
 binfilter/bf_sw/source/core/swg/sw_rdswg.cxx|4 
 binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx |   43 -
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx   |   53 --
 binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx |   22 --
 binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx |   50 --
 binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx|   30 ---
 binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx |1 
 binfilter/bf_sw/source/ui/app/sw_docsh2.cxx |   12 -
 binfilter/bf_sw/source/ui/app/sw_docshini.cxx   |   22 --
 binfilter/bf_sw/source/ui/app/sw_docstyle.cxx   |   80 
+-
 binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx   |   21 --
 binfilter/bf_sw/source/ui/config/sw_viewopt.cxx |9 -
 binfilter/bf_sw/source/ui/uno/sw_unomod.cxx |   13 -
 binfilter/inc/bf_sw/doc.hxx |   41 -
 binfilter/inc/bf_sw/docsh.hxx   |3 
 binfilter/inc/bf_sw/shellio.hxx |7 
 binfilter/inc/bf_sw/swmodule.hxx|7 
 binfilter/inc/bf_sw/viewopt.hxx |   13 -
 21 files changed, 40 insertions(+), 441 deletions(-)

New commits:
commit 819cb5a2b9e57f6308ebdda7782d9b23493cd897
Author: Joseph Powers 
Date:   Wed Sep 21 05:31:45 2011 -0700

More DBG_BF_ASSERT clean in bf_sw classes

diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx 
b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index 1492ee3..e25f472 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -64,10 +64,6 @@ namespace binfilter {
 /*N*/   {
 /*N*/   const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
 /*N*/
-/*N*/ // verify valid redline positions
-/*N*/   for( USHORT i = 0; i < rTbl.Count(); ++i )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
 /*N*/ for( USHORT j = 0; j < rTbl.Count(); ++j )
 /*N*/ {
 /*N*/ // check for empty redlines
@@ -117,7 +113,6 @@ namespace binfilter {
 /*N*/   pFnc = &SwRedline::Hide;
 /*N*/   break;
 /*N*/   case REDLINE_SHOW_DELETE:
-/*?*/   DBG_BF_ASSERT(0, "STRIP");
 /*?*/   break;
 /*N*/
 /*N*/   default:
@@ -166,11 +161,6 @@ Verhalten von Delete-Redline:
   ueberlappt
 */
 
-/*N*/ BOOL SwDoc::AppendRedline( SwRedline* /*pNewRedl*/, BOOL /*bCallDelete*/ 
)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
 /*N*/ BOOL SwDoc::DeleteRedline( const SwPaM& rRange, BOOL /*bSaveInUndo*/,
 /*N*/   USHORT /*nDelType*/ )
 /*N*/ {
@@ -178,22 +168,13 @@ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
 /*N*/   !rRange.HasMark() || *rRange.GetMark() == *rRange.GetPoint() )
 /*N*/   return FALSE;
 /*N*/
-/*N*/   BOOL bChg = FALSE;
-/*N*/
 /*N*/   const SwPosition* pStt = rRange.Start();
 /*N*/   pStt == rRange.GetPoint() ? rRange.GetMark() : rRange.GetPoint();
 
 /*N*/   USHORT n = 0;
 /*N*/   GetRedline( *pStt, &n );
-/*N*/   for( ; n < pRedlineTbl->Count() ; ++n )
-/*N*/   {
-/*?*/   DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/
-/*N*/   if( bChg )
-/*N*/   SetModified();
 /*N*/
-/*N*/   return bChg;
+/*N*/   return FALSE;
 /*N*/ }
 
 /*N*/ BOOL SwDoc::DeleteRedline( const SwStartNode& rNode, BOOL bSaveInUndo,
@@ -207,23 +188,14 @@ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
 /*N*/ USHORT SwDoc::GetRedlinePos( const SwNode& rNd, USHORT /*nType*/ ) const
 /*N*/ {
 /*N*/   rNd.GetIndex();
-/*N*/   for( USHORT n = 0; n < pRedlineTbl->Count() ; ++n )
-/*N*/   {
-/*?*/   DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
 /*N*/   return USHRT_MAX;
 /*N*/ }
 
 /*N*/ const SwRedline* SwDoc::GetRedline( const SwPosition& /*rPos*/,
 /*N*/   USHORT* pFndPos ) const
 /*N*/ {
-/*N*/   register USHORT nO = pRedlineTbl->Count(), nU = 0;
-/*N*/   if( nO > 0 )
-/*N*/   {
-/*?*/   DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
 /*N*/   if( pFndPos )
-/*N*/   *pFndPos = nU;
+/*N*/   *pFndPos = 0;
 /*N*/   return 0;
 /*N*/ }
 
@@ -234,12 +206,6 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, 
USHORT& rPos,
 
 // Kommentar am Redline setzen
 
-// legt gebenenfalls einen neuen Author an
-/*N*/ USHORT SwDoc::GetRedlineAuthor()
-/*N*/ {
-/*N*/ return SW_MOD()->GetRedlineAuthor(); //SW50.SDW
-/*N*/ }
-
 // fuer die Reader usw. - neuen Author in die Tabelle eintragen
 /*N*/ USHORT SwDoc::InsertRedlineAuthor( const String& rNew )
 /*N*/ {
diff --git a/binfil

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-21 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx|7 ---
 binfilter/bf_sw/source/core/inc/notxtfrm.hxx   |1 
 binfilter/bf_sw/source/core/layout/sw_calcmove.cxx |   36 ---
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx  |9 
 binfilter/bf_sw/source/core/view/sw_viewsh.cxx |   39 -
 binfilter/bf_sw/source/core/view/sw_vnew.cxx   |4 --
 binfilter/inc/bf_sw/viewsh.hxx |8 
 7 files changed, 104 deletions(-)

New commits:
commit 06c331ea0a07a248383075a3f75bf27d001ae8f2
Author: Caolán McNamara 
Date:   Wed Sep 21 09:05:11 2011 +0100

callcatcher: remove newly unused methods

diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx 
b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index 1f84bf8..d90978b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -302,13 +302,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // 
TxtFly.Cxx
 /*N*/   pGrfNd->GetGrfObj().StopAnimation( pOut, long(this) );
 /*N*/ }
 
-
-/*N*/ BOOL SwNoTxtFrm::HasAnimation() const
-/*N*/ {
-/*N*/   const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
-/*N*/   return pGrfNd && pGrfNd->IsAnimated();
-/*N*/ }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx 
b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
index d749d67..044f075 100644
--- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
@@ -73,7 +73,6 @@ public:
 void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
 
 void StopAnimation( OutputDevice* = 0 ) const;
-BOOL HasAnimation()  const;
 
 // Routinen fuer den Grafik-Cache
 USHORT GetWeight() { return nWeight; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx 
b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index 644d285..f626de3 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -480,42 +480,6 @@ namespace binfilter {
 /*N*/   }
 /*N*/ }
 
-/*
-|*
-|*  SwPageFrm::MakeAll()
-|*
-|*/
-
-/*N*/ void lcl_CheckObjects( SwSortDrawObjs* pSortedObjs, SwFrm* pFrm, long& 
rBot )
-/*N*/ {
-/*N*/   //Und dann kann es natuerlich noch Absatzgebundene
-/*N*/   //Rahmen geben, die unterhalb ihres Absatzes stehen.
-/*N*/   long nMax = 0;
-/*N*/   for ( USHORT i = 0; i < pSortedObjs->Count(); ++i )
-/*N*/   {
-/*N*/   SdrObject *pObj = (*pSortedObjs)[i];
-/*N*/   long nTmp = 0;
-/*N*/   if ( pObj->IsWriterFlyFrame() )
-/*N*/   {
-/*N*/   SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
-/*N*/   if( pFly->Frm().Top() != WEIT_WECH &&
-/*N*/   ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() :
-/*N*/ ( pFly->IsFlyAtCntFrm() &&
-/*N*/   ( pFrm->IsBodyFrm() ? pFly->GetAnchor()->IsInDocBody() 
:
-/*N*/ pFly->GetAnchor()->IsInFtn() ) ) 
) )
-/*N*/   {
-/*N*/   nTmp = pFly->Frm().Bottom();
-/*N*/   }
-/*N*/   }
-/*N*/   else
-/*N*/   nTmp = pObj->GetBoundRect().Bottom();
-/*N*/   nMax = Max( nTmp, nMax );
-/*N*/   }
-/*N*/   ++nMax; //Unterkante vs. Hoehe!
-/*N*/   rBot = Max( rBot, nMax );
-/*N*/ }
-
-
 /*N*/ void SwPageFrm::MakeAll()
 /*N*/ {
 /*N*/   PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index af87b73..d7cc336 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -3152,15 +3152,6 @@ void SwXTextTable::setName(const OUString& rName) throw( 
uno::RuntimeException )
 //Window??
 SchDLL::Update( rOObj.GetOleRef(), pData, 
0/*GetWin()*/ );
 }
-SwFrm *pFrm;
-SwClientIter aIter( *((SwOLENode*)pNd) );
-for( pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) ); pFrm;
-pFrm = (SwFrm*)aIter.Next() )
-{
-//InvalidateWindows?
-//if ( pFrm->Frm().HasArea() )
-//((ViewShell*)this)->InvalidateWindows( 
pFrm->Frm() );
-}
 }
 }
 aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx 
b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index cc539de..9e72015 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -66,45 +66,6 @@ bool bInSizeNotify = FALSE;
 
 /*N*/ TYPEINIT0(ViewShell);
 
-/**

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-20 Thread Joseph Powers 
 binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx|7 +++
 binfilter/bf_sw/source/core/inc/notxtfrm.hxx   |1 
 binfilter/bf_sw/source/core/layout/sw_calcmove.cxx |   31 
 binfilter/bf_sw/source/core/view/sw_viewsh.cxx |   39 +
 binfilter/bf_sw/source/core/view/sw_vnew.cxx   |5 ++
 binfilter/inc/bf_sw/viewsh.hxx |8 
 6 files changed, 91 insertions(+)

New commits:
commit 1b94742492067c23500c083b76fe7426cc877362
Author: Joseph Powers 
Date:   Tue Sep 20 07:25:27 2011 -0700

Some more cleanup of bf_sw classes

diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx 
b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index d90978b..1f84bf8 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -302,6 +302,13 @@ extern void ClrContourCache( const SdrObject *pObj ); // 
TxtFly.Cxx
 /*N*/   pGrfNd->GetGrfObj().StopAnimation( pOut, long(this) );
 /*N*/ }
 
+
+/*N*/ BOOL SwNoTxtFrm::HasAnimation() const
+/*N*/ {
+/*N*/   const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
+/*N*/   return pGrfNd && pGrfNd->IsAnimated();
+/*N*/ }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx 
b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
index 044f075..d749d67 100644
--- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
@@ -73,6 +73,7 @@ public:
 void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
 
 void StopAnimation( OutputDevice* = 0 ) const;
+BOOL HasAnimation()  const;
 
 // Routinen fuer den Grafik-Cache
 USHORT GetWeight() { return nWeight; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx 
b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index e252511..644d285 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -485,6 +485,37 @@ namespace binfilter {
 |*  SwPageFrm::MakeAll()
 |*
 |*/
+
+/*N*/ void lcl_CheckObjects( SwSortDrawObjs* pSortedObjs, SwFrm* pFrm, long& 
rBot )
+/*N*/ {
+/*N*/   //Und dann kann es natuerlich noch Absatzgebundene
+/*N*/   //Rahmen geben, die unterhalb ihres Absatzes stehen.
+/*N*/   long nMax = 0;
+/*N*/   for ( USHORT i = 0; i < pSortedObjs->Count(); ++i )
+/*N*/   {
+/*N*/   SdrObject *pObj = (*pSortedObjs)[i];
+/*N*/   long nTmp = 0;
+/*N*/   if ( pObj->IsWriterFlyFrame() )
+/*N*/   {
+/*N*/   SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
+/*N*/   if( pFly->Frm().Top() != WEIT_WECH &&
+/*N*/   ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() :
+/*N*/ ( pFly->IsFlyAtCntFrm() &&
+/*N*/   ( pFrm->IsBodyFrm() ? pFly->GetAnchor()->IsInDocBody() 
:
+/*N*/ pFly->GetAnchor()->IsInFtn() ) ) 
) )
+/*N*/   {
+/*N*/   nTmp = pFly->Frm().Bottom();
+/*N*/   }
+/*N*/   }
+/*N*/   else
+/*N*/   nTmp = pObj->GetBoundRect().Bottom();
+/*N*/   nMax = Max( nTmp, nMax );
+/*N*/   }
+/*N*/   ++nMax; //Unterkante vs. Hoehe!
+/*N*/   rBot = Max( rBot, nMax );
+/*N*/ }
+
+
 /*N*/ void SwPageFrm::MakeAll()
 /*N*/ {
 /*N*/   PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx 
b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index 9e72015..cc539de 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -66,6 +66,45 @@ bool bInSizeNotify = FALSE;
 
 /*N*/ TYPEINIT0(ViewShell);
 
+/**
+|*
+|*  ViewShell::InvalidateWindows()
+|*
+**/
+
+/*N*/ void ViewShell::InvalidateWindows( const SwRect &rRect )
+/*N*/ {
+/*N*/ ViewShell *pSh = this;
+/*N*/ do
+/*N*/ {
+/*N*/ if ( pSh->GetWin() )
+/*N*/ {
+/*N*/ if ( pSh->IsPreView() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ else if ( pSh->VisArea().IsOver( rRect ) )
+/*N*/ pSh->GetWin()->Invalidate( rRect.SVRect() );
+/*N*/ }
+/*N*/ pSh = (ViewShell*)pSh->GetNext();
+/*N*/
+/*N*/ } while ( pSh != this );
+/*N*/ }
+
+/**
+|*
+|*  ViewShell::SetFirstVisPageInvalid()
+|*
+**/
+
+/*N*/ void ViewShell::SetFirstVisPageInvalid()
+/*N*/ {
+/*N*/   ViewShell *pSh = this;
+/*N*/   do
+/*N*/   {   pSh->Imp()->SetFirstVisPageInvalid();
+/*N*/   pSh = (ViewShell*)pSh->GetNext();
+/*N*/
+/*N*/   } while ( pSh != this );
+/*N*/ }
+
 /*N*/ Outp

[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

2011-09-19 Thread Caolán McNamara 
 binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx|7 ---
 binfilter/bf_sw/source/core/inc/notxtfrm.hxx   |1 
 binfilter/bf_sw/source/core/layout/sw_calcmove.cxx |   31 
 binfilter/bf_sw/source/core/view/sw_viewsh.cxx |   39 -
 binfilter/bf_sw/source/core/view/sw_vnew.cxx   |5 --
 binfilter/inc/bf_sw/viewsh.hxx |8 
 6 files changed, 91 deletions(-)

New commits:
commit 08e4dea45941c961e5f1625c1d6f07bc2d9662f4
Author: Caolán McNamara 
Date:   Mon Sep 19 15:35:04 2011 +0100

callcatcher: remove freshly unused code

diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx 
b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index 1f84bf8..d90978b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -302,13 +302,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // 
TxtFly.Cxx
 /*N*/   pGrfNd->GetGrfObj().StopAnimation( pOut, long(this) );
 /*N*/ }
 
-
-/*N*/ BOOL SwNoTxtFrm::HasAnimation() const
-/*N*/ {
-/*N*/   const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
-/*N*/   return pGrfNd && pGrfNd->IsAnimated();
-/*N*/ }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx 
b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
index d749d67..044f075 100644
--- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
@@ -73,7 +73,6 @@ public:
 void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
 
 void StopAnimation( OutputDevice* = 0 ) const;
-BOOL HasAnimation()  const;
 
 // Routinen fuer den Grafik-Cache
 USHORT GetWeight() { return nWeight; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx 
b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index 644d285..e252511 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -485,37 +485,6 @@ namespace binfilter {
 |*  SwPageFrm::MakeAll()
 |*
 |*/
-
-/*N*/ void lcl_CheckObjects( SwSortDrawObjs* pSortedObjs, SwFrm* pFrm, long& 
rBot )
-/*N*/ {
-/*N*/   //Und dann kann es natuerlich noch Absatzgebundene
-/*N*/   //Rahmen geben, die unterhalb ihres Absatzes stehen.
-/*N*/   long nMax = 0;
-/*N*/   for ( USHORT i = 0; i < pSortedObjs->Count(); ++i )
-/*N*/   {
-/*N*/   SdrObject *pObj = (*pSortedObjs)[i];
-/*N*/   long nTmp = 0;
-/*N*/   if ( pObj->IsWriterFlyFrame() )
-/*N*/   {
-/*N*/   SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
-/*N*/   if( pFly->Frm().Top() != WEIT_WECH &&
-/*N*/   ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() :
-/*N*/ ( pFly->IsFlyAtCntFrm() &&
-/*N*/   ( pFrm->IsBodyFrm() ? pFly->GetAnchor()->IsInDocBody() 
:
-/*N*/ pFly->GetAnchor()->IsInFtn() ) ) 
) )
-/*N*/   {
-/*N*/   nTmp = pFly->Frm().Bottom();
-/*N*/   }
-/*N*/   }
-/*N*/   else
-/*N*/   nTmp = pObj->GetBoundRect().Bottom();
-/*N*/   nMax = Max( nTmp, nMax );
-/*N*/   }
-/*N*/   ++nMax; //Unterkante vs. Hoehe!
-/*N*/   rBot = Max( rBot, nMax );
-/*N*/ }
-
-
 /*N*/ void SwPageFrm::MakeAll()
 /*N*/ {
 /*N*/   PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx 
b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index cc539de..9e72015 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -66,45 +66,6 @@ bool bInSizeNotify = FALSE;
 
 /*N*/ TYPEINIT0(ViewShell);
 
-/**
-|*
-|*  ViewShell::InvalidateWindows()
-|*
-**/
-
-/*N*/ void ViewShell::InvalidateWindows( const SwRect &rRect )
-/*N*/ {
-/*N*/ ViewShell *pSh = this;
-/*N*/ do
-/*N*/ {
-/*N*/ if ( pSh->GetWin() )
-/*N*/ {
-/*N*/ if ( pSh->IsPreView() )
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ else if ( pSh->VisArea().IsOver( rRect ) )
-/*N*/ pSh->GetWin()->Invalidate( rRect.SVRect() );
-/*N*/ }
-/*N*/ pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/ } while ( pSh != this );
-/*N*/ }
-
-/**
-|*
-|*  ViewShell::SetFirstVisPageInvalid()
-|*
-**/
-
-/*N*/ void ViewShell::SetFirstVisPageInvalid()
-/*N*/ {
-/*N*/   ViewShell *pSh = this;
-/*N*/   do
-/*N*/   {   pSh->Imp()->SetFirstVisPageInvalid();
-/*N*/   pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/   } while ( pSh != this );
-/*N*/ }
-
 /*N

[Libreoffice-commits] .: binfilter/bf_sw

2011-09-18 Thread Stephan Bergmann 
 binfilter/bf_sw/source/core/draw/sw_dcontact.cxx  |   10 +-
 binfilter/bf_sw/source/core/inc/frmtool.hxx   |2 +-
 binfilter/bf_sw/source/core/layout/sw_flylay.cxx  |2 +-
 binfilter/bf_sw/source/core/layout/sw_frmtool.cxx |2 +-
 binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx  |4 
 5 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 9636dc9259c154a1f38070831b18354b34b874a4
Author: Stephan Bergmann 
Date:   Sun Sep 18 22:29:33 2011 +0200

Some more warning cleanup.

diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx 
b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 363feba..24f8f5e 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -426,7 +426,7 @@ namespace binfilter {
 /*N*/   SwRect aOldRect( *pOldBoundRect );
 /*N*/   if( aOldRect.HasArea() )
 /*N*/   Notify_Background( pThis->GetMaster(),pPage, aOldRect,
-/*N*/   PREP_FLY_LEAVE,TRUE);
+/*N*/   PREP_FLY_LEAVE);
 /*N*/   }
 /*N*/   SwRect aRect( pThis->GetMaster()->GetBoundRect() );
 /*N*/   if( aRect.HasArea() )
@@ -434,7 +434,7 @@ namespace binfilter {
 /*N*/   SwPageFrm *pPg = pThis->FindPage( aRect );
 /*N*/   if( pPg )
 /*N*/   Notify_Background( pThis->GetMaster(), pPg, aRect,
-/*N*/   PREP_FLY_ARRIVE, TRUE );
+/*N*/   PREP_FLY_ARRIVE );
 /*N*/   }
 /*N*/   ClrContourCache( pThis->GetMaster() );
 /*N*/
@@ -459,7 +459,7 @@ namespace binfilter {
 /*N*/ aOldRect.Pos() += pDrawVirtObj->GetOffset();
 /*N*/ if( aOldRect.HasArea() )
 /*N*/ Notify_Background( pDrawVirtObj ,pPage2,
-/*N*/aOldRect, PREP_FLY_LEAVE,TRUE);
+/*N*/aOldRect, PREP_FLY_LEAVE);
 /*N*/ }
 /*N*/ SwRect aRect( pDrawVirtObj->GetBoundRect() );
 /*N*/ if( aRect.HasArea() )
@@ -471,7 +471,7 @@ namespace binfilter {
 /*N*/ pPg = (SwPageFrm*)::binfilter::FindPage( aRect, pPg 
);
 /*N*/ if( pPg )
 /*N*/ Notify_Background( pDrawVirtObj, pPg, aRect,
-/*N*/ PREP_FLY_ARRIVE, TRUE );
+/*N*/ PREP_FLY_ARRIVE );
 /*N*/ }
 /*N*/ ClrContourCache( pDrawVirtObj );
 /*N*/ }
@@ -629,7 +629,7 @@ namespace binfilter {
 /*N*/   }
 /*N*/   ConnectToLayout( pAnch );
 /*N*/   if( pPg && aOldRect.HasArea() )
-/*N*/   
Notify_Background(GetMaster(),pPg,aOldRect,PREP_FLY_LEAVE,TRUE);
+/*N*/   Notify_Background(GetMaster(),pPg,aOldRect,PREP_FLY_LEAVE);
 /*N*/   lcl_Notify( this, NULL );
 /*N*/
 /*N*/   // #86973#
diff --git a/binfilter/bf_sw/source/core/inc/frmtool.hxx 
b/binfilter/bf_sw/source/core/inc/frmtool.hxx
index c8c71d3..68892b9 100644
--- a/binfilter/bf_sw/source/core/inc/frmtool.hxx
+++ b/binfilter/bf_sw/source/core/inc/frmtool.hxx
@@ -114,7 +114,7 @@ void RegistFlys( SwPageFrm*, const SwLayoutFrm* );
 void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld );
 
 void Notify_Background( SdrObject *pObj, SwPageFrm *pPage, const SwRect& rRect,
-const PrepareHint eHint, const BOOL bInva );
+const PrepareHint eHint );
 
 const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos );
 
diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx 
b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
index 091b17a..e2f59c1 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
@@ -105,7 +105,7 @@ namespace binfilter {
 /*N*/ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPage1,
 /*N*/const SwRect& rRect, PrepareHint 
eHint )
 /*N*/ {
-/*N*/   ::binfilter::Notify_Background( GetVirtDrawObj(), pPage1, rRect, 
eHint, TRUE );
+/*N*/   ::binfilter::Notify_Background( GetVirtDrawObj(), pPage1, rRect, eHint 
);
 /*N*/ }
 
 /*
diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx 
b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
index 600b621..87a046c 100644
--- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
@@ -2335,7 +2335,7 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm *pFrm )
 /*N*/ }
 
 /*N*/ void Notify_Background( SdrObject *pObj, SwPageFrm *pPage, const SwRect& 
rRect,
-/*N*/   const PrepareHint eHint, const BOOL bInva )
+/*N*/   const PrepareHint eHint )
 /*N*/ {
 /*N*/
 /*N*/   //Wenn der Frm gerade erstmalig sinnvoll positioniert