[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 22 03:52:39 PST 2010
binfilter/bf_sc/source/core/data/sc_cell.cxx | 10
binfilter/bf_sc/source/core/data/sc_column.cxx | 14
binfilter/bf_sc/source/core/data/sc_column2.cxx | 6
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 5
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 13
binfilter/bf_sc/source/core/tool/sc_addinlis.cxx | 14
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 25 -
binfilter/bf_sc/source/core/tool/sc_chartarr.cxx | 32 -
binfilter/bf_sc/source/core/tool/sc_interpr3.cxx | 13
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 17
binfilter/bf_sc/source/core/tool/sc_interpr6.cxx | 69 ---
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 11
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 7
binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx | 7
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 13
binfilter/bf_sch/source/core/sch_memchrt.cxx | 27 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 27 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 37 -
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 14
binfilter/bf_so3/source/misc/factory.cxx | 28 -
binfilter/bf_starmath/source/starmath_document.cxx | 28 -
binfilter/bf_starmath/source/starmath_mathml.cxx | 59 --
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 14
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 67 ---
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 14
binfilter/bf_svtools/source/notify/svt_brdcst.cxx | 10
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 34 -
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 4
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 25 -
binfilter/bf_svtools/source/numbers/svt_zforscan.cxx | 8
binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx | 208 ----------
binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx | 43 --
binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx | 27 -
binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx | 14
binfilter/bf_svx/source/editeng/svx_txtrange.cxx | 18
binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx | 2
binfilter/bf_sw/source/core/crsr/sw_splcstk.cxx | 8
binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx | 76 ---
binfilter/bf_sw/source/core/inc/splcstk.hxx | 7
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 39 -
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx | 23 -
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 11
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 6
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 26 -
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 8
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 27 -
binfilter/bf_sw/source/core/view/sw_viewimp.cxx | 42 --
binfilter/bf_sw/source/filter/excel/excxfbuf.hxx | 6
binfilter/bf_sw/source/filter/excel/sw_exctools.cxx | 22 -
binfilter/bf_sw/source/filter/inc/fltini.hxx | 17
binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx | 21 -
binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx | 12
binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx | 40 -
binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx | 13
binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx | 33 -
binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx | 23 -
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 26 -
binfilter/bf_sw/source/ui/inc/swmn.hrc | 64 ---
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 115 -----
binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx | 20
binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx | 75 ---
binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx | 50 --
binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx | 12
binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx | 26 -
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 63 ---
binfilter/inc/bf_sc/compiler.hxx | 9
binfilter/inc/bf_sc/global.hxx | 19
binfilter/inc/bf_svtools/filter.hxx | 4
binfilter/inc/bf_svtools/zforlist.hxx | 5
binfilter/inc/bf_sw/swtypes.hxx | 8
70 files changed, 28 insertions(+), 1892 deletions(-)
New commits:
commit b82b002da80fbddd580881b86dda2d8302ed9093
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 22 11:52:16 2010 +0000
Remove some #if 0 code blocks--author= Kevin Hunter <hunteke at earlham.edu>
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 3c9582f..36123aa 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -5650,13 +5650,6 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
ScCellFieldObj* pCellField = ScCellFieldObj::getImplementation( xContent );
SvxUnoTextRangeBase* pTextRange = ScCellTextCursor::getImplementation( xRange );
-#if 0
- if (!pTextRange)
- pTextRange = SvxUnoTextRangeBase::getImplementation( xRange );
-
- //! bei SvxUnoTextRange testen, ob in passendem Objekt !!!
-#endif
-
if ( pCellField && !pCellField->IsInserted() && pTextRange )
{
SvxEditSource* pEditSource = pTextRange->GetEditSource();
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx
index fdd9b0c..0c05c30 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx
@@ -515,13 +515,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
SvxUnoTextRangeBase* pTextRange =
ScHeaderFooterTextCursor::getImplementation( xRange );
-#if 0
- if (!pTextRange)
- pTextRange = (SvxUnoTextRange*)xRange->getImplementation(
- SvxUnoTextRange_getReflection() );
- //! bei SvxUnoTextRange testen, ob in passendem Objekt !!!
-#endif
-
if ( pHeaderField && !pHeaderField->IsInserted() && pTextRange )
{
SvxEditSource* pEditSource = pTextRange->GetEditSource();
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index f612d26..fcb9582 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -1400,19 +1400,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/ {
/*N*/ CHART_TRACE( "ChartModel::GetAttr( long nObjId, SfxItemSet& rAttr)" );
/*N*/
-/*N*/ #if 0
-/*N*/ SdrObject* pObj=NULL;
-/*N*/
-/*N*/ //Objektattribute aus der Seite holen
-/*N*/ //aber keine indizierten Objekte auf diese Weise suchen !
-/*N*/ if(nIndex1==-1)
-/*N*/ {
-/*N*/ pObj=(GetObjWithId ((USHORT)nObjId,*GetPage(0),0,IM_DEEPWITHGROUPS));
-/*N*/ if(pObj)
-/*N*/ rAttr.Put(pObj->GetItemSet());
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ // items at model (and axis object)
/*N*/ switch( nObjId )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index cf3b9e6..d397560 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -1320,22 +1320,6 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ aChartRange.mbFirstRowContainsLabels = ( aOpt.GetChar(0) != '0' );
/*N*/ aChartRange.mbFirstColumnContainsLabels = ( aOpt.GetChar(1) != '0' );
- #if 0
- /* Calc internal data
- if ( aOpt.Len() >= 3 )
- {
- if ( bNewChart )
- {
- bDummyUpperLeft = ( aOpt.GetChar(2) != '0' );
- xub_StrLen nInd = 4; // 111;
- eGlue = (ScChartGlue) aOpt.GetToken( 0, cTok, nInd ).ToInt32();
- nStartCol = (USHORT) aOpt.GetToken( 0, cTok, nInd ).ToInt32();
- nStartRow = (USHORT) aOpt.GetToken( 0, cTok, nInd ).ToInt32();
- bInitOk = TRUE;
- }
- }
- */
- #endif
/*N*/ }
/*N*/ else
/*N*/ {
@@ -1384,17 +1368,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ String aFlags = rChartRange.mbFirstRowContainsLabels ? '1' : '0';
/*N*/ aFlags += rChartRange.mbFirstColumnContainsLabels ? '1' : '0';
- #if 0
- /* these can't be stored, automatically recalculated after load by old versions
- aFlags += bDummyUpperLeft ? '1' : '0';
- aFlags += cTok;
- aFlags += String::CreateFromInt32( eGlue );
- aFlags += cTok;
- aFlags += String::CreateFromInt32( nStartCol );
- aFlags += cTok;
- aFlags += String::CreateFromInt32( nStartRow );
- */
- #endif
/*N*/
/*N*/ SomeData1() = aRef;
/*N*/ SomeData2() = aFlags;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index a8e6a97..fc7bb0d 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -832,16 +832,6 @@ uno::Sequence< uno::Any > SAL_CALL ChXChartObject::getPropertyValues (
const uno::Sequence< ::rtl::OUString >& aPropertyNames )
throw ( uno::RuntimeException)
{
-#if 0
- uno::Sequence<uno::Any> aResult (aPropertyNames.getLength());
-
- for (sal_Int32 i=0; i<aPropertyNames.getLength(); i++)
- {
- aResult[i] = getPropertyValue (aPropertyNames[i]);
- }
-
- return aResult;
-#endif
SolarMutexGuard aGuard;
// This sequence is filled with the requested values for the given property names.
@@ -982,22 +972,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL ChXChartObject::getPropertyStates
throw( beans::UnknownPropertyException,
uno::RuntimeException )
{
-#if 0
- SolarMutexGuard aGuard;
-
- const sal_Int32 nCount = aPropertyNames.getLength();
- const ::rtl::OUString * pName = aPropertyNames.getConstArray();
- Sequence<PropertyState > aStates (nCount);
- PropertyState * pState = aStates.getArray();
-
- if (mpModel == NULL)
- return aStates;
-
- for (sal_Int32 nIdx = 0; nIdx < nCount; nIdx++)
- pState[nIdx] = getPropertyState (pName[nIdx]);
-
- return aStates;
-#else
SolarMutexGuard aGuard;
// Get pointers to first elements of lists.
@@ -1091,7 +1065,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL ChXChartObject::getPropertyStates
}
return aStates;
-#endif
}
void SAL_CALL ChXChartObject::setPropertyToDefault( const ::rtl::OUString& PropertyName )
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index e115720..0606e39 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -1337,14 +1337,6 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT (context, "sch (af119097) ::ChXDiagram::getPropertyValues");
-#if 0
- uno::Sequence<uno::Any> aResult (aPropertyNames.getLength());
-
- for (sal_Int32 i=0; i<aPropertyNames.getLength(); i++)
- aResult[i] = getPropertyValue (aPropertyNames[i]);
-
- return aResult;
-#else
SolarMutexGuard aGuard;
// This sequence is filled with the requested values for the given property names.
@@ -1371,7 +1363,6 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
CHATTR_TMP_START, CHATTR_TMP_END,
0);
- // if( nWID == SCHATTR_SYMBOL_BRUSH )
mpModel->GetDataRowAttrAll (aAttributes);
// else
ChartType aType (mpModel);
@@ -1507,16 +1498,6 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
sName.GetBuffer(), nWID);
#endif
}
-
-#if 0
- // Compare to result of original getPropertyValue.
- // Used only for debugging.
- if (*pPropertyValue != getPropertyValue (*pPropertyName))
- {
- DBG_ERROR1 ("ChXDiagram::getPropertyValues : values differ for nWID %d",
- nWID);
- }
-#endif
// Advance to the next property, property name and value.
pPropertyName++;
@@ -1529,7 +1510,6 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
static_cast< ::cppu::OWeakObject*>(this));
return aResult;
-#endif
}
@@ -1708,22 +1688,6 @@ Sequence<PropertyState> SAL_CALL ChXDiagram::getPropertyStates (
uno::RuntimeException)
{
SolarMutexGuard aGuard;
-
-#if 0
- // Old implementation.
-
- const sal_Int32 nCount = aPropertyName.getLength();
- const ::rtl::OUString* pNames = aPropertyName.getConstArray();
-
- uno::Sequence< beans::PropertyState > aRet( nCount );
- beans::PropertyState* pState = aRet.getArray();
-
- for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ )
- pState[ nIdx ] = getPropertyState( pNames[ nIdx ] );
-
- return aRet;
-
-#else
// New implementation.
@@ -1839,7 +1803,6 @@ Sequence<PropertyState> SAL_CALL ChXDiagram::getPropertyStates (
static_cast< ::cppu::OWeakObject*>(this));
return aPropertyStates;
-#endif
}
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index fbcc61a..2f1ea87 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -369,20 +369,6 @@ using namespace ::com::sun::star::uno;
/*N*/ pImp->nTime = aNow;
/*N*/ rInfo.IncDocumentNumber();
/*N*/ //! DocumentNummer
-/*N*/ #if 0
-/*N*/ const String aDocNo(rInfo.GetUserKey(0).GetWord());
-/*N*/ const String aTitle(rInfo.GetUserKey(0).GetTitle());
-/*N*/ USHORT nNo = 1;
-/*N*/ if ( aDocNo.Len() )
-/*N*/ {
-/*N*/ nNo = (USHORT)aDocNo;
-/*N*/ if(nNo)
-/*N*/ ++nNo;
-/*N*/ else
-/*N*/ nNo = 1;
-/*N*/ }
-/*N*/ rInfo.SetUserKey(SfxDocUserKey(aTitle, nNo), 0);
-/*N*/ #endif
/*N*/ return rInfo;
/*N*/ }
diff --git a/binfilter/bf_so3/source/misc/factory.cxx b/binfilter/bf_so3/source/misc/factory.cxx
index 54d3c6f..e58c384 100644
--- a/binfilter/bf_so3/source/misc/factory.cxx
+++ b/binfilter/bf_so3/source/misc/factory.cxx
@@ -600,34 +600,6 @@ ConvertTo_Impl (* SetupConvertTable_Impl( USHORT * pCount )) [SO3_OFFICE_VERSION
SOT_FORMATSTR_ID_STARWRITERGLOB_60
);
-#if 0
- // obselete, because Image has been removed
- pSoApp->pConvTable[2][0] = ConvertTo_Impl
- (// StarImage 3.0
- SvGlobalName( 0xEA60C941L, 0x2C6C, 0x101C, 0x8E, 0x2C, 0x00, 0x00, 0x1B, 0x4C, 0xC7, 0x11 ),
- SOT_FORMATSTR_ID_STARIMAGE
- );
- pSoApp->pConvTable[2][1] = ConvertTo_Impl
- (// StarImage 4.0
- SvGlobalName( 0x447BB8A0L, 0x41FB, 0x11D0, 0x89, 0xCA, 0x00, 0x80, 0x29, 0xE4, 0xB0, 0xB1 ),
- SOT_FORMATSTR_ID_STARIMAGE_40
- );
- pSoApp->pConvTable[2][2] = ConvertTo_Impl
- (// StarImage 5.0
- SvGlobalName( SO3_SIM_CLASSID_50 ),
- SOT_FORMATSTR_ID_STARIMAGE_50
- );
- pSoApp->pConvTable[2][3] = ConvertTo_Impl
- (// StarImage 5.0
- SvGlobalName( SO3_SIM_CLASSID ),
- SOT_FORMATSTR_ID_STARIMAGE_50
- );
- pSoApp->pConvTable[2][4] = ConvertTo_Impl
- (// StarImage 5.0
- SvGlobalName( SO3_SIM_CLASSID ),
- SOT_FORMATSTR_ID_STARIMAGE_50
- );
-#endif
}
*pCount = pSoApp->nConvTableEntries;
return pSoApp->pConvTable;
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index 1562f4f..8f0f2d5 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -432,17 +432,6 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
/*N*/ {
/*N*/ bRet = TRUE;
/*N*/ SetVisArea(Rectangle(Point(0, 0), Size(2000, 1000)));
-/*N*/ #if 0
-/*N*/ if (pStor)
-/*N*/ {
-/*N*/ aDocStream = pStor->OpenStream(String::CreateFromAscii(pStarMathDoc));
-/*N*/ aDocStream->SetVersion (pStor->GetVersion ());
-/*N*/ GetPool().SetFileFormatVersion(USHORT(pStor->GetVersion()));
-/*N*/
-/*N*/ if (! aDocStream )
-/*N*/ bRet = FALSE;
-/*N*/ }
-/*N*/ #endif
/*N*/ }
/*N*/ return bRet;
/*N*/ }
@@ -617,17 +606,6 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
/*N*/ {
/*N*/ if( SfxInPlaceObject::SaveCompleted( pStor ))
/*N*/ {
-/*N*/ #if 0
-/*N*/ if (! pStor)
-/*N*/ return TRUE;
-/*N*/
-/*N*/ aDocStream = pStor->OpenStream(String::CreateFromAscii(pStarMathDoc));
-/*N*/ aDocStream->SetVersion (pStor->GetVersion ());
-/*N*/ GetPool().SetFileFormatVersion(USHORT(pStor->GetVersion()));
-/*N*/ aDocStream->SetBufferSize(DOCUMENT_BUFFER_SIZE);
-/*N*/ aDocStream->SetKey( pStor->GetKey() ); // Passwort setzen
-/*N*/ return aDocStream.Is();
-/*N*/ #endif
/*N*/ return TRUE;
/*N*/ }
/*N*/ return FALSE;
@@ -640,9 +618,6 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
/*N*/ void SmDocShell::HandsOff()
/*N*/ {
/*N*/ SfxInPlaceObject::HandsOff();
-/*N*/ #if 0
-/*N*/ aDocStream.Clear();
-/*N*/ #endif
/*N*/ }
@@ -755,9 +730,6 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
/*N*/ }
/*N*/
/*N*/ bRet = TRUE;
-/*N*/ #if 0
-/*N*/ aDocStream = aTempStream;
-/*N*/ #endif
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 106f014..b084a3e 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -2015,12 +2015,6 @@ void SmXMLUnderContext_Impl::EndElement()
GenericEndElement(TCSUB,CSUB);
else
HandleAccent();
-#if 0
- //UnderBrace trick
- SmStructureNode *pNode = rNodeStack.Pop();
- if (pNode->GetSubNode(1)->GetToken().cMathChar == (0x0332|0xf000))
- if (pNode->GetSubNode(0)->GetToken().cMathChar == (0x0332|0xf000))
-#endif
}
class SmXMLOverContext_Impl : public SmXMLSubContext_Impl
@@ -3462,25 +3456,9 @@ void SmXMLExport::ExportExpression(const SmNode *pNode,int nLevel)
pRow = new SvXMLElementExport(*this,XML_NAMESPACE_MATH,sXML_mrow,
sal_True, sal_True);
- //if (nSize)
- //{
for (USHORT i = 0; i < nSize; i++)
if (const SmNode *pTemp = pNode->GetSubNode(i))
ExportNodes(pTemp,nLevel+1);
- //}
-#if 0
- else
- {
- //This saves us from situations like "a newline" where the
- //lack of a term following the newline would otherwise create
- //a incorrect token like <mtr/>
- SvXMLElementExport aDummy(*this,XML_NAMESPACE_MATH,sXML_mi,
- sal_True,sal_True);
- sal_Unicode nArse[2] = {'\n','\0'};
- GetDocHandler()->characters(nArse);
- }
-#endif
-
delete pRow;
}
@@ -3790,14 +3768,6 @@ void SmXMLExport::ExportOperator(const SmNode *pNode, int nLevel)
{
/*we need to either use content or font and size attributes
*here*/
-#if 0
- {
- SvXMLElementExport aMath(*this,XML_NAMESPACE_MATH,sXML_mo,
- sal_True,sal_False);
- SmTextNode *pTemp = (SmTextNode *)pNode->GetSubNode(0);
- GetDocHandler()->characters(pTemp->GetText());
- }
-#endif
SvXMLElementExport aRow(*this,XML_NAMESPACE_MATH,sXML_mrow,
sal_True, sal_True);
ExportNodes(pNode->GetSubNode(0),nLevel+1);
@@ -3831,12 +3801,7 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel)
//proper entity support required
SvXMLElementExport aMath(*this,XML_NAMESPACE_MATH,sXML_mo,
sal_True,sal_False);
-#if 0
- GetDocHandler()->characters(
- OUString(RTL_CONSTASCII_USTRINGPARAM("&overbar;")));
-#else
sal_Unicode nArse[2] = {0xAF,0x00};
-#endif
GetDocHandler()->characters(nArse);
}
break;
@@ -3845,12 +3810,7 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel)
//proper entity support required
SvXMLElementExport aMath(*this,XML_NAMESPACE_MATH,sXML_mo,
sal_True,sal_False);
-#if 0
- GetDocHandler()->characters(
- OUString(RTL_CONSTASCII_USTRINGPARAM("&underbar;")));
-#else
sal_Unicode nArse[2] = {0x0332,0x00};
-#endif
GetDocHandler()->characters(nArse);
}
break;
@@ -3985,23 +3945,12 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)
default:
break;
}
-#if 0
- if (pNode->GetNumSubNodes() > 1) //or in the future is a node that
- //cannot take the currently supported
- //properties
-#endif
+
//for now we will just always export with a style and not worry about
//anyone else for the moment.
- {
- //wrap a style around it
- SvXMLElementExport aStyle(*this,XML_NAMESPACE_MATH,
- sXML_mstyle, sal_True,sal_True);
- ExportExpression(pNode,nLevel);
- }
-#if 0
- else
- ExportNodes(pNode->GetSubNode(0),nLevel+1);
-#endif
+ //wrap a style around it
+ SvXMLElementExport aStyle(*this,XML_NAMESPACE_MATH, sXML_mstyle, sal_True,sal_True);
+ ExportExpression(pNode,nLevel);
delete pElement;
}
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index 68c4299..0092b62 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -268,20 +268,6 @@ static VarNameAttribute aVarNameAttribute[] =
{ SUBSTITUTE_PATH, VAR_NEEDS_SYSTEM_PATH }, // $(path)
};
-#if 0
-// currently unused
-static Sequence< OUString > GetPathPropertyNames()
-{
- const int nCount = sizeof( aPropNames ) / sizeof( PropertyStruct );
- Sequence< OUString > aNames( nCount );
- OUString* pNames = aNames.getArray();
- for ( int i = 0; i < nCount; i++ )
- pNames[i] = OUString::createFromAscii( aPropNames[i].pPropName );
-
- return aNames;
-}
-#endif
-
// class SvtPathOptions_Impl ---------------------------------------------
const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath )
diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
index 706309b..6cb93cd 100644
--- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
@@ -1979,73 +1979,6 @@ void SfxItemSet::DisableItem(USHORT nWhich)
// -----------------------------------------------------------------------
-#if 0
-BOOL SfxAllItemSet::Remove(USHORT nWhich)
-{
- DBG_CHKTHIS(SfxAllItemSet, 0);
- USHORT *pPtr = _pWhichRanges;
- USHORT nPos = 0;
- while( *pPtr )
- {
- if( *pPtr <= nWhich && nWhich <= *(pPtr+1) )
- {
- USHORT *pTmp = pPtr;
- USHORT nLeft = 0;
- USHORT nRest = 0;
- while(*++pTmp){
- if( nLeft & 1 )
- nRest = *pTmp - *(pTmp-1) + 1;
- ++nLeft;
- }
-
- // in diesem Bereich
- nPos += nWhich - *pPtr;
- nRest -= nWhich - *pPtr;
- // 3,3
- if(*pPtr == nWhich && *(pPtr+1) == nWhich) {
- memmove(pPtr, pPtr + 2, nLeft * sizeof(USHORT));
- nFree += 2;
- }
- // Anfang
- else if(*pPtr == nWhich)
- (*pPtr)++;
- // Ende
- else if(*(pPtr+1) == nWhich)
- (*(pPtr+1))--;
- else {
- if(nPos + nRest + 2 > nFree) {
- USHORT nOf = pPtr - _pWhichRanges;
- _pWhichRanges = IncrSize(_pWhichRanges, nPos + nRest, nInitCount);
- nFree += nInitCount;
- pPtr = _pWhichRanges + nOf;
- }
- memmove(pPtr +2, pPtr, (nLeft+2) * sizeof(USHORT));
- *++pPtr = nWhich-1;
- *++pPtr = nWhich+1;
- nFree -= 2;
- }
- SfxPoolItem* pItem = *( _aItems + nPos );
- if( pItem )
- {
- if(_pPool)
- _pPool->Remove(*pItem );
- else
- delete pItem;
- --_nCount;
- }
- memmove(_aItems + nPos +1, _aItems + nPos,
- sizeof(SfxPoolItem *) * (nRest - 1));
- break; // dann beim Parent suchen
- }
- nPos += *(pPtr+1) - *pPtr + 1;
- pPtr += 2;
- }
- return *pPtr? TRUE: FALSE;
-}
-#endif
-
-// -----------------------------------------------------------------------
-
SfxItemSet *SfxAllItemSet::Clone(BOOL bItems, SfxItemPool *pToPool ) const
{
DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
index 634e5a8..ad1b4d5 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
@@ -375,20 +375,6 @@ int SfxPoolItem::HasMetrics() const
}
// -----------------------------------------------------------------------
-#if 0 /* @@@ NOT USED @@@ */
-void SfxPoolItem::GetVersion() const
-{
- DBG_ERROR( "dummy called" );
-}
-
-// -----------------------------------------------------------------------
-void SfxPoolItem::Store(SvStream &rStream) const
-{
- DBG_ERROR( "dummy called" );
-}
-#endif /* @@@ NOT USED @@@ */
-
-// -----------------------------------------------------------------------
bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
{
diff --git a/binfilter/bf_svtools/source/notify/svt_brdcst.cxx b/binfilter/bf_svtools/source/notify/svt_brdcst.cxx
index ebef9be..2b3be0b 100644
--- a/binfilter/bf_svtools/source/notify/svt_brdcst.cxx
+++ b/binfilter/bf_svtools/source/notify/svt_brdcst.cxx
@@ -57,22 +57,12 @@ void SfxBroadcaster::Broadcast( const SfxHint &rHint )
// is anybody to notify?
if ( aListeners.Count() /*! || aGlobListeners.Count() */ )
{
- #if 0
- // determine the type only once, because of its expensiveness
- const TypeId& rBCType = Type();
- const TypeId& rHintType = rHint.Type();
- #endif
-
// notify all registered listeners exactly once
for ( USHORT n = 0; n < aListeners.Count(); ++n )
{
SfxListener* pListener = aListeners[n];
if ( pListener )
- #if 0
- pListener->SFX_NOTIFY( *this, rBCType, rHint, rHintType );
- #else
pListener->Notify( *this, rHint );
- #endif
}
}
}
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
index eb283ab..8f23141 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
@@ -117,17 +117,6 @@ ImpSvNumberInputScan::~ImpSvNumberInputScan()
void ImpSvNumberInputScan::Reset()
{
-#if 0
-// ER 16.06.97 18:56 Vorbelegung erfolgt jetzt in NumberStringDivision,
-// wozu immer alles loeschen wenn einiges wieder benutzt oder gar nicht
-// gebraucht wird..
- for (USHORT i = 0; i < SV_MAX_ANZ_INPUT_STRINGS; i++)
- {
- sStrArray[i].Erase();
- nNums[i] = SV_MAX_ANZ_INPUT_STRINGS-1;
- IsNum[i] = FALSE;
- }
-#endif
nMonth = 0;
nMonthPos = 0;
nTimePos = 0;
@@ -157,17 +146,7 @@ inline BOOL ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
{
// If the input string wouldn't be converted using TransformInput() we'd
// to use something similar to the following and to adapt many places.
-#if 0
- // use faster isdigit() if possible
- if ( c < 128 )
- return isdigit( (unsigned char) c ) != 0;
- if ( c < 256 )
- return FALSE;
- String aTmp( c );
- return pFormatter->GetCharClass()->isDigit( aTmp, 0 );
-#else
return c < 128 && isdigit( (unsigned char) c );
-#endif
}
@@ -1039,10 +1018,10 @@ BOOL ImpSvNumberInputScan::GetDateRef( double& fDays, USHORT& nCounter,
DateFmt = YMD;
bFormatTurn = FALSE;
}
+/*
if ( bFormatTurn )
{
-#if 0
-/* TODO:
+TODO:
We are currently not able to fully support a switch to another calendar during
input for the following reasons:
1. We do have a problem if both (locale's default and format's) calendars
@@ -1066,15 +1045,8 @@ input for the following reasons:
4. Last and least: the GetMonth() method currently only matches month names of
the default calendar. Alternating month names of the actual format's
calendar would have to be implemented. No problem.
-
-*/
- if ( pFormat->IsOtherCalendar( nStringScanNumFor ) )
- pFormat->SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
- else
- pFormat->SwitchToSpecifiedCalendar( aOrgCalendar, fOrgDateTime,
- nStringScanNumFor );
-#endif
}
+*/
res = TRUE;
nCounter = 0;
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index a5afb10..fae5027 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -3205,10 +3205,6 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr )
aStr += ", negative: ";
aStr += ByteString::CreateFromInt32( rCurr.GetNegativeFormat() );
aStr += ( nNeg ? " (postfix)" : " (prefix)" );
-#if 0
-// seems that there really are some currencies which differ, e.g. YugoDinar
- DBG_ERRORFILE( aStr.GetBuffer() );
-#endif
}
}
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index fd36221..15bea86 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -1704,31 +1704,6 @@ void SvNumberformat::ImpGetOutputStandard(double& fNumber, String& OutString)
GetFormatter().GetNumDecimalSep().GetChar(0));
else
{
-#if 0
-{
- // debugger test case for ANSI standard correctness
- ::rtl::OUString aTest;
- // expect 0.00123 OK
- aTest = ::rtl::math::doubleToUString( 0.001234567,
- rtl_math_StringFormat_G, 3, '.', sal_True );
- // expect 123 OK
- aTest = ::rtl::math::doubleToUString( 123.4567,
- rtl_math_StringFormat_G, 3, '.', sal_True );
- // expect 123.5 OK
- aTest = ::rtl::math::doubleToUString( 123.4567,
- rtl_math_StringFormat_G, 4, '.', sal_True );
- // expect 1e+03 (as 999.6 rounded to 3 significant digits results in
- // 1000 with an exponent equal to significant digits)
- // Currently (24-Jan-2003) we do fail in this case and output 1000
- // instead, negligible.
- aTest = ::rtl::math::doubleToUString( 999.6,
- rtl_math_StringFormat_G, 3, '.', sal_True );
- // expect what? result is 1.2e+004
- aTest = ::rtl::math::doubleToUString( 12345.6789,
- rtl_math_StringFormat_G, -3, '.', sal_True );
-}
-#endif
-
OutString = ::rtl::math::doubleToUString( fNumber,
rtl_math_StringFormat_F, nStandardPrec /*2*/,
GetFormatter().GetNumDecimalSep().GetChar(0), sal_True );
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx b/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx
index b906626..179aab9 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx
@@ -1024,14 +1024,6 @@ void ImpSvNumberformatScan::Reset()
{
nAnzStrings = 0;
nAnzResStrings = 0;
-#if 0
-// ER 20.06.97 14:05 nicht noetig, wenn nAnzStrings beachtet wird
- for (size_t i = 0; i < NF_MAX_FORMAT_SYMBOLS; i++)
- {
- sStrArray[i].Erase();
- nTypeArray[i] = 0;
- }
-#endif
eScannedType = NUMBERFORMAT_UNDEFINED;
nRepPos = 0;
bExp = FALSE;
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx b/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx
index ae2a9e8..81ee2dd 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx
@@ -334,13 +334,6 @@ HCONV ImpDdeMgr::DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC)
ULONG nBufLen;
PSZ pService = AllocAtomName( (ATOM)hszService, nBufLen );
PSZ pTopic = AllocAtomName( (ATOM)hszTopic, nBufLen );
-#if 0 && defined(OV_DEBUG)
- String aStr("DdeConnectImp Service:");
- aStr += pService;
- aStr += " Topic:";
- aStr += pTopic;
- WRITELOG((char*)(const char*)aStr)
-#endif
#if defined(OV_DEBUG)
if( !strcmp(pService,"oliver voeltz") )
@@ -352,13 +345,6 @@ HCONV ImpDdeMgr::DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC)
}
#endif
-#if 0
- // original pm-fkt benutzen
- HWND hWndCurClient = CreateConversationWnd();
- WinDdeInitiate( hWndCurClient, pService, pTopic, pCC );
- if( GetConversationWndRefCount(hWndCurClient) == 0)
- DestroyConversationWnd( hWndCurClient );
-#else
// eigener Verbindungsaufbau
HENUM hEnum = WinBeginEnumWindows( HWND_DESKTOP );
HWND hWndCurSrv = NextFrameWin( hEnum );
@@ -384,20 +370,10 @@ HCONV ImpDdeMgr::DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC)
if( GetConversationWndRefCount(hWndCurClient) == 0)
DestroyConversationWnd( hWndCurClient );
WinEndEnumWindows( hEnum );
-#endif
if( !hCurConv )
nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED;
-#if 0 && defined(OV_DEBUG)
- String aCStr( "DdeConnectImp:End ");
- if( nLastErrInstance != DMLERR_NO_CONV_ESTABLISHED )
- aCStr += "(Success)";
- else
- aCStr += "(Failed)";
- WRITELOG((char*)aCStr.GetStr())
-#endif
-
MyDosFreeMem( pTopic,"DdeConnectImp" );
MyDosFreeMem( pService,"DdeConnectImp" );
return hCurConv;
@@ -440,17 +416,7 @@ HCONVLIST ImpDdeMgr::DdeConnectList( HSZ hszService, HSZ hszTopic,
bListConnect = TRUE;
DdeConnectImp( hszService, hszTopic, pCC );
-#if 0 && defined(OV_DEBUG)
- WRITELOG("DdeConnectList:ConnectionList:")
- HCONV hDebug = 0;
- do
- {
- hDebug = DdeQueryNextServer( hCurListId, hDebug);
- String aStr( (ULONG)hDebug );
- WRITELOG((char*)(const char*)aStr)
- } while( hDebug );
-#endif
- ////WRITESTATUS("After DdeConnectList")
+
return (HCONVLIST)hCurListId;
}
@@ -924,14 +890,6 @@ BOOL ImpDdeMgr::DdeAbandonTransaction( HCONV hConv, ULONG nTransId )
// benachrichtigt die Clients
BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem)
{
- ////WRITELOG("DdePostAdvise:Start")
- ////WRITESTATUS("DdePostAdvise:Start")
-
-#if 0 && defined( OV_DEBUG )
- String aDebStr("DdePostAdvise:Item ");
- aDebStr += (ULONG)hszItem;
- WRITELOG((char*)(const char*)aDebStr)
-#endif
Transaction* pTrans = pTransTable;
pTrans++;
@@ -961,25 +919,16 @@ BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem)
}
HWND hWndClient = pConv->hWndPartner;
HWND hWndServer = pConv->hWndThis;
-#if 0 && defined( OV_DEBUG )
- String aDebStr("DdePostAdvise: Server:");
- aDebStr += (ULONG)hWndServer;
- aDebStr += " Client:";
- aDebStr += (ULONG)hWndClient;
- WRITELOG((char*)(const char*)aDebStr)
-#endif
DDESTRUCT* pOutDDEData;
if ( pTrans->nType & XTYPF_NODATA )
{
// Warm link
- ////WRITELOG("DdePostAdvise:Warm link found")
pOutDDEData = MakeDDEObject( hWndClient, hszItem,
DDE_FNODATA, pTrans->nFormat, 0, 0 );
}
else
{
// Hot link
- ////WRITELOG("DdePostAdvise:Hot link found")
pOutDDEData = Callback( XTYP_ADVREQ,
pTrans->nFormat, hOwner, hszTopic,
hszItem, (HDDEDATA)0, 1, 0 );
@@ -987,7 +936,6 @@ BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem)
if( pOutDDEData )
{
// todo: FACK_REQ in Out-Data setzen, wenn pTrans->nType & XTYPF_ACKREQ
- ////WRITELOG("DdePostAdvise:Sending data/notification")
BOOL bSuccess = MyWinDdePostMsg( hWndClient,
hWndServer,WM_DDE_DATA, pOutDDEData, DDEPM_RETRY);
if( bSuccess )
@@ -1158,18 +1106,6 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
HCONV hConv, HSZ hszItem, USHORT nFormat, USHORT nType,
ULONG nTimeout, ULONG* pResult)
{
- //WRITELOG("DdeClientTransaction:Start")
-
-#if 0 && defined(OV_DEBUG)
- if( nType == XTYP_REQUEST )
- {
- WRITELOG("Start XTYP_REQUEST");
- WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
- "Start XTYP_REQUEST","DdeClientTransaction",
- HWND_DESKTOP,MB_OK);
- }
-#endif
-
if( pResult )
*pResult = 0;
@@ -1200,17 +1136,7 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
case XTYP_ADVSTART:
nMsg = WM_DDE_ADVISE;
nTimeoutErr = DMLERR_ADVACKTIMEOUT;
-{
nTimeout = 60000;
-#if 0 && defined(OV_DEBUG)
- char aBuf[ 128 ];
- ImpDdeMgr::DdeQueryString( hszItem,aBuf,127,850);
- String aXXStr("Establishing hotlink ");
- aXXStr += aBuf;
- WRITELOG((char*)aXXStr.GetStr());
-#endif
-
-}
break;
case XTYP_ADVSTOP:
@@ -1454,20 +1380,11 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
break;
case WM_DDE_ACK:
- {
- // WRITELOG("DdeClientTransaction:Ack received")
BOOL bPositive = (BOOL)(pDDEInData->fsStatus & DDE_FACK);
MyDosFreeMem( pDDEInData,"DdeClientTransaction" );
pDDEInData = (HDDEDATA)bPositive;
if( nType == XTYP_ADVSTART && pDDEInData )
{
-
-#if 0 && defined(OV_DEBUG)
- char aBuf[ 128 ];
- ImpDdeMgr::DdeQueryString( pTrans->hszItem,aBuf,128,850);
- String aXXStr("Hotlink ");
-#endif
-
if( bPositive )
{
pTrans->nType = XTYP_ADVREQ;
@@ -1475,24 +1392,7 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
pTrans->nType |= nTypeFlags;
// XST_WAITING_ACK ==> XST_WAITING_ADVDATA
pTrans->nConvst = XST_WAITING_ADVDATA;
-
-#if 0 && defined(OV_DEBUG)
- aXXStr += "established ";
- aXXStr += aBuf;
-#endif
-
- }
-
-#if 0 && defined(OV_DEBUG)
- else
- {
- aXXStr += "failed ";
- aXXStr += aBuf;
}
- WRITELOG((char*)aXXStr.GetStr());
-#endif
-
- }
}
break;
@@ -1542,17 +1442,7 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData,
*pResult = nTransId;
}
}
-#if 0 && defined( OV_DEBUG )
- if( nType == XTYP_REQUEST )
- {
- WRITELOG("End XTYP_REQUEST");
- WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
- "End XTYP_REQUEST","DdeClientTransaction",
- HWND_DESKTOP,MB_OK);
- }
-#endif
- //WRITELOG("DdeClientTransaction:End")
- //WRITESTATUS("DdeClientTransaction:End")
+
return pDDEInData;
}
@@ -1607,19 +1497,12 @@ MRESULT ImpDdeMgr::DdeTimeout( ImpWndProcParams* pParams )
// in diesem fall nicht geloescht.
if( nTempType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK) ))
{
- ////WRITELOG("DdeTimeout:Freeing transaction")
FreeTransaction( pData, nTransId );
}
nSyncResponseMsg = WM_TIMER;
-#if 0 && defined( OV_DEBUG )
- String aMsg("DdeTimeout:Transaction=");
- aMsg += nTransId;
- WRITELOG((char*)(const char*)aMsg)
-#endif
}
else
{
- ////WRITELOG("DdeTimeout:Async transaction timed out")
pTrans->nConvst = XST_TIMEOUT;
}
return (MRESULT)1;
@@ -1634,18 +1517,12 @@ MRESULT ImpDdeMgr::DdeTerminate( ImpWndProcParams* pParams )
HWND hWndPartner = (HWND)(pParams->nPar1);
HCONV hConv = GetConvHandle( pData, hWndThis, hWndPartner );
-#if 0 && defined( OV_DEBUG )
- String strDebug("DdeTerminate:ConvHandle=");
- strDebug += (USHORT)hConv;
- WRITELOG((char*)(const char*)strDebug)
-#endif
ImpHCONV* pConv = pConvTable + (USHORT)hConv;
if( hConv )
{
// warten wir auf ein DDE_TERMINATE Acknowledge ?
if( pConv->nStatus & ST_TERMINATED )
{
- ////WRITELOG("DdeTerminate:TERMINATE-Ack received")
pConv->nStatus |= ST_TERMACKREC;
return (MRESULT)0; // DdeDisconnect raeumt jetzt auf
}
@@ -1673,24 +1550,12 @@ MRESULT ImpDdeMgr::DdeTerminate( ImpWndProcParams* pParams )
if( !(pConv->hConvPartner) )
{
// nein, deshalb Transaktionstabelle selbst loeschen
- ////WRITELOG("DdeTerminate:Freeing transactions")
FreeTransactions( pData, hConv );
}
}
else
nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED;
-#if 0 && defined(OV_DEBUG)
- if( !WinIsWindow(0,hWndPartner))
- {
- WRITELOG("DdeTerminate:hWndPartner not valid")
- }
- if(!WinIsWindow(0,hWndThis))
- {
- WRITELOG("DdeTerminate:hWndThis not valid")
- }
-#endif
-
if( hConv )
{
// hWndThis nicht loeschen, da wir den Handle noch fuer
@@ -1818,18 +1683,6 @@ MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams )
BOOL bPositive = (BOOL)(pInDDEData->fsStatus & DDE_FACK ) != 0;
BOOL bBusy = bPositive ? FALSE : (BOOL)(pInDDEData->fsStatus & DDE_FBUSY ) != 0;
BOOL bNotProcessed = (BOOL)(pInDDEData->fsStatus & DDE_NOTPROCESSED ) != 0;
-#if 0 && defined( OV_DEBUG )
- String aDebStr("DdeAck:Received ");
- if( bPositive )
- aDebStr += "(positive)";
- else
- aDebStr += "(negative)";
- if( bBusy )
- aDebStr += "(busy)";
- if( bNotProcessed )
- aDebStr += "(not processed)";
- WRITELOG((char*)(const char*)aDebStr)
-#endif
// ein DDE_ACK niemals bestaetigen (um endlosschleifen zu vermeiden)
pInDDEData->fsStatus &= (~DDE_FACKREQ);
}
@@ -1855,12 +1708,6 @@ MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams )
}
BOOL bThisIsSync = (BOOL)( bInSyncTrans && nTransId == nSyncTransId );
-#if 0 && defined( OV_DEBUG )
- if( bThisIsSync)
- WRITELOG("DdeAck: sync transaction")
- else
- WRITELOG("DdeAck: async transaction")
-#endif
// pruefen, ob die Transaktion abgeschlossen ist.
Transaction* pTrans = pTransTable;
pTrans += (USHORT)nTransId;
@@ -1922,13 +1769,6 @@ USHORT ImpDdeMgr::SendUnadvises(HCONV hConvServer,USHORT nFormat,BOOL bFree)
{
USHORT nTransFound = 0;
BOOL bCallApp = (BOOL)(!(nTransactFilter & CBF_FAIL_ADVISES));
-#if 0 && defined( OV_DEBUG )
- String aStr("Unadvising transactions for HCONV=");
- aStr += (ULONG)hConvServer;
- aStr += " CallApp:"; aStr += (USHORT)bCallApp;
- WRITELOG((char*)aStr.GetStr())
-#endif
-
// wenn wir weder loeschen noch die App benachrichtigen sollen,
// koennen wir gleich wieder returnen
@@ -2115,13 +1955,6 @@ MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams )
HWND hWndThis = pParams->hWndReceiver;
HWND hWndClient = (HWND)pParams->nPar1;
DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
-#if 0 && defined( OV_DEBUG )
- {
- String aStr("DdeData Address:");
- aStr += (ULONG)pInDDEData;
- WRITELOG((char*)aStr.GetStr())
- }
-#endif
BOOL bSendAck;
if( pInDDEData && (pInDDEData->fsStatus & DDE_FACKREQ ))
@@ -2153,13 +1986,6 @@ MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams )
return (MRESULT)0;
}
-#if 0 && defined( OV_DEBUG )
- if( pInDDEData )
- {
- WRITEDATA(pInDDEData)
- }
-#endif
-
BOOL bThisIsSync = (BOOL)( bInSyncTrans && nTransId == nSyncTransId );
// pruefen, ob die Transaktion abgeschlossen ist.
@@ -2323,12 +2149,6 @@ HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient,
ImpHCONV* pConv = pConvTable;
pConv += (USHORT)hConv;
pConv->hConvPartner = GetConvHandle( pData, hWndClient, hWndSrv );
-#if 0 && defined(OV_DEBUG)
- if( !pConv->hConvPartner )
- {
- WRITELOG("DdeConnectWithClient:Partner not found")
- }
-#endif
pConv->nStatus = ST_CONNECTED;
//WRITESTATUS("Server:Connected with client")
//WRITELOG("ConnectWithClient:End")
@@ -2404,28 +2224,20 @@ MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams )
}
}
}
-#if 0 && defined(OV_DEBUG)
- else
- {
- WRITELOG("DdeInitiate:Service filtered")
- }
-#endif
DdeFreeStringHandle( hszTopic );
DdeFreeStringHandle( hszService );
DdeFreeStringHandle( hszPartner );
MyDosFreeMem( pDDEData,"DdeInitiate" );
- ////WRITELOG("DdeInitiate:End")
+
return (MRESULT)TRUE;
}
MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
{
- ////WRITELOG("DdeInitiateAck:Received")
DDEINIT* pDDEData = (DDEINIT*)(pParams->nPar2);
if( !bListConnect && hCurConv )
{
- ////WRITELOG("DdeInitiateAck:Already connected")
MyDosFreeMem( pDDEData,"DdeInitiateAck" );
WinPostMsg( hWndServer, WM_DDE_TERMINATE, (MPARAM)hWndServer, 0 );
return (MRESULT)FALSE;
@@ -2479,7 +2291,6 @@ MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams )
MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
{
- ////WRITELOG("DdePoke:Received")
HSZ hszItem = 0;
DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
HCONV hConv = CheckIncoming( pParams, CBF_FAIL_REQUESTS, hszItem );
@@ -2493,12 +2304,6 @@ MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
== (DDESTRUCT*)DDE_FACK )
bSuccess = TRUE;
}
-#if 0 && defined( OV_DEBUG )
- else
- {
- WRITELOG("DdePoke:Not processed")
- }
-#endif
if( pInDDEData )
{
if( bSuccess )
@@ -2515,7 +2320,6 @@ MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams )
MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
{
- ////WRITELOG("DdeRequest:Received")
HSZ hszItem = 0;
DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
if( pInDDEData )
@@ -2534,13 +2338,11 @@ MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
if ( !pOutDDEData )
{
- ////WRITELOG("DdeRequest:Not processed")
pInDDEData->fsStatus &= (~DDE_FACK);
MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY);
}
else
{
- ////WRITELOG("DdeRequest:Success")
MyDosFreeMem( pInDDEData,"DdeRequest" );
pOutDDEData->fsStatus |= DDE_FRESPONSE;
MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_DATA,pOutDDEData,DDEPM_RETRY);
@@ -2553,15 +2355,13 @@ MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams )
}
DdeFreeStringHandle( hszItem );
- ////WRITELOG("DdeRequest:End")
+
return (MRESULT)0;
}
MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams )
{
- ////WRITELOG("DdeUnadvise:Received")
-
HSZ hszItem;
HCONV hConv = CheckIncoming( pParams, 0, hszItem );
DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2);
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx b/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx
index af6242c..e048db5 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddeml2.cxx
@@ -78,7 +78,6 @@ PDDESTRUCT ImpDdeMgr::MakeDDEObject( HWND hwnd, ATOM hItemName,
PDDESTRUCT pddes = 0;
ULONG usItemLen;
PULONG pulSharedObj;
- //WRITELOG("MakeDDEObject: Start")
PSZ pItemName = 0;
if( hItemName != NULL )
@@ -170,11 +169,6 @@ HWND ImpDdeMgr::CreateConversationWnd()
pWndData->nRefCount = 0;
WinSetWindowULong( hWnd, 0, (ULONG)pWndData );
WinSubclassWindow( hWnd, ::ConvWndProc );
-#if 0 && defined( OV_DEBUG )
- String aStr("ConvWnd created:");
- aStr += (ULONG)hWnd;
- WRITELOG((char*)aStr.GetStr())
-#endif
}
else
nLastErrInstance = DMLERR_SYS_ERROR;
@@ -196,20 +190,6 @@ void ImpDdeMgr::DestroyConversationWnd( HWND hWnd )
{
delete pObj;
WinDestroyWindow( hWnd );
-#if 0 && defined( OV_DEBUG )
- String aStr("ConvWnd destroyed:");
- aStr += (ULONG)hWnd;
- WRITELOG((char*)aStr.GetStr())
-#endif
- }
- else
- {
-#if 0 && defined( OV_DEBUG )
- String aStr("ConvWnd not destroyed (Refcount=");
- aStr += pObj->nRefCount;
- aStr += ") "; aStr += (ULONG)hWnd;
- WRITELOG((char*)aStr.GetStr())
-#endif
}
}
#if defined( OV_DEBUG )
@@ -233,11 +213,6 @@ USHORT ImpDdeMgr::GetConversationWndRefCount( HWND hWnd )
// static
USHORT ImpDdeMgr::IncConversationWndRefCount( HWND hWnd )
{
-#if 0 && defined( OV_DEBUG )
- String aStr("IncConversationWndRefCount ");
- aStr += (ULONG)hWnd;
- WRITELOG((char*)aStr.GetStr())
-#endif
ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 );
DBG_ASSERT(pObj,"Dde:ConvWnd has no data");
if( pObj )
@@ -363,13 +338,6 @@ void ImpDdeMgr::FreeConvHandle( ImpDdeMgrData* pBase, HCONV hConv,
BOOL bDestroyHWndThis )
{
DBG_ASSERT(pBase,"DDE:No data");
-#if 0 && defined( OV_DEBUG )
- String aStr("FreeConvHandle: Start ");
- aStr += (ULONG)hConv;
- aStr += " Destroy: "; aStr += (USHORT)bDestroyHWndThis;
- WRITELOG((char*)aStr.GetStr());
- WRITESTATUS("FreeConvHandle: Start");
-#endif
if( !pBase )
{
WRITELOG("FreeConvHandle: FAIL");
@@ -413,8 +381,6 @@ void ImpDdeMgr::FreeConvHandle( ImpDdeMgrData* pBase, HCONV hConv,
WRITELOG("FreeConvHandle: FAIL");
}
#endif
- //WRITELOG("FreeConvHandle: END");
- //WRITESTATUS("FreeConvHandle: End");
}
// static
@@ -515,7 +481,6 @@ void ImpDdeMgr::FreeTransaction( ImpDdeMgrData* pBase, ULONG nTransId )
DBG_ASSERT(pPtr->hConvOwner!=0,"DDE:TransId has no owner");
if( pPtr->hConvOwner )
{
- //WRITELOG("Freeing transaction");
DdeFreeStringHandle( pPtr->hszItem );
memset( pPtr, 0, sizeof(Transaction) );
DBG_ASSERT(pBase->nCurTransCount,"Dde:Invalid Trans. count");
@@ -795,22 +760,14 @@ void ImpDdeMgr::FreeConversations( ImpDdeMgrData* pData, HWND hWndThis,
BOOL ImpDdeMgr::OwnsConversationHandles()
{
- //WRITESTATUS("OwnsConversationHandles()");
-#if 0 && defined( OV_DEBUG )
- String aStr("OwnsConversationHandles Server:");
- aStr += (ULONG)hWndServer;
- WRITELOG((char*)aStr.GetStr())
-#endif
ImpHCONV* pPtr = GetConvTable( pData );
for( USHORT nCur = 1; nCur < pData->nMaxConvCount; nCur++, pPtr++ )
{
if( pPtr->hWndThis && pPtr->pidOwner == pidThis )
{
- //WRITELOG("OwnsConversationHandles: TRUE");
return TRUE;
}
}
- // WRITELOG("OwnsConversationHandles: FALSE");
return FALSE;
}
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx b/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx
index 78cc6ca..9b11849 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx
@@ -234,16 +234,6 @@ APIRET MyDosAllocSharedMem(void** ppBaseAddress, char* pszName, unsigned long ul
unsigned long ulFlags, char* pContextStr )
{
APIRET nRet = DosAllocSharedMem(ppBaseAddress,pszName,ulObjectSize,ulFlags );
-#if 0 && defined(OV_DEBUG) && defined(LOGFILE)
- String aStr("DosAllocSharedMem:");
- aStr += pContextStr;
- aStr += ": ";
- aStr += ulObjectSize;
- aStr += " (";
- aStr += (ULONG)*((char**)ppBaseAddress);
- aStr += ')';
- ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr() );
-#endif
return nRet;
}
@@ -251,16 +241,6 @@ APIRET MyDosAllocMem(void** ppBaseAddress, unsigned long ulObjectSize,
unsigned long ulFlags, char* pContextStr )
{
APIRET nRet = DosAllocMem(ppBaseAddress, ulObjectSize,ulFlags );
-#if 0 && defined(OV_DEBUG) && defined(LOGFILE)
- String aStr("DosAllocMem:");
- aStr += pContextStr;
- aStr += ": ";
- aStr += ulObjectSize;
- aStr += " (";
- aStr += (ULONG)*((char**)ppBaseAddress);
- aStr += ')';
- ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr() );
-#endif
return nRet;
}
@@ -268,13 +248,6 @@ APIRET MyDosAllocMem(void** ppBaseAddress, unsigned long ulObjectSize,
APIRET MyDosFreeMem( void* pBaseAddress, char* pContextStr )
{
APIRET nRet = DosFreeMem( pBaseAddress );
-#if 0 && defined(OV_DEBUG) && defined(LOGFILE)
- String aStr("DosFreeMem:");
- aStr += pContextStr;
- aStr += ": ";
- aStr += (ULONG)pBaseAddress;
- ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr());
-#endif
return nRet;
}
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index dab139f..64dcbe1 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -152,18 +152,6 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
{
if ( !hText2 || (*pService->pName == hText2 ) )
{
-#if 0
- for ( pTopic = pService->aTopics.First(); pTopic;
- pTopic = pService->aTopics.Next() )
- {
- if ( !hText1 || (*pTopic->pName == hText1) )
- {
- q->hszSvc = *pService->pName;
- q->hszTopic = *pTopic->pName;
- q++;
- }
- }
-#else
String sTopics( pService->Topics() );
USHORT n = 0;
while( STRING_NOTFOUND != n )
@@ -182,8 +170,6 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
}
}
}
-
-#endif
}
}
diff --git a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
index acb00a3..a7b96ff 100644
--- a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
@@ -87,24 +87,6 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ pLine = NULL;
-/*N*/
-/*N*/ #if 0
-/*N*/ ULONG nPolyPtr = (ULONG)&rXPoly;
-/*N*/ String aDbgFile( "d:\\" );
-/*N*/ aDbgFile += nPolyPtr;
-/*N*/ aDbgFile += ".pol";
-/*N*/ SvFileStream aStream( aDbgFile, STREAM_WRITE|STREAM_TRUNC );
-/*N*/ aStream << "pPoly: " << String( (ULONG)pPoly ).GetStr();
-/*N*/ for ( USHORT nPoly = 0; nPoly < pPoly->Count(); nPoly++ )
-/*N*/ {
-/*N*/ const Polygon& rPoly = pPoly->GetObject( nPoly );
-/*N*/ for ( USHORT n = 0; n < rPoly.GetSize(); n++ )
-/*N*/ {
-/*N*/ const Point& rPoint = rPoly.GetPoint( n );
-/*N*/ aStream << String( rPoint.X() ).GetStr() << ", " << String( rPoint.Y() ).GetStr() << endl;
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ }
#ifdef WIN
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx b/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx
index ee680a7..a636df2 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx
@@ -92,8 +92,6 @@ const USHORT nBlockGrowSize = 20;
/*N*/ }
// Einfachst-Implementation, evtl. spaeter mal komplexer
-#if 0
-#endif
// Auch der Move ist schlicht. Optimieren ist hier wg. der
// Stueckelung des Feldes zwecklos!
diff --git a/binfilter/bf_sw/source/core/crsr/sw_splcstk.cxx b/binfilter/bf_sw/source/core/crsr/sw_splcstk.cxx
index 51a2c31..c15ee4d 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_splcstk.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_splcstk.cxx
@@ -149,14 +149,6 @@ void SwSpellCrsrStk::SetErrPos()
rCrsrShell.GetCrsr()->DeleteMark();
}
-
-#if 0
-
-SwPaM* SwSpellCrsrStk::GetCurCrsr() const { return pCurCrsr; }
-#endif
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx b/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx
index e8a89cb..c9b127a 100644
--- a/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx
+++ b/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx
@@ -207,81 +207,5 @@ using namespace ::com::sun::star;
/*N*/ }
} //namespace binfilter
-#include <fmtcnct.hxx>
-#if 0
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-
-
-/*M*/ static ::std::ostream & operator << (::std::ostream & aStream,
-/*M*/ const String & aString)
-/*M*/ {
-/*M*/ ByteString aByteString(aString, RTL_TEXTENCODING_ASCII_US);
-/*M*/ aStream << aByteString.GetBuffer();
-/*M*/
-/*M*/ return aStream;
-/*M*/ }
-
-/*M*/ void lcl_PrintFrameChainPrev(const SwFrmFmt * pFmt)
-/*M*/ {
-/*M*/ if (pFmt != NULL)
-/*M*/ {
-/*M*/ lcl_PrintFrameChainPrev(pFmt->GetChain().GetPrev());
-/*M*/
-/*M*/ ::std::clog << pFmt->GetName() << "->";
-/*M*/ }
-/*M*/ }
-
-/*M*/ void lcl_PrintFrameChainNext(const SwFrmFmt * pFmt)
-/*M*/ {
-/*M*/ if (pFmt != NULL)
-/*M*/ {
-/*M*/ ::std::clog << "->" << pFmt->GetName();
-/*M*/
-/*M*/ lcl_PrintFrameChainPrev(pFmt->GetChain().GetNext());
-/*M*/ }
-/*M*/ }
-
-/*M*/ void lcl_PrintFrameChain(const SwFrmFmt & rFmt)
-/*M*/ {
-/*M*/ lcl_PrintFrameChainPrev(rFmt.GetChain().GetPrev());
-/*M*/ ::std::clog << "(" << rFmt.GetName() << ")";
-/*M*/ lcl_PrintFrameChainNext(rFmt.GetChain().GetNext());
-/*M*/ ::std::clog << ::std::endl;
-/*M*/ }
-
-/*M*/ String lcl_GetChainableString(int nVal)
-/*M*/ {
-/*M*/ switch(nVal)
-/*M*/ {
-/*M*/ case SW_CHAIN_OK:
-/*M*/ return String::CreateFromAscii("OK");
-/*M*/
-/*M*/ case SW_CHAIN_SOURCE_CHAINED:
-/*M*/ return String::CreateFromAscii("source chained");
-/*M*/
-/*M*/ case SW_CHAIN_SELF:
-/*M*/ return String::CreateFromAscii("self");
-/*M*/
-/*M*/ case SW_CHAIN_IS_IN_CHAIN:
-/*M*/ return String::CreateFromAscii("in chain");
-/*M*/
-/*M*/ case SW_CHAIN_NOT_FOUND:
-/*M*/ return String::CreateFromAscii("not found");
-/*M*/
-/*M*/ case SW_CHAIN_NOT_EMPTY:
-/*M*/ return String::CreateFromAscii("not empty");
-/*M*/
-/*M*/ case SW_CHAIN_WRONG_AREA:
-/*M*/ return String::CreateFromAscii("wrong area");
-/*M*/
-/*M*/ default:
-/*M*/ return String::CreateFromAscii("??");
-/*M*/
-/*M*/ }
-/*M*/ }
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/splcstk.hxx b/binfilter/bf_sw/source/core/inc/splcstk.hxx
index e035feb..d7b80fa 100644
--- a/binfilter/bf_sw/source/core/inc/splcstk.hxx
+++ b/binfilter/bf_sw/source/core/inc/splcstk.hxx
@@ -55,13 +55,6 @@ public:
// an dieser wird spaeter wieder aufgesetzt
void SetErrPos(); // akt. Cursor auf die Error Position setzen
-#if 0
- // ??? wird das ueberhaupt benoetigt ???
- // fuer die EditShell, damit sie die Cursor
- // aus den Loeschbereichen verschieben kann
- SwPaM* GetCurCrsr() const;
- SwPosition* GetErrorPos() const { return pErrorPos; }
-#endif
};
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index edcaca1..111943e 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -139,26 +139,6 @@ SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
/*N*/ SwOLENode *pNode =
/*N*/ new SwOLENode( rWhere, pObj, pGrfColl, pAutoAttr );
/*N*/
-/*N*/ #if 0
-/*N*/ JP 02.10.97 - OLE Objecte stehen immer alleine im Rahmen, also hat es
-/*N*/ keinen Sinn, nach einem vorherigen/nachfolgenden
-/*N*/ ContentNode zu suchen!
-/*N*/
-/*N*/ SwCntntNode *pCntntNd;
-/*N*/ SwIndex aIdx( rWhere, -1 );
-/*N*/ if ( (pCntntNd=(*this)[ rWhere ]->GetCntntNode()) != 0 )
-/*N*/ pCntntNd->MakeFrms( rWhere, aIdx );
-/*N*/ else
-/*N*/ {
-/*N*/ aIdx--;
-/*N*/ if ( (pCntntNd=(*this)[aIdx]->GetCntntNode()) != 0 )
-/*N*/ {
-/*N*/ SwIndex aTmp( aIdx );
-/*N*/ aIdx++;
-/*N*/ pCntntNd->MakeFrms( aTmp, aIdx );
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ return pNode;
/*N*/ }
@@ -173,25 +153,6 @@ SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
/*N*/ SwOLENode *pNode =
/*N*/ new SwOLENode( rWhere, rName, pGrfColl, pAutoAttr );
/*N*/
-/*N*/ #if 0
-/*N*/ JP 02.10.97 - OLE Objecte stehen immer alleine im Rahmen, also hat es
-/*N*/ keinen Sinn, nach einem vorherigen/nachfolgenden
-/*N*/ ContentNode zu suchen!
-/*N*/ SwCntntNode *pCntntNd;
-/*N*/ SwIndex aIdx( rWhere, -1 );
-/*N*/ if ( (pCntntNd=(*this)[ rWhere ]->GetCntntNode()) != 0 )
-/*N*/ pCntntNd->MakeFrms( rWhere, aIdx );
-/*N*/ else
-/*N*/ {
-/*N*/ aIdx--;
-/*N*/ if ( (pCntntNd=(*this)[aIdx]->GetCntntNode()) != 0 )
-/*N*/ {
-/*N*/ SwIndex aTmp( aIdx );
-/*N*/ aIdx++;
-/*N*/ pCntntNd->MakeFrms( aTmp, aIdx );
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ return pNode;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
index 4392fa0..59b21fb 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
@@ -211,29 +211,6 @@ void lcl_sw3doc_ChgChartName( SwDoc* pDoc )
/*N*/ SwNumRule* pRule = InNumRule( cType );
/*N*/ if( pRule )
/*N*/ {
-/*N*/ //JP 10.03.96: und wieder alles zurueck
-/*N*/ #if 0
-/*N*/ if( nVersion < SWG_DELETEOLE )
-/*N*/ {
-/*N*/ //JP 18.01.96: Alle Ueberschriften sind normalerweise
-/*N*/ // ohne Kapitelnummer. Darum hier explizit abschalten
-/*N*/ // weil das Default jetzt wieder auf AN ist.
-/*N*/ // und UeberschirftBasis ohne Einrueckung!
-/*N*/ SwTxtFmtColl* pCol = pDoc->GetTxtCollFromPool(
-/*N*/ RES_POOLCOLL_HEADLINE_BASE );
-/*N*/ pCol->ResetAttr( RES_LR_SPACE );
-/*N*/
-/*N*/ for( short i = 0; i < MAXLEVEL; i++ )
-/*N*/ {
-/*N*/ if( !pRule->GetNumFmt( i ) )
-/*N*/ {
-/*N*/ SwNumFmt aFmt( pRule->Get( i ) );
-/*N*/ aFmt.eType = NUMBER_NONE;
-/*N*/ pRule->Set( i, aFmt );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ pDoc->SetOutlineNumRule( *pRule );
/*N*/ }
/*N*/ delete pRule;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 6dd2b79..20ad31b 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -967,17 +967,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )//STRIP008 ;
/*N*/ {
/*N*/ // MAXLEVEL war im 3.1/4.0-SW 5 und kann sich nichr mehr aendern,
/*N*/ // deshalb baruchen wir es nicht zu beachten.
-/*N*/ #if 0
-/*N*/ if( cNumLevel != NO_NUM && GetRealLevel(cNumLevel) >= MAXLEVEL )
-/*N*/ {
-/*N*/ // die Numerierungs-Ebene ist zu hoch => die hoecht moegliche
-/*N*/ // setzen
-/*N*/ BYTE cTmp = MAXLEVEL-1;
-/*N*/ if( cNumLevel & NO_NUMLEVEL )
-/*N*/ cTmp |= NO_NUMLEVEL;
-/*N*/ cNumLevel = cTmp;
-/*N*/ }
-/*N*/ #endif
/*N*/ pNd->UpdateNum( SwNodeNum( cNumLevel ) );
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index afce09d..6afd73c 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -665,11 +665,6 @@ bool SwFmtFlyCnt::Sw3ioExportAllowed() const
/*N*/ Sw3IoImp* pIo = Sw3IoImp::GetCurrentIo();
/*N*/ SwNodes& rNodes = pIo->pDoc->GetNodes();
/*N*/ SwNodeIndex aStart( rNodes.GetEndOfInserts() );
-/*N*/ #if 0
-/*N*/ SwStartNode* pSttNd = rNodes.MakeTextSection( aStart, SwFootnoteStartNode,
-/*N*/ pIo->FindTxtColl( IDX_DFLT_VALUE ) );
-/*N*/ aStart = *pSttNd;
-/*N*/ #endif
/*N*/ SwStartNode* pSttNd = rNodes.MakeEmptySection( aStart,SwFootnoteStartNode );
/*N*/ aStart = *pSttNd->EndOfSectionNode();
/*N*/
@@ -679,7 +674,6 @@ bool SwFmtFlyCnt::Sw3ioExportAllowed() const
/*?*/ pIo->pSectionDepths = new SvUShorts;
/*?*/ pIo->pSectionDepths->Insert( (USHORT)0U, pIo->pSectionDepths->Count() );
/*N*/ }
-/*N*/ // pIo->InContents( aStart );
/*N*/ pIo->InContents( aStart, 0, FALSE );
/*N*/ if( pIo->bInsert )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index f08e7b3..dda3649 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -494,10 +494,6 @@ namespace binfilter {
/*N*/
/*N*/ // falls es nicht unterstuetzte Formate koennte man sie ueberlesen.
/*N*/ // Da danach aber nicht sinnvolles kommt, lassen wir das erstmal
-/*N*/ #if 0
-/*N*/ for( i = nKnownFmt; Good() && i < nFmt; i++ )
-/*N*/ SkipRec();
-/*N*/ #endif
/*N*/
/*N*/ #ifdef NUM_RELSPACE
/*N*/ if( SWG_OUTLINE == cType && !IsVersion(SWG_NUMRELSPACE) )
@@ -955,28 +951,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst )
/*N*/ pRule = InNumRule( cType );
/*N*/ if( pRule )
/*N*/ {
-/*N*/ #if 0
-/*N*/ if( nVersion < SWG_DELETEOLE )
-/*N*/ {
-/*N*/ //JP 18.01.96: Alle Ueberschriften sind normalerweise
-/*N*/ // ohne Kapitelnummer. Darum hier explizit abschalten
-/*N*/ // weil das Default jetzt wieder auf AN ist.
-/*N*/ // und UeberschirftBasis ohne Einrueckung!
-/*N*/ SwTxtFmtColl* pCol = pDoc->GetTxtCollFromPool(
-/*N*/ RES_POOLCOLL_HEADLINE_BASE );
-/*N*/ pCol->ResetAttr( RES_LR_SPACE );
-/*N*/
-/*N*/ for( short i = 0; i < MAXLEVEL; i++ )
-/*N*/ {
-/*N*/ if( !pRule->GetNumFmt( i ) )
-/*N*/ {
-/*N*/ SwNumFmt aFmt( pRule->Get( i ) );
-/*N*/ aFmt.eType = NUMBER_NONE;
-/*N*/ pRule->Set( i, aFmt );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ pDoc->SetOutlineNumRule( *pRule );
/*N*/ }
/*N*/ delete pRule;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
index aa37b56..7694afa 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
@@ -351,14 +351,6 @@ namespace binfilter {
/*N*/ SwStartNode& Sw3IoImp::InContents()
/*N*/ {
/*N*/ // Anlegen einer Section mit einem TextNode
-/*N*/ #if 0
-/*N*/ SwStartNode* pSttNd = pDoc->GetNodes().MakeTextSection(
-/*N*/ pDoc->GetNodes().EndOfAutotext,
-/*N*/ (SwStartNodeType)eStartNodeType,
-/*N*/ (SwTxtFmtColl*) pDoc->GetDfltTxtFmtColl() );
-/*N*/ SwIndex aStart( pSttNd->GetMyIndex() );
-/*N*/ InContents( aStart );
-/*N*/ #endif
/*N*/ // OPT: Section leer anlegen
/*N*/ SwNodeIndex aStart( pDoc->GetNodes().GetEndOfAutotext() );
/*N*/ SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection( aStart,
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
index c2d2c1b..06b91e2 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
@@ -722,36 +722,10 @@ using namespace ::com::sun::star::i18n;
/*N*/ rSet.Put( rCFSet.Get( nWhich ) );
/*N*/ nWhich = aIter.NextWhich();
/*N*/ }
-/*N*/ #if 0
-/*N*/ SfxItemSet aTmpSet( *rSet.GetPool(), rSet.GetRanges() );
-/*N*/ aTmpSet.Set( pFmt->GetAttrSet(), TRUE );
- /*
- ????? JP 31.01.95 ???? wie jetzt ???
- rSet.MergeValues( aTmpSet );
-
- // jetzt alle zusammen "mergen"
- rSet.Differentiate( aTmpSet );
- */
-/*N*/ rSet.Put( aTmpSet );
-/*N*/ #endif
/*N*/ }
/*N*/ }
/*N*/
/*N*/ // aufnehmen als MergeWert (falls noch nicht gesetzt neu setzen!)
-/*N*/ #if 0
- /* wenn mehrere Attribute ueberlappen werden diese gemergt !!
- z.B
- 1234567890123456789
- |------------| Font1
- |------| Font2
- ^ ^
- |--| Abfragebereich: -> uneindeutig
- */
-/*N*/ else if( SFX_ITEM_DEFAULT == rSet.GetItemState( rAttr.Which(), FALSE ))
-/*N*/ rSet.Put( rAttr );
-/*N*/ else
-/*N*/ rSet.MergeValue( rAttr );
-/*N*/ #else
/* wenn mehrere Attribute ueberlappen gewinnt der letze !!
z.B
1234567890123456789
@@ -761,7 +735,6 @@ using namespace ::com::sun::star::i18n;
|--| Abfragebereich: -> Gueltig ist Font2
*/
/*N*/ rSet.Put( rAttr );
-/*N*/ #endif
/*N*/ }
// erfrage die Attribute vom TextNode ueber den Bereich
diff --git a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
index aeb6eff..56f36a5 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
@@ -74,25 +74,7 @@ namespace binfilter {
|*
******************************************************************************/
-/*N*/ SwViewImp::~SwViewImp()
-/*N*/ {
-#if 0
-/*N*/
-/*N*/ // OD 12.12.2002 #103492#
-/*N*/
-/*N*/ //JP 29.03.96: nach ShowPage muss auch HidePage gemacht werden!!!
-/*N*/ if( pDrawView )
-/*N*/ pDrawView->HidePage( pSdrPageView );
-/*N*/
-/*N*/ delete pDrawView;
-/*N*/
-/*N*/ DelRegions();
-/*N*/ delete pScrolledArea;
-/*N*/
-/*N*/ ASSERT( !pLayAct, "Have action for the rest of your life." );
-/*N*/ ASSERT( !pIdleAct,"Be idle for the rest of your life." );
-#endif
-/*N*/ }
+/*N*/ SwViewImp::~SwViewImp() { }
/******************************************************************************
|*
@@ -222,27 +204,7 @@ namespace binfilter {
|*
******************************************************************************/
-/*N*/ void SwViewImp::MakeDrawView()
-/*N*/ {
-#if 0
-/*N*/ if( !GetShell()->GetDoc()->GetDrawModel() )
-/*?*/ GetShell()->GetDoc()->_MakeDrawModel();
-/*N*/ else
-/*N*/ {
-/*N*/ if ( !pDrawView )
-/*N*/ {
-/*N*/ pDrawView = new SwDrawView( *this,
-/*N*/ GetShell()->GetDoc()->GetDrawModel(),
-/*N*/ GetShell()->GetWin() ?
-/*N*/ GetShell()->GetWin() :
-/*N*/ (OutputDevice*)GetShell()->GetDoc()->GetPrt() );
-/*N*/ }
-/*N*/ GetDrawView()->SetActiveLayer( XubString::CreateFromAscii(
-/*N*/ RTL_CONSTASCII_STRINGPARAM( "Heaven" ) ) );
-/*N*/ Init( GetShell()->GetViewOptions() );
-/*N*/ }
-#endif
-/*N*/ }
+/*N*/ void SwViewImp::MakeDrawView() { }
/******************************************************************************
|*
diff --git a/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx b/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
index 929e139..514d7ce 100644
--- a/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
+++ b/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
@@ -126,12 +126,6 @@ class XF_Data
inline void SetBorder( CellBorder *pNew );
void SetBorder( const CellBorder &rNew );
-#if 0
- void SetBorder( BYTE nTopLine, BYTE nLeftLine,
- BYTE nBottomLine, BYTE nRightLine,
- USHORT nTopColor, USHORT nLeftColor,
- USHORT nBottomColor, USHORT nRightColor );
-#endif
const CellBorder *Border() const { return pBord; }
};
diff --git a/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx b/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
index 9131b6b..713e1fa 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
@@ -696,29 +696,9 @@ void XF_Data::SetBorder( const CellBorder &rNew )
pBord->nRightColor = rNew.nRightColor;
}
-#if 0
-// ------------------------- XF_Data::SetBorder( BYTE, BYTE, BYTE,... ) -
-void XF_Data::SetBorder( BYTE nTopLine, BYTE nLeftLine, BYTE nBottomLine,
- BYTE nRightLine, UINT16 nTopColor, UINT16 nLeftColor,
- UINT16 nBottomColor, UINT16 nRightColor )
- {
- if( pBord == NULL ) pBord = new CellBorder;
- DBG_ASSERT( pBord != NULL,
- "-XF_Data::SetBorder(): pBord == NULL!" );
- pBord->nTopLine = nTopLine;
- pBord->nLeftLine = nLeftLine;
- pBord->nBottomLine = nBottomLine;
- pBord->nRightLine = nRightLine;
- pBord->nTopColor = nTopColor;
- pBord->nLeftColor = nLeftColor;
- pBord->nBottomColor = nBottomColor;
- pBord->nRightColor = nRightColor;
- }
-#endif
-
// -- class XF_Buffer ----------------------------------------------------
//
-// Kopiert aus: xfbuff.cxx
+// Copied from: xfbuff.cxx
// ------------------------------------------------ XF_Buffer::XF_Buffer -
XF_Buffer::XF_Buffer( UINT16 nNewMax )
diff --git a/binfilter/bf_sw/source/filter/inc/fltini.hxx b/binfilter/bf_sw/source/filter/inc/fltini.hxx
index 21ac005..bd71236 100644
--- a/binfilter/bf_sw/source/filter/inc/fltini.hxx
+++ b/binfilter/bf_sw/source/filter/inc/fltini.hxx
@@ -107,25 +107,10 @@ public:
// die speziellen Writer
-#if 0
-/*?*/ WriterRef GetW4WWriter( const String& );
-WriterRef GetStgWriter( const String& );
-WriterRef GetWWWriter( const String& );
-/*?*/ WriterRef GetWW8Writer( const String& );
-#if !( !defined(DBG_UTIL) || defined(MAC) || defined(PM2) )
-/*?*/ WriterRef GetDebugWriter( const String& );
-/*?*/ WriterRef GetUndoWriter( const String& );
-#endif
-#else
-/*?*/ void GetW4WWriter( const String&, WriterRef& );
+void GetW4WWriter( const String&, WriterRef& );
void GetStgWriter( const String&, WriterRef& );
void GetWWWriter( const String&, WriterRef& );
-#if !( !defined(DBG_UTIL) || defined(MAC) || defined(PM2) )
-#endif
-#endif
-
-// JP 17.03.99 - 63049
// Umsetzen der LRSpaces im aktuell importierten Doc. Die Fremd-Filter
// liefern immer absolute Werte fuer die Ebenen einer NumRule. Wir
// verarbeiten jetzt aber relative Werte bezogen auf das LR-Space-Item.
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
index f035b48..f7378f5 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
@@ -3112,21 +3112,6 @@ void SwW4WParser::Read_SetLeftMarginRelease() // (LMR)
}
SetAttr( aLR );
-#if 0
- // MIB 16.5.2001: A default tab at pos 0 isn't required since 1996.
- if( nDocType == 33 && bStyleDef && !bIsTab )
- {
- // AmiPro hat nicht so irrsinnig viele Tabs im Metafile,
- // so dass die dort eingebaute Mimik zum Setzen eines
- // Default-Tabs an die Pos 0 ( fuer 1.Zeile < LRand )
- // nicht ausreicht.
-
- SvxTabStopItem aTabStops( 0, 0 );
- aTabStops.Insert( SvxTabStop( 0, SVX_TAB_ADJUST_DEFAULT ) );
- SetAttr( aTabStops );
- bIsTab = TRUE;
- }
-#endif
}
// fuer IPS und RSM waehrend StyleDefinition
// und fuer RSM bei WordPerfekt f. Win 6,7,8
@@ -3291,16 +3276,10 @@ void SwW4WParser::AdjustTempVar1( long& rHeight,
long nMin = (nIniHdFtSiz ? nIniHdFtSiz : MM50) * 3 / 2;
if( rHeight < nMin )
rHeight = nMin;
-#if 0
-// why get the page upper / lower the half of the header/footer height?
- rPgDelta = rHeight / 2;
- rHdFtDelta = rPgDelta / 2;
-#else
// then the half height for the header/footer and the other half
// height get half the page and the header/footer distance
rHdFtDelta = rPgDelta = rHeight / 4;
rHeight -= rPgDelta;
-#endif
}
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index 4519aed..7ef51dc 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -3248,17 +3248,6 @@ void SwW4WParser::Read_FootNoteInfo() // (FNI)
void SwW4WParser::UpdateCacheVars()
{
-#if 0
- const SwFrmFmt &rFmt = pPageDesc->GetMaster();
- ASSERT( pPageDesc->GetMaster().GetFrmSize().GetFixSize() != LONG_MAX ,
- "Seitenbreite (Master) falsch" );
- ASSERT( pPageDesc->GetLeft().GetFrmSize().GetFixSize() != LONG_MAX ,
- "Seitenbreite (Left) falsch" );
- ASSERT( pPageDesc->GetMaster().GetFrmSize().GetVarSize() != LONG_MAX ,
- "Seitenlaenge (Master) falsch" );
- ASSERT( pPageDesc->GetLeft().GetFrmSize().GetVarSize() != LONG_MAX ,
- "Seitenlaenge (Left) falsch" );
-#else
SwFrmFmt *pFmt = &pPageDesc->GetLeft();
SwFmtFrmSize aSz( pFmt->GetFrmSize() );
BOOL bSet = FALSE;
@@ -3297,7 +3286,6 @@ void SwW4WParser::UpdateCacheVars()
if( bSet )
pFmt->SetAttr( aSz );
-#endif
const SvxLRSpaceItem& rPageLR = pFmt->GetLRSpace();
nPgLeft = (USHORT)(rPageLR.GetTxtLeft() + nLeftMgnCorr);
nPgRightDelta = (USHORT)( rPageLR.GetRight() );
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx
index d7526f3..d8d91b2 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx
@@ -355,46 +355,6 @@ void SwW4WParser::StyleAnfang()
// anscheinend nur bei WP richtig quotet. Bei WW stimmt's bei OS/2 nicht,
// bei AMI stimmt's nie
-//JP 11.05.00: UNICODE-CHANGE - stimmt das noch so ??
-#if 0
- if ( nDocType == 44 || nDocType == 33 ) // Hier stimmen die Umlaute nicht
- {
- rtl_TextEncoding eCS = RTL_TEXTENCODING_IBM_437; // Wandle Umlaute in ALay - Namen
- if ( nDocType == 44 )
- eCS = RTL_TEXTENCODING_MS_1252; // WinWord hat Ansi-Charset
- register BYTE ch, ch2;
- for ( USHORT i=0; i<nChrCnt; i++ )
- {
- ch = aCharBuffer[i];
- if ( ch < 32 || ch > 127 )
- {
- ch2 = String::Convert( ch, eCS, eSysCharSet );
- aCharBuffer[i] = ( ch2 == 0 ) ? ch : ch2;
- }
- else if ( nDocType == 33 && ch == '<' // AMI-Pro-Umlaute
- && aCharBuffer[i+1] == '\\' )
- {
- ch = aCharBuffer[i+2];
- switch ( ch )
- {
- case 'd': ch = 0x84; break;
- case 'v': ch = 0x94; break;
- case '|': ch = 0x81; break;
- case '_': ch = 0xe1; break;
- case 'D': ch = 0x8e; break;
- case 'V': ch = 0x99; break;
- case '\\': ch = 0x9a; break;
- default: ch = 'X' ; break;
- }
- ch2 = String::Convert( ch, eCS, eSysCharSet ); // Umlaut in's System
- aCharBuffer[i] = ch2;
- for ( USHORT j=i+1; j+3<nChrCnt; j++ ) // loesche Klammern
- aCharBuffer[j] = aCharBuffer[j+3];
- nChrCnt -= 3;
- }
- }
- } // Ende Umpopelungen
-#endif
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
index ab9991c..0949d92 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
@@ -469,19 +469,6 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
(OUString( RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.document.IndexedPropertyValues") ) ), UNO_QUERY);
if (xBox.is() )
{
-#if 0
- Any aAny;
- sal_Int32 i=0;
- for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst();
- pFrame;
- i++, pFrame = SfxViewFrame::GetNext(*pFrame ) )
- {
- Sequence < PropertyValue > aSequence;
- pFrame->GetViewShell()->WriteUserDataSequence( aSequence, sal_False );
- aAny <<= aSequence;
- xBox->insertByIndex(i, aAny);
- }
-#endif
pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "Views") );
pValue[nIndex++].Value <<= Reference < XIndexAccess > ( xBox, UNO_QUERY );
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
index 14e3fa5..ac94670 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
@@ -129,38 +129,7 @@ sal_Bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
return bRet;
}
-void SwXMLImportTableItemMapper_Impl::finished( SfxItemSet& rSet ) const
-{
-#if 0
- const SfxPoolItem *pItem;
-
- // ensure that box item have a distance to a border.
- if( SFX_ITEM_SET == rSet.GetItemState( RES_BOX, sal_False, &pItem ) )
- {
- const SvxBoxItem *pBox = (const SvxBoxItem *)pItem;
- sal_uInt16 aLines[4] = { BOX_LINE_TOP, BOX_LINE_BOTTOM,
- BOX_LINE_LEFT, BOX_LINE_RIGHT };
- sal_uInt16 i;
- for( i=0; i<4; i++ )
- {
- if( pBox->GetLine( aLines[i] ) &&
- pBox->GetDistance( aLines[i] ) < MIN_BORDER_DIST )
- break;
- }
- if( i < 4 )
- {
- SvxBoxItem aBox( *pBox );
- for( /*i=0*/; i<4; i++ ) // i points to the mod. line
- {
- if( aBox.GetLine( aLines[i] ) &&
- aBox.GetDistance( aLines[i] ) < MIN_BORDER_DIST )
- aBox.SetDistance( MIN_BORDER_DIST, aLines[i] );
- }
- rSet.Put( aBox );
- }
- }
-#endif
-}
+void SwXMLImportTableItemMapper_Impl::finished( SfxItemSet& rSet ) const { }
// ---------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
index 1d6b371..b9fc4cb 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
@@ -75,29 +75,6 @@ using rtl::OUStringBuffer;
// ---------------------------------------------------------------------
-#if 0
-class SwXMLMetaContext_Impl : public SfxXMLMetaContext
-{
-public:
- SwXMLMetaContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLName,
- const Reference< document::XDocumentInfo > & rInfo ) :
- SfxXMLMetaContext( rImport, nPrfx, rLName, rInfo )
- {}
-
- virtual void SetDocLanguage( LanguageType eLang );
-};
-
-void SwXMLMetaContext_Impl::SetDocLanguage( LanguageType eLang )
-{
- SwDoc& rDoc = ((SwXMLImport&)GetImport()).GetDoc();
-
- rDoc.SetDefault( SvxLanguageItem( eLang, RES_CHRATR_LANGUAGE ) );
-}
-#endif
-
-// ---------------------------------------------------------------------
-
SvXMLImportContext *SwXMLImport::CreateMetaContext(
const OUString& rLocalName )
{
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index c360d4d..d769758 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -2188,32 +2188,6 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
// is a content box
nSplitCol = nCol + 1UL;
-#if 0
- // eventuell ist die Zelle noch leer
- if( !pCell->GetContents() )
- {
- ASSERT( 1UL==pCell->GetRowSpan(),
- "leere Box ist nicht 1 Zeile hoch" );
- const SwStartNode* pPrevStNd =
- GetPrevBoxStartNode( nTopRow, nStartCol );
- HTMLTableCnts *pCnts = new HTMLTableCnts(
- pParser->InsertTableSection(pPrevStNd) );
- SwHTMLTableLayoutCnts *pCntsLayoutInfo =
- pCnts->CreateLayoutInfo();
-
- pCell->SetContents( pCnts );
- pLayoutInfo->GetCell( nTopRow, nStartCol )
- ->SetContents( pCntsLayoutInfo );
-
- // ggf. COLSPAN beachten
- for( sal_uInt16 j=nStartCol+1; j<nSplitCol; j++ )
- {
- GetCell(nTopRow,j)->SetContents( pCnts );
- pLayoutInfo->GetCell( nTopRow, j )
- ->SetContents( pCntsLayoutInfo );
- }
- }
-#endif
pBox = MakeTableBox( pLine, pCell,
nTopRow, nStartCol,
nBottomRow, nSplitCol );
diff --git a/binfilter/bf_sw/source/ui/inc/swmn.hrc b/binfilter/bf_sw/source/ui/inc/swmn.hrc
index 06f8857..2b9041c 100644
--- a/binfilter/bf_sw/source/ui/inc/swmn.hrc
+++ b/binfilter/bf_sw/source/ui/inc/swmn.hrc
@@ -6058,70 +6058,6 @@ MenuItem _MN_INS
#endif //MN_SW_PORTAL
//#else
-#if 0
- MenuItem
- {
- Identifier = SID_INSERT_PLUGIN ;
- HelpID = SID_INSERT_PLUGIN ;
- Text [ de ] = "PlugIn..." ;
- Text [ en-US ] = "Plug-in..." ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "PlugIn...";
- Text[ ru ] = "Подключаемый модуль...";
- Text[ el ] = "Συνδεόμενη υπομονάδα...";
- Text[ nl ] = "PlugIn...";
- Text[ fr ] = "Plug-in...";
- Text[ es ] = "Plug-in...";
- Text[ fi ] = "Lisäosa...";
- Text[ ca ] = "Extensió...";
- Text[ it ] = "PlugIn...";
- Text[ sk ] = "Zásuvný modul...";
- Text[ da ] = "PlugIn...";
- Text[ sv ] = "Plug-in...";
- Text[ pl ] = "Wtyczka plug-in...";
- Text[ pt-BR ] = "Plug-in...";
- Text[ th ] = "ปลั๊à¸à¸à¸´à¸™...";
- Text[ ja ] = "プラグイン...";
- Text[ ko ] = "플러그ì¸...";
- Text[ zh-CN ] = "Plug-In ...";
- Text[ zh-TW ] = "PlugIn...";
- Text[ tr ] = "Takı...";
- Text[ hi-IN ] = "पà¥à¤²à¤—-इन...";
- Text[ ar ] = "...توصيل";
- Text[ he ] = "â€®×ª×•×›× ×” מיתווספת...‬";
- };
- MenuItem
- {
- Identifier = SID_INSERT_APPLET ;
- HelpID = SID_INSERT_APPLET ;
- Text [ de ] = "Applet..." ;
- Text [ en-US ] = "Applet..." ;
- Text [ x-comment ] = " ";
- Text[ pt ] = "Applet...";
- Text[ ru ] = "Ðпплет...";
- Text[ el ] = "ΜικÏοεφαÏμογή...";
- Text[ nl ] = "Applet...";
- Text[ fr ] = "Applet...";
- Text[ es ] = "Miniaplicación...";
- Text[ fi ] = "Sovelma...";
- Text[ ca ] = "Applet...";
- Text[ it ] = "Applet...";
- Text[ sk ] = "Applet...";
- Text[ da ] = "Applet...";
- Text[ sv ] = "Applet...";
- Text[ pl ] = "Aplet...";
- Text[ pt-BR ] = "Applet...";
- Text[ th ] = "à¹à¸à¹‡à¸žà¹€à¸žà¸¥à¹‡à¸•...";
- Text[ ja ] = "アプレット...";
- Text[ ko ] = "ì• í”Œë¦¿...";
- Text[ zh-CN ] = "Applet...";
- Text[ zh-TW ] = "Applet...";
- Text[ tr ] = "Applet...";
- Text[ hi-IN ] = "à¤à¤ªà¥à¤²à¥‡à¤Ÿà¥...";
- Text[ ar ] = "...تطبيق صغير";
- Text[ he ] = "â€®×ª×•×›× ×™×ª×•× ×ª...‬";
- };
-#endif
MenuItem
{
Identifier = SID_INSERT_FLOATINGFRAME ;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
index 0a4a3ff..47cbbdf 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
@@ -1334,120 +1334,6 @@ void SchXMLExportHelper::exportPlotArea( uno::Reference< chart::XDiagram > xDiag
// the sequence aDataPointSeq contains indices of data-points that
// do have own attributes. This increases the performance substantially.
-#if 0
- sal_Int32 nRepeated = 1;
- if( mxExpPropMapper.is())
- {
- sal_Bool bIsEmpty = sal_False;
- ::rtl::OUString aLastASName;
- aASName = ::rtl::OUString();
-
- for( sal_Int32 nElement = 0; nElement < mnSeriesLength; nElement++ )
- {
- // get property states for autostyles
- try
- {
- xPropSet = xDiagram->getDataPointProperties( nElement, nSeries );
- }
- catch( uno::Exception aEx )
- {
- String aStr( aEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR1( "Exception caught during Export of data point: %s", aBStr.GetBuffer());
- }
- if( xPropSet.is())
- aPropertyStates = mxExpPropMapper->Filter( xPropSet );
- bIsEmpty = ( aPropertyStates.size() == 0 );
-
- if( bExportContent )
- {
- if( bIsEmpty )
- aASName = ::rtl::OUString();
- else
- {
-// AddAutoStyleAttribute( aPropertyStates ); // can't be used here because we need the name
- DBG_ASSERT( ! maAutoStyleNameQueue.empty(), "Autostyle queue empty!" );
- if( ! maAutoStyleNameQueue.empty())
- {
- aASName = maAutoStyleNameQueue.front();
- maAutoStyleNameQueue.pop();
- }
- }
-
-
- // The following conditional realizes a run-length compression. For every run of data
- // points with the same style only one point is written together with a repeat count.
- // The style of the current data point is compared with that of the last data point.
- // If they differ, then the _last_ data point and, if greater than 1, the repreat count
- // are written, else the repeat count is increased but no output takes place.
- // This has two consequences: 1. the first data point is skipped,
- // because it can not be compared to a predecessor and 2. the last data point (or series
- // of data points with the same style) is written outside and after the enclosing loop.
- if( nElement )
- {
- if( aASName.equals( aLastASName ))
- {
- nRepeated++;
- }
- else
- {
- // Write the style of the last data point(s).
-
- // Write reapeat counter (if data point run contains more than one point).
- if( nRepeated > 1 )
- {
- mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED,
- ::rtl::OUString::valueOf( (sal_Int64)( nRepeated ) ));
- }
-
- // Write style if it is present and is not the same as that of the data series.
- if( aLastASName.getLength() &&
- ! aLastASName.equals( aSeriesASName ))
- {
- mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_STYLE_NAME, aLastASName );
- }
-
- // Write the actual point data.
- SvXMLElementExport aPoint( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True );
-
- // Reset repeat counter for the new style.
- nRepeated = 1;
- aLastASName = aASName;
- }
- }
- else
- // Remember the name of the first data point's style as that of the next point's
- // predecessor.
- aLastASName = aASName;
- }
- else
- {
- if( ! bIsEmpty )
- CollectAutoStyle( aPropertyStates );
- }
- aPropertyStates.clear();
- } // End of loop over data points.
-
- // Now write the style for the last data point(s).
- if( bExportContent )
- {
- if( nRepeated > 1 )
- {
- mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED,
- ::rtl::OUString::valueOf( (sal_Int64)( nRepeated ) ));
- }
-
- if( ! bIsEmpty &&
- aLastASName.getLength() &&
- ! aLastASName.equals( aSeriesASName ))
- {
- mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_STYLE_NAME, aLastASName );
- }
-
- SvXMLElementExport aPoint( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True );
- }
- }
-#else
// more performant version for #93600#
if( mxExpPropMapper.is())
{
@@ -1591,7 +1477,6 @@ void SchXMLExportHelper::exportPlotArea( uno::Reference< chart::XDiagram > xDiag
}
}
}
-#endif
// close series element
if( pSeries )
diff --git a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
index 813c4d1..4a17c1c 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
@@ -314,26 +314,6 @@ void XMLEmbeddedObjectImportContext::EndElement()
aSeq );
}
}
-#if 0
- // reset modifies state for the object since it has been imported
- // completly and therfor hasn't been modified.
- Reference < XModifiable > xModifiable( xComp, UNO_QUERY );
- if( xModifiable.is() )
- {
- try
- {
- xModifiable->setModified( sal_False );
- }
- catch( ::com::sun::star::beans::PropertyVetoException& e )
- {
- Sequence<OUString> aSeq( 0 );
- GetImport().SetError( XMLERROR_FLAG_WARNING |
- XMLERROR_API,
- aSeq );
- }
- }
-#endif
-
}
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
index 3b69c19..b4cc36e 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
@@ -216,81 +216,6 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
if( eUnit != XML_TOKEN_INVALID )
rOut.append( GetXMLToken(eUnit) );
-#if 0
- enum XMLTokenEnum eUnit;
- long nFac = 1;
- switch( eOutUnit )
- {
- case MAP_100TH_MM:
- nFac *= 10L;
- case MAP_10TH_MM:
- nFac *= 10L;
- eOutUnit = MAP_MM;
- case MAP_MM:
- // 0.01mm
- nFac *= 100L;
- eUnit = XML_UNIT_MM;
- break;
-
- case MAP_CM:
-#ifdef EXACT_VALUES
- // 0.001cm
- nFac *= 1000L;
-#else
- // 0.01cm
- nFac *= 100L;
-#endif
- eUnit = XML_UNIT_CM;
- break;
-
- case MAP_TWIP:
- case MAP_POINT:
-#ifdef EXACT_VALUES
- // 0.01pt
- nFac *= 100L;
-#else
- // 0.1pt
- nFac *= 10L;
-#endif
- eUnit = XML_UNIT_PT;
- break;
-
- case MAP_1000TH_INCH:
- nFac *= 10L;
- case MAP_100TH_INCH:
- nFac *= 10L;
- case MAP_10TH_INCH:
- nFac *= 10L;
- case MAP_INCH:
- default:
- eOutUnit = MAP_INCH;
-#ifdef EXACT_VALUES
- // 0.0001in
- nFac *= 10000L;
-#else
- // 0.01in
- nFac *= 100L;
-#endif
- eUnit = XML_UNIT_INCH;
- break;
- }
-
- if( eValueUnit != eOutUnit )
- nValue = OutputDevice::LogicToLogic( nValue, eValueUnit, eOutUnit );
-
- rOut.append( nValue / nFac );
- if( nFac > 1 && (nValue % nFac) != 0 )
- {
- rOut.append( sal_Unicode('.') );
- while( nFac > 1 && (nValue % nFac) != 0 )
- {
- nFac /= 10L;
- rOut.append( (nValue / nFac) % 10L );
- }
- }
-
- rOut.append( GetXMLToken(eUnit) );
-#endif
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
index 8c2301a..4891c46 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
@@ -677,52 +677,20 @@ void SvXMLExport::ImplExportStyles( sal_Bool bUsed )
void SvXMLExport::ImplExportAutoStyles( sal_Bool bUsed )
{
-// AddAttributeASCII( XML_NAMESPACE_NONE, XML_ID, XML_AUTO_STYLES_ID );
- {
- // <style:automatic-styles>
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
- XML_AUTOMATIC_STYLES, sal_True, sal_True );
-
-#if 0
- AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, XML_STYLES_HREF );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE,
- pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE,
- GetXMLToken(XML_STYLESHEET)) );
- {
- // <style:use-styles>
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
- XML_USE_STYLES, sal_True, sal_True );
- }
-#endif
- _ExportAutoStyles();
- }
+ // <style:automatic-styles>
+ SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES,
+ sal_True, sal_True );
+
+ _ExportAutoStyles();
}
void SvXMLExport::ImplExportMasterStyles( sal_Bool bUsed )
{
- {
- // <style:master-styles>
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,
- sal_True, sal_True );
-
- _ExportMasterStyles();
- }
+ // <style:master-styles>
+ SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,
+ sal_True, sal_True );
-#if 0
- AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, XML_AUTO_STYLES_HREF );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE,
- pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE,
- GetXMLToken(XML_STYLESHEET) ) );
- {
- // <style:use-styles>
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
- XML_USE_STYLES, sal_True, sal_True );
- }
-#endif
+ _ExportMasterStyles();
}
void SvXMLExport::ImplExportContent()
diff --git a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
index cb06e63..5b4d070 100644
--- a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
+++ b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
@@ -320,18 +320,6 @@ void SfxXMLMetaExport::Export()
}
// document language
-#if 0
- if ( eLanguage != LANGUAGE_SYSTEM )
- {
- sValue = ConvertLanguageToIsoString( eLanguage, '-' );
- if ( sValue.getLength() )
- {
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DC, XML_LANGUAGE,
- sal_True, sal_False );
- aElem->Characters( sValue );
- }
- }
-#endif
if ( aLocale.Language.getLength() )
{
sValue = aLocale.Language;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx b/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx
index c70fe29..91a371b 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx
@@ -237,32 +237,6 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
return sal_True;
}
-#if 0
-void XMLStyleExport::exportStyleFamily(
- const sal_Char *pFamily,
- const OUString& rXMLFamily,
- const UniReference < XMLPropertySetMapper >& rPropMapper,
- sal_Bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix)
-{
- const OUString sFamily(OUString::createFromAscii(pFamily ));
- UniReference < SvXMLExportPropertyMapper > xExpPropMapper =
- new SvXMLExportPropertyMapper( rPropMapper );
- exportStyleFamily( sFamily, rXMLFamily, xExpPropMapper, bUsed, nFamily,
- pPrefix);
-}
-
-void XMLStyleExport::exportStyleFamily(
- const OUString& rFamily, const OUString& rXMLFamily,
- const UniReference < XMLPropertySetMapper >& rPropMapper,
- sal_Bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix)
-{
- UniReference < SvXMLExportPropertyMapper > xExpPropMapper =
- new SvXMLExportPropertyMapper( rPropMapper );
- exportStyleFamily( rFamily, rXMLFamily, xExpPropMapper, bUsed, nFamily,
- pPrefix);
-}
-#endif
-
void XMLStyleExport::exportStyleFamily(
const sal_Char *pFamily,
const OUString& rXMLFamily,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list