summaryrefslogtreecommitdiff
path: root/sd/source/filter/eppt
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter/eppt')
-rw-r--r--sd/source/filter/eppt/eppt.cxx114
-rwxr-xr-xsd/source/filter/eppt/eppt.hxx692
-rw-r--r--sd/source/filter/eppt/epptdef.hxx110
-rwxr-xr-xsd/source/filter/eppt/epptso.cxx116
-rw-r--r--sd/source/filter/eppt/escherex.cxx30
-rw-r--r--sd/source/filter/eppt/escherex.hxx20
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx96
-rw-r--r--sd/source/filter/eppt/pptexanimations.hxx16
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx6
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.hxx30
10 files changed, 615 insertions, 615 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 2a40c8707866..2ed890a3e129 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -78,45 +78,45 @@
#define PPT_TRANSITION_TYPE_SPLIT 13
// effects, new in xp
-#define PPT_TRANSITION_TYPE_DIAMOND 17
-#define PPT_TRANSITION_TYPE_PLUS 18
-#define PPT_TRANSITION_TYPE_WEDGE 19
-#define PPT_TRANSITION_TYPE_PUSH 20
-#define PPT_TRANSITION_TYPE_COMB 21
-#define PPT_TRANSITION_TYPE_NEWSFLASH 22
-#define PPT_TRANSITION_TYPE_SMOOTHFADE 23
-#define PPT_TRANSITION_TYPE_WHEEL 26
-#define PPT_TRANSITION_TYPE_CIRCLE 27
+#define PPT_TRANSITION_TYPE_DIAMOND 17
+#define PPT_TRANSITION_TYPE_PLUS 18
+#define PPT_TRANSITION_TYPE_WEDGE 19
+#define PPT_TRANSITION_TYPE_PUSH 20
+#define PPT_TRANSITION_TYPE_COMB 21
+#define PPT_TRANSITION_TYPE_NEWSFLASH 22
+#define PPT_TRANSITION_TYPE_SMOOTHFADE 23
+#define PPT_TRANSITION_TYPE_WHEEL 26
+#define PPT_TRANSITION_TYPE_CIRCLE 27
using namespace com::sun::star;
static PHLayout pPHLayout[] =
{
- { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
+ { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+ { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+ { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+ { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
{ EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE }
+ { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE }
};
//============================ PPTWriter ==================================
@@ -126,7 +126,7 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
mbStatus ( sal_False ),
- mbUseNewAnimations ( sal_True ),
+ mbUseNewAnimations ( sal_True ),
mnLatestStatValue ( 0 ),
maFraction ( 1, 576 ),
maMapModeSrc ( MAP_100TH_MM ),
@@ -539,13 +539,13 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->PtInsert( EPP_Persist_Document, mpStrm->Tell() );
- mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default)
+ mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default)
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
*mpStrm << (sal_uInt32)0x25000d;
if ( ImplGetPageByIndex( 0, MASTER ) )
ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
mpPptEscherEx->CloseContainer();
- mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default)
+ mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default)
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
*mpStrm << (sal_uInt32)0x3d000d;
if ( ImplGetPageByIndex( 0, NOTICE ) )
@@ -558,7 +558,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() );
- *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
+ *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
<< (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
<< (INT32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
<< (INT32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
@@ -946,7 +946,7 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum )
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
*mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide
<< (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID
- << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage )
+ << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage )
<< (sal_uInt32)0 // notes ID ( ist gleich null wenn keine notizen vorhanden )
<< (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
<< (sal_uInt16)0; // padword
@@ -1073,14 +1073,14 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 );
EscherPropertyContainer aPropOpt;
- aPropOpt.AddOpt( ESCHER_Prop_fillColor, 0xffffff ); // stock valued fill color
+ aPropOpt.AddOpt( ESCHER_Prop_fillColor, 0xffffff ); // stock valued fill color
aPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0 );
aPropOpt.AddOpt( ESCHER_Prop_fillRectRight, 0x68bdde );
aPropOpt.AddOpt( ESCHER_Prop_fillRectBottom, 0x8b9f8e );
aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0 );
aPropOpt.AddOpt( ESCHER_Prop_bWMode, ESCHER_wDontShow );
- aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 ); // if true, this is the background shape
+ aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 ); // if true, this is the background shape
aPropOpt.Commit( *mpStrm );
mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer
@@ -1114,7 +1114,7 @@ static rtl::OUString getInitials( const rtl::OUString& rName )
// take letter
if( nLength )
{
- sInitials += rtl::OUString( *pStr );
+ sInitials += rtl::OUString( *pStr );
nLength--; pStr++;
}
@@ -1139,7 +1139,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr
while( xAnnotationEnumeration->hasMoreElements() )
{
- EscherExContainer aComment10( rBinaryTagData10Atom, EPP_Comment10 );
+ EscherExContainer aComment10( rBinaryTagData10Atom, EPP_Comment10 );
{
uno::Reference< office::XAnnotation > xAnnotation( xAnnotationEnumeration->nextElement() );
@@ -1165,7 +1165,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr
rBinaryTagData10Atom << nIndex++
<< aDateTime.Year
<< aDateTime.Month
- << aDateTime.Day // todo: day of week
+ << aDateTime.Day // todo: day of week
<< aDateTime.Day
<< aDateTime.Hours
<< aDateTime.Minutes
@@ -1258,8 +1258,8 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum )
sal_uInt32 nSoundRef = 0;
sal_Bool bIsSound = sal_False;
- sal_Bool bStopSound = sal_False;
- sal_Bool bLoopSound = sal_False;
+ sal_Bool bStopSound = sal_False;
+ sal_Bool bLoopSound = sal_False;
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) )
{
@@ -1571,7 +1571,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum )
}
if ( aBinaryTagData10Atom.Tell() )
{
- EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags );
+ EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags );
EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
{
EscherExAtom aCString( *mpStrm, EPP_CString );
@@ -1595,7 +1595,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum )
sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
if ( nmsofbtAnimGroupSize )
{
- EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags );
+ EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags );
EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
{
EscherExAtom aCString( *mpStrm, EPP_CString );
@@ -1726,7 +1726,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
}
- } // PASSTHROUGH INTENDED
+ } // PASSTHROUGH INTENDED
case ::com::sun::star::drawing::FillStyle_NONE :
default:
aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
@@ -1794,14 +1794,14 @@ void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags )
// SJ: #99809# create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
SotStorageStreamRef xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE );
- *xStm << (sal_uInt32)0 // no ClipboardId
- << (sal_uInt32)4 // no target device
- << (sal_uInt32)1 // aspect ratio
- << (sal_Int32)-1 // L-Index
- << (sal_uInt32)0 // Advanced Flags
- << (sal_uInt32)0 // compression
- << (sal_uInt32)0 // Size
- << (sal_uInt32)0 // "
+ *xStm << (sal_uInt32)0 // no ClipboardId
+ << (sal_uInt32)4 // no target device
+ << (sal_uInt32)1 // aspect ratio
+ << (sal_Int32)-1 // L-Index
+ << (sal_uInt32)0 // Advanced Flags
+ << (sal_uInt32)0 // compression
+ << (sal_uInt32)0 // Size
+ << (sal_uInt32)0 // "
<< (sal_uInt32)0;
pStrm = xCleanStorage->CreateMemoryStream();
}
@@ -1827,7 +1827,7 @@ void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags )
mpPptEscherEx->BeginAtom();
pStrm->Seek( STREAM_SEEK_TO_END );
sal_uInt32 npStrmSize = pStrm->Tell();
- *mpStrm << npStrmSize; // uncompressed size
+ *mpStrm << npStrmSize; // uncompressed size
#ifdef DBG_EXTRACTOLEOBJECTS
SvFileStream aOut( String::CreateFromAscii( "D:\\OUT.OLE" ), STREAM_TRUNC | STREAM_WRITE );
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 3d8797beb328..8fadff5b6cfe 100755
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -94,30 +94,30 @@
enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
-#define EPP_MAINMASTER_PERSIST_KEY 0x80010000
-#define EPP_MAINNOTESMASTER_PERSIST_KEY 0x80020000
-#define EPP_MAINSLIDE_PERSIST_KEY 0x80030000
-#define EPP_MAINNOTES_PERSIST_KEY 0x80040000
-
-#define EPP_Persist_Document 0x80080000
-#define EPP_Persist_MainMaster 0x80100000
-#define EPP_Persist_MainNotes 0x80200000
-#define EPP_Persist_Slide 0x80400000
-#define EPP_Persist_Notes 0x80800000
-#define EPP_Persist_CurrentPos 0x81000000
-#define EPP_Persist_VBAInfoAtom 0x84000000
-#define EPP_Persist_ExObj 0x88000000
-
-#define EPP_TEXTSTYLE_NORMAL 0x00000001
-#define EPP_TEXTSTYLE_TITLE 0x00000010
-#define EPP_TEXTSTYLE_BODY 0x00000100
-#define EPP_TEXTSTYLE_TEXT 0x00001000
+#define EPP_MAINMASTER_PERSIST_KEY 0x80010000
+#define EPP_MAINNOTESMASTER_PERSIST_KEY 0x80020000
+#define EPP_MAINSLIDE_PERSIST_KEY 0x80030000
+#define EPP_MAINNOTES_PERSIST_KEY 0x80040000
+
+#define EPP_Persist_Document 0x80080000
+#define EPP_Persist_MainMaster 0x80100000
+#define EPP_Persist_MainNotes 0x80200000
+#define EPP_Persist_Slide 0x80400000
+#define EPP_Persist_Notes 0x80800000
+#define EPP_Persist_CurrentPos 0x81000000
+#define EPP_Persist_VBAInfoAtom 0x84000000
+#define EPP_Persist_ExObj 0x88000000
+
+#define EPP_TEXTSTYLE_NORMAL 0x00000001
+#define EPP_TEXTSTYLE_TITLE 0x00000010
+#define EPP_TEXTSTYLE_BODY 0x00000100
+#define EPP_TEXTSTYLE_TEXT 0x00001000
// PLACEMENT_ID
#define EPP_LAYOUT_TITLESLIDE 0 /* The slide is a title slide */
#define EPP_LAYOUT_TITLEANDBODYSLIDE 1 /* Title and body slide */
#define EPP_LAYOUT_TITLEMASTERSLIDE 2 /* Title master slide */
-#define EPP_LAYOUT_MASTERSLIDE 3 /* Master slide layout */
+#define EPP_LAYOUT_MASTERSLIDE 3 /* Master slide layout */
#define EPP_LAYOUT_MASTERNOTES 4 /* Master notes layout */
#define EPP_LAYOUT_NOTESTITLEBODY 5 /* Notes title/body layout */
#define EPP_LAYOUT_HANDOUTLAYOUT 6 /* Handout layout, therefore it doesn't have placeholders except header, footer, and date */
@@ -140,42 +140,42 @@ class XStatusIndicatorRef;
struct PHLayout
{
- sal_Int32 nLayout;
- sal_uInt8 nPlaceHolder[ 8 ];
+ sal_Int32 nLayout;
+ sal_uInt8 nPlaceHolder[ 8 ];
- sal_uInt8 nUsedObjectPlaceHolder;
- sal_uInt8 nTypeOfTitle;
- sal_uInt8 nTypeOfOutliner;
+ sal_uInt8 nUsedObjectPlaceHolder;
+ sal_uInt8 nTypeOfTitle;
+ sal_uInt8 nTypeOfOutliner;
- BOOL bTitlePossible;
- BOOL bOutlinerPossible;
- BOOL bSecOutlinerPossible;
+ BOOL bTitlePossible;
+ BOOL bOutlinerPossible;
+ BOOL bSecOutlinerPossible;
};
struct SOParagraph
{
- sal_Bool bExtendedParameters;
- sal_uInt32 nParaFlags;
- sal_Int16 nBulletFlags;
- String sPrefix;
- String sSuffix;
- String sGraphicUrl; // String auf eine Graphic
- Size aBuGraSize;
- sal_uInt32 nNumberingType; // in wirlichkeit ist dies ein SvxEnum
- sal_uInt32 nHorzAdjust;
- sal_uInt32 nBulletColor;
- sal_Int32 nBulletOfs;
- sal_Int16 nStartWith; // Start der nummerierung
- sal_Int16 nTextOfs;
- sal_Int16 nBulletRealSize; // GroessenVerhaeltnis in Proz
- sal_Int16 nDepth; // aktuelle tiefe
- sal_Unicode cBulletId; // wenn Numbering Type == CharSpecial
- ::com::sun::star::awt::FontDescriptor aFontDesc;
-
- sal_Bool bExtendedBulletsUsed;
- sal_uInt16 nBulletId;
- sal_uInt32 nMappedNumType;
- sal_Bool bNumberingIsNumber;
+ sal_Bool bExtendedParameters;
+ sal_uInt32 nParaFlags;
+ sal_Int16 nBulletFlags;
+ String sPrefix;
+ String sSuffix;
+ String sGraphicUrl; // String auf eine Graphic
+ Size aBuGraSize;
+ sal_uInt32 nNumberingType; // in wirlichkeit ist dies ein SvxEnum
+ sal_uInt32 nHorzAdjust;
+ sal_uInt32 nBulletColor;
+ sal_Int32 nBulletOfs;
+ sal_Int16 nStartWith; // Start der nummerierung
+ sal_Int16 nTextOfs;
+ sal_Int16 nBulletRealSize; // GroessenVerhaeltnis in Proz
+ sal_Int16 nDepth; // aktuelle tiefe
+ sal_Unicode cBulletId; // wenn Numbering Type == CharSpecial
+ ::com::sun::star::awt::FontDescriptor aFontDesc;
+
+ sal_Bool bExtendedBulletsUsed;
+ sal_uInt16 nBulletId;
+ sal_uInt32 nMappedNumType;
+ sal_Bool bNumberingIsNumber;
SOParagraph()
{
@@ -200,15 +200,15 @@ class PPTExBulletProvider
protected :
- SvMemoryStream aBuExPictureStream;
- SvMemoryStream aBuExOutlineStream;
- SvMemoryStream aBuExMasterStream;
+ SvMemoryStream aBuExPictureStream;
+ SvMemoryStream aBuExOutlineStream;
+ SvMemoryStream aBuExMasterStream;
- EscherGraphicProvider* pGraphicProv;
+ EscherGraphicProvider* pGraphicProv;
public :
- sal_uInt16 GetId( const ByteString& rUniqueId, Size& rGraphicSize );
+ sal_uInt16 GetId( const ByteString& rUniqueId, Size& rGraphicSize );
PPTExBulletProvider();
~PPTExBulletProvider();
@@ -216,20 +216,20 @@ class PPTExBulletProvider
struct FontCollectionEntry
{
- String Name;
+ String Name;
double Scaling;
- sal_Int16 Family;
- sal_Int16 Pitch;
- sal_Int16 CharSet;
-
+ sal_Int16 Family;
+ sal_Int16 Pitch;
+ sal_Int16 CharSet;
+
String Original;
sal_Bool bIsConverted;
FontCollectionEntry( const String& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) :
Scaling ( 1.0 ),
- Family ( nFamily ),
- Pitch ( nPitch ),
- CharSet ( nCharSet ),
+ Family ( nFamily ),
+ Pitch ( nPitch ),
+ CharSet ( nCharSet ),
Original( rName )
{
ImplInit( rName );
@@ -244,7 +244,7 @@ struct FontCollectionEntry
~FontCollectionEntry();
private :
-
+
FontCollectionEntry() {};
void ImplInit( const String& rName );
@@ -258,16 +258,16 @@ class FontCollection : private List
FontCollection();
~FontCollection();
- short GetScriptDirection( const String& rText ) const;
- sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor );
- sal_uInt32 GetCount() const { return List::Count(); };
- const FontCollectionEntry* GetById( sal_uInt32 nId );
- FontCollectionEntry& GetLast() { return *(FontCollectionEntry*)List::Last(); };
+ short GetScriptDirection( const String& rText ) const;
+ sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor );
+ sal_uInt32 GetCount() const { return List::Count(); };
+ const FontCollectionEntry* GetById( sal_uInt32 nId );
+ FontCollectionEntry& GetLast() { return *(FontCollectionEntry*)List::Last(); };
};
// ------------------------------------------------------------------------
-#define PPTEX_STYLESHEETENTRYS 9
+#define PPTEX_STYLESHEETENTRYS 9
enum PPTExTextAttr
{
@@ -306,64 +306,64 @@ enum PPTExTextAttr
struct PPTExCharLevel
{
- sal_uInt16 mnFlags;
- sal_uInt16 mnFont;
- sal_uInt16 mnAsianOrComplexFont;
- sal_uInt16 mnFontHeight;
- sal_uInt16 mnEscapement;
- sal_uInt32 mnFontColor;
+ sal_uInt16 mnFlags;
+ sal_uInt16 mnFont;
+ sal_uInt16 mnAsianOrComplexFont;
+ sal_uInt16 mnFontHeight;
+ sal_uInt16 mnEscapement;
+ sal_uInt32 mnFontColor;
};
struct PPTExCharSheet
{
- PPTExCharLevel maCharLevel[ 5 ];
+ PPTExCharLevel maCharLevel[ 5 ];
PPTExCharSheet( int nInstance );
- void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+ void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
FontCollection& rFontCollection, int nLevel );
- void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
+ void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
};
struct PPTExParaLevel
{
- sal_Bool mbIsBullet;
- sal_uInt16 mnBulletChar;
- sal_uInt16 mnBulletFont;
- sal_uInt16 mnBulletHeight;
- sal_uInt32 mnBulletColor;
-
- sal_uInt16 mnAdjust;
- sal_uInt16 mnLineFeed;
- sal_uInt16 mnUpperDist;
- sal_uInt16 mnLowerDist;
- sal_uInt16 mnTextOfs;
- sal_uInt16 mnBulletOfs;
- sal_uInt16 mnDefaultTab;
-
- sal_Bool mbExtendedBulletsUsed;
- sal_uInt16 mnBulletId;
- sal_uInt16 mnBulletStart;
- sal_uInt32 mnMappedNumType;
- sal_uInt32 mnNumberingType;
+ sal_Bool mbIsBullet;
+ sal_uInt16 mnBulletChar;
+ sal_uInt16 mnBulletFont;
+ sal_uInt16 mnBulletHeight;
+ sal_uInt32 mnBulletColor;
+
+ sal_uInt16 mnAdjust;
+ sal_uInt16 mnLineFeed;
+ sal_uInt16 mnUpperDist;
+ sal_uInt16 mnLowerDist;
+ sal_uInt16 mnTextOfs;
+ sal_uInt16 mnBulletOfs;
+ sal_uInt16 mnDefaultTab;
+
+ sal_Bool mbExtendedBulletsUsed;
+ sal_uInt16 mnBulletId;
+ sal_uInt16 mnBulletStart;
+ sal_uInt32 mnMappedNumType;
+ sal_uInt32 mnNumberingType;
sal_uInt16 mnAsianSettings;
- sal_uInt16 mnBiDi;
+ sal_uInt16 mnBiDi;
};
struct PPTExParaSheet
{
PPTExBulletProvider& rBuProv;
- sal_uInt32 mnInstance;
+ sal_uInt32 mnInstance;
- PPTExParaLevel maParaLevel[ 5 ];
+ PPTExParaLevel maParaLevel[ 5 ];
PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv );
- void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+ void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel );
- void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
+ void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
};
@@ -372,8 +372,8 @@ class PPTExStyleSheet
public :
- PPTExCharSheet* mpCharSheet[ PPTEX_STYLESHEETENTRYS ];
- PPTExParaSheet* mpParaSheet[ PPTEX_STYLESHEETENTRYS ];
+ PPTExCharSheet* mpCharSheet[ PPTEX_STYLESHEETENTRYS ];
+ PPTExParaSheet* mpParaSheet[ PPTEX_STYLESHEETENTRYS ];
PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv );
~PPTExStyleSheet();
@@ -381,51 +381,51 @@ class PPTExStyleSheet
PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; };
PPTExCharSheet& GetCharSheet( int nInstance ) { return *mpCharSheet[ nInstance ]; };
- void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+ void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
FontCollection& rFontCollection, int nInstance, int nLevel );
- sal_Bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
+ sal_Bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
- sal_uInt32 SizeOfTxCFStyleAtom() const;
- void WriteTxCFStyleAtom( SvStream& rSt );
+ sal_uInt32 SizeOfTxCFStyleAtom() const;
+ void WriteTxCFStyleAtom( SvStream& rSt );
};
struct EPPTHyperlink
{
- String aURL;
- sal_uInt32 nType; // bit 0-7 : type ( 1: click action to a slide )
- // ( 2: hyperlink url )
+ String aURL;
+ sal_uInt32 nType; // bit 0-7 : type ( 1: click action to a slide )
+ // ( 2: hyperlink url )
// bit 8-23: index
// bit 31 : hyperlink is attached to a shape
EPPTHyperlink( const String rURL, sal_uInt32 nT ) :
- aURL ( rURL ),
- nType ( nT ){};
+ aURL ( rURL ),
+ nType ( nT ){};
};
enum PPTExOleObjEntryType
{
- NORMAL_OLE_OBJECT, OCX_CONTROL
+ NORMAL_OLE_OBJECT, OCX_CONTROL
};
struct PPTExOleObjEntry
{
- PPTExOleObjEntryType eType;
- sal_uInt32 nOfsA; // offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation)
- sal_uInt32 nOfsB; // offset to the EPP_ExOleObjStg
+ PPTExOleObjEntryType eType;
+ sal_uInt32 nOfsA; // offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation)
+ sal_uInt32 nOfsB; // offset to the EPP_ExOleObjStg
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xControlModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xControlModel;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
PPTExOleObjEntry( PPTExOleObjEntryType eT, sal_uInt32 nOfs ) :
- eType ( eT ),
- nOfsA ( nOfs ) {};
+ eType ( eT ),
+ nOfsA ( nOfs ) {};
};
struct TextRuleEntry
{
- int nPageNumber;
- SvMemoryStream* pOut;
+ int nPageNumber;
+ SvMemoryStream* pOut;
TextRuleEntry( int nPg ) :
nPageNumber( nPg ),
@@ -438,9 +438,9 @@ struct TextRuleEntry
struct GroupEntry
{
- sal_uInt32 mnCurrentPos;
- sal_uInt32 mnCount;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > mXIndexAccess;
+ sal_uInt32 mnCurrentPos;
+ sal_uInt32 mnCount;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > mXIndexAccess;
GroupEntry( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex )
{
mXIndexAccess = rIndex;
@@ -461,25 +461,25 @@ class GroupTable
{
protected:
- sal_uInt32 mnIndex;
- sal_uInt32 mnCurrentGroupEntry;
- sal_uInt32 mnMaxGroupEntry;
- sal_uInt32 mnGroupsClosed;
- GroupEntry** mpGroupEntry;
+ sal_uInt32 mnIndex;
+ sal_uInt32 mnCurrentGroupEntry;
+ sal_uInt32 mnMaxGroupEntry;
+ sal_uInt32 mnGroupsClosed;
+ GroupEntry** mpGroupEntry;
- void ImplResizeGroupTable( sal_uInt32 nEntrys );
+ void ImplResizeGroupTable( sal_uInt32 nEntrys );
public:
- sal_uInt32 GetCurrentGroupIndex() const { return mnIndex; };
- sal_Int32 GetCurrentGroupLevel() const { return mnCurrentGroupEntry - 1; };
+ sal_uInt32 GetCurrentGroupIndex() const { return mnIndex; };
+ sal_Int32 GetCurrentGroupLevel() const { return mnCurrentGroupEntry - 1; };
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > &
GetCurrentGroupAccess() const { return mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mXIndexAccess; };
- sal_uInt32 GetGroupsClosed();
- void ResetGroupTable( sal_uInt32 nCount );
- void ClearGroupTable();
+ sal_uInt32 GetGroupsClosed();
+ void ResetGroupTable( sal_uInt32 nCount );
+ void ClearGroupTable();
sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
- sal_Bool GetNextGroupEntry();
+ sal_Bool GetNextGroupEntry();
GroupTable();
~GroupTable();
};
@@ -488,13 +488,13 @@ class PropValue
{
protected :
- ::com::sun::star::uno::Any mAny;
+ ::com::sun::star::uno::Any mAny;
::com::sun::star::uno::Reference
- < ::com::sun::star::beans::XPropertySet > mXPropSet;
+ < ::com::sun::star::beans::XPropertySet > mXPropSet;
- sal_Bool ImplGetPropertyValue( const String& rString );
- sal_Bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference
+ sal_Bool ImplGetPropertyValue( const String& rString );
+ sal_Bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference
< ::com::sun::star::beans::XPropertySet > &, const String& );
public :
@@ -514,11 +514,11 @@ class PropStateValue : public PropValue
{
protected :
- ::com::sun::star::beans::PropertyState ePropState;
+ ::com::sun::star::beans::PropertyState ePropState;
::com::sun::star::uno::Reference
- < ::com::sun::star::beans::XPropertyState > mXPropState;
+ < ::com::sun::star::beans::XPropertyState > mXPropState;
- sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE );
+ sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE );
};
@@ -532,35 +532,35 @@ class PortionObj : public PropStateValue
protected :
- void ImplClear();
- void ImplConstruct( const PortionObj& rPortionObj );
- sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
+ void ImplClear();
+ void ImplConstruct( const PortionObj& rPortionObj );
+ sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
- sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
- void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE );
+ sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
+ void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE );
public :
- ::com::sun::star::beans::PropertyState meCharColor;
- ::com::sun::star::beans::PropertyState meCharHeight;
- ::com::sun::star::beans::PropertyState meFontName;
- ::com::sun::star::beans::PropertyState meAsianOrComplexFont;
- ::com::sun::star::beans::PropertyState meCharEscapement;
- ::com::sun::star::lang::Locale meCharLocale;
- sal_uInt16 mnCharAttrHard;
+ ::com::sun::star::beans::PropertyState meCharColor;
+ ::com::sun::star::beans::PropertyState meCharHeight;
+ ::com::sun::star::beans::PropertyState meFontName;
+ ::com::sun::star::beans::PropertyState meAsianOrComplexFont;
+ ::com::sun::star::beans::PropertyState meCharEscapement;
+ ::com::sun::star::lang::Locale meCharLocale;
+ sal_uInt16 mnCharAttrHard;
- sal_uInt32 mnCharColor;
- sal_uInt16 mnCharAttr;
- sal_uInt16 mnCharHeight;
- sal_uInt16 mnFont;
- sal_uInt16 mnAsianOrComplexFont;
- sal_Int16 mnCharEscapement;
+ sal_uInt32 mnCharColor;
+ sal_uInt16 mnCharAttr;
+ sal_uInt16 mnCharHeight;
+ sal_uInt16 mnFont;
+ sal_uInt16 mnAsianOrComplexFont;
+ sal_Int16 mnCharEscapement;
- sal_uInt32 mnTextSize;
- sal_Bool mbLastPortion;
+ sal_uInt32 mnTextSize;
+ sal_Bool mbLastPortion;
- sal_uInt16* mpText;
- FieldEntry* mpFieldEntry;
+ sal_uInt16* mpText;
+ FieldEntry* mpFieldEntry;
PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
sal_Bool bLast, FontCollection& rFontCollection );
@@ -569,16 +569,16 @@ class PortionObj : public PropStateValue
PortionObj( const PortionObj& rPortionObj );
~PortionObj();
- void Write( SvStream* pStrm, sal_Bool bLast );
- sal_uInt32 Count() const { return mnTextSize; };
+ void Write( SvStream* pStrm, sal_Bool bLast );
+ sal_uInt32 Count() const { return mnTextSize; };
- PortionObj& operator=( const PortionObj& rPortionObj );
+ PortionObj& operator=( const PortionObj& rPortionObj );
};
struct ParaFlags
{
- sal_Bool bFirstParagraph : 1;
- sal_Bool bLastParagraph : 1;
+ sal_Bool bFirstParagraph : 1;
+ sal_Bool bLastParagraph : 1;
ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; };
};
@@ -588,43 +588,43 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
friend class TextObj;
friend struct PPTExParaSheet;
- MapMode maMapModeSrc;
- MapMode maMapModeDest;
+ MapMode maMapModeSrc;
+ MapMode maMapModeDest;
protected :
- void ImplConstruct( const ParagraphObj& rParagraphObj );
- void ImplClear();
- sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
- void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
- void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
+ void ImplConstruct( const ParagraphObj& rParagraphObj );
+ void ImplClear();
+ sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
+ void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
+ void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
public :
::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > maTabStop;
- sal_uInt32 mnTextSize;
-
- sal_Bool mbIsBullet;
- sal_Bool mbFirstParagraph;
- sal_Bool mbLastParagraph;
-
- ::com::sun::star::beans::PropertyState meBullet;
- ::com::sun::star::beans::PropertyState meTextAdjust;
- ::com::sun::star::beans::PropertyState meLineSpacing;
- ::com::sun::star::beans::PropertyState meLineSpacingTop;
- ::com::sun::star::beans::PropertyState meLineSpacingBottom;
- ::com::sun::star::beans::PropertyState meForbiddenRules;
- ::com::sun::star::beans::PropertyState meParagraphPunctation;
- ::com::sun::star::beans::PropertyState meBiDi;
-
- sal_uInt16 mnTextAdjust;
- sal_Int16 mnLineSpacing;
- sal_Int16 mnLineSpacingTop;
- sal_Int16 mnLineSpacingBottom;
- sal_Bool mbForbiddenRules;
- sal_Bool mbParagraphPunctation;
- sal_uInt16 mnBiDi;
+ sal_uInt32 mnTextSize;
+
+ sal_Bool mbIsBullet;
+ sal_Bool mbFirstParagraph;
+ sal_Bool mbLastParagraph;
+
+ ::com::sun::star::beans::PropertyState meBullet;
+ ::com::sun::star::beans::PropertyState meTextAdjust;
+ ::com::sun::star::beans::PropertyState meLineSpacing;
+ ::com::sun::star::beans::PropertyState meLineSpacingTop;
+ ::com::sun::star::beans::PropertyState meLineSpacingBottom;
+ ::com::sun::star::beans::PropertyState meForbiddenRules;
+ ::com::sun::star::beans::PropertyState meParagraphPunctation;
+ ::com::sun::star::beans::PropertyState meBiDi;
+
+ sal_uInt16 mnTextAdjust;
+ sal_Int16 mnLineSpacing;
+ sal_Int16 mnLineSpacingTop;
+ sal_Int16 mnLineSpacingBottom;
+ sal_Bool mbForbiddenRules;
+ sal_Bool mbParagraphPunctation;
+ sal_uInt16 mnBiDi;
ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef,
ParaFlags, FontCollection& rFontCollection,
@@ -633,23 +633,23 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
PPTExBulletProvider& rBuProv );
- void CalculateGraphicBulletSize( sal_uInt16 nFontHeight );
+ void CalculateGraphicBulletSize( sal_uInt16 nFontHeight );
~ParagraphObj();
- void Write( SvStream* pStrm );
- sal_uInt32 Count() const { return mnTextSize; };
+ void Write( SvStream* pStrm );
+ sal_uInt32 Count() const { return mnTextSize; };
- ParagraphObj& operator=( const ParagraphObj& rParagraphObj );
+ ParagraphObj& operator=( const ParagraphObj& rParagraphObj );
};
struct ImplTextObj
{
- sal_uInt32 mnRefCount;
- sal_uInt32 mnTextSize;
- int mnInstance;
- List* mpList;
- sal_Bool mbHasExtendedBullets;
- sal_Bool mbFixedCellHeightUsed;
+ sal_uInt32 mnRefCount;
+ sal_uInt32 mnTextSize;
+ int mnInstance;
+ List* mpList;
+ sal_Bool mbHasExtendedBullets;
+ sal_Bool mbFixedCellHeightUsed;
ImplTextObj( int nInstance );
~ImplTextObj();
@@ -657,8 +657,8 @@ struct ImplTextObj
class TextObj
{
- mutable ImplTextObj* mpImplTextObj;
- void ImplCalculateTextPositions();
+ mutable ImplTextObj* mpImplTextObj;
+ void ImplCalculateTextPositions();
public :
TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > &
@@ -666,172 +666,172 @@ class TextObj
TextObj( const TextObj& rTextObj );
~TextObj();
- void Write( SvStream* pStrm );
+ void Write( SvStream* pStrm );
- ParagraphObj* First(){ return (ParagraphObj*)mpImplTextObj->mpList->First(); };
- ParagraphObj* Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); };
- sal_uInt32 Count() const { return mpImplTextObj->mnTextSize; };
- int GetInstance() const { return mpImplTextObj->mnInstance; };
- sal_Bool HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
- void WriteTextSpecInfo( SvStream* pStrm );
+ ParagraphObj* First(){ return (ParagraphObj*)mpImplTextObj->mpList->First(); };
+ ParagraphObj* Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); };
+ sal_uInt32 Count() const { return mpImplTextObj->mnTextSize; };
+ int GetInstance() const { return mpImplTextObj->mnInstance; };
+ sal_Bool HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
+ void WriteTextSpecInfo( SvStream* pStrm );
- TextObj& operator=( TextObj& rTextObj );
+ TextObj& operator=( TextObj& rTextObj );
};
// ------------------------------------------------------------------------
struct CellBorder;
class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvider
{
- sal_Bool mbStatus;
- sal_Bool mbUseNewAnimations;
- sal_uInt32 mnStatMaxValue;
- sal_uInt32 mnLatestStatValue;
- std::vector< PPTExStyleSheet* > maStyleSheetList;
- PPTExStyleSheet* mpStyleSheet;
-
- EscherGraphicProvider* mpGraphicProvider;
- Fraction maFraction;
- MapMode maMapModeSrc;
- MapMode maMapModeDest;
- ::com::sun::star::awt::Size maDestPageSize;
- ::com::sun::star::awt::Size maNotesPageSize;
- PageType meLatestPageType;
- List maSlideNameList;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mXModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > mXDrawPagesSupplier;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > mXDrawPages;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mXDrawPage;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXPagePropSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXBackgroundPropSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mXShapes;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXShape;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef des globalen Text
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mXCursorText; // TextRef des Teilstuecks des Cursors
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXCursorPropSet; // die Properties des Teilstueckes
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField;
- ::com::sun::star::awt::Size maSize;
- ::com::sun::star::awt::Point maPosition;
- Rectangle maRect;
- ByteString mType;
- sal_Bool mbPresObj;
- sal_Bool mbEmptyPresObj;
- sal_Bool mbStatusIndicator;
- sal_Int32 mnAngle;
- sal_uInt32 mnTextStyle;
-
- sal_Bool mbFontIndependentLineSpacing;
- sal_uInt32 mnTextSize;
-
- SvStorageRef mrStg;
- SvStorageStream* mpCurUserStrm;
- SvStorageStream* mpStrm;
- SvStorageStream* mpPicStrm;
- PptEscherEx* mpPptEscherEx;
-
- List maExOleObj;
- sal_uInt32 mnVBAOleOfs;
- SvMemoryStream* mpVBA;
- sal_uInt32 mnExEmbed;
- SvMemoryStream* mpExEmbed;
-
- sal_uInt32 mnPages; // anzahl einzelner Slides ( ohne masterpages & notes & handout )
- sal_uInt32 mnMasterPages; //
- sal_uInt32 mnDrawings; // anzahl Slides + masterpages + notes + handout
- sal_uInt32 mnPagesWritten;
- sal_uInt32 mnUniqueSlideIdentifier;
- sal_uInt32 mnTxId; // Identifier determined by the HOST (PP) ????
- sal_uInt32 mnDiaMode; // 0 -> manuell
+ sal_Bool mbStatus;
+ sal_Bool mbUseNewAnimations;
+ sal_uInt32 mnStatMaxValue;
+ sal_uInt32 mnLatestStatValue;
+ std::vector< PPTExStyleSheet* > maStyleSheetList;
+ PPTExStyleSheet* mpStyleSheet;
+
+ EscherGraphicProvider* mpGraphicProvider;
+ Fraction maFraction;
+ MapMode maMapModeSrc;
+ MapMode maMapModeDest;
+ ::com::sun::star::awt::Size maDestPageSize;
+ ::com::sun::star::awt::Size maNotesPageSize;
+ PageType meLatestPageType;
+ List maSlideNameList;
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mXModel;
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > mXDrawPagesSupplier;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > mXDrawPages;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mXDrawPage;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXPagePropSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXBackgroundPropSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mXShapes;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXShape;
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef des globalen Text
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor;
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mXCursorText; // TextRef des Teilstuecks des Cursors
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXCursorPropSet; // die Properties des Teilstueckes
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField;
+ ::com::sun::star::awt::Size maSize;
+ ::com::sun::star::awt::Point maPosition;
+ Rectangle maRect;
+ ByteString mType;
+ sal_Bool mbPresObj;
+ sal_Bool mbEmptyPresObj;
+ sal_Bool mbStatusIndicator;
+ sal_Int32 mnAngle;
+ sal_uInt32 mnTextStyle;
+
+ sal_Bool mbFontIndependentLineSpacing;
+ sal_uInt32 mnTextSize;
+
+ SvStorageRef mrStg;
+ SvStorageStream* mpCurUserStrm;
+ SvStorageStream* mpStrm;
+ SvStorageStream* mpPicStrm;
+ PptEscherEx* mpPptEscherEx;
+
+ List maExOleObj;
+ sal_uInt32 mnVBAOleOfs;
+ SvMemoryStream* mpVBA;
+ sal_uInt32 mnExEmbed;
+ SvMemoryStream* mpExEmbed;
+
+ sal_uInt32 mnPages; // anzahl einzelner Slides ( ohne masterpages & notes & handout )
+ sal_uInt32 mnMasterPages; //
+ sal_uInt32 mnDrawings; // anzahl Slides + masterpages + notes + handout
+ sal_uInt32 mnPagesWritten;
+ sal_uInt32 mnUniqueSlideIdentifier;
+ sal_uInt32 mnTxId; // Identifier determined by the HOST (PP) ????
+ sal_uInt32 mnDiaMode; // 0 -> manuell
// 1 -> halbautomatisch
// 2 -> automatisch
- sal_uInt32 mnShapeMasterTitle;
- sal_uInt32 mnShapeMasterBody;
-
- List maHyperlink;
-
- FontCollection maFontCollection;
- ppt::ExSoundCollection maSoundCollection;
+ sal_uInt32 mnShapeMasterTitle;
+ sal_uInt32 mnShapeMasterBody;
- PHLayout& ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const;
- void ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId );
+ List maHyperlink;
+ FontCollection maFontCollection;
+ ppt::ExSoundCollection maSoundCollection;
+
+ PHLayout& ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const;
+ void ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId );
+
- sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm = NULL );
- sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
- sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
- sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = NULL );
- sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = NULL );
- sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm = NULL );
- sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm = NULL );
- sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm = NULL );
+ sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm = NULL );
+ sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
+ sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
+ sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = NULL );
+ sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = NULL );
+ sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm = NULL );
+ sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm = NULL );
+ sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm = NULL );
public:
- static void WriteCString( SvStream&, const String&, sal_uInt32 nInstance = 0 );
+ static void WriteCString( SvStream&, const String&, sal_uInt32 nInstance = 0 );
protected:
- sal_Bool ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags );
- sal_Bool ImplCreateCurrentUserStream();
- void ImplCreateHeaderFooterStrings( SvStream& rOut,
+ sal_Bool ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags );
+ sal_Bool ImplCreateCurrentUserStream();
+ void ImplCreateHeaderFooterStrings( SvStream& rOut,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
- void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
- sal_Bool ImplCreateDocument();
- sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream );
- sal_uInt32 ImplInsertBookmarkURL( const String& rBookmark, const sal_uInt32 nType,
+ void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
+ sal_Bool ImplCreateDocument();
+ sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream );
+ sal_uInt32 ImplInsertBookmarkURL( const String& rBookmark, const sal_uInt32 nType,
const String& rStringVer0, const String& rStringVer1, const String& rStringVer2, const String& rStringVer3 );
- sal_Bool ImplCreateMaster( sal_uInt32 nPageNum );
- sal_Bool ImplCreateMainNotes();
- sal_Bool ImplCreateSlide( sal_uInt32 nPageNum );
- sal_Bool ImplCreateNotes( sal_uInt32 nPageNum );
- void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet );
- void ImplWriteVBA( SvMemoryStream* pVBA );
- void ImplWriteOLE( sal_uInt32 nCnvrtFlags );
- sal_Bool ImplWriteAtomEnding();
-
- sal_Bool ImplInitSOIface();
- sal_Bool ImplSetCurrentStyleSheet( sal_uInt32 nPageNum );
- sal_Bool ImplGetPageByIndex( sal_uInt32 nIndex, PageType );
- sal_Bool ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE );
- sal_uInt32 ImplGetMasterIndex( PageType ePageType );
- void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt );
- sal_Bool ImplGetText();
- sal_Bool ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType,
+ sal_Bool ImplCreateMaster( sal_uInt32 nPageNum );
+ sal_Bool ImplCreateMainNotes();
+ sal_Bool ImplCreateSlide( sal_uInt32 nPageNum );
+ sal_Bool ImplCreateNotes( sal_uInt32 nPageNum );
+ void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet );
+ void ImplWriteVBA( SvMemoryStream* pVBA );
+ void ImplWriteOLE( sal_uInt32 nCnvrtFlags );
+ sal_Bool ImplWriteAtomEnding();
+
+ sal_Bool ImplInitSOIface();
+ sal_Bool ImplSetCurrentStyleSheet( sal_uInt32 nPageNum );
+ sal_Bool ImplGetPageByIndex( sal_uInt32 nIndex, PageType );
+ sal_Bool ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE );
+ sal_uInt32 ImplGetMasterIndex( PageType ePageType );
+ void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt );
+ sal_Bool ImplGetText();
+ sal_Bool ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType,
const sal_uInt32 StyleInstance, const sal_uInt8 PlaceHolderId );
- sal_Bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+ sal_Bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
::com::sun::star::presentation::AnimationEffect& eEffect,
::com::sun::star::presentation::AnimationEffect& eTextEffect,
- sal_Bool& bHasSound );
- void ImplWriteObjectEffect( SvStream& rSt,
+ sal_Bool& bHasSound );
+ void ImplWriteObjectEffect( SvStream& rSt,
::com::sun::star::presentation::AnimationEffect eEffect,
::com::sun::star::presentation::AnimationEffect eTextEffect,
sal_uInt16 nOrder );
- void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction );
- sal_Bool ImplGetStyleSheets();
- void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj );
- void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj );
- void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance,
+ void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction );
+ sal_Bool ImplGetStyleSheets();
+ void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj );
+ void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj );
+ void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance,
TextRuleEntry* pTextRule, SvStream& rExtBu, EscherPropertyContainer* );
- void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt );
- void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& );
- void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill );
+ void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt );
+ void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& );
+ void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill );
- void ImplWritePage( const PHLayout& rLayout,
+ void ImplWritePage( const PHLayout& rLayout,
EscherSolverContainer& rSolver,
PageType ePageType,
sal_Bool bMaster,
int nPageNumber = 0 );
- void ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
- void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
+ void ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
+ void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
EscherPropertyContainer& aPropOpt );
- ::com::sun::star::awt::Point ImplMapPoint( const ::com::sun::star::awt::Point& );
- ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& );
- Rectangle ImplMapRectangle( const ::com::sun::star::awt::Rectangle& );
+ ::com::sun::star::awt::Point ImplMapPoint( const ::com::sun::star::awt::Point& );
+ ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& );
+ Rectangle ImplMapRectangle( const ::com::sun::star::awt::Rectangle& );
- sal_Bool ImplCloseDocument(); // die font-, hyper-, Soundliste wird geschrieben ..
+ sal_Bool ImplCloseDocument(); // die font-, hyper-, Soundliste wird geschrieben ..
public:
PPTWriter( SvStorageRef& rSvStorage,
@@ -841,7 +841,7 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
~PPTWriter();
- sal_Bool IsValid() const { return mbStatus; };
+ sal_Bool IsValid() const { return mbStatus; };
};
diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx
index 7d23fee19344..f4f651aef09f 100644
--- a/sd/source/filter/eppt/epptdef.hxx
+++ b/sd/source/filter/eppt/epptdef.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
#include <tools/solar.h>
-#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record
+#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record
// header takes on this value, the
// record header marks the start of
// a container.
@@ -54,7 +54,7 @@
#define EPP_Notes 1008
#define EPP_NotesAtom 1009
#define EPP_Environment 1010
-#define EPP_SlidePersistAtom 1011 //0x03F3
+#define EPP_SlidePersistAtom 1011 //0x03F3
#define EPP_Scheme 1012
#define EPP_SchemeAtom 1013
#define EPP_DocViewInfo 1014
@@ -100,8 +100,8 @@
#define EPP_ColorSchemeAtom 2032
// these atoms first was seen in ppt2000 in a private Tag atom
-#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041
-#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic
+#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041
+#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic
#define EPP_OEShape 3008
#define EPP_ExObjRefAtom 3009
@@ -128,13 +128,13 @@
#define EPP_DefaultRulerAtom 4011
// these atoms first was seen in ppt2000 in a private Tag atom
-#define EPP_PST_ExtendedParagraphAtom 4012
-#define EPP_PST_ExtendedParagraphMasterAtom 4013
-#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015,
-#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj
+#define EPP_PST_ExtendedParagraphAtom 4012
+#define EPP_PST_ExtendedParagraphMasterAtom 4013
+#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015,
+#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj
// the first UINT32 in this atom indices the current slideId
-#define EPP_FontEnityAtom 4023
+#define EPP_FontEnityAtom 4023
#define EPP_FontEmbedData 4024
#define EPP_TypeFace 4025
#define EPP_CString 4026
@@ -176,7 +176,7 @@
#define EPP_ExSubscriptionSection 4077
#define EPP_ExControl 4078
#define EPP_ExControlAtom 4091
-#define EPP_SlideListWithText 4080 // 0x0FF0
+#define EPP_SlideListWithText 4080 // 0x0FF0
#define EPP_AnimationInfoAtom 4081
#define EPP_InteractiveInfo 4082
#define EPP_InteractiveInfoAtom 4083
@@ -211,53 +211,53 @@
#define EPP_GscalingAtom 10001
#define EPP_GrColorAtom 10002
#define EPP_GLPointAtom 10003
-#define EPP_Comment10 12000
-#define EPP_CommentAtom10 12001
+#define EPP_Comment10 12000
+#define EPP_CommentAtom10 12001
-#define EPP_PLACEHOLDER_NONE 0 // 0 None
-#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title
-#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body
-#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title
-#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle
-#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image
-#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image
-#define EPP_PLACEHOLDER_MASTERDATE 7 // 6 Master date
-#define EPP_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number
-#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer
-#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header
-#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object
-#define EPP_PLACEHOLDER_TITLE 13 // 12 Title
-#define EPP_PLACEHOLDER_BODY 14 // 13 Body
-#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body
-#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title
-#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle
-#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title
-#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body
-#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image
-#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size)
-#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph
-#define EPP_PLACEHOLDER_TABLE 21 // 22 Table
-#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art
-#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart
-#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip
+#define EPP_PLACEHOLDER_NONE 0 // 0 None
+#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title
+#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body
+#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title
+#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle
+#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image
+#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image
+#define EPP_PLACEHOLDER_MASTERDATE 7 // 6 Master date
+#define EPP_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number
+#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer
+#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header
+#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object
+#define EPP_PLACEHOLDER_TITLE 13 // 12 Title
+#define EPP_PLACEHOLDER_BODY 14 // 13 Body
+#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body
+#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title
+#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle
+#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title
+#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body
+#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image
+#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size)
+#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph
+#define EPP_PLACEHOLDER_TABLE 21 // 22 Table
+#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art
+#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart
+#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip
-#define EPP_TEXTTYPE_Title 0
-#define EPP_TEXTTYPE_Body 1
-#define EPP_TEXTTYPE_Notes 2
-#define EPP_TEXTTYPE_notUsed 3
-#define EPP_TEXTTYPE_Other 4 // ( Text in a shape )
-#define EPP_TEXTTYPE_CenterBody 5 // ( subtitle in title slide )
-#define EPP_TEXTTYPE_CenterTitle 6 // ( title in title slide )
-#define EPP_TEXTTYPE_HalfBody 7 // ( body in two-column slide )
-#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide )
+#define EPP_TEXTTYPE_Title 0
+#define EPP_TEXTTYPE_Body 1
+#define EPP_TEXTTYPE_Notes 2
+#define EPP_TEXTTYPE_notUsed 3
+#define EPP_TEXTTYPE_Other 4 // ( Text in a shape )
+#define EPP_TEXTTYPE_CenterBody 5 // ( subtitle in title slide )
+#define EPP_TEXTTYPE_CenterTitle 6 // ( title in title slide )
+#define EPP_TEXTTYPE_HalfBody 7 // ( body in two-column slide )
+#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide )
-#define EPP_SLIDESIZE_TYPEONSCREEN 0
-#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1
-#define EPP_SLIDESIZE_TYPEA4PAPER 2
-#define EPP_SLIDESIZE_TYPE35MM 3
-#define EPP_SLIDESIZE_TYPEOVERHEAD 4
-#define EPP_SLIDESIZE_TYPEBANNER 5
-#define EPP_SLIDESIZE_TYPECUSTOM 6
+#define EPP_SLIDESIZE_TYPEONSCREEN 0
+#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1
+#define EPP_SLIDESIZE_TYPEA4PAPER 2
+#define EPP_SLIDESIZE_TYPE35MM 3
+#define EPP_SLIDESIZE_TYPEOVERHEAD 4
+#define EPP_SLIDESIZE_TYPEBANNER 5
+#define EPP_SLIDESIZE_TYPECUSTOM 6
#endif
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f4462da6b8b8..c948353fac98 100755
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -385,8 +385,8 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry )
Font aFont;
aFont.SetCharSet( rEntry.CharSet );
aFont.SetName( rEntry.Original );
-// aFont.SetFamily( rEntry.Family );
-// aFont.SetPitch( rEntry.Pitch );
+// aFont.SetFamily( rEntry.Family );
+// aFont.SetPitch( rEntry.Pitch );
aFont.SetHeight( 100 );
if ( !pVDev )
@@ -713,7 +713,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
SvMemoryStream aTxMasterStyleAtomStrm( 0x200, 0x200 );
{
EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other );
- aTxMasterStyleAtomStrm << (sal_uInt16)5; // paragraph count
+ aTxMasterStyleAtomStrm << (sal_uInt16)5; // paragraph count
sal_uInt16 nLev;
sal_Bool bFirst = sal_True;
for ( nLev = 0; nLev < 5; nLev++ )
@@ -732,7 +732,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
+ 8 // 1 FontCollection Container
+ 20 // SrKinsoku Container
+ 18 // 1 TxSiStyleAtom
- + aTxMasterStyleAtomStrm.Tell() // 1 TxMasterStyleAtom;
+ + aTxMasterStyleAtomStrm.Tell() // 1 TxMasterStyleAtom;
+ mpStyleSheet->SizeOfTxCFStyleAtom();
sal_uInt32 nBytesToInsert = nEnvironment + 8;
@@ -1187,7 +1187,7 @@ sal_Bool PPTWriter::ImplGetStyleSheets()
{
int nInstance, nLevel;
sal_Bool bRetValue = sal_False;
- sal_uInt32 nPageNum;
+ sal_uInt32 nPageNum;
for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ )
{
@@ -1351,7 +1351,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
fN *= pDesc->Scaling;
nNormalSpacing = (sal_Int16)( fN + 0.5 );
}
- if ( !mbFontIndependentLineSpacing && bFirstParagraph && ( nLineSpacing > nNormalSpacing ) ) // sj: i28747, no replacement for fixed linespacing
+ if ( !mbFontIndependentLineSpacing && bFirstParagraph && ( nLineSpacing > nNormalSpacing ) ) // sj: i28747, no replacement for fixed linespacing
{
nLineSpacing = nNormalSpacing;
nPropertyFlags |= 0x00001000;
@@ -1485,8 +1485,8 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
{
sal_uInt32 nBackgroundColor = 0xffffff;
- if ( !nCharColor ) // special threatment for
- nCharColor = 0xffffff; // black fontcolor
+ if ( !nCharColor ) // special threatment for
+ nCharColor = 0xffffff; // black fontcolor
::com::sun::star::uno::Any aAny;
::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE );
@@ -1554,7 +1554,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
// not possible to export the 'embossed' flag
if ( ( GetCurrentGroupLevel() > 0 ) && ( GetCurrentGroupIndex() >= 1 ) )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aGroupedShape( GetCurrentGroupAccess()->getByIndex( GetCurrentGroupIndex() - 1 ), uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aGroupedShape( GetCurrentGroupAccess()->getByIndex( GetCurrentGroupIndex() - 1 ), uno::UNO_QUERY );
if( aGroupedShape.is() )
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aPropSetOfNextShape
@@ -1701,7 +1701,7 @@ struct FieldEntry
sal_uInt32 nFieldType;
sal_uInt32 nFieldStartPos;
sal_uInt32 nFieldEndPos;
- String aRepresentation;
+ String aRepresentation;
String aFieldUrl;
FieldEntry( sal_uInt32 nType, sal_uInt32 nStart, sal_uInt32 nEnd )
@@ -1966,7 +1966,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
case com::sun::star::i18n::ScriptType::COMPLEX :
{
aCharHeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightComplex" ) );
- aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) );
+ aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) );
aCharLocaleName = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleComplex" ) );
aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureComplex" ) );
break;
@@ -2131,10 +2131,10 @@ sal_uInt32 PortionObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPositi
// 2 = Time
// 3 = SlideNumber
// 4 = Url
-// 5 = DateTime
-// 6 = header
-// 7 = footer
-// bit24->27 text field sub type (optional)
+// 5 = DateTime
+// 6 = header
+// 7 = footer
+// bit24->27 text field sub type (optional)
// 23-> PPT Textfield needs a placeholder
sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & ,
@@ -3039,9 +3039,9 @@ void TextObj::WriteTextSpecInfo( SvStream* pStrm )
nCharactersLeft -= nPortionSize;
*pStrm << static_cast< sal_uInt32 >( nPortionSize )
<< nFlags
- << static_cast< sal_Int16 >( 1 ) // spellinfo -> needs rechecking
+ << static_cast< sal_Int16 >( 1 ) // spellinfo -> needs rechecking
<< static_cast< sal_Int16 >( MsLangId::convertLocaleToLanguageWithFallback( pPortion->meCharLocale ) )
- << static_cast< sal_Int16 >( 0 ); // alt language
+ << static_cast< sal_Int16 >( 0 ); // alt language
}
}
if ( nCharactersLeft )
@@ -3160,9 +3160,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
case 2 :
{
rOut << (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) << (sal_uInt32)8
- << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset auf TxtField;
- << (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type
- << (sal_uInt8)0 << (sal_uInt16)0; // PadBytes
+ << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset auf TxtField;
+ << (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type
+ << (sal_uInt8)0 << (sal_uInt16)0; // PadBytes
}
break;
case 3 :
@@ -3204,9 +3204,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
rOut << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24
<< (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16
- << (sal_uInt32)0 // soundref
- << nHyperId // hyperlink id
- << (sal_uInt8)4 // hyperlink action
+ << (sal_uInt32)0 // soundref
+ << nHyperId // hyperlink id
+ << (sal_uInt8)4 // hyperlink action
<< (sal_uInt8)0 // ole verb
<< (sal_uInt8)0 // jump
<< (sal_uInt8)0 // flags
@@ -4068,7 +4068,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
<< nFlags
<< (sal_uInt32)nHyperLinkType;
- if ( nAction == 2 ) // run program Action
+ if ( nAction == 2 ) // run program Action
{
sal_uInt16 i, nLen = aFile.Len();
rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) << (sal_uInt32)( nLen * 2 );
@@ -4134,7 +4134,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags );
SvMemoryStream aExtBu( 0x200, 0x200 );
- SvMemoryStream aClientTextBox( 0x200, 0x200 );
+ SvMemoryStream aClientTextBox( 0x200, 0x200 );
ImplWriteTextStyleAtom( aClientTextBox, nStyleInstance, 0, NULL, aExtBu, &aPropOpt );
aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
@@ -4145,10 +4145,10 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
*mpStrm << (sal_uInt32)0 // PlacementID
- << (sal_uInt8)nPlaceHolderId // PlaceHolderID
- << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
+ << (sal_uInt8)nPlaceHolderId // PlaceHolderID
+ << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
<< (sal_uInt16)0; // padword
- mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
+ mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
/*
if ( aExtBu.Tell() )
{
@@ -4325,7 +4325,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
rtl::OUString sCustomShapeType;
MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType );
if ( sCustomShapeType.equalsAscii( "col-502ad400" ) || sCustomShapeType.equalsAscii( "col-60da8460" ) )
- { // sj: creating metafile for customshapes that can't be saved to ms format properly
+ { // sj: creating metafile for customshapes that can't be saved to ms format properly
ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
{
@@ -4827,8 +4827,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
aPropertyOptions.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
aPropertyOptions.AddOpt( ESCHER_Prop_lTxid, mnTxId += 0x60 );
aPropertyOptions.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
-// aPropertyOptions.AddOpt( ESCHER_Prop_fillColor, nFillColor );
-// aPropertyOptions.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
+// aPropertyOptions.AddOpt( ESCHER_Prop_fillColor, nFillColor );
+// aPropertyOptions.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
aPropertyOptions.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 );
aPropertyOptions.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
aPropertyOptions.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
@@ -4920,8 +4920,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
EscherPropertyContainer aPropOpt2;
aPropOpt2.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
aPropOpt2.AddOpt( ESCHER_Prop_lTxid, mnTxId += 0x60 );
-// aPropOpt2.AddOpt( ESCHER_Prop_fillColor, nFillColor );
-// aPropOpt2.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
+// aPropOpt2.AddOpt( ESCHER_Prop_fillColor, nFillColor );
+// aPropOpt2.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
aPropOpt2.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 );
aPropOpt2.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
aPropOpt2.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90001 );
@@ -5061,14 +5061,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
*mpExEmbed << (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) )
<< (sal_uInt32)24
- << (sal_uInt32)nAspect // Aspect
+ << (sal_uInt32)nAspect // Aspect
<< (sal_uInt32)0
<< (sal_uInt32)mnExEmbed // index to the persist table
<< (sal_uInt32)0 // subtype
<< (sal_uInt32)0
<< (sal_uInt32)0x0012b600;
-// PPTWriter::WriteCString( *mpExEmbed, "Photo Editor Photo", 1 );
+// PPTWriter::WriteCString( *mpExEmbed, "Photo Editor Photo", 1 );
// PPTWriter::WriteCString( *mpExEmbed, "MSPhotoEd.3", 2 );
// PPTWriter::WriteCString( *mpExEmbed, "Microsoft Photo Editor 3.0 Photo", 3 );
@@ -5160,7 +5160,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
sal_uInt32 nRefId = ++mnExEmbed;
*mpExEmbed << (sal_uInt16)0xf
- << (sal_uInt16)EPP_ExMCIMovie // PPT_PST_ExAviMovie
+ << (sal_uInt16)EPP_ExMCIMovie // PPT_PST_ExAviMovie
<< (sal_uInt32)0;
sal_uInt32 nSize, nStart = mpExEmbed->Tell();
*mpExEmbed << (sal_uInt16)0
@@ -5171,7 +5171,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
<< (sal_uInt16)EPP_ExVideo
<< (sal_uInt32)0;
- *mpExEmbed << (sal_uInt16)0
+ *mpExEmbed << (sal_uInt16)0
<< (sal_uInt16)EPP_ExMediaAtom
<< (sal_uInt32)8
<< nRefId
@@ -5188,10 +5188,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
nSize = mpExEmbed->Tell() - nStart;
mpExEmbed->SeekRel( - ( (sal_Int32)nSize + 4 ) );
- *mpExEmbed << nSize; // size of PPT_PST_ExMCIMovie
+ *mpExEmbed << nSize; // size of PPT_PST_ExMCIMovie
mpExEmbed->SeekRel( 0x10 );
nSize -= 20;
- *mpExEmbed << nSize; // PPT_PST_ExMediaAtom
+ *mpExEmbed << nSize; // PPT_PST_ExMediaAtom
mpExEmbed->SeekRel( nSize );
if ( !pClientData )
@@ -5321,7 +5321,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
sal_uInt32 nTextType = EPP_TEXTTYPE_Body;
if ( mnTextStyle == EPP_TEXTSTYLE_BODY )
- {
+ {
if ( bSecOutl )
nTextType = EPP_TEXTTYPE_HalfBody;
else if ( mType == "presentation.Subtitle" )
@@ -5516,9 +5516,9 @@ Rectangle PPTWriter::ImplMapRectangle( const ::com::sun::star::awt::Rectangle& r
struct CellBorder
{
- sal_Int32 mnPos; // specifies the distance to the top/left position of the table
- sal_Int32 mnLength;
- table::BorderLine maCellBorder;
+ sal_Int32 mnPos; // specifies the distance to the top/left position of the table
+ sal_Int32 mnLength;
+ table::BorderLine maCellBorder;
CellBorder() : mnPos ( 0 ), mnLength( 0 ){};
};
@@ -5538,16 +5538,16 @@ void PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 n
aPropOptSp.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0xa0008 );
aPropOptSp.AddOpt( ESCHER_Prop_fshadowObscured, 0x20000 );
- sal_uInt32 nBorderColor = pCellBorder->maCellBorder.Color & 0xff00; // green
- nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color ) << 16; // red
- nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color >> 16 ); // blue
+ sal_uInt32 nBorderColor = pCellBorder->maCellBorder.Color & 0xff00; // green
+ nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color ) << 16; // red
+ nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color >> 16 ); // blue
aPropOptSp.AddOpt( ESCHER_Prop_lineColor, nBorderColor );
aPropOptSp.AddOpt( ESCHER_Prop_lineWidth, nLineWidth * 360 );
aPropOptSp.AddOpt( ESCHER_Prop_fc3DLightFace, 0x80000 );
aPropOptSp.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor );
- *mpStrm << nX1
+ *mpStrm << nX1
<< nY1
<< nX2
<< nY2;
@@ -5573,18 +5573,18 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
- *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
<< (INT32)maRect.Top()
<< (INT32)maRect.Right()
<< (INT32)maRect.Bottom();
sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch
+ mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch
aSolverContainer.AddShape( rXShape, nShapeId );
EscherPropertyContainer aPropOpt2;
try
{
- static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) );
+ static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) );
static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) );
static const rtl::OUString sHeight( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) );
@@ -5703,7 +5703,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aPropOptSp.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor );
- *mpStrm << nLeft
+ *mpStrm << nLeft
<< nTop
<< nRight
<< nBottom;
@@ -5720,9 +5720,9 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
static const rtl::OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) );
static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) );
static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) );
- static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) );
- static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) );
- static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) );
+ static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) );
+ static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) );
+ static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) );
// creating horz lines
sal_Int32 nYPos = ImplMapPoint( rXShape->getPosition() ).Y;
@@ -5741,7 +5741,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aCellBorder.mnPos = nXPos;
aCellBorder.mnLength = aM.Width;
if ( nLine < xRows->getCount() )
- { // top border
+ { // top border
uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nColumn, nLine ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xPropSet2( xCell, uno::UNO_QUERY_THROW );
table::BorderLine aBorderLine;
@@ -5749,7 +5749,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aCellBorder.maCellBorder = aBorderLine;
}
if ( nLine )
- { // bottom border
+ { // bottom border
uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nColumn, nLine - 1 ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xPropSet2( xCell, uno::UNO_QUERY_THROW );
table::BorderLine aBorderLine;
@@ -5793,7 +5793,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aCellBorder.mnPos = nYPos;
aCellBorder.mnLength = aM.Height;
if ( nLine < xColumns->getCount() )
- { // left border
+ { // left border
uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine, nRow ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xCellSet( xCell, uno::UNO_QUERY_THROW );
table::BorderLine aBorderLine;
@@ -5801,7 +5801,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aCellBorder.maCellBorder = aBorderLine;
}
if ( nLine )
- { // right border
+ { // right border
uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine - 1, nRow ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xCellSet( xCell, uno::UNO_QUERY_THROW );
table::BorderLine aBorderLine;
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index fbb94de67ae7..fbbf178c0a5f 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -40,7 +40,7 @@
PptEscherEx::PptEscherEx( SvStream& rOutStrm ) :
EscherEx( EscherExGlobalRef( new EscherExGlobal ), rOutStrm )
{
- mnCurrentDg = 0;
+ mnCurrentDg = 0;
}
// ---------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
{
UINT32 nSize = DrawingGroupContainerSize();
- rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup
+ rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup
<< (sal_uInt32)( nSize - 8 );
ImplWriteDggContainer( rSt );
@@ -108,18 +108,18 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
{
rSt << (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 )
<< (sal_uInt32)( nSize - 8 )
- << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800
- << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0
- << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010
- << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001
- << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008
- << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002;
+ << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800
+ << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0
+ << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010
+ << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001
+ << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008
+ << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002;
}
}
// ---------------------------------------------------------------------------------------------
-#define ESCHER_SPLIT_MENU_COLORS_COUNT 4
+#define ESCHER_SPLIT_MENU_COLORS_COUNT 4
sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize()
{
@@ -168,8 +168,8 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
mnCurrentDg = mxGlobal->GenerateDrawingId();
AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
- *mpOutStrm << (UINT32)0 // The number of shapes in this drawing
- << (UINT32)0; // The last MSOSPID given to an SP in this DG
+ *mpOutStrm << (UINT32)0 // The number of shapes in this drawing
+ << (UINT32)0; // The last MSOSPID given to an SP in this DG
}
}
break;
@@ -259,17 +259,17 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
OpenContainer( ESCHER_SpContainer );
AddAtom( 16, ESCHER_Spgr, 1 );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
<< (INT32)aRect.Top()
<< (INT32)aRect.Right()
<< (INT32)aRect.Bottom();
nShapeId = GenerateShapeId();
if ( !mnGroupLevel )
- AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch
+ AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch
else
{
- AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor
+ AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor
AddAtom( 8, ESCHER_ClientAnchor );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
*mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
@@ -285,7 +285,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
mpOutStrm->Write( pClientData->GetData(), nSize );
}
}
- CloseContainer(); // ESCHER_SpContainer
+ CloseContainer(); // ESCHER_SpContainer
}
mnGroupLevel++;
return nShapeId;
diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx
index 739ef6300d1c..1e2222d7a017 100644
--- a/sd/source/filter/eppt/escherex.hxx
+++ b/sd/source/filter/eppt/escherex.hxx
@@ -48,27 +48,27 @@ enum PPT_TextHeader
class PptEscherEx : public EscherEx
{
- sal_uInt32 ImplDggContainerSize();
- void ImplWriteDggContainer( SvStream& rSt );
+ sal_uInt32 ImplDggContainerSize();
+ void ImplWriteDggContainer( SvStream& rSt );
- sal_uInt32 ImplOptAtomSize();
- void ImplWriteOptAtom( SvStream& rSt );
+ sal_uInt32 ImplOptAtomSize();
+ void ImplWriteOptAtom( SvStream& rSt );
- sal_uInt32 ImplSplitMenuColorsAtomSize();
- void ImplWriteSplitMenuColorsAtom( SvStream& rSt );
+ sal_uInt32 ImplSplitMenuColorsAtomSize();
+ void ImplWriteSplitMenuColorsAtom( SvStream& rSt );
public:
PptEscherEx( SvStream& rOut );
~PptEscherEx();
- void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 );
- void CloseContainer();
+ void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 );
+ void CloseContainer();
sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData );
- UINT32 DrawingGroupContainerSize();
- void WriteDrawingGroupContainer( SvStream& rSt );
+ UINT32 DrawingGroupContainerSize();
+ void WriteDrawingGroupContainer( SvStream& rSt );
using EscherEx::EnterGroup;
};
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 4e4b50007443..cceeed929c3e 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -163,8 +163,8 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl
sal_uInt32 ImplTranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType )
{
- sal_uInt32 nPresetSubType = 0;
- sal_Bool bTranslated = sal_False;
+ sal_uInt32 nPresetSubType = 0;
+ sal_Bool bTranslated = sal_False;
if ( ( nPresetClass == (sal_uInt32)EffectPresetClass::ENTRANCE ) || ( nPresetClass == (sal_uInt32)EffectPresetClass::EXIT ) )
{
@@ -244,7 +244,7 @@ sal_uInt32 ImplTranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_
const sal_Char* transition::find( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection )
{
const sal_Char* pRet = NULL;
- int nFit = 0;
+ int nFit = 0;
const transition* p = gTransitions;
while( p->mpName )
@@ -261,7 +261,7 @@ const sal_Char* transition::find( const sal_Int16 nType, const sal_Int16 nSubTyp
pRet = p->mpName;
nFit = nF;
}
- if ( nFit == 7 ) // maximum
+ if ( nFit == 7 ) // maximum
break;
p++;
}
@@ -283,7 +283,7 @@ SvStream& operator<<(SvStream& rOut, AnimationNode& rNode )
}
AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContainer, ppt::ExSoundCollection& rExSoundCollection ) :
- mrSolverContainer ( rSolverContainer ),
+ mrSolverContainer ( rSolverContainer ),
mrExSoundCollection ( rExSoundCollection ),
mnCurrentGroup(0)
{
@@ -508,7 +508,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
sal_Int16 nFillDefault = GetFillMode( xNode, nFDef );
bool bSkipChildren = false;
-
+
Reference< XAnimationNode > xAudioNode;
static sal_uInt32 nAudioGroup;
@@ -676,7 +676,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
}
break;
- case AnimationNodeType::AUDIO : // #i58428#
+ case AnimationNodeType::AUDIO : // #i58428#
{
exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault );
exportAnimPropertySet( rStrm, xNode );
@@ -791,8 +791,8 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const
void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >*, const sal_Int32, const sal_Int16 nFillDefault )
{
- EscherExAtom aAnimNodeExAtom( rStrm, DFF_msofbtAnimNode );
- AnimationNode aAnim;
+ EscherExAtom aAnimNodeExAtom( rStrm, DFF_msofbtAnimNode );
+ AnimationNode aAnim;
rtl_zeroMemory( &aAnim, sizeof( aAnim ) );
// attribute Restart
@@ -806,7 +806,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
}
// attribute Fill
-// aAnim.mnFill = GetFillMode( xNode, pParent );
+// aAnim.mnFill = GetFillMode( xNode, pParent );
switch( nFillDefault )
{
default:
@@ -836,7 +836,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
aAnim.mnGroupType = mso_Anim_GroupType_SEQ;
switch( xNode->getType() )
{
- case AnimationNodeType::PAR : // PASSTROUGH!!! (as it was intended)
+ case AnimationNodeType::PAR : // PASSTROUGH!!! (as it was intended)
aAnim.mnGroupType = mso_Anim_GroupType_PAR;
case AnimationNodeType::SEQ :
{
@@ -847,7 +847,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
const NamedValue* p = aUserData.getConstArray();
sal_Int32 nLength = aUserData.getLength();
while( nLength-- )
- {
+ {
if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
{
sal_Int16 nType = 0;
@@ -924,7 +924,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
const NamedValue* p = aUserData.getConstArray();
sal_Int32 nLength = aUserData.getLength();
while( nLength-- )
- {
+ {
if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
{
pAny[ DFF_ANIM_NODE_TYPE ] = &(p->Value);
@@ -978,7 +978,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
sal_uInt32 nPPTNodeType = DFF_ANIM_NODE_TYPE_ON_CLICK;
switch( nNodeType )
{
- case ::com::sun::star::presentation::EffectNodeType::ON_CLICK : nPPTNodeType = DFF_ANIM_NODE_TYPE_ON_CLICK; break;
+ case ::com::sun::star::presentation::EffectNodeType::ON_CLICK : nPPTNodeType = DFF_ANIM_NODE_TYPE_ON_CLICK; break;
case ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS : nPPTNodeType = DFF_ANIM_NODE_TYPE_WITH_PREVIOUS; break;
case ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS : nPPTNodeType = DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS; break;
case ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE : nPPTNodeType = DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE; break;
@@ -1089,9 +1089,9 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
Reference< XAnimateColor > xColor( xNode, UNO_QUERY );
if( xColor.is() )
{
-// sal_uInt32 nColorSpace = xColor->getColorSpace() == AnimationColorSpace::RGB ? 0 : 1;
-// exportAnimPropertyuInt32( rStrm, DFF_ANIM_COLORSPACE, nColorSpace, TRANSLATE_NONE );
-
+// sal_uInt32 nColorSpace = xColor->getColorSpace() == AnimationColorSpace::RGB ? 0 : 1;
+// exportAnimPropertyuInt32( rStrm, DFF_ANIM_COLORSPACE, nColorSpace, TRANSLATE_NONE );
+
sal_Bool bDirection = !xColor->getDirection();
exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection, TRANSLATE_NONE );
}
@@ -1127,11 +1127,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
}
if ( pAny[ DFF_ANIM_EVENT_FILTER ] )
{
- // TODO DFF_ANIM_EVENT_FILTER
+ // TODO DFF_ANIM_EVENT_FILTER
}
if ( pAny[ DFF_ANIM_VOLUME ] )
{
- // TODO DFF_ANIM_VOLUME
+ // TODO DFF_ANIM_VOLUME
}
return nNodeType;
}
@@ -1289,7 +1289,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
switch( i )
{
- case 0 :
+ case 0 :
case 1 :
{
Any aAny;
@@ -1304,7 +1304,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_QUERY_THROW );
if ( xE.is() && xE->hasMoreElements() )
{
-// while( xE->hasMoreElements() )
+// while( xE->hasMoreElements() )
{
Reference< XAnimationNode > xClickNode( xE->nextElement(), UNO_QUERY );
aAny = xClickNode->getBegin();
@@ -1318,7 +1318,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
else
{
aAny = xNode->getBegin();
- if ( nFlags & 0x10 ) // replace ON_NEXT with IDEFINITE
+ if ( nFlags & 0x10 ) // replace ON_NEXT with IDEFINITE
{
if ( ( aAny >>= aEvent ) && ( aEvent.Trigger == EventTrigger::ON_NEXT ) )
{
@@ -1429,7 +1429,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
aDest += aStr;
}
}
- else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rotate" ) ) // "r" or "style.rotation" ?
+ else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rotate" ) ) // "r" or "style.rotation" ?
|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SkewX" ) )
|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Opacity" ) )
|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharHeight" ) )
@@ -1440,7 +1440,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
aDest += rtl::OUString::valueOf( fNumber );
}
else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Color" ) )
- || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillColor" ) ) // "Fillcolor" or "FillColor" ?
+ || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillColor" ) ) // "Fillcolor" or "FillColor" ?
|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LineColor" ) )
|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharColor" ) )
)
@@ -1475,7 +1475,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= eFillStyle )
{
if ( eFillStyle == ::com::sun::star::drawing::FillStyle_NONE )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "none" ) ); // ?
+ aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "none" ) ); // ?
else
aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "solid" ) );
}
@@ -1521,7 +1521,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( eFontSlant == com::sun::star::awt::FontSlant_ITALIC )
aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "italic" ) );
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); // ?
+ aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); // ?
}
}
else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Visibility" ) ) )
@@ -1551,8 +1551,8 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni
EscherExContainer aAnimateSet( rStrm, DFF_msofbtAnimateSet, 0 );
{
EscherExAtom aAnimateSetData( rStrm, DFF_msofbtAnimateSetData );
- sal_uInt32 nId1 = 1; // ??
- sal_uInt32 nId2 = 1; // ??
+ sal_uInt32 nId1 = 1; // ??
+ sal_uInt32 nId2 = 1; // ??
rStrm << nId1 << nId2;
}
Any aConvertedValue( convertAnimateValue( xSet->getTo(), xSet->getAttributeName() ) );
@@ -1575,7 +1575,7 @@ sal_uInt32 GetValueTypeForAttributeName( const rtl::OUString& rAttributeName )
struct Entry
{
const sal_Char* pName;
- sal_uInt8 nType;
+ sal_uInt8 nType;
};
static const Entry lcl_attributeMap[] =
{
@@ -1630,7 +1630,7 @@ void AnimationExporter::exportAnimate( SvStream& rStrm, const Reference< XAnimat
EscherExContainer aContainer( rStrm, DFF_msofbtAnimate, 0 );
{
- EscherExAtom aAnimateData( rStrm, DFF_msofbtAnimateData );
+ EscherExAtom aAnimateData( rStrm, DFF_msofbtAnimateData );
sal_uInt32 nBits = 0x38;
sal_Int16 nTmp = xAnimate->getCalcMode();
sal_uInt32 nCalcMode = /* (nTmp == AnimationCalcMode::FORMULA) ? 2 : */ (nTmp == AnimationCalcMode::LINEAR) ? 1 : 0;
@@ -1679,7 +1679,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
if ( xAnimate.is() )
{
if ( xAnimate->getAttributeName().getLength() )
- nBits |= 4; // what is attributeName ?, maybe this is set if a DFF_msofbtAnimateAttributeNames is written
+ nBits |= 4; // what is attributeName ?, maybe this is set if a DFF_msofbtAnimateAttributeNames is written
sal_Int16 nAdditiveMode = xAnimate->getAdditive();
if ( nAdditiveMode != AnimationAdditiveMode::BASE )
{
@@ -1741,7 +1741,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a
{
Reference< XShape > xShape;
aAny >>= xShape;
- sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph
+ sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph
sal_Int32 begin = -1;
sal_Int32 end = -1;
@@ -1792,7 +1792,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a
{
EscherExAtom aAnimReference( rStrm, DFF_msofbtAnimReference );
- sal_uInt32 nRefType = 1; // TODO: nRefType == 2 -> Sound;
+ sal_uInt32 nRefType = 1; // TODO: nRefType == 2 -> Sound;
sal_uInt32 nRefId = ((EscherSolverContainer&)mrSolverContainer).GetShapeId( xShape );
rStrm << nRefMode
@@ -1804,7 +1804,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a
if ( bCreate2b01Atom )
{
EscherExAtom a2b01Atom( rStrm, 0x2b01 );
- rStrm << (sal_uInt32)1; // ?
+ rStrm << (sal_uInt32)1; // ?
}
}
}
@@ -1912,7 +1912,7 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference
EscherExContainer aAnimateFilter( rStrm, DFF_msofbtAnimateFilter );
{
EscherExAtom aAnimateFilterData( rStrm, DFF_msofbtAnimateFilterData );
- sal_uInt32 nBits = 3; // bit 0 -> use AnimAttributeValue
+ sal_uInt32 nBits = 3; // bit 0 -> use AnimAttributeValue
// bit 1 -> use nTransition
sal_uInt32 nTransition = xFilter->getMode() ? 0 : 1;
@@ -1936,11 +1936,11 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X
{
EscherExContainer aAnimateMotion( rStrm, DFF_msofbtAnimateMotion );
{
- { //SJ: Ignored from import filter
- EscherExAtom aAnimateMotionData( rStrm, DFF_msofbtAnimateMotionData );
+ { //SJ: Ignored from import filter
+ EscherExAtom aAnimateMotionData( rStrm, DFF_msofbtAnimateMotionData );
sal_uInt32 nBits = 0x98;
sal_uInt32 nOrigin = 0x2;
- float fByX = 100.0; // nBits&1
+ float fByX = 100.0; // nBits&1
float fByY = 100.0; // nBits&1
float fFromX = 0.0; // nBits&2
float fFromY = 0.0; // nBits&2
@@ -1948,7 +1948,7 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X
float fToY = 100.0; // nBits&4
rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nOrigin;
}
-/* ?
+/* ?
{
EscherExAtom aF137( rStrm, 0xf137 );
}
@@ -2015,7 +2015,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference
// TODO: ZoomContents:
//if( nBits & 8 )
- //( fprintf( mpFile, " zoomContents=\"%s\"", nZoomContents ? "true" : "false" );
+ //( fprintf( mpFile, " zoomContents=\"%s\"", nZoomContents ? "true" : "false" );
rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nZoomContents;
}
@@ -2065,13 +2065,13 @@ sal_Bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColor
sal_Int32 nColor = 0;
Sequence< double > aHSL( 3 );
- if ( rAny >>= nColor ) // RGB color
+ if ( rAny >>= nColor ) // RGB color
{
rA = (sal_uInt8)( nColor >> 24 );
rB = (sal_uInt8)( nColor >> 8 );
rC = (sal_uInt8)( nColor );
}
- else if ( rAny >>= aHSL ) // HSL
+ else if ( rAny >>= aHSL ) // HSL
{
rA = (sal_Int32) ( aHSL[ 0 ] * 255.0 / 360.0 );
rB = (sal_Int32) ( aHSL[ 1 ] * 255.0 );
@@ -2137,11 +2137,11 @@ void AnimationExporter::exportIterate( SvStream& rStrm, const Reference< XAnimat
{
EscherExAtom aAnimIteration( rStrm, DFF_msofbtAnimIteration );
- float fInterval = 10.0;
- sal_Int32 nTextUnitEffect = 0;
- sal_Int32 nU1 = 1;
- sal_Int32 nU2 = 1;
- sal_Int32 nU3 = 0xe;
+ float fInterval = 10.0;
+ sal_Int32 nTextUnitEffect = 0;
+ sal_Int32 nU1 = 1;
+ sal_Int32 nU2 = 1;
+ sal_Int32 nU3 = 0xe;
sal_Int16 nIterateType = xIterate->getIterateType();
switch( nIterateType )
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index b0f38519366d..88baf6cb357a 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ class SdPage;
class SvStream;
namespace ppt
-{
+{
struct AfterEffectNode
{
@@ -67,11 +67,11 @@ namespace ppt
typedef boost::shared_ptr< AfterEffectNode > AfterEffectNodePtr;
typedef sal_uInt32 TranslateMode;
-#define TRANSLATE_NONE 0
-#define TRANSLATE_VALUE 1
-#define TRANSLATE_ATTRIBUTE 2
-#define TRANSLATE_MEASURE 4
-#define TRANSLATE_NUMBER_TO_STRING 8
+#define TRANSLATE_NONE 0
+#define TRANSLATE_VALUE 1
+#define TRANSLATE_ATTRIBUTE 2
+#define TRANSLATE_MEASURE 4
+#define TRANSLATE_NUMBER_TO_STRING 8
const int AFTEREFFECT_NONE = 0;
const int AFTEREFFECT_COLOR = 1;
@@ -89,7 +89,7 @@ class AnimationExporter
void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode );
void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode );
void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode );
-
+
// if available exportAnimPropertySet returns the ::com::sun::star::presentation::EffectNodeType
sal_Int16 exportAnimPropertySet( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void exportAnimNode( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index 9510da8757e3..a1102c968062 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,8 @@ namespace ppt
{
ExSoundEntry::ExSoundEntry( const String& rString )
-: nFileSize( 0 )
-, aSoundURL( rString )
+: nFileSize( 0 )
+, aSoundURL( rString )
{
try
{
diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx
index 88965abe71ef..6e7061576cd9 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.hxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,42 +40,42 @@
#include <list>
namespace ppt
-{
+{
class ExSoundEntry
{
- sal_uInt32 nFileSize;
- String aSoundURL;
+ sal_uInt32 nFileSize;
+ String aSoundURL;
- String ImplGetName() const;
- String ImplGetExtension() const;
+ String ImplGetName() const;
+ String ImplGetExtension() const;
public :
-
- sal_Bool IsSameURL( const String& rURL ) const;
- sal_uInt32 GetFileSize( ) const { return nFileSize; };
+
+ sal_Bool IsSameURL( const String& rURL ) const;
+ sal_uInt32 GetFileSize( ) const { return nFileSize; };
ExSoundEntry( const String& rSoundURL );
// returns the size of a complete SoundContainer
- sal_uInt32 GetSize( sal_uInt32 nId ) const;
- void Write( SvStream& rSt, sal_uInt32 nId );
+ sal_uInt32 GetSize( sal_uInt32 nId ) const;
+ void Write( SvStream& rSt, sal_uInt32 nId );
};
class ExSoundCollection : private List
{
- const ExSoundEntry* ImplGetByIndex( sal_uInt32 nId ) const;
+ const ExSoundEntry* ImplGetByIndex( sal_uInt32 nId ) const;
public:
ExSoundCollection() {}
~ExSoundCollection();
- sal_uInt32 GetId( const String& );
+ sal_uInt32 GetId( const String& );
// returns the size of a complete SoundCollectionContainer
- sal_uInt32 GetSize() const;
- void Write( SvStream& rSt );
+ sal_uInt32 GetSize() const;
+ void Write( SvStream& rSt );
};
} // namespace ppt
generated by cgit (git 2.34.1) at 2024-06-18 20:31:10 +0000