binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx | 3
binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode5.cxx | 5
binfilter/bf_sch/source/core/sch_chtmode6.cxx | 16 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 2
binfilter/bf_starmath/source/starmath_mathml.cxx | 148 --------------
binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx | 2
binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx | 15 -
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 16 -
binfilter/bf_svx/source/form/svx_fmpage.cxx | 16 -
binfilter/bf_svx/source/outliner/svx_outlvw.cxx | 92 --------
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 49 ----
binfilter/bf_svx/source/svxlink/svx_fileobj.cxx | 36 ---
binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx | 3
binfilter/bf_sw/source/core/inc/laycache.hxx | 3
binfilter/bf_sw/source/core/inc/tblrwcl.hxx | 3
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 7
binfilter/bf_sw/source/core/text/porlin.hxx | 3
binfilter/bf_sw/source/core/text/sw_porlin.cxx | 12 -
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 3
binfilter/bf_sw/source/core/text/txtfly.hxx | 5
binfilter/bf_sw/source/ui/inc/edtwin.hxx | 8
binfilter/bf_sw/source/ui/uno/SwXDocumentSettings.hxx | 2
binfilter/bf_sw/source/ui/uno/SwXPrintPreviewSettings.hxx | 2
24 files changed, 8 insertions(+), 445 deletions(-)
New commits:
commit c4f33e6da3e1370d7fed705594d99a567baea5ea
Author: Joseph Powers <jpower...@cox.net>
Date: Tue Oct 4 07:48:17 2011 -0700
Cleanup the #if a little
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
index 9ef5ae5..f5db657 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-#ifdef PRECOMPILED
-#endif
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
index 4408711..a359233 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
@@ -33,8 +33,6 @@
#include "xmlexprt.hxx"
#include "xmlimprt.hxx"
-/*#ifndef _PROPIMP0_HXX
-#endif*/
#include "XMLConverter.hxx"
#include <bf_xmloff/xmlnmspe.hxx>
diff --git a/binfilter/bf_sch/source/core/sch_chtmode5.cxx
b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
index 3295557..e9dc807 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode5.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
@@ -41,12 +41,8 @@
#define ITEMID_DOUBLE 0
#define ITEMID_CHARTTEXTORDER SCHATTR_TEXT_ORDER
#define ITEMID_CHARTTEXTORIENT SCHATTR_TEXT_ORIENT
-
-
#endif
-#ifndef _CHTMODEL_HXX
-#endif
#include <bf_svx/svxids.hrc>
#include <math.h>
#include <float.h>
@@ -61,6 +57,7 @@
#endif
#include <bf_svtools/zforlist.hxx>
#endif
+
namespace binfilter {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode6.cxx
b/binfilter/bf_sch/source/core/sch_chtmode6.cxx
index afce003..d2d0e6e 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode6.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode6.cxx
@@ -35,11 +35,7 @@
#define _SDR_NOITEMS
#define _SDR_NOTOUCH
#define _SDR_NOTRANSFORM
-//#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS ***
-//#define SI_NOITEMS
-//#define SI_NODRW
#define _SI_NOSBXCONTROLS
#define _SI_NOOTHERFORMS
#define _SI_NOCONTROL
@@ -47,9 +43,6 @@
#include <bf_svx/xdef.hxx>
-#ifndef _SV_MENU_HXX //autogen
-#endif
-
#include "schattr.hxx"
#ifndef _SVX_CHRTITEM_HXX //autogen
@@ -71,17 +64,10 @@
#include <bf_svx/dialogs.hrc>
-#ifndef _CHTMODEL_HXX
-#endif
-
#include "docshell.hxx"
-
-
-
-
-
#include <bf_sfx2/printer.hxx>
+
namespace binfilter {
/*************************************************************************
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 9482507..849d2f5 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -1290,10 +1290,8 @@ void SAL_CALL ChXDiagram::setPropertyValues (
uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT (context2, "sch (af119097)
::ChXDiagram::setPropertyValues");
-#if 1
for (sal_Int32 i=0; i<aPropertyNames.getLength(); i++)
setPropertyValue (aPropertyNames[i], aValues[i]);
-#endif
}
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx
b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 16295ea..22b5912 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -992,65 +992,7 @@ public:
void SmXMLStyleContext_Impl::StartElement(const uno::Reference<
xml::sax::XAttributeList > & xAttrList )
{
- #if 1
aStyleHelper.RetrieveAttrs(xAttrList);
- #else
- sal_Int8 nOldIsBold=nIsBold;
- sal_Int8 nOldIsItalic=nIsItalic;
- double nOldFontSize=nFontSize;
- sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- OUString sOldFontFamily = sFontFamily;
- for (sal_Int16 i=0;i<nAttrCount;i++)
- {
- OUString sAttrName = xAttrList->getNameByIndex(i);
- OUString aLclLocalName;
- sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
- GetKeyByAttrName(sAttrName,&aLclLocalName);
- OUString sValue = xAttrList->getValueByIndex(i);
- const SvXMLTokenMap &rAttrTokenMap =
- GetSmImport().GetPresLayoutAttrTokenMap();
- switch(rAttrTokenMap.Get(nLclPrefix,aLclLocalName))
- {
- case XML_TOK_FONTWEIGHT:
- nIsBold =
sValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(
- sXML_bold)));
- break;
- case XML_TOK_FONTSTYLE:
- nIsItalic =
sValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(
- sXML_italic)));
- break;
- case XML_TOK_FONTSIZE:
- SvXMLUnitConverter::convertDouble(nFontSize,sValue);
- GetSmImport().GetMM100UnitConverter().
- setXMLMeasureUnit(MAP_POINT);
- if (-1 == sValue.indexOf(OUString(
- RTL_CONSTASCII_USTRINGPARAM(sXML_unit_pt))))
- if (-1 == sValue.indexOf('%'))
- nFontSize=0.0;
- else
- {
- GetSmImport().GetMM100UnitConverter().
- setXMLMeasureUnit(MAP_RELATIVE);
- }
- break;
- case XML_TOK_FONTFAMILY:
- sFontFamily = sValue;
- break;
- case XML_TOK_COLOR:
- sColor = sValue;
- break;
- default:
- break;
- }
- }
-
- if ((nOldIsBold!=nIsBold) || (nOldIsItalic!=nIsItalic) ||
- (nOldFontSize!=nFontSize) || (sOldFontFamily!=sFontFamily)
- || sColor.getLength())
- bFontNodeNeeded=sal_True;
- else
- bFontNodeNeeded=sal_False;
- #endif
}
@@ -1064,97 +1006,7 @@ public:
SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
if (rNodeStack.Count() - nElementCount > 1)
SmXMLRowContext_Impl::EndElement();
- #if 1
aStyleHelper.ApplyAttrs();
- #else
- if (bFontNodeNeeded)
- {
- SmToken aToken;
- aToken.cMathChar = '\0';
- aToken.nGroup = 0;
- aToken.nLevel = 5;
-
- if (nIsBold != -1)
- {
- if (nIsBold)
- aToken.eType = TBOLD;
- else
- aToken.eType = TNBOLD;
- SmStructureNode *pFontNode = static_cast<SmStructureNode *>
- (new SmFontNode(aToken));
- pFontNode->SetSubNodes(0,rNodeStack.Pop());
- rNodeStack.Push(pFontNode);
- }
- if (nIsItalic != -1)
- {
- if (nIsItalic)
- aToken.eType = TITALIC;
- else
- aToken.eType = TNITALIC;
- SmStructureNode *pFontNode = static_cast<SmStructureNode *>
- (new SmFontNode(aToken));
- pFontNode->SetSubNodes(0,rNodeStack.Pop());
- rNodeStack.Push(pFontNode);
- }
- if (nFontSize != 0.0)
- {
- aToken.eType = TSIZE;
- SmFontNode *pFontNode = new SmFontNode(aToken);
-
- if (MAP_RELATIVE == GetSmImport().GetMM100UnitConverter().
- getXMLMeasureUnit())
- {
- if (nFontSize < 100.00)
- pFontNode->SetSizeParameter(Fraction(100.00/nFontSize),
- FNTSIZ_DIVIDE);
- else
- pFontNode->SetSizeParameter(Fraction(nFontSize/100.00),
- FNTSIZ_MULTIPLY);
- }
- else
-
pFontNode->SetSizeParameter(Fraction(nFontSize),FNTSIZ_ABSOLUT);
-
- pFontNode->SetSubNodes(0,rNodeStack.Pop());
- rNodeStack.Push(pFontNode);
- }
- if (sFontFamily.getLength())
- {
- if (sFontFamily.equalsIgnoreCase(OUString(
- RTL_CONSTASCII_USTRINGPARAM(sXML_fixed))))
- aToken.eType = TFIXED;
- else if (sFontFamily.equalsIgnoreCase(OUString(
- RTL_CONSTASCII_USTRINGPARAM("sans"))))
- aToken.eType = TSANS;
- else if (sFontFamily.equalsIgnoreCase(OUString(
- RTL_CONSTASCII_USTRINGPARAM("serif"))))
- aToken.eType = TSERIF;
- else //Just give up, we need to extend our font mechanism to be
- //more general
- return;
-
- aToken.aText = sFontFamily;
- SmFontNode *pFontNode = new SmFontNode(aToken);
- pFontNode->SetSubNodes(0,rNodeStack.Pop());
- rNodeStack.Push(pFontNode);
- }
- if (sColor.getLength())
- {
- //Again we can only handle a small set of colours in
- //StarMath for now.
- const SvXMLTokenMap& rTokenMap =
- GetSmImport().GetColorTokenMap();
- aToken.eType = static_cast<SmTokenType>(rTokenMap.Get(
- XML_NAMESPACE_MATH, sColor));
- if (aToken.eType != -1)
- {
- SmFontNode *pFontNode = new SmFontNode(aToken);
- pFontNode->SetSubNodes(0,rNodeStack.Pop());
- rNodeStack.Push(pFontNode);
- }
- }
-
- }
- #endif
}
class SmXMLPaddedContext_Impl : public SmXMLRowContext_Impl
diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
index 6dfb3c4..efcba43 100644
--- a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
@@ -521,7 +521,6 @@ ReadState JPEGReader::Read( Graphic& rGraphic )
BOOL bRet = FALSE;
BYTE cDummy;
-#if 1 // TODO: is it possible to get rid of this seek to the end?
// check if the stream's end is already available
rIStm.Seek( STREAM_SEEK_TO_END );
rIStm >> cDummy;
@@ -540,7 +539,6 @@ ReadState JPEGReader::Read( Graphic& rGraphic )
// seek back to the original position
rIStm.Seek( nLastPos );
-#endif
Size aPreviewSize = GetPreviewSize();
SetJpegPreviewSizeHint( aPreviewSize.Width(), aPreviewSize.Height() );
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index 799b4ee..a714c96 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -92,7 +92,6 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
{
int nTopics = 0;
-#if 1
TCHAR chTopicBuf[250];
if( hText1 )
DdeQueryString( pInst->hDdeInstSvr, hText1, chTopicBuf,
@@ -121,20 +120,6 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
}
}
-#else
- for( pService = rAll.First();pService;pService = rAll.Next() )
- {
- if ( !hText2 || ( *pService->pName == hText2 ) )
- {
- for( pTopic = pService->aTopics.First(); pTopic;
- pTopic = pService->aTopics.Next() )
- {
- if ( !hText1 || (*pTopic->pName == hText1) )
- nTopics++;
- }
- }
- }
-#endif
if( !nTopics )
return (HDDEDATA)NULL;
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index a8fd09b..45e41ea 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -36,17 +36,12 @@
#include <lspcitem.hxx>
-
-
#include "itemdata.hxx"
#include <tools/date.hxx>
#include <tools/time.hxx>
-
-
-
#include <vcl/window.hxx>
#include <impedit.hxx>
@@ -64,23 +59,14 @@
#include <scripttypeitem.hxx>
#include <frmdiritem.hxx>
-
-
-
#include <vcl/cmdevt.h>
-#ifndef SVX_LIGHT
-#endif
-
-
-
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/text/CharacterCompressionType.hpp>
-
-
#include <unicode/ubidi.h>
+
namespace binfilter {
using namespace ::com::sun::star;
diff --git a/binfilter/bf_svx/source/form/svx_fmpage.cxx
b/binfilter/bf_svx/source/form/svx_fmpage.cxx
index 775eb85..19a90a5 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -34,19 +34,12 @@
#include "fmpage.hxx"
-
-
#include "fmmodel.hxx"
#ifndef SVX_LIGHT
-#endif
-
-#ifndef SVX_LIGHT
#include "fmresids.hrc"
#endif
-
-
#ifndef SVX_LIGHT
#include "fmpgeimp.hxx"
#endif
@@ -54,21 +47,12 @@
#include "svdio.hxx"
#ifndef SVX_LIGHT
-#endif
-
-
-
-
-
-
-#ifndef SVX_LIGHT
#include "fmprop.hrc"
using namespace ::binfilter::svxform;
#endif
namespace binfilter {
-
/*N*/ TYPEINIT1(FmFormPage, SdrPage);
//------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
b/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
index 435c401..62f5fa8 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlvw.cxx
@@ -35,20 +35,10 @@
#define _OUTLINER_CXX
#include <outleeng.hxx>
-
-
-
-
-
-
-
-
-
#include "editview.hxx"
namespace binfilter {
-
// Breite der Randzonen innerhalb derer beim D&D gescrollt wird
#define OL_SCROLL_LRBORDERWIDTHPIX 10
#define OL_SCROLL_TBBORDERWIDTHPIX 10
@@ -72,35 +62,6 @@ namespace binfilter {
/*N*/ return pEditView->GetVisArea();
/*N*/ }
-
-
-// MT 05/00: Wofuer dies ImpXXXScroll, sollte das nicht die EditEngine
machen???
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void OutlinerView::Cut()
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -110,32 +71,23 @@ namespace binfilter {
/*N*/ }
-
-
// =====================================================================
// ====================== Einfache Durchreicher =======================
// ======================================================================
-
-
-
/*N*/ void OutlinerView::SetSelection( const ESelection& rSel )
/*N*/ {
/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ pEditView->SetSelection( rSel );
/*N*/ }
-
/*N*/ Window* OutlinerView::GetWindow() const
/*N*/ {
/*N*/ DBG_CHKTHIS(OutlinerView,0);
/*N*/ return pEditView->GetWindow();
/*N*/ }
-
-
-
/*N*/ Rectangle OutlinerView::GetOutputArea() const
/*N*/ {
/*N*/ DBG_CHKTHIS(OutlinerView,0);
@@ -148,54 +100,10 @@ namespace binfilter {
/*N*/ return pEditView->GetSelection();
/*N*/ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void OutlinerView::Copy()
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#ifndef SVX_LIGHT
-#endif
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 90e44e4..8dfe10a 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -26,14 +26,8 @@
*
************************************************************************/
-
-
#include "svdogrp.hxx"
-#ifndef SVX_LIGHT
-#endif
-
-
#include <bf_svtools/urihelper.hxx>
#include "xpool.hxx"
@@ -45,7 +39,6 @@
#include "svdoedge.hxx" // #32383# Die Verbinder nach Move nochmal
anbroadcasten
#include "svdstr.hrc" // Objektname
-
#include "svxids.hrc"
#include <bf_svtools/whiter.hxx>
@@ -53,37 +46,6 @@
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
-#ifndef SVX_LIGHT
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@ @@@@@ @@@@@@ @@@@@ @@@@@ @@@@ @@ @@ @@@@@ @@ @@ @@ @@
@@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@@ @@
@@ @@
-// @@ @@ @@@@@ @@ @@ @@@ @@@@@ @@ @@ @@ @@ @@@@@ @@ @@ @@@@@@
@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@@
@@ @@
-// @@@@ @@@@@ @@@@ @@@@@ @@ @@ @@@@ @@@@ @@ @@@@@ @@ @@ @@
@@ @@
-//
-// ImpSdrObjGroupLink zur Verbindung von SdrObjGroup und LinkManager
-//
-// Einem solchen Link merke ich mir als SdrObjUserData am Objekt. Im Gegensatz
-// zum Grafik-Link werden die ObjektDaten jedoch kopiert (fuer Paint, etc.).
-// Die Information ob das Objekt ein Link ist besteht genau darin, dass dem
-// Objekt ein entsprechender UserData-Record angehaengt ist oder nicht.
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-// Closed() wird gerufen, wenn die Verkn?fung geloesst wird.
-
-
-
-
-#endif // SVX_LIGHT
-
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// @@ @@ @@ @@ @@ @@ @@ @@ @@@@@ @@@@@@ @@@@@ @@@@@ @@@@ @@@@@@
@@@@
@@ -425,16 +387,6 @@ namespace binfilter {
-/*SdrObject* SdrObjGroup::Clone() const
-{
- SdrObjGroup* pObj=new SdrObjGroup();
- if (pObj!=NULL) {
- *pObj=*this;
- }
- return pObj;
-}*/
-
-
/*N*/ void SdrObjGroup::operator=(const SdrObject& rObj)
/*N*/ {
/*N*/ if (rObj.IsGroupObject()) {
@@ -456,6 +408,7 @@ namespace binfilter {
/*N*/ void SdrObjGroup::RecalcSnapRect()
/*N*/ {
/*N*/ // nicht erforderlich, da die Rects von der SubList verwendet werden.
+ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
b/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
index e6db6ed..cc0cbbc 100644
--- a/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
+++ b/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
@@ -30,10 +30,6 @@
#pragma hdrstop
#endif
-#ifdef OS2
-#endif
-
-
#include <sot/formats.hxx>
#include <bf_so3/lnkbase.hxx>
#include <bf_sfx2/app.hxx>
@@ -109,36 +105,6 @@ using namespace ::com::sun::star::uno;
/*N*/ // LinkManager und damit von dessen Storage erledigt.
/*N*/ rData <<= ::rtl::OUString( sFileNm );
/*N*/
-/*
-===========================================================================
-noch eine Baustelle:
- Idee: hier das Medium und die DocShell anlegen, Doc laden
- und ueber OLE-SS (GetObj(...)) den Bereich als
- PseudoObject erfragen. Dieses mit den Daten oder
- dessen Daten verschicken.
-
-===========================================================================
-
- SfxMedium aMed( aFileNm.GetFull(), STREAM_READ, TRUE );
- aMed.DownLoad(); // nur mal das Medium anfassen (DownLoaden)
-
- if( aMed.IsStorage() )
- pSvData->SetData( SvStorageRef( aMed.GetStorage() ),
- TRANSFER_COPY );
- else
- {
- SvStream* pStream = aMed.GetInStream();
- if( !pStream )
- return FALSE;
-
- UINT32 nLen = pStream->Seek( STREAM_SEEK_TO_END );
- pStream->Seek( STREAM_SEEK_TO_BEGIN );
-
- void* pData = SvMemAlloc( nLen );
- pStream->Read( pData, nLen );
- pSvData->SetData( pData, nLen, TRANSFER_MOVE );
- }
-*/
/*N*/ }
/*N*/ break;
/*N*/
@@ -157,7 +123,6 @@ noch eine Baustelle:
/*?*/ // wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
/*?*/ // GraphicNode entfernt wird.
/*?*/ BOOL bOldNativFormat = bNativFormat;
-/*?*/ //!!?? bNativFormat = 0 != (ASPECT_ICON &
pSvData->GetAspect());
/*?*/
/*?*/ // falls gedruckt werden soll, warten wir bis die
/*?*/ // Daten vorhanden sind
@@ -391,7 +356,6 @@ noch eine Baustelle:
/*?*/ if( !pDownLoadData->aGrf.GetContext() )
/*?*/ {
/*?*/ xMed->SetDataAvailableLink( Link() );
-/*?*/ // xMed->SetDoneLink( Link() );
/*?*/ delete pDownLoadData, pDownLoadData = 0;
/*?*/ bDataReady = TRUE;
/*?*/ bWaitForData = FALSE;
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
index 1f66ed2..5736bf6 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
@@ -31,8 +31,6 @@
#pragma hdrstop
#endif
-#ifdef DBG_UTIL
-#endif
#include <stdlib.h>
#include "swrect.hxx"
@@ -270,7 +268,6 @@ namespace binfilter {
/*N*/ SvStream &operator<<( SvStream &rStream, const SwRect & )
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return rStream;
/*N*/ }
#endif
diff --git a/binfilter/bf_sw/source/core/inc/laycache.hxx
b/binfilter/bf_sw/source/core/inc/laycache.hxx
index c946117..e4d7bf5 100644
--- a/binfilter/bf_sw/source/core/inc/laycache.hxx
+++ b/binfilter/bf_sw/source/core/inc/laycache.hxx
@@ -63,9 +63,6 @@ public:
++nLockCount;
return pImpl; }
void UnlockImpl() { --nLockCount; }
-
-#ifdef DBG_UTIL
-#endif
};
} //namespace binfilter
diff --git a/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
b/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
index 3e01a92..40162d9 100644
--- a/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
+++ b/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
@@ -73,9 +73,6 @@ BOOL lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void*
pPara );
BOOL lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara );
-#ifdef DBG_UTIL
-#endif
-
void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd,
SwTableLine* pLine, SwTableBoxFmt* pBoxFrmFmt,
SwTableBox* pBox, USHORT nInsPos, USHORT nCnt = 1 );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 60f7c6f..9a9f799 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -32,10 +32,12 @@
#include <tools/string.hxx>
#include <bf_svtools/svarray.hxx>
+
#ifndef _SVSTDARR_BYTES_DECL
#define _SVSTDARR_BYTES
#include <bf_svtools/svstdarr.hxx>
#endif
+
#include <bf_so3/svstor.hxx>
#include <bf_so3/persist.hxx>
#include <tools/poly.hxx>
@@ -45,9 +47,11 @@
#include <sw3ids.hxx>
#include <docstat.hxx>
#include <list>
+
class SvStream;
class SvXub_StrLens;
class SvxMacroTableDtor;
+
namespace binfilter {
class ImageMap;
@@ -678,9 +682,6 @@ public:
void GetMacroTable( SvxMacroTableDtor& rMacroTbl );
void ScanMacroTbl( SvxMacroTableDtor& rMacroTbl );
-
-#ifdef TEST_HUGE_DOCS
-#endif
};
inline BOOL Sw3IoImp::IsVersion( USHORT nMinVers ) const
diff --git a/binfilter/bf_sw/source/core/text/porlin.hxx
b/binfilter/bf_sw/source/core/text/porlin.hxx
index 162d8e5..21d9cf8 100644
--- a/binfilter/bf_sw/source/core/text/porlin.hxx
+++ b/binfilter/bf_sw/source/core/text/porlin.hxx
@@ -174,9 +174,6 @@ public:
// Ausgabe
virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
-#ifdef DBG_UTIL
-#endif
-
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
// wird fuer die letzte Portion der Zeile extra gerufen
virtual void FormatEOL( SwTxtFormatInfo &rInf );
diff --git a/binfilter/bf_sw/source/core/text/sw_porlin.cxx
b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
index 37f7423..b572c3d 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlin.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
@@ -31,10 +31,6 @@
#pragma hdrstop
#endif
-#ifdef BIDI
-#endif
-
-
#include "txtcfg.hxx"
#include "pormulti.hxx"
#include "inftxt.hxx"
@@ -223,14 +219,6 @@ namespace binfilter {
/*N*/ return SwPosSize();
/*N*/ }
-#ifdef DBG_UTIL
-
-/*************************************************************************
- * virtual SwLinePortion::Check()
- *************************************************************************/
-
-#endif
-
/*************************************************************************
* virtual SwLinePortion::Format()
*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index 3099398..21f357e 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -1114,9 +1114,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String*
pTxt,
/*M*/ // einen kleineren Font eingestellt als der vom QuoVadis-Text ...
/*M*/ CalcAdjustLine( pCurr );
/*M*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/ #endif
-/*M*/
/*M*/ // Uff...
/*M*/ return nRet;
/*M*/ }
diff --git a/binfilter/bf_sw/source/core/text/txtfly.hxx
b/binfilter/bf_sw/source/core/text/txtfly.hxx
index 817a1f8..85a5c73 100644
--- a/binfilter/bf_sw/source/core/text/txtfly.hxx
+++ b/binfilter/bf_sw/source/core/text/txtfly.hxx
@@ -110,8 +110,6 @@ public:
static const SwRect CalcBoundRect( const SdrObject* pObj,
const SwRect &rLine, const long nXPos, const sal_Bool bRight );
#endif
-#ifdef DBG_UTIL
-#endif
};
/*************************************************************************
@@ -202,9 +200,6 @@ public:
void SetIgnoreCurrentFrame( sal_Bool bNew ) { mbIgnoreCurrentFrame = bNew;
}
void SetIgnoreContour( sal_Bool bNew ) { mbIgnoreContour = bNew; }
-
-#ifdef DBG_UTIL
-#endif
};
// Wenn in das rRect (meist die aktuelle Zeile) kein freifliegender
diff --git a/binfilter/bf_sw/source/ui/inc/edtwin.hxx
b/binfilter/bf_sw/source/ui/inc/edtwin.hxx
index 3efe271..f29db46 100644
--- a/binfilter/bf_sw/source/ui/inc/edtwin.hxx
+++ b/binfilter/bf_sw/source/ui/inc/edtwin.hxx
@@ -156,11 +156,6 @@ friend void PageNumNotify( ViewShell* pVwSh,
protected:
-
-
-
-
-
// Drag & Drop Interface
void ShowAutoTextCorrectQuickHelp( const String& rWord, OfaAutoCorrCfg*
pACfg, SvxAutoCorrect* pACorr );
@@ -205,9 +200,6 @@ public:
const SwView &GetView() const { return rView; }
SwView &GetView() { return rView; }
-#ifdef ACCESSIBLE_LAYOUT
-#endif
-
// Tipfenster loeschen
static inline long GetDDStartPosX() { return nDDStartPosX; }
diff --git a/binfilter/bf_sw/source/ui/uno/SwXDocumentSettings.hxx
b/binfilter/bf_sw/source/ui/uno/SwXDocumentSettings.hxx
index a657aec..0c81805 100644
--- a/binfilter/bf_sw/source/ui/uno/SwXDocumentSettings.hxx
+++ b/binfilter/bf_sw/source/ui/uno/SwXDocumentSettings.hxx
@@ -29,8 +29,6 @@
#ifndef _SW_XDOCUMENT_SETTINGS_HXX
#define _SW_XDOCUMENT_SETTINGS_HXX
-#ifdef PRECOMPILED
-#endif
#ifdef _MSC_VER
#pragma hdrstop
#endif
diff --git a/binfilter/bf_sw/source/ui/uno/SwXPrintPreviewSettings.hxx
b/binfilter/bf_sw/source/ui/uno/SwXPrintPreviewSettings.hxx
index 5ba6503..08e1ade 100644
--- a/binfilter/bf_sw/source/ui/uno/SwXPrintPreviewSettings.hxx
+++ b/binfilter/bf_sw/source/ui/uno/SwXPrintPreviewSettings.hxx
@@ -29,8 +29,6 @@
#ifndef _SW_XPRINTPREVIEWSETTINGS_HXX_
#define _SW_XPRINTPREVIEWSETTINGS_HXX_
-#ifdef PRECOMPILED
-#endif
#ifdef _MSC_VER
#pragma hdrstop
#endif
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
