[ooo-build-commit] .: binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect filter/inc filter/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 4 07:59:52 PDT 2010
binfilter/bf_sw/source/core/unocore/sw_unosect.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx | 1
binfilter/binfilterdetect/source/bindetect.cxx | 3
filter/inc/filter/msfilter/msdffimp.hxx | 12 --
filter/inc/filter/msfilter/svdfppt.hxx | 28 ------
filter/source/msfilter/msdffimp.cxx | 34 +-------
filter/source/msfilter/svdfppt.cxx | 84 --------------------
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 6 -
8 files changed, 12 insertions(+), 158 deletions(-)
New commits:
commit 3239694fea6d1889ed8051acc74fb1dc1e92e689
Author: David Hobley <davidh at sharpblue.org>
Date: Mon Oct 4 16:52:11 2010 +0200
Some more OD style's comments removed
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx
index 75059ef..e09ffb9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx
@@ -784,7 +784,6 @@ void SwXTextSection::setPropertyValues(
{
if(rFmts[i]->GetSection()->GetName() == pSect->GetName())
{
- // --> OD 2006-07-14 #b6448029#
// always prevent update of an existing link in the section
pDoc->ChgSection( i, aSection, aItemSet.pItemSet, sal_True );
// <--
@@ -1311,7 +1310,6 @@ void SwXTextSection::setPropertyToDefault( const OUString& rPropertyName )
{
if(rFmts[i]->GetSection()->GetName() == pSect->GetName())
{
- // --> OD 2006-07-14 #b6448029#
// always prevent update of an existing link in the section
pDoc->ChgSection( i, aSection, pNewAttrSet, sal_True );
// <--
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
index 6505728..0a6b17f 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
@@ -792,7 +792,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
pWrapState->maValue >>= eVal;
switch( eVal )
{
- // --> OD 2006-06-02 #b6432057#
// merge fix #i32592# into binfilter module
case WrapTextMode_NONE:
// no wrapping: disable para-only and contour
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx b/binfilter/binfilterdetect/source/bindetect.cxx
index e79a857..c4c31a3 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -87,8 +87,7 @@ struct TypesInfo
sal_Int32 Length;
};
-// --> OD 2005-08-04 #i47323#, #i51938# - list of file types
-// the binfilter modul is responsible for
+// the binfilter module is responsible for
// - see /filter/source/config/fragments/filters/
static const sal_uInt8 nStreamFileTypeCount = 114;
static const sal_uInt8 nFileTypeCount = 29 + nStreamFileTypeCount;
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 68c4b22..ab8c591 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <tools/solar.h> // UINTXX
+#include <tools/solar.h>
#include <svl/svarray.hxx>
#include <tools/color.hxx>
#include <tools/gen.hxx>
@@ -478,7 +478,7 @@ protected :
void GetCtrlData( long nOffsDgg );
void GetDrawingGroupContainerData( SvStream& rSt,
ULONG nLenDgg );
- // --> OD 2008-08-01 #156763#
+ // #156763#
// Add internal drawing container id as parameter to the sub methods of
// reading the control information about the drawing objects.
// The drawing container id is used to distinguish the text ids of drawing
@@ -494,12 +494,11 @@ protected :
ULONG nLenShapeCont,
ULONG nPosGroup,
const unsigned long nDrawingContainerId );
- // <--
FASTBOOL ReadGraphic( SvStream& rSt, ULONG nIndex, Graphic& rGraphic ) const;
SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const;
SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ) const;
- // --> OD 2004-12-14 #i32596# - pass <nCalledByGroup> to method
+ // #i32596# - pass <nCalledByGroup> to method
// Needed in the Writer Microsoft Word import to avoid import of OLE objects
// inside groups. Instead a graphic object is created.
virtual SdrObject* ImportOLE( long nOLEId,
@@ -508,7 +507,6 @@ protected :
const Rectangle& rVisArea,
const int _nCalledByGroup,
sal_Int64 nAspect ) const;
- // <--
SdrObject* GetAutoForm( MSO_SPT eTyp ) const;
static const GDIMetaFile* lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf, GDIMetaFile& rMtf );
#ifndef SVX_LIGHT
@@ -529,15 +527,12 @@ protected :
virtual ULONG Calc_nBLIPPos( ULONG nOrgVal, ULONG nStreamPos ) const;
virtual FASTBOOL GetColorFromPalette(USHORT nNum, Color& rColor) const;
- // -----------------------------------------------------------------------
-
FASTBOOL ReadDffString(SvStream& rSt, String& rTxt) const;
FASTBOOL ReadObjText(SvStream& rSt, SdrObject* pObj) const;
// SJ: New implementation of ReadObjText is used by Fontwork objects, because
// the old one does not properly import multiple paragraphs
void ReadObjText( const String& rText, SdrObject* pObj ) const;
- // -----------------------------------------------------------------------
/*
folgende Methode ist von allen zu ueberschreiben, die OLE-Objecte
@@ -575,7 +570,6 @@ public:
FASTBOOL SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
FASTBOOL SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
- // -----------------------------------------------------------------------
static void MSDFFReadZString( SvStream& rIn, String& rStr, ULONG nMaxLen, FASTBOOL bUniCode = FALSE );
static BOOL ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn );
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 6023cc4..3a87fa9 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -38,7 +38,7 @@
#include <svx/svdobj.hxx>
#include <editeng/numitem.hxx>
#include <editeng/editdata.hxx>
-#include <filter/msfilter/msdffimp.hxx> // Escher-Grafikimport
+#include <filter/msfilter/msdffimp.hxx>
#include <filter/msfilter/msocximex.hxx>
#include <filter/msfilter/msfiltertracer.hxx>
#include <editeng/eeitem.hxx>
@@ -49,7 +49,6 @@
#include <vcl/font.hxx>
#include <vector>
#include <boost/optional.hpp>
-////////////////////////////////////////////////////////////////////////////////////////////////////
class SdrModel;
class SdPage;
@@ -565,7 +564,7 @@ protected:
virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, SfxStyleSheet*, SfxStyleSheet** ) const;
using SdrEscherImport::ReadObjText;
virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const;
- // --> OD 2004-12-14 #i32596# - new parameter <_nCalledByGroup>, which
+ // #i32596# - new parameter <_nCalledByGroup>, which
// indicates, if the OLE object is imported inside a group object.
virtual SdrObject* ImportOLE( long nOLEId,
const Graphic& rGraf,
@@ -573,7 +572,6 @@ protected:
const Rectangle& rVisArea,
const int _nCalledByGroup,
sal_Int64 nAspect ) const;
- // <--
SvMemoryStream* ImportExOleObjStg( UINT32 nPersistPtr, UINT32& nOleId ) const;
SdrPage* MakeBlancPage(sal_Bool bMaster) const;
sal_Bool ReadFontCollection();
@@ -608,8 +606,6 @@ public:
SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
struct PPTTextCharacterStyleAtomInterpreter
{
sal_uInt16 nFlags1;
@@ -663,8 +659,6 @@ struct PPTTextSpecInfoAtomInterpreter
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#define PPT_STYLESHEETENTRYS 9
struct PPTExtParaLevel
@@ -713,8 +707,6 @@ class PPTExtParaProv
~PPTExtParaProv();
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
struct PPTCharLevel
{
Color mnFontColorInStyleSheet;
@@ -770,8 +762,6 @@ struct PPTParaSheet
sal_uInt32 nLevel, sal_Bool bFirst );
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
class PPTParagraphObj;
class PPTNumberFormatCreator
{
@@ -804,8 +794,6 @@ class PPTNumberFormatCreator
PPTParagraphObj* pPara, UINT32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering );
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
class SvxNumBulletItem;
struct PPTStyleSheet : public PPTNumberFormatCreator
{
@@ -820,8 +808,6 @@ struct PPTStyleSheet : public PPTNumberFormatCreator
~PPTStyleSheet();
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
struct ImplPPTParaPropSet
{
sal_uInt32 mnRefCount;
@@ -898,8 +884,6 @@ struct PPTCharPropSet
void ImplMakeUnique();
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
struct PPTTabEntry
{
sal_uInt16 nOffset;
@@ -940,8 +924,6 @@ struct PPTTextRulerInterpreter
PPTTextRulerInterpreter& operator=( PPTTextRulerInterpreter& rRuler );
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#define PPT_SPEC_NEWLINE 0x10000
#define PPT_SPEC_SYMBOL 0x20000
#define PPT_SPEC_USE_STARBATS 0x40000
@@ -999,8 +981,6 @@ struct PPTStyleTextPropReader
~PPTStyleTextPropReader();
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
class SvxFieldItem;
class MSFILTER_DLLPUBLIC PPTPortionObj : public PPTCharPropSet
{
@@ -1142,8 +1122,6 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
BOOL bFloatingCtrl );
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
// Powerpoint Recordtypen
#define PPT_PST_Unknown 0
#define PPT_PST_SubContainerCompleted 1
@@ -1432,8 +1410,6 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
#define PPT_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart
#define PPT_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#endif // SVX_LIGHT
#endif //_SVDFPPT_HXX
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 6898ddf..6e079a4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -34,7 +34,7 @@
#include <limits.h>
#include <vector>
#include <osl/endian.h>
-#include <tools/solar.h> // UINTXX
+#include <tools/solar.h>
#include <rtl/math.hxx>
#include <sot/clsids.hxx>
@@ -4629,9 +4629,8 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
{
// TODO/LATER: in future probably the correct aspect should be provided here
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
- // --> OD 2004-12-14 #i32596# - pass <nCalledByGroup> to method
+ // #i32596# - pass <nCalledByGroup> to method
pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup, nAspect );
- // <--
}
if( !pRet )
{
@@ -6343,23 +6342,18 @@ void SvxMSDffManager::CheckTxBxStoryChain()
{
pObj->bLastBoxInChain = FALSE;
// Gruppenwechsel ?
- // --> OD 2008-07-28 #156763#
+ // #156763#
// the text id also contains an internal drawing container id
// to distinguish between text id of drawing objects in different
// drawing containers.
-// if( nChain != (pObj->nTxBxComp & 0xFFFF0000) )
if( nChain != pObj->nTxBxComp )
- // <--
{
// voriger war letzter seiner Gruppe
if( nObj )
pOld->GetObject( nObj-1 )->bLastBoxInChain = TRUE;
// Merker und Hilfs-Flag zuruecksetzen
nObjMark = nObj;
- // --> OD 2008-07-28 #156763#
-// nChain = pObj->nTxBxComp & 0xFFFF0000;
nChain = pObj->nTxBxComp;
- // <--
bSetReplaceFALSE = !pObj->bReplaceByFly;
}
else
@@ -6381,9 +6375,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
// alle Shape-Info-Objekte in pShapeInfos umkopieren
// (aber nach nShapeId sortieren)
pObj->bSortByShapeId = TRUE;
- // --> OD 2008-07-28 #156763#
pObj->nTxBxComp = pObj->nTxBxComp & 0xFFFF0000;
- // <--
pShapeInfos->Insert( pObj );
}
// voriger war letzter seiner Gruppe
@@ -6430,9 +6422,7 @@ void SvxMSDffManager::GetCtrlData( long nOffsDgg_ )
UINT32 nMaxStrPos = rStCtrl.Tell();
nPos += nLength;
- // --> OD 2008-07-28 #156763#
unsigned long nDrawingContainerId = 1;
- // <--
do
{
rStCtrl.Seek( nPos );
@@ -6448,14 +6438,10 @@ void SvxMSDffManager::GetCtrlData( long nOffsDgg_ )
}
if( bOk )
{
- // --> OD 2008-07-28 #156763#
GetDrawingContainerData( rStCtrl, nLength, nDrawingContainerId );
- // <--
}
nPos += DFF_COMMON_RECORD_HEADER_SIZE + nLength;
- // --> OD 2008-07-28 #156763#
++nDrawingContainerId;
- // <--
}
while( nPos < nMaxStrPos && bOk );
}
@@ -6812,7 +6798,6 @@ BOOL SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
else if( ( DFF_msofbtClientTextbox == nFbt ) && ( 4 == nLength ) ) // Text-Box-Story-Eintrag gefunden
{
rSt >> aInfo.nTxBxComp;
- // --> OD 2008-07-28 #156763#
// Add internal drawing container id to text id.
// Note: The text id uses the first two bytes, while the internal
// drawing container id used the second two bytes.
@@ -6820,7 +6805,6 @@ BOOL SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
nDrawingContainerId;
DBG_ASSERT( (aInfo.nTxBxComp & 0x0000FFFF) == nDrawingContainerId,
"<SvxMSDffManager::GetShapeContainerData(..)> - internal drawing container Id could not be correctly merged into DFF_msofbtClientTextbox value." );
- // <--
}
else
{
@@ -7236,14 +7220,13 @@ BOOL SvxMSDffManager::ShapeHasText( ULONG /* nShapeId */, ULONG /* nFilePos */ )
return TRUE;
}
-// --> OD 2004-12-14 #i32596# - add new parameter <_nCalledByGroup>
+// #i32596# - add new parameter <_nCalledByGroup>
SdrObject* SvxMSDffManager::ImportOLE( long nOLEId,
const Graphic& rGrf,
const Rectangle& rBoundRect,
const Rectangle& rVisArea,
const int /* _nCalledByGroup */,
sal_Int64 nAspect ) const
-// <--
{
SdrObject* pRet = 0;
String sStorageName;
@@ -7419,9 +7402,7 @@ static ClsIDs aClsIDs[] = {
{ 0x00030036, "Designer_40", "MicroGrafx Designer 4.0" },
// STAR DIVISION
-// { 0x000424CA, "StarMath", "StarMath 1.0" },
{ 0x00043AD2, "FontWork", "Star FontWork" },
-// { 0x000456EE, "StarMath2", "StarMath 2.0" },
{ 0, "", "" } };
@@ -7489,7 +7470,7 @@ BOOL SvxMSDffManager::ConvertToOle2( SvStream& rStm, UINT32 nReadLen,
if( COMPARE_EQUAL == aSvrName.CompareToAscii( pIds->pSvrName ) )
break;
}
-// SvGlobalName* pClsId = NULL;
+
String aShort, aFull;
if( pIds->nId )
{
@@ -7511,7 +7492,6 @@ BOOL SvxMSDffManager::ConvertToOle2( SvStream& rStm, UINT32 nReadLen,
ULONG nPos = rStm.Tell();
UINT16 sz[4];
rStm.Read( sz, 8 );
- //rStm.SeekRel( 8 );
Graphic aGraphic;
if( ERRCODE_NONE == GraphicConverter::Import( rStm, aGraphic ) && aGraphic.GetType() )
{
@@ -8040,7 +8020,6 @@ SvxMSDffImportRec::SvxMSDffImportRec()
eLineStyle = mso_lineSimple; // GPF-Bug #66227#
bDrawHell = FALSE;
bHidden = FALSE;
-// bInGroup = FALSE;
bReplaceByFly = FALSE;
bLastBoxInChain = TRUE;
bHasUDefProp = FALSE; // was the DFF_msofbtUDefProp record set?
@@ -8077,7 +8056,6 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
eLineStyle = rCopy.eLineStyle; // GPF-Bug #66227#
bDrawHell = rCopy.bDrawHell;
bHidden = rCopy.bHidden;
-// bInGroup = rCopy.bInGroup;
bReplaceByFly = rCopy.bReplaceByFly;
bAutoWidth = rCopy.bAutoWidth;
bLastBoxInChain = rCopy.bLastBoxInChain;
@@ -8122,8 +8100,6 @@ SvxMSDffImportRec::~SvxMSDffImportRec()
delete pWrapPolygon;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
{
maShapeIdContainer[nShapeId] = pShape;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index e2c6b06..e94e35f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -136,8 +136,6 @@
#include <algorithm>
#include <set>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
// PPT ColorScheme Slots
#define PPT_COLSCHEME (0x08000000)
#define PPT_COLSCHEME_HINTERGRUND (0x08000000)
@@ -149,8 +147,6 @@
#define PPT_COLSCHEME_A_UND_HYPERLINK (0x08000006)
#define PPT_COLSCHEME_A_H_GESICHERT (0x08000007)
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#define ANSI_CHARSET 0
#define DEFAULT_CHARSET 1
#define SYMBOL_CHARSET 2
@@ -159,8 +155,6 @@
#define CHINESEBIG5_CHARSET 136
#define OEM_CHARSET 255
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/* Font Families */
#define FF_DONTCARE 0x00
#define FF_ROMAN 0x10
@@ -169,8 +163,6 @@
#define FF_SCRIPT 0x40
#define FF_DECORATIVE 0x50
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#define DEFAULT_PITCH 0x00
#define FIXED_PITCH 0x01
#define VARIABLE_PITCH 0x02
@@ -182,8 +174,6 @@ using namespace drawing ;
using namespace container ;
using namespace table ;
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags, MSFilterTracer* pT ) :
rDocStream ( rDocStrm ),
nImportFlags ( nFlags ),
@@ -191,8 +181,6 @@ PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFl
{
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom )
{
DffRecordHeader aHd;
@@ -228,7 +216,6 @@ SvStream& operator>>( SvStream& rIn, PptSlidePersistAtom& rAtom )
>> rAtom.nFlags
>> rAtom.nNumberTexts
>> rAtom.nSlideId;
-// >> rAtom.nReserved;
aHd.SeekToEndOfRecord( rIn );
return rIn;
}
@@ -244,8 +231,6 @@ USHORT PptSlidePersistList::FindPage(UINT32 nId) const
return PPTSLIDEPERSIST_ENTRY_NOTFOUND;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom )
{
rIn >> rAtom.nSoundRef
@@ -275,38 +260,6 @@ SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom )
Size PptDocumentAtom::GetPageSize(const Size& rSiz) const
{
return rSiz;
-/*
- Size aRet;
- switch ( eSlidesPageFormat )
- {
- // Wenn man in Powerpoint als Seitenformat "Bildschirmgroesse"
- // einstellt, dann zeigt dieser Dialog zwar 24x18cm an, die
- // angezeigte Seite ist aber anders. Das sieht man, wenn man
- // ein Rechteck seitenfuellend aufzieht und sich dessen Groesse
- // ansieht. Die importierten Abmessungen sind auf jeden Fall
- // die, die auch im Ppt-File stehen. Ich denke, das es sich
- // hier eher um ein Bug in PowerPoint handelt, das im
- // Seitenformat-Dialog bei "Bildschirmgroesse" falsche Masse
- // angezeigt werden (vielleicht ja auch bildschirmabhaengig?).
-// case PPTPF_SCREEN : aRet.Width()=4082; aRet.Height()=5443; break;
- case PPTPF_USLETTER: aRet.Width()=4896; aRet.Height()=6336; break;
- case PPTPF_A4 : aRet.Width()=4762; aRet.Height()=6735; break;
-// case PPTPF_35MMDIA : aRet.Width()=4082; aRet.Height()=6123; break;
-// case PPTPF_OVERHEAD: aRet.Width()=4082; aRet.Height()=5443; break;
- }
- if ( aRet.Width() )
- {
- if ( rSiz.Width() > rSiz.Height() )
- { // Querformat
- long nMerk = aRet.Width();
- aRet.Width() = aRet.Height();
- aRet.Height() = nMerk;
- }
- }
- else // CustomFormat oder Unbekannt oder Screen,Dia,Overhead
- aRet = rSiz;
- return aRet;
-*/
}
SvStream& operator>>(SvStream& rIn, PptDocumentAtom& rAtom)
@@ -354,8 +307,6 @@ SvStream& operator>>(SvStream& rIn, PptDocumentAtom& rAtom)
return rIn;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void PptSlideLayoutAtom::Clear()
{
eLayout = 0;
@@ -373,8 +324,6 @@ SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom )
return rIn;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SvStream& operator>>( SvStream& rIn, PptSlideAtom& rAtom )
{
DffRecordHeader aHd;
@@ -393,8 +342,6 @@ void PptSlideAtom::Clear()
nFlags = 0;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SvStream& operator>>( SvStream& rIn, PptNotesAtom& rAtom )
{
DffRecordHeader aHd;
@@ -411,8 +358,6 @@ void PptNotesAtom::Clear()
nFlags = 0;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void PptColorSchemeAtom::Clear()
{
memset(&aData[0], 0, 32);
@@ -440,8 +385,6 @@ SvStream& operator>>( SvStream& rIn, PptColorSchemeAtom& rAtom )
return rIn;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom )
{
DffRecordHeader aHd;
@@ -465,11 +408,6 @@ SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom )
rAtom.eCharSet = RTL_TEXTENCODING_MS_1252;
break;
-// case DEFAULT_CHARSET :
-// case SHIFTJIS_CHARSET :
-// case HANGEUL_CHARSET :
-// case CHINESEBIG5_CHARSET :
-// case OEM_CHARSET :
default :
rAtom.eCharSet = gsl_getSystemTextEncoding();
}
@@ -535,8 +473,6 @@ SV_IMPL_PTRARR( PptFontEntityAtomList, PptFontEntityAtom* );
class PptFontCollection: public PptFontEntityAtomList {
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom )
{
rIn >> rAtom.aHd
@@ -551,8 +487,6 @@ SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom )
return rIn;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void PptOEPlaceholderAtom::Clear()
{
nPlacementId = 0;
@@ -567,8 +501,6 @@ SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom )
return rIn;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PptSlidePersistEntry::PptSlidePersistEntry() :
pStyleSheet ( NULL ),
pHeaderFooterEntry ( NULL ),
@@ -596,10 +528,6 @@ PptSlidePersistEntry::~PptSlidePersistEntry()
delete[] pPresentationObjects;
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const String& rBaseURL ) :
SvxMSDffManager ( rParam.rDocStream, rBaseURL, rParam.pTracer ),
pFonts ( NULL ),
@@ -924,15 +852,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( ( nFontDirection == 1 ) || ( nFontDirection == 3 ) ) // #104546#
{
bVerticalText = !bVerticalText;
-/*
- sal_Int32 nHalfWidth = ( rTextRect.GetWidth() + 1 ) >> 1;
- sal_Int32 nHalfHeight = ( rTextRect.GetHeight() + 1 ) >> 1;
- Point aTopLeft( rTextRect.Left() + nHalfWidth - nHalfHeight,
- rTextRect.Top() + nHalfHeight - nHalfWidth );
- Size aNewSize( rTextRect.GetHeight(), rTextRect.GetWidth() );
- Rectangle aNewRect( aTopLeft, aNewSize );
- rTextRect = aNewRect;
-*/
}
aTextObj.SetVertical( bVerticalText );
if ( pRet )
@@ -1893,14 +1812,13 @@ sal_Bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uI
return bSuccess;
}
-// --> OD 2004-12-14 #i32596# - add new parameter <_nCalledByGroup>
+// #i32596# - add new parameter <_nCalledByGroup>
SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
const Graphic& rGraf,
const Rectangle& rBoundRect,
const Rectangle& rVisArea,
const int /*_nCalledByGroup*/,
sal_Int64 /*nAspect*/ ) const
-// <--
{
SdrObject* pRet = NULL;
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 4baea1e..75987b8 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -263,13 +263,11 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
sal_Bool bPrettyPrint =
(msUserData.getLength() > 6 && msUserData[6].equalsIgnoreAsciiCaseAscii("true"));
- // --> OD 2008-11-25 #b6761284#
// export of <text:number> element for <text:list-item> elements are
// needed for certain filters.
sal_Bool bExportTextNumberElementForListItems =
( msUserData.getLength() > 7 &&
msUserData[7].equalsIgnoreAsciiCaseAscii("true") );
- // <--
// get the base URI, so we can use relative links
OUString aBaseURI;
@@ -285,9 +283,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
PropertyMapEntry aImportInfoMap[] =
{
{ MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
- // --> OD 2008-11-25 #b6761284#
{ MAP_LEN( "ExportTextNumberElement" ), 0, &::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
- // <--
{ MAP_LEN( "BaseURI" ), 0, &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
{ NULL, 0, 0, NULL, 0, 0 }
};
@@ -296,11 +292,9 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
xInfoSet->setPropertyValue(
OUString::createFromAscii( "UsePrettyPrinting" ), makeAny( bPrettyPrint ));
- // --> OD 2008-11-25 #b6761284#
xInfoSet->setPropertyValue(
OUString::createFromAscii( "ExportTextNumberElement" ),
makeAny( bExportTextNumberElementForListItems ));
- // <--
xInfoSet->setPropertyValue(
OUString::createFromAscii( "BaseURI" ), makeAny( aBaseURI ));
aAnys[1] <<= xInfoSet;
More information about the ooo-build-commit
mailing list