summaryrefslogtreecommitdiff
path: root/sd/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter')
-rw-r--r--sd/source/filter/eppt/eppt.cxx34
-rw-r--r--sd/source/filter/eppt/epptso.cxx36
-rw-r--r--sd/source/filter/eppt/escherex.cxx24
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptbase.cxx22
-rw-r--r--sd/source/filter/eppt/pptx-grouptable.cxx16
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx18
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx8
-rw-r--r--sd/source/filter/html/htmlex.cxx6
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx8
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx4
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx68
-rw-r--r--sd/source/filter/sdfilter.cxx16
-rw-r--r--sd/source/filter/sdpptwrp.cxx14
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx26
16 files changed, 153 insertions, 153 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index be8b0e9ba4eb..852755704b82 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -164,7 +164,7 @@ void PPTWriter::exportPPTPost( )
mbStatus = sal_True;
};
-// ---------------------------------------------------------------------------------------------
+
void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom );
@@ -358,7 +358,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx->CloseContainer(); // EPP_Slide
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
{
@@ -446,7 +446,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->CloseContainer(); // EPP_MainMaster
};
-// ---------------------------------------------------------------------------------------------
+
PPTWriter::~PPTWriter()
{
@@ -467,7 +467,7 @@ PPTWriter::~PPTWriter()
mXStatusIndicator->end();
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriter::ImplCreateCurrentUserStream()
{
@@ -499,7 +499,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
return sal_True;
};
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation()
{
@@ -552,7 +552,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation()
return sal_True;
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId )
{
@@ -567,7 +567,7 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa
}
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet )
{
@@ -593,7 +593,7 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star
}
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet )
{
@@ -677,7 +677,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com
}
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriter::ImplCreateDocument()
{
@@ -943,7 +943,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
return sal_True;
};
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
{
@@ -1026,7 +1026,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
return sal_True;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriter::ImplCreateMainNotes()
{
@@ -1068,7 +1068,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
return sal_True;
}
-// ---------------------------------------------------------------------------------------------
+
static OUString getInitials( const OUString& rName )
{
@@ -1155,7 +1155,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr
}
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
{
@@ -1281,7 +1281,7 @@ void PPTWriter::ImplWriteVBA()
}
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplWriteOLE( )
{
@@ -1361,7 +1361,7 @@ void PPTWriter::ImplWriteOLE( )
}
}
-// ---------------------------------------------------------------------------------------------
+
// write PersistantTable and UserEditAtom
sal_Bool PPTWriter::ImplWriteAtomEnding()
@@ -1472,9 +1472,9 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
return sal_True;
}
-// ---------------------
+
// - exported function -
-// ---------------------
+
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index cc47322acdd5..3843fb9b51e3 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -97,7 +97,7 @@ using namespace ::com::sun::star;
#define DEFAULT_PITCH 0x00
#define FIXED_PITCH 0x01
-// ---------------------------------------------------------------------------------------------
+
PPTExBulletProvider::PPTExBulletProvider()
{
@@ -153,7 +153,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicS
return nRetValue;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
{
@@ -172,7 +172,7 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pStrm )
{
@@ -223,7 +223,7 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
{
@@ -243,7 +243,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm )
{
@@ -274,7 +274,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm )
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm )
{
@@ -305,7 +305,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm )
{
@@ -328,7 +328,7 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
{
@@ -353,7 +353,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
{
@@ -376,7 +376,7 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
return nSize;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const sal_uInt32 nType,
const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 )
@@ -416,7 +416,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const
return nHyperId;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriter::ImplCloseDocument()
{
@@ -577,7 +577,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
return sal_False;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PropValue::GetPropertyValue(
::com::sun::star::uno::Any& rAny,
@@ -617,7 +617,7 @@ sal_Bool PropValue::GetPropertyValue(
return bRetValue;
}
-// ---------------------------------------------------------------------------------------------
+
::com::sun::star::beans::PropertyState PropValue::GetPropertyState(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
@@ -638,21 +638,21 @@ sal_Bool PropValue::GetPropertyValue(
return eRetValue;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PropValue::ImplGetPropertyValue( const OUString& rString )
{
return GetPropertyValue( mAny, mXPropSet, rString );
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString )
{
return GetPropertyValue( mAny, aXPropSet, rString );
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState )
{
@@ -681,7 +681,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool
return bRetValue;
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
{
@@ -3890,7 +3890,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mpPptEscherEx->CloseContainer();
}
-//----------------------------------------------------------------------------------------------------------
+
void TextObjBinary::Write( SvStream* pStrm )
{
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index abd2081e7887..7e2eadf6ae0f 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -19,9 +19,9 @@
#include "escherex.hxx"
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
+
+
+
PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) :
EscherEx( EscherExGlobalRef( new EscherExGlobal ), &rOutStrm )
@@ -30,7 +30,7 @@ PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) :
mnCurrentDg = 0;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
{
@@ -46,7 +46,7 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
ImplWriteDggContainer( rSt );
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PptEscherEx::ImplDggContainerSize()
{
@@ -76,7 +76,7 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
}
}
-// ---------------------------------------------------------------------------------------------
+
#define ESCHER_OPT_COUNT 6
@@ -104,7 +104,7 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
}
}
-// ---------------------------------------------------------------------------------------------
+
#define ESCHER_SPLIT_MENU_COLORS_COUNT 4
@@ -131,13 +131,13 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
}
-// ---------------------------------------------------------------------------------------------
+
PptEscherEx::~PptEscherEx()
{
}
-// ---------------------------------------------------------------------------------------------
+
void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
{
@@ -175,7 +175,7 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance
}
}
-// ---------------------------------------------------------------------------------------------
+
void PptEscherEx::CloseContainer()
{
@@ -222,7 +222,7 @@ void PptEscherEx::CloseContainer()
}
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData )
{
@@ -285,6 +285,6 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
return nShapeId;
}
-// ---------------------------------------------------------------------------------------------
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index f65ecc1eaeec..aae16dede5b1 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -273,7 +273,7 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai
{
}
-// --------------------------------------------------------------------
+
sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault )
{
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4ffe04677735..afa63d3c8bc0 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -165,7 +165,7 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
{
}
-// ---------------------------------------------------------------------------------------------
+
PPTWriterBase::~PPTWriterBase()
{
@@ -177,7 +177,7 @@ PPTWriterBase::~PPTWriterBase()
mXStatusIndicator->end();
}
-// ---------------------------------------------------------------------------------------------
+
void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData )
{
@@ -258,7 +258,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
exportPPTPost();
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriterBase::InitSOIface()
{
@@ -287,7 +287,7 @@ sal_Bool PPTWriterBase::InitSOIface()
return sal_False;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
{
@@ -372,7 +372,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
return sal_False;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
{
@@ -419,7 +419,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
return sal_True;
};
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
{
@@ -432,7 +432,7 @@ sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
return sal_True;
};
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
{
@@ -451,7 +451,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
return sal_True;
};
-// ---------------------------------------------------------------------------------------------
+
sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const
{
@@ -484,7 +484,7 @@ PHLayout& PPTWriterBase::GetLayout( const ::com::sun::star::uno::Reference< ::c
return pPHLayout[ GetLayoutOffsetFixed( rXPropSet ) ];
}
-// ---------------------------------------------------------------------------------------------
+
PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const
{
@@ -496,7 +496,7 @@ PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const
return pPHLayout[ 0 ];
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
{
@@ -540,7 +540,7 @@ sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum )
return bRet;
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool PPTWriterBase::GetStyleSheets()
{
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx
index 2345716f0d49..60252c26aa71 100644
--- a/sd/source/filter/eppt/pptx-grouptable.cxx
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -31,7 +31,7 @@ GroupTable::GroupTable() :
ImplResizeGroupTable( 32 );
}
-// ---------------------------------------------------------------------------------------------
+
GroupTable::~GroupTable()
{
@@ -39,7 +39,7 @@ GroupTable::~GroupTable()
delete[] mpGroupEntry;
}
-// ---------------------------------------------------------------------------------------------
+
void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys )
{
@@ -55,7 +55,7 @@ void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys )
}
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef )
{
@@ -76,7 +76,7 @@ sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::s
return bRet;
}
-// ---------------------------------------------------------------------------------------------
+
sal_uInt32 GroupTable::GetGroupsClosed()
{
@@ -85,7 +85,7 @@ sal_uInt32 GroupTable::GetGroupsClosed()
return nRet;
}
-// ---------------------------------------------------------------------------------------------
+
void GroupTable::ClearGroupTable()
{
@@ -93,7 +93,7 @@ void GroupTable::ClearGroupTable()
mnCurrentGroupEntry = 0;
}
-// ---------------------------------------------------------------------------------------------
+
void GroupTable::ResetGroupTable( sal_uInt32 nCount )
{
@@ -101,7 +101,7 @@ void GroupTable::ResetGroupTable( sal_uInt32 nCount )
mpGroupEntry[ mnCurrentGroupEntry++ ] = new GroupEntry( nCount );
}
-// ---------------------------------------------------------------------------------------------
+
sal_Bool GroupTable::GetNextGroupEntry()
{
@@ -120,6 +120,6 @@ sal_Bool GroupTable::GetNextGroupEntry()
return sal_False;
}
-// ---------------------------------------------------------------------------------------------
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index a2a7582ca3e3..86ea3b45dc61 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -48,14 +48,14 @@
#include "comphelper/anytostring.hxx"
#include "cppuhelper/exc_hlp.hxx"
-// --
+
#include <comphelper/processfactory.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
#include <vcl/graphicfilter.hxx>
#include <svx/xoutbmp.hxx>
-// --
+
#include "sdpage.hxx"
#include "drawdoc.hxx"
@@ -89,7 +89,7 @@ using namespace com::sun::star::ui::dialogs;
using namespace ::sfx2;
-// -----------------------------------------------------------------------------
+
class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
{
@@ -129,22 +129,22 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc
}
-// ---------------
+
// - SdPPTFilter -
-// ---------------
+
SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
SdFilter( rMedium, rDocShell, sal_True )
{
}
-// -----------------------------------------------------------------------------
+
SdGRFFilter::~SdGRFFilter()
{
}
-// -----------------------------------------------------------------------------
+
void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError )
{
@@ -188,7 +188,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdGRFFilter::Import()
{
@@ -247,7 +247,7 @@ sal_Bool SdGRFFilter::Import()
return bRet;
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdGRFFilter::Export()
{
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 28d1bf3375f9..02071ef64aa5 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -116,27 +116,27 @@ Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames()
return aRet;
}
-// -----------------------------------------------------------------------------
+
SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
meDocType ( DOCUMENT_TYPE_DRAW )
{
}
-// -----------------------------------------------------------------------------
+
SdHtmlOptionsDialog::~SdHtmlOptionsDialog()
{
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL SdHtmlOptionsDialog::acquire() throw()
{
OWeakObject::acquire();
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL SdHtmlOptionsDialog::release() throw()
{
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index e3590fe7993c..7b16e80fe50e 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -604,7 +604,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio);
- //------------------------------------------------------------------
+
// we come up with a destination...
INetURLObject aINetURLObj( maPath );
@@ -673,7 +673,7 @@ void HtmlExport::ExportHtml()
mpDocSh->SetWaitCursor( true );
- //------------------------------------------------------------------
+
// Exceptions are cool...
CreateFileNames();
@@ -2992,7 +2992,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA
return false;
}
-// ---------------------------------------------------------------------
+
bool HtmlExport::checkForExistingFiles()
{
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 83a97d1c9f63..23f27ede3da9 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -39,22 +39,22 @@
#include "htmlex.hxx"
#include "sdhtmlfilter.hxx"
-// ---------------
+
// - SdPPTFilter -
-// ---------------
+
SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress )
{
}
-// -----------------------------------------------------------------------------
+
SdHTMLFilter::~SdHTMLFilter()
{
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdHTMLFilter::Export()
{
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index fc30f643cf85..241407338503 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -37,7 +37,7 @@
using namespace ::com::sun::star;
-//---------------------------------------------------------------------------------------
+
void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn )
{
@@ -57,7 +57,7 @@ void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn )
rIn.ReadUChar( nUnknown2 );
}
-//---------------------------------------------------------------------------------------
+
#define MEMBER_CONSTRUCTOR_LIST() \
m_aAtom() \
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b6ce991f4267..fed3b94c3c6a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2716,9 +2716,9 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref
return false;
}
-// ---------------------
+
// - exported function -
-// ---------------------
+
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT(
SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium )
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index e61122ee2e3e..628158d5ba3e 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -165,7 +165,7 @@ bool PropertySet::hasProperty( sal_Int32 nProperty ) const
return maProperties.find( nProperty ) != maProperties.end();
}
-// --------------------------------------------------------------------
+
Any PropertySet::getProperty( sal_Int32 nProperty ) const
{
@@ -220,7 +220,7 @@ AnimationImporter::AnimationImporter( ImplSdPPTImport* pPPTImport, SvStream& rSt
{
}
-// --------------------------------------------------------------------
+
int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRecordHeader& rProgTagContentHd )
{
@@ -260,14 +260,14 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
return nNodes;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::processAfterEffectNodes()
{
std::for_each( maAfterEffectNodes.begin(), maAfterEffectNodes.end(), sd::stl_process_after_effect_node_func );
}
-// --------------------------------------------------------------------
+
Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, const AnimationNode& rNode )
{
@@ -332,7 +332,7 @@ Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, co
return xNode;
}
-// --------------------------------------------------------------------
+
static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_Int32& rPresetClass )
{
@@ -573,7 +573,7 @@ int AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refere
return nNodes;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
{
try
@@ -638,7 +638,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
{
@@ -663,7 +663,7 @@ void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::un
}
}
-// --------------------------------------------------------------------
+
bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& xNode, const Reference< XAnimationNode >& xParent )
{
@@ -1043,7 +1043,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
return bRet;
}
-// --------------------------------------------------------------------
+
static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType )
{
@@ -1104,7 +1104,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
return OUString::number( nPresetSubType );
}
-// --------------------------------------------------------------------
+
void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const AnimationNode& rNode, const PropertySet& rSet )
{
@@ -1386,7 +1386,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
}
}
-// --------------------------------------------------------------------
+
int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -1498,7 +1498,7 @@ int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference<
return nNodes;
}
-// --------------------------------------------------------------------
+
int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -1574,7 +1574,7 @@ int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Re
return nNodes;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -1653,7 +1653,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -1798,7 +1798,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom
}
}
-// --------------------------------------------------------------------
+
sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA*/, sal_Int32 /*nB*/, sal_Int32 /*nC*/ )
{
@@ -1816,7 +1816,7 @@ sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA*
}
}
-// --------------------------------------------------------------------
+
Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC )
{
@@ -1937,7 +1937,7 @@ void AnimationImporter::importAnimateColorContainer( const Atom* pAtom, const Re
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -1996,7 +1996,7 @@ void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Refe
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2075,7 +2075,7 @@ void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Referen
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2157,7 +2157,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importCommandContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2290,7 +2290,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
}
}
-// --------------------------------------------------------------------
+
int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2369,7 +2369,7 @@ int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference<
return nNodes;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2470,7 +2470,7 @@ void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Re
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2539,7 +2539,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const
}
}
}
-// --------------------------------------------------------------------
+
bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames )
{
@@ -2577,7 +2577,7 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri
return true;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimationValues( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2655,7 +2655,7 @@ void AnimationImporter::importAnimationValues( const Atom* pAtom, const Referenc
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2789,7 +2789,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
}
}
-// --------------------------------------------------------------------
+
bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny )
{
@@ -2864,7 +2864,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny )
return bOk;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -2982,7 +2982,7 @@ void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Referenc
#endif
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importAnimationActions( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
@@ -3021,7 +3021,7 @@ void AnimationImporter::importAnimationActions( const Atom* pAtom, const Referen
}
}
-// --------------------------------------------------------------------
+
sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rTarget, sal_Int16& rSubType )
{
@@ -3144,7 +3144,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
return nRefMode;
}
-// --------------------------------------------------------------------
+
void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertySet& rSet )
{
@@ -3233,7 +3233,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine )
{
@@ -3260,7 +3260,7 @@ void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine )
fprintf(mpFile,"\n");
}
-// --------------------------------------------------------------------
+
void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine )
{
@@ -3326,7 +3326,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine )
}
}
-// --------------------------------------------------------------------
+
void AnimationImporter::dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen )
{
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 2d0831f8e5e5..a7df9aff0e5c 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -35,17 +35,17 @@
#include "drawdoc.hxx"
#include "sdfilter.hxx"
-// --------------
+
// - Namespaces -
-// --------------
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
-// ------------
+
// - SdFilter -
-// ------------
+
SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress )
: mxModel( rDocShell.GetModel() )
@@ -57,13 +57,13 @@ SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool
{
}
-// -----------------------------------------------------------------------------
+
SdFilter::~SdFilter()
{
}
-// -----------------------------------------------------------------------------
+
OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const
{
@@ -71,7 +71,7 @@ OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const
return aTemp.replaceFirst( "?", rLibraryName );
}
-// -----------------------------------------------------------------------------
+
#ifndef DISABLE_DYNLOADING
extern "C" { static void SAL_CALL thisModule() {} }
@@ -86,7 +86,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
#endif
-// -----------------------------------------------------------------------------
+
void SdFilter::CreateStatusIndicator()
{
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index fc27da66dfda..be51d9c4ae8f 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -31,9 +31,9 @@
#include "drawdoc.hxx"
#include <tools/urlobj.hxx>
-// --------------
+
// - Namespaces -
-// --------------
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -62,9 +62,9 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
#endif
-// ---------------
+
// - SdPPTFilter -
-// ---------------
+
SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress ),
@@ -72,14 +72,14 @@ SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal
{
}
-// -----------------------------------------------------------------------------
+
SdPPTFilter::~SdPPTFilter()
{
delete pBas; // deleting the compressed basic storage
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdPPTFilter::Import()
{
@@ -131,7 +131,7 @@ sal_Bool SdPPTFilter::Import()
return bRet;
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdPPTFilter::Export()
{
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 6578d4dc04f8..29a208c46639 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -165,9 +165,9 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
}
-// ----------------
+
// - SdXMLWrapper -
-// ----------------
+
SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
@@ -414,7 +414,7 @@ sal_Int32 ReadThroughComponent(
return SD_XML_READERROR;
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdXMLFilter::Import( ErrCode& nError )
{
@@ -424,7 +424,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
Reference< uno::XComponentContext > rxContext =
comphelper::getProcessComponentContext();
- // -------------------------------------
+
SdDrawDocument* pDoc = mrDocShell.GetDoc();
pDoc->EnableUndo(false);
@@ -432,11 +432,11 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
pDoc->CreateFirstPages();
pDoc->StopWorkStartupDelay();
- // -------------------------------------
+
mxModel->lockControllers();
- // -------------------------------------
+
/** property map for import info set */
PropertyMapEntry const aImportInfoMap[] =
@@ -490,7 +490,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
}
}
- // -------------------------------------
+
Reference< io::XActiveDataSource > xSource;
Reference< XInterface > xPipe;
@@ -501,7 +501,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
Reference< lang::XComponent > xModelComp( mxModel, uno::UNO_QUERY );
- // -------------------------------------
+
// try to get an XStatusIndicator from the Medium
if( mbShowProgress )
@@ -536,9 +536,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
}
}
- // -------------------------------------
+
// get the input stream (storage or stream)
- // -------------------------------------
+
SvStorageStreamRef xDocStream;
Reference<io::XInputStream> xInputStream;
@@ -586,7 +586,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
if (SDXMLMODE_Organizer == meFilterMode)
xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(sal_True));
- // -------------------------------------
+
if( 0 == nRet )
{
@@ -645,7 +645,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
}
}
- // -------------------------------------
+
if( pGraphicHelper )
SvXMLGraphicHelper::Destroy( pGraphicHelper );
xGraphicResolver = 0;
@@ -785,7 +785,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
return nRet == 0;
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdXMLFilter::Export()
{
generated by cgit (git 2.34.1) at 2024-07-13 07:39:48 +0000