[Libreoffice-commits] .: 8 commits - binfilter/bf_sw
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Mon Dec 13 22:45:00 PST 2010
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 20
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 1
binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx | 9
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 7
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx | 50 -
binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 8
binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx | 69 -
binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx | 26
binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx | 14
binfilter/bf_sw/source/filter/writer/sw_writer.cxx | 9
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx | 34
binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx | 22
binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 29
binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx | 4
binfilter/bf_sw/source/ui/app/sw_apphdl.cxx | 17
binfilter/bf_sw/source/ui/app/sw_docshini.cxx | 10
binfilter/bf_sw/source/ui/app/sw_docstyle.cxx | 19
binfilter/bf_sw/source/ui/uno/sw_SwXFilterOptions.cxx | 28
binfilter/bf_sw/source/ui/uno/sw_unodefaults.cxx | 9
binfilter/bf_sw/source/ui/uno/sw_unodoc.cxx | 6
binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx | 6
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 47 -
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 356 +---------
binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx | 75 --
binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx | 39 -
34 files changed, 159 insertions(+), 793 deletions(-)
New commits:
commit 6ee1fab0b931f8f95d708b396cd5449b01b58bab
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 11 17:48:44 2010 +0100
warning fixes in binfilter bf_sw filter/basflt
commented code and comments deletion and warning fixes based on
unused parameter
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index 7a64bb2..9799041 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -230,7 +230,7 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
/* */
-/*N*/ ULONG Sw3Reader::Read( SwDoc &rDoc, SwPaM &rPam, const String & )
+/*N*/ ULONG Sw3Reader::Read( SwDoc & /*rDoc*/, SwPaM &rPam, const String & )
/*N*/ {
/*N*/ ULONG nRet;
/*N*/ if( pStg && pIO )
@@ -1028,9 +1028,6 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
} while( STRING_NOTFOUND != nToken );
}
-/* -----------------------------02.03.00 17:33--------------------------------
-
- ---------------------------------------------------------------------------*/
Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle)
{
Color aColor = rCol;
@@ -1080,7 +1077,7 @@ Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle)
}
void SwFilterOptions::Commit() {}
- void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+ void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) {}
}
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index ad46524..ad106a1 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -119,8 +119,6 @@ using namespace ::com::sun::star;
/*N*/ // ersten ist.
/*N*/ SwPaM *pEnd = pPam;
/*N*/
-/*N*/ BOOL bReadPageDescs = FALSE;
-/*N*/
/*N*/ SwNodeIndex aSplitIdx( pDoc->GetNodes() );
/*N*/
/*N*/ SwRedlineMode eOld = pDoc->GetRedlineMode();
@@ -454,7 +452,7 @@ int Reader::SetStrmStgPtr()
}
-void Reader::SetNoOutlineNum( SwDoc& rDoc )
+void Reader::SetNoOutlineNum( SwDoc& /*rDoc*/ )
{
}
@@ -525,20 +523,6 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
/*N*/ {
/*N*/ }
-/*
-
-SwWriter::SwWriter( SvStorage& rStg, SwCrsrShell &rShell, BOOL bWriteAll )
- : pStrm( 0 ),
- pStg( &rStg ),
- pMedium( 0 ),
- pShell( &rShell ),
- pOutPam( 0 ),
- rDoc( *rShell.GetDoc() ),
- bWriteAll( bWriteAll )
-{
-}
-*/
-
/*N*/ SwWriter::SwWriter(SvStorage& rStg,SwDoc &rDoc)
/*N*/ :pStrm( 0 ),
@@ -550,36 +534,6 @@ SwWriter::SwWriter( SvStorage& rStg, SwCrsrShell &rShell, BOOL bWriteAll )
/*N*/ bWriteAll( TRUE )
/*N*/ {
/*N*/ }
-/*
-
-SwWriter::SwWriter( SvStorage& rStg, SwPaM& rPam, BOOL bWriteAll )
- : pStrm( 0 ),
- pStg( &rStg ),
- pMedium( 0 ),
- pShell( 0 ),
- pOutPam( &rPam ),
- rDoc( *rPam.GetDoc() ),
- bWriteAll( bWriteAll )
-{
-}
-*/
-
-
-
-
-/*
-
-SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll )
- : pStrm( 0 ),
- pStg( 0 ),
- pShell( 0 ),
- pMedium( &rMedium ),
- pOutPam( &rPam ),
- rDoc( *rPam.GetDoc() ),
- bWriteAll( bWriteAll )
-{
-}
-*/
/*N*/ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
@@ -719,7 +673,7 @@ SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll )
// ----------------------------------------------------------------------
-/*N*/ BOOL SetHTMLTemplate( SwDoc & rDoc )
+/*N*/ BOOL SetHTMLTemplate( SwDoc & /*rDoc*/ )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // Vorlagennamen von den Sfx-HTML-Filter besorgen!!!
/*N*/ }
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx b/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx
index 7ca3cfd..326e1b1 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx
@@ -96,7 +96,7 @@ namespace binfilter {//STRIP009
#define ERR_DLL 9999
-/*N*/ USHORT AutoDetec( const String& rFileName, USHORT & rVersion )
+/*N*/ USHORT AutoDetec( const String& /*rFileName*/, USHORT & /*rVersion*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
/*N*/ }
commit b8efac5938745eb51b52d8cf53abfc7c42638590
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 11 16:33:30 2010 +0100
fix warnings in binfilter bf_sw filter/xml
dead code / coments deletion and warning removing concerning:
unused parameter
enumeration (all cases not handled in switch)
diff --git a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
index 159cdb8..d1e55e1 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
@@ -567,8 +567,8 @@ void XMLRedlineImportHelper::SetCursor(
void XMLRedlineImportHelper::AdjustStartNodeCursor(
const OUString& rId, /// ID used in RedlineAdd() call
- sal_Bool bStart,
- Reference<XTextRange> & rRange)
+ sal_Bool /*bStart*/,
+ Reference<XTextRange> & /*rRange*/)
{
// this method will modify the document directly -> lock SolarMutex
SolarMutexGuard aGuard;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx b/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
index c7f5c29..3a6939d 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
@@ -327,8 +327,6 @@ sal_uInt32 SwXMLWriter::_Write()
if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 &&
!(bOrganizerMode || bBlock || bErr) )
{
-// DBG_ASSERT( !pDoc->GetDocStat().bModified,
-// "doc stat is modified!" );
OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") );
SvStorageStreamRef xStrm = pStg->OpenStream( sStreamName,
STREAM_WRITE | STREAM_SHARE_DENYWRITE );
@@ -541,15 +539,11 @@ sal_Bool SwXMLWriter::WriteThroughComponent(
return xFilter->filter( rMediaDesc );
}
-
-// -----------------------------------------------------------------------
-
-void GetXMLWriter( const String& rName, WriterRef& xRet )
+void GetXMLWriter( const String& /*rName*/, WriterRef& xRet )
{
xRet = new SwXMLWriter();
}
-// -----------------------------------------------------------------------
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
index 03323cf..1b9a814 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
@@ -317,23 +317,23 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport,
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
-void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& rAttrList,
- const SvXMLItemMapEntry& rEntry,
- const SfxPoolItem& rItem,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- const SfxItemSet* pSet /* = NULL */ ) const
+void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& /*rAttrList*/,
+ const SvXMLItemMapEntry& /*rEntry*/,
+ const SfxPoolItem& /*rItem*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/,
+ const SfxItemSet* /*pSet = NULL */ ) const
{
DBG_ERROR( "special item not handled in xml export" );
}
/** this method is called for every item that has the
MID_FLAG_NO_ITEM_EXPORT flag set */
-void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& rAttrList,
- const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- const SfxItemSet& rSet ) const
+void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& /*rAttrList*/,
+ const SvXMLItemMapEntry& /*rEntry*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/,
+ const SfxItemSet& /*rSet*/ ) const
{
DBG_ERROR( "no item not handled in xml export" );
}
@@ -341,12 +341,12 @@ void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& rAttrList,
/** this method is called for every item that has the
MID_FLAG_ELEMENT_EXPORT flag set */
void SvXMLExportItemMapper::handleElementItem(
- SvXMLExport& rExport,
- const SvXMLItemMapEntry& rEntry,
- const SfxPoolItem& rItem,
- const SvXMLUnitConverter& rUnitConverter,
- const SfxItemSet& rSet,
- sal_uInt16 nFlags ) const
+ SvXMLExport& /*rExport*/,
+ const SvXMLItemMapEntry& /*rEntry*/,
+ const SfxPoolItem& /*rItem*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SfxItemSet& /*rSet*/,
+ sal_uInt16 /*nFlags*/ ) const
{
DBG_ERROR( "element item not handled in xml export" );
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
index dfd7b00..b50efd5 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
@@ -696,8 +696,6 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc()
sal_Bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName()
{
- sal_Bool bTmp = bDataStyleIsResolved;
-
// resolve, if not already done
if (! bDataStyleIsResolved)
{
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx
index e73a3a5..fc08f20 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx
@@ -214,12 +214,12 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
BOOL
-SvXMLImportItemMapper::handleSpecialItem( const SvXMLItemMapEntry& rEntry,
- SfxPoolItem& rItem,
- SfxItemSet& rSet,
- const OUString& rValue,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap ) const
+SvXMLImportItemMapper::handleSpecialItem( const SvXMLItemMapEntry& /*rEntry*/,
+ SfxPoolItem& /*rItem*/,
+ SfxItemSet& /*rSet*/,
+ const OUString& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
{
DBG_ERROR( "unsuported special item in xml import" );
return FALSE;
@@ -227,11 +227,11 @@ SvXMLImportItemMapper::handleSpecialItem( const SvXMLItemMapEntry& rEntry,
/** this method is called for every item that has the
MID_FLAG_NO_ITEM_IMPORT flag set */
-BOOL SvXMLImportItemMapper::handleNoItem( const SvXMLItemMapEntry& rEntry,
- SfxItemSet& rSet,
- const OUString& rValue,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap) const
+BOOL SvXMLImportItemMapper::handleNoItem( const SvXMLItemMapEntry& /*rEntry*/,
+ SfxItemSet& /*rSet*/,
+ const OUString& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/) const
{
DBG_ERROR( "unsuported no item in xml import" );
return FALSE;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx
index fe378c4..7c72115 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx
@@ -81,10 +81,10 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
*/
SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
const ::rtl::OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList,
- SfxItemSet& rItemSet,
- const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConv )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/,
+ SfxItemSet& /*rItemSet*/,
+ const SvXMLItemMapEntry& /*rEntry*/,
+ const SvXMLUnitConverter& /*rUnitConv*/ )
{
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
index 03dc7b6..43e0150 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
@@ -214,10 +214,10 @@ void SwXMLTableItemMapper_Impl::handleSpecialItem(
/** this method is called for every item that has the
MID_FLAG_ELEMENT_EXPORT flag set */
void SwXMLTableItemMapper_Impl::handleElementItem(
- SvXMLExport& rExport,
+ SvXMLExport& /*rExport*/,
const SvXMLItemMapEntry& rEntry,
const SfxPoolItem& rItem,
- const SvXMLUnitConverter& rUnitConverter,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
const SfxItemSet&,
sal_uInt16 ) const
{
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
index ac94670..794c8b6 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
@@ -129,7 +129,7 @@ sal_Bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
return bRet;
}
-void SwXMLImportTableItemMapper_Impl::finished( SfxItemSet& rSet ) const { }
+void SwXMLImportTableItemMapper_Impl::finished( SfxItemSet& /*rSet*/ ) const { }
// ---------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
index f015d36..bfab895 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
@@ -176,8 +176,6 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
{
const SwTableBox *pBox = rBoxes[nBox];
- sal_uInt16 nOldCPos = nCPos;
-
if( nBox < nBoxes-1U || nWidth==0UL )
{
nCPos += (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
@@ -659,7 +657,6 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
{
SwTableBox *pBox = rBoxes[nBox];
- sal_uInt16 nOldCPos = nCPos;
if( nBox < nBoxes-1U )
nCPos += (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
else
@@ -912,7 +909,6 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
{
const SwTableBox *pBox = rBoxes[nBox];
- sal_uInt16 nOldCPos = nCPos;
if( nBox < nBoxes-1U )
nCPos += (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
else
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index c840218..1de1681 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -282,7 +282,6 @@ inline void SwXMLTableCell_Impl::Dispose()
xSubTable = 0;
}
-// ---------------------------------------------------------------------
typedef SwXMLTableCell_Impl* SwXMLTableCellPtr;
SV_DECL_PTRARR_DEL(SwXMLTableCells_Impl,SwXMLTableCellPtr,5,5)
@@ -378,7 +377,6 @@ void SwXMLTableRow_Impl::Dispose()
aCells[i]->Dispose();
}
-// ---------------------------------------------------------------------
class SwXMLTableCellContext_Impl : public SvXMLImportContext
{
@@ -598,7 +596,6 @@ void SwXMLTableCellContext_Impl::EndElement()
{
if( GetTable()->IsValid() )
{
- sal_Bool bEmpty = sal_False;
if( bHasTextContent )
{
GetImport().GetTextImport()->DeleteParagraph();
@@ -656,8 +653,6 @@ void SwXMLTableCellContext_Impl::EndElement()
}
}
-// ---------------------------------------------------------------------
-
class SwXMLTableColContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -737,8 +732,6 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl()
{
}
-// ---------------------------------------------------------------------
-
class SwXMLTableColsContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -766,7 +759,7 @@ public:
SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
- const Reference< xml::sax::XAttributeList > & xAttrList,
+ const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
SwXMLTableContext *pTable, sal_Bool bHead ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xMyTable( pTable ),
@@ -798,8 +791,6 @@ SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
class SwXMLTableRowContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
@@ -913,7 +904,6 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
class SwXMLTableRowsContext_Impl : public SvXMLImportContext
{
@@ -943,7 +933,7 @@ public:
SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const Reference< xml::sax::XAttributeList > & xAttrList,
+ const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
SwXMLTableContext *pTable,
sal_Bool bHead ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -977,7 +967,6 @@ SvXMLImportContext *SwXMLTableRowsContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
class SwXMLDDETableContext_Impl : public SvXMLImportContext
{
@@ -1078,11 +1067,6 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode)
{
sPrefixStr = String('_');
}
-// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii())
-// {
-// sPrefixStr.Insert('_', 0);
-// }
- // else: name is OK.
// increase count until we find a name that is not yet taken
String sName;
@@ -1166,8 +1150,6 @@ SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
}
-// ---------------------------------------------------------------------
-
class TableBoxIndex
{
public:
@@ -1355,7 +1337,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const Reference< xml::sax::XAttributeList > & xAttrList,
+ const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
SwXMLTableContext *pTable ) :
XMLTextTableContext( rImport, nPrfx, rLName ),
xParentTable( pTable ),
@@ -1948,7 +1930,6 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
{
SwTableBox *pBox;
sal_uInt32 nColSpan = nRightCol - nLeftCol;
- sal_uInt32 nRowSpan = nBottomRow - nTopRow;
sal_Int32 nColWidth = GetColumnWidth( nLeftCol, nColSpan );
if( pCell->GetStartNode() )
@@ -2508,8 +2489,6 @@ void SwXMLTableContext::MakeTable()
sal_Bool bSetHoriOrient = sal_False;
sal_uInt16 nPrcWidth = 0U;
- sal_Bool bCalcWidth = sal_False;
- sal_Bool bSetWidth = sal_False;
pTableNode->GetTable().SetHeadlineRepeat( bHasHeading );
@@ -2545,6 +2524,8 @@ void SwXMLTableContext::MakeTable()
bSetHoriOrient = sal_True;
}
break;
+ default:
+ break;
}
}
else
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
index 4c6dfa2..5ae5eb9 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
@@ -138,7 +138,7 @@ SwXMLTextImportHelper::SwXMLTextImportHelper(
const Reference<XPropertySet> & rInfoSet,
sal_Bool bInsertM, sal_Bool bStylesOnlyM, sal_Bool bProgress,
sal_Bool bBlockM, sal_Bool bOrganizerM,
- sal_Bool bPreserveRedlineMode ) :
+ sal_Bool /*bPreserveRedlineMode*/ ) :
XMLTextImportHelper( rModel, rImport, bInsertM, bStylesOnlyM, bProgress,
bBlockM, bOrganizerM ),
pRedlineHelper( NULL )
@@ -199,7 +199,7 @@ SwOLENode *lcl_GetOLENode( const SwFrmFmt *pFrmFmt )
}
Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
- SvXMLImport& rImport,
+ SvXMLImport& /*rImport*/,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTblName,
commit a39ed7acd90f48e496f171e9ddb633703c5d8f93
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Dec 10 22:49:26 2010 +0100
warning fixes in binfilter bf_sw ui/app
dead code / comments removal and trivial warning fixes conerning:
unused parameter
enumeration (without all cases handled within swtich)
diff --git a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
index 6a9a5d7..a708006 100644
--- a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
namespace binfilter {
-/*M*/ void SwModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+/*M*/ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
/*M*/ {
/*M*/ if( rHint.ISA( SfxEventHint ) )
/*M*/ {
@@ -87,14 +87,6 @@ namespace binfilter {
/*M*/ SwWrtShell* pWrtSh = pDocSh ? pDocSh->GetWrtShell() : 0;
/*M*/ switch( rEvHint.GetEventId() )
/*M*/ {
-/* MA 07. Mar. 96: UpdateInputFlds() nur noch bei Dokument neu.
- (Und bei Einfuegen Textbaust.)
- case SFX_EVENT_OPENDOC:
- // dann am aktuellen Dokument die Input-Fedler updaten
- if( pWrtSh )
- pWrtSh->UpdateInputFlds();
- break;
-*/
/*M*/ case SFX_EVENT_CREATEDOC:
/*M*/ // alle FIX-Date/Time Felder auf akt. setzen
/*M*/ if( pWrtSh )
@@ -158,18 +150,13 @@ namespace binfilter {
/*M*/ }
/*M*/ }
-/* -----------------------------20.02.01 12:43--------------------------------
-
- ---------------------------------------------------------------------------*/
/*N*/ SwDBConfig* SwModule::GetDBConfig()
/*N*/ {
/*N*/ if(!pDBConfig)
/*N*/ pDBConfig = new SwDBConfig;
/*N*/ return pDBConfig;
/*N*/ }
-/* -----------------------------11.04.2002 15:27------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ ColorConfig& SwModule::GetColorConfig()
/*N*/ {
/*N*/ if(!pColorConfig)
@@ -190,9 +177,7 @@ SvtCTLOptions& SwModule::GetCTLOptions()
}
return *pCTLOptions;
}
-/*-----------------30.01.97 08.30-------------------
---------------------------------------------------*/
/*N*/ const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const
/*N*/ {
/*N*/ SwModule* pNonConstModule = (SwModule*)this;
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
index 5c85ecb..238861c 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
@@ -498,10 +498,6 @@ using namespace ::rtl;
/*N*/ sal_uInt32 nErr = ERR_SWG_READ_ERROR;
/*N*/ switch( GetCreateMode() )
/*N*/ {
-// case SFX_CREATE_MODE_INTERNAL:
-// nErr = 0;
-// break;
-
/*N*/ case SFX_CREATE_MODE_ORGANIZER:
/*?*/ if( bXML )
/*?*/ {
@@ -516,7 +512,6 @@ using namespace ::rtl;
/*?*/ else
/*?*/ {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 )
@@ -525,7 +520,6 @@ using namespace ::rtl;
// SfxProgress unterdruecken, wenn man Embedded ist
/*N*/ SW_MOD()->SetEmbeddedLoadSave( sal_True );
// kein break;
-
/*N*/ case SFX_CREATE_MODE_STANDARD:
/*N*/ case SFX_CREATE_MODE_PREVIEW:
/*N*/ {
@@ -566,11 +560,11 @@ using namespace ::rtl;
/*N*/ }
/*N*/ break;
-/*N*/ #ifdef DBG_UTIL
/*N*/ default:
+/*N*/ #ifdef DBG_UTIL
/*?*/ ASSERT( !this, "Load: new CreateMode?" );
/*N*/ #endif
-/*N*/
+/*N*/ break;
/*N*/ }
/*N*/
/*N*/ 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 46aadaf..5ebe40b 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
@@ -693,11 +693,11 @@ namespace binfilter {
/*N*/ }
/*N*/ break;
/*N*/
-/*N*/
-/*N*/ #ifdef DBG_UTIL
/*N*/ default:
+/*N*/ #ifdef DBG_UTIL
/*N*/ ASSERT(!this, "unbekannte Style-Familie");
/*N*/ #endif
+ break;
/*N*/ }
/*N*/ // Member der Basisklasse
/*N*/ pSet = &aCoreSet;
@@ -837,10 +837,11 @@ namespace binfilter {
/*N*/ }
/*N*/ break;
/*N*/
-/*N*/ #ifdef DBG_UTIL
/*N*/ default:
+/*N*/ #ifdef DBG_UTIL
/*N*/ ASSERT(!this, "unbekannte Style-Familie");
/*N*/ #endif
+ break;
/*N*/ }
/*N*/
/*N*/ if( pFmt && rSet.Count())
@@ -1013,6 +1014,8 @@ namespace binfilter {
/*N*/ if( bDeleteInfo )
/*N*/ pNumRule = 0;
/*N*/ break;
+ default:
+ break;
/*N*/ }
/*N*/
/*N*/ if( SFX_STYLE_FAMILY_CHAR == nFamily ||
@@ -1121,6 +1124,8 @@ namespace binfilter {
/*?*/ pNumRule = pRule;
/*?*/ }
/*N*/ break;
+ default:
+ break;
/*N*/ }
/*N*/ bPhysical = TRUE;
/*N*/ aCoreSet.ClearItem();
@@ -1211,14 +1216,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-
-
-/* */
-
/*--------------------------------------------------------------------
Beschreibung: Methoden fuer den DocStyleSheetPool
--------------------------------------------------------------------*/
commit 52eae310142101c92d31ff7f29d11c8158acbb2f
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Dec 10 22:31:23 2010 +0100
warning fixes in binfilter bf_sw core/doc
contains dead code / comments deletion and warning fixes of
unused parameter
enumeration (switch without handling all cases)
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 6404a99..e63866c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -347,6 +347,8 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*?*/ // zur relativen Darstellung
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pFld->ToRelBoxNm( pUpdtFld->pTbl );
/*?*/ break;
+ default:
+ break;
/*?*/ }
/*N*/ }
/*N*/ else
@@ -626,6 +628,8 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ case CRSRPOS:
/*N*/ nRet = CNTNT.pPos->nContent.GetIndex();
/*N*/ break;
+ default:
+ break;
/*N*/ }
/*N*/ return nRet;
/*N*/ }
@@ -788,15 +792,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ // aktuelle Datensatznummer schon vorher einstellen
/*N*/ SwNewDBMgr* pMgr = GetNewDBMgr();
/*N*/ pMgr->CloseAll(FALSE);
-/*
- if(pMgr && pMgr->OpenDB(DBMGR_STD, GetDBDesc(), FALSE))
- {
- if(!pMgr->IsInMerge() )
- pMgr->ToFirstSelectedRecord(DBMGR_STD);
-
- aCalc.VarChange( sDBNumNm, pMgr->GetCurSelectedRecordId(DBMGR_STD));
- }
- */
/*N*/
/*N*/ String aNew;
/*N*/ const _SetGetExpFldPtr* ppSortLst = pUpdtFlds->GetSortLst()->GetData();
@@ -807,7 +802,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ {
/*N*/ //!SECTION
/*N*/
-/*N*/ // if( pGFld->IsInBodyTxt() )
/*N*/ pSect->SetCondHidden( aCalc.Calculate(
/*N*/ pSect->GetCondition() ).GetBool() );
/*N*/ continue;
@@ -861,12 +855,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/
/*N*/ const String& rName = pFld->GetTyp()->GetName();
/*N*/
-/*N*/ // Wert fuer den Calculator setzen
-/*N*/ //JP 10.02.96: GetValue macht hier doch keinen Sinn
-/*N*/ // ((SwDBField*)pFld)->GetValue();
-/*N*/
-/*N*/ //!OK aCalc.VarChange(aName, ((SwDBField*)pFld)->GetValue(aCalc));
-/*N*/
/*N*/ // Eintrag in den HashTable eintragen
/*N*/ // Eintrag vorhanden ?
/*N*/ USHORT nPos;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 51d71af..1e2e591 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -204,6 +204,8 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ }
/*?*/ }
/*?*/ break;
+ default:
+ break;
/*?*/ }
/*N*/ return aRet;
/*N*/ }
@@ -355,6 +357,8 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*M*/ }
/*M*/ }
/*M*/ break;
+ default:
+ break;
/*M*/ }
/*M*/
/*M*/ if( bNewFrms )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 399706b..aba7cd3 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -854,7 +854,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().
/*N*/ }
/*N*/
/*N*/ //FEATURE::CONDCOLL
-/*N*/ BOOL bCheck = TRUE;
/*N*/ if( RES_CONDTXTFMTCOLL == pStt->GetFmtColl()->Which() )
/*N*/ {
/*N*/ pStt->ChkCondColl();
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index 0e856cf..44b483a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -985,7 +985,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ aLR.SetLeft( GetMetricVal( CM_1 ));
/*N*/ aLR.SetRight( GetMetricVal( CM_1 ));
/*N*/ aSet.Put( aLR );
-/*N*/ // aSet.Put( SvxAdjustItem( SVX_ADJUST_BLOCK ) );
/*N*/ SvxULSpaceItem aUL;
/*N*/ if( !pDesc )
/*N*/ aUL = pNewColl->GetULSpace();
@@ -1176,7 +1175,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/ if( pDesc )
/*M*/ {
/*M*/ pNewFmt = 0;
-/*M*/ // *pDesc = aEmptyStr; // oder den Namen ?? aNm;
/*M*/ *pDesc = aNm;
/*M*/ }
/*M*/ else
@@ -1438,7 +1436,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ if( pDesc )
/*N*/ {
/*?*/ pNewPgDsc = 0;
-/*?*/ // *pDesc = aEmptyStr; // oder den Namen ?? aNm;
/*?*/ *pDesc = aNm;
/*N*/ }
/*N*/ else
@@ -1999,12 +1996,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/
/*N*/ if( pDesc )
/*N*/ {
-/*N*/ //JP 25.02.98: wie soll die Beschreibung sein??
-/*N*/ // String aStr;
-/*N*/ // aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, aStr );
-/*N*/ // *pDesc += sKomma;
-/*N*/ // *pDesc += aStr;
-/*N*/
/*?*/ delete pNewRule, pNewRule = 0;
/*N*/ }
/*N*/
commit b79f4f549cbcd627dcdbd53ba11462181c14a102
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Dec 10 22:11:56 2010 +0100
trivial warning fix in binfilter bf_sw writer
diff --git a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
index 59c8e6f..782cb50 100644
--- a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
+++ b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
@@ -73,7 +73,7 @@ static sal_Char aNToABuf[] = "0000000000000000000000000";
/*N*/ void RemoveFontList( SwDoc& rDoc );
/*N*/ };
-/*N*/ Writer_Impl::Writer_Impl( const SwDoc& rDoc )
+/*N*/ Writer_Impl::Writer_Impl( const SwDoc& /*rDoc*/ )
/*N*/ : pSrcArr( 0 ), pDestArr( 0 ), pFontRemoveLst( 0 ), pBkmkNodePos( 0 )
/*N*/ {
/*N*/ }
@@ -192,8 +192,6 @@ static sal_Char aNToABuf[] = "0000000000000000000000000";
return pNew;
}
-/////////////////////////////////////////////////////////////////////////////
-
// Stream-spezifisches
/*N*/ #ifdef DBG_UTIL
/*N*/ SvStream& Writer::Strm()
@@ -272,7 +270,7 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
/*N*/ }
-/*N*/ ULONG Writer::Write( SwPaM& rPam, SvStorage&, const String* )
+/*N*/ ULONG Writer::Write( SwPaM& /*rPam*/, SvStorage&, const String* )
/*N*/ {
/*N*/ ASSERT( !this, "Schreiben in Storages auf einem Stream?" );
/*N*/ return ERR_SWG_WRITE_ERROR;
@@ -378,11 +376,8 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
// build a bookmark table, which is sort by the node position. The
// OtherPos of the bookmarks also inserted.
-
// search alle Bookmarks in the range and return it in the Array
-////////////////////////////////////////////////////////////////////////////
-
// Storage-spezifisches
commit d3d3e7a87ce270314d0fb3d849f1738ff081a18a
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Dec 10 21:58:25 2010 +0100
trivial warning fixes binfilter bf_sw ui/utuli
this remove dead code and compiler warning:
unused parameter
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx b/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx
index 210a2a6..ae14968 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx
@@ -49,19 +49,19 @@ namespace binfilter {
// erfrage die Attribut-Beschreibung
/*N*/ void SwAttrSet::GetPresentation(
-/*N*/ SfxItemPresentation ePres,
-/*N*/ SfxMapUnit eCoreMetric,
-/*N*/ SfxMapUnit ePresMetric,
-/*N*/ String &rText ) const
+/*N*/ SfxItemPresentation /*ePres*/,
+/*N*/ SfxMapUnit /*eCoreMetric*/,
+/*N*/ SfxMapUnit /*ePresMetric*/,
+/*N*/ String & /*rText*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char const sKomma[] = ", ";
}
/*N*/ void SwPageDesc::GetPresentation(
-/*N*/ SfxItemPresentation ePres,
-/*N*/ SfxMapUnit eCoreMetric,
-/*N*/ SfxMapUnit ePresMetric,
+/*N*/ SfxItemPresentation /*ePres*/,
+/*N*/ SfxMapUnit /*eCoreMetric*/,
+/*N*/ SfxMapUnit /*ePresMetric*/,
/*N*/ String &rText ) const
/*N*/ {
/*N*/ rText = GetName();
@@ -73,11 +73,11 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char const sKomma[] = ", ";
/*N*/ SfxItemPresentation SwFmtCharFmt::GetPresentation
/*N*/ (
-/*N*/ SfxItemPresentation ePres,
-/*N*/ SfxMapUnit eCoreUnit,
-/*N*/ SfxMapUnit ePresUnit,
-/*N*/ String& rText,
-/*N*/ const ::IntlWrapper* pIntl
+/*N*/ SfxItemPresentation /*ePres*/,
+/*N*/ SfxMapUnit /*eCoreUnit*/,
+/*N*/ SfxMapUnit /*ePresUnit*/,
+/*N*/ String& /*rText*/,
+/*N*/ const ::IntlWrapper* /*pIntl*/
/*N*/ ) const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return SFX_ITEM_PRESENTATION_NONE;
@@ -120,21 +120,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char const sKomma[] = ", ";
/*N*/ {
/*N*/ // no UI support available
/*N*/ return SfxBoolItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntl );
-/* switch ( ePres )
- {
- case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
- return SFX_ITEM_PRESENTATION_NONE;
- case SFX_ITEM_PRESENTATION_NAMELESS:
- case SFX_ITEM_PRESENTATION_COMPLETE:
- {
- USHORT nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF;
- rText = SW_RESSTR( nId );
- return ePres;
- }
- }
- return SFX_ITEM_PRESENTATION_NONE;
- */
/*N*/ }
@@ -200,43 +185,17 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char const sKomma[] = ", ";
/*M*/ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation
/*M*/ (
-/*M*/ SfxItemPresentation ePres,
-/*M*/ SfxMapUnit eCoreUnit,
-/*M*/ SfxMapUnit ePresUnit,
-/*M*/ String& rText,
-/*M*/ const ::IntlWrapper* pIntl
+/*M*/ SfxItemPresentation /*ePres*/,
+/*M*/ SfxMapUnit /*eCoreUnit*/,
+/*M*/ SfxMapUnit /*ePresUnit*/,
+/*M*/ String& /*rText*/,
+/*M*/ const ::IntlWrapper* /*pIntl*/
/*M*/ ) const
/*M*/ {
-// rText.Erase();
-// switch ( ePres )
-// {
-// case SFX_ITEM_PRESENTATION_NONE:
-// rText.Erase();
-// break;
-// case SFX_ITEM_PRESENTATION_NAMELESS:
-// case SFX_ITEM_PRESENTATION_COMPLETE:
-// {
-// if ( GetValue() )
-// rText = SW_RESSTR(STR_EDIT_IN_READONLY);
-// return ePres;
-// }
-// }
/*M*/ return SFX_ITEM_PRESENTATION_NONE;
/*M*/ }
-// ---------------------- Grafik-Attribute --------------------------
-
-
-
-
-
-
-
-
-
-
-
}
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
index 04715a5..1c7a577 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
@@ -75,7 +75,7 @@ static const USHORT nFtnLines[] = {
/*N*/ }
-/*N*/ SfxPoolItem* SwPageFtnInfoItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SwPageFtnInfoItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SwPageFtnInfoItem( *this );
/*N*/ }
@@ -88,9 +88,6 @@ static const USHORT nFtnLines[] = {
/*N*/ }
-/* -----------------------------26.04.01 12:25--------------------------------
-
- ---------------------------------------------------------------------------*/
/*N*/ bool SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/ bool bRet = true;
@@ -114,9 +111,7 @@ static const USHORT nFtnLines[] = {
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-/* -----------------------------26.04.01 12:26--------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ bool SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
/*N*/ {
/*N*/ sal_Int32 nSet32;
@@ -180,42 +175,12 @@ static const USHORT nFtnLines[] = {
/*--------------------------------------------------------------------
Beschreibung: Copy-Konstruktor
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
Beschreibung: Clonen
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
-/*-----------------12.11.97 12:55-------------------------------
- SwUINumRuleItem fuer die NumTabPages der FormatNumRule/Stylisten
+ SwUINumRuleItem fuer die NumTabPages der FormatNumRule/Stylisten
---------------------------------------------------------------*/
-
-
-
-
-
-
-/* -----------------17.06.98 17:43-------------------
- *
- * --------------------------------------------------*/
-/* -----------------17.06.98 17:44-------------------
- *
- * --------------------------------------------------*/
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7eabdb89d45a27313d44d2ce3a99e71d7c1ced02
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Dec 10 21:48:55 2010 +0100
trivial warning fixes binfilter bf_sw ui/uno
this contains trivial warning fixes and dead code / comments deletion.
Warning fixed are
unused parameter
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXFilterOptions.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXFilterOptions.cxx
index 5048783..5533cad 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXFilterOptions.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXFilterOptions.cxx
@@ -56,37 +56,27 @@ using namespace ::com::sun::star::lang;
#define SWFILTEROPTIONSOBJ_SERVICE RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilterOptionsDialog")
#define SWFILTEROPTIONSOBJ_IMPLNAME RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.FilterOptionsDialog")
#define FILTER_OPTIONS_NAME RTL_CONSTASCII_USTRINGPARAM("FilterOptions")
-/*-- 2002/06/21 11:01:23---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXFilterOptions::SwXFilterOptions() :
bExport( sal_False )
{
}
-/*-- 2002/06/21 11:01:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXFilterOptions::~SwXFilterOptions()
{
}
-/*-- 2002/06/21 11:01:24---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwXFilterOptions::getImplementationName_Static()
{
return ::rtl::OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
}
-/*-- 2002/06/21 11:01:24---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString> SwXFilterOptions::getSupportedServiceNames_Static()
{
::rtl::OUString sService(SWFILTEROPTIONSOBJ_SERVICE);
return uno::Sequence< ::rtl::OUString> (&sService, 1);
}
-/*-- 2002/06/21 11:01:25---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() throw (uno::RuntimeException)
{
uno::Sequence<beans::PropertyValue> aRet(1);
@@ -97,9 +87,7 @@ uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() thro
return aRet;
}
-/*-- 2002/06/21 11:01:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyValue >& aProps )
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
IllegalArgumentException, WrappedTargetException, uno::RuntimeException)
@@ -119,16 +107,12 @@ void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyV
rProp.Value >>= xInputStream;
}
}
-/*-- 2002/06/21 11:01:25---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXFilterOptions::setTitle( const ::rtl::OUString& aTitle )
+void SwXFilterOptions::setTitle( const ::rtl::OUString& /*aTitle*/ )
throw (uno::RuntimeException)
{
}
-/*-- 2002/06/21 11:01:25---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException)
{
sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
@@ -153,42 +137,32 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException)
return nRet;
}
-/*-- 2002/06/21 11:01:26---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFilterOptions::setTargetDocument( const uno::Reference< XComponent >& xDoc )
throw (IllegalArgumentException, uno::RuntimeException)
{
bExport = sal_False;
xModel = xDoc;
}
-/*-- 2002/06/21 11:01:26---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& xDoc )
throw (IllegalArgumentException,uno::RuntimeException)
{
bExport = sal_True;
xModel = xDoc;
}
-/*-- 2002/06/21 11:01:26---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException)
{
return ::rtl::OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
}
-/*-- 2002/06/21 11:01:27---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXFilterOptions::supportsService( const ::rtl::OUString& rServiceName )
throw(uno::RuntimeException)
{
return rServiceName == ::rtl::OUString(SWFILTEROPTIONSOBJ_SERVICE);
}
-/*-- 2002/06/21 11:01:28---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString > SwXFilterOptions::getSupportedServiceNames()
throw(uno::RuntimeException)
{
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unodefaults.cxx b/binfilter/bf_sw/source/ui/uno/sw_unodefaults.cxx
index b921e9c..791c06a 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unodefaults.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unodefaults.cxx
@@ -41,24 +41,17 @@
#include <doc.hxx>
namespace binfilter {
-/* -----------------------------13.03.01 14:16--------------------------------
-
- ---------------------------------------------------------------------------*/
SwSvxUnoDrawPool::SwSvxUnoDrawPool( SwDoc* pDoc ) throw() :
SvxUnoDrawPool(pDoc->GetDrawModel(), SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER),
m_pDoc(pDoc)
{
}
-/* -----------------------------13.03.01 14:16--------------------------------
- ---------------------------------------------------------------------------*/
SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw()
{
}
-/* -----------------------------13.03.01 14:16--------------------------------
- ---------------------------------------------------------------------------*/
-SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool bReadOnly ) throw()
+SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw()
{
if(m_pDoc)
{
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unodoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unodoc.cxx
index 341b3e6..25303b0 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unodoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unodoc.cxx
@@ -59,7 +59,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SwTextDocument_getSupportedServiceName
return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
}
-uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &rSMgr )
+uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
throw( uno::Exception )
{
SolarMutexGuard aGuard;
@@ -100,7 +100,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SwWebDocument_getSupportedServiceNames
return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WebDocument" ) );
}
-uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &rSMgr )
+uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
throw( uno::Exception )
{
SolarMutexGuard aGuard;
@@ -141,7 +141,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNa
return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.GlobalDocument" ) );
}
-uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &rSMgr )
+uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
throw( uno::Exception )
{
SolarMutexGuard aGuard;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
index 0a3eebb..dc88aaf 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
@@ -100,7 +100,7 @@ extern "C"
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName,
- uno_Environment ** ppEnv )
+ uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -119,7 +119,7 @@ void SAL_CALL lcl_uno_writeInfo(
}
sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager,
+ void * /*pServiceManager*/,
void * pRegistryKey )
{
if( pRegistryKey )
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL component_writeInfo(
void * SAL_CALL component_getFactory( const sal_Char * pImplName,
void * pServiceManager,
- void * pRegistryKey )
+ void * /*pRegistryKey*/ )
{
void * pRet = 0;
if( pServiceManager )
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
index 6b4c468..a52784a 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
@@ -191,50 +191,38 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
/******************************************************************
* SwXModule
******************************************************************/
-/* -----------------30.03.99 15:10-------------------
- *
- * --------------------------------------------------*/
+
Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(
- const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
+ const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception )
{
static Reference< uno::XInterface > xModule = (cppu::OWeakObject*)new SwXModule();;
return xModule;
}
-/* -----------------------------17.04.01 13:11--------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() throw()
{
OUString sService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalSettings"));
const Sequence< OUString > aSeq( &sService, 1 );
return aSeq;
}
-/* -----------------------------17.04.01 13:11--------------------------------
- ---------------------------------------------------------------------------*/
OUString SAL_CALL SwXModule_getImplementationName() throw()
{
return OUString( RTL_CONSTASCII_USTRINGPARAM("SwXModule" ) );
}
-/*-- 17.12.98 12:19:01---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXModule::SwXModule() :
pxViewSettings(0),
pxPrintSettings(0)
{
}
-/*-- 17.12.98 12:19:02---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXModule::~SwXModule()
{
delete pxViewSettings;
delete pxPrintSettings;
}
-/*-- 17.12.98 12:19:03---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -246,9 +234,7 @@ Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeE
}
return *pxViewSettings;
}
-/*-- 17.12.98 12:19:03---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -260,16 +246,12 @@ Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::Runtime
}
return *pxPrintSettings;
}
-/* -----------------------------06.04.00 10:59--------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXModule::getImplementationName(void) throw( RuntimeException )
{
return SwXModule_getImplementationName();
}
-/* -----------------------------06.04.00 10:59--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
const Sequence< OUString > aNames = SwXModule_getSupportedServiceNames();
@@ -280,9 +262,7 @@ sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( Runtime
}
return FALSE;
}
-/* -----------------------------06.04.00 10:59--------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SwXModule::getSupportedServiceNames(void) throw( RuntimeException )
{
return SwXModule_getSupportedServiceNames();
@@ -291,9 +271,7 @@ Sequence< OUString > SwXModule::getSupportedServiceNames(void) throw( RuntimeExc
/******************************************************************
* SwXPrintSettings
******************************************************************/
-/*-- 17.12.98 12:54:04---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
: ChainableHelperNoState ( lcl_createPrintSettingsInfo (), &Application::GetSolarMutex() )
, meType(eType)
@@ -301,9 +279,7 @@ SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
, mpDoc ( pDoc )
{
}
-/*-- 17.12.98 12:54:05---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXPrintSettings::~SwXPrintSettings()
throw()
{
@@ -539,23 +515,17 @@ void SwXPrintSettings::_postGetValues ()
{
mpPrtOpt = NULL;
}
-/* -----------------------------06.04.00 11:02--------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXPrintSettings::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXPrintSettings");
}
-/* -----------------------------06.04.00 11:02--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return C2U("com.sun.star.text.PrintSettings") == rServiceName;
}
-/* -----------------------------06.04.00 11:02--------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
@@ -564,13 +534,6 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( Run
return aRet;
}
-
-/******************************************************************
- *
- ******************************************************************/
-/*-- 18.12.98 11:01:10---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw)
: ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() )
, pView(pVw)
@@ -582,11 +545,8 @@ SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw)
// This property only exists if we have a view (ie, not at the module )
if ( !pView )
mpInfo->remove ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "HelpURL" ) ) );
-
}
-/*-- 18.12.98 11:01:10---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXViewSettings::~SwXViewSettings()
throw()
{
@@ -595,9 +555,6 @@ SwXViewSettings::~SwXViewSettings()
void SwXViewSettings::_preSetValues ()
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
{
- sal_Bool bApply = sal_True;
- sal_Bool bApplyZoom = sal_False;
-
const SwViewOption* pVOpt = 0;
pVOpt = SW_MOD()->GetViewOption(bWeb);
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 51f0fa6..57c434a 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -133,9 +133,7 @@ static cppu::ClassData27 cppu::ImplHelper27::s_aCD;
static cppu::ClassData27 cppu::WeakImplHelper27::s_aCD;
#endif
-/* -----------------------------17.01.01 15:43--------------------------------
- ---------------------------------------------------------------------------*/
#define SW_CREATE_DASH_TABLE 0x01
#define SW_CREATE_GRADIENT_TABLE 0x02
#define SW_CREATE_HATCH_TABLE 0x03
@@ -145,9 +143,6 @@ static cppu::ClassData27 cppu::WeakImplHelper27::s_aCD;
#define SW_CREATE_DRAW_DEFAULTS 0x07
-/******************************************************************************
- *
- ******************************************************************************/
SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc)
{
SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollName );
@@ -159,17 +154,13 @@ SwTxtFmtColl *lcl_GetParaStyle(const String& rCollName, SwDoc* pDoc)
}
return pColl;
}
-/* -----------------------------10.03.00 18:02--------------------------------
- ---------------------------------------------------------------------------*/
const Sequence< sal_Int8 > & SwXTextDocument::getUnoTunnelId()
{
static Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
return aSeq;
}
-/* -----------------------------10.03.00 18:04--------------------------------
- ---------------------------------------------------------------------------*/
sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rId )
throw(RuntimeException)
{
@@ -190,9 +181,7 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
}
return 0;
}
-/* -----------------------------16.03.00 14:12--------------------------------
- ---------------------------------------------------------------------------*/
Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException)
{
Any aRet = SwXTextDocumentBaseClass::queryInterface(rType);
@@ -212,30 +201,22 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run
}
return aRet;
}
-/* -----------------------------16.03.00 14:12--------------------------------
- ---------------------------------------------------------------------------*/
void SAL_CALL SwXTextDocument::acquire()throw()
{
SfxBaseModel::acquire();
}
-/* -----------------------------16.03.00 14:12--------------------------------
- ---------------------------------------------------------------------------*/
void SAL_CALL SwXTextDocument::release()throw()
{
SfxBaseModel::release();
}
-/* -----------------------------07.12.00 11:37--------------------------------
- ---------------------------------------------------------------------------*/
Reference< XAdapter > SwXTextDocument::queryAdapter( ) throw(RuntimeException)
{
return SfxBaseModel::queryAdapter();
}
-/* -----------------------------16.03.00 14:12--------------------------------
- ---------------------------------------------------------------------------*/
Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeException)
{
Sequence< uno::Type > aBaseTypes = SfxBaseModel::getTypes();
@@ -271,9 +252,7 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeExceptio
pBaseTypes[nIndex++] = ::getCppuType((Reference<lang::XMultiServiceFactory>*)0);
return aBaseTypes;
}
-/*-- 18.12.98 11:52:59---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextDocument::SwXTextDocument(SwDocShell* pShell) :
SfxBaseModel(pShell),
aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_DOCUMENT)),
@@ -303,9 +282,7 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell) :
pxXRedlines(0)
{
}
-/*-- 18.12.98 11:53:00---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextDocument::~SwXTextDocument()
{
InitNewDoc();
@@ -316,12 +293,7 @@ SwXTextDocument::~SwXTextDocument()
xNumFmtAgg = 0;
}
}
-/*-- 18.12.98 11:55:08---------------------------------------------------
- -----------------------------------------------------------------------*/
-/* -----------------18.12.98 12:49-------------------
- *
- * --------------------------------------------------*/
SwXDocumentPropertyHelper * SwXTextDocument::GetPropertyHelper ()
{
if(!xPropertyHelper.is())
@@ -365,9 +337,7 @@ void SwXTextDocument::GetNumberFormatter()
}
}
}
-/*-- 18.12.98 11:55:11---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XText > SwXTextDocument::getText(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -380,18 +350,14 @@ Reference< XText > SwXTextDocument::getText(void) throw( RuntimeException )
}
return xBodyText;
}
-/*-- 18.12.98 11:55:11---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::reformat(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
if(!IsValid())
throw RuntimeException();
}
-/*-- 18.12.98 11:55:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::lockControllers(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -403,9 +369,7 @@ void SwXTextDocument::lockControllers(void) throw( RuntimeException )
else
throw RuntimeException();
}
-/*-- 18.12.98 11:55:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::unlockControllers(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -418,32 +382,24 @@ void SwXTextDocument::unlockControllers(void) throw( RuntimeException )
else
throw RuntimeException();
}
-/*-- 18.12.98 11:55:17---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextDocument::hasControllersLocked(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
return aActionArr.Count() > 0;
}
-/*-- 18.12.98 13:12:23---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< frame::XController > SwXTextDocument::getCurrentController(void) throw( RuntimeException )
{
return Reference< frame::XController >();
}
-/*-- 18.12.98 13:12:24---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXTextDocument::setCurrentController(const Reference< frame::XController > & xController)
+void SwXTextDocument::setCurrentController(const Reference< frame::XController > & /*xController*/)
throw( NoSuchElementException, RuntimeException )
{
}
-/* -----------------27.01.99 11:48-------------------
- *
- * --------------------------------------------------*/
+
Reference< XInterface > SwXTextDocument::getCurrentSelection() throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -451,67 +407,48 @@ Reference< XInterface > SwXTextDocument::getCurrentSelection() throw( RuntimeEx
return xRef;
}
-/*-- 18.12.98 13:12:24---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextDocument::attachResource(const OUString& aURL, const Sequence< beans::PropertyValue >& aArgs)
throw( RuntimeException )
{
return SfxBaseModel::attachResource(aURL, aArgs);
}
-/*-- 18.12.98 13:12:24---------------------------------------------------
- -----------------------------------------------------------------------*/
OUString SwXTextDocument::getURL(void) throw( RuntimeException )
{
return SfxBaseModel::getURL();
}
-/*-- 18.12.98 13:12:24---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< beans::PropertyValue > SwXTextDocument::getArgs(void) throw( RuntimeException )
{
return SfxBaseModel::getArgs();
}
-/*-- 18.12.98 13:12:24---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::connectController(const Reference< frame::XController > & xController) throw( RuntimeException )
{
SfxBaseModel::connectController(xController);
}
-/*-- 18.12.98 13:12:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::disconnectController(const Reference< frame::XController > & xController) throw( RuntimeException )
{
SfxBaseModel::disconnectController(xController);
}
-/*-- 18.12.98 13:12:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::dispose(void) throw( RuntimeException )
{
SfxBaseModel::dispose();
}
-/*-- 18.12.98 13:12:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::addEventListener(const Reference< lang::XEventListener > & aListener) throw( RuntimeException )
{
SfxBaseModel::addEventListener(aListener);
}
-/*-- 18.12.98 13:12:26---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener > & aListener) throw( RuntimeException )
{
SfxBaseModel::removeEventListener(aListener);
}
-/*-- 18.12.98 11:55:19---------------------------------------------------
-
- -----------------------------------------------------------------------*/
Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties(void)
throw( RuntimeException )
{
@@ -528,9 +465,7 @@ Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties(void)
throw RuntimeException();
return *pxXLineNumberingProperties;
}
-/*-- 18.12.98 11:55:20---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules(void)
throw( RuntimeException )
{
@@ -544,9 +479,7 @@ Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules(void)
}
return *pxXChapterNumbering;
}
-/*-- 18.12.98 11:55:21---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XIndexAccess > SwXTextDocument::getFootnotes(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -559,9 +492,7 @@ Reference< XIndexAccess > SwXTextDocument::getFootnotes(void) throw( RuntimeExc
}
return *pxXFootnotes;
}
-/*-- 18.12.98 11:55:21---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XPropertySet > SAL_CALL
SwXTextDocument::getFootnoteSettings(void) throw( RuntimeException )
{
@@ -575,9 +506,7 @@ Reference< XPropertySet > SAL_CALL
}
return *pxXFootnoteSettings;
}
-/*-- 18.12.98 11:55:21---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XIndexAccess > SwXTextDocument::getEndnotes(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -590,9 +519,7 @@ Reference< XIndexAccess > SwXTextDocument::getEndnotes(void) throw( RuntimeExce
}
return *pxXEndnotes;
}
-/*-- 18.12.98 11:55:22---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XPropertySet > SwXTextDocument::getEndnoteSettings(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -605,9 +532,7 @@ Reference< XPropertySet > SwXTextDocument::getEndnoteSettings(void) throw( Runt
}
return *pxXEndnoteSettings;
}
-/*-- 18.12.98 11:55:22---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor(void)
throw( RuntimeException )
{
@@ -615,9 +540,7 @@ Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor(
Reference< util::XReplaceDescriptor > xRet = new SwXTextSearch;
return xRet;
}
-/* -----------------26.02.99 15:52-------------------
- *
- * --------------------------------------------------*/
+
SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xCrsr)
{
getText();
@@ -633,15 +556,12 @@ SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xC
SwXTextCursor::getUnoTunnelId());
}
- sal_uInt32 nResult = 0;
SwUnoCrsr* pUnoCrsr = pxUnoCrsr->GetCrsr();
pUnoCrsr->SetRemainInSection(sal_False);
return pUnoCrsr;
}
-/*-- 18.12.98 11:55:22---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > & xDesc)
throw( RuntimeException )
{
@@ -656,7 +576,6 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
const SwXTextSearch* pSearch = (const SwXTextSearch*)
xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId());
- sal_Bool bBackward = sal_False;
int eRanges(FND_IN_BODY|FND_IN_SELALL);
SearchOptions aSearchOpt;
@@ -713,9 +632,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
return (sal_Int32)nResult;
}
-/*-- 18.12.98 11:55:22---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor(void)
throw( RuntimeException )
{
@@ -781,7 +698,6 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
pRangeNode->FindFooterStartNode() ;
}
- sal_Bool bBackward = sal_False;
SearchOptions aSearchOpt;
pSearch->FillSearchOptions( aSearchOpt );
@@ -825,7 +741,6 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
else if(pSearch->bStyles)
{
SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
- //pSearch->sReplaceText
SwTxtFmtColl *pReplaceColl = 0;
BOOL bCancel;
nResult = (sal_Int32)pUnoCrsr->Find( *pSearchColl,
@@ -848,9 +763,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
}
return pUnoCrsr;
}
-/*-- 18.12.98 11:55:23---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XIndexAccess >
SwXTextDocument::findAll(const Reference< util::XSearchDescriptor > & xDesc)
throw( RuntimeException )
@@ -870,9 +783,7 @@ Reference< XIndexAccess >
delete pResultCrsr;
return xRet;
}
-/*-- 18.12.98 11:55:23---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSearchDescriptor > & xDesc)
throw( RuntimeException )
{
@@ -895,9 +806,7 @@ Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSear
}
return xRet;
}
-/*-- 18.12.98 11:55:24---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > & xStartAt,
const Reference< util::XSearchDescriptor > & xDesc)
throw( RuntimeException )
@@ -924,9 +833,7 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface >
}
return xRet;
}
-/*-- 18.12.98 11:55:24---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void)
throw( RuntimeException )
{
@@ -964,9 +871,7 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void)
throw RuntimeException();
return aSeq;
}
-/* -----------------24.02.99 10:57-------------------
- *
- * --------------------------------------------------*/
+
sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException)
{
bException = sal_False;
@@ -1006,9 +911,7 @@ sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException)
return nRet;
}
-/*-- 18.12.98 11:55:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue >& aSettings)
throw( RuntimeException )
{
@@ -1079,17 +982,13 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue
else
throw RuntimeException();
}
-/*-- 18.12.98 11:55:25---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOptions)
+void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& /*xOptions*/)
throw( IllegalArgumentException, RuntimeException )
{
throw RuntimeException();
}
-/*-- 18.12.98 11:55:25---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getReferenceMarks(void)
throw( RuntimeException )
{
@@ -1103,9 +1002,7 @@ Reference< XNameAccess > SwXTextDocument::getReferenceMarks(void)
}
return *pxXReferenceMarks;
}
-/* -----------------21.12.98 10:20-------------------
- *
- * --------------------------------------------------*/
+
Reference< XEnumerationAccess > SwXTextDocument::getTextFields(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1118,9 +1015,7 @@ Reference< XEnumerationAccess > SwXTextDocument::getTextFields(void) throw( Run
}
return *pxXTextFieldTypes;
}
-/*-- 21.12.98 10:21:12---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getTextFieldMasters(void)
throw( RuntimeException )
{
@@ -1134,9 +1029,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFieldMasters(void)
}
return *pxXTextFieldMasters;
}
-/*-- 21.12.98 10:21:12---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1149,9 +1042,7 @@ Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects(void) throw( Runti
}
return *pxXEmbeddedObjects;
}
-/*-- 21.12.98 10:21:13---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getBookmarks(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1164,9 +1055,7 @@ Reference< XNameAccess > SwXTextDocument::getBookmarks(void) throw( RuntimeExce
}
return *pxXBookmarks;
}
-/*-- 21.12.98 10:21:13---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getTextSections(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1179,9 +1068,7 @@ Reference< XNameAccess > SwXTextDocument::getTextSections(void) throw( RuntimeE
}
return *pxXTextSections;
}
-/*-- 21.12.98 10:21:13---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getTextTables(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1194,9 +1081,7 @@ Reference< XNameAccess > SwXTextDocument::getTextTables(void) throw( RuntimeExc
}
return *pxXTextTables;
}
-/*-- 21.12.98 10:21:13---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getGraphicObjects(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1209,9 +1094,7 @@ Reference< XNameAccess > SwXTextDocument::getGraphicObjects(void) throw( Runtim
}
return *pxXGraphicObjects;
}
-/*-- 21.12.98 10:21:14---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getTextFrames(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1224,9 +1107,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFrames(void) throw( RuntimeExc
}
return *pxXTextFrames;
}
-/* -----------------21.12.98 10:56-------------------
- *
- * --------------------------------------------------*/
+
Reference< XNameAccess > SwXTextDocument::getStyleFamilies(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1239,9 +1120,7 @@ Reference< XNameAccess > SwXTextDocument::getStyleFamilies(void) throw( Runtime
}
return *pxXStyleFamilies;
}
-/*-- 22.01.99 10:18:03---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1256,9 +1135,7 @@ Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage(void) throw( Runti
}
return *pxXDrawPage;
}
-/*-- 18.12.98 11:55:26---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::Invalidate()
{
bObjectValid = sal_False;
@@ -1280,9 +1157,7 @@ void SwXTextDocument::Invalidate()
pDocShell = 0;
aRefreshCont.Disposing();
}
-/* -----------------------------13.07.00 15:59--------------------------------
- ---------------------------------------------------------------------------*/
void SwXTextDocument::Reactivate(SwDocShell* pNewDocShell)
{
if(pDocShell && pDocShell != pNewDocShell)
@@ -1290,9 +1165,7 @@ void SwXTextDocument::Reactivate(SwDocShell* pNewDocShell)
pDocShell = pNewDocShell;
bObjectValid = TRUE;
}
-/*-- 18.12.98 11:55:26---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::InitNewDoc()
{
// zunaechst alle Collections invalidieren, dann Referenzen loeschen und Null setzen
@@ -1482,9 +1355,7 @@ void SwXTextDocument::InitNewDoc()
}
}
-/*-- 11.03.99 11:51:40---------------------------------------------------
- -----------------------------------------------------------------------*/
#define COM_SUN_STAR__DRAWING_LENGTH 13
Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServiceName)
throw( Exception, RuntimeException )
@@ -1564,12 +1435,10 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic
}
return xRet;
}
-/*-- 11.03.99 11:51:40---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XInterface > SwXTextDocument::createInstanceWithArguments(
const OUString& ServiceSpecifier,
- const Sequence< Any >& Arguments)
+ const Sequence< Any >& /*Arguments*/)
throw( Exception, RuntimeException )
{
Reference< XInterface > xInt = createInstance(ServiceSpecifier);
@@ -1577,9 +1446,7 @@ Reference< XInterface > SwXTextDocument::createInstanceWithArguments(
//Parameter zwingend angewiesen sind - bis jetzt haben wir das nicht
return xInt;
}
-/*-- 11.03.99 11:51:41---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< OUString > SwXTextDocument::getAvailableServiceNames(void)
throw( RuntimeException )
{
@@ -1588,16 +1455,12 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames(void)
return SvxFmMSFactory::concatServiceNames(aRet, aOwn);
}
-/* -----------------18.03.99 11:36-------------------
- *
- * --------------------------------------------------*/
+
OUString SwXTextDocument::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXTextDocument");
}
-/* -----------------18.03.99 11:32-------------------
- *
- * --------------------------------------------------*/
+
sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
BOOL bWebDoc = 0 != PTR_CAST(SwWebDocShell, pDocShell);
@@ -1623,9 +1486,7 @@ sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( R
return bRet;
}
-/* -----------------18.03.99 11:32-------------------
- *
- * --------------------------------------------------*/
+
Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( RuntimeException )
{
BOOL bWebDoc = 0 != PTR_CAST(SwWebDocShell, pDocShell);
@@ -1647,9 +1508,7 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt
return aRet;
}
-/* -----------------05.05.99 12:10-------------------
- *
- * --------------------------------------------------*/
+
Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1663,17 +1522,12 @@ Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes(void) throw( Runt
return *pxXDocumentIndexes;
}
-/*-- 10.05.99 13:58:58---------------------------------------------------
-
- -----------------------------------------------------------------------*/
Reference< XPropertySetInfo > SwXTextDocument::getPropertySetInfo(void) throw( RuntimeException )
{
static Reference< XPropertySetInfo > xRet = aPropSet.getPropertySetInfo();
return xRet;
}
-/*-- 10.05.99 13:58:58---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
const Any& aValue)
throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
@@ -1823,9 +1677,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
}
}
}
-/*-- 10.05.99 13:58:59---------------------------------------------------
- -----------------------------------------------------------------------*/
Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
@@ -1953,45 +1805,35 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
}
return aAny;
}
-/*-- 10.05.99 13:58:59---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXTextDocument::addPropertyChangeListener(const OUString& PropertyName,
- const Reference< XPropertyChangeListener > & aListener)
+void SwXTextDocument::addPropertyChangeListener(const OUString& /*PropertyName*/,
+ const Reference< XPropertyChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 10.05.99 13:58:59---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXTextDocument::removePropertyChangeListener(const OUString& PropertyName,
- const Reference< XPropertyChangeListener > & aListener)
+void SwXTextDocument::removePropertyChangeListener(const OUString& /*PropertyName*/,
+ const Reference< XPropertyChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 10.05.99 13:59:00---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXTextDocument::addVetoableChangeListener(const OUString& PropertyName,
- const Reference< XVetoableChangeListener > & aListener)
+void SwXTextDocument::addVetoableChangeListener(const OUString& /*PropertyName*/,
+ const Reference< XVetoableChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 10.05.99 13:59:00---------------------------------------------------
- -----------------------------------------------------------------------*/
-void SwXTextDocument::removeVetoableChangeListener(const OUString& PropertyName,
- const Reference< XVetoableChangeListener > & aListener)
+void SwXTextDocument::removeVetoableChangeListener(const OUString& /*PropertyName*/,
+ const Reference< XVetoableChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
DBG_WARNING("not implemented");
}
-/* -----------------25.10.99 10:42-------------------
- --------------------------------------------------*/
Reference< XNameAccess > SwXTextDocument::getLinks(void) throw( RuntimeException )
{
if(!pxLinkTargetSupplier)
@@ -2001,9 +1843,7 @@ Reference< XNameAccess > SwXTextDocument::getLinks(void) throw( RuntimeExceptio
}
return (*pxLinkTargetSupplier);
}
-/* -----------------------------11.01.01 15:01--------------------------------
- ---------------------------------------------------------------------------*/
Reference< XEnumerationAccess > SwXTextDocument::getRedlines( ) throw(RuntimeException)
{
if(!pxXRedlines)
@@ -2013,9 +1853,7 @@ Reference< XEnumerationAccess > SwXTextDocument::getRedlines( ) throw(RuntimeEx
}
return *pxXRedlines;
}
-/*-- 21.02.00 08:41:06---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::refresh(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -2026,9 +1864,7 @@ void SwXTextDocument::refresh(void) throw( RuntimeException )
if(pWrtShell)
pWrtShell->CalcLayout();
}
-/*-- 21.02.00 08:41:06---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::addRefreshListener(const Reference< util::XRefreshListener > & l)
throw( RuntimeException )
{
@@ -2037,9 +1873,7 @@ void SwXTextDocument::addRefreshListener(const Reference< util::XRefreshListener
throw RuntimeException();
aRefreshCont.AddListener ( reinterpret_cast < const Reference < lang::XEventListener > &> ( l ));
}
-/*-- 21.02.00 08:41:07---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextDocument::removeRefreshListener(const Reference< util::XRefreshListener > & l)
throw( RuntimeException )
{
@@ -2047,9 +1881,7 @@ void SwXTextDocument::removeRefreshListener(const Reference< util::XRefreshListe
if ( !IsValid() || !aRefreshCont.RemoveListener ( reinterpret_cast < const Reference < lang::XEventListener > &> ( l ) ) )
throw RuntimeException();
}
-/* -----------------------------26.02.01 12:22--------------------------------
- ---------------------------------------------------------------------------*/
void SwXTextDocument::updateLinks( ) throw(RuntimeException)
{
SolarMutexGuard aGuard;
@@ -2128,9 +1960,7 @@ Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName
}
return aAny;
}
-/* -----------------------------23.08.02 16:00--------------------------------
- ---------------------------------------------------------------------------*/
/*
* GetRenderDoc:
* returns the document to be rendered, usually this will be the 'regular'
@@ -2152,12 +1982,10 @@ SwDoc* SwXTextDocument::GetRenderDoc( const uno::Any& rSelection )
DBG_BF_ASSERT(0, "STRIP");
return pDoc;
}
-/* -----------------------------23.08.02 16:00--------------------------------
- ---------------------------------------------------------------------------*/
sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
const uno::Any& rSelection,
- const uno::Sequence< beans::PropertyValue >& rxOptions )
+ const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
throw (IllegalArgumentException, RuntimeException)
{
SolarMutexGuard aGuard;
@@ -2183,13 +2011,11 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
return pDoc->GetPageCount();
}
-/* -----------------------------23.08.02 16:00--------------------------------
- ---------------------------------------------------------------------------*/
uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
sal_Int32 nRenderer,
const uno::Any& rSelection,
- const uno::Sequence< beans::PropertyValue >& rxOptions )
+ const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
throw (IllegalArgumentException, RuntimeException)
{
SolarMutexGuard aGuard;
@@ -2219,12 +2045,11 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
return aRenderer;
}
-/* -----------------------------28.10.02 16:00--------------------------------
- ---------------------------------------------------------------------------*/
+
void SAL_CALL SwXTextDocument::render(
sal_Int32 nRenderer,
const uno::Any& rSelection,
- const uno::Sequence< beans::PropertyValue >& rxOptions )
+ const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
throw (IllegalArgumentException, RuntimeException)
{
SolarMutexGuard aGuard;
@@ -2237,30 +2062,24 @@ void SAL_CALL SwXTextDocument::render(
// due to #110067# (document page count changes sometimes during
// PDF export/printing) we can not check for the upper bound properly.
// Thus instead of throwing the exception we silently return.
- if (!(0 <= nRenderer /* && nRenderer < pDoc->GetPageCount()*/))
+ if ( !(0 <= nRenderer) )
throw IllegalArgumentException();
if (nRenderer >= pDoc->GetPageCount())
return;
DBG_BF_ASSERT(0, "STRIP");
}
-/* -----------------------------20.06.00 09:54--------------------------------
- ---------------------------------------------------------------------------*/
void * SAL_CALL SwXTextDocument::operator new( size_t t) throw()
{
return SwXTextDocumentBaseClass::operator new(t);
}
-/* -----------------------------20.06.00 09:54--------------------------------
- ---------------------------------------------------------------------------*/
void SAL_CALL SwXTextDocument::operator delete( void * p) throw()
{
SwXTextDocumentBaseClass::operator delete(p);
}
-/* -----------------25.10.99 11:06-------------------
- --------------------------------------------------*/
SwXLinkTargetSupplier::SwXLinkTargetSupplier(SwXTextDocument& rxDoc) :
pxDoc(&rxDoc)
{
@@ -2272,16 +2091,11 @@ SwXLinkTargetSupplier::SwXLinkTargetSupplier(SwXTextDocument& rxDoc) :
sOutlines = String(SW_RES(STR_CONTENT_TYPE_OUTLINE));
sBookmarks = String(SW_RES(STR_CONTENT_TYPE_BOOKMARK));
}
-/* -----------------25.10.99 11:11-------------------
- --------------------------------------------------*/
SwXLinkTargetSupplier::~SwXLinkTargetSupplier()
{
}
-/*-- 25.10.99 11:12:45---------------------------------------------------
-
- -----------------------------------------------------------------------*/
Any SwXLinkTargetSupplier::getByName(const OUString& rName)
throw( NoSuchElementException, WrappedTargetException, RuntimeException )
{
@@ -2315,14 +2129,6 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0));
}
-/* else if(sToCompare == )
- {
- sSuffix += UniString::CreateFromAscii(pMarkToText);
- Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
- pxDoc->, sSuffix );
- Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
- aRet.setValue(&xRet, ::getCppuType((const XPropertySet*)0));
- }*/
else if(sToCompare == sGraphics)
{
sSuffix += UniString::CreateFromAscii(pMarkToGraphic);
@@ -2359,9 +2165,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
throw NoSuchElementException();
return aRet;
}
-/*-- 25.10.99 11:12:46---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< OUString > SwXLinkTargetSupplier::getElementNames(void)
throw( RuntimeException )
{
@@ -2376,9 +2180,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getElementNames(void)
pNames[6] = sBookmarks;
return aRet;
}
-/*-- 25.10.99 11:12:46---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName)
throw( RuntimeException )
{
@@ -2393,40 +2195,30 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName)
return sal_True;
return sal_False;
}
-/*-- 25.10.99 11:12:47---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Type SwXLinkTargetSupplier::getElementType(void)
throw( RuntimeException )
{
return ::getCppuType((Reference< XPropertySet>*)0);
}
-/*-- 25.10.99 11:12:47---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXLinkTargetSupplier::hasElements(void) throw( RuntimeException )
{
return 0 != pxDoc;
}
-/*-- 25.10.99 11:12:47---------------------------------------------------
- -----------------------------------------------------------------------*/
OUString SwXLinkTargetSupplier::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXLinkTargetSupplier");
}
-/*-- 25.10.99 11:12:48---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXLinkTargetSupplier::supportsService(const OUString& rServiceName)
throw( RuntimeException )
{
return (rServiceName == C2U("com.sun.star.document.LinkTargets"));
}
-/*-- 25.10.99 11:12:48---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void)
throw( RuntimeException )
{
@@ -2436,9 +2228,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void)
return aRet;
}
-/*-- 26.10.99 09:16:23---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list