[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Wed Sep 21 05:33:10 PDT 2011
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 <jpowers27 at cox.net>
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/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index 435e0e8..7ea4cca 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -1326,13 +1326,9 @@ extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
/*?*/ String aTableName;
/*?*/ InString( *pStrm, aTableName );
/*?*/
-/*?*/ if( nVersion < SWG_REGISTER )
-/*?*/ {
-/*?*/ SfxDocumentInfo aInfo( *pDoc->GetInfo() );
-/*?*/ aInfo.SetDefaultTarget( aTableName );
-/*?*/ pDoc->SetInfo( aInfo );
-/*?*/ }
-/*?*/ else if( nVersion >= SWG_DBTABLE )
+/*?*/ if( !( nVersion < SWG_REGISTER )
+ && ( nVersion >= SWG_DBTABLE )
+ )
/*?*/ {
/*?*/ aData3.sCommand = aTableName;
/*?*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
index 7f39db2..b44a65c 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
@@ -104,7 +104,7 @@ namespace binfilter {
/*N*/ if( bNormal && !bInsert )
/*N*/ nAuthorIdx = pDoc->InsertRedlineAuthor(aStringPool.Find(nStrIdx));
/*N*/ else
-/*N*/ nAuthorIdx = pDoc->GetRedlineAuthor();
+/*N*/ nAuthorIdx = 0;
/*N*/
/*N*/ pData = new SwRedlineData( (SwRedlineType)cType, nAuthorIdx,
/*N*/ DateTime( nDate2, nTime2 ), aComment,
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx b/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
index 69bf592..f8624eb 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
@@ -564,8 +564,6 @@ ByteString SwSwgReader::GetAsciiText( BOOL bReq )
// Expr-Felder in Shared-Formaten?
- // if( nStatus & SWGSTAT_UPDATEEXPR )
- // pDoc->SetUpdateExpFldStat();
if( !IsError( nErrno ))
{
if( nOptions == SWGRD_NORMAL )
@@ -586,8 +584,6 @@ ByteString SwSwgReader::GetAsciiText( BOOL bReq )
pDoc->SetModified();
}
}
- if( bNew )
- pDoc->SetInfo( *pInfo );
pDoc->SetNewDoc( FALSE );
return nErrno;
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx b/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx
index 506c06f..2bf4e59 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx
@@ -371,50 +371,11 @@ sal_Bool SwXStyleFamilies::hasElements(void) throw( RuntimeException )
}
void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
- const Sequence< PropertyValue >& aOptions)
+ const Sequence< PropertyValue >& /* aOptions */)
throw( io::IOException, RuntimeException )
{
SolarMutexGuard aGuard;
- sal_Bool bLoadStyleText = sal_True;
- sal_Bool bLoadStylePage = sal_True;
- sal_Bool bLoadStyleOverwrite = sal_True;
- sal_Bool bLoadStyleNumbering = sal_True;
- sal_Bool bLoadStyleFrame = sal_True;
- if(IsValid() && rURL.getLength())
- {
- const Any* pVal;
- int nCount = aOptions.getLength();
- const PropertyValue* pArray = aOptions.getConstArray();
- for(int i = 0; i < nCount; i++)
- if( ( pVal = &pArray[i].Value)->getValueType() ==
- ::getBooleanCppuType() )
- {
- String sName = pArray[i].Name;
- sal_Bool bVal = *(sal_Bool*)pVal->getValue();
- if( sName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES )))
- bLoadStyleOverwrite = bVal;
- else if( sName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES )))
- bLoadStyleNumbering = bVal;
- else if( sName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES )))
- bLoadStylePage = bVal;
- else if( sName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES )))
- bLoadStyleFrame = bVal;
- else if( sName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES )))
- bLoadStyleText = bVal;
- }
-
- SwgReaderOption aOpt;
- aOpt.SetFrmFmts( bLoadStyleFrame );
- aOpt.SetTxtFmts( bLoadStyleText );
- aOpt.SetPageDescs( bLoadStylePage );
- aOpt.SetNumRules( bLoadStyleNumbering );
- aOpt.SetMerge( !bLoadStyleOverwrite );
-
- ULONG nErr = pDocShell->LoadStylesFromFile( rURL, aOpt, TRUE );
- if( nErr )
- throw io::IOException();
- }
- else
+ if( !(IsValid() && rURL.getLength()) )
throw RuntimeException();
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index d7cc336..ede5245 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -164,14 +164,8 @@ void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertyMap* pMap, cons
switch(pMap->nWID)
{
case FN_TABLE_HEADLINE_REPEAT:
-
{
- SwTable* pTable = SwTable::FindTable( pFmt );
- {
- UnoActionContext aAction(pFmt->GetDoc());
- sal_Bool bVal = *(sal_Bool*)aValue.getValue();
- pFmt->GetDoc()->SetHeadlineRepeat( *pTable, bVal);
- }
+ UnoActionContext aAction(pFmt->GetDoc());
}
break;
case FN_TABLE_IS_RELATIVE_WIDTH:
@@ -503,10 +497,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBo
}
nLastValue = aCols[i];
}
- if(!bError)
- {
- pDoc->SetTabCols(*pTable, aCols, aOldCols, pBox, bRow );
- }
}
}
@@ -567,7 +557,6 @@ void lcl_setValue( SwXCell &rCell, double nVal )
SwTblBoxValue aVal(nVal);
aSet.Put(aVal);
- pDoc->SetTblBoxFormulaAttrs( *rCell.pBox, aSet );
//Tabelle aktualisieren
SwTableFmlUpdate aTblUpdate( SwTable::FindTable( rCell.GetFrmFmt() ));
pDoc->UpdateTblFlds( &aTblUpdate );
@@ -780,7 +769,6 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException
aSet.Put(SwTblBoxNumFormat(0));
}
aSet.Put(aFml);
- GetDoc()->SetTblBoxFormulaAttrs( *pBox, aSet );
//Tabelle aktualisieren
SwTableFmlUpdate aTblUpdate( SwTable::FindTable( GetFrmFmt() ));
pLclDoc->UpdateTblFlds( &aTblUpdate );
@@ -1433,7 +1421,7 @@ sal_Bool SwXTextTableCursor::mergeRange(void) throw( uno::RuntimeException )
{
UnoActionContext aContext(pUnoCrsr->GetDoc());
- bRet = TBLMERGE_OK == pTblCrsr->GetDoc()->MergeTbl(*pTblCrsr);
+ bRet = TBLMERGE_OK == 0;
if(bRet)
{
USHORT nCount = pTblCrsr->GetBoxesCount();
@@ -1503,20 +1491,9 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
switch(pMap->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
- {
- SvxBrushItem aBrush;
- aBrush.PutValue(aValue, pMap->nMemberId);
- pDoc->SetBoxAttr( *pUnoCrsr, aBrush );
-
- }
- break;
+ break;
case RES_BOXATR_FORMAT:
- {
- SfxUInt32Item aNumberFormat(RES_BOXATR_FORMAT);
- aNumberFormat.PutValue(aValue, 0);
- pDoc->SetBoxAttr( *pUnoCrsr, aNumberFormat);
- }
- break;
+ break;
case FN_UNO_PARA_STYLE:
lcl_SetTxtFmtColl(aValue, *pUnoCrsr);
break;
@@ -2873,7 +2850,6 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
aSet.Put(aBox);
aSet.Put(aBoxInfo);
- pDoc->SetTabBorders(*pCrsr, aSet);
delete pUnoCrsr;
}
}
@@ -3434,13 +3410,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
switch(pMap->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
- {
- SvxBrushItem aBrush;
- ((SfxPoolItem&)aBrush).PutValue(aValue, pMap->nMemberId);
- pDoc->SetBoxAttr( *pTblCrsr, aBrush );
-
- }
- break;
+ break;
case RES_BOX :
{
SfxItemSet aSet(pDoc->GetAttrPool(),
@@ -3473,17 +3443,10 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
SvxBoxItem aBoxItem((const SvxBoxItem&)aSet.Get(RES_BOX));
((SfxPoolItem&)aBoxItem).PutValue(aValue, pMap->nMemberId);
aSet.Put(aBoxItem);
- pDoc->SetTabBorders( *pTblCrsr, aSet );
}
break;
case RES_BOXATR_FORMAT:
- {
- SwUnoTableCrsr* pLclCrsr = *pTblCrsr;
- SfxUInt32Item aNumberFormat(RES_BOXATR_FORMAT);
- ((SfxPoolItem&)aNumberFormat).PutValue(aValue, 0);
- pDoc->SetBoxAttr( *pLclCrsr, aNumberFormat);
- }
- break;
+ break;
case FN_UNO_RANGE_ROW_LABEL:
{
sal_Bool bTmp = *(sal_Bool*)aValue.getValue();
@@ -4174,7 +4137,6 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
- pFrmFmt->GetDoc()->InsertRow(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
delete pUnoCrsr;
}
}
@@ -4218,7 +4180,6 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
pCrsr->MakeBoxSels();
{ // Die Klammer ist wichtig
UnoActionContext aAction(pFrmFmt->GetDoc());
- pFrmFmt->GetDoc()->DeleteRow(*pUnoCrsr);
delete pUnoCrsr;
bSuccess = TRUE;
}
@@ -4369,7 +4330,6 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
- pFrmFmt->GetDoc()->InsertCol(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
delete pUnoCrsr;
}
}
@@ -4413,7 +4373,6 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
pCrsr->MakeBoxSels();
{ // Die Klammer ist wichtig
UnoActionContext aAction(pFrmFmt->GetDoc());
- pFrmFmt->GetDoc()->DeleteCol(*pUnoCrsr);
delete pUnoCrsr;
bSuccess = TRUE;
}
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index 3399f21..8780fb6 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -78,7 +78,6 @@ using namespace ::com::sun::star;
/*N*/ // ist ein Medium angegeben, dann aus diesem die Streams besorgen
/*N*/ if( 0 != (po->pMedium = pMedium ) && !po->SetStrmStgPtr() )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ return ERR_SWG_FILE_FORMAT_ERROR;
/*N*/ }
/*N*/
@@ -131,12 +130,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ while( TRUE )
/*N*/ {
-/*N*/ if( pCrsr )
-/*N*/ {
-/*?*/ // Pam auf den Node davor setzen damit er nicht mit verschoben wird
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ // Speicher mal alle Fly's
/*N*/ if( pCrsr )
/*?*/ aFlyFrmArr.Insert( pDoc->GetSpzFrmFmts(), 0L );
@@ -167,11 +160,6 @@ using namespace ::com::sun::star;
/*N*/ pPam->GetPoint()->nContent.Assign( pCNd, nEndCntnt );
/*N*/ }
/*N*/
-/*N*/ if( pCrsr )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ pPam = (SwPaM *) pPam->GetNext();
/*N*/ if( pPam == pEnd )
/*N*/ break;
@@ -353,10 +341,6 @@ using namespace ::com::sun::star;
/*?*/ // for the help.
OSL_ASSERT("ReadXML removed");
/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*?*/
/*?*/ OSL_ENSURE( !pTemplate || ::binfilter::IsDocument(
@@ -376,7 +360,6 @@ using namespace ::com::sun::star;
/*N*/ if( pTemplate )
/*N*/ {
/*?*/ rDoc.RemoveAllFmtLanguageDependencies();
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ return bRet;
@@ -470,11 +453,6 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
}
-/*N*/ BOOL SetHTMLTemplate( SwDoc & /*rDoc*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 281f437..73b6671 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -5396,54 +5396,8 @@ BOOL SwSw6Parser::CallParser()
}
if (Anz>1) // LeseDocInfo
{
- if (ReadDocInfo())
- {
- SfxDocumentInfo aInfo(*pDoc->GetInfo());
- SfxStamp aTmp;
- if (pDat->DocInfo.Autor.Len())
- {
- aTmp=aInfo.GetCreated();
- aTmp.SetName(pDat->DocInfo.Autor);
- aInfo.SetCreated(aTmp);
- }
- if (pDat->DocInfo.Kateg.Len())
- {
- aInfo.SetTitle(pDat->DocInfo.Kateg);
- }
- short n;
- for (n=0; n<4; n++)
- {
- if (pDat->DocInfo.Thema[n].Len())
- {
- String s(aInfo.GetTheme());
- if (s.Len() &&
- s.GetChar( s.Len() ) !=' ' &&
- s.GetChar( s.Len() ) !='-')
- {
- s.Insert(' ');
- }
- s+=pDat->DocInfo.Thema[n];
- aInfo.SetTheme(s);
- }
- } // for n
- for (n=0; n<4; n++)
- {
- if (pDat->DocInfo.Keys[n].Len())
- {
- String s(aInfo.GetKeywords());
- if (s.Len() &&
- s.GetChar( s.Len() )!=' ' &&
- s.GetChar( s.Len() )!='-')
- {
- s.Insert(' ');
- }
- s+=pDat->DocInfo.Keys[n];
- aInfo.SetKeywords(s);
- }
- } // for n
- pDoc->SetInfo(aInfo);
- }
- else return FALSE;
+ if ( !ReadDocInfo() )
+ return FALSE;
}
if (Anz>2) // LeseLayInfo
{
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index c6abe36..c019bb4 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -3547,16 +3547,6 @@ BOOL SwW4WParser::ContinueHdFtDefinition( BOOL bFollow,
pCtrlStck->SetEndForClosedEntries( aTmpPos );
*pCurPaM->GetPoint() = aTmpPos;
- if( bShareHdFtCntntOfFirstPgDsc )
- {
- if( bDoTheHeader )
- pDoc->CopyHeader( pThisPageDesc->GetMaster(),
- pOpen1stPgPageDesc->GetMaster() );
- else
- pDoc->CopyFooter( pThisPageDesc->GetMaster(),
- pOpen1stPgPageDesc->GetMaster() );
- }
-
return bRet;
}
@@ -3779,20 +3769,6 @@ SwPageDesc* SwW4WParser::CreatePageDesc( USHORT eCreateMode )
// store old HdFtShare value
UseOnPage eOldUse = pLastActPageDesc->ReadUseOn();
- // copy even header content section
- if( ! ( (eCreateMode & CRPGD_REMOVE_HD)
- && (nHdFtType & W4W_EVEN) ) )
- {
- pDoc->CopyHeader( pLastActPageDesc->GetMaster(),
- pPageDesc->GetMaster() );
- }
- // copy even footer content section
- if( ! ( (eCreateMode & CRPGD_REMOVE_FT)
- && (nHdFtType & W4W_EVEN) ) )
- {
- pDoc->CopyFooter( pLastActPageDesc->GetMaster(),
- pPageDesc->GetMaster() );
- }
// copy odd header content section
if( ! ( (eCreateMode & CRPGD_REMOVE_HD)
&& (nHdFtType & W4W_ODD) ) )
@@ -3800,9 +3776,6 @@ SwPageDesc* SwW4WParser::CreatePageDesc( USHORT eCreateMode )
if( eOldUse & PD_HEADERSHARE )
pPageDesc->GetLeft().SetAttr(
pLastActPageDesc->GetMaster().GetHeader() );
- else
- pDoc->CopyHeader( pLastActPageDesc->GetLeft(),
- pPageDesc->GetLeft() );
}
// copy odd footer content section
if( ! ( (eCreateMode & CRPGD_REMOVE_FT)
@@ -3811,9 +3784,6 @@ SwPageDesc* SwW4WParser::CreatePageDesc( USHORT eCreateMode )
if( eOldUse & PD_FOOTERSHARE )
pPageDesc->GetLeft().SetAttr(
pLastActPageDesc->GetMaster().GetFooter() );
- else
- pDoc->CopyFooter( pLastActPageDesc->GetLeft(),
- pPageDesc->GetLeft() );
}
// Look which old UseOn values shall continue
diff --git a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
index 8b09e63..b88fd72 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
@@ -673,7 +673,6 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
// set redline mode (without doing the associated book-keeping)
pDoc->SetRedlineMode_intern(REDLINE_ON);
- pDoc->AppendRedline(pRedline);
pDoc->SetRedlineMode_intern(REDLINE_NONE);
}
}
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
index 754c908..4758125 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
@@ -148,11 +148,6 @@ using namespace ::rtl;
/*N*/ }
/*N*/ }
-/*N*/ void SwDoc::SetInfo( const SfxDocumentInfo& /*rInfo*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SwDocShell::FillClass( SvGlobalName * pClassName,
/*N*/ ULONG * pClipFormat,
/*N*/ String * pAppName,
@@ -226,13 +221,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ Broadcast(SfxSimpleHint(SFX_HINT_DOCCHANGED));
/*N*/ }
-/*N*/ULONG SwDocShell::LoadStylesFromFile( const String& /*rURL*/,
-/*N*/ SwgReaderOption& /*rOpt*/, BOOL /*bUnoCall*/ )
-/*N*/{
-/*N*/ ULONG nErr = 0;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return nErr;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
index 0b17be2..3b8f59e 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
@@ -126,7 +126,7 @@ using namespace ::rtl;
/*N*/
/*N*/ sal_Bool bWeb = ISA( SwWebDocShell );
/*N*/ if ( bWeb )
-/*?*/ bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );//Styles aus HTML.vor
+/*?*/ bHTMLTemplSet = FALSE;//Styles aus HTML.vor
/*N*/ else if( ISA( SwGlobalDocShell ) )
/*?*/ GetDoc()->SetGlobalDoc(); // Globaldokument
/*N*/
@@ -148,11 +148,6 @@ using namespace ::rtl;
/*N*/ }
// set forbidden characters if necessary
/*N*/ SvxAsianConfig aAsian;
-/*N*/ Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales();
-/*N*/ if(aLocales.getLength())
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ pDoc->SetKernAsianPunctuation(!aAsian.IsKerningWesternTextOnly());
/*N*/ pDoc->SetCharCompressType((SwCharCompressType)aAsian.GetCharDistanceCompression());
/*N*/ pDoc->SetPrintData(*SW_MOD()->GetPrtOptions(bWeb));
@@ -385,8 +380,6 @@ using namespace ::rtl;
/*N*/
/*N*/ if( !pIo )
/*N*/ pIo = new Sw3Io( *pDoc );
-/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ SetPool(&pDoc->GetAttrPool());
@@ -477,13 +470,9 @@ using namespace ::rtl;
/*N*/ switch( GetCreateMode() )
/*N*/ {
/*N*/ case SFX_CREATE_MODE_ORGANIZER:
- {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nErr = pIo->LoadStyles( pStor );
/*?*/ break;
/*N*/ case SFX_CREATE_MODE_INTERNAL:
/*N*/ case SFX_CREATE_MODE_EMBEDDED:
-/*N*/ if ( bXML )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
// SfxProgress unterdruecken, wenn man Embedded ist
/*N*/ SW_MOD()->SetEmbeddedLoadSave( sal_True );
// kein break;
@@ -642,10 +631,7 @@ using namespace ::rtl;
/*?*/ if( bXML )
/*?*/ {
OSL_ASSERT("ReadXML removed");
-
/*?*/ }
-/*?*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*?*/ }
/*?*/ else
/*?*/ {
@@ -656,12 +642,6 @@ using namespace ::rtl;
/*?*/ const SfxFilter* pFltr = SwIoSystem::GetFileFilter(rNm);
/*?*/ if( !pFltr || !pFltr->GetUserData().EqualsAscii( FILTER_SWG ))
/*?*/ break;
-/*?*/
-/*?*/ SfxMedium aMed( rNm, STREAM_STD_READ, FALSE );
-/*?*/ if( 0 == ( nErr = aMed.GetInStream()->GetError() ) )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*?*/
/*?*/ if( !bXML )
diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
index f500bd6..74e5a9c 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
@@ -697,16 +697,6 @@ namespace binfilter {
/*N*/ (const SfxPoolItem**)&pCondItem ))
/*N*/ pCondItem = 0;
/*N*/
-/*N*/ if( RES_CONDTXTFMTCOLL == pColl->Which() && pCondItem )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if( pCondItem && !pColl->GetDepends() )
-/*N*/ {
-/*?*/ // keine bedingte Vorlage, dann erstmal erzeugen und
-/*?*/ // alle wichtigen Werte uebernehmen
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ pFmt = pColl;
/*N*/ USHORT nId = pColl->GetPoolFmtId() &
@@ -844,7 +834,6 @@ namespace binfilter {
/*N*/
/*N*/ BOOL bCreate = FillPhysical == eFType;
/*N*/ BOOL bDeleteInfo = FALSE;
-/*N*/ BOOL bFillOnlyInfo = FillAllInfo == eFType;
/*N*/ SvPtrarr aDelArr;
/*N*/
/*N*/ switch(nFamily)
@@ -852,10 +841,6 @@ namespace binfilter {
/*N*/ case SFX_STYLE_FAMILY_CHAR:
/*N*/ pCharFmt = lcl_FindCharFmt(rDoc, aName, this, bCreate );
/*N*/ bPhysical = 0 != pCharFmt;
-/*N*/ if( bFillOnlyInfo && !bPhysical )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ pFmt = pCharFmt;
/*N*/ if( !bCreate && !pFmt )
@@ -877,10 +862,6 @@ namespace binfilter {
/*N*/ {
/*N*/ pColl = lcl_FindParaFmt(rDoc, aName, this, bCreate);
/*N*/ bPhysical = 0 != pColl;
-/*N*/ if( bFillOnlyInfo && !bPhysical )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ pFmt = pColl;
/*N*/ if( pColl )
@@ -898,10 +879,6 @@ namespace binfilter {
/*N*/ case SFX_STYLE_FAMILY_FRAME:
/*N*/ pFrmFmt = lcl_FindFrmFmt(rDoc, aName, this, bCreate);
/*N*/ bPhysical = 0 != pFrmFmt;
-/*N*/ if( bFillOnlyInfo && bPhysical )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ pFmt = pFrmFmt;
/*N*/ if( !bCreate && !pFmt )
/*N*/ nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( aName, GET_POOLID_FRMFMT );
@@ -915,10 +892,6 @@ namespace binfilter {
/*N*/ case SFX_STYLE_FAMILY_PAGE:
/*N*/ pDesc = lcl_FindPageDesc(rDoc, aName, this, bCreate);
/*N*/ bPhysical = 0 != pDesc;
-/*N*/ if( bFillOnlyInfo && !pDesc )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if( pDesc )
/*N*/ {
@@ -941,10 +914,6 @@ namespace binfilter {
/*N*/ case SFX_STYLE_FAMILY_PSEUDO:
/*N*/ pNumRule = lcl_FindNumRule(rDoc, aName, this, bCreate);
/*N*/ bPhysical = 0 != pNumRule;
-/*N*/ if( bFillOnlyInfo && !pNumRule )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if( pNumRule )
/*N*/ {
@@ -1007,8 +976,6 @@ namespace binfilter {
/*N*/
/*N*/ SetMask( nLclMask );
/*N*/ }
-/*N*/ if( bDeleteInfo && bFillOnlyInfo )
-/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ return bRet;
/*N*/ }
@@ -1034,9 +1001,7 @@ namespace binfilter {
/*N*/ if( !pColl )
/*N*/ {
/*N*/ SwTxtFmtColl *pPar = (*rDoc.GetTxtFmtColls())[0];
-/*N*/ if( nMask & SWSTYLEBIT_CONDCOLL )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if ( !( nMask & SWSTYLEBIT_CONDCOLL ) )
/*N*/ pColl = rDoc.MakeTxtFmtColl( aName, pPar );
/*N*/ }
/*N*/ break;
@@ -1213,10 +1178,15 @@ namespace binfilter {
-/*N*/ BOOL SwDocStyleSheetPool::SetParent( SfxStyleFamily /*eFam*/,
-/*N*/ const String& /*rStyle*/, const String& /*rParent*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*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 )
@@ -1504,17 +1474,6 @@ namespace binfilter {
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_EXTRA )
/*N*/ AppendStyleList(SwStyleNameMapper::GetExtraUINameArray(),
/*N*/ bLclSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
-/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CONDCOLL )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ if ( bAll ||
-/*N*/ (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_HTML ||
-/*N*/ (nSMask & ~SFXSTYLEBIT_USED) ==
-/*N*/ (SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if( nSearchFamily == SFX_STYLE_FAMILY_FRAME ||
@@ -1631,24 +1590,15 @@ namespace binfilter {
/*N*/ BOOL bTestUsed,
/*N*/ USHORT /*nSection*/, char cType )
/*N*/ {
-/*N*/ if( bTestUsed )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !bTestUsed )
/*N*/ for ( USHORT i=0; i < rList.Count(); ++i )
/*N*/ aLst.Append( cType, *rList[i] );
/*N*/ }
-/*N*/ void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
-/*N*/ {
-/*N*/ // suchen und aus der Anzeige-Liste entfernen !!
-/*N*/ if( rHint.ISA( SfxStyleSheetHint ) &&
-/*N*/ SFX_STYLESHEET_ERASED == ((SfxStyleSheetHint&) rHint).GetHint() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
}
diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx
index 801948f..b036ca1 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx
@@ -89,13 +89,6 @@ using namespace ::com::sun::star::lang;
folgenden aus.
------------------------------------------------------------------------*/
-/*M*/ void SwModule::ApplyUsrPref(const SwViewOption& /*rUsrPref*/, SwView* /*pActView*/,
-/*M*/ sal_uInt16 /*nDest*/ )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-
-
-
/*N*/ SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
/*N*/ {
/*N*/ if(bWeb && !pWebPrtOpt)
@@ -111,15 +104,6 @@ using namespace ::com::sun::star::lang;
/*N*/ }
/*--------------------------------------------------------------------
- Beschreibung: Redlining
- --------------------------------------------------------------------*/
-
-/*N*/ sal_uInt16 SwModule::GetRedlineAuthor()
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-/*--------------------------------------------------------------------
Beschreibung:
--------------------------------------------------------------------*/
@@ -132,11 +116,6 @@ DBG_BF_ASSERT(0, "STRIP"); return 0;
Beschreibung:
--------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
/*N*/ sal_uInt16 SwModule::InsertRedlineAuthor(const String& rAuthor) //SW50.SDW
/*N*/ {
/*N*/ sal_uInt16 nPos = 0;
diff --git a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
index 426c262..92706c7 100644
--- a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
@@ -196,10 +196,6 @@ static const char aPostItStr[] = " ";
/*N*/ }
-/*N*/ SwViewOption::~SwViewOption()
-/*N*/ {
-/*N*/ }
-
/*************************************************************************/
/*N*/ AuthorCharAttr::AuthorCharAttr() :
/*N*/ nItemId (SID_ATTR_CHAR_UNDERLINE),
@@ -271,11 +267,6 @@ static const char aPostItStr[] = " ";
/*N*/ }
/*************************************************************************/
-/*N*/ void SwViewOption::SetAppearanceFlag(sal_Int32 /*nFlag*/, BOOL /*bSet*/, BOOL /*bSaveInConfig*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*************************************************************************/
/*N*/ BOOL SwViewOption::IsAppearanceFlag(sal_Int32 nFlag)
/*N*/ {
/*N*/ return 0 != (nAppearanceFlags & nFlag);
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
index 37f3ac6..cb51917 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
@@ -581,9 +581,9 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break;
case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break;
case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break;
- case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
- case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
- case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
+ case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : break;
+ case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : break;
+ case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : break;
case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break;
case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break;
case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break;
@@ -592,8 +592,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_BREAKS : mpViewOption->SetLineBreak(bVal); break;
case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetHidden(bVal); break;
case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break;
- case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, TRUE); break;
- case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break;
+ case HANDLE_VIEWSET_TABLE_BOUNDARIES : break;
+ case HANDLE_VIEWSET_TEXT_BOUNDARIES : break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break;
case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break;
case HANDLE_VIEWSET_PREVENT_TIPS : mpViewOption->SetPreventTips(bVal); break;
@@ -653,9 +653,6 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
void SwXViewSettings::_postSetValues ()
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
- SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? VIEWOPT_DEST_VIEW_ONLY
- : bWeb ? VIEWOPT_DEST_WEB
- : VIEWOPT_DEST_TEXT );
delete mpViewOption;
mpViewOption = NULL;
}
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 31fa778..08a1687 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1038,11 +1038,6 @@ public:
// kann auch 0 sein !!!
const SfxDocumentInfo* GetpInfo() const { return pSwgInfo; }
- // setze ueber die DocShell in den entsp. Storage-Stream. Hier wird
- // jetzt die DocInfo verwaltet. Fuer die Felder ist am Doc eine Kopie
- // der Info, um einen schnellen Zugriff zu ermoeglichen.
- // (impl. in docsh2.cxx)
- void SetInfo( const SfxDocumentInfo& rInfo );
// die DocInfo hat siche geaendert (Notify ueber die DocShell)
// stosse die entsp. Felder zum Updaten an.
void DocInfoChgd( const SfxDocumentInfo& rInfo );
@@ -1060,15 +1055,6 @@ public:
SwPageDesc* FindPageDescByName( const String& rName,
sal_uInt16* pPos = 0 ) const;
- // kopiere die Kopzeile (mit dem Inhalt!) aus dem SrcFmt
- // ins DestFmt ( auch ueber Doc grenzen hinaus!)
- void CopyHeader( const SwFrmFmt& /*rSrcFmt*/, SwFrmFmt& /*rDestFmt*/ )
- { DBG_BF_ASSERT(0, "STRIP"); }
- // kopiere die Fusszeile (mit dem Inhalt!) aus dem SrcFmt
- // ins DestFmt ( auch ueber Doc grenzen hinaus!)
- void CopyFooter( const SwFrmFmt& /*rSrcFmt*/, SwFrmFmt& /*rDestFmt*/ )
- { DBG_BF_ASSERT(0, "STRIP"); }
-
//fuer Reader
SwPageDesc& _GetPageDesc( sal_uInt16 i ) const { return *aPageDescs[i]; }
void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
@@ -1210,38 +1196,17 @@ public:
SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx );
inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const;
- // erzeuge aus dem makierten Bereich eine ausgeglichene Tabelle
- // erzeuge aus der Tabelle wieder normalen Text
- // einfuegen von Spalten/Zeilen in der Tabelle
- sal_Bool InsertCol( const SwCursor& /*rCursor*/,
- sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ){DBG_BF_ASSERT(0, "STRIP"); (void)nCnt; (void)bBehind; return FALSE;}
- sal_Bool InsertRow( const SwCursor& /*rCursor*/,
- sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ){DBG_BF_ASSERT(0, "STRIP"); (void)nCnt; (void)bBehind; return FALSE;}
- sal_Bool DeleteRow( const SwCursor& /*rCursor*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- sal_Bool DeleteCol( const SwCursor& /*rCursor*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
// teilen / zusammenfassen von Boxen in der Tabelle
sal_Bool SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert = sal_True,
sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False );
- // returnt den enum TableMergeErr
- sal_uInt16 MergeTbl( SwPaM& /*rPam*/ ){DBG_BF_ASSERT(0, "STRIP"); return 0;}
String GetUniqueTblName() const;
- // aus der FEShell wg.. Undo und bModified
-
- // Direktzugriff fuer Uno
- void SetTabCols(SwTable& /*rTab*/, const SwTabCols& /*rNew*/, SwTabCols& /*rOld*/,
- const SwTableBox* /*pStart*/, sal_Bool /*bCurRowOnly*/){DBG_BF_ASSERT(0, "STRIP");}
-
- void SetHeadlineRepeat( SwTable& /*rTable*/, sal_Bool /*bSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
// Erfrage wie attributiert ist
// setze das TabelleAttribut Undo auf:
// setze das InsertDB als Tabelle Undo auf:
// setze die Spalten/Zeilen/ZTellen Breite/Hoehe
SwTableBoxFmt* MakeTableBoxFmt();
SwTableLineFmt* MakeTableLineFmt();
- // teste ob die Box ein numerischen Wert darstellt und aender dann ggfs.
- // das Format der Box
- void SetTblBoxFormulaAttrs( SwTableBox& /*rBox*/, const SfxItemSet& /*rSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
void ClearBoxNumAttrs( const SwNodeIndex& rNode );
@@ -1368,7 +1333,6 @@ public:
void SetRedlineMode( sal_uInt16 eMode );
const SwRedlineTbl& GetRedlineTbl() const { return *pRedlineTbl; }
- sal_Bool AppendRedline( SwRedline* pPtr, sal_Bool bCallDelete = sal_True );
sal_Bool DeleteRedline( const SwPaM& rPam, sal_Bool bSaveInUndo = sal_True,
sal_uInt16 nDelType = USHRT_MAX );
sal_Bool DeleteRedline( const SwStartNode& rSection, sal_Bool bSaveInUndo = sal_True,
@@ -1381,9 +1345,6 @@ public:
void SetRedlineMove( sal_Bool bFlag ) { bIsRedlineMove = bFlag; }
- // alle Redline invalidieren, die Darstellung hat sich geaendert
- // legt gegebenenfalls einen neuen Author an
- sal_uInt16 GetRedlineAuthor();
// fuer die Reader usw. - neuen Author in die Tabelle eintragen
sal_uInt16 InsertRedlineAuthor( const String& );
// Kommentar am Redline an der Position setzen
@@ -1425,9 +1386,7 @@ public:
sal_Bool ChgAnchor( const SdrMarkList &rMrkList, int eAnchorId,
sal_Bool bSameOnly, sal_Bool bPosCorr );
- void SetTabBorders( const SwCursor& /*rCursor*/, const SfxItemSet& /*rSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const;
- void SetBoxAttr( const SwCursor& /*rCursor*/, const SfxPoolItem& /*rNew*/ ){DBG_BF_ASSERT(0, "STRIP");}
int Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
void Unchain( SwFrmFmt &rFmt );
diff --git a/binfilter/inc/bf_sw/docsh.hxx b/binfilter/inc/bf_sw/docsh.hxx
index 92a56bf..23fb086 100644
--- a/binfilter/inc/bf_sw/docsh.hxx
+++ b/binfilter/inc/bf_sw/docsh.hxx
@@ -191,9 +191,6 @@ public:
void EnterWait( BOOL bLockDispatcher );
void LeaveWait( BOOL bLockDispatcher );
- ULONG LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt,
- BOOL bUnoCall );
-
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
};
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 77f67e2..fafc1c6 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -326,19 +326,12 @@ extern void _InitFilter();
extern void _FinitFilter();
extern SwRead ReadRtf, ReadAscii, ReadSwg, ReadSw3, ReadHTML;
-extern BOOL SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx
-
/*
* Schreiben, Writer
*/
-#ifndef SW_DECL_WRITER_DEFINED
-#define SW_DECL_WRITER_DEFINED
-#endif
-
-
// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
// Writer-internen Namen, d.h. die namen, die in INSTALL.INI vor dem
diff --git a/binfilter/inc/bf_sw/swmodule.hxx b/binfilter/inc/bf_sw/swmodule.hxx
index 1554b49..9b73c41 100644
--- a/binfilter/inc/bf_sw/swmodule.hxx
+++ b/binfilter/inc/bf_sw/swmodule.hxx
@@ -135,8 +135,6 @@ public:
// Benutzereinstellungen modifizieren
const SwMasterUsrPref *GetUsrPref(sal_Bool bWeb) const;
const SwViewOption* GetViewOption(sal_Bool bWeb);
- void ApplyUsrPref(const SwViewOption &, SwView*,
- sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
// ConfigItems erzeugen
SwModuleOptions* GetModuleConfig() { return pModuleConfig;}
@@ -150,9 +148,8 @@ public:
void SetEmbeddedLoadSave( sal_Bool bFlag ) { bEmbeddedLoadSave = bFlag; }
// Redlining
- sal_uInt16 GetRedlineAuthor();
- const String& GetRedlineAuthor(sal_uInt16 nPos);
-/*N*/ sal_uInt16 InsertRedlineAuthor(const String& rAuthor); //SW50.SDW
+ const String& GetRedlineAuthor(sal_uInt16 nPos);
+ sal_uInt16 InsertRedlineAuthor(const String& rAuthor); //SW50.SDW
// returne den definierten DocStat - WordDelimiter
const String& GetDocStatWordDelim() const;
diff --git a/binfilter/inc/bf_sw/viewopt.hxx b/binfilter/inc/bf_sw/viewopt.hxx
index aebcd1f..3cfdeef 100644
--- a/binfilter/inc/bf_sw/viewopt.hxx
+++ b/binfilter/inc/bf_sw/viewopt.hxx
@@ -184,7 +184,7 @@ protected:
public:
SwViewOption(); // CTOR
SwViewOption(const SwViewOption&); //
- ~SwViewOption(); //
+ ~SwViewOption() {} //
USHORT GetPixelTwips() const { return nPixelTwips; }
@@ -208,10 +208,6 @@ public:
inline void SetTab( BOOL b ) {
(b != 0) ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); }
-#ifdef VERTICAL_LAYOUT
-#else
-#endif
-
inline BOOL IsBlank(BOOL bHard = FALSE) const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_BLANK) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard)
@@ -237,9 +233,6 @@ public:
? TRUE : FALSE; }
inline void SetLineBreak( BOOL b )
{ (b != 0) ? (nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_LINEBREAK); }
-#ifdef VERTICAL_LAYOUT
-#else
-#endif
inline BOOL IsPageBreak() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_PAGEBREAK) ? TRUE : FALSE; }
inline void SetPageBreak( BOOL b )
@@ -538,10 +531,6 @@ public:
static BOOL IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);}
static BOOL IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);}
- static void SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInConfig = FALSE);
-
- void SetDocBoundaries(BOOL bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);}
-
static void ApplyColorConfigValues(const ColorConfig& rConfig);
};
More information about the Libreoffice-commits
mailing list